diff --git a/results/combined/inconsistent_results.csv b/results/combined/inconsistent_results.csv index a5bb09e9bb..6c66a157e4 100644 --- a/results/combined/inconsistent_results.csv +++ b/results/combined/inconsistent_results.csv @@ -1,4 +1,4 @@ -idx,repo-idx,merge-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,adjacent,adjacent_merge_fingerprint,adjacent_ignorespace,adjacent_ignorespace_merge_fingerprint,imports,imports_merge_fingerprint,imports_ignorespace,imports_ignorespace_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,version_numbers_ignorespace,version_numbers_ignorespace_merge_fingerprint,repository,Oracle tool +idx,repo-idx,merge-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,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,adjacent_ignorespace,adjacent_ignorespace_merge_fingerprint,imports,imports_merge_fingerprint,imports_ignorespace,imports_ignorespace_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,version_numbers_ignorespace,version_numbers_ignorespace_merge_fingerprint,repository,Oracle tool 244-2,244,2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,Tests_passed,True,True,True,True,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,da8c62208a3131912761c4d210ca8386df0f5e584fbfa3343be6a92e57788d77,Tests_passed,da8c62208a3131912761c4d210ca8386df0f5e584fbfa3343be6a92e57788d77,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,allan-huang/remote-procedure-call,Tests_passed 681-36,681,36,refs/heads/ea,651fafcf0cdc3bbb18890955b02061bfc5f85c64,9ab050a11428838af56ad7479904209a7040b29b,b7d01c6ec8e5bdf57ecd47ed93b19624b5ba6c77,,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,True,True,True,True,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Merge_failed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,eed80cf2eb766308de18d2f9ae8e85339f69b7262b7bdf9a5e423071ae0b395e,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,openhft/chronicle-threads,Tests_passed 3183-5,3183,5,refs/heads/master,09c65cd9540ef816799eb0540ec463ec912a300a,590e67d0d93811d58b9454be6a0c9178e7f2ba3f,fc2a9e2cffc52f1f4392b5552555196d7e41dc49,,b1fc4677d158a76fd8a141595ff1c8791f73abced5b525bfd20fa515589570b7,Tests_passed,66af1d880972b5291a442f2ae4572de0c31e6146d48a15a4422715f1d8a235b8,Tests_passed,True,True,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,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,accla/d4m_api_java,Tests_passed diff --git a/results/combined/merges_tested/47deg/firebrand.csv b/results/combined/merges_tested/47deg/firebrand.csv index 5f0ffe14c8..8f55dbb866 100644 --- a/results/combined/merges_tested/47deg/firebrand.csv +++ b/results/combined/merges_tested/47deg/firebrand.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,True,13,31,147,2,True,13,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,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,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34 6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,True,13,43,154,3,True,13,Tests_passed,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,True,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,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,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0 7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,True,11,27,92,2,True,11,Tests_passed,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,True,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,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,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615 diff --git a/results/combined/merges_tested/9apps/elasticsearch-cloudwatch.csv b/results/combined/merges_tested/9apps/elasticsearch-cloudwatch.csv index 188f090afc..f805da01bf 100644 --- a/results/combined/merges_tested/9apps/elasticsearch-cloudwatch.csv +++ b/results/combined/merges_tested/9apps/elasticsearch-cloudwatch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,True,False,Tests_passed,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,True,2,3,4,2,True,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,True,2,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,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02 diff --git a/results/combined/merges_tested/ab0oo/javaprslib.csv b/results/combined/merges_tested/ab0oo/javaprslib.csv index 500add0574..c0cb50ed6c 100644 --- 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,,True,33,128,,13,True,38,Tests_passed,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,True,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,True,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,c1005244cea23c90b85f9ed83eacf23dd49eb4e3eb00850a7e7004672e125956,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,ef011810a94c8b74e909aac656c472c7479df2e338df82b87555a632af804902,Merge_failed,9df6aedb4433679f03a8ea6d87b32c6504aea4e5e25b1ba0b7c3bd02929743f4,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f diff --git a/results/combined/merges_tested/abel533/echarts.csv b/results/combined/merges_tested/abel533/echarts.csv index 179954e68c..f743bb427a 100644 --- 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,True,45,49,425,6,True,46,Tests_passed,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,True,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,True,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,907b1bcbd6c0530192451b5a6b3f6bcad63bbd66a493b72d3c22694852f4b5bf,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,69c908a14a0241ffcb5d5a451ed075adda2c56b1ec128e36754dd91353e3a1f2,Merge_failed,a1fabae4541d4a40110c0e590d4efb3d5969787a75f2270e1ecb357a830d0150,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333 diff --git a/results/combined/merges_tested/acciente/oacc-core.csv b/results/combined/merges_tested/acciente/oacc-core.csv index a1497b9122..5f3d8a91a7 100644 --- 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,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,True,214,296,1066,18,True,215,Tests_passed,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,True,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,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,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,0ad53a1530f8a34063dbd30466d149f7910e477ea05235886981b3b336b9fda5,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b diff --git a/results/combined/merges_tested/accla/d4m_api_java.csv b/results/combined/merges_tested/accla/d4m_api_java.csv index 186dbc14c5..dba43e9ede 100644 --- a/results/combined/merges_tested/accla/d4m_api_java.csv +++ b/results/combined/merges_tested/accla/d4m_api_java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,09c65cd9540ef816799eb0540ec463ec912a300a,590e67d0d93811d58b9454be6a0c9178e7f2ba3f,fc2a9e2cffc52f1f4392b5552555196d7e41dc49,,True,True,True,69,146,4086,6,True,73,Tests_passed,b1fc4677d158a76fd8a141595ff1c8791f73abced5b525bfd20fa515589570b7,True,Tests_passed,66af1d880972b5291a442f2ae4572de0c31e6146d48a15a4422715f1d8a235b8,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,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,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,True,27,84,260,3,True,27,Tests_passed,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,True,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,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,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,b598962e1fd11802906787f69a7c036a879fdc16b1fcf9b9a402ec6614619373,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354 12,refs/heads/master,31dd135b6787853c444473b11b049f41e63d939d,5d66714f7e8d8c8b46a5129e3cf01720dfa89632,69ae63c52d595f71875ebcadc6455b624ac86e1f,,True,True,True,24,61,172,3,True,24,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,True,Tests_passed,8e702a8d2b5ca4c259fc2c6dd476b91c98e8ac8e678754bdf17f1c0ec9b1501c,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,ff7767b81cf5e947df2b9016c4a623f701df1817c883bcd09ba07cafd14e3d70,Tests_failed,3368051063b0ff8616663278753e3111927f48a772891f717ff1581a106604fe,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,ff7767b81cf5e947df2b9016c4a623f701df1817c883bcd09ba07cafd14e3d70,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e diff --git a/results/combined/merges_tested/adamd/z.csv b/results/combined/merges_tested/adamd/z.csv index 4e8ecaa8b8..9480107a6d 100644 --- 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,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,True,True,Tests_passed,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,True,19,71,1095,2,True,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,True,19,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,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,501c1d5967d59f0fb6ce694b4ea73cb0b831f431e603b88f8c8e5f4604c0a4bd,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf diff --git a/results/combined/merges_tested/adangel/pmd.csv b/results/combined/merges_tested/adangel/pmd.csv index a50edbc118..bdf78bcfce 100644 --- a/results/combined/merges_tested/adangel/pmd.csv +++ b/results/combined/merges_tested/adangel/pmd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 95,refs/heads/master,f9c6b0b08dac300305daf222438c8b3dd54fc535,fede0e28fb7dfa69854d8a7d520146baa7f68b6d,1c08f946917a938669cfcf011e238dae028b3898,,True,True,True,458.0,1264,9069.0,3,True,458,Tests_passed,330e203411bd99643160a55163acd32680857ea38cd1137a159605b8c51e0c61,True,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,True,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,e5a3e28e16c1372daa7baae7bb974df04b14b3567381092c985a5ac7e95c9779,Merge_failed,bc19a4758a0c3e998b99988cac43ee69d56f7af9bd42b04a77086cec1b034e6a,Merge_failed,dd8eabd01947cf7b4eac438b39b87343c11795e3b16ecab8491e569d29a8019a,Merge_timedout,,Merge_failed,bc19a4758a0c3e998b99988cac43ee69d56f7af9bd42b04a77086cec1b034e6a,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,86b8c74090114373c6870f627d410ac434ce606aeb5b5210b744466f160bc9aa,Merge_failed,9478abcb236d6e3388fd3fae9ef6848940501742fd0c7a5c79c5e95a7af3cffe,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d 372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,True,True,True,436.0,1210,8471.0,3,True,436,Tests_passed,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,True,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,True,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b397d9858ce04ef6f080eef96ef54986de392de1a55dd54680660cc7c558110,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_timedout,,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b6e7c636f7601a8c6e5d7703b626b70b7dc8510783c36470b57de847ffddd31,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63 467,refs/heads/master,e52be1498094e7947e341cbb49c2b537e761d395,2b700c02b62549a26dc444c2a5b699b16686414d,04527bc4cb9c004ff3daf145690a1268b04a2a70,,True,,True,458.0,1261,,5,True,458,Tests_passed,e74295a8924a99c16abb67ed1e11121a1267c3d60c73b109355dd9a9abe66281,True,Tests_passed,466dfff5a728ab07907abf8b9233234504d515e4dcd52e714bb5b607492c187b,True,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,3ea355dda8d6d14c7d8ba9ece741b90c1dbcc5defa83694b0009568fb48a5397,Merge_failed,c3dde99c0b187614f331f7af2da7fc23b606dd31ea96d1c84befcb8968a5c284,Merge_failed,980021a9b7c15b32875a0f9ea207b840d141507cfc604c1703e00e644c45fedb,Merge_timedout,,Merge_failed,c3dde99c0b187614f331f7af2da7fc23b606dd31ea96d1c84befcb8968a5c284,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,0e68ca6a04b8a5714efc88cd1988b401c42112ad5f04491818e9685e801fe4b9,Merge_failed,515961d0dc421c3d1510901240214282ccfca2dba4931cad37c3767840ba4dc2,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff diff --git a/results/combined/merges_tested/addthis/meshy.csv b/results/combined/merges_tested/addthis/meshy.csv index f9fc382a47..1b5b798fbc 100644 --- a/results/combined/merges_tested/addthis/meshy.csv +++ b/results/combined/merges_tested/addthis/meshy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/1,1079da2f62ed1b8c096c40aeb293b1f1348d6e5d,6299d33d6b0d3e44d3dca4fec896ed368165dc5c,93106b5a0e7cf303bbb19ac8f2c7af5d6a6f5523,,True,True,True,31,158,1119,4,True,32,Tests_passed,d971cadbd932e5b7e11dc49e37ff7632d7af515e9def82bbd9c262f0f0e4db8e,True,Tests_passed,73a2ef4bdec99c031a98953b8085037f9c3eca3783d158d1e694a6994d31ab36,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,845c63d5517686f91754e200552b71f4df8b8b776642f358382f4e446409d07a,Tests_failed,6b3064ba7525438588b69db9ce0f832baf7ad0d9c89d562b75be57ca30b82573,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,50ed54678fbbbfcf03713a74e316107fa5c32c9568015f07a2e443b7c630228d,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Merge_failed,cf204e221e073f340db669687c060f6253a60589f8691bd104387d092a1d79bb,Tests_passed,845c63d5517686f91754e200552b71f4df8b8b776642f358382f4e446409d07a,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,8e0d6e22a9ec58addfbdc6336e5e97d18d3791382067799ebb5d9d43d49b500c,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5 8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,True,16,42,313,2,True,16,Tests_passed,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,True,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,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,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Tests_failed,ea332700fa1bedb43cd44d5a9367e6dffc6f15d75d2a8a6c117283c18f2d046d,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,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617 diff --git a/results/combined/merges_tested/addthis/stream-lib.csv b/results/combined/merges_tested/addthis/stream-lib.csv index 272f37a948..9c7019c40b 100644 --- a/results/combined/merges_tested/addthis/stream-lib.csv +++ b/results/combined/merges_tested/addthis/stream-lib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c901ea4391873e4d195a334dc99cb23cede2b339,b5891e2d3513236d91a2aee3e9d220215663113d,013b3ea315d91417dccdbeb1f5d7f569d0968ebe,,True,False,True,6,9,18,2,True,6,Tests_passed,d23e1a01302eb6fef57307f5e5e5ae7457d74cde83573892f76b1d2ac45fe229,True,Tests_passed,cead205f1db60523ea9dca5c36a261cd82b3a1952c6e14173d3d19f512e2c531,True,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_failed,4e6f9641e3863ba9ceb5754ccef39e41ad5f6b6726f7d985f22b4a3b27eae378,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834 16,refs/heads/master,644e4e9be40e0eb69a9aef6acee6ca28643f174b,e221cb6ab7841007e68d9a6e215f39600ff27502,35816a5396ba66280229d3b0d1c8570f62b6ae4a,,True,False,True,3,29,68,2,True,3,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,True,Tests_passed,035151ed8047112db4cc9368e27b5dbc636d8d2cddf19723cd5ce9951fa442d9,True,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_failed,5c756a4096751ef05974cd3e8bf1e72993f797f1b8fcb404d0e25724411335f5,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c 17,refs/heads/master,e221cb6ab7841007e68d9a6e215f39600ff27502,323e3010615a0f5b3b5356cc77297df94a92cfbb,b05dbce28a6dab82f20f31e4da28b29d2b736cef,,True,False,True,2,27,102,2,True,2,Tests_passed,dce673b5ad07d3f818db2b9c16c774354d0836d9fd774a57222bd20f3fb38792,True,Tests_passed,42093ed8a06fb413e90f54de7737ae684ef6fb6ae973b387f5309d8607b2adff,True,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd diff --git a/results/combined/merges_tested/adoptopenjdk/mjprof.csv b/results/combined/merges_tested/adoptopenjdk/mjprof.csv index eecad04db6..336bc6bc9c 100644 --- a/results/combined/merges_tested/adoptopenjdk/mjprof.csv +++ b/results/combined/merges_tested/adoptopenjdk/mjprof.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,754462e890ac29f2155ef2f60aeba253ad15ce76,4962f53609eea0aeef8b98fa156f0d8d12ced109,b53ee16a330b07ab9a9171da60c2919319542260,,True,True,True,44,134,1897,5,True,44,Tests_passed,5b9435e155856cdcbee1c87c1a2a84b98957fc6e9ffdc5bcfc0d512ec6cad1e7,True,Tests_passed,2b9f80aeff490dd0aba9103f23c5be1914eab72d338aa977739f57ec51c71cc5,True,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,62d9d6b1cb3d0a5516df5a5d0c2a35ff8c88c29768d81c546caf08eceb14eb13,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Tests_failed,7bb5087bd724eafa7d8aea7171c7bdda545a3b19e5f150d5b3140047d2a68a0c,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,b59b6de50e59aee634af8c13925e7b26112fbaa4c2d61cf66b0b2d168b87820b,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca 39,refs/heads/master,fde954818e8ec249a1b9888714b6b3d528e3db62,534cb7b1c61e80655b0862d3894d567c7400922d,4ba1f2366f030be0b6edde0065a401ed7197a2b8,,True,True,True,34,68,639,4,True,34,Tests_passed,5d9ffcb139f3aadd15d0cd373799fabb7d3f18f95e9b20557ee138e6ccf46021,True,Tests_passed,d961cca7a62a72eb835cc7f7e098d38c65c844f2a3c8da4ab5e69d042aebdf3d,True,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,637158d79a513e24c2507f204009bfd2f443f5c133ed8180281165716ee8b44f,Merge_failed,44cc378937d5ca83c74e74c891f3d89b792ed4d338151a694af5b49ce539497f,Merge_failed,96b4a469665666de872a3384ae8a5cac2b509b769e833ea4644047072379f6e0,Merge_failed,9d6a36be56d66716f5ae6cca9aa83506a72990c77950aebb9726e733ea606334,Merge_failed,44cc378937d5ca83c74e74c891f3d89b792ed4d338151a694af5b49ce539497f,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e0fb35490308f20f2a25052eb33e96ec990e935683267c88023fb4baa8fe0d26,Merge_failed,96b4a469665666de872a3384ae8a5cac2b509b769e833ea4644047072379f6e0,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27 48,refs/heads/master,44b7a2b3dbb6af1aa221a4a38b248e99629f8592,ee53d91c9f1d4dbb6def4312dd01063969dcdef4,9b1e992a94be4f9ac723bbf21b08f596ffae413d,,True,True,True,10,24,131,2,True,10,Tests_passed,f8eb78a84c08b66e69dcdde10811d7c7cc52fcfa128c4dadc0be8e4f50a9aeba,True,Tests_passed,adb3940c366ab752965e0a621b157be520efb02a4fc754c6c916c5daa6ac02d7,True,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,e50c757c672f980cb4024da73757248baf945bafa2899fa8ecdcc32f8b1a9974,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,e50c757c672f980cb4024da73757248baf945bafa2899fa8ecdcc32f8b1a9974,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15 diff --git a/results/combined/merges_tested/aerogear/aerogear-crypto-java.csv b/results/combined/merges_tested/aerogear/aerogear-crypto-java.csv index dac02f4217..6f92e7939c 100644 --- a/results/combined/merges_tested/aerogear/aerogear-crypto-java.csv +++ b/results/combined/merges_tested/aerogear/aerogear-crypto-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,4c895357e7aa06557e4ca3eae89f727c2c1534f5,592aac6c071772332a8f3f405fcc6d6c2b94fcb3,07beb7efc7bd0c3319076c9f14219f8392a39b7c,,True,True,True,9,21,75,2,True,9,Tests_passed,c63b54bfea1e25b29e519ebf48e0e4a7f834431446bc01f8a4fbf657a9917b2b,True,Tests_passed,8e399dc2b014f51497be382d63e2bef7b908ba4b122fd20dbf03847fac0aba46,True,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c diff --git a/results/combined/merges_tested/aerospike/aerospike-client-java.csv b/results/combined/merges_tested/aerospike/aerospike-client-java.csv index 99989169c3..0220d700e8 100644 --- a/results/combined/merges_tested/aerospike/aerospike-client-java.csv +++ b/results/combined/merges_tested/aerospike/aerospike-client-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/remotes/origin/CLIENT-2252,924fe34da0c425c1587a7edfff62947ecd8307d7,ff3bc5c7d7524932d8ae27b4ad6965102c0feacd,f15bfa18ba3fece17351381df2eb2705c446aaa6,,True,True,Tests_passed,7692ba6a959bd681118176fb3b4edf05e7aef2e3ddb1e5ffb062513cf7719bd4,True,102,477,2605,66,True,Tests_passed,d208410214cd8c7a33c6bb56a26a52b0eb40d353141fe535486937954556c0b3,True,157,True,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,18a04fb28c88b1ef17c1990167cccaab7c054be8e4cf9aca0d1d51e4dde1327b,Merge_failed,a5c464112388a0b40b7846f0be8e36568db0f7c2314cbdc90d6eeb42fa9e5fd9,Merge_failed,61822474e8f108f3e5f08fd67720aca706accf1d17a1b617e382565552876a66,Merge_failed,cb84b0b00ea1a899c436adeda33d9a79d9b3c754e9a685c160461f75fdaf2084,Merge_failed,a5c464112388a0b40b7846f0be8e36568db0f7c2314cbdc90d6eeb42fa9e5fd9,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,669dec8f11c302d91923da07beee4e36222925c0d2c5dbee3447f65e8b2954f8,Merge_failed,61822474e8f108f3e5f08fd67720aca706accf1d17a1b617e382565552876a66,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8 30,refs/remotes/origin/CLIENT-2293,526dc9ce7304f2006178d36d186d43e65bc7fc0d,19b303b3c394023abc5e2b28415376958962bb44,c23f291eb65987f4178ae127a87ce68cb668eae5,,True,True,Tests_passed,c205f0a3c6c9211a46a0744f6f4ab606c88d7e7902a2994c8c9a1467ecc3888c,True,16,101,1651,2,True,Tests_passed,121e49fce46d790ca43aa474251d7a1d8b74732e9f5537aab19ddcd38f214d2c,True,16,True,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,7ea684c73b335b3b930b1c85f9a7b687afc78bcb357a582b130c2aeee59c8b9f,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,7ea684c73b335b3b930b1c85f9a7b687afc78bcb357a582b130c2aeee59c8b9f,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb 40,refs/remotes/origin/CLIENT-2335-maven_jfrog_repo,ecf123c1911bd8a8a34e86c37c5db16c8cb3f941,716e82739db36725520bf3459383db9b5a5ebf94,1c4b47652f7612c81f3031d8556808f7c71905fd,,True,True,Tests_passed,847c2067049dbe3f38b0049e730126900ec841cf654eb18115dacaa4f166b9dc,True,133,588,11285,2,True,Tests_passed,9b26ffe44cbc79593c2a2a1b1ddde57a384620469cf23e36186b4384bd2397b6,True,133,True,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,ec91da4f2a0813306fe6799437b9637cd1e8b624d5e457532f6c2c70a132c6d9,Tests_failed,8f820f53f7561df5995690fa5938fa86b4bedca1d47d121666ea70da0f6b7cf3,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,ec91da4f2a0813306fe6799437b9637cd1e8b624d5e457532f6c2c70a132c6d9,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530 diff --git a/results/combined/merges_tested/afranken/jmeter-analysis-maven-plugin.csv b/results/combined/merges_tested/afranken/jmeter-analysis-maven-plugin.csv index 643827fd0c..6f8a602a4f 100644 --- a/results/combined/merges_tested/afranken/jmeter-analysis-maven-plugin.csv +++ b/results/combined/merges_tested/afranken/jmeter-analysis-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,b5d8d8fc2b75beaa9fa6265208204639dc084991,a8efde4deeb7c6826c64e4e4656c99511ee5df11,7ce5946f318da235038f01f43c3566d8f34b3bc5,,True,True,Tests_passed,7b3c674776f4d8f8ab18c29f7e304225ace2138b54558f968612c557541dccfd,True,17,61,468,2,True,Tests_passed,5025ee670c84f99302eeaece879ea4b137795a40f904569bc0023892bc174d5d,True,17,True,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf diff --git a/results/combined/merges_tested/ahmetaa/zemberek-nlp.csv b/results/combined/merges_tested/ahmetaa/zemberek-nlp.csv index 1710f84002..0e72e1efe2 100644 --- a/results/combined/merges_tested/ahmetaa/zemberek-nlp.csv +++ b/results/combined/merges_tested/ahmetaa/zemberek-nlp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,ef48fdd35bd72c69cff4a320a5df8120bbeb3a5b,034b88a9489b2e8dc5087ae4aa520cb3db624754,049f566e3b98f0b3738f3ac0a105e4c13fb61348,,True,True,True,7,28,85,2,True,7,Tests_passed,0cf0ab9b9b59369eb4a5b89b820d3801c58b4b7de54eb271cbdf748485e5ee53,True,Tests_passed,510ec606793fe4486cc88b6b6881cf743a81017d2c292821a9fa229b2fda61ac,True,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,730120e50d84325588385456906559703515a6e74e860b0b2d12aede5155be48,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,730120e50d84325588385456906559703515a6e74e860b0b2d12aede5155be48,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c 24,refs/heads/master,dcf5bee7e969cb5716d5f3490e2ca5722690e318,837e0ae272fc50670019de5dcf6453b2207c2ee5,1796bb4a2081cedb2c82ca81a2205640e9de26bf,,True,False,True,3,25,79,2,True,3,Tests_passed,95ace073d911d2a7ae61404c02199f1fb81d116d47bd044a5460e18e2ff2b52e,True,Tests_passed,ed814382591eb25113a1995f80dee9b3ab804db58b06090d0e40e5b236180326,True,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_failed,a9c1989fb255328fd724775d5f055c9fb6ccfc9bb35177e4c97ddc605b53bf65,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a 42,refs/heads/master,e497b43183da07131fc2fa7bd4f05b578b3d70a9,98bfd4f46f0c81015918c4333e2fecc6bff20f37,9ec48c53d9faf2a537129f2f28ef0587d4a1ef1e,,True,True,True,21,84,777,2,True,24,Tests_passed,e55724a76ec80ff4608f0b1cb9bf8dc1fe1afa391fd02d6a823b5936a7c27478,True,Tests_passed,fbaaacdbe8389cc6aeafccfcd991c7e030eb034681fc5457e81eef6e0ca713e1,True,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,455600cfff3f218f44a441a1d8bdca7f465780f5724517d6a15048f4082f6c92,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,be29d02eafc007e69b1f2a218d3c6f4446b9d78a49790299202d3160ec80c134,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,e55a8fe45b0c1e1e2c657da2c86f06ea9b0bf1fd0e4b50f135d64fe08e4df848,Merge_failed,9cbb49ca71bd0cb9b1ad700fabe345464ea3e1032e38328307defb8697b97029,Tests_failed,4657a0a5db75487b152ca6a7f4534203f39cb327d4c4c8af65e80e4518200134,Merge_failed,15a300e8f8cde97f13840320f28e068d69614bc33ea55e89ee657b77a7b300ba,Merge_failed,9cbb49ca71bd0cb9b1ad700fabe345464ea3e1032e38328307defb8697b97029,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,be29d02eafc007e69b1f2a218d3c6f4446b9d78a49790299202d3160ec80c134,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,e55a8fe45b0c1e1e2c657da2c86f06ea9b0bf1fd0e4b50f135d64fe08e4df848,Tests_failed,4657a0a5db75487b152ca6a7f4534203f39cb327d4c4c8af65e80e4518200134,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,455600cfff3f218f44a441a1d8bdca7f465780f5724517d6a15048f4082f6c92,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a diff --git a/results/combined/merges_tested/ahome-it/lienzo-core.csv b/results/combined/merges_tested/ahome-it/lienzo-core.csv index eb3cea87c0..a44c6bf1aa 100644 --- a/results/combined/merges_tested/ahome-it/lienzo-core.csv +++ b/results/combined/merges_tested/ahome-it/lienzo-core.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/2.0,ac01904309c648db0e7506ae380d3a98037b1531,f96c2fb55256f1a54953cfaf41e40c6365120345,e8f7e68392d2fe629ddbe066a1858a849b3f6ede,,True,False,True,6,16,48,2,True,6,Tests_passed,0eae40a3728a6faf0aa02c1249f2eec1fa81c37478e5180394161609b81cd32e,True,Tests_passed,cb7f8b5f17af41014ca514dd1ea21b63a6f0fc908f1b850f6e8eef259736c0bf,True,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,50d65b8c77863034c4918af46fdbf8a04ee221784fe49da7b3542f3ae7e7df4c,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,50d65b8c77863034c4918af46fdbf8a04ee221784fe49da7b3542f3ae7e7df4c,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567 31,refs/heads/2.0,bf4b253816bc316cd6dc5437f7ca25f35f591863,9c20b62e512757f686df15a748caa633ccf0cd88,c4be5cb68537dd419f2524786e41404f422ee8fb,,True,True,True,39,421,5543,2,True,39,Tests_passed,ce70921e19a3f1dffaa9a4963a8dcdddacf62da1c4e8cd21687762c526a66be6,True,Tests_passed,b07213c428a3ced1d96428b0b5994a5a8e6fae59332b29e48d1937e72f556e2f,True,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f diff --git a/results/combined/merges_tested/aleksandr-m/gitflow-maven-plugin.csv b/results/combined/merges_tested/aleksandr-m/gitflow-maven-plugin.csv index 0aa447f125..aa7dd68d79 100644 --- a/results/combined/merges_tested/aleksandr-m/gitflow-maven-plugin.csv +++ b/results/combined/merges_tested/aleksandr-m/gitflow-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,7482fdb5b64c2210fb5eadb5f90fb30c9163e517,c0b13b5d71779c30994d585ac6b01f7c5fe2d6ec,d2dfaebb57d6ace09903ff8c7e9cd9c6af27100f,,True,True,Tests_passed,931b92cd55bdaddc1b62a269eba8f797fb411293b016b3895180df00f10a1c23,True,30,60,344,3,True,Tests_passed,134620d9f3d65f31e3a7eaee4b462b6e928cb8a9460d0dbdec00fcd9788da977,True,32,True,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_failed,9ed675fa9d95d09286874cc7cefb216cc3124ec8e4dc267c5235829e9e6ab209,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2 9,refs/heads/master,1c97e42bdefdcad7659d10a64fd7e6048c3c58c5,637c6df72e51b2ab624ef5987d4eba926587ecd1,f3492cf0d2a9f7a470a1e2ddc06257151e5e96ae,,True,True,Tests_passed,33d15881d2c9712f23bf213f7375ff5b33a2b2e44659801c3cad761de101bb5f,True,112,369,2734,13,True,Tests_passed,3805c28a3044d25db3476dd51cd03c6444795749e9c8f35d7947aeba09e4f2d3,True,112,True,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,dd60c8b82aee3fe6bbd6c539143b4e7c7a4dc0a9f00f28ad86c8fa139b237ced,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,6e989e6121e8f34d26aba5e01cce60cd8c1174437385b5576be1fc940dab0b18,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,e50d1da0fa7d883a5d5faeb71656f4bb967bdd5d5b12856b5ed1e3a3f6a3f572,Merge_failed,f701bc91605f1f4ed45a4632ddd0ea5a12c537368cd6d55f7d59764bc7ef1038,Merge_failed,e9f2d814f55cb51d36bf3ef339c28ca1f75fdc5853d5549e2e5e0bebc8748953,Tests_failed,0a3df58f8ccdf08ec09d206a683e84e8af0eb2d22a9ab3b73497b2dc6b224470,Merge_failed,f701bc91605f1f4ed45a4632ddd0ea5a12c537368cd6d55f7d59764bc7ef1038,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,6e989e6121e8f34d26aba5e01cce60cd8c1174437385b5576be1fc940dab0b18,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,45b14d2a14f211ee2624fe8eb6c60a156aaa4bd5cf3696b7af2c7c91ddbf21b2,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,dd60c8b82aee3fe6bbd6c539143b4e7c7a4dc0a9f00f28ad86c8fa139b237ced,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3 21,refs/heads/master,b54f0d5c8d960b6069ee6c69abc616fd3e42cb6f,304505cb77bccf51f71641c83be4d8433d52e9db,7fd4321e387f0f666aeff50fda38664ba9f0d683,,True,True,Tests_passed,655803869862d3d37f52ff86aca352307d9686dfabe15ded8f1617b18c0f99f4,True,19,24,345,2,True,Tests_passed,05eba7bfb74562aa8e4426af872ee0788e9cdacf3f48b231b8b025b8fae232f2,True,19,True,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_failed,2a2a996ab1c88dee0b83cfa9edfbf7e5d3aa0ff213d36886aa108a0c58bc599e,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da diff --git a/results/combined/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv b/results/combined/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv index 106e3f41a3..29667c5238 100644 --- a/results/combined/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv +++ b/results/combined/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,feb36bfc8ee3a9e0d4394ef8e845a97c8c489840,daf63b4a8f05792b6c0f530445dc9238b83ed136,f9c2d45541a4c000039e68f8f4cf23dec19efc8d,,True,,Tests_passed,829c333d86eab04b07bdb6004aff20a4904992aedaca3f8e2a60b1b86ef5b14a,True,15,40,,2,True,Tests_passed,52bd5a2eeca2dc99be68d4cc0639a7878f053159cb66dedff9a978108a9aa6ae,True,15,True,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,6fa4425a207d7a60fd6f4cf8191feac7ca4ec501ae4d64426766a7268aa7e207,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,26edef49b09c33360a2bc727f60a6c2147771e4b44de3eecb15528a30e6e7f32,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0e2b0ddd3ee3740b8ab6347c05c883bdb0a82bcfd2d9b5eb3f6246f2f5ad3262,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd diff --git a/results/combined/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv b/results/combined/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv index d7ac77deb5..5f0e0ebd72 100644 --- a/results/combined/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv +++ b/results/combined/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,6c23c6286d649523f298ec09a2b4c0ca16390d80,a2a9c8c379f039a27fbbd2155d1ea1c437d12973,d43dad41a0f0c2fc7db7bcae6998f269e29f40d3,,True,True,True,10,19,91,2,True,10,Tests_passed,47ada1adc79435beae737b665437ffe360d46959ea92464bc5849a8dbd05307b,True,Tests_passed,80198a2ac49d65f5b42c2b1bef691482c4b077add17b82139dfb98c2964b3e50,True,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,c471a85b83237b9a20a9dddfa66c56cc0650a54cda98c931098563dc10a0341d,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,c471a85b83237b9a20a9dddfa66c56cc0650a54cda98c931098563dc10a0341d,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf 54,refs/heads/master,690d8dcc2e2b230c9aa4c5484f74ee56fd7ba029,56a03c07946d9e1137c25c34b561f269a85682b7,f9c65f30b453deaa676db4d2f40a43a61f237a16,,True,True,True,103,168,6423,4,True,103,Tests_passed,53fc56880a65ecfc2ddafcc027eb7040a993b64fdf36ca0154d26697fb8cb7b6,True,Tests_passed,f67be7c2def7ff51b5a974e2670e3afc7250b6f25a0daa39f159acbc3674f211,True,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,c89501900b6cbd0f1219843732848511f0ed9eb5f5e5233616047cfda61a9daf,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,8960a3dbaee15dd74a578c2c74375273c228fad8db78ac6a99e1688d59b709df,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6 57,refs/heads/master,80a84ddaaedf4d73d3e2a4a952dea3593b11d4a3,aee18e6430e21995212686495d4d1474df166a74,e6cb1ecd323a1c0494779dc007fb213f7af82451,,True,True,True,8,38,323,15,True,15,Tests_passed,87cea9606b8d03e550beb2e6557d9a59827ba0d60cabd9792ff9e43de3713b79,True,Tests_passed,27873444c1f487ddd0c53184fb7843c2fb6200549ca1739b13f376461aceae3d,True,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,f56b4246e95985fbc26bbf333ef565176dc2b710d25f13da5f8214fdd09103a5,Merge_failed,7e33f15ef6889f632eeaf3ddc8968e19cbecd993fba555a2636f0dcacde11f77,Merge_failed,193212186e98fea960141eda677b6ea5d85b1b62d2a6d7e4750677807fa33892,Merge_failed,f5033a3ff83f2102a15eb52dbef3600cc51f1825f0253045eeabe94a52ba492e,Merge_failed,7e33f15ef6889f632eeaf3ddc8968e19cbecd993fba555a2636f0dcacde11f77,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,c118c154a1f96b2c08aa8f6e40460d527fb6b2dc3d0b0dfe838719adf6387290,Merge_failed,2280ff097d9cd89fffda91c382f237dbb874ba9bee1731cb3ca2b0ca0c697357,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37 diff --git a/results/combined/merges_tested/alexruiz/fest-util.csv b/results/combined/merges_tested/alexruiz/fest-util.csv index e075847ab5..68caf40d7f 100644 --- a/results/combined/merges_tested/alexruiz/fest-util.csv +++ b/results/combined/merges_tested/alexruiz/fest-util.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,ec150f8c4420dbd9d177e880e96f09dca7f35f30,7013ac26f4e59640d2a1b1a56b0f03fd24bc86e2,3c3d01351f4149a749f8278423ca5d8112b18102,,True,True,True,72,482,1751,2,True,72,Tests_passed,833a91462a1542ca9c479413d57c31bd9012625e7f9c8ea1506ad968ebda264f,True,Tests_passed,f7dffb843a3421008bf85a098c2b6ae72c7cbc511a41086a51a21a1e9493ae66,True,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,2eb744e157f3b798acf692b63364a4f63b2638945ca9c769dcc6460235e5abc7,Merge_failed,3f70addfe526a403d8ab4914440513ac294cd04a8844e2785d3159ba2bb1a4e7,Tests_passed,44d02e20800f7d05d904989c32e840c9d18400053678a11e6d5cb9dbe7fb6f92,Merge_failed,505d3e96a238d37ad6dad65e53c5f41130d1530a987795a8602ca72e5fec2098,Merge_failed,3f70addfe526a403d8ab4914440513ac294cd04a8844e2785d3159ba2bb1a4e7,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,dc10dd566d9afb843326e8b91a5772dd83e69cf5c3b1245241d263d8b57be6d7,Tests_passed,44d02e20800f7d05d904989c32e840c9d18400053678a11e6d5cb9dbe7fb6f92,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5 10,refs/heads/master,3c3d01351f4149a749f8278423ca5d8112b18102,06f36741ee79cc5ed52de5ff4abd7ba2e676a40a,e95a95aac15a74c43627ec042c7a87bdb6852b9b,,True,True,True,19,83,452,2,True,19,Tests_passed,f9eca1f111e34587fdbf9e205daa8b08deb0dd575e934f26ac783e2561d1e199,True,Tests_passed,ca81b0f754f0d863f9395ed9304d5a041f5337275d61814628ccaa0719226661,True,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,3718cc6b0f38a1b20728c584984cb8f38a1f9419f841efc7035e3eb3dc67fc47,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,9473c23548c9422912b5e1fc1c2436a7692fd9efa67c23e788bfc0b3a780c3ae,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,9ee5dd5bd710b6ca9fc0e25e5520dda6455c946b92b9314f03d73ad511dc0a23,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71 diff --git a/results/combined/merges_tested/alexxiyang/shiro-redis.csv b/results/combined/merges_tested/alexxiyang/shiro-redis.csv index 46cd6f81a2..86e083a0e3 100644 --- a/results/combined/merges_tested/alexxiyang/shiro-redis.csv +++ b/results/combined/merges_tested/alexxiyang/shiro-redis.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,056ecf1dff7084af80617c6fe856497ec477fc22,34d1af0961cbe89b28480c8c6550898621ad01cb,234a7ec09972609aaf89da8c78aa677add3c55ff,,True,True,Tests_passed,4c7b133d48bd496a5e9a2ef3ec1d4f4c16a1ff5846997aa39917092634e208cd,True,4,7,14,3,True,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,True,4,True,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,e283a73b4ebdd1e17f73450d5f7b078fc8427d7caa9a066617db97723e7d2e47,Tests_failed,22c9354950b372763e6a1f47466ec6f293967667a597c48e5142c8e6ca977056,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,e283a73b4ebdd1e17f73450d5f7b078fc8427d7caa9a066617db97723e7d2e47,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7 20,refs/heads/master,234a7ec09972609aaf89da8c78aa677add3c55ff,fd8a94fde3f6f4ca24d848ec013f71865ce9218d,ebd16b97867db297230fc5b3e5dd08c559144e6a,,True,True,Tests_passed,79ee8e9a29237c205e7ffdf1c7260b3c64450bde5940a840c0258afd36f51fae,True,16,101,1012,3,True,Tests_passed,d70087d389678cee0425fd419227cca89280f1c07fe7727fdaa2a1a55ef1b8f0,True,16,True,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26 21,refs/heads/master,0f0ecea024252dcaad14f1891f49bf96fd8e0e0b,71ca8a9c7b72f9405d83ffd3bbc4aaad40539663,2f217aec62bc9f46ef4d4f1f43bb0e0d75ce58da,,True,True,Tests_passed,53047e409056032e48933f721e6075a329d9dc0affed910bdbef3cec62032bce,True,5,48,127,2,True,Tests_passed,28892ce247decea4d0e0721773e9f22436a7d22259c1ff7a804384fd81dbacbf,True,5,True,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,a9cf9579a9a4c49c382b3d980afeb3b57844366710a32d6842a5eb13470d4335,Tests_passed,941c2c38f84064edbde7aae719ba867fae607da824944a8eda741359b286e951,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,a9cf9579a9a4c49c382b3d980afeb3b57844366710a32d6842a5eb13470d4335,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9 diff --git a/results/combined/merges_tested/alibaba/canal.csv b/results/combined/merges_tested/alibaba/canal.csv index 685023629d..3770a4eedc 100644 --- a/results/combined/merges_tested/alibaba/canal.csv +++ b/results/combined/merges_tested/alibaba/canal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 229,refs/heads/master,4fe6c36c499ffe044d50a9ae1900427433797e4c,899592ce2a18f2787ae1adab4ff5347aba769845,9e3d4a7ffe5371557d79de1899fb68152a1a1d83,,True,True,True,92,159,2624.0,10,True,92,Tests_passed,89cd045707ea84c057fcf47629e626baa8b4c4300d50cac256cc1fb06ca09ebb,True,Tests_passed,a2dc05d4bbd067dfd95e89e028dd5805833451df74a4e2e407255ef7378351ba,True,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,bcc147fccfa3cc6329e214668606a7000d1871b5df9790d3a70c30cde16379e1,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,bcc147fccfa3cc6329e214668606a7000d1871b5df9790d3a70c30cde16379e1,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5 248,refs/heads/master,68d8afae3e9cb4c21c26b3f7c291759f0c9e7426,61c7f7738d33dfb6bd939c3a4211caf0ce86e218,9e816bc48f9955f9e2839873993cef9627c2f389,,True,True,True,42,123,2293.0,104,True,136,Tests_passed,adb0019e4c986e531fe55137f6d06697b46a4ce8b29f02517c2e38382181b0de,True,Tests_passed,23a987cd41852b0dec64796718d0a4c99fefbb00f0ac9bb912c79325cbaba56f,True,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,f8c893d28b0cd9b6eec17ca6fefa13c85ed431a4009a2bbe1957bee2b413b06a,Merge_failed,659525c6f96d60516cc258126b3aa00e834aae1203f88f7639115adbc13c28fe,Merge_failed,827dd2ea39f202b867883a6190d71eb31b63c403aae0648b0592ad3ebc8c6782,Tests_failed,5c3e659f3346cc06a8a94a1506d2498e4cae6238eb50b7367ac1ec85ad912857,Merge_failed,659525c6f96d60516cc258126b3aa00e834aae1203f88f7639115adbc13c28fe,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,9f6e2fd7e0d0fc905ed260969e4c42cfc99923806925cac35881c4e4b60027ae,Merge_failed,827dd2ea39f202b867883a6190d71eb31b63c403aae0648b0592ad3ebc8c6782,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973 250,refs/heads/master,b1dc5bd59f66fdc6df0dbf449d7b9eec8c58452c,02868d8fecb50e445d8b624ca70b25da36cda788,23f7b3b5d82c3571454877e32bc6f5bbd020b4c2,,True,True,True,183,1354,27749.0,6,True,183,Tests_passed,41ae054da8f10862135c8b359d27530c2d5cc8aba7a31046b0c745f7a804c9c0,True,Tests_passed,1349a5494ae220a2c938a2a9ce3ee272465e7f2e16ef60a0e13f51c4a7c99378,True,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,2ef170632ac2a53a693f3cb03dc9f20171c007fc95871de4fce2ad0e02336130,Merge_failed,e527c1c1eabee1a4529fccbb8cc064309d6749269c654608a0c2316baf915049,Merge_failed,29cb5d2f6f2d3bd42bcfb90c405123d4fed20d54bd9ee9a65cecdbb5913306b0,Merge_failed,a5e32df929c17b53b9d284a9dcc74b72981c878cb96b684ab6c56740bccc408a,Merge_failed,e527c1c1eabee1a4529fccbb8cc064309d6749269c654608a0c2316baf915049,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,35501881836d1ecc357d239d19d7a57e7bdfb524d6b22db58ac1c318b824eab5,Merge_failed,6109ea7b53030c3954d844db6942db2e036328b460bbd9eba7f295dde5dd3be8,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25 diff --git a/results/combined/merges_tested/alibaba/easyexcel.csv b/results/combined/merges_tested/alibaba/easyexcel.csv index d7ddae5db6..47e6842947 100644 --- a/results/combined/merges_tested/alibaba/easyexcel.csv +++ b/results/combined/merges_tested/alibaba/easyexcel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,5ccd41cd7ae9c6560002b7d482e391e8697c6845,a16b181c4ed56ce0672168194afd6b3bc0303caf,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,True,2,4,23,2,True,2,Tests_passed,59af16e5467d8a6cf8cf185d8a67eff57b02a8a274e491acc4d68b7f168c392b,True,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,True,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,3a9d0c4f9bd59482349945cb5ed0ff7fa7d8d2c33bbb20e11a10338d01c467e6,Tests_passed,59af16e5467d8a6cf8cf185d8a67eff57b02a8a274e491acc4d68b7f168c392b,Tests_passed,4844d8d0fcff5b4e63d35a9245c22b1e4c07b02da0b812f2cafa7b69db3c69e8,Tests_passed,2d6b3e98c10e700ffad1170102e0dea84ee05f29fc5b7d84718eaaa6eb203912,Tests_passed,59af16e5467d8a6cf8cf185d8a67eff57b02a8a274e491acc4d68b7f168c392b,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,578c16a7576e4a18f70962467b65f940d36e1a2a17d98d439148f006f5429b4d,Tests_passed,4844d8d0fcff5b4e63d35a9245c22b1e4c07b02da0b812f2cafa7b69db3c69e8,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0 14,refs/heads/master,a1d3b2b86fbb872a8f3ae20d58161b1a13f1f3ea,7fd3b1f5032b8c081490aa135ba0792e9a9d9d9c,e6bf1649823594bbb8525dea1522274e935f4093,,True,True,True,158,767,4424,3,True,159,Tests_passed,2552ac5b0f5af9a28b19f19a67f5f2c77ca1e83cb85a0be3f719df46afdb942f,True,Tests_passed,bf191b1c7373f67f075c6a1dacc8596ce30a74be540871488e6d21585195e68a,True,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,566c33cff2a8d2e8779435dc3f96cb968cfc2ffdf0e715057522d7097fe2936f,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,65442196acb80b997748b48398dccd5961e5d6c9db11d6e5104673d85008c172,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,56591c789bba8f437ece315870d7f1027e0fca3f85872deba857ec52fdea82ed,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33 39,refs/heads/master,ea2594d340f2bdd5e8079f1b30895e378638a76b,ab7d1a6fcaca7a8145379f4b4d37c19d6da15e61,126135cd427124e5722576b9c1844b5376df5846,,True,True,True,93,182,868,6,True,94,Tests_passed,94254e86762fd42895013e862da2d3896b8e99b2d7b3aa04044ea313b2d9b6d8,True,Tests_passed,b99fe21514ef8d89bf2312eb4faccdb84d0e3eeecdd35d269aa40b07cddba9fd,True,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Merge_failed,c258964292d2e1d0b553a06ba7980efa9c59869c479eaed70e62f6e304a47a66,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,eba5c42c49bebb91f01395e3cdfb51e8d665fb61f356aad82e74c2c28c62e000,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Merge_failed,c258964292d2e1d0b553a06ba7980efa9c59869c479eaed70e62f6e304a47a66,Tests_passed,eba5c42c49bebb91f01395e3cdfb51e8d665fb61f356aad82e74c2c28c62e000,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e diff --git a/results/combined/merges_tested/allan-huang/remote-procedure-call.csv b/results/combined/merges_tested/allan-huang/remote-procedure-call.csv index 6f7e6f8556..17eaab3be2 100644 --- a/results/combined/merges_tested/allan-huang/remote-procedure-call.csv +++ b/results/combined/merges_tested/allan-huang/remote-procedure-call.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,True,True,True,14,46,139,2,True,14,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,True,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,True,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254 diff --git a/results/combined/merges_tested/allanbank/mongodb-async-driver.csv b/results/combined/merges_tested/allanbank/mongodb-async-driver.csv index 58f6939c95..15fe3b1f87 100644 --- a/results/combined/merges_tested/allanbank/mongodb-async-driver.csv +++ b/results/combined/merges_tested/allanbank/mongodb-async-driver.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,81bedcbc10519b605deb41ef5b29ca78d17d4544,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,d60feb648a010c457b811122bde1eccd800dc3cf,,True,True,True,91,331,7744,4,True,91,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,True,Tests_passed,61800cedd2f345380aa7104c8c5df70b18762f4d942ae8fcf9527ebce00d6ee7,True,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987 5,refs/heads/master,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,30dcedbc589374c4c2a6298028e1fa3cbb3ada94,8bc382834511fef08de9cbeb20bcdb801f963287,,True,True,True,81,196,4650,3,True,81,Tests_passed,8cbcd3ce51889cce90fe5f7c54e2dbb228ce8a9f961930aea7009bcbcc491f8d,True,Tests_passed,bcc579eb6afdeee5aba3b298728edc35360497ed164b043bc913564079200032,True,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,a087a04d112f963c1ace88f95a8929be694b121b9613538fea622f764fd3eb3b,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,a087a04d112f963c1ace88f95a8929be694b121b9613538fea622f764fd3eb3b,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857 7,refs/heads/master,fad5b54783b500f5cb8039ac62f2504373da2b72,ec79624b161581f95f1832483b2e3fa85c1e8e28,17cda465b17c34c09ae6e1e3679a76cc70b9b4a9,,True,True,True,69,186,3857,2,True,69,Tests_passed,18d20fc6c154e1186125174e6b6552813c41f6030a7287d3da71b487738e9100,True,Tests_passed,f6ea1c519425af208968a7067c59211839e8fbe4623e29d46c9dedcb61f03c3b,True,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,2f44b627fc124de49e44269998a6026c58675205215393f6f032eee875f0eddd,Merge_failed,de4249445ecd057e9b2294d7b75af31cf1b1f595b99418007783270db39ae77b,Tests_passed,70c4a9aba83ece7696f826435dfa3de5f183e8b2acdfc90591b60b245a843f2e,Merge_failed,f292b3166f011a946d6977ef200d549227299a39bb62d5362ff5afd68c0b9afb,Merge_failed,de4249445ecd057e9b2294d7b75af31cf1b1f595b99418007783270db39ae77b,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,5a82d372ec6d4694fe3883a0251c24f3fe13d240f39bc0713c7618bcb5ff8935,Tests_passed,70c4a9aba83ece7696f826435dfa3de5f183e8b2acdfc90591b60b245a843f2e,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31 diff --git a/results/combined/merges_tested/amplafi/htmlcleaner.csv b/results/combined/merges_tested/amplafi/htmlcleaner.csv index 9ae78e762b..f75590492e 100644 --- a/results/combined/merges_tested/amplafi/htmlcleaner.csv +++ b/results/combined/merges_tested/amplafi/htmlcleaner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,5b1e2bd095894b31df3f14834a1d2df1da8bd203,70ed05ffd628822930987f1d43ca03ea2cd0881d,75a6251aac4918ccbbb59b52d5b85de3620bd3f6,,True,True,True,32,290,1968,2,True,32,Tests_passed,ca82ed754a52ebf432c9efa52fa4081a4310558a7b810a9fabd437157ada203b,True,Tests_passed,92d0ab5408293c8bdd89f456643bab91aa2fadde5626be494648cc103d31c3c2,True,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_failed,423fe0cc9c0c29df897059304f38fa22674adf39ad0c4e96c4a57f56a0fb271a,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80 diff --git a/results/combined/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv b/results/combined/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv index 96d247d375..3b70804e1e 100644 --- a/results/combined/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv +++ b/results/combined/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cadddbad17de1526cd54f53de4a0c633acb328e9,c5438560f54b525d3e1a8afb9fc4efbc6db9806c,ca84722195aac40f62ec2db5eed3eea4273a6ff8,,True,True,Tests_passed,afc2fb1335920e6cf399aaf2bddc8abb09b870393caefeccc2b2f792a343923e,True,16,42,4014,8,True,Tests_passed,681deceb3f1d91429c54cf81c807c924f7e374d6e2351e0aaf9c95a4d614ff95,True,16,True,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,e5573efae466ccc37ba93824f6ae7c87fa318908b9bcd9da0ca7683c4f3c1d93,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,1396adb50125b234604d4843012ded79f250975391afab4676df25472af57aa6,Merge_failed,aa769c067b9a1d5a4da3386fe8911ddbaa6bc622ca43e1d22919b83e71ce296f,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,a3468ed79e9f670af8607dcd657fcbb13f65a9e29161e4ca7a0c5d0581e641ba,Merge_failed,5b7faede93576782b5377b0768203f1933838b62f73ffa2d7ee85b41b7b2a4ed,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb diff --git a/results/combined/merges_tested/andresoviedo/google-drive-ftp-adapter.csv b/results/combined/merges_tested/andresoviedo/google-drive-ftp-adapter.csv index c9319d24e4..64a345a50d 100644 --- a/results/combined/merges_tested/andresoviedo/google-drive-ftp-adapter.csv +++ b/results/combined/merges_tested/andresoviedo/google-drive-ftp-adapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/45,7046a248be867a7bfadbd2c29fd9ef86c3cca54b,d0a2be254d0cac3cac7f989fa63614219ebee200,0193b2d43121b281e79b77bac820b46f6619de3c,,True,False,True,3,5,45,4,True,4,Tests_passed,ba31b3912bd8f0e88cc8896ab18c819ba2333f1b10d99c7cd38c3ca981213529,True,Tests_passed,247d93dc036dfbee14662705e443c88af623211c07b229f29d7a61c7de33d927,True,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,aadf2b6538766a44b8533fad3730cf113cb983564618533d1f942129f1364b29,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,0ceab100f5bc1fb0502923b0880f011e844f65f5ff4f8b01c55e69d9d5cf2c1a,Merge_failed,fa419cb44a7652398c4700fda6edb72273d7dedd818148845f73908b6b8de2b0,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,a124089abf6ac8f663cf7adff7f1b23bc0b96d8efc5a7ee9b7c631f57fe72def,Merge_failed,efd6ce716da6bdc3eedfaa591d18fbd4a1433c82d632a4d587274c014b9c5d7e,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776 diff --git a/results/combined/merges_tested/andrewphorn/classicube-client.csv b/results/combined/merges_tested/andrewphorn/classicube-client.csv index eb4d5d88a6..75c1344e53 100644 --- a/results/combined/merges_tested/andrewphorn/classicube-client.csv +++ b/results/combined/merges_tested/andrewphorn/classicube-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cc32a2554eb5fac5492e7eaa7dcf1ca121b35012,84bf151168576bfa61dc0cee6bd09ced1f10b9f5,9f682a7ed6759e77374a0beb40e3182fd7cf7e83,,True,True,Tests_passed,857bf5f828f870e83eae7ce2249622e8b8a97d1dd242e4aeb75a75da30bb8e6b,True,20,32,166,2,True,Tests_passed,1dd16ab12f1a1f179b47341ec4b5ad6a6baefa51257f01a3e0ea3f2d3bf5b241,True,20,True,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_failed,17f21dd81baab93f2408b87df1948c8ad7471d1256d219a0f4ce06534b3c7099,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3 19,refs/heads/master,64bbaac8971625a7bd7b46da9bb1091cd4d49e90,122887b8405051aaeef9823e112b39e71880d240,8f79bed3a185f603961c17378e60c81d7cbad774,,True,True,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,True,11,74,461,2,True,Tests_passed,9d2c86c513253f3afb6b6a8ef144c04206c8109a05d9d1d1a7c96c904e4d5624,True,11,True,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,219093ec22ed77ddc18fb07b9c42a24b257861bf93f6e656055fae4013685a93,Tests_failed,f5034a9ef640ba479ccdcb53e58ad7f35387d5ae452fb0ff1250e2b159ff83f9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,219093ec22ed77ddc18fb07b9c42a24b257861bf93f6e656055fae4013685a93,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9 21,refs/heads/master,423e913b966e398d2f424b491491f4fa7977dd25,0502c301ab9717cdb22af9aa10634604606f4b5e,2d3765b36fca01582560a716d09dcf0a66b618f7,,True,True,Tests_passed,323d0e5d6cf52668ed64b270376699035479c2e46f65c708d4bc984ad1de48d1,True,10,62,636,2,True,Tests_passed,3dd94cb991508fdb09bbb09744263cd44428b2c6db8534ebfc682ba392034fd6,True,10,True,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,7cedb3d943bf593d9eb5047aa8d20549a67562ddaed831f82ee0cf5d62084e45,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,7cedb3d943bf593d9eb5047aa8d20549a67562ddaed831f82ee0cf5d62084e45,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c diff --git a/results/combined/merges_tested/andygibson/datafactory.csv b/results/combined/merges_tested/andygibson/datafactory.csv index 5ec956ba5e..06df63bba2 100644 --- a/results/combined/merges_tested/andygibson/datafactory.csv +++ b/results/combined/merges_tested/andygibson/datafactory.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,1d4a47b045ee2c13820416dd60773690f6093e62,9ce0ce8f79c37a97461cf79d032471b5183e0d34,11f6613d23702cf7280d66129478bcd917d561ab,,True,True,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,True,6,9,331,3,True,Tests_passed,e97a2256dfe1f376dfb6e7b30f61157af83de4f3295bffae65a5a3f51bb3880b,True,6,True,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,a332a8c1b78cae5b6c2cc929a757877f86e3386b3af40645d61b8044431da7e1,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Tests_failed,58b5d34278d52caba6cc75a593c7796db7cea203292308b1d1b7d68ebb45120c,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,7bae8c05b545c80d74e6eae6340604cf364c85cafebbf1fb8c9510774b465199,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3 3,refs/heads/master,9ce0ce8f79c37a97461cf79d032471b5183e0d34,6220f33ac428c08674fe092482fa53ebca3fdb8f,16b2951895532a5044a71f0d172f22134d9c70ef,,True,True,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,True,3,5,62,2,True,Tests_passed,0f9b40732c1bd906e69dcd9ee0538ac0cd17ed89afa0d436974620787ab98f67,True,3,True,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,b4d54f368a19464bdb0406eae9e06f24d890c4446d575c8e6ca0d35d23f826dd,Tests_passed,5e09fcd93dfd7583bc82df63b0f6435ba543bd9c53e45aa5f98b617e363bcd4b,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,b4d54f368a19464bdb0406eae9e06f24d890c4446d575c8e6ca0d35d23f826dd,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3 4,refs/heads/master,6220f33ac428c08674fe092482fa53ebca3fdb8f,1d74d5ce77557bee9093f21cfc39489f0928d837,16e2b25f1721a2134b1c9539a608a0b396c6253c,,True,True,Tests_passed,ce1170d1df77f350625f10a6fee4cf1ab9dbeca8f39a50cccc01a002afd9082e,True,6,7,312,2,True,Tests_passed,6dd1d0560197f9cad5234e307a9622f98b9042546b4de596975a3d036f60ecf3,True,6,True,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f04374b72d953d385f976b395e824da7d13bb73bc84e15c98200334d3986b54d,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f04374b72d953d385f976b395e824da7d13bb73bc84e15c98200334d3986b54d,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55 diff --git a/results/combined/merges_tested/anjuke/hwi.csv b/results/combined/merges_tested/anjuke/hwi.csv index d0a3837394..8df8ff7675 100644 --- a/results/combined/merges_tested/anjuke/hwi.csv +++ b/results/combined/merges_tested/anjuke/hwi.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,93f975a6d0de030195150ffe63a9548de970d20c,50640ee2a825690dd1783887f8a1b32c2a0c4edb,94766cb0d37279e1842a9bff4769c366bf43e699,,True,True,Tests_passed,d46c25a5e4b77929903b49247fc82dffe524eba72c0a02b99a416b316af54f2e,True,7,33,191,2,True,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,True,7,True,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,57bf04d005e4d2a86baee3ba792aca9fba6ae98ccf56ad56029124387c84f484,Tests_failed,c5bd42890931bf6a17244c17e9f93ec66d68d9ca5b37227dfb1b1dc7a5d38870,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,57bf04d005e4d2a86baee3ba792aca9fba6ae98ccf56ad56029124387c84f484,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f 5,refs/heads/master,94766cb0d37279e1842a9bff4769c366bf43e699,73c71cfc99f805ee178b5930e5d8a8adef6c3a1c,9340c5c00c8e261f1660113ef522e13229b39db1,,True,True,Tests_passed,5fd1fa7875970aae4d57cda371e1eae1cdbc124db213a7378d069062a7267607,True,7,34,193,2,True,Tests_passed,5e5a2dd5029029038841e7e40b11809075b3e6a536020abfce013374dcd5a817,True,7,True,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_failed,aec70c98dec34787e9a3f8e63ce283f201c288a5aa0cd79321be4fcb939464d7,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541 diff --git a/results/combined/merges_tested/antlr/grammars-v4.csv b/results/combined/merges_tested/antlr/grammars-v4.csv index 03d425ea4a..301dc7d379 100644 --- a/results/combined/merges_tested/antlr/grammars-v4.csv +++ b/results/combined/merges_tested/antlr/grammars-v4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,True,5,41,157.0,3,True,5,Tests_passed,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,True,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,8d9cda6259bbb9199d7953d37747bccf7f81d986fb07464b5392f218c4341f40,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0 978,refs/heads/master,ffe55a577d771d3379a2e47d2e4705fb5c98a3ce,c75b9c4e96d28be16061648840f330c230218726,5212cd6321d56712c4eb42eccc72f751c9213171,,True,True,True,5,39,178.0,4,True,5,Tests_passed,7a4cf56e3206f31e7b8c60edf24bad740438f61882aca5f56ece4f3d1fa53684,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,True,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,97cd9b28209c4558b599f889a74878ea8ebd874dfc044f8256d39036ecf7c8e5,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,f8763e9fd384319c5eccaf7c5368d91034f0d8fb93666fdf377368e5d82ef0bc,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,99e90c50ee70d9f6b3bb7d5b107cd48815d7b253a26e9e7bac9632db188f9427,Merge_failed,d4fbbee2b57bc75329614632f95e763a87ce9d1b1b0370ffb4ad653b45fd15fa,Merge_failed,3005b6d84839d52069c72d2d3c7eb56e4539cf2f6193cfdd7b96706cb84aa84e,Merge_failed,3005b6d84839d52069c72d2d3c7eb56e4539cf2f6193cfdd7b96706cb84aa84e,Merge_failed,d4fbbee2b57bc75329614632f95e763a87ce9d1b1b0370ffb4ad653b45fd15fa,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,f8763e9fd384319c5eccaf7c5368d91034f0d8fb93666fdf377368e5d82ef0bc,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,43bf0d8f0bdde25a70afc66e1c1edbd7aa1ab3fc2001f2f4888597478d24cc4f,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,97cd9b28209c4558b599f889a74878ea8ebd874dfc044f8256d39036ecf7c8e5,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3 1192,refs/heads/master,8c9eade3f3b05c247448cce58dc99ae389608288,cda43d1e0e58baccdf62da56d01b86ab76e88d93,d9a325609fb89db920aa3db3be8b218fa12ab1ff,,True,,True,698,2710,,4,True,698,Tests_passed,4308e306352c4f7f3f7dafd42392d75ec5c2e45380ccb4e97e316bef7b9a63d6,True,Tests_passed,f77a8f00d02c586116e0f6ea8c47b696b281f2740ce5bf18b05ea248505a840c,True,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c diff --git a/results/combined/merges_tested/apache/accumulo.csv b/results/combined/merges_tested/apache/accumulo.csv index d62e7ec374..2cf9686348 100644 --- a/results/combined/merges_tested/apache/accumulo.csv +++ b/results/combined/merges_tested/apache/accumulo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/main,ce3a886c1cf90ff764edd872159cf3c036ff182a,1415599a5b744df3f79d05f9cd49b4fe0e458c1b,1fd1f797ca70f043992fd90485c9dcb33641e928,,True,True,True,1012,7273,128524,2,True,1011,Tests_passed,21fca3ca9ee1354b5475c6e1033702af05e963b80a3b2c0dbdf8be99c25b811c,True,Tests_passed,745d863e7f0c6c4f8b5f0a6d6e0fef73da8c920dea5eb4c7ed2eb2bc574ef41b,True,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,05a6056efedf5074fd4e9095f4ee64d1aa44b26cc1e4644ece644e70a9561a41,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,a818912655d31e82d47d6c6469f8b3d1c59f95a27384885039c7158a45aa6db1,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028 117,refs/heads/main,c4c8c572c8be14d882899f8f9370700227e87423,c14a97fe8ca91bd6bc5bba3a2f2ba1094f11fac6,e6cbdb4418d50e6c3c99e166a0390e483401fded,,True,True,True,1023,7525,132404,19,True,1022,Tests_passed,e612b5a4c948e7d9011313e6859ac198562522ddf524d01227fe00b833fbdc1d,True,Tests_passed,1970b16ef0ca7980dffcae6efd5d89cf24d8d40b6b2a9e19619833dffb3afc81,True,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,f0e27e7c19f6c382fdc5cce665d13022aa920735f504e8772308ad97d2c8d724,Merge_failed,a613acdc0fb0c625ddf6750eadad65ec0e76154f757b7dea5bd392a60f53c970,Merge_failed,381173d9adbad6e6e9bc5959fb1ae755e173671d492a3b5fd07919405f207b67,Merge_failed,381173d9adbad6e6e9bc5959fb1ae755e173671d492a3b5fd07919405f207b67,Merge_failed,a613acdc0fb0c625ddf6750eadad65ec0e76154f757b7dea5bd392a60f53c970,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,64f24c3d9c4252b8b8db39c1eb5a74fbd9cba6b5dcfb8ba07fb9ba8f45235dd3,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b 172,refs/heads/main,862cead28590ef0105febf115192775d1ec826aa,96026abe60ffde3747922defc33d095b9f9731d1,35f8e2b1868cea9849efae7fae21e8ac789a0817,,True,True,True,230,756,27140,8,True,230,Tests_passed,033cccbcc4d1b315b8f66fcd8a7ad54c1ab39671a8656b9a527f4789d6cd7b91,True,Tests_passed,3a248ffefcaaff24772e21a04bdc9b78c971d4e3f9282b90daaa72c670fcffa5,True,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,f2dd6bf31bd2d12725b3e5c2324dfee4875dd7a9bcfcb8e9d5a422d430a5365d,Merge_failed,9c98e86c2333801ece14dbe79120f86a88bc8929bc3a8ccdeda036eb0337e7a8,Merge_failed,649f307c246cc9faa536f57223e3f61aab471324b313d71479ba7416932a53e0,Merge_failed,13e06e070776d59db6f21946a087e41b7dfd7c81b9621dc2ea70fe80339b118b,Merge_failed,9c98e86c2333801ece14dbe79120f86a88bc8929bc3a8ccdeda036eb0337e7a8,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,af58a9a3053ebe464e25decde108257ba5c0fa1a497f18a908f75ec7184a2c83,Merge_failed,649f307c246cc9faa536f57223e3f61aab471324b313d71479ba7416932a53e0,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021 diff --git a/results/combined/merges_tested/apache/avro.csv b/results/combined/merges_tested/apache/avro.csv index d27b279813..c03d5fcd03 100644 --- a/results/combined/merges_tested/apache/avro.csv +++ b/results/combined/merges_tested/apache/avro.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 55,refs/heads/main,c299da64ee53de57ea34e589b858d7fe8ada72fd,fd6c4228fbecc6eff3e3ecd5ee27d2ceb46339ff,57bea12e3a0860958b2060cab4f1193391584839,,True,,Tests_passed,fc9f0dd415a77e7ddd310c2a82e63988afcff970e9d2fec8964c376cf791db8f,True,374.0,488,,8,True,Tests_passed,dcc74ea3e9de72e816ade67ddc36b2ade7155232fd2539e5edd0a13345273875,True,380,True,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,a04291eda8f9bded4adece06dfa4c0c3bea0dc06b13be3d3328c829f528bc14a,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,ccbb6f579b792e1ff663b4151a39339017951cd1513d147981a48ea9d6c354f1,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,b3b1cd4fc59004192f6c12d4d7e3211102deda778814fde087951cbda4680f70,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2 58,refs/remotes/origin/branch-1.8,8c30a2d55d841e3da32554b01850fb40aeff9c0f,ed6a4e1f2aad7cea85bd956165fb7f66277533ea,1ccb4c22c1723d8137c3fa21dc16252af593d76c,,True,True,Tests_passed,6f941c48fbbff1fff9426265cc83474dfb81f710167e9d83824619989d289802,True,137.0,207,18729.0,30,True,Tests_passed,cad9cb0246f1e8fdad4b727e6f2ffa1a77fd4b19481075b2ef1df59fb437df39,True,145,True,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,ea7e15fb22a6aab496da19f88bf8ad51e07b5e022475b8ec9de185566ad43619,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,de513a252c64150ea4ee9662136dd127e4f968d54b6213ceb55730cd885acdc3,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,6494b278043c744088e199c5d14f5cb0fc1d98ff452deac27e70fdd775998d75,Merge_failed,d974b6be06bfdcbba186f2104f61336a1f6af1117bedb2e21f86f46008f927c4,Merge_failed,6b8dc10d8f3a1a20efadd72048a87ad4804e7c8e6d8ceef1eabeba6f0e91d82e,Merge_failed,f4e7c7fb9a8b4de8dbe2fdffb2af2f5c581520de8800f3cf1a7037ad45b7c5d3,Merge_failed,d974b6be06bfdcbba186f2104f61336a1f6af1117bedb2e21f86f46008f927c4,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,de513a252c64150ea4ee9662136dd127e4f968d54b6213ceb55730cd885acdc3,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,8265d51687b36e4774afb11fc33e04690621f0708cb047a004af3c0764b3734e,Merge_failed,3805c324ac70231fce8bf605b0f20ba947d8f31cb5b43c70989b0a7f1e209501,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,ea7e15fb22a6aab496da19f88bf8ad51e07b5e022475b8ec9de185566ad43619,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1 81,refs/remotes/origin/pull/126,3e6422d16dad01e35cf79f9eae39c3e33ef42e45,962379da0269cbc87398ce2afe16b7a17dbdf217,77e7fa0274b85742937026b95a839590368d2879,,True,True,Tests_passed,d3402fce644700b1333e215bb486ac972ac6486e2ebaf22bfd07cf9bb30ec2f8,True,56.0,193,2460.0,2,True,Tests_passed,31eaa533f0b52e644da1c4e03a2ab0a16f3fda27e4bd37ba9925fdb1e2e56b6d,True,56,True,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_failed,cc21fa27edfacd09d03336ed4be6b905255bfbef5e25fb97d181ca5fdb298bd6,Tests_failed,6c32c18d4dcbe3445a8a5b23a2d1c5e9cfea1c807b73b1247c20f317eecf4540,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_failed,cc21fa27edfacd09d03336ed4be6b905255bfbef5e25fb97d181ca5fdb298bd6,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309 diff --git a/results/combined/merges_tested/apache/cayenne.csv b/results/combined/merges_tested/apache/cayenne.csv index 2eea57f3b9..478cc02d68 100644 --- a/results/combined/merges_tested/apache/cayenne.csv +++ b/results/combined/merges_tested/apache/cayenne.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,8a6fb9cadcb15edf35e9ef42f6b357aa89df0051,2a8c24a704570a2e89dceeb2607d40b72c4276c6,6ad180b4c52cd585377dc1cc2e97b59872af6c2b,,True,True,True,33,136,541,2,True,33,Tests_passed,fbcf5ae3ed7d960d7dd287e3619ae8b29ea5298e14359f0b1268caca370d7369,True,Tests_passed,e7d00c031e17cf6491a2502ea252d9394a93c178cf042dc61b4093d357d470ed,True,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,c101a26211960b1cfde48ab0b8bf0e7a7c6d49c30b04f6994d44855aac454113,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,c101a26211960b1cfde48ab0b8bf0e7a7c6d49c30b04f6994d44855aac454113,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a 22,refs/heads/master,40eed24a3ffad2197e216fef06227809c84c1e75,8725b265832a6c2d03ca5d866d5751cc1f35167f,ea1d6913bc80229783ec5842ec50b4b5252e322a,,True,True,True,8,22,55,2,True,8,Tests_passed,ca8ba6a6a4b949254d71541d85b75399eb829fe655fbd8dfe977867e3b9eda70,True,Tests_passed,1e31891107170cffd80248e6c4ad4ec32bb012e8c6594b7d971c04397c2a05e8,True,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af 32,refs/heads/master,e9f3501da40ea1f41187c823b3aa3643c77bc65a,473e943e904b39bc87cf8a3e921242378f4257a2,0d96b4a9686e3d587cb2785cd0b125ae8ae458df,,True,True,True,206,823,8610,12,True,217,Tests_passed,70be2019532bff0062fd0699d85ce698385e6720de47c7ee421c7f63059319d4,True,Tests_passed,e3f0f84a0ef77c1c71e6ee673f56344bcc61a13a4c69237ec9d3cdf114a62984,True,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,d212953ab9bbab4e84f21fa87a27708a06d9716fd2cce3d3a6b252462bf49aaa,Merge_failed,446211d85a8088b9196a963fce4864c863a4533c514d7754037cd6d6cfd07012,Merge_failed,dc33d649328b131a931afca56b0bb62815fe272e32f250ec9fe260837138bff6,Merge_failed,b77ffcac196c8d1288684df50a9325ccbdfcf93f62a8e8a94d96a66391628efc,Merge_failed,446211d85a8088b9196a963fce4864c863a4533c514d7754037cd6d6cfd07012,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b0ccab5d9470ee0c93c63f39f7d611c30ad39bd25bd1fe6056cbbee99c666738,Merge_failed,dc33d649328b131a931afca56b0bb62815fe272e32f250ec9fe260837138bff6,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044 diff --git a/results/combined/merges_tested/apache/commons-bcel.csv b/results/combined/merges_tested/apache/commons-bcel.csv index 00d1ae82ca..a3bc458e79 100644 --- a/results/combined/merges_tested/apache/commons-bcel.csv +++ b/results/combined/merges_tested/apache/commons-bcel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/remotes/origin/pull/10,6c2a6f01fdcd4400bb5decb910915eb78137a07b,496c6ecef0d097383d8e2558a65f62bf38a5bdb2,7ceb5a6b8236517d708d7965f4873344c5630969,,True,True,Tests_passed,b78a25d2c745aaafda153d80811d74438fbbba691bedcdf53212a933284d2c82,True,9,16,373.0,4,True,Tests_passed,9725f060feff49a74ec6523f4688ff452f54d97db523d52697966ef9b167bfb4,True,10,True,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,77bc1a49ebde443019cf89f9f65f0036aee5158aa56cb3d6c2fe3ec0c19a0701,Merge_failed,519a17cdfe67af1466c977dec4bd904e5568d0a911069fa35baae2438a8d1626,Merge_failed,94dc67af67c7a178c9703f796579bef79759fa3201dc220ceb5ecfcbd889770d,Merge_failed,33230dfef6a516c71caa2db049af32c3d47f12da59c818eb3fab0c0ebcb050e1,Merge_failed,519a17cdfe67af1466c977dec4bd904e5568d0a911069fa35baae2438a8d1626,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,318843dda885e948e29c986fcd071603ae0305390d2726774fcf2374c5ee36ef,Merge_failed,94dc67af67c7a178c9703f796579bef79759fa3201dc220ceb5ecfcbd889770d,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f 41,refs/remotes/origin/pull/117,6f207e4850caca46170bbe4074a0773bf7e7f1f1,82d02ab196ea0a135470de590e317ce22d00e186,d865f2df015fc6e04487cce77f18edb602d0592a,,True,True,Tests_passed,7e9904a6026259cd172deb1bd1d15e25889cbae53148b8e90d16806795d3d0bd,True,54,172,3963.0,3,True,Tests_passed,f1e0804621d53dda2b0568f6c387fb6920bb8e44361efa81cc79a8ce139947aa,True,54,True,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,62458c21f714473f88fa617e522f1e0ced4185c87d214a90bb68546835297174,Tests_failed,247da9234279ec5fbb8d87b653654a2a61ce2640d0073f2baa3f41dc9f1314ae,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,62458c21f714473f88fa617e522f1e0ced4185c87d214a90bb68546835297174,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee 42,refs/remotes/origin/pull/12,6917052a54643f63b5abebf79dae59eab5aebc4c,6fca90afed94a8b8fc32821bbc28c655bc48aae3,165518ac82555661207efca4e23b9f349c0d2fd4,,True,False,Tests_passed,3ea964ab984f3609a812e4f4f87d8bf9e25cf5f3827437b5519c5f6f21d4b921,True,6,23,55.0,4,True,Tests_passed,709257a2a73d2626f146ad7f82a5f4bf3d0ed1f0c238dd381e25ea85259b8513,True,8,True,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,4d003557af1cf37c3923f0c792f2ae0d002c00a952d4ac4d06d4a7c2fea805b8,Merge_failed,2942b6219838587174d79871783466470d742aa9890f9f8a82c6d0ffcb95eddb,Merge_failed,38a0d562fcedd48fb3068295c90f54cc685c86a10152a40472a53f22bfad4d49,Merge_failed,a39824c3d0f945f36b4b10169b5e9b9bd29277d405fdd661c46bc771f528ab9c,Merge_failed,2942b6219838587174d79871783466470d742aa9890f9f8a82c6d0ffcb95eddb,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,efee1ded415cc0a972729d1e48fa4c85223202345d7b1876664cb53f031f9541,Merge_failed,38a0d562fcedd48fb3068295c90f54cc685c86a10152a40472a53f22bfad4d49,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7 diff --git a/results/combined/merges_tested/apache/commons-beanutils.csv b/results/combined/merges_tested/apache/commons-beanutils.csv index 63a6756e2a..cbafa29ebd 100644 --- a/results/combined/merges_tested/apache/commons-beanutils.csv +++ b/results/combined/merges_tested/apache/commons-beanutils.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/remotes/origin/pull/16,3147331ee84e114c0168b3f0d17164916c3ffa6e,0f37b9f1012ada894d2d4938062694c363c33368,6c0432a423b5dfcaca04f25ccb50a86f66350fc4,,True,True,Tests_passed,269e8447898ff19dc12c4d6686f6447467be0f5e6c4a522f01f19f88a6f4bee4,True,25,75,1863.0,3,True,Tests_passed,7aa3c6408dceaadd7f9b9b5a1ee58d3eaf6fb8a741018f826bb358ec0d9a5933,True,27,True,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d0f4f5aec1398a93a172ef95322d0700e0cec8ca674378abe629f3c6fe8a100f,Merge_failed,2a10ca4b058568e5e3a8e19cbdb7f145591ab082e918e8cbaf8cdc0800c086bd,Merge_failed,3374d3d168ce0b1379252c2ed481f2a08e0ffc6ef751033b7f5ac0072a948421,Merge_failed,47f9842d6a7a0e2e2256ab84e603aa4702166780b14dd08210290edeb3ca46f5,Merge_failed,2a10ca4b058568e5e3a8e19cbdb7f145591ab082e918e8cbaf8cdc0800c086bd,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,b7c6b802a8abf583855b6f50cb31c636db2254d83ea3bf6be525974de640dbd0,Merge_failed,a7bae5ba8d88e19b9f1641c5c8229e666d4abd643b4b7e33c74ba43600d6dde8,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345 17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,Tests_passed,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,True,201,1574,4281.0,2,True,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,True,201,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,09f92cfe7692f140bb3e839e2d664e5e955f77516bc42f9600e3b8cf9f9cd45b,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b diff --git a/results/combined/merges_tested/apache/commons-codec.csv b/results/combined/merges_tested/apache/commons-codec.csv index 478fe1f80b..98181b6a21 100644 --- a/results/combined/merges_tested/apache/commons-codec.csv +++ b/results/combined/merges_tested/apache/commons-codec.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,b542cf9d098e65a78b71e5671bf700610b03dc07,b46a254edaa0952421a3b22ae27bde3211ca39c9,1a30728418f1d015453c0ad6521de56f4728e7bd,,True,,True,35,180,,4,True,35,Tests_passed,1fc238ae5b4ddaaf345ab8e1fe37c229c4150e6e001358ae0e7cd85d5b2c0934,True,Tests_passed,24fd4ec92a4026ba3c6837ab0e7b6681a39943f7f9d34032237f6ac137c08d89,True,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40 26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,False,True,3,4,8.0,2,True,3,Tests_passed,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,True,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc 27,refs/heads/master,dd5e46203e5b12f4b65e76ef2e5c34197692b5b4,a94813fb0ce4597d2465a273821306a055f35492,ac7e904531c4509ecb9158e4b31cce95ed938119,,True,True,True,17,31,92.0,2,True,17,Tests_passed,a0f5fe1308f78103e86c985fcb187cf742281f11049c853c1f384b5a6eb5943c,True,Tests_passed,8b3beb79a94d0a621a5b8a1d4c78dc6453fbcd1ffa3a9b8a8d81b86f9150666b,True,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,5e0c3ae4cbc89d8e85d4dc0889f75bbd924cc78547b3d191e1e24546b13a39a2,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,5e0c3ae4cbc89d8e85d4dc0889f75bbd924cc78547b3d191e1e24546b13a39a2,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c diff --git a/results/combined/merges_tested/apache/commons-collections.csv b/results/combined/merges_tested/apache/commons-collections.csv index c928c62cf6..8f6ba6ea6b 100644 --- a/results/combined/merges_tested/apache/commons-collections.csv +++ b/results/combined/merges_tested/apache/commons-collections.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,Tests_passed,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,True,37,108,791,2,True,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,True,37,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a 102,refs/remotes/origin/pull/117,900af49dc3f82c796cb19eb5b0192e39b0f41518,0b8a4c7b71b682ac8417822ac693cbc8b6c261b3,2cbac58f7e3b51a4f2f3a6672bb4380e18469c50,,True,True,Tests_passed,30fae6a152628fd076b7ce4ce7770e78b3e9148d8fd4c524b08d6766fc0b0b5b,True,433,2431,21115,3,True,Tests_passed,d5e0dd301398533f95a463b871a65835c2700c7f00fefd1cef23c68bc2585fdd,True,433,True,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,372e4ba43a67e1e7af848e57f0124b51873f67820e5f8bfe2d279450eda41906,Merge_failed,d86bb8d3bf1ac4fbf674622bc1926579acf39250152c7c5bc385e1cf80e6754d,Merge_failed,cdbd1f8404ea00394944340fbb39137ffddcbcbd74527114e3722029784213d6,Tests_failed,820a1ddd1559ad392d7449ef89d5590e410d2b85d3bd418903f948b74f7ceb1a,Merge_failed,d86bb8d3bf1ac4fbf674622bc1926579acf39250152c7c5bc385e1cf80e6754d,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,7fb6185d883c5700ad4ab031f6f029c1db7b65a1ba0c72c310a7ac9612a60440,Merge_failed,cdbd1f8404ea00394944340fbb39137ffddcbcbd74527114e3722029784213d6,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051 104,refs/remotes/origin/pull/118,fbb5ee798adc480bd3325a27d5b945ecc6fbd50c,f53428c57a19d1316b684d5390c17efbbbd3121d,04c59168baf640912aa039e9b17661ff5a0e770f,,True,True,Tests_passed,5ad6862468d3d826ed6d78faf3858f28feafc8043bf4b48a8c3b121183384eb3,True,268,1440,4106,2,True,Tests_passed,c43b947a4cbe10c6d72bf53a199c9e13b1e8b69402905546505480407139e52e,True,268,True,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,d9e572e88cb47e87e08192203b144a03ffe98f85806ebcf05736d44cf0544f6d,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,d9e572e88cb47e87e08192203b144a03ffe98f85806ebcf05736d44cf0544f6d,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0 diff --git a/results/combined/merges_tested/apache/commons-csv.csv b/results/combined/merges_tested/apache/commons-csv.csv index d7118e339c..0c78315284 100644 --- a/results/combined/merges_tested/apache/commons-csv.csv +++ b/results/combined/merges_tested/apache/commons-csv.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,082827ceef359ab4554721477bed8fe77fb655ff,6fb2b6e085fe800e7eb96391675c678041fc7a00,f1294a7a65b2a6472dfcac86de0e61483ef8735d,,True,False,True,6,12,84,2,True,6,Tests_passed,f27b058c384139a4695b9378ad1767dfdc77615e4aeb2a02d9a3066d51f2df5b,True,Tests_passed,cebb4fa489a75c1c2fcb6fd97ccfdf73a27937a6535ebf6f89e99a286f868a8e,True,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,b733560744e9a85005727d5eff8635579622500198ed876f51eabf5beda44632,Tests_failed,71975a301f95ae49d8dae41277fe56d44c1e42094076f3a121dcdc9e36eb2e5d,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,b733560744e9a85005727d5eff8635579622500198ed876f51eabf5beda44632,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b 72,refs/heads/master,4a865fd7f8fadc1b12d77ecabacbdc8cf2aab5bf,50f4525614f5fb492a826be303f7bb8c23f3161b,86186dd9656fdc6f29d2d8f7aa061ab9e4a72d24,,True,True,True,8,13,34,2,True,8,Tests_passed,08ec72a94c38546c80093042c07fbea06487b6ae63994d9200dbe24c9bdd6520,True,Tests_passed,da8ce6891b3ff75581b1d4289530c3854f9a1b9173b12d1c98c473c4b64abffe,True,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_failed,c67da5c5e851775e227c5466e6eb1e3ce8b60880ecfe58267526154c6b8b5767,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_failed,c67da5c5e851775e227c5466e6eb1e3ce8b60880ecfe58267526154c6b8b5767,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6 76,refs/heads/master,23c39b158e13ee835ae77ed3e39de0d54a0600cd,550309e3278bdcea0ee6467b95f1f1487746f1d8,1da75703a46305dbdf45b29e6d886533769c2a3c,,True,True,True,14,36,227,3,True,14,Tests_passed,f5e1b450003b0c2330dd4ec94e756c3b87b19898c00013f9a3c4c0832676afe4,True,Tests_passed,c397326515e451b0bec86847c0722aad4e6c05ce704f840bf698b677cff6372c,True,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_failed,3f86256f4e57ddd07f24197184b4547a958aaf471567c65f1899a8b2380d34fd,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_failed,3f86256f4e57ddd07f24197184b4547a958aaf471567c65f1899a8b2380d34fd,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755 diff --git a/results/combined/merges_tested/apache/commons-dbcp.csv b/results/combined/merges_tested/apache/commons-dbcp.csv index 204efae34d..b93de8c8de 100644 --- a/results/combined/merges_tested/apache/commons-dbcp.csv +++ b/results/combined/merges_tested/apache/commons-dbcp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,True,30,137,1520,3,True,31,Tests_passed,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Merge_timedout,,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9 diff --git a/results/combined/merges_tested/apache/commons-email.csv b/results/combined/merges_tested/apache/commons-email.csv index f2a32de53b..ccc57c4587 100644 --- a/results/combined/merges_tested/apache/commons-email.csv +++ b/results/combined/merges_tested/apache/commons-email.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 103,refs/remotes/origin/pull/101,e04e3a519953a6d40174ef9d80118c8cc9366288,523ad9a2e391f71e5d37665b31ed5228fc90a3bd,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,,True,True,True,3,8,23,2,True,3,Tests_passed,95f2164dcf5c059464f566caaad9b423d3021a80a30f1c8b68c7226146839198,True,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,True,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,727a2bd01d7454bf8bdf6fe0dfa34b3a71d8c5c08994ef08dd10253b97832d6f,Merge_failed,f503111a409f33730b9da5b0e9465e80d8cce7a4539db741b590942d50b1c845,Tests_failed,375ef583c5fa3e9f92226b63bd5331977263dfde076b3646df79dc11db663b77,Tests_failed,e53017a8d36847ef26bf456390e97c8dfb1b04d180f79f5626757122075222a3,Merge_failed,f503111a409f33730b9da5b0e9465e80d8cce7a4539db741b590942d50b1c845,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,9f2b30a11b1c4abd538bfd4eca71d34587d6020824f010b2406f9b2d8894c168,Tests_failed,375ef583c5fa3e9f92226b63bd5331977263dfde076b3646df79dc11db663b77,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751 104,refs/remotes/origin/pull/101,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,234aef759f76f4a4de53d2d311cd37806de9f361,2410f4bf5ffacb559984f7584e12cad802b7805c,,True,False,True,2,7,15,2,True,2,Tests_passed,e61be0a8f3eb18ea0261adba74391c43135a450c6b81d61969017e30bad7e18d,True,Tests_passed,41b28dfe3eba4c482094d558d2c80fb0c7925bd33c6793c95934e06add2c4f3e,True,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac diff --git a/results/combined/merges_tested/apache/commons-fileupload.csv b/results/combined/merges_tested/apache/commons-fileupload.csv index 17b3fa0f35..cf2649ce3b 100644 --- a/results/combined/merges_tested/apache/commons-fileupload.csv +++ b/results/combined/merges_tested/apache/commons-fileupload.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,e7ecf9e2b400f9d2dc7ea333578f171072eeec07,516552828b7ee2a9ac2e5d58c987cccedd0aa857,7f02be4a08481fe319126b797353f641e9a42214,,True,True,True,11,33,73.0,2,True,11,Tests_passed,b047e5164de51fee8eea7ca06b06038cae246e952a740d03e779068479a4f1bc,True,Tests_passed,ec3d0a0c37f27a999ee4d3be2725c2576cfff000f7c083d40a2aed5dc188a1c7,True,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,3425c6e64eba29294113c24aa9a663f54ab00d9de7208f2cc7ebb93905e94009,Tests_failed,4b429d95e1e59272b10c47893277e9b687ee7228997461be6dc3f1dba6d4aa6f,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,3425c6e64eba29294113c24aa9a663f54ab00d9de7208f2cc7ebb93905e94009,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735 33,refs/heads/master,5d3e1d8f4eafd654dec3e0ece71940597239a5e9,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,1b10014dddf12527f8dbad24169e4f6a9434e8c5,,True,,True,15,51,,2,True,15,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,True,Tests_passed,5736c3cc1b8062325082bf12feedafa77b5e37d3b23174926a613d2b9a543ac3,True,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_failed,d1e8f065a5a9d9e80afc1aacc906cdafa859ed39438f8154b7a898980ef63151,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff 34,refs/heads/master,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,66427249f9039ed8f65343f94946a3eb6f395cbf,06357585199fe659d9cc4914d04279bb6d5d18ec,,True,True,True,13,34,93.0,5,True,13,Tests_passed,8c5124dbe2f95a1be127496ebdfbfa3a724044ee0fa143aa74f140ddb0f3fdb0,True,Tests_passed,0cd432ff32beaed72781c52197585e39167091a0f4213853e8988b9d9e0f48af,True,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,de39f92863a492897462b14fe520cb1a7aed414961c2c3fde522a527a79d01a3,Merge_timedout,,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,de39f92863a492897462b14fe520cb1a7aed414961c2c3fde522a527a79d01a3,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661 diff --git a/results/combined/merges_tested/apache/commons-imaging.csv b/results/combined/merges_tested/apache/commons-imaging.csv index cddf4239dc..9f656a1c56 100644 --- a/results/combined/merges_tested/apache/commons-imaging.csv +++ b/results/combined/merges_tested/apache/commons-imaging.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,888d6faf62dbb06004f2eae2cb889565ab044def,df36623d1826a43031e01af20783c9df4674c3d8,c0c98466358cedbd78ba91b238bb2cc1a4718f53,,True,True,True,480.0,1205,6176.0,3,True,480,Tests_passed,0d05ffbf27bc75c717c2fe0cf23ca003c37065bf54ab2f76d8e76e1b7b83e450,True,Tests_passed,a2a6ed14001f03ef10a083edace01b168e5876c281b69c0b082a2f518b86baac,True,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c 27,refs/heads/master,fa1e1be0ecebffef63a7e26a31eb57a75edcab54,0277fc30fd9ad5fb994de15b9251430cd224ac2b,e89555925bd806a130e3d9de3a7ba44c3013446b,,True,True,True,24.0,36,478.0,2,True,24,Tests_passed,a6f73bfbdd661ec0a2a9b7226cf9876fb265eaa644c29912c1c60c86d6eca0d7,True,Tests_passed,bc0885146af2ba15281048607f48986e0e2eb8e45bb54187e75c869cd5179bb5,True,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,83162d99fd70cd5bbf2bcb747b2bc73ba195986fe8ca3fe93e2c7033ed04bdb1,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,83162d99fd70cd5bbf2bcb747b2bc73ba195986fe8ca3fe93e2c7033ed04bdb1,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313 28,refs/heads/master,57151c5f2bb8ce52d1d3342c5062d88db096036b,6f80849e4a641bd40af8e8160ad37a5d57cc1b92,adba5dcad7aa258328207162a395abca3b6bc933,,True,True,True,217.0,760,1681.0,2,True,217,Tests_passed,bef63e741990283c32607e5c93c86007ad983610555ca97980d54e0de562e70a,True,Tests_passed,7b82738dc8ea17d4d5abbdee60a59b20bd448c396ee91c2b804059f564d24e1c,True,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,5cd97091be76b04f3ef9c9218342730f8d567d7e1966f544b9e89b0054b192fd,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,5cd97091be76b04f3ef9c9218342730f8d567d7e1966f544b9e89b0054b192fd,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce diff --git a/results/combined/merges_tested/apache/commons-io.csv b/results/combined/merges_tested/apache/commons-io.csv index 6eee05e5ef..b5119256df 100644 --- a/results/combined/merges_tested/apache/commons-io.csv +++ b/results/combined/merges_tested/apache/commons-io.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,b507d7e60b3593288990dd9f570ab87bfcc65e17,e3aeb380b429dfa54b757c4ac6077c173e885d93,f3b44601abf9b79ba90780b963b4b8f8548bd9b1,,True,False,True,11,13,56.0,2,True,11,Tests_passed,973975dddd9855dabb30ee6db9765402926a0169736233fc591e631e8c121b9f,True,Tests_passed,f7fab8f7c130d64280351b4530f9fc77b7e796e7aca6abd359c3a38e4c4c9fe5,True,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_failed,a8a3afeead41aaae26ae0d4bb88863a0e0072875e192c641ead4590b28c1c3ab,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca 52,refs/heads/master,257d6f423ec5e3e15e136b72fd686c49208b1aa1,cc3e5fb58d371c8ab3eef800be5e2a40e3fb9179,b3447316b5c586312f26e3df431f926e82d7a283,,True,True,True,2,6,15.0,2,True,2,Tests_passed,1709cef5042f67e79725fee5cba19f76a981049fb6c61795b3fc70272d34eaf2,True,Tests_passed,5257aed0c0a4cd90f9e6e14f4c2e96deabd6814bc367fa3691fa6e0cbc919207,True,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363 67,refs/heads/master,5e2ace28efe0476feb6a32794fe6b5e90e71eb7e,65657b874c03a1b6fee23653b01a9baad6a518e8,aafa3dca40e1d0a377ce9112538091581176dd50,,True,False,True,2,6,16.0,2,True,2,Tests_passed,fa34e0f2156f38c8709bd8dcfbbc930ee92a7c6e42831b5592f1adeaa1cde244,True,Tests_passed,c4fda76cdf284534e1a6b3fe7fa0b5f12cc3ef110563290104e454a9bdd819cb,True,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_failed,c987adc44163f45e0b90d29606774fddbbe27acb9e4d7b4fb30155dbd312f915,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef diff --git a/results/combined/merges_tested/apache/commons-jexl.csv b/results/combined/merges_tested/apache/commons-jexl.csv index db679e20b4..48eef7e18f 100644 --- a/results/combined/merges_tested/apache/commons-jexl.csv +++ b/results/combined/merges_tested/apache/commons-jexl.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 38,refs/heads/master,5592c6cacb2d5ea28b70b77abefeae0e9eae5841,46854b60a75fba8ec96066fae6051e38c6fe1245,33787af3153c80787c14dca6b7d3673a07516ab4,,True,True,True,36,114,272,6,True,39,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,True,Tests_passed,9283ad59baa4eaa342b95d638dfbbf55743c06a628b5e593d572d3b848ff310e,True,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,82303f83be651913bd6eba1e81bb05fcd715b04d6adaddc98369dbd205c31db4,Tests_failed,385fb86f4b8a6cd613fb78cdb34276aa505a74bf3bf48f70a3972c68542e4d3e,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,82303f83be651913bd6eba1e81bb05fcd715b04d6adaddc98369dbd205c31db4,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0 86,refs/heads/master,241f9615d5c3343266186df5d7f79787677e41fa,2b027b4676fbd08c98f37b7014d3a158ef2bade1,8760868c92a542d939569a5f3b627775df22b73d,,True,True,True,4,11,45,21,True,23,Tests_passed,dbdbd264b93329b9ed48f0eb7219ca4c12b92e441feca11261113d38b879a818,True,Tests_passed,822336c83ea3329e85e21f9883282ee1efc79468a07d6e87cc19b33799233b8a,True,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_failed,2f3d886889983be49e1d974d0982c0ce614d059402b5633379fb42538db63400,Tests_failed,7cec897d7df011be26062cc829fed19e5758709c71d55ba8c324bfe201eb10e4,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_failed,2f3d886889983be49e1d974d0982c0ce614d059402b5633379fb42538db63400,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75 90,refs/heads/master,ed73a52cbbd255564ed183a6dbbbc00e0691aa6c,2fd5464c48885edd1dc79736c6b6ebbb869b2d9c,79e655d94da0d8650e89db37d5bd59e72ceb4b03,,True,True,True,22,93,595,3,True,22,Tests_passed,22a6515db4273c70aac1aede8faef7a06ed616d4427875d799b5fd5ead07b257,True,Tests_passed,150054ac8aa3400d5244d471c195de8f72044d788830ff9e15412a55eb54a59a,True,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,80eeebfbe54986cb6193285e4fe540267ef14e3c5220c14b0ac9e32ef7668aec,Tests_passed,9d57c4102f2f61c85bf3b7122d8f613868727dff169f058b0591762b9b0aa8c2,Merge_failed,21cd03383bc618887f5dfa34a3e2d7107b7cb8a4b84e68b4ffc9694040578b98,Merge_failed,e5e729a0491a93ce8d7a4fb4bb27e6ded98862fcf4afe7ee453c362f617c7544,Tests_passed,9d57c4102f2f61c85bf3b7122d8f613868727dff169f058b0591762b9b0aa8c2,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,827f3e291a5156b50c4ee316c6c33e3a7eb938b7ceb89854186ba1b3d2a40bb7,Merge_failed,6022067f352199a859ffaf6e87d92222e51ee962009010f1ae86c48c61484b42,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3 diff --git a/results/combined/merges_tested/apache/commons-lang.csv b/results/combined/merges_tested/apache/commons-lang.csv index 4ff954c26c..d78050e111 100644 --- a/results/combined/merges_tested/apache/commons-lang.csv +++ b/results/combined/merges_tested/apache/commons-lang.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,bd7956949eff64db275b209429221c816eca9571,bdde0e1c13ed5dddcb358ef8b3d0c0dce11d8b92,07403c9a943d8c4988c85bf6cccfa5926e4dffe1,,True,False,Tests_passed,c61b61fec0c52f237dc3e35ea103a954924a52f99fdccd9af40526c9389e1e8c,True,9.0,22,40.0,2,True,Tests_passed,ac6a12ec1ad2aa298ce8e581be4d26a0de44d89f6585806e204ae4803be628ab,True,9,True,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_failed,a68206ab21707e75d75e8e293b49be4f8267ecf2a013f25e0836f699dc23cef9,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51 64,refs/heads/master,c7c2dd783a2b7c97267a4c185ec1cddde10d513d,dd5d284e86cc83b1ef8088fa8cba383d95957850,b69c4759ed286546ba5437d9fcb6d24a1e2d3f8d,,True,True,Tests_passed,b1fe9c9ab69884bfdd41ec9aeb37056415c82f20293eecb297f0154e3692d7b7,True,119.0,735,5163.0,2,True,Tests_passed,cc816827abd1117e18dcce3be2e20a91adffc03da55fa957da6af05f173eef75,True,119,True,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71 78,refs/heads/master,ee87df847299c55c97347e6c11e00a283feb189d,83dd32b901dea25a571adcd6a976464c8a36601c,b19b2d37dafb1f26360ee5e8ac6fa297e9ae86ab,,True,True,Tests_passed,70654ca8be50dedee73af2b6ff8937c1afd7413631d7360fc0cdca0529ed4df5,True,54.0,264,703.0,3,True,Tests_passed,2ead4162bf4960650e5ed8eecac194addcdf3e858d26c4bc8611bdf093f32352,True,54,True,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,3fdf216d900f2843d280821bda0cb80a9083dfd67f3279d74a5f02e137041914,Merge_failed,e1c813f78e2776da75607b6b8a4d17262dbcdbc9bd54fbf12c34316a2426fbdc,Merge_failed,7ef21b1531406764b8217b5304664281fc4e959729863871314561a730d5daaf,Merge_failed,7ef21b1531406764b8217b5304664281fc4e959729863871314561a730d5daaf,Merge_failed,e1c813f78e2776da75607b6b8a4d17262dbcdbc9bd54fbf12c34316a2426fbdc,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,f5c510654ee68b427170dd64e28255989c10eff32ee91e492f0c5974438a8464,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55 diff --git a/results/combined/merges_tested/apache/commons-math.csv b/results/combined/merges_tested/apache/commons-math.csv index a45a2202f0..5f4acb0d8c 100644 --- a/results/combined/merges_tested/apache/commons-math.csv +++ b/results/combined/merges_tested/apache/commons-math.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 48,refs/heads/master,c4c288a3e0e610ed02801b17ed26016b0e734032,a8c6d43b5a61d8da784f0ac188d40b88a15dad50,a3677db89ef3863e8ac7cf578df499f85d970b76,,True,True,True,300,1163,123270,2,True,300,Tests_passed,3d100917289ba2dc011dec4a4ff16170fd7c3e5679094ee328b85c9f21d18b47,True,Tests_passed,6b3fef96cee086a368ec7970f8305409ccb4cdf55ddefccb5cf958248542cbb9,True,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_failed,103b6ef99cae90de7f5cd6e5a9b95a6337e21bf2364dbf0c3efdfca6033012d0,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432 69,refs/heads/master,9575054ff07b8dbb912e889111f6b3a3be582680,5f9dda6b900ced96f21c4c0cee9bf14ea58451b2,3ac3ff62b862ee89effcf1a4889b04f32fd8dbb2,,True,True,True,10,15,1023,4,True,10,Tests_passed,42e2e92eb514029404d296b00ffb753880d637fbc8c1a622a7b3a9e6d251d05b,True,Tests_passed,5b1dcff5961966e96cf895e6e3c968c2b97a4dcc0cd7dfb35063edbb7e7ff20c,True,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,1215347c809d3b008768b38d5b6385af3f8d57d2e8928fd340d7be8567be0f2f,Merge_failed,034828b6460ffc7345db5f8b74c3386d26e4bb4b10f4531057ba374b8ec0da7f,Merge_failed,330ed042c9b1da653313197022ff994618f373a392b8cc9ddd620d5b5d40429e,Merge_failed,4ae53c6b264d46c308f9f35cd1103f5822c4bce563a60d225128a1b43d3614d7,Merge_failed,034828b6460ffc7345db5f8b74c3386d26e4bb4b10f4531057ba374b8ec0da7f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,a16110a15c7ce23ab49d131514048d53cd8dbaf920f57a21612a882d3fae32cc,Merge_failed,2154ef91fd1efe1082e148a6ce65587af917dc0be90c6a5f9c82c070f174aa05,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a 118,refs/remotes/origin/h10-builds,a6804eaa74dd04734bac4081d16fc058030dce13,809ce8a30485e65a792674692a8dd66b60c48d98,175d7a1242f98ec9c2da23608bc0fd503a837ad1,,True,True,True,35,188,801,5,True,35,Tests_passed,3bd30ff2e49530c3187ef7afb9d8ba6a4cf5a7dd29b4e099eb719a1f1cc71e48,True,Tests_passed,1d703ebe29992ba38201e018610faaaebae889d3fbaf1da70811acb308428a1d,True,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,8573318dfe5a9eeab4a609c31935c18a477bb20638187d833fc8ee64bc659f4f,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,4ae42fdd8785a81e259e80abc209b6c5a221ceb0aed92cfdcd5ec552d1fae23c,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,c7c52680521055855e2d7da569bc770e485f759448a9863404d65ef128220c5a,Merge_failed,1b258f3b99e4c488b68d5933dfdf70afd92c3eb65e7df12e58169334f24bb1c4,Merge_failed,6cdcb06326f6e5c79d2de1a6de9f08d96e867dd0d7fe30126b8f9d1e8856f4f0,Tests_failed,ab0797bb0f9d26546ab6cd5d029e86de0e89e538a0e6164c7c5ecfaddbbeb62d,Merge_failed,1b258f3b99e4c488b68d5933dfdf70afd92c3eb65e7df12e58169334f24bb1c4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,4ae42fdd8785a81e259e80abc209b6c5a221ceb0aed92cfdcd5ec552d1fae23c,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,df8a5d0767cab0df7140a8dc76fc533087d8c136acb6421d60ef5e4a0d9ac502,Merge_failed,6cdcb06326f6e5c79d2de1a6de9f08d96e867dd0d7fe30126b8f9d1e8856f4f0,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,8573318dfe5a9eeab4a609c31935c18a477bb20638187d833fc8ee64bc659f4f,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4 diff --git a/results/combined/merges_tested/apache/commons-net.csv b/results/combined/merges_tested/apache/commons-net.csv index 9ae1068df0..50ffcc5636 100644 --- a/results/combined/merges_tested/apache/commons-net.csv +++ b/results/combined/merges_tested/apache/commons-net.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,e3013d784b0b6c93a7624a36870f2dd73e6ecc41,2d0e6ece9df028b11b4592fce2d1c761f570533b,cd0aa01783cc7c0459f24ac9139b952f144c110b,,True,True,True,76,372,1159.0,3,True,76,Tests_passed,0e60b717d0b4708350b767069f2a58a7b80e7a91839ea474d86f50b786df605b,True,Tests_passed,6974d633c93ae3afcd6d7e82f6250dc718697b6613bdb8921807495ea703ca7f,True,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,a2999352b1213272dd1edcefbd298fadc2fcaa759cf4cf6b6d12cf590c6bb49e,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,784c54f9f2db2df21a5a2de5d19cad4f3fe2e80815dce82ba80f54e27caf692b,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,6fa3fc8d09cb57b5ed95207e1c5ec919e4d1434e0946036d2f4d2feeb176bc89,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527 74,refs/heads/master,dcb63c3de215cccd34b808f7a4f8fa55be592226,d0c61b76437c48b4dbde6a508616b47b36040126,f7f3f3e73fe64efe630937e70c9151d1773ad5a0,,True,True,True,98,384,2029.0,5,True,98,Tests_passed,38e1396c51e0b728a511cc546b69e261150beac0193ee2d23d3d6dc1132a6bff,True,Tests_passed,da10745ac43520f8a11130fb9fa2a98bc0cc4722e372cbc6fe70e20e2174d330,True,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,2af2e5c6634e0584b323d448dd4639148d1ffcc377dc57ee60cc901dc9c02de8,Merge_failed,2b94a423949986bb9a3c8a02089e25aca61a4b4e215b5a726586df64a5d3254d,Tests_failed,44a0569df0978a9bbcae2d6fa612e4c0e91d5bb06039c38e9c8ea59ac09c3e58,Tests_failed,b21deaf25fa9985f894d3ad38768eaeab848d909baa232311157535cd51c0d89,Merge_failed,2b94a423949986bb9a3c8a02089e25aca61a4b4e215b5a726586df64a5d3254d,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,8a8ed4fd2690eca1dde4619f0375a7d3db8fc9d8934ee2e7a23f19f08f2cd34e,Tests_failed,44a0569df0978a9bbcae2d6fa612e4c0e91d5bb06039c38e9c8ea59ac09c3e58,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3 90,refs/heads/master,2d8ec8dcc97b4ea26220b25771cdaaf4bfa68ad4,69d88f0b284525b259f2870aa08b70a53dfdaac5,400c7bba108bad66198330e508a65a5de91b09fd,,True,True,True,59,159,791.0,4,True,59,Tests_passed,aabb3202c63020e0698d98f062e5a887490a8c1850ea91fee6d3142792a90fcd,True,Tests_passed,e70a942e04efc6a41a6967c6bd77f9937cb3c346720adb084a2850ea8592575c,True,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,1791df66c158fa2845b6eaf61afd8274e3eb67dc8f17b19852d3de88e2b0dbab,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,1791df66c158fa2845b6eaf61afd8274e3eb67dc8f17b19852d3de88e2b0dbab,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4 diff --git a/results/combined/merges_tested/apache/commons-ognl.csv b/results/combined/merges_tested/apache/commons-ognl.csv index a869c83192..a8f303f8c8 100644 --- a/results/combined/merges_tested/apache/commons-ognl.csv +++ b/results/combined/merges_tested/apache/commons-ognl.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,f2a63d67f5a95954bd780afe63818e4aba601a08,9fd017729bea36b5306eae9fd6709195011d4ab4,c901ba54b752e471f67e66fc5c2867473d4932eb,,True,True,True,29,110,272,2,True,29,Tests_passed,c6f21647664c097488119a547492412182d87cde27a99d830a63a44ddf822996,True,Tests_passed,0cc8d9bae6d7969e2354d3a43716e61286f31971e01ba5f887a65bb5d360c5b6,True,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_failed,711a2eb8987bbd6b1f4b0131d39ab073536ae4f08b0f5878e789e4ca7815ad58,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_failed,711a2eb8987bbd6b1f4b0131d39ab073536ae4f08b0f5878e789e4ca7815ad58,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a 89,refs/heads/master,c1132d8fb32b81da8b9192ad1ee4e61dfa890665,812a35eb7f400aa93b2e60cf84151b1787a79cfd,5165bddec796a1e2278c01412e06f44de52c911a,,True,False,True,11,31,176,2,True,11,Tests_passed,01ccd28af5b5560f840e671640c614e7de2c0034fa319201f2701b016a5ebb48,True,Tests_passed,d04c3968e492f8063f94e925e78e31a108e85a0ad86a24b69babd6fce558531b,True,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_failed,8bacca06174bd381821055d56f710fcb9608aaaf1371dbccf004e42a531b0a7e,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b diff --git a/results/combined/merges_tested/apache/commons-pool.csv b/results/combined/merges_tested/apache/commons-pool.csv index ecc421c4bb..3c532f1084 100644 --- a/results/combined/merges_tested/apache/commons-pool.csv +++ b/results/combined/merges_tested/apache/commons-pool.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 36,refs/remotes/origin/1_5_RELEASE,14d3779529102d835672c5bad513d859e5e1deea,dc7faf6d8ccfc4e960bc7af6633c25329d8d3f3d,81e055707a4ef6da311fd88a07b891bcd8a576ed,,True,True,True,80,1028,22102,6,True,84,Tests_passed,5ff845cf1883dbc6aa84287a20f41923443e4d202a6fccc6943623677c763d8a,True,Tests_passed,a9b859e5b94d1097e80b39d44f7536499f73a024ea81409747dfcd12064a239e,True,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,aa6e66911bea5debe129b95e7d0934e1c6c748ce7a9616459191301f9bac1af3,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,a8c414bc061f720ac53f6c7b7bf705a8bb8a0642cc290166bf4ce1678c5889d9,Merge_failed,aad768e89a333d52cf91ff5cdea265c54e144670c099dbfdd5cc898f6f9fcea2,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,bf2e0d540e90ec7c1ac909fb2dd8f83bf87dbe6bcb97f786cc09fcc2ec1a6ef2,Merge_failed,062103779e804d8c637af2d69addddd019610d292c25c12e7ea7759c9cd24438,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992 diff --git a/results/combined/merges_tested/apache/commons-validator.csv b/results/combined/merges_tested/apache/commons-validator.csv index ebce038ba5..5313c250d3 100644 --- a/results/combined/merges_tested/apache/commons-validator.csv +++ b/results/combined/merges_tested/apache/commons-validator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,3d8f2df479e5b0884bb8d58b6a194e0f8163102c,cf76af0ad3ba123eb9337c46a60a60623db7129d,79293404604cf443236e859df057962ff28676c4,,True,True,True,74,363,1667,2,True,74,Tests_passed,aee43ad24650e76057f1b884617cc35c9fec55edeaa2d07a9c9940bba7990d19,True,Tests_passed,078eaeaee7cc75875773b14c0fc6502d07c2e526d0e7fd04d50d86e67f45297d,True,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c 50,refs/heads/master,9aeb4661a9391148aa439a12ca71fedb4015c466,f1cf42ffa0c6301b2396be672fe97aa8529c7987,376d0ea65f7140a20f7aa3b7b50bc1db8fdf1015,,True,True,True,28,130,302,4,True,28,Tests_passed,fd52923d9b429606a411c04e6f143e40709a94358b1396aecdcc5cd27f990546,True,Tests_passed,ac1cc0b1c2fa3846a880a22da6e53f66d7c2360a15ac7fe49ca931b5082db24a,True,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,e855b64c09f239e6fda7c7addce03046e34df702be4db0942961dc25b12eef01,Merge_failed,8482c20f7bc19e25ccd0f0ed86e358efca14ee00986a56a1573334d4d6afd17c,Tests_passed,f8e213f9b5d810adfafcd9be151dcc61261e00ece90ab6bf2290355ead99d68a,Tests_failed,171b5d05de4bd41c4aad78e9061e610028c1b59ee324a8de19c8ccae371ba72d,Merge_failed,8482c20f7bc19e25ccd0f0ed86e358efca14ee00986a56a1573334d4d6afd17c,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,2034a86def64dd9a7dd35f48f14a1c3b257be98e2bff8456f30203b921a56aa2,Tests_passed,f8e213f9b5d810adfafcd9be151dcc61261e00ece90ab6bf2290355ead99d68a,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd 52,refs/heads/master,a34ef7d3bb1c98d64ecda138b8d05fb1eea6990a,faf43c58c3f89da6a7f30bb9af6b36523be2b9e2,28051f0f13d2213d21c901bd2b18bad53da7ed46,,True,True,True,22,71,201,3,True,22,Tests_passed,603e0cbe82d0e2cf25158e29e799905ddf2f0de0059f1002e6fd14e136bf0883,True,Tests_passed,e2a85b4d359896140a3925257516c196338c3527182a6edb3426da6c0d53d181,True,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b20563c47f834a997d4f2a1272b192b2ed94637ed952148d839df9c5f3f804c0,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b20563c47f834a997d4f2a1272b192b2ed94637ed952148d839df9c5f3f804c0,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c diff --git a/results/combined/merges_tested/apache/directory-kerby.csv b/results/combined/merges_tested/apache/directory-kerby.csv index 3da639e02a..6743edc208 100644 --- a/results/combined/merges_tested/apache/directory-kerby.csv +++ b/results/combined/merges_tested/apache/directory-kerby.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 203,refs/heads/trunk,19c903e4fb5e8d5ba12148d6d4210c25698ea4ab,8790af24f7f0ffc5a208e1f0140400ba89a0a36c,8ae0b35429396f87a8f8160acb056e778f9166a9,,True,True,True,28,115,671.0,2,True,28,Tests_passed,9ee3cd3a554767a4e963d09e17a40a9eab30cbafd77adbf05a44f2836d24660f,True,Tests_passed,fd29de1545ea7d0216642478617cbddc1b61fc281cce4dca3e53ea79b7c53ac9,True,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_failed,26b7b27859bdd446e1f2525064ef9c06070eee06fa9124250753633ec8fd573a,Tests_failed,a70246abbd44b2a991e2cd5fbd84bf0f4d89b1e0a0456cf7128343cab6ba0e11,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_failed,26b7b27859bdd446e1f2525064ef9c06070eee06fa9124250753633ec8fd573a,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f 226,refs/heads/trunk,2daee238dbcf01170a01936f0feddb65e7dd0726,df2539bed1b4fc59642979ade83abfd8809b53bd,44f40d11d8cf2d9017278d92aec5d9f48d3fb88d,,True,False,True,4,3,8.0,2,True,4,Tests_passed,66b814d0497c94eb54c444f56e9e953dc3ea268ac6cc1a203bced908cc5f0d84,True,Tests_passed,27352618feac3c7caa18496734a060a137f8bda57cdc3bdf06ff2a4e5427d130,True,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d5a54451ae15627b70efa617d0d9ab135d1d8f8e24e64ca39b3b5936aa1ac9dc,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,df34eed536cdf56d42f9c1eaf0b1937ea23ab8e65c390913a57f258617d3cb4e,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d4c3e57ae2c290b0f23fc922e89a6449738dec93ceb2f15b5a7aed7bd6cc5035,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930 245,refs/heads/trunk,4832ef6c97920c89220f22d3e7f1998733af07e5,9425e8a4b902ddd2cd2b861e57d322d672f85306,6f15357c3250d5dfd5a53954a9401cc826974821,,True,True,True,47,186,945.0,2,True,47,Tests_passed,af8f856df0b77eddfd0906c277febc885823f592f119917d77d6b0a306a9481a,True,Tests_passed,f4100b3d6b9ca9befbd1fd54d212df013d77fdafd5641806a773c03ef4b10f14,True,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,d198f2d3c3bcbc2b7b96f7ae4f2cd4321ef823c8b16a8d8f396a6af1816963be,Tests_failed,33133cee30d46161554f3dd618dbdad49494094cb67562ec487a82a9be38bd84,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,d198f2d3c3bcbc2b7b96f7ae4f2cd4321ef823c8b16a8d8f396a6af1816963be,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f diff --git a/results/combined/merges_tested/apache/fop.csv b/results/combined/merges_tested/apache/fop.csv index ce3cc74d6c..fd79e66d35 100644 --- a/results/combined/merges_tested/apache/fop.csv +++ b/results/combined/merges_tested/apache/fop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 175,refs/remotes/origin/pull/3,7403425be8d6fe84d9ebd9614109629fadc8a752,7cae529cc4d2b6f3e8084d1950fefd630f29ccfd,9978ac1d3a99a429627198759affdedd2b10cd1d,,True,True,True,281,1150,4999.0,12,True,281,Tests_passed,cd1ff9e568e7f297b54ff98013502d203e3a67096b2503f6db7c2da6e438eeb5,True,Tests_passed,292361e45e7524ae9746da64b485aeda42d21a864bb8e63435c970d82863268e,True,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,1bf457ed34cb24c60b5e6807182c983abdc7ad606ff364e7aa5c1327e156bbd2,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,06d8ee6440cde442becf271f50cf589c8bb97cc24bb663acbb097dfe52cfde7d,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,c60b1d17d9202e31f2db0c32fec695029d187eb4789cfdd5529a67535c58f319,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1 diff --git a/results/combined/merges_tested/apache/geronimo-specs.csv b/results/combined/merges_tested/apache/geronimo-specs.csv index 7102128c5e..32d1b4798d 100644 --- a/results/combined/merges_tested/apache/geronimo-specs.csv +++ b/results/combined/merges_tested/apache/geronimo-specs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 88,refs/remotes/origin/pull/17,229a0222332567f69c53b4bdac713238935e840c,8d5bb7178205a4171b69d0d352cff74a4f221439,8f32fef5f3dbd5c1f577d967fcfb41bbb8af497d,,True,True,True,7,10,143.0,2,True,7,Tests_passed,e8dcaa08c37afb37d4f0640e9083832b641b41a8d8191236b19ab68978d00182,True,Tests_passed,7147bed0aea305357e81b689c9f37b551abbc487a5304ac965f6391301784b31,True,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8999d89554b0214e00c8bb31db923de3c0a4f637dcb60e0e315caeb6c6bc618f,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,db3fadc461b96d53f4aa7d2974be7e96a62d5104282125b510e4287846e2e36b,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,4ed1822dbd8b9424e5f274dad2dfc6bde215e90dd1d9851ca00443712992d6fe,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319 diff --git a/results/combined/merges_tested/apache/incubator-tamaya.csv b/results/combined/merges_tested/apache/incubator-tamaya.csv index 77769b2917..5b25d78513 100644 --- a/results/combined/merges_tested/apache/incubator-tamaya.csv +++ b/results/combined/merges_tested/apache/incubator-tamaya.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/master,74a73954a03c9854e80b7bafd46332a5a034a2fe,3a50d2e6eb06b7463e85a6f872463c28bc1142b0,45f5bb90bb48e1dc083e6e67138c140112f1dcab,,True,True,True,84,182,633,14,True,84,Tests_passed,cd2b85b49101b8714f817a3d58806b56b1b37f418d85d6a300fe45b7db783b38,True,Tests_passed,56d347327d56a0d41a3b4d4b8005abe2d37de34f11b2506284a72f6ac2503a13,True,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_failed,ff04d4d55d481a7fb000561d2123f3f9095d209d8004b3965883226173c4fb3b,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104 diff --git a/results/combined/merges_tested/apache/jackrabbit-filevault.csv b/results/combined/merges_tested/apache/jackrabbit-filevault.csv index f5800790d4..11747c5b4a 100644 --- a/results/combined/merges_tested/apache/jackrabbit-filevault.csv +++ b/results/combined/merges_tested/apache/jackrabbit-filevault.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 35,refs/remotes/origin/pull/274,7c0672367c10fbda249ffd0fdf233ab56d1f82fe,526977d56f5effce6cdb8a46b0dd5d4c92d30ce6,44ba240756901c4abde51fbb938c2011525507a5,,True,True,True,19,16,276,3,True,29,Tests_passed,23161bf888a978a734e378c371b9db01af025e885f9ecd711c1e3512921615b8,True,Tests_passed,9991f96811564fd8d5069f7e96b86abdcfe6038442c0adc6d4a0e07076098346,True,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,a6079316b4624f2bb04b3601f96ef1a007db2bef3b77ab0cec6bd7bd9002abf4,Merge_failed,868a5b1da7061b22594f867d78e5f7f2dfa04d8a00fab34ea05d2038af7521ea,Merge_failed,a3956a0a70dc8ba87e0290c2a2665a3d237268b2bd18afe4e8d40e313e58abc4,Merge_failed,a3956a0a70dc8ba87e0290c2a2665a3d237268b2bd18afe4e8d40e313e58abc4,Merge_failed,868a5b1da7061b22594f867d78e5f7f2dfa04d8a00fab34ea05d2038af7521ea,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,0901503d0d47c9e7d9bf5a96405ebd122c9345dee91606156380ca9a6fd2aa83,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e 38,refs/remotes/origin/pull/318,c4842868060884add8b7232d8d30224ad6bd2952,d4140d0987608e07f0b0b0d718ea1abfb892d5c1,d462b815ba9cca13721e6f36e40251e2b74244f4,,True,True,True,4,15,56,2,True,4,Tests_passed,1d98f63ca51c4c0e6f13357dfbce768de31ab86bb198a047741f894789083255,True,Tests_passed,d3cf4a0af32f12478d370f5264340ba5314244ae695cbc869a90e2a2e8774b65,True,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,4969e185faf3b86cd00d72721731493bc321c6c2e379924f224e6b1d1d0c8f38,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,Tests_failed,0f9d5a1b31707f769d8f58ef3ebda7a47a7e17204fcaf9b60b17f932fcc017c6,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,bb00a3c1c4e978ef5f589eeb721a7a9fc05c1011105d87ae07b2971a87a841c6,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835 diff --git a/results/combined/merges_tested/apache/jackrabbit.csv b/results/combined/merges_tested/apache/jackrabbit.csv index b15759ebeb..1ae799f3e9 100644 --- a/results/combined/merges_tested/apache/jackrabbit.csv +++ b/results/combined/merges_tested/apache/jackrabbit.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 52,refs/remotes/origin/pull/60,938dcd57bf4be8e13e43f8257203538c98b04026,ce510893a7dcccbbd8fdc6cd43f697853f572886,927eb4491d79d2860b094eff5649212395a6388d,,True,True,True,8,72,524.0,5,True,10,Tests_passed,3ec37f1cb7491062e01df35c8f6599b59f56587c160210ba150d96ef225210cf,True,Tests_passed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,True,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee 78,refs/remotes/origin/pull/88,c980ab851ddaac027ad4237151e416167682a71b,df833def60f7ddaeb3388043b7617155a03faa0f,e0e0f4592be8d34c442b466bf94184cedf3b7437,,True,True,True,30,57,190.0,2,True,30,Tests_passed,2664596db516481df6480497e04bd6aaf6d460bdab6d08bf8ac19073971127b8,True,Tests_passed,982a484a16a3d6f5605f8cfb51395ed490fd1d9531ab41c635d7168e1be24ed5,True,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_failed,d3c9245810d5cb7abea852d565f14ca6506ee3b13a46830dc83a39f5c7a79378,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29 diff --git a/results/combined/merges_tested/apache/james-mime4j.csv b/results/combined/merges_tested/apache/james-mime4j.csv index c820ceee5e..9852e80ad0 100644 --- a/results/combined/merges_tested/apache/james-mime4j.csv +++ b/results/combined/merges_tested/apache/james-mime4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2fe9d4d3f5929ea1e42f8c63595a3a8cf2cf3106,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,2e492ab771e58b46455553191c79b7f983343479,,True,True,True,62,200,748,4,True,64,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,True,Tests_passed,72c8f4d73bfced165770a81de141accd20ae6c51db59b7e921926fbae2327580,True,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,3a5ac708e868667aa08dab28cdc5f5c975f08b8d3147aab8c81c6d4b47c912e3,Tests_failed,11726dabee572e4ac7d65f68003932f7bcef21bd8792d79e60bf47a5890c8c1d,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,3a5ac708e868667aa08dab28cdc5f5c975f08b8d3147aab8c81c6d4b47c912e3,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb 2,refs/heads/master,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,e5a2caca4d3b5b2694d7156cd42cb8e3f96541c4,293714fe2c91fed2b5c6a7fb351fa79c80e867e2,,True,True,True,7,15,46,2,True,7,Tests_passed,4938610b1e2de86cc71e85b0b31ca4c521bafc4aa24b3469a3af7aeca0edce90,True,Tests_passed,c8f1e41ffc2c675e72bacb41dd025c2073a095a729ec1f7fcc02094a7f5359e2,True,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_failed,ba66d74aaac86cac8467127b573bee718dac34e392a3cfa37e188e1a1fd5037b,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb diff --git a/results/combined/merges_tested/apache/maven-enforcer.csv b/results/combined/merges_tested/apache/maven-enforcer.csv index ca093ee492..1873e70f52 100644 --- a/results/combined/merges_tested/apache/maven-enforcer.csv +++ b/results/combined/merges_tested/apache/maven-enforcer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0f3207ac28155bce317658f813c6fb4022c1ce19,3c192e174a09cb3a4cb4793d4bc7a9b4b8ae6ddd,e48ef741173c57fa1b43a960db107b40cff49536,,True,True,True,18,59,280,2,True,18,Tests_passed,fca3e8aef5e88c65527ec6264547c226d8c481941fee173efb3b173fa64f9007,True,Tests_passed,dc8fc476507683e6bb9244dd9409d5b317b4fd0e6abef96a1e43a1d964ad851d,True,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Merge_timedout,,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535 14,refs/heads/master,f4f8c2559e4af34d6db68f39b0d2e71e3b31e27f,4c28fbb5d101ca8fdde06fa645e111597b60a1ca,fad4dcc7ea83a90a0a853a0356804bc6a2f2f997,,True,True,True,41,131,1448,2,True,41,Tests_passed,dd5bb3584700368b445dcd219fcc08dbcaf29d89ee969d422916502a7afb2630,True,Tests_passed,cfe5e98afb833b115c44d3747db282228182fd0c9d2342e1dfd076891c4d1409,True,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_failed,4d309f3ac1c221ed5e40b6b1400330f50c717144016c74f899af32fef2cc2003,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_failed,4d309f3ac1c221ed5e40b6b1400330f50c717144016c74f899af32fef2cc2003,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744 27,refs/remotes/origin/pull/29,888631f16e3736fdcf1e06a69a25c67cd8e47846,70ab749b34908d351cce877bc8b8b8635ae109bf,48508c51afe26c15d6c246be88e603831c8fb864,,True,True,True,63,218,2683,3,True,63,Tests_passed,716881147eda3d79cb24eb7d39dd4860d0c397066e1fed71463ae2faf6206af7,True,Tests_passed,8659d5da33f5a8cfdee61f191ba84449407127f7e8787a8a4985b4d3b7f90841,True,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,34696613502a688f4635fb1f216593a5500be2519d78da3844aef4a184656375,Merge_failed,f7ad80c97f9df6448a28c0a6fc2a29393a3c3c231a196189b5a9cd853946521a,Tests_failed,11d1a87d688f324ed040f94b1b960967ddebe13f890f823e4bdafd3ecaf75863,Merge_timedout,,Merge_failed,f7ad80c97f9df6448a28c0a6fc2a29393a3c3c231a196189b5a9cd853946521a,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,912f86236a96a689f22fb7630f45d2d0568c5fccf9baa8e3d62d0bb9dd5bbcba,Tests_failed,11d1a87d688f324ed040f94b1b960967ddebe13f890f823e4bdafd3ecaf75863,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef diff --git a/results/combined/merges_tested/apache/maven-plugin-tools.csv b/results/combined/merges_tested/apache/maven-plugin-tools.csv index 6d9f7265dc..a5b9769c42 100644 --- a/results/combined/merges_tested/apache/maven-plugin-tools.csv +++ b/results/combined/merges_tested/apache/maven-plugin-tools.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/remotes/origin/pull/46,5fe527d2614d39b64e81881e52ff4fb88a0c6111,0b0daeeeada60052ab663d9b08122826c1e130d1,8f9ee789d272cf702aaf390004b78b73b78db4f1,,True,,True,165,622,,7,True,166,Tests_passed,c2da2b9f750344257c06e4d547aa76e8678bc43746be03e970b70c2d338602a7,True,Tests_passed,ec94dfb2d3ee664add509e4980d203c3bb86f42f604c133eafc5cc8e14d4d87c,True,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,9e6088178393a0fa09cb761f4edfeb0cf3048cfc289e2e25db02a520a6efbfd0,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_timedout,,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,e54a47c01d1d47e9a76fdff4ffcd77ccbeb574b84493e05d5d9791201048f96f,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615 18,refs/remotes/origin/pull/56,a859f5f2e195188a00c1af3b6ea86f3d5582f92f,85b7905d4edb8fc64a2aa129459a2f49f9da4c3a,95f76d2b303c15de01bbb29e3d1a16db4595e44c,,True,False,True,3,12,47.0,2,True,3,Tests_passed,84bddc5d5d99cd4b5388c925218f369ee755568371093cba2e166f058def7ec5,True,Tests_passed,026707d95189b6d2a29ee81e849a7d7823ac2553e546b972244082977c959eb7,True,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,24809d4351cae94e7f35bcb69997073875019aaf838d710d7aa2d57a40e178c5,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Tests_failed,d8cc62ce590b476121ee1f5c794026b61a4bc2b0af2ab7cce5ebd54bcdba0ff6,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,fc2bf670a0a63e81d6fb64f4f0c18fc9f5448db59d4546e0b1b3315099feb24f,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b 19,refs/remotes/origin/pull/58,48c578a3a9e45c2f052c7a5f1d98011719f947fb,a0c3695f8af6191b8291606ab2e3ffa1bc2d931a,bbc5fa4a6d4ba93d11fbe29e444dc31ab11e0cd4,,True,False,True,4,5,19.0,2,True,4,Tests_passed,830e3388d2dfcd2fd9dfa11fd64c69ca36f94ff75c1ab94a7ce0c2d2594a348a,True,Tests_passed,876db674b51ae3599d3e2558a8d84d0c68a2b5fe280d708c2e067006df0c1cb7,True,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,370bb801d5e81ffef363a1fe951fd92db78021d4ef638ec24f06ba3c98666f16,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,370bb801d5e81ffef363a1fe951fd92db78021d4ef638ec24f06ba3c98666f16,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e diff --git a/results/combined/merges_tested/apache/metamodel.csv b/results/combined/merges_tested/apache/metamodel.csv index 2091ae2d39..28bad15970 100644 --- a/results/combined/merges_tested/apache/metamodel.csv +++ b/results/combined/merges_tested/apache/metamodel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,292b40b8e2832d36c1cb78c845b6497211992518,56dd99fc519f8db5bf03906e01f4a89c3169df10,7e60c6066d3784efacc240e9a8dbfbff391eb172,,True,True,True,5,62,152.0,2,True,5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,True,Tests_passed,c1313624f5dafeb981796b2d8f7e96066fc00087decd626f4acf269564448775,True,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_failed,2658506b10a93eb0bd6683b1f6efca93fd25ef544a722532656149f0ac89f05b,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe 5,refs/heads/master,56dd99fc519f8db5bf03906e01f4a89c3169df10,60710cfd049b7e576b7af3244cd7b7463275ef07,a783e4fe2585da62d38c44417ca05fde86453666,,True,True,True,44,194,459.0,2,True,44,Tests_passed,ed0178fff437d8f023423547f8600f46e6a5cf4b881f07f5d515dfdf408d3c05,True,Tests_passed,4e632a4611a1124a74a0f6ecff98e2bde95ad7196477d4e003d4f9b3015e861e,True,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_failed,a58dc95d96c1a3dd9ddf16ee7c838d352feed1ce268c13890c607d37f0ed4a91,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7 6,refs/heads/master,985d82cb4cbaae82e1a76f82231ce83adf0d2df2,5fcc525c238ecc294df465bcddc489fe57880bb5,4e1c8aa95f45af2370e489a05bb5fd8d978fb835,,True,True,True,63,179,313.0,2,True,63,Tests_passed,715c6736514bfb89044a117afacdbb50443e741c24c1b867a4ce9636b046273a,True,Tests_passed,2b3b2b3e99a5ccb17e80771fb5d075d13029b32653ec44ed99a8fd91a04f6584,True,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27 diff --git a/results/combined/merges_tested/apache/olingo-odata2.csv b/results/combined/merges_tested/apache/olingo-odata2.csv index 703af4b8df..5de34d9b93 100644 --- a/results/combined/merges_tested/apache/olingo-odata2.csv +++ b/results/combined/merges_tested/apache/olingo-odata2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,843fba1449b367d5eef6fa69f4606bbd7232a9d9,352a82c3ccfd91ab45e21f83309c675886332bd3,21dfed3b6b399e4629729e35cc300104b74cb153,,True,True,True,22,156,649,2,True,22,Tests_passed,89082f64daa0c2b0bb5c32a9d370927326bad450c8c788a072bcb6fdf78bf04b,True,Tests_passed,9df2bfc43c74ccd58819140a1fc0c0dbd696f603f3f7ac2c121ada075f985e8c,True,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0 10,refs/heads/master,13b7b4897e7a1e67852853e2dbefbdd1dc69d484,03858a15dc4ecd956cb2ab7cb6dcbb5082798de7,4ef73c4b401199a2b8239db46f2a7eba5be458bc,,True,True,True,3,4,4,2,True,3,Tests_passed,5f95ba56537213841f7f7851e33f1618b71da169da5c92f531b42c2d4fa053f4,True,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,True,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_failed,e21decef93ec67eea9f4750cfd72ad329c57af8738be09c5c6dbbddba0423c82,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7 11,refs/heads/master,438f7a95e6209aafb763d3790f260efd6067d0d7,5f81a5c4c2c79a26619528ed9587de27bf27b7e7,ac22319687de5c2da1f58e3667612803fd6ffd2a,,True,True,True,15,35,198,2,True,15,Tests_passed,4682f404c8742b3b82cf1d0bf2606c209a516c95ef3c94d54284e8cdf516462b,True,Tests_passed,851b72fe7096edaeb743b9293a4d773b933e02ea191da522e441440b5119a2a5,True,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_failed,3cfe3399c4c4abb7bcebcee41381a0b067adf57608e6f63db26ab5225f01cb47,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36 diff --git a/results/combined/merges_tested/apache/olingo-odata4.csv b/results/combined/merges_tested/apache/olingo-odata4.csv index 8ac4c89400..e4ca78d0da 100644 --- a/results/combined/merges_tested/apache/olingo-odata4.csv +++ b/results/combined/merges_tested/apache/olingo-odata4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,820b462f4957ee1e547f21de712c394c5eb159b9,ca876f1fb99b224369fb27056d462e22cec8700d,50ac6c8494ad496fc1c1b4632a32baaa692007e4,,True,True,True,438,1878,20610.0,2,True,438,Tests_passed,61d86800cd87baf765d7df257a0b35eafcd858cc659cd85d2b7b35dbb19be2e9,True,Tests_passed,ead63826e7e026b606bf36a5eb5734dc188954f5129f5b5cf4369a0c399bc269,True,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,d837e20cd0da05ada2782e797a8b7d82c9fb38a281c9175c491b00576a85aa35,Tests_failed,357105ca837167d83c97b8ff063c17fe9d66ce565242af573ceb19cbed0062b2,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,d837e20cd0da05ada2782e797a8b7d82c9fb38a281c9175c491b00576a85aa35,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef 8,refs/heads/master,74587d98f5f9018129e9bd322bc58a30916d2d8c,9e94d9521f93879c554ccc8442c3ea82e8edffd1,a19ab7cb1d6153639b51c8b3f4c5dfffd338238b,,True,True,True,21,75,634.0,4,True,21,Tests_passed,0c7b6c1e8ae8fdbc12b699152bc83cd578997d53b8475675acec31bb22357418,True,Tests_passed,68742d3a961864bcae38e498f452a0f0cb2943eb40f1959803a2006cf36b6632,True,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_failed,3e1df2e63be471086412d9a2773772912c8cbf6abbf4ca4ccd712ceb77ce4bb5,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_failed,3e1df2e63be471086412d9a2773772912c8cbf6abbf4ca4ccd712ceb77ce4bb5,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76 14,refs/heads/master,e839533bb43b3c12f41a9123c07792d024fd4143,ebdf0d3e3a604133e1a54e79aecd7299e6b7c55e,b09dde0b3991f458dec1e90e74e6fce0639cb849,,True,True,True,14,74,304.0,3,True,14,Tests_passed,14640901f09e2c3795a35995c1ae9d29ed4fbd539d97370fde97bc62c2803e87,True,Tests_passed,c1de20657882f11bf793b072424ff430c1c050fafe9682272419247dfaeef7a5,True,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,e8f9f559b95e055a3f20dd39b92fe699b247039b467200b27e099e16c5f009bf,Tests_failed,ce3f00a15232bd39cb724312f803168f24140f487e4ecce8169fe2a24a0ae709,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,e8f9f559b95e055a3f20dd39b92fe699b247039b467200b27e099e16c5f009bf,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc diff --git a/results/combined/merges_tested/apache/opennlp.csv b/results/combined/merges_tested/apache/opennlp.csv index 3f8165968e..984f5a8722 100644 --- a/results/combined/merges_tested/apache/opennlp.csv +++ b/results/combined/merges_tested/apache/opennlp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/101,6fceb69a6af56b3ccf80b333b25f884a20ef224e,62e6242804e4167f5c476ae34acc784009a1af0f,9a0d208129c66ce13e90edb9765e3ba3684d7b80,,True,True,True,581,3034,27124.0,3,True,583,Tests_passed,a86ef3da5c32de2e3b8da7f9fbdede66282481f54c61b66a51d37831045e3118,True,Tests_passed,8518d304966701bf30996be17b0430c6da27b4ae062d0f0847b09dd30bda240d,True,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,1f4acab7d852d1df2021d27455f3ddc9fb9a23e62ece721b6f1149d2f9efdc35,Merge_failed,cbbce31659829ca4eee79a747b67e122babf0ce8e2b3a94a7d36b082aba114ef,Merge_failed,37fc1da6794fa3ad3fc52f3d83e466065669b99eec149838529a320911449527,Merge_failed,08384497073f7555589a741d7a0f1b1a2bc2c5143e7c706b4548afb8457db29f,Merge_failed,cbbce31659829ca4eee79a747b67e122babf0ce8e2b3a94a7d36b082aba114ef,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,2ba8543576b5da6489629fa83d683e336877301aae26596c3d4e8f19440829d8,Merge_failed,37fc1da6794fa3ad3fc52f3d83e466065669b99eec149838529a320911449527,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52 9,refs/remotes/origin/pull/14,8240a2c66097f25303d9f4959b128db9bff1c840,c7d4346838f8dacac362afa0f532a3b715dc6320,43c388388cc93406cc029f8a3b807d09e0744b8d,,True,True,True,402,1685,7921.0,10,True,402,Tests_passed,0d4aeb7ca30285b8512ce9154dac1123228d15379ba506680eb86f6b0d5c1a05,True,Tests_passed,fd678101aba9c441df9f89c72444f6dbe88b9e6b65ac7d4a4f4b268f4e0205c5,True,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,c764bc836b9db5b98fd37e46818d90e6bcff6c28a98a21060b8acf17dcdd3546,Merge_failed,0aa231fd7d7c58affcbccc550a6cfed36d52cd3c2459a02a1e5dcfd2144bcb1b,Tests_failed,9afe1a2e5390e4c532899ade2517b8ff194b989b3ad1cb3ec316b1996a3864fa,Merge_timedout,,Merge_failed,0aa231fd7d7c58affcbccc550a6cfed36d52cd3c2459a02a1e5dcfd2144bcb1b,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,4da0a7c7d1dec1f2f67a73ad8f82be8b4f67b91ddbad6e2626185a3687e78118,Tests_failed,9afe1a2e5390e4c532899ade2517b8ff194b989b3ad1cb3ec316b1996a3864fa,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558 10,refs/remotes/origin/pull/14,c7d4346838f8dacac362afa0f532a3b715dc6320,6a966b1696f68654f4d3a39cd74c114e3b6401cf,25724449667875591f829588e8652bbbe8739849,,True,True,True,11,33,127.0,19,True,19,Tests_passed,d876e7aab27b3082da9cf44039222e3842f1ce3bcd668106c133125378e4139f,True,Tests_passed,7ce16b91d26cec2b5d80bbb1949610977c47f3af39cf588c301511f4acc8796a,True,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,773b8d6fb39b0231031460d317ed14ba656d54282a56cb8eb1c9331d572c0e2f,Merge_failed,450aa47a18ddfc4f00a8143d04a2c21808d8b794835acbb8825e46362b493258,Tests_passed,2bbfccfe43d94a32c2ced6a2059e15d68988b24b25364d222430e9c4d6cdc125,Merge_failed,7edcb6259a4ca4fba4f31ab00273bd8c698949c7119734795b3a51d540099d0c,Merge_failed,450aa47a18ddfc4f00a8143d04a2c21808d8b794835acbb8825e46362b493258,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,7685b06d131fdf6f5069f9a5b179ae92141e20c666b7d771bb9a84ba23310e6e,Tests_passed,2bbfccfe43d94a32c2ced6a2059e15d68988b24b25364d222430e9c4d6cdc125,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd diff --git a/results/combined/merges_tested/apache/roller.csv b/results/combined/merges_tested/apache/roller.csv index 1b6aa40782..40b74a91e3 100644 --- a/results/combined/merges_tested/apache/roller.csv +++ b/results/combined/merges_tested/apache/roller.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,1628c3a3c4425cb39d2aa5197cd94f817c9e935e,3495b5131c704a2705b373d018043d830df8c809,8475fdaed28dfdb21e5c94f5d5cb41f4caef3f5d,,True,True,True,243,996,1297.0,13,True,243,Tests_passed,8c8ea94403500c65be98f334e28d593c732f89781ca49a16386c097b38fb4b21,True,Tests_passed,3fa0a1fc81ba714c6bbcc20caeca44f871dacd96970dc9549ac9b2a5642cbf44,True,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,c89df9dec7ff67bd2f851b47866b074a60f0d8c19a95e7a7f05145df21124628,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,c89df9dec7ff67bd2f851b47866b074a60f0d8c19a95e7a7f05145df21124628,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a 93,refs/heads/master,4e955ce4618ef1484eaeb42e5aa42650f5abc616,ed48b479acea0fbee79c5ac1fcc0380d150cd06d,d456d54200e7c747ef0312ca190c2a15433b6b3d,,True,,True,2590,2108,,4,True,2590,Tests_passed,f74899072cafc24f821746c0aa5ed3980e86333f30290af9ca8bb204ac9469b8,True,Tests_passed,9bcfedea1bd9dacee52ea37b0461cac41da9dbff90ed51947b1035988fc61c4b,True,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,d9a4b57c9b8a24e529821351a33b089685ae929086e1c76e7e726e0464a47780,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,8349cc1020073a479dfde08dbae7aae4d3cfc8c34ed86f307c3ebe713eda7fd5,Merge_failed,1a92293bfb4ef9fbc3cc3f11d72353081af158bafecd909109ecec864a08b078,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,c24b3824774acb29026c6dafa9fd7a29f55626f95f17808ec564cc2042b8d6a7,Merge_failed,4996d1ca29060a1cf4042857a1801617d388be0e57349b0a27095d599d9c6f88,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402 96,refs/heads/master,cd196fe541630c996d411fba01fa5981c09a8449,44b008d5d761e08eead9a643821b2d66684c7382,de461a7654d6b9fce2509a487ff0ebc88a4ea1d5,,True,,True,2707,3000,,5,True,2707,Tests_passed,a611028b34a2af115b64a34b6140ef71087d57478f0819b628e2f48069359452,True,Tests_passed,0dd4a1283c87ae5c02cdc81b379c1b7d61b884d69880236d629b6a5de62dc3b5,True,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,13d005481c2eb4934dc07da589ed3f80732acfbefebec97e32bc9462d6a770c6,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,d2f679a181ddf9d0452c9042a2b7fbdff9ab7c252918424d1af81db1ab9dd58a,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,53ff8c494e106242761524aee7952334fc748f8c5edbf9ddb876406938f1e558,Merge_failed,ce4ce88fc67a198659d1e5dee612c362634084d3b73cce6936871ec4246376f2,Merge_failed,13667a9dc7492462ca85b3449adaed0a05d49cec6b8553e1142b7b8c3bdf32fa,Merge_failed,b3ed0f444485c6108e077bb822beef1c892ca690d18e9f889ad1c56190197351,Merge_failed,287b2b8f1d1ff1837fd36280352fa825d284c1653597aaa71196f6421e9ca0b1,Merge_failed,13667a9dc7492462ca85b3449adaed0a05d49cec6b8553e1142b7b8c3bdf32fa,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,d2f679a181ddf9d0452c9042a2b7fbdff9ab7c252918424d1af81db1ab9dd58a,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,53ff8c494e106242761524aee7952334fc748f8c5edbf9ddb876406938f1e558,Merge_failed,6e3265e8e52dc53e3ec999b0886eeb3c7761b8650367f1b8f2f4f39714f4735e,Merge_failed,ba311a83cfc9cf4a54b42ab1fa4a07def4f757a62a441d4e215dc29331478936,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,13d005481c2eb4934dc07da589ed3f80732acfbefebec97e32bc9462d6a770c6,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3 diff --git a/results/combined/merges_tested/apache/shiro.csv b/results/combined/merges_tested/apache/shiro.csv index ffa5aab189..fc2f0da6a9 100644 --- a/results/combined/merges_tested/apache/shiro.csv +++ b/results/combined/merges_tested/apache/shiro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,True,25,39,1940,2,True,25,Tests_passed,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,True,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39 diff --git a/results/combined/merges_tested/apache/tomcat-maven-plugin.csv b/results/combined/merges_tested/apache/tomcat-maven-plugin.csv index 6e296e4cdf..3cddff806f 100644 --- a/results/combined/merges_tested/apache/tomcat-maven-plugin.csv +++ b/results/combined/merges_tested/apache/tomcat-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,True,101,145,13939,3,True,101,Tests_passed,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,True,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250 diff --git a/results/combined/merges_tested/appendium/flatpack.csv b/results/combined/merges_tested/appendium/flatpack.csv index 90f11d5d4e..1f08268a7a 100644 --- a/results/combined/merges_tested/appendium/flatpack.csv +++ b/results/combined/merges_tested/appendium/flatpack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,5e09875d97db7038e3ba6af9468f5313d99b0082,4958463e5a0d1008a43fa9e44b8b4e653ca9c719,b9c4bd89e021b980bbb4809d0a7749ab4d12001f,,True,False,True,3,3,4,2,True,3,Tests_passed,8e935556279de81bdfb886820671c62a430cc8c315cead24cc588765449921ac,True,Tests_passed,101ca456068e58cebf4d2543931c88e218c292ee4e8550ae9d87c8cac4b85558,True,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097 diff --git a/results/combined/merges_tested/appstatus/appstatus.csv b/results/combined/merges_tested/appstatus/appstatus.csv index 3d3e569767..f49dd9ca55 100644 --- a/results/combined/merges_tested/appstatus/appstatus.csv +++ b/results/combined/merges_tested/appstatus/appstatus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/heads/master,c76bf77dfdbd3f235a7ab6dc304504a19e0947ae,b5f911a83e5319df2ff47603d24ab84b5c1cd930,08282fb20f2be3845592118435b9ae6f750ba2c4,,True,True,True,7,60,233,184,True,185,Tests_passed,0068eb6e8c396c3450fe57ff8866d29d5db0b689e6cbd8b31b007f9fdcf3cd84,True,Tests_passed,565af7ec27ba0172cfe94036b85cff7412f1e8a005516deb3094b8af9590442a,True,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,7ed8922ac73c7891f8ea4afbc08c014332d53294a6b9136b71fad615b17d80cd,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,b6be2f65453bfd1f1b96f17e65e75a2e6315f80399aa5aa0db2f977fecdc16f9,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,e6a0da9b536e2ac0057a2ae74e10604f858cb13d9a055d99921fa9bf5b45db7e,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca diff --git a/results/combined/merges_tested/arcbees/arcbees-archetypes.csv b/results/combined/merges_tested/arcbees/arcbees-archetypes.csv index 40f2335bc5..46b8f07ae2 100644 --- a/results/combined/merges_tested/arcbees/arcbees-archetypes.csv +++ b/results/combined/merges_tested/arcbees/arcbees-archetypes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,084676165de5efceeb6002f5fef9ab28411531ea,a28fc80a9d07b9eeb2eae944f59478c949983df1,e39e7ff7e6e62409ea54d2e9b6f5b05c209d3ebe,,True,True,True,132,276,692,3,True,132,Tests_passed,a92a1512f34dbf008ec12ced0cb44d2023b17e44fff1157adecc8c16e92ad0e2,True,Tests_passed,b36afc048802b58eb2bdafc8d28d8dee3ed0541678481f3a55a08d2573c14462,True,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,a0f65412de8b7d361062cdd991c0ff4b2a59261be0f8b32d85e41a20149e60dc,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1 diff --git a/results/combined/merges_tested/arcbees/gwtchosen.csv b/results/combined/merges_tested/arcbees/gwtchosen.csv index ca45f6f5c2..092cb29efd 100644 --- a/results/combined/merges_tested/arcbees/gwtchosen.csv +++ b/results/combined/merges_tested/arcbees/gwtchosen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,2f547d0ec294537953214e5e29b2cce8cf6ff440,d127b18331b2ee9b1fcc7e6be3a15def933e3553,b9f0d3709fa109e55a4adfd265bce8e95de0605f,,True,True,Tests_passed,6b576fb34c5b4e80dd0141a78d1bc5e5e7168230c11761f600f743955676fab4,True,6,8,83,2,True,Tests_passed,e35bc67f049a6ff6ceae4ec9c79906ba5424d80580c2d5ce367ba8c71d1aee46,True,6,True,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_failed,8a9ce0675021e6b7224be5f6ba17e860582e458fe864954c198560bd80f18d38,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d 10,refs/heads/master,81c336ac96ae1ef86e5d506d32d387cfe95287f1,a414b8d8c0ff536efa310e139664f8db260d3682,58f0e24814fceceb7d3c473721a551d4fa409718,,True,True,Tests_passed,8e8f7dd07c57187c30874a25b5c18283a2eb06555f291bfdab7a90f1cbbc80cf,True,21,58,478,4,True,Tests_passed,53757183f66cda8de20adc189468e712451bb4ce547755af8807532b204f588f,True,21,True,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_failed,8d4c71a57062b1d307f8cef5d848c94daf2a8df94f17c89cb460e7bd749edb33,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e 14,refs/heads/master,3a485493c2f30e08993762075a1f704f442ea5e8,b7f65bc9c3a9a395796dcd86e8128abd07b826a1,f86997364588510c6fc8446a820863105238c3ec,,True,True,Tests_passed,78004ef9ab96aee3e0c5ac7f42bb7a3212cd4cec2b6c5d0978d4eaa04091297e,True,107,609,18090,2,True,Tests_passed,add2e11112039c010d65bd1889ddc6ad9f840fd8beda61fa682c005c05a14eee,True,107,True,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,dda4ed9193317e8e3242622f5cb7b185e826384e53a06b23d6f009673792f6e3,Merge_failed,5af2095bd5a5a83884f3e2a0dfdc2fd01e505ea2765f6ef513b4dcde28c0bad2,Merge_failed,d7a40940b738d65bac590977f5bba997b221db7402a1439624e68b29d421b067,Tests_failed,e9d93312da802c54e79e92657544d60ebdfb3ebc488076eca4ff22b5b304627d,Merge_failed,5af2095bd5a5a83884f3e2a0dfdc2fd01e505ea2765f6ef513b4dcde28c0bad2,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,312f58ab0eef0a59981e9a70c9775b235deec943308b458276c0e2f9ffe376b2,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038 diff --git a/results/combined/merges_tested/arcbees/universal-analytics.csv b/results/combined/merges_tested/arcbees/universal-analytics.csv index 1bd5e99b48..f5ddea9bec 100644 --- a/results/combined/merges_tested/arcbees/universal-analytics.csv +++ b/results/combined/merges_tested/arcbees/universal-analytics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,d4259d6249da0e00f06f46da5c68e12a89dc7f80,94a02010f5d77d4472e4a618af3c5d74da5207b6,6621d617e75f83815f297d2e734b4f6952d1615f,,True,True,True,39,361,1600,8,True,39,Tests_passed,c7ce74e29e8e7352afd4c31fc2bfd7c332d2dcb12d76e6e88acd8bbca83f67ac,True,Tests_passed,5ca1de52e35b6501158fe73bceb17c0364a2ef6981074eaad08286c416d28f17,True,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,781bcf97efd2cc2798964ae6bf73ad40bd9a301f511a617fc10762d089399f6c,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,1b8ed382758bb730d09b76f819445a82cd80d72729328375794ed0a453f3fb1f,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,283e5a1320d3c1cafde80917fb93867c8d41d94f89b1319493bdb1fc66ad4a21,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180 diff --git a/results/combined/merges_tested/ardesco/selenium-standalone-server-plugin.csv b/results/combined/merges_tested/ardesco/selenium-standalone-server-plugin.csv index a577ae2e19..5af018eb0c 100644 --- a/results/combined/merges_tested/ardesco/selenium-standalone-server-plugin.csv +++ b/results/combined/merges_tested/ardesco/selenium-standalone-server-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,957d978135279c122dcfaf9d72ed5a89f487b0ae,2fbb7e4f756f0288d11b2cf4bf2ca6e25cbafc07,c14176511dd6db04b8b175f5c3cb30abd9929449,,True,True,True,14,50,333,4,True,14,Tests_passed,33de56f17f9a862cf5be309b20f7dac23da7a8121ac3bd88510a53417b0391d7,True,Tests_passed,506a90dc93cd6f4f00ce7df0c39bee07cb8eb9a14f493a3c3e0a1036a900fb56,True,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,9851f5b1e8a39aa126a579557b022b04931ddd9d4f7a859002a56f0f2ccf913d,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,673377ed588ca1778189c5e347c0cd48242902be5aa73156c70fcc23060f3f6e,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,2b5d3fe603de9b434b9f03b7dc1b3b83525b69b557708de3cfac5a8bd06ae311,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2 diff --git a/results/combined/merges_tested/arimus/jmimemagic.csv b/results/combined/merges_tested/arimus/jmimemagic.csv index f0539b1b3b..d09a5cd477 100644 --- a/results/combined/merges_tested/arimus/jmimemagic.csv +++ b/results/combined/merges_tested/arimus/jmimemagic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,c543655186711a1c141e3af8201ed0f45666dd5a,2f3cb6d930b665edfe70f06eeb03e76cc869bbe1,d2bad1e68bc2871c21c3baa67ac54f88aa7ab4f6,,True,False,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,True,2,1,18,2,True,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,True,2,True,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,979001eccde34158f1f6cd65cbc9d653bf43049328eed8d76ad400f4fb565f94,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_failed,affc0512dd5f97702796225b939faee8cfa753140035e339b3f43c76b2832d60,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,e1357f7a3622d04ea7cdaa39142c8dbade4c6e544dc0fc474fd0f0039b9b0b27,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e diff --git a/results/combined/merges_tested/arnim/hdp.csv b/results/combined/merges_tested/arnim/hdp.csv index c7d07c6615..5d5f6102ce 100644 --- a/results/combined/merges_tested/arnim/hdp.csv +++ b/results/combined/merges_tested/arnim/hdp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,57e634d310aa6445d6b27e3262801d235a809357,d47b8c4e62b612f326f1b31c4c0db125b6597622,ea7bd11d56e0b1869ec861ecb011fa7fa309f84b,,True,True,Tests_passed,7c8982c3e9b5f2cc621b9e64dc0a27347185b827460129b4525347fcd5cc3d6e,True,18,43,1077,3,True,Tests_passed,d8919e0a2d04c70dc26597739bc83021437dfba63ff751fd79589df88da8ccb0,True,18,True,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3 diff --git a/results/combined/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv b/results/combined/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv index 4f35c96246..de3c13b383 100644 --- a/results/combined/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv +++ b/results/combined/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2def1e280114d209ed8a7314a8b236051b4c503b,85631073f159e2f624955db081c5759e6822c6ef,2371e6119d531a6405d6e89d7ec78a2aa4012365,,True,True,True,7,37,340,5,True,7,Tests_passed,df8c858ac71d05013d16bd16d82d10b3256166785586b6b22044608f55e9ff37,True,Tests_passed,03d8896cd387655bbc4eda5c37ad6f8305487eef241542fb3a87ee7f938714db,True,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,39f730c5f64333a92dcf2e502c274e8be4b14980d5933dd854523c56ad2805f2,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,6dcc8b0b29f434e5b85dffdd40538917c2fe0084288ad7b0f04964746938215d,Merge_failed,d0cd89544354f20cce3a5b73b5d30f7bfb7d6d0c6f0828e0dd37185180c92d6a,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,f8530239006d2eac8ce1029e1b339c90727ca9bce14bf0047f7053d6e2cf92de,Merge_failed,c59ed1f818d6e557a8da7d5795631429d4195536f6aca8f615f98046ce3c7c0f,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa diff --git a/results/combined/merges_tested/arquillian/arquillian-container-jetty.csv b/results/combined/merges_tested/arquillian/arquillian-container-jetty.csv index 5d8b4e5fec..e87e088ffd 100644 --- a/results/combined/merges_tested/arquillian/arquillian-container-jetty.csv +++ b/results/combined/merges_tested/arquillian/arquillian-container-jetty.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/87,39bdbff77e89dc772b812683a19a55b7db9ecb6a,38a562379eb854cc31391e754cf0e793fdf8e35a,e9c27acf0fa7891a0fa7b833da552ee7724ad8b1,,True,True,True,31,139,978,2,True,31,Tests_passed,de037d51ccfab8fd713240f1e405e9e0a45b3138f5d859d1519f61536bec14a2,True,Tests_passed,147af071ad6577bb1dd648880354c0ac645fd3ddfbedd1d03c602bf83635e014,True,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_failed,62865ba94f5477f30274dee864b138c46f296e2b6726f7b0dc611dc7930ff945,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437 diff --git a/results/combined/merges_tested/arturmkrtchyan/iban4j.csv b/results/combined/merges_tested/arturmkrtchyan/iban4j.csv index 83cc4d92ba..a26930ffda 100644 --- a/results/combined/merges_tested/arturmkrtchyan/iban4j.csv +++ b/results/combined/merges_tested/arturmkrtchyan/iban4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,52ace4f3cfdb442793c5a0b0f4b58c8fa5397c69,1a86e4dfcb4c9a3337cd3f7942da94284cdde8ae,23e67a9ce83f2af6a6059bd972ad515ede9166ca,,True,False,True,3,4,27,3,True,3,Tests_passed,eda661163865152bc92ced945c3214610bef32268d5aeeb7275f2b94e5958fdb,True,Tests_passed,ff90a9b8134d64dbfc5c0d1e6a42e7bd59071d6fcfc695e25e07f11811048f25,True,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,03a77adf5389d51a557f8f1cf54caf2b20126a152c2137d52b44879fc6d464f9,Tests_passed,328ad22c8cc79e9146b44a026ced4154eaa85d542733ab311110d3475567badf,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,03a77adf5389d51a557f8f1cf54caf2b20126a152c2137d52b44879fc6d464f9,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843 15,refs/heads/master,ee807e0a05fc291337dc0b8d5753265f55fed104,9de45a0291792726c86b1d8b843fa6b2fc7fb4f7,d1d3aa59e50447b135594902ef80877e5c852373,,True,False,True,6,18,71,2,True,6,Tests_passed,837a88b28f3967640d98a8a0aae019b256ec3aa12d8fef9c8745705e601a3c49,True,Tests_passed,2d0cbf9c6e73e33221c0a8342ccd3d5d38fa77dca15f10e2fec8590fd7f49006,True,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,c8b16bb4e0db3b5eb13b422624c3016d7eca9edeb7b572151a475263db7e3dd6,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Tests_failed,176fc8c75323f89e1166db637a3207a9f36ed241657fbc3a8edcf27cedbdf335,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,16cbfd1caecb32e26bb8a2ecd9c0a07f8599ba37532873f1415ff3a4e5072060,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935 25,refs/remotes/origin/pull/102,66c4c0fe6fc398e325c12eeccdba1c0473c75990,90f325863915c17eff42735fc118b1c0dc9ef614,516d4773dcff39bdeac8792933b0124d974bff8b,,True,False,True,5,27,148,3,True,5,Tests_passed,ca4c778f951ac50fbd6611ac169682d35c37e820c762b27b7b759906b05b0483,True,Tests_passed,64bbb4448416d09f7e4c9f64b8e060ad89c0b167bc008ae60d75fbc61e762692,True,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,cf3193a76d1d6a52b25105d5c2f09b35be2d33381180304c37544085722fb526,Merge_failed,cd7de150bf5975a27788c726faef10e82a88bebb8252684060e1991759f2df0b,Merge_failed,559ae2d70c0a8bf97ed5104ec0017363863194128354d2fd10df94b3a21af2a8,Merge_failed,d39da41cb24ca804979237c6a8273ef3e0c293615669dd7fffad68a21dce15fb,Merge_failed,cd7de150bf5975a27788c726faef10e82a88bebb8252684060e1991759f2df0b,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,61ba15f8a1b3ab370a157140d11d90e476f92740eec9d177994e352e3f8aa0ee,Merge_failed,559ae2d70c0a8bf97ed5104ec0017363863194128354d2fd10df94b3a21af2a8,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132 diff --git a/results/combined/merges_tested/asciidoctor/asciidoclet.csv b/results/combined/merges_tested/asciidoctor/asciidoclet.csv index 3dd1b9d663..6bae9f4855 100644 --- a/results/combined/merges_tested/asciidoctor/asciidoclet.csv +++ b/results/combined/merges_tested/asciidoctor/asciidoclet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,e31ec7a8acded7cc6ed731a391ddaf86d13329da,4b279a4f9b5f6719ef1d99014d6967eb460488e5,06a32ee38abd15691f802949c797e428c8b9f07b,,True,True,True,12,53,409,5,True,12,Tests_passed,c9f483e06f2176eda62d75ac4205364a082fcfaa36665f886377fc3ed3e7670a,True,Tests_passed,4aced6fc18d4fe0f7ec8e17b133463eb7d37f8a8f8912c5d285b1b30973d2dd3,True,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,cc4c9076a0a1c22a313d2687b73140cbe8b294f9bd7aaca404dbe4e22a687cca,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Tests_failed,c41572ffcdb9a004b932761848ae131e275cd1ccdb62446b018d5390a7a69bc6,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,95a98deee5900f23eb6ff06f4b5d66dfa1bdb32034ccee2433dd3679d3c4ea77,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61 diff --git a/results/combined/merges_tested/aseldawy/spatialhadoop2.csv b/results/combined/merges_tested/aseldawy/spatialhadoop2.csv index f425aa8b80..54a7de24cb 100644 --- a/results/combined/merges_tested/aseldawy/spatialhadoop2.csv +++ b/results/combined/merges_tested/aseldawy/spatialhadoop2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,833f69b3184bfb8781abcacc04859fd8dbb01b0e,24b3b64b0443ce6d49e50ecd52934bddeee319b0,3d060e0c3804c23128a917d51d96876350d203b1,,True,True,True,4,9,169,3,True,4,Tests_passed,c92c2e0ffa0f0406331b6b4a7961cbf22ff143475c269aa9dbb022d0a8fc8cb7,True,Tests_passed,211649ad60b8a7b8ac004a571c67878435aa06379fbeed486874381cfe936cab,True,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_failed,2b34b6de605ffdc8bef8807147d9ff6294a6039ed225f6638304ac0cdbe975f1,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d 5,refs/heads/master,83340231db8f7e94b9972fb90e6dbd379e7937fa,77dd45ad18995198d9763941a0ec5796e726635d,debeb83822e48a6ee582fdcc5390310f750779d6,,True,True,True,160,636,19545,6,True,160,Tests_passed,629d7efca8614c600a4fefb81b7b6094da185640f1023e431603472e2b4bb8d2,True,Tests_passed,855aacfc91ab198d43cc1449edf74ab696add0e0c4e5a48b5ad0c708c44db96b,True,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1a211c90422cba760ed28c0fb9a4d0f2a0e58b0686f3807694561949960be96f,Merge_failed,9e0cdff9ee6aaea6430bf9d56641c4b7e86eb9c63a9df473d101a9e61df73db0,Merge_failed,353e85ef1e0c83cedd9da86c148197c1660787c8d97a51381e1c86801098ad21,Tests_failed,4d2af375888cfa03c962fba552490ceec15f1022da34a2ec2490f8f6a31db601,Merge_failed,9e0cdff9ee6aaea6430bf9d56641c4b7e86eb9c63a9df473d101a9e61df73db0,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,aeb31c80c8feeba86f09dcec08ea3fe891d361f98a3f41e5e4e75e634633a071,Merge_failed,353e85ef1e0c83cedd9da86c148197c1660787c8d97a51381e1c86801098ad21,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e 17,refs/heads/master,d00e0eab23794022e39ea6089db1c8235511ab10,0ffb6e0e745497e4d61554ea3b11407cdf4b4cf0,6d7775ab22ea31ffc8966ef4741bd0c4991446fb,,True,True,True,23,47,384,4,True,23,Tests_passed,0d2c9fccf5c35927d3fd80c38893f1a29ba0810d567632e9a910c33e76058fda,True,Tests_passed,edf8bf501749ab3edb444f8709e8da00af58de686c81402758e82ffe3d828a0f,True,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,48cabd70e88cc7a687920229e02a2cc0af6158398471137c9c943d5b4679f82d,Tests_failed,d66921ab61c0d8bd0f0c46dbc651208030eead10b1341ed49801fd371e63899e,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,48cabd70e88cc7a687920229e02a2cc0af6158398471137c9c943d5b4679f82d,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924 diff --git a/results/combined/merges_tested/astefanutti/metrics-cdi.csv b/results/combined/merges_tested/astefanutti/metrics-cdi.csv index adcbb58e30..a9b5147a87 100644 --- a/results/combined/merges_tested/astefanutti/metrics-cdi.csv +++ b/results/combined/merges_tested/astefanutti/metrics-cdi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,e3afc46398a8f613fbf841984a64a838d7b7898e,29e7bac497513de420543497612180331cc5d1b3,1def8a8aa23211109f40b06e979c0f64045e0bd5,,True,True,True,123,281,971,7,True,123,Tests_passed,ab773b5fd6bfa9d866a6f39016487e6dbed2e3793b9df7cd9d882b17165985aa,True,Tests_passed,b1c2545045a10b07384a65323023f020131d2b0c1c5cbdd77e843fb473e1637d,True,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66 diff --git a/results/combined/merges_tested/astrapi69/jaulp.wicket.csv b/results/combined/merges_tested/astrapi69/jaulp.wicket.csv index 2affa50e11..d51070b225 100644 --- a/results/combined/merges_tested/astrapi69/jaulp.wicket.csv +++ b/results/combined/merges_tested/astrapi69/jaulp.wicket.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/develop,f4a6f0e81a16add0005c7da1bc9ccc3188b974d5,b17cf26ca146d4d8eacaadc21b3f314ab1bbf488,ad14308fa5ce7ae64e07a37e30d973da77999c40,,True,True,True,31,165,850,10,True,31,Tests_passed,03679928af45d3cf429d0873a6c95e2f4e51195d4b0cac1ddae51a1e97581b66,True,Tests_passed,1c8f1af1715d3c95e0720e8dc3c09fd3f28985c6d6b378d2be39be54d32244a0,True,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,eb13a08a0ab6630fb2c7162e5679207c07418196228acdab5bfc1c6c1b61a25f,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,213c7d6609b3925ae62a5f20196367e1aa13415a1134949143c95b0f528e236c,Merge_failed,3353c85dfd422601c5fbb94dc3cd1e3a20aa5858a937ebfe7f416238ea1fa314,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,bcfa2773197488f7c86c493139bf8cb796ccba4ec5ebfe9b224173fd0496d9d4,Merge_failed,0c1f2d6657041e54d08d60e0985b557717dc694bdda1b22289892b31209a770b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b diff --git a/results/combined/merges_tested/ata4/disunity.csv b/results/combined/merges_tested/ata4/disunity.csv index d671a62859..23ca74dc76 100644 --- a/results/combined/merges_tested/ata4/disunity.csv +++ b/results/combined/merges_tested/ata4/disunity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,True,242,336,13397,6,True,242,Tests_passed,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,True,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,True,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,d392dfd1cc301317c906977eb6e88f4cc93fcc968f42a7bf3f5b67eb0c4276b8,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,c74291a900df05eb1eae076fae81b8504eeb986cd2b66c10138caab84e17abba,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0 diff --git a/results/combined/merges_tested/atam4j/atam4j.csv b/results/combined/merges_tested/atam4j/atam4j.csv index 9df2a68eb3..937920be19 100644 --- a/results/combined/merges_tested/atam4j/atam4j.csv +++ b/results/combined/merges_tested/atam4j/atam4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,71fcecb071270981bc92b14d2cc3b0e56828c011,ac72c93c78397f60ed7d24de967e1fe34a9b36b6,fb6e6e5d5b8dbcbc2679e18f3f491847f6dcc33e,,True,True,True,17,70,438,3,True,17,Tests_passed,205610f2f84c4fc3fe3a162a6cb8f4409067f27af6a1d5840c90980f844b4ea6,True,Tests_passed,1f646b266f7cb714e05397072ac2744a0b05b86dfef6de5740f8ea203e17e431,True,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,e765739003097850ccc9ac0cef5745cb6e631e2b3bc22d7aaeec90a9a7930f51,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,e9f1476d364c6c41316bc7ec7456383d731d43a194bb35f76cc6c7904ea92fcf,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,d88c457cf7b5f27d58902f50a139d2260c05f96eecb8078b370e413b9b7ca9a1,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b diff --git a/results/combined/merges_tested/athou/commafeed.csv b/results/combined/merges_tested/athou/commafeed.csv index a1e663d4ca..0e8e034176 100644 --- a/results/combined/merges_tested/athou/commafeed.csv +++ b/results/combined/merges_tested/athou/commafeed.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 207,refs/heads/master,6133497a29ab62720d03c3a62637410ece53fee5,598630cc23617c75da17b55d916faca005b7a3a0,23dd016f428660aab9bcf47438e318eb7f7a76b7,,True,True,True,21,106,435.0,2,True,21,Tests_passed,0eecb1074ab850268b6cabaa1bb7fb78728e9330e47a71219e150fd117d38a02,True,Tests_passed,bb2965a4da0154146ad21a2dde17bdb2eec95250528a76f126151ac1f8e3293b,True,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,4fa85cac1834bd4be0ed42bc6a564147c7633e0886cbe6d9a9075430d883ac25,Merge_failed,66c659446d36538512a938eac00723bd0cc436d3a6918f935265f7bac2c4e4e7,Merge_failed,60fceee1b2ed2d3575e38075aa29508619cac9a38327e1771e7d84bacf7213bd,Merge_failed,f5bd79a91c279f97298f4c0b595cb4cdf2eb5f92ae5cf7a3d78a3c45442ceb75,Merge_failed,66c659446d36538512a938eac00723bd0cc436d3a6918f935265f7bac2c4e4e7,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,315d4bdf00fec7bdc5d770ba678b1ee41c2a511b333b50eb54201a9a10d2cee8,Merge_failed,60fceee1b2ed2d3575e38075aa29508619cac9a38327e1771e7d84bacf7213bd,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279 211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,True,32,129,751.0,2,True,32,Tests_passed,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,True,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,True,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2 diff --git a/results/combined/merges_tested/atmosphere/atmosphere-extensions.csv b/results/combined/merges_tested/atmosphere/atmosphere-extensions.csv index 376f22efa3..1086ffc826 100644 --- a/results/combined/merges_tested/atmosphere/atmosphere-extensions.csv +++ b/results/combined/merges_tested/atmosphere/atmosphere-extensions.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/master,f57bf3445e3b89d5389a50ea01c32059af88569b,141fdf08301360228fcebba029f0b98f4e373822,ac485fa2ff1644f6fb602640526e0618bee6bac5,,True,True,True,13,38,219.0,2,True,13,Tests_passed,6bc20dc88b5f61894a398186d0f6f77133c9a58b670630e59fa759c11a926cb6,True,Tests_passed,eade686a70683750d4c3ef2aa5a7beaa39282b330ff7f6af647aa55006f668d7,True,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,eb9eb4cc212f27db8814eaeec45dcb0093109702ae5128b970cd7c140fd25cb7,Merge_failed,e9281c61d01d3851bcfbb705f9c7462e21426e6e8faa0739f8abf267de8ca37e,Merge_failed,2e0a9fd5c2d707f06401804c5f2a113fe2c374c65ec1040c5d104f6139974fb4,Merge_failed,e741f7d08f7594e269dafee35fdcd3bcefcd98af95036973a9fa2f7fb9319cbc,Merge_failed,e9281c61d01d3851bcfbb705f9c7462e21426e6e8faa0739f8abf267de8ca37e,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,530d129c7392f12404d4475975d613c5a53480edb6f561f33c9848d92753a31b,Merge_failed,2e0a9fd5c2d707f06401804c5f2a113fe2c374c65ec1040c5d104f6139974fb4,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61 77,refs/remotes/origin/extensions-2.4.x,8fd31b3e8717249b185da0e271103a90b760e89b,7b84f67240d1fe92228648acbb9d67e4a0960ba7,3607c69f55516200dd452f86afc2751818f498ee,,True,True,True,42,115,886.0,28,True,44,Tests_passed,6f27fca37c4d9988982bf676fa9ebb9164f23efa3cfac7b1cd386c15f62c470f,True,Tests_passed,6031e123e91269536304aba4f3fbf17cb4abb736dfae882ac34014429e7b6cfa,True,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,5eaac6726137e4abcac5af959819ca7117d4cf6c34946ef68887e43f09a1f60b,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,3405b20ce96048e8d3b0cd4cd6d07d136977cc6de986167aed04fd77d9cc5804,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,ba478956bc8335a69c49d8f205ff854751f3dcd087e74d5cda96b5d6b6ee99a9,Merge_failed,2c678f04f97c377ff6cfec77e2f8e730c4117ed6067d4f4fddea545c3c986c4a,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210 diff --git a/results/combined/merges_tested/atorstling/bychan.csv b/results/combined/merges_tested/atorstling/bychan.csv index 5905a53bf4..990749df01 100644 --- a/results/combined/merges_tested/atorstling/bychan.csv +++ b/results/combined/merges_tested/atorstling/bychan.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,96d59116bbca17ba5b72e31736f17cb431b19ad1,9783d0571b7a7c006f5c295b536dbfecf5178f12,00e0379193b04458c930e16f42d0870700df6c42,,True,True,True,14,57,172,2,True,14,Tests_passed,771bd4150cc0ef221c8bd7a389faa83049508c489b3b98638b44cf458ddbd6f2,True,Tests_passed,4c5eacf255995b4c85be64a931da3fd3fc548a32e0a53ea8546a36e066b4a0b1,True,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693 diff --git a/results/combined/merges_tested/attoparser/attoparser.csv b/results/combined/merges_tested/attoparser/attoparser.csv index 12b7cd1883..001a8030e6 100644 --- a/results/combined/merges_tested/attoparser/attoparser.csv +++ b/results/combined/merges_tested/attoparser/attoparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,798b83b78f7a4821456d8ec3d36f9f86cbc1d5b0,2c0f34f7637d172a354518387ece1ef19c01fb4c,9ea8984c9828d2f35f6754195a5e23b740c546eb,,True,True,True,9,19,152,2,True,9,Tests_passed,2c12d47073f152e140db1f836dd074f563a67b2df0693a51124a5c5e166749fb,True,Tests_passed,3bb345124a68f0dfe2c0417135132e6bf662acadd2b2486482b55a30f46df361,True,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798 diff --git a/results/combined/merges_tested/augustt198/lumen.csv b/results/combined/merges_tested/augustt198/lumen.csv index f21e612b0a..2fc0d453b4 100644 --- a/results/combined/merges_tested/augustt198/lumen.csv +++ b/results/combined/merges_tested/augustt198/lumen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,7d97ea8fcd51dbe8b89640b5aa4df71836c06834,f8caae07c25e99ce557f4a4e7c99f17fe15071e3,91bfe976e4de8e35b136285351f8430cb99903be,,True,True,True,26,45,457,2,True,26,Tests_passed,055b804925b7fa8654ec1fe911a72480ecbf1416d03155b8436c1ac4a67b5f2f,True,Tests_passed,9ef8a67610a72565cf195ce3ee4d0505c784ab9afcbc08a01950b2bd6b89232d,True,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,8c09719eb7ad7e3bdf337bfe5e7a2bf38577862fdf08e7a9f39e6121aadba24f,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Tests_failed,a2e891b964d64fdc85a734f6036898f3bc8ffb7b661801ada16ed510a25ba067,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,241b319cadb9518aa7367b7b89fe7a01124d2e5616370fc29133e1272c18a57c,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e 7,refs/heads/master,7907ebdef0dd0a755b3c28a61dfd4ba6148a6032,46af4dc176107e19c37f499b8a5191dbb0ffa946,96ad62efcb67b5a069a2a5a28b732bf5112769ef,,True,True,True,14,41,151,4,True,14,Tests_passed,ab34de40e656745185216b91ad638f0d52150108084047e1e5a940fa11b35013,True,Tests_passed,9c8fdc34f3a8c6f5c081ed9699bef273fb011e25a9a413b7df0798150ad4c453,True,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,4440089346bb1b237bfc5d3516f755696a5c24269e2f7b429030a42c81d580d9,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,4440089346bb1b237bfc5d3516f755696a5c24269e2f7b429030a42c81d580d9,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4 9,refs/heads/master,336a59cfb1dd6f232f142f86d94890533265dbef,7b6547886add415d92fb4065c6b029a287ee97fa,026ed6aab1381446623c1a46abb1bbab0c5c0363,,True,True,True,31,76,262,2,True,31,Tests_passed,f4236cca9188a4b5a4f89947d870d3b3725fc8955075b20a78038cb9f445ebf5,True,Tests_passed,5838f63cf9a8882cba64b5c061bf7a1da6f5e5533d57856797b2b5fb34c53a8a,True,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,0177157eab558530a7cfa8b21668850de46258d6ecad46bd60e071f1cf68d7da,Tests_passed,2ff90ff6f8c7ae1ee6437ffea50bf06bd0db1cb0af1d6568dda3407dcb87d214,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,0177157eab558530a7cfa8b21668850de46258d6ecad46bd60e071f1cf68d7da,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019 diff --git a/results/combined/merges_tested/aurbroszniowski/rainfall-core.csv b/results/combined/merges_tested/aurbroszniowski/rainfall-core.csv index a484eaeba3..8af3bc4b41 100644 --- a/results/combined/merges_tested/aurbroszniowski/rainfall-core.csv +++ b/results/combined/merges_tested/aurbroszniowski/rainfall-core.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/main,589fd0b34c60d3f1ea2ec291f0011b65df78d38e,07af041cab96d790028c519a111d33410917b893,53c5d6872600ef23d65e4f53907ad253b5ca110b,,True,True,True,12,31,332,2,True,12,Tests_passed,c50c6e180ec6e0db6067b23ccec2bbdfbfe9e06787e72bcd1cfd5f4c204a8709,True,Tests_passed,5c60ebf380b0a12b299c917200a084abfd0bde2c2c197a1376502874912b066a,True,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,a3d087c51acb72a69176e07228c3e3b2247a2553c5518a50603d55c94a319cb0,Tests_failed,43318037f579633933b70fec3382248335b61de40d364efc688e12e4b9e49beb,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,a3d087c51acb72a69176e07228c3e3b2247a2553c5518a50603d55c94a319cb0,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc 32,refs/heads/main,7ac65a5f80090b7e18e9280be5ddb3a183d8da66,29a68d4ec812c2a6ca35b52f22f43c3ea4b67c39,8b883513acbe998713abbd743921ca455dc69445,,True,True,True,21,50,999,2,True,21,Tests_passed,ca603698c7f3f52f447d99d19e990cf7bbe01e9921a343c4f9bd25040ce9c5a7,True,Tests_passed,026bd25b9aa9406dee80143389a5178491827a84f4e277a99f8395b334ceb8bf,True,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_failed,c7c141d975834c095a87179787672f8ce58dd75a4af4802a92d338cec0f928e7,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044 diff --git a/results/combined/merges_tested/auth0/java-jwt.csv b/results/combined/merges_tested/auth0/java-jwt.csv index d8f128d784..5f77bc3e2a 100644 --- a/results/combined/merges_tested/auth0/java-jwt.csv +++ b/results/combined/merges_tested/auth0/java-jwt.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 204,refs/remotes/origin/pull/426,04706657b6695ff5794720f3a6ad7df852b38e07,cf3c498d43c8a07867b538b106d2c540b7cb247a,9fdf105c65cded2a4fde33facf24db6f581e5c08,,True,True,True,18,47,179,2,True,18,Tests_passed,5cd1b8fa8f0546015890375fbfe4f9abcd4cbe5d70a9a08d7cd1e951bba082e7,True,Tests_passed,a1373f97c187e1a47cdde2a4161e40b7d1ac6b4e4cc572cbe0d5734dada25342,True,Tests_timedout,6ca5c9ebfd5e11bc1837078398a21e8bdb21df838391e60b1307d7eeaf5ebe4f,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,True,True,True,63,299,2284,10,True,63,Tests_passed,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,True,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8545447a8a08f11db002c933f54a44fdea2db1fa4d7308d925582e04ad2743f6,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4 diff --git a/results/combined/merges_tested/avaje-common/avaje-agentloader.csv b/results/combined/merges_tested/avaje-common/avaje-agentloader.csv index ec6fad6276..297b1ce616 100644 --- a/results/combined/merges_tested/avaje-common/avaje-agentloader.csv +++ b/results/combined/merges_tested/avaje-common/avaje-agentloader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,1406ac7a25bad7155a3ace629e63da4ba6d9c4c0,9fef8b5a77120ba7feb1d1d46e763bc4b1052d6c,6652713f4ba4337ca030fea6c306cc21c932fdae,,True,True,Tests_passed,b600ab30bf1a6c2c0338e1364d1953ab9794ed902bc23873aea1f3ef70cb90e5,True,4,15,61,3,True,Tests_passed,d9f63ef2754a04cb34a1ab4e47ebbfd76fbabe9b62d7ad695671c6e13959833e,True,4,True,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,31057f913a038aba6f24db1aba3ea9e6779116409a6c53c0356ccf87630c7abb,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,834fc8ccf5b1975e010a5489af3590f2eed5c64c029d93ff98cb4c13796c5ec3,Merge_failed,bc78ea94ab3adabaf81382511dfc87fd8184b1ebbc73d94f08f6089fc9ee4410,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,c8de3c85e4f4d2722c5fbce1fc3158eec49b07837371b2b88a478849f01f2953,Merge_failed,9542ddd18bb2530a5c7a3860bfa3dd23d656997036bc24dedac727ce850c3e8c,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9 diff --git a/results/combined/merges_tested/awaisathar/dependensee.csv b/results/combined/merges_tested/awaisathar/dependensee.csv index d998463a56..41463ec5ad 100644 --- a/results/combined/merges_tested/awaisathar/dependensee.csv +++ b/results/combined/merges_tested/awaisathar/dependensee.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,38b5080a19a4b08f68e6255427afa7d8d57caae4,55efd475ca9223eb2ac75021f4862487b70ab2c5,56277c0e14a8c2bef74e4be02bbd2d980f4d939b,,True,True,Tests_passed,4f38be01ee9da8e1497a2544f50925a20a119f2b13d80064095318e001670c27,True,7,30,182,4,True,Tests_passed,c2128c07d91497e2179ba4694ad88b57660e18859d979bffbb8beb43db6e96d0,True,7,True,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,83c811f3b7cf490047ff31c0c5b8755c89f0442a3c1cae13e1377d5e6cc493c5,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,2c23e39635c8853ee25ca1c5285a8fe4a5ffce5b92f4fd59b88c0f53d9d0c74f,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,c495fefe4b29c6ae0db1f851bcd36fbcbe4a85c1cd22aa4823f4105424725e37,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4 diff --git a/results/combined/merges_tested/awaitility/awaitility.csv b/results/combined/merges_tested/awaitility/awaitility.csv index 38c474d5c2..b2027e9b06 100644 --- a/results/combined/merges_tested/awaitility/awaitility.csv +++ b/results/combined/merges_tested/awaitility/awaitility.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/master,715ad2ecff73829eade318cdd435a9e91d8c2162,cf261505ee2a2308e270ec9a64a80ce9e5a59f10,6949468fb680f667e0d67e5228d7fabbeeee97ba,,True,False,Tests_passed,d1112acb55e9eb9bc6aa3e29ba486300b985ee1f7bbab4372905682f543dba9a,True,2,1,2,7,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,True,7,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_failed,5727079f3849b62b0d705dc28d42cfda3bb97fddb83c77d5ddc47dbb22decbf0,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f 45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Tests_timedout,51d8510d5ed040ef94e34f8be2c6198cb98dd31124aa0176ab2fb5539d83c4c6,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/combined/merges_tested/aweber/rabbitmq-flume-plugin.csv b/results/combined/merges_tested/aweber/rabbitmq-flume-plugin.csv index b7d9370d92..05f6797831 100644 --- a/results/combined/merges_tested/aweber/rabbitmq-flume-plugin.csv +++ b/results/combined/merges_tested/aweber/rabbitmq-flume-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,93b744705965d180aa463a576f96eb6c2e19731b,642e116773e5d3495f3f95682e72cd77a7e391f8,c8e66e6ebdab6bbf07c30912f64625fd8e8187b8,,True,True,Tests_passed,b470b08641dd44116f4201fb4d577b3ff69300ab5a0b2949327b64f8a236787f,True,8,18,43,3,True,Tests_passed,c598958f04ce09f559db8ef634d8cdb3613f46e9129a23d9a37de862526480ee,True,8,True,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4 6,refs/heads/master,710a5fb3b85f30fc1992e135ee8b303591aa6bce,ce70045eb938a16a2e82de97bd5ab4c2ce8596e4,ed70b2c5c33b52017f2528a587894c01be750ed7,,True,False,Tests_passed,953e4267c911a5f5f59265a5187a225fe185af95331ad640f9667665c0e31303,True,7,25,90,2,True,Tests_passed,a65b763b8152207f8365bf179dabfe7ea74f093eb0a7419ad8207a5cd2cfbe06,True,7,True,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,61d3a4af38939851e31579448c1153ee40cf1a49b16b3552215c5b585272b435,Merge_failed,34578972ed590804e7ca4a407e652aa1dcbcddddc05feb039524bcc0fdaada06,Tests_passed,f2693c405f298391fefc0584c9939c994dec72b26584e5ac74a30be7f9877d4c,Tests_failed,426d2af38c8d404ec5dc4b01ee3cb99b871b6e5e89c2647000fd30eae8cf9645,Merge_failed,34578972ed590804e7ca4a407e652aa1dcbcddddc05feb039524bcc0fdaada06,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,9edd889e33fe5a4fe9a0952ddc7b359209dd2fe9287f62756a6061bfdb020c9a,Tests_passed,f2693c405f298391fefc0584c9939c994dec72b26584e5ac74a30be7f9877d4c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239 9,refs/heads/master,ed70b2c5c33b52017f2528a587894c01be750ed7,658ff078b5639c973f02cdc7c718f9771f2cd03d,43ad0db59400c0e67e38c20837a11b15cfde6d1e,,True,False,Tests_passed,a65b763b8152207f8365bf179dabfe7ea74f093eb0a7419ad8207a5cd2cfbe06,True,3,2,10,3,True,Tests_passed,ac0a2babd5b4ee007fb2697cbaeda249fde7a90ddc8132d58adb03a183884c96,True,3,True,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,8d2c0d6540b471360f047124d73618cf3d4a7e339da50be058122e631f89475f,Merge_failed,d27f8b1cd3485cfbef06c1ed68fa8bfb1277b5bd2cfc13e0bb08ab4656962195,Merge_failed,4a5ef41e64bfe379398f9563387156ac549530da99a46b92b13bc9263466fbe7,Merge_failed,7a32dfea89ea738f75b97e52e32c39323672f9adcb4346da815c5bc93c123ca7,Merge_failed,d27f8b1cd3485cfbef06c1ed68fa8bfb1277b5bd2cfc13e0bb08ab4656962195,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,b8e9247632fe32428043020a123a62c7738defbeab809052ad37c9bc58efcb56,Merge_failed,35227745fb86db613ae88c5b0490ac79a2dc7633cdd149d2f473077faf81a080,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613 diff --git a/results/combined/merges_tested/aws/aws-cloudtrail-processing-library.csv b/results/combined/merges_tested/aws/aws-cloudtrail-processing-library.csv index e57ad805df..ca3352d262 100644 --- a/results/combined/merges_tested/aws/aws-cloudtrail-processing-library.csv +++ b/results/combined/merges_tested/aws/aws-cloudtrail-processing-library.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/2,c91b62a4589a6dafb9a910dedcfaeff861fb05fd,443968050923b97dc46cb0b0d0279a8edb655d4a,2bb6a3307bd2fc1798a7b185caa369db8d230875,,True,True,Tests_passed,4961c7acb75cf36da8e171cb1b34fbff868d0ad11accaa318904f2b0b1e11c95,True,82,116,407,3,True,Tests_passed,b53ab54beeed37d469af2b8d6cab98809b561b3ab9ad7694d4001a128d28944a,True,82,True,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,05868520d3b2c2952d364ed03f78ced6734e71e86fdd88c2a0572990a5865bd6,Tests_passed,2a96fc34acea34d8c14b75ee0baa797699b7c38ed78a7627de0d5b0c25dbc846,Merge_failed,41957941ca7bfaa06466b953c3f6200a3b54f421ea2024614858099a5295f882,Merge_failed,ddaf65fbbef4f34fbdca687e1ca20ffcb6b4464b22ed42b4c6eb381bc241990e,Tests_passed,2a96fc34acea34d8c14b75ee0baa797699b7c38ed78a7627de0d5b0c25dbc846,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,aa8621e402e4bea0ade01c02a3f26365940155e5613091bd1cc4b6f94c54e111,Merge_failed,a261f5365515314c43f2b79b7c9efe52aabd58fabfa276d69f9802fdf773940d,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370 3,refs/remotes/origin/pull/2,75fb2ff17d00bd2a2f1f478901a13de2149b3f15,eb47dbe7b5f96148b77d94f0a1471de1d01830a2,3aa119cc6425360f76cb96fb5c7f103db1c92ca8,,True,True,Tests_passed,751d4a43b21d8de56b21e3a148883a4cec30be4695c800a6a3e691999d5ac912,True,82,96,278,3,True,Tests_passed,f8343de806fb0573de66933baf08fc3bb54cd37f2a49addbe0b73575573eef59,True,82,True,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,740ee519d959a4077fedb1b023a31b858563d9d47ffece415399fce7e81df8ef,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,6514943e1d33b0af754808af85fe340226f10188c54055b0ecb62aa1a2beae98,Merge_failed,a6a782362e5023408d76622d584944f96c822ab4d24dd6e5a04a268b13499d24,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,97ecd86bdbf815e5c111ba4c6d0caf77d07d46300646c3f94d87ef5da4f427da,Merge_failed,0acfe2cb0f0aeecda348798086df23987f0c7b4c75538ff49fcfff5fc664bc35,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51 diff --git a/results/combined/merges_tested/awslabs/amazon-kinesis-client.csv b/results/combined/merges_tested/awslabs/amazon-kinesis-client.csv index 0c1f40ecb7..52293ebbad 100644 --- a/results/combined/merges_tested/awslabs/amazon-kinesis-client.csv +++ b/results/combined/merges_tested/awslabs/amazon-kinesis-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,7f18330ebdefe2551ae88cdae2e41877d2cca213,7196a41cd43978f4ef354afd2d2239352056f82f,51787690d9d1315054671ff9ea8af875685811e1,,True,True,True,13,51,263,2,True,13,Tests_passed,849e6a431d6e9d8e96de3e6a18394b127757efcae39507dd244153d009fbc2df,True,Tests_passed,53fc8e63667511b40ecd7e6a2178ee4621bdf8acd3cc9a03d0ddebaa9344e56e,True,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,8b718262068eed1d609f8e3a8f88ebb4601ef6902b8c54304e5f856b4a86caa3,Tests_failed,00b9b54e2fa1bbe9cd56b907181e57bc03b050ca4dbc7aaad2e069f495d5f4a4,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,8b718262068eed1d609f8e3a8f88ebb4601ef6902b8c54304e5f856b4a86caa3,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c 62,refs/remotes/origin/1.14.8,6fbfc21ad7d6a2722491806a411d168304167f7f,4f927da81c2bb64ac90d8d247dbbfa4347ee5fdc,ff004d75be17831f80dc6e58296a183823ed9904,,True,True,True,54,507,6591,4,True,54,Tests_passed,b4ef78da5574607a97d49f05c5d71a4cd41d260fd810bac8728871b68735b56f,True,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,True,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,55a4a5cc6f714f31b60021ddf5651c5be1166defa85a0f1d05e971d48a1f19da,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,55a4a5cc6f714f31b60021ddf5651c5be1166defa85a0f1d05e971d48a1f19da,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0 84,refs/remotes/origin/1.14.8,4ec77b1705f1f089a1c973cd3e61398a6a4a6294,f1a50cd14bc50b1edf98ecac9c06c312e06437b7,317dc1ae847a0e473b017d5fee05ea1087d9e7c0,,True,True,True,28,150,2714,5,True,30,Tests_passed,6d2c316bc9c7268f92d82a734e37354af6d56d7122f2ac3c9a2af39e45ff4056,True,Tests_passed,6567c3e5914604e826f6eadba39e6e5345d128070e70c3334d92f16533e05a92,True,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,a48621536d7114ad03de90e4e23018b26aaf86ee7eead2e4986357a1a27e00db,Merge_failed,c44f5fdc66be3dc7578253c81936680c0afaa815006618a4c8aeafa6129b235e,Merge_failed,d4ea76ad450a752f340933d170c4fb0200bb6fe2d006a362e029a1e07b6d1025,Merge_failed,51aeb4144f3a5c9bba8dd38ce38f150dd4661dc9ec5b8ba5b4fde4bb3f1e86a4,Merge_failed,c44f5fdc66be3dc7578253c81936680c0afaa815006618a4c8aeafa6129b235e,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,f2811f599e023a4d3d1a9154ec739288889d292f22c22da8c06b2941ad525d30,Merge_failed,b0b4c2130f62ac172ada3f87cb888bf2203036792528e0cfc6c1eedf59b04cd4,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f diff --git a/results/combined/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv b/results/combined/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv index 3a910f416f..c9d4bc00a1 100644 --- a/results/combined/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv +++ b/results/combined/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,016338972c443427e3b9f46c5e00f254a10c7095,dde1d7af4a90903d2b1c0a9bacd7ec30390680ce,13a3a50831d439af76cc6d0e4b3cc074ec3f47cb,,True,True,Tests_passed,a1e829b040fc1933be67229019cb22ea3142ffaf616d4fdc00c74a39f3334adf,True,37,399,2427,7,True,Tests_passed,37504941c14b349bef5e2c72270d8befe15473544105110ea0685b6771048dec,True,38,True,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,f44c6867e9bfbf7ac97fd4866a73d52815b86333288cbf340c55ae6991d5aa5b,Merge_failed,d93d0a131c88f6347f661d125c1f405a74958ac17cef3a627804a00690634ed8,Merge_failed,c1c54025ab2cba2bf1bafd2f1ae1edaaae6a24ab15cce843f976de165c692a78,Merge_failed,92822f419587855b5400b3935aadda8cdcda529513ab56f0d78e8583565b49e5,Merge_failed,d93d0a131c88f6347f661d125c1f405a74958ac17cef3a627804a00690634ed8,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,d7e0a1a937e49a760067ea362152db1b8156faab330b05a8ba1248cbca3e3ebf,Merge_failed,d3d1550d130aad3c7134d0b84101c2b78ae170fa706971d89ce0da863a7ac99c,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13 24,refs/heads/master,04b2881401bb35ae6113c4802484135c1c3533ae,721cd7d882b4af5168f474d16a071d780ffa91dd,091d3e41238d823838d761c2c41532ca7e880f97,,True,True,Tests_passed,09114dcb420c91af75b3e08615a81b4afc454335ae2df7c939c660ba9be72594,True,56,144,583,2,True,Tests_passed,842420198bc8701ec5ba7c5a3bbde3d742c921a48e89eb417cc6ee8ea49e7ca9,True,56,True,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_failed,0af47479ff6767c9a1d7dc1e2c84f654bc3d11510e7c43240cdfa545ee9e0618,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab 36,refs/remotes/origin/pull/38,c6da79ddbb4358e2342983dafdb177125a879391,93146b36a95ee9c9bba161115bc17ce7e835493e,6824b40e0ef908dd768eff93618270822c62ba65,,True,True,Tests_passed,94f2cc2815c50a6d5518e2fe644a871572e3a0309c831e05424bd4e4441c86bc,True,58,617,3575,2,True,Tests_passed,8763ddc63fe9b06f332f3edb97b52b79faabdd5fdec010df8502b6ab4930a42f,True,58,True,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,c4ceeb941e9c67af20badfd63ce3278ef22973e89acfe966d652555fcafd8c43,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,fb583b825bd73f9d841a0c2ea7ee776ba7ff648dd0348715938757e58fbe778d,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,a00b8d4fedd54eeafe88816ee976b977c1c1f4b78426b7eab493e7d55eceabbd,Tests_passed,8892be0e6c7aabe6950bf4417b10d5a624d0fa5f329355437265ecd66b2fab4d,Tests_passed,2293aca0b4078eec04438b2c0f94befc66d04a349f36bd3ccf86e458d0d7af0c,Merge_failed,be0506a75d04d4bd44a5294ae2e932f292f970967db1b86bacb077d04cac9bd2,Tests_passed,8892be0e6c7aabe6950bf4417b10d5a624d0fa5f329355437265ecd66b2fab4d,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,fb583b825bd73f9d841a0c2ea7ee776ba7ff648dd0348715938757e58fbe778d,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,5a8283da24dae3a545c8768dff3faeeea6e8952f747fd45cc70fa3b55b1461dc,Tests_passed,2293aca0b4078eec04438b2c0f94befc66d04a349f36bd3ccf86e458d0d7af0c,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,c4ceeb941e9c67af20badfd63ce3278ef22973e89acfe966d652555fcafd8c43,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87 diff --git a/results/combined/merges_tested/awslabs/dynamodb-geo.csv b/results/combined/merges_tested/awslabs/dynamodb-geo.csv index 14d2d82aa9..ce48179691 100644 --- a/results/combined/merges_tested/awslabs/dynamodb-geo.csv +++ b/results/combined/merges_tested/awslabs/dynamodb-geo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,1d1b774cef3609a4e9f435c2ed8ea36359e058bd,f4d62cbb93f622c0565ff23a95908385d1d4a799,ef43ffecf577d610b6be671634c64bf1dc09adea,,True,True,Tests_passed,999c7d6c45f71b90674a9e41b7abc7f88cf4307059383432b586990243381013,True,5,13,95,2,True,Tests_passed,92b9ae4263d61671d401e712afa7c73976334d71e3a61b60b8cedb0a33449f7a,True,5,True,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,e89cc8059d250aa9f2173c8fdca55444dc6942b0caaf858bec1a671b73629bd2,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667 diff --git a/results/combined/merges_tested/awslabs/kinesis-log4j-appender.csv b/results/combined/merges_tested/awslabs/kinesis-log4j-appender.csv index bf40d17176..e9ce08c889 100644 --- a/results/combined/merges_tested/awslabs/kinesis-log4j-appender.csv +++ b/results/combined/merges_tested/awslabs/kinesis-log4j-appender.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4acb58fdc4040822d2f8bdcad0e89354a06a1157,3304473d0d47b00517e04e5942052f4205edca9a,cc0811dba8cb9210fa86aa57f2ac40d9e14ff244,,True,True,Tests_passed,a1eefa38c5061dbc9b605fd767ee746846b0e52f77fa831f49ae9d2b4cfd7868,True,7,17,155,3,True,Tests_passed,ff928199e1db91f59b72fde0191ccbe323b1e0fab491d8e8c9ee292aeb1a4bdb,True,7,True,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec diff --git a/results/combined/merges_tested/azuread/azure-activedirectory-library-for-java.csv b/results/combined/merges_tested/azuread/azure-activedirectory-library-for-java.csv index ea8942497e..930609478d 100644 --- a/results/combined/merges_tested/azuread/azure-activedirectory-library-for-java.csv +++ b/results/combined/merges_tested/azuread/azure-activedirectory-library-for-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/dev,48bdc8500618d5452013a4823bc8ba7a85515986,c8286c6389c70d2033e8ec7a35fa7ccf786cb1b7,663b8bd7b8b90d8af9e04b363d4f98d080f20f4f,,True,True,True,46,188,2646,4,True,47,Tests_passed,c96e970d3253b313b108b25d2e7ca3fda79bf6266f00605777b75ff0de8d54d5,True,Tests_passed,f5e9a243ca812af2f41770b5962f4b02ba899b5602a9d25f390b402a18cb3cb7,True,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,bc8b22f9f2383a1eb2bfc0c6280f85c8b04ebd98676d272bca155bc40539c5ba,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,4952e1cebedfff4c8947471801f592badc7a37e7a34b2f0bf8b0b14a547c5ded,Merge_timedout,,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,0f95487dcc4c46d73b310978b9a35cccc2d35b8214154fa9eb563b4a6a47e830,Merge_failed,402ae7d4e0228f680882ebbc286287b619375e595bdc9ed8d408a8a64f5711d7,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b 29,refs/heads/dev,ee1814c0ac36dfd7d0ebce404b446f5e02b76a5d,14c567ed46797dce0f8b6ca902a48718df869951,f6d775d5f5f0214f92878f5fccce6a99706fe5cd,,True,False,True,4,7,18,22,True,23,Tests_passed,cd13117767f6c627eb3b7559fdd1cbee26fbd22c1590445a110fd708e7c8c0c7,True,Tests_passed,2206f21f589e63424fe2dc371dcaff3e1ba36af280aef40c759a126dc2b3e453,True,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,10414df2641fe37a1a6c8af5e525fe93c48b23678f99056840af61131622993a,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,569884d3a1600c7f11c9734e5891059b3b4a00307c24c8299a8c51a8d0ace3b3,Merge_failed,22efdcec4e7afa2912d25eba54ff4f3a7a88c41e9c31f1ea3cd6f3e3e4a81ad2,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,b6c41dafa3207a2ffc7ef960a810845d9418ae4db2a036c1fbab1879c50aebc7,Merge_failed,b61e169e101a29838ee9e73aed8a56a3be88e03190f253b884be80ec1c24fb0f,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529 52,refs/heads/dev,547837a0347aed4d9fa8f1d631b822ea256421ba,897ee8a2bd8e2e56af2e0af434304816e82bfad5,34676f86d0e196f692b3daf21bac0c947f9dcf94,,True,True,True,26,80,363,12,True,33,Tests_passed,004a1a7f1f23f161957c9ab820e49e749d1a175832fdf66dca885d1fa7b145be,True,Tests_passed,25264399df92e7613fb6c4614ef6b0bf77c8852c66ae06f1c1332dde117c9128,True,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,973a4caf124a17835b67cac39ac06524986c228342db57526c97a79277faa213,Merge_failed,c64576d0cae7ccf0b7e22933355d79bfc23e6a9060c462bf06f8a4a1f23cd249,Merge_failed,3927bc766f9fb14e78b196d8473da30b6fe618bf807bd0e0b85382e2a252287b,Merge_timedout,,Merge_failed,c64576d0cae7ccf0b7e22933355d79bfc23e6a9060c462bf06f8a4a1f23cd249,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,103ea9e6d6b237d13421c43af6479c3d26c2ef7c250b86c67c166466361f22a5,Merge_failed,3de442734361077022556a43d9723e0f9b47572ab84998c2320e439c9a9fd139,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46 diff --git a/results/combined/merges_tested/b/kafka-websocket.csv b/results/combined/merges_tested/b/kafka-websocket.csv index 5d3da7c3a2..c0330ab208 100644 --- a/results/combined/merges_tested/b/kafka-websocket.csv +++ b/results/combined/merges_tested/b/kafka-websocket.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,3e7fb0a946a78bee2f1ae85fcbdc36e3d85bc5d8,214dd17bdce8b4bb846f1906bbeed685bff07be9,c1cc4961a40a45b2b4fd1796eeda998ba5e6d617,,True,True,True,15,32,400,2,True,15,Tests_passed,2de6155d3b55b16d42dcebd7bfbdb5643fef262f33a5ab66f6ee22338a78d563,True,Tests_passed,b395ee4c0847300b9a2e4233f74ae41c237010fb93f1a9fa3326ecd7611cd0ed,True,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_failed,224551dccc1495143b99208718169e8173aa4712236f33dd9721fa4676c4098c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7 diff --git a/results/combined/merges_tested/barend/java-iban.csv b/results/combined/merges_tested/barend/java-iban.csv index 4cabb82309..806dc0da31 100644 --- a/results/combined/merges_tested/barend/java-iban.csv +++ b/results/combined/merges_tested/barend/java-iban.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/main,981e0311705b2f83cabb82c9c9e098952960b248,6f91a456f15385e0c713bf52e99249b7679222e8,97764aca73b79d78f8544cb2d6355501efcd0d2f,,True,False,True,5,30,168,4,True,5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,True,Tests_passed,138260e0ef7fb7cebe0f1d9e127da546ec05033e2ef378c0e6b2dfbcdd24f6b4,True,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,69dd05809a336ccfa9267c41766e292fcb17c00af23cfca504726a01a0350fb5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,de65cc873cd172aef52247335ab474571833c1d47551cd906f1afc5a3f1fb7de,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,2f28d3d17890592f5f6e32ecf70e36b5ffcbe15f7d0f69b486a8cd08c9012356,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82 diff --git a/results/combined/merges_tested/basho/riak-java-client.csv b/results/combined/merges_tested/basho/riak-java-client.csv index 38755f806e..43f0bd3ac4 100644 --- a/results/combined/merges_tested/basho/riak-java-client.csv +++ b/results/combined/merges_tested/basho/riak-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/develop,1cf7c917508a69d5ea12f3d5bebc3dab5984be23,e1c33ec9de33e6b395401183c18c60da5cad31a2,15da081ff85e6c899184b619b4bf87bb0728f4ea,,True,True,True,16,61,252,2,True,16,Tests_passed,3a228fafc2b902172c56310aa0b7e8b212d2ed676d56ca388c381af7c7be9baa,True,Tests_passed,8e3ba0cef7564135f171ddbe9b22eaec0c0f9aa01a6af618ec8b2bf6b34231f1,True,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_failed,56bc020f1539db12b3aafd53497c711b4f46c9fbb4109a66640c88ec3aeaea66,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5 diff --git a/results/combined/merges_tested/bastillion-io/bastillion.csv b/results/combined/merges_tested/bastillion-io/bastillion.csv index 8b281c6658..b3f7887f82 100644 --- a/results/combined/merges_tested/bastillion-io/bastillion.csv +++ b/results/combined/merges_tested/bastillion-io/bastillion.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,True,7,32,113,2,True,7,Tests_passed,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,True,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,True,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_failed,104d4e4275646fe3a9efa197b0c08323d6f353aa14172a3db0603ba95e5eca28,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d 101,refs/heads/master,974b6c963b42712a5b2d97dbd2b166d239951381,1b2173eb2ee6af0486e891f54d06aafac9ede651,63c25853004ef4631ea134254332044d17cf7bb0,,True,True,True,34,146,430,10,True,34,Tests_passed,c7c706da658feae56082cefd1b34dc6f590846fcb383f6390f6083ecba430823,True,Tests_passed,376fb417040873f09f367dfdbe2bb6dd17c1db1d7a52abd018e649d0af355250,True,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,d60728c1bf3e9e5151b73e05f01dd4c5a710e6b8f8dd2aab991980ce85b84f5f,Merge_failed,be5637b3cc2b74df95ffd4ff327ec587c8e1975307dc782394330da355a41080,Tests_failed,ebca78a08e325d9f159bca5343a30ce59c8ed944c92a0f3c636d612a9209f95d,Tests_failed,2b54efb12f3aad9665100283e284fd84b15bc9ee451124877790562b9d017d19,Merge_failed,be5637b3cc2b74df95ffd4ff327ec587c8e1975307dc782394330da355a41080,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,160fe8cb47954f87d8f38be709622dcc0bc5f1c7d6d499b3a11f02245b4fde1d,Tests_failed,ebca78a08e325d9f159bca5343a30ce59c8ed944c92a0f3c636d612a9209f95d,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695 103,refs/heads/master,46d36b7b4a770c0a4404372b39c35a3efdb15cde,fb1429bc175c5ed0096d69f94368a923d45d0eef,716bdc9904562d730750e335c8ae39235f1b89ea,,True,True,True,30,69,171,12,True,30,Tests_passed,68c2d18cb418d7eb0ede410a589ceb12c00f6ed9a7e4e00b6aaab3cae3242ffc,True,Tests_passed,0b39a993d28755656667423d389963d7646a8db07bcdd8715d47eebe49121159,True,Tests_timedout,8b281cd91d66cb5258e020e3b5970fc9ceba9b58fc1c380b1fe98737ea880167,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/combined/merges_tested/bazhenov/load-test-tool.csv b/results/combined/merges_tested/bazhenov/load-test-tool.csv index 6d17340915..853157b5e9 100644 --- a/results/combined/merges_tested/bazhenov/load-test-tool.csv +++ b/results/combined/merges_tested/bazhenov/load-test-tool.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,6593812db93b89deb415cd4e2728baf690b38487,34d51cd87873b3239c3fc65ee88f35468a23baea,63a868bfc12d00d726e6ecba2fd9be1b5ae29584,,True,False,Tests_passed,313f0c1ddaba97cbd2d795a390befa7e6f00f21d58ea17e4df27dd46c40a7328,True,2,1,8.0,17,True,Tests_passed,2394e1e6dba97558969834a69f14bb27c1062dfdd27c67cb2d4c5a418e1c0d68,True,17,True,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,ead356baef18eb94975767454fdc555baa489ecb7ca94e1acea0b3ddd919d8cc,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Tests_failed,ae7222ddd19b7e144650364a9a10ab4448991780a718b80c1a48467fbbd883e6,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,6b2eb3bb6755c466f43c2e8cbecef0d6f0fa8d49efa77f0c0ffbbcf11b2b1b4c,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225 diff --git a/results/combined/merges_tested/beastmachine/ggplot.csv b/results/combined/merges_tested/beastmachine/ggplot.csv index 088ca5c3da..cec664dc53 100644 --- a/results/combined/merges_tested/beastmachine/ggplot.csv +++ b/results/combined/merges_tested/beastmachine/ggplot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,e2841b05bab86e238732649229f3d0a2834badf7,5a94ad6e32c8175745c301c900a3184e83a6923c,ff2ab22bcb56d13c130004d312f0b56efd1f8ed2,,True,True,True,6,15,188,2,True,6,Tests_passed,a035e7a19867b9a5062fb37a9524b4745247c17f6f566cb42d5608cbf1931a4a,True,Tests_passed,0bb57dafc5ba5a54fa0b5aa060883bf862b8914b0dad133ed974d232eddfc10d,True,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,5e97975fa1ee062883fd625d36db6d0bf983a6951ddf50184661022b30b45348,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Tests_failed,461440b78a16fb516456a8e5a80d9c4c06c22a8c805fc428c8a6de418111952f,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,cf7dcf7c0d584f5ddf4706f486ffa237bade18138dca56a89916b466fa86fec3,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf diff --git a/results/combined/merges_tested/bedatadriven/jackson-datatype-jts.csv b/results/combined/merges_tested/bedatadriven/jackson-datatype-jts.csv index cd5769f094..2d06b7c3cc 100644 --- a/results/combined/merges_tested/bedatadriven/jackson-datatype-jts.csv +++ b/results/combined/merges_tested/bedatadriven/jackson-datatype-jts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/5,1416f1af0698abdf85fed9076cf00896f176f3a8,980366ecfc5b313f23e9032c2cd766bd1905f777,9f80c5c8e0ca843d54cc23fcb5769a824f0b0ff7,,True,True,Tests_passed,a33534485efef0da7fa4ea4fb639e0acc16c6eea5069a81db41d5ba044c136af,True,3,4,13,2,True,Tests_passed,d1c22d1dc041af25a27710c793a4d2bf9c5ed4681c3df27570e7dbcc08bd456d,True,3,True,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,74cb1006fcada0fd6e0b9c25db6a64cdb3e6c872db4702d872d14957b27195b7,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Tests_failed,6eea65c340c77581b6d0f2601b9366fb865977a724fd1fc381f449ebeeee1cca,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,1561e874abba516ed1baca89e07729a5084f7fd260c3568719dcb041cf7ec598,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04 diff --git a/results/combined/merges_tested/benas/easy-rules.csv b/results/combined/merges_tested/benas/easy-rules.csv index a5a1b317f4..dbb4a8545a 100644 --- a/results/combined/merges_tested/benas/easy-rules.csv +++ b/results/combined/merges_tested/benas/easy-rules.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/remotes/origin/pull/184,ba07071a49b4ef022c745d13c6502b38794ef956,192d3fb32413f101c07fdbc9f5965b41a47daea5,12ef53dec57066f111a7ce9f1e72765469d0fec4,,True,False,Tests_passed,8ae063bf60773dbe12a9b1ab6fdcc9c7f1c0867d34f285bbc7003b4ddf87ec5a,True,99,127,266,2,True,Tests_passed,48e3adb0e6bc49f758017df58201dac8c127af6c9196395f3d493e6f7cec23b1,True,99,True,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_failed,a384118e494cac4f78b8a22831567241cef52ea8722c43cfa8b8b10d447b48a2,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15 32,refs/remotes/origin/pull/289,cc5de266d34bd622580059ef5de52d5e893c0b53,1967db34f27494adfbe443337a240891e96b50ad,b888b85119db7adde3d9399c9d9bd1d0079731f4,,True,False,Tests_passed,eda46100da055b1844a4bb18f2c5adad510930c2928460d2396afb8993500409,True,4,6,13,3,True,Tests_passed,ec8d986848f0c9e3b88548412c1332df3652820cb9578caf1cbb418bc0636e30,True,4,True,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,61d60f93ef0900a0209a83f92009f89d46755fb0ff4e42e880f7d7bc20820d44,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,3224e89bf539864fdab90426d1e7b9278e4da378a0b8e4aa736996733df48d33,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,6276e65d3ff7f69ffd1db5f3e3464783836962d7bfb8c2c7e004a4f09cd2c33a,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000 diff --git a/results/combined/merges_tested/benas/projector.csv b/results/combined/merges_tested/benas/projector.csv index 96b1753f9d..e310747e0a 100644 --- a/results/combined/merges_tested/benas/projector.csv +++ b/results/combined/merges_tested/benas/projector.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,f088b5c59aefe6966218d6af783f02ec7508a6c6,a127d12133d0f2e3def0d99a999250ab6ed5d77a,52020bf4c023f00a76086ddd3b6f0a48eb69606f,,True,True,Tests_passed,d81081af6ef3c25acc3e63a9b8bd3c26de150dd9010cb876f5751813fbee2e7a,True,23,73,391,4,True,Tests_passed,c0c421cf9772eb05bde93d2d847ca3788a3e5bdb65b5d4e9af1eea167d4a13bb,True,23,True,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,b77ec165ba3526546a4b76eddd037b5a0e0541258c5bdd154373473128cbaf53,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,8ea8314c66d21214c4b665c125e3c5dcd8e0bf830a4451ae7e2b916106a2e4c3,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,eccefcf90ef97c10c61c30ca81a3125938f67717a249967d92fecdca00e68500,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208 diff --git a/results/combined/merges_tested/benoker/dockingframes.csv b/results/combined/merges_tested/benoker/dockingframes.csv index e3ab4d3e77..8ad19dd409 100644 --- a/results/combined/merges_tested/benoker/dockingframes.csv +++ b/results/combined/merges_tested/benoker/dockingframes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,28c12250682f5b704cef429c96db66bf5bbbd2f7,6e0be54923e64248ef27a7c87d32060e5572967f,e44263da6b4b620a8069aa52ef0741c34c74209f,,True,True,True,21,43,88.0,2,True,21,Tests_passed,418398278234696fdaad1bfb37763868c5c69468196339e2435b7c9ac741793f,True,Tests_passed,6b566795116abba3c328224fe56759d7a9f04be9be134f3ebcc22af4c1e02a48,True,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4 9,refs/heads/master,75062c471a1608f1ad1c8998ee07674148a021af,3c4890188ceffc907e782b379c290399b82f432c,58a3104af288868069fde4095bd3b12be24a09b1,,True,True,True,153,271,559.0,2,True,153,Tests_passed,a116300d30f9540a1571bba3f665a46fc9e218251f98d4d2784770fa5f2c567f,True,Tests_passed,8c822c5739438e7557fe72912e91d45d945b1ac49c49f46596e4d758340e9a0b,True,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_failed,87427c04d6bdd41f4f9c037f0765d7ec12d97c52591a2b442a74aa97eb33dd81,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584 16,refs/heads/master,4eade0559bd870598985013ec714c63f8970d3f8,c8e2118f94c00cd54f79f74c078fa94c975583ed,40609b39f7233de8451abcbca8f44f7558092b96,,True,,True,861,2338,,8,True,861,Tests_passed,94593893294e898d96490b93aa520eca914ebcbc037a4271e9d8dce61dc57bf4,True,Tests_passed,8805ebcfc4e1cb032dc3eaccb8061cdc3cfc56099bbfd0a0d4570e71de2acaa1,True,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,69ae5d75b069ba7d020a961c267f004fe8b328ae912a21fc0eec4f6baa02b8eb,Merge_failed,4c9fac040cf0965674a2e404814f7f450e5d6e9dac9cfa4e05a70bd0677ec934,Merge_failed,bb80a26ba8f62507f910230e3e0d43024fa388a6f7330bd4f5894647099e6627,Merge_timedout,,Merge_failed,4c9fac040cf0965674a2e404814f7f450e5d6e9dac9cfa4e05a70bd0677ec934,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,358486b586b0c9de22688fc5299c06c3de77817e84b9b39c5e7801bd6b7dd219,Tests_passed,94593893294e898d96490b93aa520eca914ebcbc037a4271e9d8dce61dc57bf4,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c diff --git a/results/combined/merges_tested/bguerout/jongo.csv b/results/combined/merges_tested/bguerout/jongo.csv index 8c41335177..b81f0a3887 100644 --- a/results/combined/merges_tested/bguerout/jongo.csv +++ b/results/combined/merges_tested/bguerout/jongo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6d3c0482f5827269fec259963ed50d35bcabe99f,ac96b9a926e3682bb89be0838e68453622edef10,9dbcd964b3d9e76a4a6b17e89e9ef8087882de3c,,True,True,True,161,267,1448,18,True,161,Tests_passed,4fd6c7e96f4b5562e703d020798f7269c6b1874a9810774d2c68f1925e464d75,True,Tests_passed,fafaa63243c3c3056a631852db042f71694c805928929625faff3397796f7a22,True,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2ba7df0859d90ab55b9fe2814798a460dfdf5d63a757a1acebcef454ae77e407,Merge_failed,9e990e3bf34b0add263255dbc1f8ec3462d0624e18b5ec42c9aa7ebb6f661d4d,Merge_failed,54bea01067f972b622b2357165151db017d802cb924e1c35484479a83372ce18,Merge_timedout,,Merge_failed,9e990e3bf34b0add263255dbc1f8ec3462d0624e18b5ec42c9aa7ebb6f661d4d,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2ad580f983f9ed3ee9cbc18e59a579c1a1c83c0b01e0c5fc6bc3afa68d4be398,Merge_failed,4c776607238d62bad5fac3e22f15e6cb5732191ca2d2222f508c99a556ba0d5d,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34 5,refs/heads/master,697fc67ed565bbaf3b67d4ad5e8a19ca8c09e90c,468ca36d2cbf8216f91c3543aa60be4254469479,bdcc9aaa22f9470ce4d424736aabbc49c4857931,,True,True,True,39,99,1921,7,True,42,Tests_passed,8d773af9214d52f12790ff4fb133e81df8c5699668bcd88742e1f3e4d58cf2a6,True,Tests_passed,b2ca0ce4f00d3864211e434312373e07b732d8165795867063ce1b92f1608d1f,True,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,8e76cb6a448635dd1fe09fe138a948f98b94c6d7d347f64bfe9fb22e4cf666ee,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,2f44c4684153cba4983fe6526cce452b0a5eae01d0b6c8e637c5207ea84d2115,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,35da450546eb595b7c0ce859eb74120cf73e84a0eae411e6f2e74e180eb7d011,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d 12,refs/heads/master,ef3b9719963e125da4191c6917e6453edd04c410,316f9770889fbc078acd5ab38e7e1c571ee496b8,0ea85896485fe8d84c11a0598cc82736f89eb0d5,,True,True,True,37,117,1415,4,True,37,Tests_passed,f846a27607108dd87a56e53917d67a5990e336a003b87a5559c086b5bffd64dd,True,Tests_passed,ac2ee6645dcf4f3b88c491934de35be1e2ed90cd18ef5173138cedefa9de2da9,True,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,62fca201e00867475ca4b4db41470a423a9736169a07c29cc58c7b28eaa1aa59,Merge_failed,028557e11726ca6009fa724f5fc7dd386d0a6f3c886eebec8f240720d0b6a8e6,Merge_failed,b9c5f40b263141090de5a01bf920d4405b226f92d0f29801e9c6d6d72638af70,Merge_failed,b1d4e890ae3141c9970715951915b6a246289e7d9b3aba2affdf6b47dfee1aeb,Merge_failed,028557e11726ca6009fa724f5fc7dd386d0a6f3c886eebec8f240720d0b6a8e6,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,15649ba0de4174d06777f8866a3cbc75624c35a15d07e26b080b99b448e5c0be,Merge_failed,db73f98e9d65a9250f8a6367ce895bf9276852ced4fa8cc2c43eea7695d1ceff,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1 diff --git a/results/combined/merges_tested/biezhi/30-seconds-of-java8.csv b/results/combined/merges_tested/biezhi/30-seconds-of-java8.csv index 7a598663e3..2acdda5b17 100644 --- a/results/combined/merges_tested/biezhi/30-seconds-of-java8.csv +++ b/results/combined/merges_tested/biezhi/30-seconds-of-java8.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,True,True,Tests_passed,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,True,2,3,23,2,True,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,True,2,True,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,aecc17bc717623a21984d3b3e27ed054c58492c0002ecbfb4b744d531573194d,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Tests_failed,437b7e1683c8a0497ccd8e45561718e4c3446dbb6bbb294ff66d113d79f8b952,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,ad8dd15ad82b9ea258c6137fcdd93bb452e7c64cebd90087c43cffdadd21bcff,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7 diff --git a/results/combined/merges_tested/bitletorg/weupnp.csv b/results/combined/merges_tested/bitletorg/weupnp.csv index d96462660d..115c53a33b 100644 --- a/results/combined/merges_tested/bitletorg/weupnp.csv +++ b/results/combined/merges_tested/bitletorg/weupnp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/1,9054d6dff4032b41ba55d23678931497ff2af75a,5c19ff9fed515e83b86f15acb8d095b2f5e0cf5e,14664d548c67775a219b9a863e67e51242bd5bac,,True,False,True,2,5,14,2,True,2,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,True,Tests_passed,e7e462d1ff0dd4d1ea6665e84491d4ec1e7d574a1d6de93cea91575b36300290,True,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,abd4e77e256c2ae47df2d738c7926f45886eb1d51543573a414e3f3156cde993,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Tests_failed,28b55b08566201dd36e78904b866d12057c8ce64f5d5a064b37c1c9325f22d49,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,43ae16839c19f8dc33d2fa19cb95d53eaa0a8e72f76a61801a76d6566c52e600,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72 diff --git a/results/combined/merges_tested/bitzeche/zencoder-java.csv b/results/combined/merges_tested/bitzeche/zencoder-java.csv index bb88d8ff52..86e3ee0ade 100644 --- a/results/combined/merges_tested/bitzeche/zencoder-java.csv +++ b/results/combined/merges_tested/bitzeche/zencoder-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,fbdc46df52f91095d127c9df2b2223207aa84dc1,285373ebf744d569d4ef3d511ffa7e7a5e703719,22b5d5679795d9757dd040a193ea5c670b7898f7,,True,True,Tests_passed,5479ef98d11b7bd22d51c6773709b2334886b903b8a57508afad21ba1af3ed71,True,9,41,328,3,True,Tests_passed,5befcad6dcdb2242268da4f14997f8fec89a67b05c709a452c72577961c45108,True,9,True,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,38be400a0c7ecaca2be08ebd7c925aa4a974b315f47c0af64c3e178cd078296e,Merge_failed,5682b0fb46d54a6e5423ee907d4b0f1e67f93862cbab41f36f08865245b53777,Merge_failed,19b7b904d8f09bb8282e2f38e148cb523d0b912151135651031830a270d653db,Merge_failed,33b28977e1057789f7dfcf1460bb86b2d96322cc88e078604f1a1a0f6f6a8d73,Merge_failed,5682b0fb46d54a6e5423ee907d4b0f1e67f93862cbab41f36f08865245b53777,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8eb28b7cd510229e9d6f6cad13f98420d8d833c91de3434054b9f687e3d34be4,Merge_failed,19b7b904d8f09bb8282e2f38e148cb523d0b912151135651031830a270d653db,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38 10,refs/heads/master,116a8e2fb219900072f36ac16320fbbe459cac03,4a25777e403cce64e4e0b44006380f932d85843c,81aff4a5655d87bab53885f736501b0d1c3aa23b,,True,True,Tests_passed,10cfd377843a748955e24ef91b8f18e075813dcd815d591e1f9cd23fa43460fb,True,7,29,147,2,True,Tests_passed,e2fe6d4f35b12ce12831cd97bf9bfbb0ea6f638acc787c9088baff9554d26440,True,7,True,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f diff --git a/results/combined/merges_tested/bjornharrtell/jts2geojson.csv b/results/combined/merges_tested/bjornharrtell/jts2geojson.csv index 1ec1d150aa..26f7e1a3cb 100644 --- a/results/combined/merges_tested/bjornharrtell/jts2geojson.csv +++ b/results/combined/merges_tested/bjornharrtell/jts2geojson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,afbe2cdddd2d776744547752f820f0d8c03ad755,f190b3781a786d8102f986dd5246cdbf3652b8a6,bfe0f485963079579c710e12acd36d34971c775b,,True,True,True,14,20,153,3,True,14,Tests_passed,e1d3a06eeb005ef9624875d7442754e74c46d02dd642a54a0ea7464fb57121a3,True,Tests_passed,136350a3b76cae98a566f5af6ff93532df288ba825c498edf98e528f3b48e9c8,True,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_failed,ccb84a77be5c1bb83c71f413f8d00942c9e810e02b081b53cfd27047e1a4d105,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600 diff --git a/results/combined/merges_tested/blockchain/api-v1-client-java.csv b/results/combined/merges_tested/blockchain/api-v1-client-java.csv index 5f24d10a58..7a9df2374d 100644 --- a/results/combined/merges_tested/blockchain/api-v1-client-java.csv +++ b/results/combined/merges_tested/blockchain/api-v1-client-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,abdf54e6ab0b99eb8179d56e0598058243bcea55,14d5560b04fd84ba9c4173b6669a2b7d90354adf,225a34c40079ff8a5c44ef0da2fa674fa4bcea38,,True,True,True,12,41,406,2,True,12,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,True,Tests_passed,400509a7aadac2f2c6dbeac4fa83b871a9ed63fa9c197f18a5f586c8eab9523f,True,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,ae26565c3b47987dbb9a921750e6d9def70454777497eaa280e033394043dbc9,Tests_failed,00ff0c8ae898da356839cec84a16b4fb7ece04aa680cf2920f8d3cd8e27258fa,Tests_failed,a442417b380e0554bed108f42a092448caca7266834531d1d5e7048fbdd6892c,Tests_failed,7d44ca15c110f59345cf375666126ab3ecf4eedc028027db296b0b44d1b39a58,Tests_failed,00ff0c8ae898da356839cec84a16b4fb7ece04aa680cf2920f8d3cd8e27258fa,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,1986c53b0425468ccf96d4f503045c0df6b95a74fe07ff556da36c705606e4a4,Tests_failed,a442417b380e0554bed108f42a092448caca7266834531d1d5e7048fbdd6892c,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d 10,refs/remotes/origin/pull/36,e349598f954da532e51825f2580948d63d0bb743,3fb6d582999cfd32ce450a5f7bede6ad3704d08b,14d5560b04fd84ba9c4173b6669a2b7d90354adf,,True,True,True,11,37,332,2,True,11,Tests_passed,982ba1f18069e4e35900310214fc89dc60d0a05e75a76a6a49418e765fe69b07,True,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,True,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,8bf5c56890ce0c78978c8fa3dcb7f88cad797dda16517b779135ef400965a0c1,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Tests_failed,cf5f04cb95ee8406cd0bfe5053289bafc15048af1f2c7962cf72543b146a02ba,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,7d1d09dcb8425a4ea029cb446a6a321acae250b51e4d9741614713b67ed2025b,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6 diff --git a/results/combined/merges_tested/bluebreezecf/sparkjobserverclient.csv b/results/combined/merges_tested/bluebreezecf/sparkjobserverclient.csv index b8cf240022..d7832653f5 100644 --- a/results/combined/merges_tested/bluebreezecf/sparkjobserverclient.csv +++ b/results/combined/merges_tested/bluebreezecf/sparkjobserverclient.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,46f2d8d50ae406cbf93855eb99b88e0fe9003454,91c92ad05f63c8e1b472f6d9e0164eb92537e03f,5cd4602a8d657cccbf97ea489eea519446c0e401,,True,True,Tests_passed,8a7c2669ed7f66932c02dc0b26f2d9d5a0da8b3faadfc49a32f034b3c1ad6611,True,4,29,256,2,True,Tests_passed,434ad22f00ca5015e85fdea7ceb5d67365a5eefa83ef8620dfe92cc2fa5d31df,True,4,True,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76 11,refs/heads/master,b33358fc74b3dc49807f93670a4f96d863839aff,6afab29ab841f9395b75965af52e85f8533d3db5,f4b01c5d96331e1658b155a05657529768eaa8e9,,True,False,Tests_passed,774d79fd873ab931a6e1d9a684cf905020a0f2458e2ff69d5868922618807b6e,True,5,10,34,6,True,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,True,7,True,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2535e34195689d94c6c3248ce0956a66b1eaee1dcf491e5462e2987759fca28d,Merge_failed,1552d2c230f484b5091b4bfc6f587c6549087f590ce40b9fed5697c141a1bad4,Merge_failed,53f863c4ac6755a4f5398c74260cea022025cf5d1095d3d727eb57a21e5ca8d4,Merge_failed,3c0bcc61f898d47645b8c694c8d16b68f272db08e37b0c458a1856d5d0a59220,Merge_failed,1552d2c230f484b5091b4bfc6f587c6549087f590ce40b9fed5697c141a1bad4,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,909db81963769e27ad995fea080de2425b7b40b0004bf97611b595750a9fd08c,Merge_failed,53f863c4ac6755a4f5398c74260cea022025cf5d1095d3d727eb57a21e5ca8d4,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083 12,refs/heads/master,f4b01c5d96331e1658b155a05657529768eaa8e9,6a35cb34fb28f2241700043d7534bcbe01e4b604,701ea5337f1c1d46c44f34757ac85d1bf29a47d5,,True,True,Tests_passed,0f1543651a341d29653fd435d1f732cf99d314b52c56ae9002c04f25ba4c15ff,True,7,42,114,2,True,Tests_passed,e4cd90f8c081c2d823a2af404e8e0e98c2b17d6242188bdac8b9804dbd083a98,True,7,True,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,a12265e40d85310246355415baae618ede10d79c43201c8580652e98a60c28ca,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,a12265e40d85310246355415baae618ede10d79c43201c8580652e98a60c28ca,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f diff --git a/results/combined/merges_tested/bobharner/componentworld.csv b/results/combined/merges_tested/bobharner/componentworld.csv index 21cf54e0ff..67f5f7a2e8 100644 --- a/results/combined/merges_tested/bobharner/componentworld.csv +++ b/results/combined/merges_tested/bobharner/componentworld.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/back-to-maven,1a2ff04097bd33609bd1c4ea9aa833640357f362,831fafda54d270586421497d4c0036067a47838e,ff5f0c920c58135ce736d60598f8080b991b6095,,True,True,Tests_passed,446d6bff03c906d7fbf16009920c2d6eb262258abc08f32b836f2b2c650d8c22,True,30,17,350,3,True,Tests_passed,6d270490d1e754219ddf921a19de11ddaabf2a83d80e57db5116904bbcee7abb,True,30,True,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,c929b6baa3ee92bfd4fe6ea595ed7ae18aeaa1659183a216cda18e04102bc991,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,1ccf82ce5e23f2ec90495e8a2e3bcfd96ac8ff7a51fb12b6649613fe86b6c480,Merge_failed,6b461a8a8b6a5097d81ac39a204bd4885be5f32de98c964b62b9d1ecc752eb17,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,5feda344267eafca69a49836d76e3cf9366621b91dfc866a66ed5bef571fa699,Merge_failed,7e9ecfa572928a11b4ced9da19dea056ba62f334a643cbef65d2d2b1e0df02d3,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c diff --git a/results/combined/merges_tested/boilit/ebm.csv b/results/combined/merges_tested/boilit/ebm.csv index c7054f47c3..bb29abc6db 100644 --- a/results/combined/merges_tested/boilit/ebm.csv +++ b/results/combined/merges_tested/boilit/ebm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b29fc0d1313fff81549c25758b1cc7b1d8f8a610,49250bf09cdeb0eae3090090c1e73c5e87ee72b0,3dedd78526d1feb50991b74c94a9e962b0610fc1,,True,True,True,23,92,859,4,True,23,Tests_passed,fd4dfdca08d3015f825302ec21cabc87f93f120885734fb10f42ac2ce3fcb2de,True,Tests_passed,807672812daddb02e11e69ab92bf391754bd8dcfd4d208cbfa2c219132058223,True,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e diff --git a/results/combined/merges_tested/brettflan/worldborder.csv b/results/combined/merges_tested/brettflan/worldborder.csv index bf933f59e0..5f13e62778 100644 --- a/results/combined/merges_tested/brettflan/worldborder.csv +++ b/results/combined/merges_tested/brettflan/worldborder.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,e6564300c73bed2ff8b73101167a6172184faf8a,ec843cde03aac693186f75638b2ebdf865128dd2,8e68e83e3d68246ce0f54efae73522fde13aef82,,True,True,True,3,16,99,2,True,3,Tests_passed,5bb291cf17f6c5dbc48744bea4a1f0aa76522a2e11615549c5e6d4e3f8831d2f,True,Tests_passed,ae41a2c05501d2dd06f1ead0cdc8220c5e0f3f1217ce8eab69f7f65ff7f2569f,True,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,aed0db5a872a1f35b13ec59d5fe346bc16cd32d9738f409b07848d2c0738903d,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,aed0db5a872a1f35b13ec59d5fe346bc16cd32d9738f409b07848d2c0738903d,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7 24,refs/remotes/origin/pull/173,fbf9066966d4b472136dcaf207400d77e2652ca5,c2a45b5876985665c80be37ff343d01f20399fe7,c1d99e560c227b2b5e3a5fb2f0d410159ff3d810,,True,False,True,8,41,148,2,True,8,Tests_passed,6598f969f1251c250c2c6a2be0a5ec85b5cd6b46d3a80eb7efafcdbe6fff175b,True,Tests_passed,64b77d515fd91002a7092ca06daef30aa8ab91c4a549fc7e42b0708e73eab6e5,True,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5 diff --git a/results/combined/merges_tested/brettwooldridge/hikarijson.csv b/results/combined/merges_tested/brettwooldridge/hikarijson.csv index 33f87a31d7..31286ea518 100644 --- a/results/combined/merges_tested/brettwooldridge/hikarijson.csv +++ b/results/combined/merges_tested/brettwooldridge/hikarijson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,f1b45352cf9c8510a94fd97c943d4fe526cc94ad,98fb6a09755102f18ced62474bc1d08093fe06af,dc0f7cdf4f2186ff65e8ac4fb1edd7b2930d6171,,True,True,True,7,23,186,3,True,7,Tests_passed,8d2a1271a18045a380a928f3f87fa85f72215fafeaa6cd022459005e346aa220,True,Tests_passed,618dc5d39d5479d4d406718de1ceb91417fc3d2ea9052ad15711cc34fc74e090,True,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,3d60a23aa6a36c42c76c04dffeef362638e5712c94aecba00c90c8f26854a10c,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Tests_failed,9289d2a851a28f6ce2c2a41c9f3d5adbca19b0b15c37ae20f9070b14e2a46273,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,651ba4f1c0c92329b48ad72145386b4040247231c13f54f14534b5be631b9cc9,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41 diff --git a/results/combined/merges_tested/brettwooldridge/nuprocess.csv b/results/combined/merges_tested/brettwooldridge/nuprocess.csv index e3298406c4..c77244dfb9 100644 --- a/results/combined/merges_tested/brettwooldridge/nuprocess.csv +++ b/results/combined/merges_tested/brettwooldridge/nuprocess.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/remotes/origin/pull/104,f2f0b7eab313c7df153843f68dc79075cb7126ee,9422f21da37be6d6ae3ad2c740e71153126cf6bf,bc948a455d20373831757e321763ad47a3e67853,,True,True,Tests_passed,093b107a086bfdc5455c1f14ef6712f77df09299774f3eb579fc1ad9927a05c6,True,20,58,1098,3,True,Tests_passed,ac59cdbc29b49aba0cd720f5c939b2d79f70cada85af0d19745d198a7a7bdb9e,True,20,True,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,ba838718ea0c9753d33b1efa843226dce5cba7bed62561841d974b78c71cd29c,Merge_failed,0284c0999a585bdb84e78263a77a109acdc982a9713c1265d59b97678b31059e,Merge_failed,ccd0a54188db0435a9419be114069fb72f5049f9b2a6bdd2f67baa75e7863f88,Merge_failed,0dec57dfb4e43d0d9dfd40b72b12bef40b374dc63a01df569675fa433e7bf787,Merge_failed,cc509cc801c82810ce3f564d20052682b07f94c0458fd117e42a388b262f8d12,Merge_failed,ccd0a54188db0435a9419be114069fb72f5049f9b2a6bdd2f67baa75e7863f88,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,ba838718ea0c9753d33b1efa843226dce5cba7bed62561841d974b78c71cd29c,Merge_failed,77caafe5f22aaadf5815e9ef25e0a2a800b8ca5981ce94e70f6004491e8318b6,Merge_failed,6339230cc7ce8e9ed9d104cde9866ced318722d55c4d2ae216b735229a8e63eb,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3 32,refs/remotes/origin/pull/131,c18f600e9456192f1216d5f1e5cb8da32822bec0,014e357002becfa872b246373656ec1f8b5d9b25,9b42fc36d3c678939ffbdfc139bcae048fa96526,,True,True,Tests_passed,d78ceb58f5917736a3bf8715aac4a119be8619905a8060a617dd3510d5316a53,True,6,9,39,2,True,Tests_passed,e17e709961098ed93c9f2e67d78b96b5c8155e05f381dcedc2e92f67d7378390,True,6,True,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,4a96197e7a6cd3113209e78c39bc75daef22c4b7c5574fbe90aee8b4f213a30d,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,1df039dc0179d489cc27dcd6c4de08f6b0a32734f3bc6f3d26e867f5519f46a7,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,040f7d468258791940b5bb0ed3b227e9960edaad628b119c3c04f024bc110443,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3 diff --git a/results/combined/merges_tested/brettwooldridge/sansorm.csv b/results/combined/merges_tested/brettwooldridge/sansorm.csv index a31ecc99d6..e05bebbf3a 100644 --- a/results/combined/merges_tested/brettwooldridge/sansorm.csv +++ b/results/combined/merges_tested/brettwooldridge/sansorm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,d8492ff5c2ed8834177f8a7dc9205b220d59df9a,9ffe04fc1c96b399f085e0e4698c877acc9acac3,f80048ccf33888d323110805e8298d7ac8d4845f,,True,True,Tests_passed,a656b1ae42a43c794eda0ee84ca2c76bfdee59c672e13a6633c72da046e313a3,True,10,28,536,2,True,Tests_passed,c00e173656076dbeb6d741438caf5f0aca37a6c15d6e3adc5c395018793bc8d5,True,10,True,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,920af9d341e2f64140a8f62118b246fa869753dfaaf93aa8ec6d58064518b147,Merge_failed,928b1c3990b60be4b74784405d1bc13877066b9400a35c486b4f7e2affcb80d0,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,920af9d341e2f64140a8f62118b246fa869753dfaaf93aa8ec6d58064518b147,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605 14,refs/heads/master,6e3a8b4303ad3c0778bd04f08ceacd024e9b67a7,0b4c876530d7f4b4962fe88142d03ace6ce4d58a,9d23c8e449cc138506f4c71454a3116bfd051d46,,True,False,Tests_passed,9a9a1099dcca43179a9602fd983d6223fa9ef507b60df10cd2138730eb1bae29,True,4,15,81,2,True,Tests_passed,a128b6699580ca29f9938c9b6b0233f0f8057045c755ce6db700d846229e8f32,True,4,True,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad diff --git a/results/combined/merges_tested/brettwooldridge/sparsebitset.csv b/results/combined/merges_tested/brettwooldridge/sparsebitset.csv index b520894b17..8496fe9b81 100644 --- a/results/combined/merges_tested/brettwooldridge/sparsebitset.csv +++ b/results/combined/merges_tested/brettwooldridge/sparsebitset.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/25,43cda6d2235f1133ae94cdfebce65d0dbaa4d83f,1f168799ce0dcac325cc7d787b8bb24465bdbfa0,8b32633706533a1fb828e05415dbdbc2c32f3a31,,True,True,True,7,86,270,3,True,7,Tests_passed,a54e1416719615f83999c52735a79585ce2eff4f501f620963eb6800e82e2770,True,Tests_passed,c8aa55b9556b30704d48f2bc849676a11897da893973dc603bc242943cfd0738,True,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,b9d12b06a107afd30cfb524158f4025941f73a29fef086396972740ba6981b51,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,426f5e18614476a5fc9646cfdbc8c815eb887dbb494af6e083e0ad80b55bf1ca,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,4809ec42fcf03adc81529e2d2687b7f3630420d8ec1ae9ed02e41939926c0f95,Merge_failed,bbc0e976759ec252a74bc6e8a963550b76c30cd9952daa13718ffc312f70e875,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f diff --git a/results/combined/merges_tested/brewinapps/ios-maven-plugin.csv b/results/combined/merges_tested/brewinapps/ios-maven-plugin.csv index 54b2b5779f..cf570851a8 100644 --- a/results/combined/merges_tested/brewinapps/ios-maven-plugin.csv +++ b/results/combined/merges_tested/brewinapps/ios-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/remotes/origin/pull/12,ccc17f78b72bd7d10a1e55e134f3eb6205a97180,f5b7f6ef62af71a4d9f953956d87c2a9eaadd25b,75e78cc2b436b169582ce05d7c0b6871c66424b1,,True,True,Tests_passed,429b77e7e100fe4099b801c308b7c330955f0dc68a7105518f0bf26e2817fbd9,True,17,140,1466,2,True,Tests_passed,360795bd1e13760e12a6c9fddc0e03f361a00b164389fd2559d9bc19a9d3c0b0,True,17,True,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,372529464b657ce5f91cee6fe1c5ba3bee9f84c2b649b6f37ebf107caacc3eff,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Tests_failed,f336987a4b15e8db1a9075a2ad46b3b64863e76289d87de94b980c4c770cf43f,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,a84c69bc1dc20c16368316b800fea9530fbbb193e4645e7377a325511c618e39,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025 24,refs/remotes/origin/pull/12,4c30de881d6668e081444b320c4e978f4f15b383,da159976509329c5f97a1d5e8ecbff50d2895ff1,b64053dfe9d01af92df8c2a42ee2b482de3fb13b,,True,True,Tests_passed,253e9808286a6121a8c27f14fea353fea5ca8cf142075b7d703fef49890b2c64,True,3,31,94,3,True,Tests_passed,7495918e494a8317e051ebc5114b2b05b10ed587fec06cd282c4265477dcfa6c,True,3,True,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,38c08bad96054762fcae9d72e227dac757f07723663857f662c5f5218d6e725a,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,38c08bad96054762fcae9d72e227dac757f07723663857f662c5f5218d6e725a,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d 36,refs/remotes/origin/pull/12,cc61aefc6be843b887a9284521d0dc01ea1104fc,bb2794e814ce5a650dbc766dc38f1b571dfc5752,ae66d294c7807568b5638e18affc4d16442034d7,,True,True,Tests_passed,5480ab8b5a3b07daaee76889131aa91ce4c61cdd09423aa247514a765b978993,True,5,50,463,4,True,Tests_passed,40cc5534c0fbddd001317c2a1301ec554fb6827131dbae0b9d113ad17b72a3f3,True,6,True,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,675113349950cd033a6dba99852ffca07cc497ab1c77c91697ad73c6827b4ec3,Merge_failed,97ec0f870085831f8f7bd41495c47f943c5fdad0fe524a77816c2ad3f9495d69,Merge_failed,a6a20ac9529cdc61653edd263238b89c877531f70654285325d593cdd6b6c44c,Merge_failed,b05dc8072c18401887639750240c50a87589390865b816a9fe0fc5ba6beeb12b,Merge_failed,97ec0f870085831f8f7bd41495c47f943c5fdad0fe524a77816c2ad3f9495d69,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,c36a09a4ebc11870a514f3891a34eae2e949d80ece22050800bfe2aa2e824175,Merge_failed,a22950d485bb9f77afe2b2afeacb73809e3de1dd29550e221b073e97a7bc0f66,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db diff --git a/results/combined/merges_tested/brianm/config-magic.csv b/results/combined/merges_tested/brianm/config-magic.csv index b1c1a91685..f6cc770026 100644 --- a/results/combined/merges_tested/brianm/config-magic.csv +++ b/results/combined/merges_tested/brianm/config-magic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,a7953193ae2e296565ecee2809830b5abb3a3bb7,0b2b3049ac1f80ac94d49f7a449af8281ad462c2,9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd,,True,True,True,15,61,536,12,True,23,Tests_passed,729c70a5cce401e65730c1a776367d40596d97439f28693e55cf802a8fe0b37b,True,Tests_passed,dab5f506370335878353bba304d83b48b05cccb3b206ff36072c9a5cc6d154f9,True,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,7748651d8c623b99b0ba0156fd1580659486c8f0c98c3a08aa3148900e318b2d,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,9080527ca16f981f294563c98199425e3b0f768ffe435df4f892eaf9eb65a7df,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,deb7a2d54d2adb30bd533d94d012acf4811163eee93cd653cc50598d198ca790,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a diff --git a/results/combined/merges_tested/brianm/jdbi3.csv b/results/combined/merges_tested/brianm/jdbi3.csv index 438790e520..b9bf747a54 100644 --- a/results/combined/merges_tested/brianm/jdbi3.csv +++ b/results/combined/merges_tested/brianm/jdbi3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9f40c034b7d4b1a262f723ec81a630d1ebeb31bd,d4bf1ba6bbff2c9a9726839d0dfbad1f154f0c07,536ef1ada584141d12aba9135f744404f007c842,,True,True,Tests_passed,a13deb9bb2aaaf9cd2f71dc901689920efd234f151b2cb716cfe559d27a9b83a,True,9,27,294,5,True,Tests_passed,35508aedfa7e6c36aca6730ac32b3f82c99929041227b69b611066caee59f314,True,9,True,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c863ff0e204e9538b6bc0a39c5074be19f4c15087647e5a2ec3a2f07ca462f1c,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,b7361d7f9f382d4456a0fa6d01ff67778a6f362d0edfcd3a42517d9af8b68d3e,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,0bcb47231b3c936237cfc45de74b8b8ef5724d8355faaedbf43b9fcf6597dc88,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a diff --git a/results/combined/merges_tested/brianm/really-executable-jars-maven-plugin.csv b/results/combined/merges_tested/brianm/really-executable-jars-maven-plugin.csv index 92fc78b708..2c57ca3c16 100644 --- a/results/combined/merges_tested/brianm/really-executable-jars-maven-plugin.csv +++ b/results/combined/merges_tested/brianm/really-executable-jars-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,913bd85a3e0137af536fc489fe7845625da4c99b,692acc3220ae529dde128d24a6fb920e599359e7,3ed2c7154ac04c734cfb7459ba5046483e34437a,,True,True,Tests_passed,5a9ba7434f61d3ba973df6c3f8ec363af8c30b7c64b36fcda65ed99883768681,True,4,9,40,2,True,Tests_passed,2016b6b4b0bc06d7d2024adceff138d02b32f0c452250912dc97978795f7a49a,True,4,True,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_failed,b4e6399513be3a03cc0a300d673f659ed47ad801ccb0ec35ce21a6e289f4659f,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406 diff --git a/results/combined/merges_tested/brndnmtthws/hdfs.csv b/results/combined/merges_tested/brndnmtthws/hdfs.csv index 4fbce9827d..91054b741b 100644 --- a/results/combined/merges_tested/brndnmtthws/hdfs.csv +++ b/results/combined/merges_tested/brndnmtthws/hdfs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/1,d6f056ab178425282ed8e44a58cee9213cda533f,8fdcb074fc50b725375557e1ed079ff19832d314,3fb64891400b15dc0b9f0dc62a931cb76b823049,,True,True,True,18,81,572,2,True,18,Tests_passed,93691cf300a3d0d105efa4804d05104a6b2170ad4ff5e217f5bd6493e12f245a,True,Tests_passed,774d398fbfa75bb3e5212e487f3b4167fcbd2bdeddfbb3809c2ce7f0ff6cf7b4,True,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,518f230a765da5df469f53f3ff81c94f47094f4f81a70948484903c903168c4a,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,668c74d0d704b0e95ec0f79a19583432dba1b5ca3fc1d0e0ebf331490ebfab9c,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,518f230a765da5df469f53f3ff81c94f47094f4f81a70948484903c903168c4a,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,668c74d0d704b0e95ec0f79a19583432dba1b5ca3fc1d0e0ebf331490ebfab9c,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53 21,refs/remotes/origin/pull/1,dbe229fa49b77424ba23ac7cbd9bdfb744b96b61,76b31c3b23c6f7d02fb73b82e87ced3aa578c655,446caa52b7b1d88f5688cd5c709a21f1510e014e,,True,True,True,10,35,326,2,True,10,Tests_passed,73398654e4e57252b6389935d28a5f8d5980976a78a61e6811e79808fc77f50e,True,Tests_passed,aeba9670d069361c084c78338773acffe2b38559688194426ec7d42b24b81317,True,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_failed,c7849adae565133fcbe6c856708dbf4f2c193e76bea0f360d36da8bd5b61f2af,Tests_passed,17c5f2974295206b7b88876968934fd7d7641bd90fbe06427ba10aa7706c146d,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_failed,c7849adae565133fcbe6c856708dbf4f2c193e76bea0f360d36da8bd5b61f2af,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc 22,refs/remotes/origin/pull/1,812784211b2b5c66e974ff250e6e76e738e9b11f,5e3871f2cb13e280d91a6be28d14b4b6ce29da74,a1bfd285e3f7d5e530d6949387cae011dd0b48c2,,True,True,True,8,34,229,2,True,8,Tests_passed,9a30a6cd08133093185e491022fac02334f1ef21c3cc683f583e6e8a7ff89050,True,Tests_passed,1fa08c460aef0d159ce0433c4a879cfef63cd71729fde084e16b956daf57bc8c,True,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_failed,b697d9b715bd767aaf054192971a5378e8d8e40b3d2d5c060f7f5e3ddba02831,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_failed,b697d9b715bd767aaf054192971a5378e8d8e40b3d2d5c060f7f5e3ddba02831,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602 diff --git a/results/combined/merges_tested/broadleafcommerce/broadleafcommerce.csv b/results/combined/merges_tested/broadleafcommerce/broadleafcommerce.csv index 7c75825898..eb3f0f3871 100644 --- a/results/combined/merges_tested/broadleafcommerce/broadleafcommerce.csv +++ b/results/combined/merges_tested/broadleafcommerce/broadleafcommerce.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 171,refs/heads/develop-6.2.x,5b98c9eaa0c3d1420aab6cab1b92c4a333457c62,d1a42351c0c5391b49427ba7a0b216c7f5b14b43,48f5b0f737750ef45b8779ed24951995246e66f0,,True,True,True,3326,3375,8842.0,3,True,3326,Tests_passed,e4e11c6f253e2d914e9d344af3cd34c593212424b0bb62557731a77f78b08454,True,Tests_passed,1a6fee2e5dbfb83e9c260435c068ab59ed728c7dfa60e01d95dfc54e18e503fc,True,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,c48e24d437914b3ea97b1120c8a65de74bb066902f37e77fc74555ebb46e1dc9,Merge_timedout,,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,c48e24d437914b3ea97b1120c8a65de74bb066902f37e77fc74555ebb46e1dc9,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129 462,refs/heads/develop-6.2.x,4c906659b12b21ea55fd99e9e59d22de6a0133ad,5beb9dced0311917ca58e701bc6efbe0111f5237,af94f77e1218f0fb5357f6dcf3a0438fb6cf84f8,,True,True,True,436,1850,17483.0,3266,True,3386,Tests_passed,8301741259a9b51b2cf414140ef7bbe547bb91c7e578ce7ef1d0c6259a791e4b,True,Tests_passed,e61fba4c0c89674620006b27ff750c2ff83711232bc84eef5868e15db59b97f7,True,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,5a110cbc589f46e097a9ce3aa6fb4e5ac0a26bbb72fa023c35405825559f2974,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,06b8051893a5083887ab7d0f3bd8e848554a8b8a0e8b107fd2f03e687c3d8d13,Merge_timedout,,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,8a4b3d0b99d8e241cf823d29fb06b9839f4d2ed5a45619adfa1fe3c01f3401d5,Merge_failed,55d7ea3418e66732255a655c792fa9c598b6b1f19f027387c99f7ebb492a5653,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641 1123,refs/heads/develop-6.2.x,a7461670eaeade30b5c8c13d32b26c4917923658,fd43bb9f00750ce6f02a1c8da3b847e74bd590ea,e58639a35b656ec328dcacdcf921557524b56d1d,,True,True,True,3300,5184,21162.0,15,True,3300,Tests_passed,0b671eb4cf995142529bafd25d2176c7bf2b73c2bdabf18060fae0cf68a6d004,True,Tests_passed,1460fac033bbc3b1834db2bd4abeb000807467f1db95bc3038acc9b312ea6d7e,True,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,36b586ee24751c5fb8a42c5eb37b14c1bbeca3972c265aa747fef6f4c0c35afe,Merge_failed,ca64c3d36fac3bc2262f6a52bf8891789e6032fffcad55234eab2f644af16d1b,Merge_failed,4881a86a373ac60b31abd364b3504a96a7f84b7fa7b0a8ad28219fa3d1757fda,Merge_timedout,,Merge_failed,ca64c3d36fac3bc2262f6a52bf8891789e6032fffcad55234eab2f644af16d1b,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,cd20f18065dbf02055226b57cf76684256fc1eced7798d4f237700fb9120b5a4,Merge_failed,b9287168fe89b186b036aa6520427d37a83a5cbb50da217963e2f88de19a247e,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd,Merge_failed,61953bbd6b303ba15926bb911f07afe3cf198a64444620cfe3c8a9623b06f7fd diff --git a/results/combined/merges_tested/bronx/saci-vraptor.csv b/results/combined/merges_tested/bronx/saci-vraptor.csv index 48645ac5fe..a2b0677a86 100644 --- a/results/combined/merges_tested/bronx/saci-vraptor.csv +++ b/results/combined/merges_tested/bronx/saci-vraptor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,cb9355ed085d8366a0317c7be599c1ffc0256a55,5bd3bdf950aaa203727ed98c937edab28c6429b3,f7da6af523ed9afda669349adfd8f1f2361594ab,,True,True,Tests_passed,e72316aa393100cdd1b4386d606e305b84124f9e5ea8f3adf4eb3557148b4751,True,11,21,907,2,True,Tests_passed,fd47b49850c946f8857dca98fcf3f4b35c0b3a5edce8ec54a2a9ec81071931cc,True,11,True,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_failed,cc7b00e9fb77cbc052cb3a307e3dd35f12c444e516bf0ccc9af4e221dbb900b7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af diff --git a/results/combined/merges_tested/brooklyncentral/brooklyn-ambari.csv b/results/combined/merges_tested/brooklyncentral/brooklyn-ambari.csv index bb05e19770..0617245f0b 100644 --- a/results/combined/merges_tested/brooklyncentral/brooklyn-ambari.csv +++ b/results/combined/merges_tested/brooklyncentral/brooklyn-ambari.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/master,a5ae8a689444a06ec389a2f6403ed32d4ffd1ca2,6623edeb58a6cb51c4e60a77645307ca43e4dbad,7c6ca7ff7afc2c25fa33c31cdc6693eec5cede72,,True,True,True,11,19,399,2,True,11,Tests_passed,8645ca8c12e1a091e2495d3d094d8fc4c750f15c375aa06c07e7960481918cd1,True,Tests_passed,5000b615374fdf2763bdc4248978d790c580d9bf132614e6cab3f66dbff5b8cb,True,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,77db74edc64dd7a028fa23e99a725d134112d93b3a170ba1192835d33943e24e,Tests_failed,3b35ba1c77f78db32203c038d6060fbeb681697279a58fa42dbc55d8066c1633,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,77db74edc64dd7a028fa23e99a725d134112d93b3a170ba1192835d33943e24e,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119 103,refs/heads/master,2b1a13acb9dd3617392ce7794dc7602908e46900,3b9261bbe998deeee80c9bb1aa5bb293b4367e14,503e498fda03565bedb43a9b7ee4b3fa9b3b5b88,,True,True,True,18,69,784,2,True,18,Tests_passed,f0dd30643fa21bafb6af4f12317388cffacc2f5fc20c84758027a88edb55bd49,True,Tests_passed,9aa221acf1421d39a4e3e841c443f151bdf14a8c982173ce48140c621e62ea01,True,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf diff --git a/results/combined/merges_tested/brooklyncentral/clocker.csv b/results/combined/merges_tested/brooklyncentral/clocker.csv index 0c5e3d9130..0a4134c60b 100644 --- a/results/combined/merges_tested/brooklyncentral/clocker.csv +++ b/results/combined/merges_tested/brooklyncentral/clocker.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 116,refs/heads/master,6a392f0a5a52d4b0c9e4e06388bf6a38bbb1b625,797d4c99f449a7b8c7eadb9fdc4d4b9c7c490cba,3c29d938a856b0aaa38936b5742328382947cdc3,,True,True,True,17,46,371,2,True,17,Tests_passed,c1c04e8aefec64b5a552d49340f7f5b31c5c2fd73a5306bdd69a950aa082ce93,True,Tests_passed,63ffc8407ac6c0370b0920beaef5423c04981fcff774db87d7f6df295b5b6a84,True,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,581592c7199d649a352b005cb1e4b9aa9069a9d0d376b6afba060a8b2b43d73d,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,581592c7199d649a352b005cb1e4b9aa9069a9d0d376b6afba060a8b2b43d73d,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88 121,refs/heads/master,cbfb53b0dfa18585296f9f245310436d7b0a7c35,8ddf6384871980e1c167abe0e890b1337c863bff,fe6fdcc30b1dcee4c3452dc6f95793d8168c94d3,,True,True,True,6,18,131,2,True,6,Tests_passed,1d753f88e8b19faa593088894f51bfacbb5b76e3b591c134be9d8544d6e68cc8,True,Tests_passed,a862ac052a176185a30fe82ebe6870579db71fe106bdc82e54d33e02785b54f5,True,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,02aaf1c4aa02f1fc49cb6cb79eb9956d6ea8d6e84bb07019f38b50c391737c97,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,02aaf1c4aa02f1fc49cb6cb79eb9956d6ea8d6e84bb07019f38b50c391737c97,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00 124,refs/heads/master,9ee6e4afa42051b24cf142a5633f20e39540d6ad,a090d562efba0f121430c8bb2ad34f2864b9a8d4,537feda2d7787118f56e46df8bae45ea74e5c078,,True,True,True,53,238,2121,2,True,53,Tests_passed,fc79ea5815730a471ebdb772e0f16275dac24d1999407970aeb1dd0d78d63d67,True,Tests_passed,74370f83ceba6bec56d650c3d5045c30f1135612c25b49c8707e42ec79fec250,True,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_failed,308ea408874ede6274edf97b23aac844386b918a46fab6dccc19b2ed73725bec,Merge_timedout,,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_failed,308ea408874ede6274edf97b23aac844386b918a46fab6dccc19b2ed73725bec,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818 diff --git a/results/combined/merges_tested/brunoribeiro/sql-parser.csv b/results/combined/merges_tested/brunoribeiro/sql-parser.csv index a16e56af7b..c3b03ffab7 100644 --- a/results/combined/merges_tested/brunoribeiro/sql-parser.csv +++ b/results/combined/merges_tested/brunoribeiro/sql-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,ec06c99726c4d7c4d5e94601535cf87c1f62f265,4c768844566b6f1d168a3efba5b26ed3f75fc91e,d298f8d193486310c8813234ec30a280f315c6b0,,True,True,True,23,48,383,2,True,23,Tests_passed,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,True,Tests_passed,9e5ca09cb1c6a5815ba01308d1e7c56f17d7c005ad15caa33aaa810bda44b5a8,True,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_failed,1caa0ba6fed62bb84d73e792e2abc267aa10319d5329aa2fc0e8b31ca3ffa1ed,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7 22,refs/heads/master,c1630334b498c4225e461a5ceff425defa8a19c4,cb2a8621752755676d77838bf939d75f100e8a46,4c768844566b6f1d168a3efba5b26ed3f75fc91e,,True,True,True,33,81,517,3,True,33,Tests_passed,5ac8bab72a41d40712305539a62e052015af5ab082e9cb6cfb3be251598015bf,True,Tests_passed,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,True,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,ce1aa258d4406a85653f1601d54b2482626ee8b5bfc72d1a8b90afd25c53dbad,Tests_failed,676e5c3aeb226d9224184cbf27d9bb2a68633d961dd5286c2c92ddc26de0bc1a,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,ce1aa258d4406a85653f1601d54b2482626ee8b5bfc72d1a8b90afd25c53dbad,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184 41,refs/heads/master,b41794d7af49d6c07e339f51eac8209f2a0bb9d1,b9f2366c231ac47575199cc0654635d5daa42f8a,2f6f0bd59c9cc4f98ef37cd79974ccedf4df063c,,True,True,True,26,81,1159,6,True,26,Tests_passed,9ce7f449c1040527adf06cddd6f6da828ae9541db40eb6e2a2da5380535a96ca,True,Tests_passed,7d40fae398405bcbdfd89d9512ef772288013a6bf9e9d383881f0596a1eae5d4,True,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,9e5ab73c3a123504c49f29c888bfa563004784ba45bb91ca1915bb0eb81a8885,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Tests_failed,d9fa2199d7e0c448f2178afb2b3937304e0cd398e4e5953cc273ad5ea9ae8785,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,7b246148fb1c7bba29cbeaf3ed2f0cebd25770b12b23b087d3a67b7f6e7602fb,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350 diff --git a/results/combined/merges_tested/bryncooke/cdi-unit.csv b/results/combined/merges_tested/bryncooke/cdi-unit.csv index 10b2e98631..632d58e286 100644 --- a/results/combined/merges_tested/bryncooke/cdi-unit.csv +++ b/results/combined/merges_tested/bryncooke/cdi-unit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2af8a2a49d84164202df069beadd2041120415d1,472aca06eeb6b7b0859845da02053b0782c7c6fa,a02637bde4ca6947ca84a14958ae6988d6f587b6,,True,True,Tests_passed,55d0d9406cdac4af8de163a41136d54577eb78393bde2699af269846ee033e52,True,48,137,2037,3,True,Tests_passed,e64a5124920e28161f3c02cdf9ba827718afb9282834699f4461a82492edeccf,True,48,True,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791 diff --git a/results/combined/merges_tested/bsblabs/embed-for-vaadin.csv b/results/combined/merges_tested/bsblabs/embed-for-vaadin.csv index e1c3b6bc3c..9a4ec7d8e0 100644 --- a/results/combined/merges_tested/bsblabs/embed-for-vaadin.csv +++ b/results/combined/merges_tested/bsblabs/embed-for-vaadin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e1324f33636a9746384d621cddcea8cedd241318,b5e7156c005b7a106da3e82b051a4bb1fed5a7a7,2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a,,True,True,Tests_passed,36da6b0742033a2e04186d78207c31ee8d3ae201e8de6c637c24ad09f5fc514b,True,19,129,468,17,True,Tests_passed,9d007c72e73932718f03e83a9cf9a30df50923e3552d94f2de4478057f4417bd,True,26,True,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,664df9508bf1fff05c1da32bb7736dfa7585649776cd3f51796814efaca3b0f5,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,990e5c906bd4600e008e1016c8e43689a44963d03f03222a04782cc67efbe8e0,Merge_failed,7549cec2a5a1004651adb5cffcfbf2b0e356393c839a9f8351ef640c2c0f705c,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,a96dbfc6794e29386b91c4c776761d09d7abfa4771d14e973ecb76a3819b0de3,Merge_failed,6b26c2c9591cddfd41b1e757afc471c9150ac2b997e50b644eabefbd0b6565b5,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09 diff --git a/results/combined/merges_tested/bserdar/jcliff.csv b/results/combined/merges_tested/bserdar/jcliff.csv index 832a5de06e..02b8328105 100644 --- a/results/combined/merges_tested/bserdar/jcliff.csv +++ b/results/combined/merges_tested/bserdar/jcliff.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,206c63ba6f86b656ddf71caa32068a1f6c88b182,f2371218e88fcc234a2c1dc18632b6c222b86035,f1ff5fce7b5bb63e26b664efaed88ad08bb41c21,,True,False,True,3,7,11,2,True,3,Tests_passed,2aacb42f80fdd4db701140d6bf51313cc5aeaedde3fc4600cac3be9a0768f5f3,True,Tests_passed,5f46d7a96932089866b7b564ae519c208fdd76c293e0d4ab127ddb1dd723ef60,True,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,2e374151dfa848a779960688a45f1939e60784dc74ac85b76a59e5834fb8161c,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,2e374151dfa848a779960688a45f1939e60784dc74ac85b76a59e5834fb8161c,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70 5,refs/heads/master,f92b40d0588bda3a035268bcdf9cbf0ac8e6acaa,f9cbdf1261bdf671b12271025acf11f887bf47c2,6e4ddbd168592ee1df3de326fce2d1e1f16c995f,,True,True,True,3,4,6,2,True,3,Tests_passed,cd8946a704702159be7623b35cf5229e744effe1c88eb74c1383f193415b3d6e,True,Tests_passed,54cb902b3f59390abb61d730bfde833e7a73604e9f60d356f87740cb43c2c899,True,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac 12,refs/heads/master,e881122648feaa70b9217e6f3b4470e591642522,24a48ca859dfb150e0bf3c78315dee35b77b03fa,4556c62f76d7ec19372cd483232da355c8fe029f,,True,True,True,18,32,385,11,True,21,Tests_passed,10f54eb9af6680f01e5808c424cf6ffc7854574104bad952950ec901f5ca2b8f,True,Tests_passed,524fa3ed4cef1bcd5d42483ca21f8c83489a3bfb235a1d53bbb7ebca3fa39981,True,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,686b9c72ab9ddd5f3e785d616ae522a6246e8e135dd88d893a29267525c3dc31,Merge_failed,2a65477ae899e30dc13ed18974bf1091f947624b4363e0f7f9450c5d9062667b,Merge_failed,0dec5ca7f8b65e7cd302e30dcc7cbd39bb20351106c109e0a58cce521294635c,Merge_failed,7f6edb51c7a9857fc84bd99da8f1e0da09738d437a3fcc7763f49c5bc33e0689,Merge_failed,2a65477ae899e30dc13ed18974bf1091f947624b4363e0f7f9450c5d9062667b,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,4632c9630fed1c1b0b1ef30254e761cf53782a0463618c192c08165f4a993363,Merge_failed,33502faa5322a88fe32de3ca923bc5a6928e16d1fb65fce4a57ead0ead6e6e45,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a diff --git a/results/combined/merges_tested/btrplace/scheduler.csv b/results/combined/merges_tested/btrplace/scheduler.csv index cb0b7ad07e..1b85d864db 100644 --- a/results/combined/merges_tested/btrplace/scheduler.csv +++ b/results/combined/merges_tested/btrplace/scheduler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,8a939c1deed03406d77b6bcc81aae4dc91b2c9c6,4cc653c4f6cdec682044f25dc1d0fd1de277abea,aeac23d36a2933e852d4384eebde16c5e8ddbc87,,True,True,True,13,55,435,11,True,22,Tests_passed,548d217241f8573fd98b03bd5891696e810cb7aa38aef713bf347d2af3de371c,True,Tests_passed,85d0833db9a95a8184cdd49f242c84b35e280fba1fd6e04f75c98f56b1e72d71,True,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,4ee6b1e925c871208005d2b96f40bae21e6e499fe3bb5f1852ca3145a7ef2e55,Merge_failed,14a701f496b879018fd91580ed381fb52a1cb4e5d632e8a004901e54a958ce5a,Merge_failed,8edf110b13a642fc72efcb7e3c723439d909089ee1d5ace7fc5fab5ed42e9c80,Tests_failed,30aa888d4fcd804fea9e3ed15855c4f43161f9f3ea19d8d2ea18b50feab94b42,Merge_failed,14a701f496b879018fd91580ed381fb52a1cb4e5d632e8a004901e54a958ce5a,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,af2d63656979c5e02b5a0322b203fc9f41b48a5b8201400b36643ab92d87356a,Merge_failed,8edf110b13a642fc72efcb7e3c723439d909089ee1d5ace7fc5fab5ed42e9c80,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be 171,refs/heads/master,e98de3367896653a65052d04949c3d13f171d17d,6cd3ec8922c81f00b8ddba838c47c585fcf9ca25,f729a9d848a5e0ade380322464b3bf719357772a,,True,True,True,23,66,1095,3,True,23,Tests_passed,5b56903c911ed6e7008bc1120895e8b07bdeb132887d6eec7f8c67b3d27595bd,True,Tests_passed,b4622299446ab885d96cd8679127032bd920ccc385935298c45ce602b18120ea,True,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,5cc2e7713a6369c6414863974f848d1d423ee4c71c8cd15dab7d7323a799332d,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,4d54f49843f83c43d3eb0f1752f52d228f1c3283fd39a501321ae58a0211cc83,Merge_failed,8f98c17c6648d505315dfef750057ba027a113fc4a37eac472ee47e0afe452f5,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,8df3e5dc61b1fbf369717791af0ab0794f319ab325faddcf78add998f5c548c2,Merge_failed,4ac642d174f1cea3c47d421e56690dc687b81cb5778a8f3e513dfa0bbbf065a3,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91 209,refs/heads/master,494fe356ec067a45acc636984541d591b85bce2e,7021a9359776d7d6be074eb06e66cd0bb4c59001,624bb8c0eddb64b725a2e7a9205dfb9afec3de39,,True,True,True,25,183,1317,2,True,25,Tests_passed,130ecadfacd3cd7b2dbec0db26bdc46d05c5e97bd46426338ee6751b0c1a13a8,True,Tests_passed,ef53b088e191af3e4426a507d86b31e35d8326cd9bd4a5ecd46a73bd8bf83e2e,True,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,f6c405ce03c0f4cf4c0024e98b02e5020546fc558a2aaee1a728b8e6689d4ee2,Tests_failed,82eeedbf118a5da6b6d0fe4c3a8cdf34901b4bd7142b38a1aa390518a028a10c,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,f6c405ce03c0f4cf4c0024e98b02e5020546fc558a2aaee1a728b8e6689d4ee2,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e diff --git a/results/combined/merges_tested/buddycloud/buddycloud-server-java.csv b/results/combined/merges_tested/buddycloud/buddycloud-server-java.csv index f98aa4d7d9..0a217aa89d 100644 --- a/results/combined/merges_tested/buddycloud/buddycloud-server-java.csv +++ b/results/combined/merges_tested/buddycloud/buddycloud-server-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,48e4675ee2e4f2e1fe3a2603221fb47f0d124a7e,d312cf501be82762d6555dd9ef820c514e922abc,c6a9a1d0506b1d4bc81503dc312cee6cd1029e53,,True,False,True,11,27,127,3,True,11,Tests_passed,3bfbdf97ffdfbd44ab6db27e0c1f67468c7957de1aa58cdacc5f34b16cd2b779,True,Tests_passed,d79322cd4fed4bf1b668ef143bc4cfa164a61639abb0349e9ad3cf451e792f56,True,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,95618245606138ec89a3375126c37bc0c65798c4e94c7454a68f402aace67c47,Merge_failed,4326fb1a3331c2b67e4e557a332afe19cd68f9af18beda52bf89f517d3982b39,Tests_failed,8e5beb550328b9834a2d7cccb562e6b48ba19a3ee4515cd7a66610c7c90792e1,Merge_failed,4b4319bfa22db16a0815737f7e84ce799c845edc4803152930a49124d2bf826f,Merge_failed,4326fb1a3331c2b67e4e557a332afe19cd68f9af18beda52bf89f517d3982b39,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,bb7ae211a62de93c32742d5be4c5130f2f615df34bfa40b13e2f05dfc9c3a497,Tests_failed,8e5beb550328b9834a2d7cccb562e6b48ba19a3ee4515cd7a66610c7c90792e1,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f 17,refs/heads/master,80d0becca2d82332ee73da0bf55b44e2cfba532b,46b7ec012737f4e7c22276d1af7111b3146917f4,d0f7ff165853408e6cf9cafa61d64581d7020e17,,True,True,True,24,73,988,2,True,24,Tests_passed,96d9f15db399b7b58039f43a47e3da24b37376b6b7bdfbce007387e9bb709b01,True,Tests_passed,c0fd03b66a33b113124da4344cad3c1baf3cc4beb5c7ac9954e40c4afde31ac5,True,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,e5630208cb745e8f1a93f02fc0956eb0b39fbc71e7802113052349013f6952fc,Merge_failed,7cfb5395bc72664c0ec885381e2a822382f82bf9458112db48dd16d9e72a84b7,Tests_failed,f0dfe98e131de7abdaec5c0380b341ada92ed714fffc69c418da7967c649b2ad,Merge_failed,dc12fae86271d29ea6d352f30642b47c5d3ac8474825a46ec36984a1515d8ff6,Merge_failed,7cfb5395bc72664c0ec885381e2a822382f82bf9458112db48dd16d9e72a84b7,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,bfb9b24e421f795e9a9cd7ae81c936af0c786dfd0c14b00f446843969c39c06d,Tests_failed,f0dfe98e131de7abdaec5c0380b341ada92ed714fffc69c418da7967c649b2ad,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6 35,refs/heads/master,43c8b054e916bd4c564e9b91af3279d879db0042,a2516928ac92640f64c2d3f8ee4c9c3fbd91065b,5cbbc301e706559546b8b86a82504c2b4fda2a77,,True,True,True,45,598,2490,3,True,45,Tests_passed,d5ab9270d38ecb663beff1fc811a8b8809b57a115fd5ebad0fd06d967e36837a,True,Tests_passed,273016a3531ca74a9fc543c31f85a0342c5b85612880e3c91fff98d99306ffa1,True,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,dca8dde607775baf054d3b0ebffb7d6c346e3fb1233873df301038224c9fc1ea,Tests_failed,0c3eca50ef64e069d4dec5b4c1197752d5dc37053d8d35e4b17a449678069219,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,dca8dde607775baf054d3b0ebffb7d6c346e3fb1233873df301038224c9fc1ea,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184 diff --git a/results/combined/merges_tested/bujiio/buji-pac4j.csv b/results/combined/merges_tested/bujiio/buji-pac4j.csv index 0780d93fc9..747fa63645 100644 --- a/results/combined/merges_tested/bujiio/buji-pac4j.csv +++ b/results/combined/merges_tested/bujiio/buji-pac4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,aa289156c694d3a1a3dfe4da2842a32139ba1bfa,b4d264f60a6af4c04656453144195ec809bf7099,77581e045fb71856d932cc8481de991e08c81117,,True,True,True,13,16,798,4,True,14,Tests_passed,5bc2095654a708f995ddb342048ab42e2dc091dc6c56b4d89fa76d508bdf802c,True,Tests_passed,5cdb2ec704233a9269ff4743c1d57d21d2684207fb4470d6c524916d30c7520e,True,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,1b48a3261b417e9e708b29ec824ffd0f875734196331b731ec67af18d9215253,Merge_failed,a24d6724429fe600a4d2d0474ce345c78e60f32b28503eb3233103f4af134ff7,Merge_failed,349a4c956bddc0c6d494950519ae0fed078f4580dda4d543c46eee0813b80cc2,Merge_failed,156ed6dfc820f3a672dbd81d0d4ae4aa3ca32b807de034b70623e7473eadf9d2,Merge_failed,a24d6724429fe600a4d2d0474ce345c78e60f32b28503eb3233103f4af134ff7,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,327203b53806c495895ad190d02ee885bf119d81b5f07199abcb2e6c2dcc2888,Merge_failed,a754f123a7e419a517f3361719be5048a531b8968c3f72bbb7343710dddce8c5,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56 35,refs/remotes/origin/pull/68,1c7eb2acf1643212c399c9485bd30e3fdd5d88a8,3adfb5dce2e27bf2b7f1946ec097a7af5e324c71,92702c61d9db078febf717bbeea5e237a4bf9d2f,,True,True,True,15,64,658,2,True,15,Tests_passed,6198764f3533235188bb2e6581b643063bf9eb96f6185322429a185816903c5c,True,Tests_passed,b1221a13d7bdfd0ebeab7f885fdf6b845ffb9490af9ab9d4cc6a16daf6b24fda,True,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,7539d06b12858c20a246d32e745298e7da80e446a3a0aa7858be24766da09010,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Tests_failed,b835e8fc74b722f0d1101d97f7a301b4c2e04b1ff06ccbaa64635a0bf60e8e65,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,e5dccd6c3482aed6b7abc4cbfd97bea75e8e6c136db2572e33b71416ac680e7a,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c diff --git a/results/combined/merges_tested/buschmais/extended-objects.csv b/results/combined/merges_tested/buschmais/extended-objects.csv index d631062757..9ef0c9351f 100644 --- a/results/combined/merges_tested/buschmais/extended-objects.csv +++ b/results/combined/merges_tested/buschmais/extended-objects.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,46ec306cf6bed6dbcfa790383ae80542ebb61324,8b434139ec272993f04775ae7c4c2b3d3597d90a,7c316187356cf8c77c63e56af510fefeeeda73ca,,True,True,True,135,284,1152,2,True,135,Tests_passed,74f567f50a2c83d24c13cf4678bd243ce56b64f2510237cc2af460cfb1252d1c,True,Tests_passed,184bd57cbc90be0e41f6a750b7226c079670824734f7fb14ebeadd0304a3bca8,True,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,e78f52c4bdc316083afb9c7daf65a0c72e0e93d2b1af4fe274dbb30b1bc473d0,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4 diff --git a/results/combined/merges_tested/bytedeco/javacpp.csv b/results/combined/merges_tested/bytedeco/javacpp.csv index d7ea838f80..8595b633e8 100644 --- a/results/combined/merges_tested/bytedeco/javacpp.csv +++ b/results/combined/merges_tested/bytedeco/javacpp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,27be9c977a78d746890e5d5e0df1ed54502856cc,079d3d6dd4cd61f555d3b69501bcb0a16e3b71d6,7c53985d8e9d5311b478e903e80c7ff7c5fde277,,True,True,Tests_passed,886e3197039cc29085684c9af573bbcad613338107de59e79e75682da8eaad85,True,5,24,80,2,True,Tests_passed,2cabf6b5e6ee02ae1a4e92d3871b22b428d701acb7542bd90d0cd84bc5c776bf,True,5,True,Tests_timedout,f2578396dda9192bca0792c4fcc8629fb5b6f208e0feece68b61f1693950b746,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 10,refs/heads/master,0c2b518cb4bc81d77f33381473a1650c8da8dcbe,1d407797951ccaa09eb994e5401ebe123943cb5c,49b4f90556a344c1ab3b0cc35f1ac31c72039054,,True,True,Tests_passed,a38bd18827effdda15a694d6e2db5a91354000666798d401ecc3528f59474a74,True,3,12,33,2,True,Tests_passed,0141e4293d29d0c6e0cb1bfa9a44364d4c2d9c539535b2563a9f9917a47bdff5,True,3,True,Tests_timedout,261ef3ffcf4c85e51fdf322c6eeed1c596a282ccc72d72a6a03dd411dfd854b6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 13,refs/heads/master,4b738fa5c21984e5828f75c270ae17dab9c81b69,3380ee99b48a9e829339173307a35ac4363f1f44,7858f2ef7025b1947b30b5b59ab4554c5b594324,,True,True,Tests_passed,dbf014f98070d011d1a772484c47ae18ba016d2c0a3c00c27448a64672e67b0c,True,11,87,422,4,True,Tests_passed,90a3c4aab32d42d81b4861e9b5e8b280c3523f26a7719c6bde359dce73f51eda,True,11,True,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,71ae88aa8d63ad5d37e0b9d6b587c2b478de87bc75102e617ac67456265e4a27,Tests_failed,f1c0cb6781db6796b751ac59d30b6fd419ed2b95e5c2dd0f111e8ad5ffce8619,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,71ae88aa8d63ad5d37e0b9d6b587c2b478de87bc75102e617ac67456265e4a27,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407 diff --git a/results/combined/merges_tested/caelum/vraptor-console.csv b/results/combined/merges_tested/caelum/vraptor-console.csv index 166bc7f79b..d19d32eb2e 100644 --- a/results/combined/merges_tested/caelum/vraptor-console.csv +++ b/results/combined/merges_tested/caelum/vraptor-console.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,75017316626095be7d4b6cbb4c1532561e1ff8a1,10d80abb189438236c5a5d5723c222ec28a69ee8,db3d6f9a2375d14d9a96c2281572a6741acb32bd,,True,True,True,5,8,40,2,True,5,Tests_passed,96a540f2c8b27352d25886f40f3478f5b1002c52e02d6129a9f63c86bb124927,True,Tests_passed,4ab414c3cb61a6dabbfc4c8be31374cf153b0441f0da8203d36f1c64939d8987,True,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,0a725314e82bc8b3f61fdab978411ab12eddeaba1addc5d75ca6ab6f2a78a827,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Tests_failed,53daea6c54a628f9e50bd4d6c0975b8a6f294f887eb5f4983b9d2966881b9860,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,ad807156db648757f177a9a1afd2604b09d97be18ee0cf3856832a6a4bd433d6,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba diff --git a/results/combined/merges_tested/caelum/vraptor-environment.csv b/results/combined/merges_tested/caelum/vraptor-environment.csv index a5a10a7a3e..fb256924aa 100644 --- a/results/combined/merges_tested/caelum/vraptor-environment.csv +++ b/results/combined/merges_tested/caelum/vraptor-environment.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,57463c6eb5148d0640081dab2ba0099937ba72ed,f708e7975329930f818ed9ba45ec415748b2d73b,b95e39f1416ceff938c759f0684bdce789a93e59,,True,True,True,17,40,415,4,True,17,Tests_passed,011ec18143fe90baa19f61869023d2caaabc431a5473ed0b83a428e24551e0e8,True,Tests_passed,e8885593a15b29783e6b151351f0dfaa4c5235a1ca60b11cf91679b2c69aa5f2,True,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,9c8a55669205d9f3dbb68e5e9880ca9b4b588d77a0d8339ff8cd529986d202ea,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,2720cd2481515561bdaba21ca01454a9be41f3916d111c9c46a8feaba93a297a,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,112352105272526c53b8c397b1d23ec40b1906ee85c1d1ada79dde373f4b6a26,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe diff --git a/results/combined/merges_tested/campagnelaboratory/metar.csv b/results/combined/merges_tested/campagnelaboratory/metar.csv index c3df694dc8..d6ce494256 100644 --- a/results/combined/merges_tested/campagnelaboratory/metar.csv +++ b/results/combined/merges_tested/campagnelaboratory/metar.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 47,refs/heads/master,941f6a100b2514ab3e75a50e6b26ad81da2a943c,ba9c27836ad3dcfcefb07396272c51189b7673ba,1eb014f526352b8eaa3b720d12f278219124cee1,,True,True,True,19,38,24936.0,293,True,304,Tests_passed,6305dbde732a595af3137d7b46d01ebd2f10497d8336aa3358315dc5e40ecf3b,True,Tests_passed,d3476aee4d1b965cd4592ef8d9422bcf67b9421a91d7aaf330150e4c0076a811,True,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,94afbc677e17dec9a965bf5fd807fcc6cc3e930db433a08cf92c76269fcc8d9e,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,2f9ca41b046d2a92364085252570c5ea38e7073f229c2377f627a430a0bcaf07,Merge_failed,817b83f5a0d59d08925b315c9f72a84a64994505d5bab5f0fc3efa3e4167c7e5,Merge_failed,0803d122d6fc74c588b437bd2f0711853652ad8a4cf96b470a8cad15ef1d5bb9,Merge_failed,37cf9e84c00f97c3feae8785ffe1991684de9eb1d99c38ba4f899ef6b039989e,Merge_failed,15cc07c760bb8452d2f56e5d6dcaf71acdb5b3f330bd5a921c8ec9b400639431,Merge_failed,63bb41ef637684db5914a1055d6f9319fdda3beaae7a9d2e129249c3a3dbf1d1,Merge_failed,9ce3e94c43e9155b5987aaa796ba6b0c1d8e6098ed615c6cd5e3f2ee40efeef9,Merge_failed,9ce3e94c43e9155b5987aaa796ba6b0c1d8e6098ed615c6cd5e3f2ee40efeef9,Merge_failed,63bb41ef637684db5914a1055d6f9319fdda3beaae7a9d2e129249c3a3dbf1d1,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,2f9ca41b046d2a92364085252570c5ea38e7073f229c2377f627a430a0bcaf07,Merge_failed,817b83f5a0d59d08925b315c9f72a84a64994505d5bab5f0fc3efa3e4167c7e5,Merge_failed,0803d122d6fc74c588b437bd2f0711853652ad8a4cf96b470a8cad15ef1d5bb9,Merge_failed,37cf9e84c00f97c3feae8785ffe1991684de9eb1d99c38ba4f899ef6b039989e,Merge_failed,6ea4c55494b4c435e2876b6df27f89ee5356744d025941af6d06e0f4cb968fb2,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,94afbc677e17dec9a965bf5fd807fcc6cc3e930db433a08cf92c76269fcc8d9e,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750 65,refs/heads/master,d17d8d1403f28b9fcadb710d89aec0c5d80128bf,ca7e791311f80ffc48b9fd903d3ee54b5bb6a6c1,287ada0e339a049d2640b9e6c0f876a783609292,,True,,True,141,18159,,30,True,158,Tests_passed,8a33876aed0e9f7f05fd7c726a2f9a6cc82d49895ccf0a392bfe86d0e9e5f2f9,True,Tests_passed,da7ea378280a05735d484ae97b1218c2d7d45e8d609501f975f862a73d43a79f,True,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,050bd2ce6df29ce4817933ecfc43ffb85acce8c1d71754abec7b3b9b5cf8171f,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e4b89ec214db5f9a2a6b00385d4c145678f3fe3806631a9a6ddec31c1907877f,Merge_failed,c8d7faf78f8ae3c7fc79b446439664c0a2174c99f58c2492af3ff998a7050582,Merge_failed,8d842e107fc9c068d8d80c9dcb65ffad1bd8d0e0039fd944071b778dbf2005a6,Merge_failed,ba6c7786b4f1b4da842e20cb5fc1911a49cc8f506d7496316b16879d8d2d6aa7,Merge_failed,13cf756b0272755a7f2a385dccd4550a1185e1a900643b1a5a1af9d6780732c0,Merge_failed,3976bab08a65ae2d41f1e5e002cae269dd3f3ff89790496afa6b5da37dac72e5,Merge_failed,e7b085f99424a648fee23191072a6ca92138c1ea86174d6fc89457e5b816a726,Merge_failed,e7b085f99424a648fee23191072a6ca92138c1ea86174d6fc89457e5b816a726,Merge_failed,3976bab08a65ae2d41f1e5e002cae269dd3f3ff89790496afa6b5da37dac72e5,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e4b89ec214db5f9a2a6b00385d4c145678f3fe3806631a9a6ddec31c1907877f,Merge_failed,c8d7faf78f8ae3c7fc79b446439664c0a2174c99f58c2492af3ff998a7050582,Merge_failed,8d842e107fc9c068d8d80c9dcb65ffad1bd8d0e0039fd944071b778dbf2005a6,Merge_failed,ba6c7786b4f1b4da842e20cb5fc1911a49cc8f506d7496316b16879d8d2d6aa7,Merge_failed,e555d10aff3582a83aa9bad722590a62c3dc812da3536125b8f24d54570dfb26,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,050bd2ce6df29ce4817933ecfc43ffb85acce8c1d71754abec7b3b9b5cf8171f,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4 82,refs/heads/master,e15e027511bd3acc93ebaf5951d94cd4e2237802,0fb473afcb8ebf5c4e4a76a8fc643aa728d6a7af,dd61a838a1abffd31b66846af3db7e88910de966,,True,True,True,156,1518,42426.0,13,True,157,Tests_passed,106f6e8845027faaaefba96befc656f44560c0c8f6a24b6ea24ef24d3020495b,True,Tests_passed,3792d46956786148aa626758b254f951d116d2596bda97a4c79fea85a0d102ef,True,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,6fa0344426ff3f15b12089934a5057db632ce26a230941f9fb3cde6295b5dd21,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,0b2069066eda5487470f69243bf1638df221fa453faaf259c7b21493a520f438,Merge_failed,6c397ad89ce5a570020ede98b67fa73fb632d8b58b79506c2c6e1a7aec2f5c21,Merge_failed,5e4ad7103898d480285fba5972aeeca120ccf1181d36199940c6393f4ffb0b15,Merge_failed,4231ed54ef365397975b52df12d4f9599142a4d864ce239f6f590b05beb675ce,Merge_failed,bf8883025b0b9aa1404e619a6de8334a50f72471988ae7acdae783ff3cb5f048,Merge_failed,4acf3cb9fc131c4e3bd2c353dea4fb4a24445e17905af153a0563b1d6b790798,Merge_failed,f9e3528c19ba061bddf070210b4d397bba936e6b8c897223cc8a1fdb82a4483c,Merge_failed,f9e3528c19ba061bddf070210b4d397bba936e6b8c897223cc8a1fdb82a4483c,Merge_failed,4acf3cb9fc131c4e3bd2c353dea4fb4a24445e17905af153a0563b1d6b790798,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,0b2069066eda5487470f69243bf1638df221fa453faaf259c7b21493a520f438,Merge_failed,6c397ad89ce5a570020ede98b67fa73fb632d8b58b79506c2c6e1a7aec2f5c21,Merge_failed,5e4ad7103898d480285fba5972aeeca120ccf1181d36199940c6393f4ffb0b15,Merge_failed,4231ed54ef365397975b52df12d4f9599142a4d864ce239f6f590b05beb675ce,Merge_failed,6a9e3b803043c2d1088bcdc5d0005f187967cb609ba1cac41091dd54f297206b,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,6fa0344426ff3f15b12089934a5057db632ce26a230941f9fb3cde6295b5dd21,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460 diff --git a/results/combined/merges_tested/camsys/onebusaway-application-modules.csv b/results/combined/merges_tested/camsys/onebusaway-application-modules.csv index 61ef406cee..f3c7afaf3b 100644 --- a/results/combined/merges_tested/camsys/onebusaway-application-modules.csv +++ b/results/combined/merges_tested/camsys/onebusaway-application-modules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 63,refs/heads/unified,e779e9fce1879efbf6a4241c6a704aec6c2faacf,f66fe0132c2d695835e1cbb85425e1eaad1b6836,6541bbbe23fe4e5be1da37c3f3711ac822f51530,,True,True,True,57,91,494.0,2,True,57,Tests_passed,e9fd9fc53bcd45c1e69d5c96aa8f8ce328e3e15ed4325633eb85eba2295e0cb7,True,Tests_passed,0b0cdf552093fcffe9a0076a9c7726926f85b46547898bdb01f9971c08cb5478,True,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,2deed109cb5bc55960dc540f861c7b5c70694ca8e976bec20c6e86ac54255d32,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,6ab758b4530459059e98840a75214c98dd4f7ff7a82193e617436360a2d329d8,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,deae9a7ad31312ef23fba4dea74b713cd2cb4a9660157d231a15e5a4384923a8,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2 65,refs/heads/unified,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,True,True,True,71,111,964.0,2,True,71,Tests_passed,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,True,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,True,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3 518,refs/remotes/origin/MTA-10-Update-the-sorting-in-the-results-returned-from-A-D-for-Location-call,341e39ee896661cc6161873b5471b8273e4a8078,7f3b9088a19497fb0ff56169ad139ea250e3e096,5d5d379aecadcf285ae16dea6fd3cca7fadddf6e,,True,True,True,10,18,112.0,2,True,10,Tests_passed,f580b32e91f27392d2346abc3e5ccb6e6c854d956ffbeba299ace1df5af50ba4,True,Tests_passed,ce5a75d6d881bcdc56bf379e8799f49fc81194356689b18cecb0003412846b5c,True,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,a7098b512b3ec0c6fd36334461dd142e2f4071442e4147751e46f0e0329bc3e3,Tests_failed,ffc17fbbffb8febcf90e871b50ee2f2b06121547305838bd327159cae4c1d945,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,a7098b512b3ec0c6fd36334461dd142e2f4071442e4147751e46f0e0329bc3e3,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5 diff --git a/results/combined/merges_tested/camunda/camunda-archetypes.csv b/results/combined/merges_tested/camunda/camunda-archetypes.csv index b1a738b076..e1cf07de39 100644 --- a/results/combined/merges_tested/camunda/camunda-archetypes.csv +++ b/results/combined/merges_tested/camunda/camunda-archetypes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,4bc11ca34e0b8a811a6d5f12d45eaddd2f646cc6,a82d4b5ccd4d730dc2544bd5ee00870a91f30f09,b031aef316b7324b624b71a198e41e9cd434e08b,,True,True,True,141,543,4307,23,True,147,Tests_passed,5b339b1582680df894e0747a589001c73a274ba807c9b7cdc51376bc6585ff9e,True,Tests_passed,ffd6854096cd1b0c1e25215dec348f4f44892c9cce2bd941cbdf9c830739b0bf,True,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,b2d6ae170cf5a29aa25a8d1761ea49aebeb03b5c753c28d8ae8ea26917ee2147,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,a8df1c2cee8d1ce9929447beec3482d2a895929586f7eafdcf0c17853b259f50,Merge_failed,c2f964f9673867d125aa2401bacf8c87682db279e9f179948a2037b2f9784796,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,e3d2cedca60129eb495f0475947ffa5b4c0bc77c4a5fccf608f584328fcbcda9,Merge_failed,0e34751bd8042bea0b1d0836a7f8cbac841d57273378339d51d15faa934a1dc3,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8 21,refs/heads/master,4568e4d7cc92f7489d29195b61aa45fd1d0ab39f,ce64cdd06c37fadd78159299cc1867706ab010ce,f1781f86ec33dfa815c207b61046b40b8859bb0c,,True,True,True,10,21,152,9,True,10,Tests_passed,bff2ee374da3040068d7836862bbcd2527d6b72307259580616b4180b6bc1201,True,Tests_passed,1a4dc76b6e1af23767944975039d6f629e734bb96057c30e08637a5405879817,True,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,eec1631d3236d95d6f5d8d05513cede646dc56aa050f46b91eaadea021d374b9,Merge_failed,4c836ca67472bbb8874e38db2e1688df17b39c9b30c4832d8821d63cf2a54a37,Merge_failed,c64f8c17c30a88c6f35fa97e52364768869c14cb06ebdd93e1a9bac1f70d41e9,Merge_failed,601e6451b9221568da2a66bde28b8a1cfc828908b67b02fbbcba7bcdbd3a73ee,Merge_failed,4c836ca67472bbb8874e38db2e1688df17b39c9b30c4832d8821d63cf2a54a37,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8cf30e1245e79d70e43e420c0f2d71634dc816a2f17d4cd1ed7b519dcf79acdb,Merge_failed,2d28a1b7f69c539285fa62a9e461e2e08dde6340ea3be2684cafc54d83034cc1,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc 23,refs/heads/master,a6522ef79660ae912bce81730cb8b8be465c144a,2567e559b74b676a3a51ee2d0d28fb3979ae906c,2f0e26c2b3849343dc9f38832f0537fd8ad2b2b7,,True,False,True,40,134,741,5,True,40,Tests_passed,66db1f1276690d52a7c9993c2ca21e326790c9c8c75ca28332f937fb1b35ccde,True,Tests_passed,3a9195befa738e4294b0ca4b0576d2014a456c857828db0c72f10d2bc4af4f83,True,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,794fb175c277044760c8e3bb41b384c46b6b67c4364f4d1a62595c8cbaca1578,Merge_failed,647c485823b22cecb1255625e40390458871ca288e1fdfce0802e046934c8d92,Merge_failed,e919e5a57a0aad39ae3e8680b31356c38b1448433df869e2b77939638d5c2ea5,Merge_failed,a07f1788354c123c6f2c1be2cd8dea4a28132d49211bcac7ff0a45a69862799a,Merge_failed,647c485823b22cecb1255625e40390458871ca288e1fdfce0802e046934c8d92,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,9ba2fbe20eed6c48deffa663d9c14da502f7b27365015540acccccb31f8af539,Merge_failed,4b01b4d7abe4aaf085377fa2e3273b61a1d6e5cdb2b953f3dfbc265722c4e3d5,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed diff --git a/results/combined/merges_tested/camunda/camunda-bpm-mockito.csv b/results/combined/merges_tested/camunda/camunda-bpm-mockito.csv index 05d398f024..9146ada948 100644 --- a/results/combined/merges_tested/camunda/camunda-bpm-mockito.csv +++ b/results/combined/merges_tested/camunda/camunda-bpm-mockito.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 38,refs/remotes/origin/pull/294,78b4cb3c2f263d88d6ec38ce5df1aaaca2175cd2,0621a6e79bb2af209a81808c0afd690394f90c17,afd1a51e6f4d944a2c09a89b57b1d40a7b2af707,,True,True,True,41,34,421,2,True,41,Tests_passed,1775965d40e66ff2cd6e7f10c5a402f67d2283c17120f618c8629c663000f6da,True,Tests_passed,57bbc1555ee7071519b7368b068f666e3768dd801d48a729f76964814fd11b79,True,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Merge_failed,b030a19a044be027bd668a9e491063ff3cea0991a79a81d0104f290b4a5166cc,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Merge_failed,556c3b7e8479b78f4e94ad01ab8c8bd1930ab5702ab6e7cb2559f20db4d5776d,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28 43,refs/remotes/origin/pull/84,3b9d3c98b5b6e2dd753097976e21ee5e3ca2ae0b,f86608325b39b5c68f406056fce6b8bfd30fd593,982b05589592f024e3fbf0af3a31862d804eeddb,,True,True,True,11,40,211,4,True,13,Tests_passed,b7be287fbaa90321d59d6fdb858dcf30099b5351e82c2eae99dbb59f38b01a53,True,Tests_passed,ed78dec0f4c077fef2fdc6ed29d89dc8975b4c0668167aeedb1c9419156074c7,True,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,101228a6d06446b22f705edf27ba7ad51e8e18856131f038a4ab083031b180a1,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Tests_failed,2c8f8957d45786c9dcc3719bee51f4880c4c8f2d631fcf4ef8acdca61effcfc8,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,93603ad80736fc96d246f327f61cee06794624d85ab10e4a80db2ffba30a8b96,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177 diff --git a/results/combined/merges_tested/carbonado/carbonado.csv b/results/combined/merges_tested/carbonado/carbonado.csv index a71ada1237..cfa571c8f8 100644 --- a/results/combined/merges_tested/carbonado/carbonado.csv +++ b/results/combined/merges_tested/carbonado/carbonado.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/v1.3,13f58b778c5559b24f1b371cfb54ad80a5ba4b3f,32d20be647d80ec3509bfa3d7040b0d21cd8cb83,51d486867a0f610f034f1934e6d494e5d302f383,,True,True,True,13,22,111,2,True,13,Tests_passed,82df07c66438f8489a5a423933744d5c482ab95f513a5d209ca1a3d7b3bdabb4,True,Tests_passed,e0b92a6b14b8106114997025ce66478e7ac034d77a22a2febcd6a777a46aa261,True,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Merge_timedout,,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b diff --git a/results/combined/merges_tested/carlossg/glacier-cli.csv b/results/combined/merges_tested/carlossg/glacier-cli.csv index 3ddd674a8d..5b8a97209d 100644 --- a/results/combined/merges_tested/carlossg/glacier-cli.csv +++ b/results/combined/merges_tested/carlossg/glacier-cli.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/11,71a1f6f512bc099e47cfccb15b46b33a3053afa1,ec9c094a73a35264837116dc831a5f7689a3b895,486498aba8bbeced3e5c3833793f3f2ad2c4d160,,True,True,Tests_passed,35dc813e0f3d097838b989d9cb45010c9a703def19508b0e51098ff9b1896086,True,3,5,123,2,True,Tests_passed,b10b46b7195fdef8f61e44bdfbe39b95da78828e512e520188049f1b70832483,True,3,True,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,a2b32d99c3882bf06491815901c3bce3e258af93f729b3ed4d75a1381878446f,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Tests_failed,572f50867b5c3e6f61ecc32f6b74ad19c8d9ee928984640ebd7541c2b4675d6a,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,4199bf2e6b57444c2427faa44b418f04920332381242e919f28e6b28bd1a9d26,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091 diff --git a/results/combined/merges_tested/cdi-spec/cdi-tck.csv b/results/combined/merges_tested/cdi-spec/cdi-tck.csv index 9bd3c406b4..38bbc8d613 100644 --- a/results/combined/merges_tested/cdi-spec/cdi-tck.csv +++ b/results/combined/merges_tested/cdi-spec/cdi-tck.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,d3b387c66f86d5594ff36573b593a928791d01dc,c252b4f509588a578ae033d522f35a45fc360a1e,f69448340df0a4dc54b658a796152b9952fbabec,,True,True,True,35,47,154,40,True,62,Tests_passed,26783a61133cdbd45413ecdc6e0c5e6673e016005d25ce1f1afd8870956b711f,True,Tests_passed,7fe74134ccd40a6f84eafc84eb0011bc94ffd0b9c2885b07aa9ad8da26b27784,True,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,3365611d4efbbba176412742ae3ce9a83baed75ce415e78d6af7e0501c8d2399,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,0b52e4c75a7475a363d9749014b41ac993966f3225c212e23e5ba64dfbf8a54b,Merge_failed,67ec3c6ce062fe5af578d6c507706341abaa06c80011f87d7dc059b8151595fb,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,0046bab0a0375f4c7806ea75ca58c9fd793c5b2429c3878b76db53214a64eaf0,Merge_failed,780c9e7cd71f39236a20e92c8a5006c8f9d51aec5bb41648ae2c12c1d0e71ff5,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580 64,refs/remotes/origin/pull/277,48659940f253d34e5194ef4c5935000aa5d5ce22,e4080c2d06bfcb70bbc5f7736872fdbba5816627,44676c8c5e55c881984b0239ef55b4f739a6997e,,True,True,True,2335,4115,11836,3,True,2335,Tests_passed,5bb66ea9a468b6b77b9f6978323f8d6360e8995b8464652afb89f9b53f4ad807,True,Tests_passed,1246d11058ba644e2d796d7bd3e75bdf346c6102fdf4f7ac344b418a78b4c737,True,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,67f2f6a3e0e2db1293866fcae2d9ef76b9ec718814039d1ad17da223f6b9e0dd,Merge_timedout,,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,67f2f6a3e0e2db1293866fcae2d9ef76b9ec718814039d1ad17da223f6b9e0dd,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f 66,refs/remotes/origin/pull/285,c4af67dee1c6fa62be9e5a1dc2a10f773a8dce15,bc99abc83782e4d52c6da6a77171c366c33c7471,1c3beac3cacccc303c575d3ff38318e8579fcb65,,True,True,True,23,31,50,391,True,418,Tests_passed,ea9d628abb863aa70a3951af8ced00e7f923ff77d7c4f4e12352ea2e8411fce2,True,Tests_passed,7c6e3949a3b8911b0b5613380045a5c1a124ba4680b08f516e96f2b6309880e6,True,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,368b65d2658f52cb6370f0a175340471b2b6a46a9a2e87fc5eb9df50f89982ab,Merge_failed,a4da883d1afd67f6bf713b6620e3f00a1cce3ffc374553139be8561f4fa81f20,Merge_failed,e38ce8de77d1ec974e9ee70c249a55ed33f281879ed3e2c81fc5c49326161d3f,Merge_failed,cd0187cbb64e165cab635c8cb6b3a2545d299234f447d6324d3fdfacd4d77331,Merge_failed,a4da883d1afd67f6bf713b6620e3f00a1cce3ffc374553139be8561f4fa81f20,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,428dde72fa7977e1e8fa1dc4648f042860c554975ddd250b736cc319d9e773cb,Merge_failed,e38ce8de77d1ec974e9ee70c249a55ed33f281879ed3e2c81fc5c49326161d3f,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10 diff --git a/results/combined/merges_tested/cglib/cglib.csv b/results/combined/merges_tested/cglib/cglib.csv index 9ef0663418..93ec25201a 100644 --- a/results/combined/merges_tested/cglib/cglib.csv +++ b/results/combined/merges_tested/cglib/cglib.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,03335449852523a223137862737f81c47d2581e7,ad455b4bc7da8ff08bf1a5045ce401b8aeef021a,89375d8f9ef7b3a890708356844d9bcc0d7d2bf0,,True,True,True,5,17,91,2,True,5,Tests_passed,7234f8af8b6fac8501bdcfe7b3ca20c4cd45326b613ff50989e7a7e04ada6fd0,True,Tests_passed,c0203c38b14ee1f94f5d2ca777e11d74ee48f11df5c1dbab8bfea0c3a502ef08,True,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_failed,2898eae629f6191da3a0808be5590e4cfda466192820b13d0faa90271e4951c2,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda 42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,True,2,1,3,2,True,2,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,True,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13 diff --git a/results/combined/merges_tested/chargebee/chargebee-java.csv b/results/combined/merges_tested/chargebee/chargebee-java.csv index e752d9546b..808af6e6e8 100644 --- a/results/combined/merges_tested/chargebee/chargebee-java.csv +++ b/results/combined/merges_tested/chargebee/chargebee-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,b47838aa7464aabbcb32bd96e45c2e10885ed506,ac23f06365cf60ea21823dc94cba9226a29cf77e,096e73976c6a0a90af0f725ab32ff6645a4cba38,,True,False,True,4,9,56,5,True,6,Tests_passed,ae31f471ec77ec167d1face8a31600a7f643e65090773f772274a27e66228cee,True,Tests_passed,8a92bed26569c6fe1a9441bc2b9085d42865cb03f62d9fa79bd4bbcd704ececd,True,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,ce1eb580fdc3c6fe0dad058ebc665727afa72c262e85981226580cd1a684299f,Merge_failed,7cceb2c72521dde5c550d9d108a8d3e805dc8ee90819f365d7f657dc8a2c3096,Merge_failed,bb236351f2241127ee3bc1636a31aaecfce819c86985e10c4d2e58c5763a7e97,Merge_failed,ffc95777d0a44ff21fce27674ef52040d8090798a056cc64df2156429ef6cbe9,Merge_failed,7cceb2c72521dde5c550d9d108a8d3e805dc8ee90819f365d7f657dc8a2c3096,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,06857a5817530c497c0fa33440f259e7a422d561dc3cb8fffd982b00a42af510,Merge_failed,9cde54b30aec9d8fffcad9b72f1f9b4ca87de0c6fea027c63797bf33d3fac9a3,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4 34,refs/heads/master,0add5bcc4f9f339049d14a211e05e03546386fdb,0e60c0b862b9e980a479372812ceef2ebb555ed8,11156f634da00fe3852d459eff3cea67fa65b5ad,,True,True,True,23,75,240,2,True,23,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,True,Tests_passed,a9d631a4875e15e4d09d93d8b45fb9d661f2ba725aad49da243fc328e1b92e26,True,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc 37,refs/remotes/origin/chargebee-v1,76dbc6098e61e649ba7abdd90e651a88e0e5b3dc,76c7be5b96a1b2256e3bbb0fb3f281715742833d,abaa6d1cc82e796d2cd6693db0fc6a366236c2ff,,True,True,True,21,77,1509,12,True,32,Tests_passed,0ab62eb57cdf3d5fab8d418d09ec8d9e5a3b446eb7ead5e95787d6785b9d3298,True,Tests_passed,72dab33b6c07420f73d43e637167d3c851634ee46bd28ea26192104b6c720116,True,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,b1afe0c4d90c96287cab14452831ee07b2f9ac9118d5cf24408c20718e0ac455,Merge_failed,0700e60d0c333ada62dc19fedd4eb819fd1b57897368e1ebf06cdc2b5fde7de8,Merge_failed,b437bb897af5b46593e4126bc4980d89aa0b28f226b5b7d235bdb97734886f1c,Merge_failed,40fa4ac7bc33c89624e25603432f2ea61757ecae1028c0a9a7ea4fc4c0bafee3,Merge_failed,0700e60d0c333ada62dc19fedd4eb819fd1b57897368e1ebf06cdc2b5fde7de8,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,ed1a61e46ba1e8a055b2769bdc2909bc1c3f63c652b877a41a84cc7ac5492d8f,Merge_failed,3c2fe120e3b67a39148713b2271313901d9a7c286cbd5d4052ad03ceeb872405,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b diff --git a/results/combined/merges_tested/chat-wane/lseq.csv b/results/combined/merges_tested/chat-wane/lseq.csv index edcf54fe37..87625ad393 100644 --- a/results/combined/merges_tested/chat-wane/lseq.csv +++ b/results/combined/merges_tested/chat-wane/lseq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,916d8a5efc2654df3f31715ed05eea52f7d09957,cd69de37ea8aec0bad1e5a4114a4a243f1b66442,86932f013055275c558f7f964225bf8e70b98281,,True,True,Tests_passed,57a196317ef2c7724708d82306b7196eac574a44a99f04d277efe6d2d37511bc,True,58,217,3102,7,True,Tests_passed,a51dca367610fc8df1b2476584962c82e0e4063a598405ba5ebbfc9926d28ecb,True,59,True,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bb76d4dafc96cb8a12f3c33ae792da766fe7d9a16ee5b6d74642b9d92402726c,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,c9edd0af6e769d396aeea0b46845f6378915226f36068778a39ba3a28b73673f,Merge_failed,abcabb3916461fcb662d05ef70dcec27cffd58ae2cea4c73abbfa8c0b95c473a,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,89ff484f6013936a71750f532b8174df5f471373d1e7dd8d8635fac6e42cb163,Merge_failed,ea07a4a17363607c93e37274cfca73b4224951763028f39ea4f16e58af2dca4c,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097 diff --git a/results/combined/merges_tested/chrisvest/stormpot.csv b/results/combined/merges_tested/chrisvest/stormpot.csv index 3b889eaba5..b5824b1b1c 100644 --- a/results/combined/merges_tested/chrisvest/stormpot.csv +++ b/results/combined/merges_tested/chrisvest/stormpot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/3.2,375e8c807ffca5524e6333b5ba602e2ce430300f,5d5d75105eb5407939194035646bb312a0bc0769,58cab5d53fc9267a54c392c1cf72bcd98b268379,,True,True,True,51,512,3234,6,True,51,Tests_passed,bdf643a5e41853b19b664f4ed5658e33ebe16e2316bf0f9e896873a23c9a31e5,True,Tests_passed,5accb39e8d00069cb07512aa018a56f63c11f53c47234f5689e604a840703d4f,True,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,dacdcd5c85338c05554894549274e56f328207b8e934008180336206071a006b,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,7cb1f3a1cf71c33621e6ce922c409d5e63ba1bb3d2f1fcce8b1244f4946d343f,Merge_failed,1658d6a108e34730c783cec7a947c3233611f55593fcf0793814b1e00e109f13,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,386d220f1c10cd353796d000d2741bfd03dfe5b2c41dfbbbb3b45cc8036c9811,Merge_failed,eec72d5c542b15e33bbce16fdd0caeb5b7c3c1e94725dcca3cd7011163140d7d,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762 diff --git a/results/combined/merges_tested/chrsan/css-selectors.csv b/results/combined/merges_tested/chrsan/css-selectors.csv index 3cbb03a610..72348743be 100644 --- a/results/combined/merges_tested/chrsan/css-selectors.csv +++ b/results/combined/merges_tested/chrsan/css-selectors.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/12,6de5c5581c473a31e83c02743caad4df4be15eec,0f725a05d197ffc54c091362bf84c34ad9654b06,c19f67760b6fa3cabf1d05ae991f5cf2e70e883c,,True,True,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,True,29,131,1223,5,True,Tests_passed,e0f4b83e5f0ce1efc3805b0f5c09a36937b4d8afc8bdaca76fb012ba6cb106ef,True,29,True,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,5e0fd4f6bb2c88782f8f658c47c2692cd972c9af8632521df459eef12bb9fe2f,Merge_failed,e1fc46348f6ce8123aa0c1fb8f7e8cf0e4844a3324017ae0b817041a0f2fb5eb,Merge_failed,7b27376842c96f57392565bc6b75df0aeb09ea0235abf91eed140955d1aeabe2,Merge_failed,7e839f9d010f71c029f76daf1d0a4a42556a4c9f6d253e5d35c2210b427bd87d,Merge_failed,e1fc46348f6ce8123aa0c1fb8f7e8cf0e4844a3324017ae0b817041a0f2fb5eb,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,00c766b9cf863497e31322112fbf7955dfa5e72404fc6241d44ac11ed2995d5b,Merge_failed,61e55842ef769c14110dd03da4968a29f1f53cd21448850241baec46ee4ed282,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1 3,refs/remotes/origin/pull/12,0f725a05d197ffc54c091362bf84c34ad9654b06,861fa596d6df2e2e03f9378e39ffbd0b0515ef55,5f66d39ef4d3578146c81f4827bfde4dc7a0430a,,True,True,Tests_passed,ed83ca9bae0f7458caea0c624c0f1424a988fac9d675e50a98201d6810d933d1,True,26,117,1079,2,True,Tests_passed,2d12a444fd1c5795985ba1c35d320d06da697c105efb83a32b17c6b977aded3d,True,26,True,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b diff --git a/results/combined/merges_tested/cinovo/cloudconductor-server.csv b/results/combined/merges_tested/cinovo/cloudconductor-server.csv index be1f0504e4..31aa58d541 100644 --- a/results/combined/merges_tested/cinovo/cloudconductor-server.csv +++ b/results/combined/merges_tested/cinovo/cloudconductor-server.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/heads/master,55b31adbcbc6413b1b147d6f6259f51de37e0ec0,b46ef94a0f9ae76f8429f039d017382aea3d436b,aba0b48f889789c170da5aa32b6d0b7efdf3f8a4,,True,True,True,42,127,2498,3,True,43,Tests_passed,6cacf7dbf53b39aa3770644110fc38907c57ccc773ab879ef5ad22747ce91c99,True,Tests_passed,106ecc9375dd4f1c373ab73abcec7a3f20ced722c9abe452949e5b70b632df70,True,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,c05b869ba27779f70397aeb5fd79be3f7ebc43a9b981217703a150152e19d7a5,Merge_failed,74603d6fd51deb0a954f22d2e781458f1ae37efc494d70ed5738fb68d376f342,Tests_passed,9fd49e7afeecfa7ff5df8608471873a58bea6961d20e5711210b8d04191c2149,Merge_failed,ebc7b42a808cb9f8013255ce71b3b4e7edd66674072d59f7f200c552a4e3606f,Merge_failed,74603d6fd51deb0a954f22d2e781458f1ae37efc494d70ed5738fb68d376f342,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,df0d82f3cff733d257239c0fca96ac69f2b6b9e85214049f5adf84cbb68a1549,Tests_passed,9fd49e7afeecfa7ff5df8608471873a58bea6961d20e5711210b8d04191c2149,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c 69,refs/heads/master,5d364913a33784a026527743d51403af2a85044d,9b07fcdfd959835f66caf79868a8c5fc19eb51ac,51cc03e9d7130262015491537d4eb314d182f22f,,True,True,True,22,82,518,5,True,22,Tests_passed,bf96c5b1260da1152ef373c993b8904f61268593901ffbac6e523ef1dff0db8a,True,Tests_passed,3dbcfa915bb9a89aac99ed9547e9241036ff4a7f98827753312738ef443ce2a4,True,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,8cdd792312fa5c90fe309de431dc7f4db0565d329c4c74ddcbc8725b16669bcf,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,d2256b177962c36d492de4f863be8089ce222d1503b80df9f5bf1ace1ce84d82,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,51234c7b5bbb1f60047b9a8571528f7ed51d138a94a3c500987e37a353267688,Merge_failed,4e534a2c4ebbe5418a653457370f776b3f59d3575ceb57a4204df811fe09bfa1,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c diff --git a/results/combined/merges_tested/circuitsoftgroup/slackmc.csv b/results/combined/merges_tested/circuitsoftgroup/slackmc.csv index daae9edfcc..11e72e799d 100644 --- a/results/combined/merges_tested/circuitsoftgroup/slackmc.csv +++ b/results/combined/merges_tested/circuitsoftgroup/slackmc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6e2ed14486ced20af34a942ad5955026e20adae7,0649a0bbae0099b51d62062d8d5e649f68d3206a,b6d96b761a6927d80ca8864ea8f151076dbb0c99,,True,True,Tests_passed,db2ae016191cb6c8f16dda043af47ded9cf665d776d3f00a5b449e4440ffca39,True,10,107,574,3,True,Tests_passed,0b810c113bda7a4fa2af72f33b73eb47773cb8b086c587a079788ad1327177a9,True,10,True,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,54363e06249b0eac2c8169965dd0d6d0b7c74f9ffcf00fb8dcc442fa33ea80b3,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,5b4614ee3643b55d0f2ec0c275ead8b62a13a85e1697ce2c9c15861423bdd878,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d071214b6277dae93a7b5d593e18646b7b2cb65ea4664a7655fb75e8fc6328dc,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb diff --git a/results/combined/merges_tested/citysearch/web-widgets.csv b/results/combined/merges_tested/citysearch/web-widgets.csv index 69958c30df..f516cd2905 100644 --- a/results/combined/merges_tested/citysearch/web-widgets.csv +++ b/results/combined/merges_tested/citysearch/web-widgets.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,309d4d30fcf2e785389d98854afe76ce753cef63,aaf7b3ab36f01b80b8f4ce821b6aea7e677903ea,f3d2b8d302d53caf03877c3182d56cf5d2c81417,,True,True,True,20,72,660,2,True,20,Tests_passed,51cf28e04439b5ff95ebc169d765dfbf2bf7d3b63da99d857197180105cc54a9,True,Tests_passed,70f5ccf567095aa86a7da7ce32dce5ae27f8a3f80b9144aab7f1f4129abf4a3f,True,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85 25,refs/heads/master,71ba63c2a251a56fad55dc7a6f3ccd5251202b75,b3e6dc0ae716c1fe53e8b89a001496a20d7be4ea,7d84f1eb05db21372023c26c9e51599baf9ae1fb,,True,False,True,3,9,52,2,True,3,Tests_passed,c3796b843343149c102373c45d82bd6a2f28427707d9d257ada448f67be6548d,True,Tests_passed,a3ca30040b09b6b7f45c46785cf94f0b0f1b141cb072a00ea3ea13654c5cc2ac,True,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,65f448438b03eed7b26477a2ed84230a1226c0e5d6b900e3dcc8f04c7e5755b4,Tests_failed,147ac388afc86632dc4703efd5312574f3bdae6d3430a40d82368f7cf2b25388,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,65f448438b03eed7b26477a2ed84230a1226c0e5d6b900e3dcc8f04c7e5755b4,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45 28,refs/heads/master,08c7993177d5a8ec8bc446c5c55d20e84e30b8dc,83e1a58f56b18111f244080be7afe40fe32f4b9d,dd02e8f3e456ce1415ee3c9906ab4b93600e49ab,,True,True,True,98,139,7661,7,True,98,Tests_passed,c1c300e900698c22602017fee24cea0499afef7486445ceea76b22f8d5658898,True,Tests_passed,72bd0588b70e915d074d8f308b946843920d5d0b7cd474ea69bb9523167eff9d,True,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,01b1fcbbd9277b7ef3f6d94d5431da2396782c207eba4816788c23312f752146,Merge_failed,76b02530678f5c948c21e354b63bd4e214aa49bd90b6e2783baae12c20ec4eec,Merge_failed,a1d3f073b66b44cc8ced172293d372fb68c60bd17aa016b7610ffc398bf6e777,Merge_failed,a1d3f073b66b44cc8ced172293d372fb68c60bd17aa016b7610ffc398bf6e777,Merge_failed,76b02530678f5c948c21e354b63bd4e214aa49bd90b6e2783baae12c20ec4eec,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,e62c7a8dc65997514cca1e9d317d26a05e3d1936bc74042710c894d53f5ba7f2,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0 diff --git a/results/combined/merges_tested/citytechinc/cq-component-maven-plugin.csv b/results/combined/merges_tested/citytechinc/cq-component-maven-plugin.csv index 7372c0b922..d7b3265bdf 100644 --- a/results/combined/merges_tested/citytechinc/cq-component-maven-plugin.csv +++ b/results/combined/merges_tested/citytechinc/cq-component-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 89,refs/heads/develop,00fe3900c26b1ee640a39462e0badd10949d33a5,cd09e00ba23122bf606d2e90c87a5b08983344a4,032498aaac1baa96c0e3b9c29742bd340ca6d282,,True,True,True,4,20,75,2,True,4,Tests_passed,c6e24f6aa9edfe1b0dc74507cbfc3565e2a5e7b6732583ed03a8e63d4a842180,True,Tests_passed,5706b56eefa4ecc886cd6a82142153430bf8a7497ee615d8bb4dcca38cc25dd2,True,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2 123,refs/heads/develop,16db663469b71596e26c87ce12b67c53668ceda9,46269600b8dce4a29aeece5678d092bafd69d18b,bbf64b98f412dfde1c4d3e5c2aeb72cf949245a6,,True,True,True,196,532,10804,6,True,196,Tests_passed,3ce7a1d4f26a44cde835fd91dc7610975164647a231c0427359a6037ff15364e,True,Tests_passed,de33f0e4a918e2390c033edbb1e1353ce93da629445903aebec53134b048f289,True,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,fb1aebfa6fc8ec746f70ac81857375b7b2248193b6e8f243beeb156f3b3919a4,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,a31534475056639e88f8c669b815cff55a8b3a916b848da06d08482494964381,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,66ca5be6582ad0c8da2a2c1c2165c0732e98280c6214abb85889670bc3053906,Merge_failed,15b9b280d34df33a460eea7c385209c2d8e70289f2f84162a3745cd127bc7868,Merge_failed,f4952c5a0f47c26ac1a956e99ff34090d0087343daf2c7078e20f2923ace4fbf,Merge_failed,f4952c5a0f47c26ac1a956e99ff34090d0087343daf2c7078e20f2923ace4fbf,Merge_failed,15b9b280d34df33a460eea7c385209c2d8e70289f2f84162a3745cd127bc7868,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,a31534475056639e88f8c669b815cff55a8b3a916b848da06d08482494964381,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,854b40e782008b00a9c9f8fd13c9331af773f1a50b9ba488b21ef11f54a534e3,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,fb1aebfa6fc8ec746f70ac81857375b7b2248193b6e8f243beeb156f3b3919a4,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7 124,refs/heads/develop,07c0f64ada9b04b6050f7897c803cfb942b15eb3,958e33b6a8f72d2a4b33b0075deed86a8ab10470,ea5f8c3ea53b554edf413546644d374cb16a6891,,True,True,True,194,493,10134,9,True,194,Tests_passed,6323adcae533126b0b16ea9a55272aadb4df863c4bcfc2fbb89a6acaa3bcf37c,True,Tests_passed,5c91796420098f4ea2bffb47c284f74ff49a702543122a27ae6c29b5822915ae,True,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,72f5e3de2e31cf1b15ae233cb164a39bbc61d68c7391e33e0831f9fdc67a5006,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,cdba59480d908351fa7ab72549e1c09e9c150c2e790820adc6869163487ed769,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,59df892dcbb22887882e5b9735c864bc31a9466471c09a06a0afb42e981d2c29,Merge_failed,f55a12518296850abf52568372127d2b79ea24ece75e82229508105351ccca8b,Merge_failed,224ad5fbab1f6acec3856578073810c9b451cf4ea1573aa162802ba311728775,Merge_failed,a8e4f145dba7cc6aeeb348c5a21c8b619b51fa52b54b2cfcc981780ec050a276,Merge_failed,a8e4f145dba7cc6aeeb348c5a21c8b619b51fa52b54b2cfcc981780ec050a276,Merge_failed,224ad5fbab1f6acec3856578073810c9b451cf4ea1573aa162802ba311728775,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,cdba59480d908351fa7ab72549e1c09e9c150c2e790820adc6869163487ed769,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,59df892dcbb22887882e5b9735c864bc31a9466471c09a06a0afb42e981d2c29,Merge_failed,c665fafc2733582ec52d2b6b4637336b73c37f9136c31f668a0942fc7ffe68fa,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,72f5e3de2e31cf1b15ae233cb164a39bbc61d68c7391e33e0831f9fdc67a5006,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e diff --git a/results/combined/merges_tested/cjwizard/cjwizard.csv b/results/combined/merges_tested/cjwizard/cjwizard.csv index 430d409ff3..dcd7a0caaa 100644 --- a/results/combined/merges_tested/cjwizard/cjwizard.csv +++ b/results/combined/merges_tested/cjwizard/cjwizard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de diff --git a/results/combined/merges_tested/clickntap/vimeo.csv b/results/combined/merges_tested/clickntap/vimeo.csv index 7f28d2ee42..f410b9772a 100644 --- a/results/combined/merges_tested/clickntap/vimeo.csv +++ b/results/combined/merges_tested/clickntap/vimeo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cedaf74fc799691641f83a34a19f8ad479e77108,f40afce905a0cd5b0ff539eae41729e8788038a9,e546bda5980616e4d60bd30fdd5e8773759621b4,,True,True,True,4,20,70,2,True,4,Tests_passed,e857b022fc34a03c41fb289a8695e8b29ee23cab8b116c90ae3274862c6212f7,True,Tests_passed,5f2cbde4460700db3bbdd235693598aeb321bdd37b9d86f5013bacbbe205ce3e,True,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d 6,refs/heads/master,85bd093b588e15e1a22c68cd6a4c83b1ed012a5b,848a750f0c470aa6e8633d1a4b4ee7e8f88237ea,f29fe6c5a056097b2d0939cfe5912efdb62d5c59,,True,True,True,3,19,60,2,True,3,Tests_passed,24b22e030c6fe598bb6bbcb2b77cf7de939acb3753ae1f693b534d6edd2b806e,True,Tests_passed,275d01bfcfa8afddabcd250075d0acb268f3912f9ec0e92f549e56896308729a,True,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,d4ec8e10059123878ff93da10903ec387ce525e17a7ede52806763b5b3cd86f1,Tests_failed,74bb45786f76dd33087b92cc4bde204035144a65292e522848bd978f01dea088,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,d4ec8e10059123878ff93da10903ec387ce525e17a7ede52806763b5b3cd86f1,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5 10,refs/heads/master,768543130e4fbffc7c050024fd643024c83d53a6,15e178c9a22a613ce53d386c8dfabe572c3b68e5,f566947b83a1381d990cac87b0cffbfc0c5194ab,,True,True,True,2,34,91,2,True,2,Tests_passed,1e3981bdf5df70839f98c8a1c301725d9a6071243b3385dd06dbd0116586f832,True,Tests_passed,bb8fd632a4b1240236bfb0c6ee261f3901e7080ba9b8924136c102f4a9c3023f,True,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,599375de407ea150bc78179dc2bbfda9f7785296f7361b1f1f74a795becbeff5,Tests_failed,d538c0136a747483c440443598e461d42f445aebd135ed5b1abec4fcb610ec5e,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,599375de407ea150bc78179dc2bbfda9f7785296f7361b1f1f74a795becbeff5,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe diff --git a/results/combined/merges_tested/clojure/clojure.csv b/results/combined/merges_tested/clojure/clojure.csv index 2f6b354e47..fc262ab8af 100644 --- a/results/combined/merges_tested/clojure/clojure.csv +++ b/results/combined/merges_tested/clojure/clojure.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,42f68bc7688db3a24565dfcdc1cba92dd8a99159,ad7d9c46992cac0e812ce3dd47584c9bb2fda11f,46be47c9f51ef10d0082f1bd39ffff1008682861,,True,True,True,5,49,137,2,True,5,Tests_passed,6e436259330ad74709cdcb01ed36d1d248e1410fd3d14b54c4f2adffa3030ff6,True,Tests_passed,124976a36feeda7dd8c82724cc6f128e836c84144aef72764e2acde809534d81,True,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,fdf50a939478e32540c6d31ba0b32c7bd5c7cd612d072a7b3bd0a9980ff54ad9,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,fdf50a939478e32540c6d31ba0b32c7bd5c7cd612d072a7b3bd0a9980ff54ad9,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8 50,refs/remotes/origin/dev-array-type-syms,158b0454a144656a57487e181fbc1f8a76b8960c,c066a61f16526c14dfe44cced136e80950c2e109,28f3ea21ce9251bcf65e9a5cddca4eaeb85c66b2,,True,False,True,6,15,159,2,True,6,Tests_passed,686c3b58841b6dadec224751da89741f4582fcd66dd7bfe781f3efef46386d81,True,Tests_passed,372a96a23d4916ac17c58b5177983fe426dcb58b05d61da23100d18673022af5,True,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,a178efc63c9757162b5e56324ef4e3b0c55059bec3f0cf8838821be1af0405fa,Tests_failed,e23fbf010cf1fc3348fc28c17e78c9e26ddebbd0fc873eb8c59cae0378e3b967,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,a178efc63c9757162b5e56324ef4e3b0c55059bec3f0cf8838821be1af0405fa,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57 52,refs/remotes/origin/dev-array-type-syms,1852e4708497dbef2a7ffd4ce4744678b1f6dfcf,118ecac78085b5081a8e640258bc472097418b16,9313810d6150f97285d3a2c99f50fe157869c83d,,True,False,True,3,6,28,2,True,3,Tests_passed,0559390ff8be2b5fdd3d845eed115597b09b63d5b361c737d62594c1960eb8d1,True,Tests_passed,b0d2fb41514eb2d872989a5cccbc7c31ddff1d29c03c33c51205ba0719bf0c60,True,Tests_timedout,928117466d27183cf04a1f6f7bd91c9e056db356b76d3c47343f0c8325071bef,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/combined/merges_tested/cloudfoundry/cf-java-client.csv b/results/combined/merges_tested/cloudfoundry/cf-java-client.csv index fc058d82bb..09dd9b7558 100644 --- a/results/combined/merges_tested/cloudfoundry/cf-java-client.csv +++ b/results/combined/merges_tested/cloudfoundry/cf-java-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,891f35daf3bb24fc4e713fe8534cc7362ce8b553,996a8155a4f17a313ec31190f7dd846f18a9a556,628c05f5d2c7c1f4b3c9f0262e50343aca70b02b,,True,True,True,7,162,1148.0,3,True,7,Tests_passed,24a5728440908f34e272f131854d3ec678e9ba8c8fdffef7594ccdfe87ffac81,True,Tests_passed,c88d314b8fc10594878428924b382e4184f2b45970b88162f2ec1e3c01ea6c3a,True,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_failed,ac1225cfee205afe5be6cf096ee91e8d09c1e4ece6038bfb80c724d75f2cf2e6,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_failed,ac1225cfee205afe5be6cf096ee91e8d09c1e4ece6038bfb80c724d75f2cf2e6,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677 10,refs/heads/main,4b00808f2f6b8f0132798bdafe86b15e57104a02,abaed48b1f1ff3ebaf3b3399ba59ab6628c1da67,8b8a56a3eaf700fd8eeeab55e61a1926c6a76747,,True,True,True,1156,7179,107110.0,2,True,1156,Tests_passed,47882e2a69fd4ece47e4d83db41780c6ffd759a44e2769a902e74a6f9cb507f3,True,Tests_passed,bfed0a443f3964d768940eef782a6b65567016142aa4b68778204d136e32d4d8,True,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,a43f216aac3ac56f7ed6a788de1e592d2f7f7c45c3fe7adc08328cff9d3c62da,Tests_failed,b0d9b9ea864cde0944d7ab47950f0258032e70b8fcab8ed236db3becddc24674,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,a43f216aac3ac56f7ed6a788de1e592d2f7f7c45c3fe7adc08328cff9d3c62da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da 24,refs/heads/main,e82ba668cd951790588e2e82cf38f3e5850fe014,8b99869c583947534a81d6ee00faf55414eb86eb,d007f964021e978786960c136a32a670d61e177d,,True,True,True,2510,2581,5312.0,31,True,2524,Tests_passed,3cd61a61103ff006aa0bbb5f18650a7ba7c3e480ad51d6ec4dd36cff186a6eb2,True,Tests_passed,4a7300e01b8739043afad2d17d18b40482c8d51bb3e4e8d65923e021d28830cb,True,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Merge_failed,250b03f95f6cd178d58197fa98351302d2e9812ba5ceb4fd4c22ce57d9393e57,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_failed,35e7aca5d0a88ffad7ed4b334055ba510ca58d57f8404c42f0f1cbe8cca8c089,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Merge_failed,250b03f95f6cd178d58197fa98351302d2e9812ba5ceb4fd4c22ce57d9393e57,Tests_failed,35e7aca5d0a88ffad7ed4b334055ba510ca58d57f8404c42f0f1cbe8cca8c089,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b diff --git a/results/combined/merges_tested/cloudslab/cloudsim.csv b/results/combined/merges_tested/cloudslab/cloudsim.csv index 2e52165a31..0ebf4baa6c 100644 --- a/results/combined/merges_tested/cloudslab/cloudsim.csv +++ b/results/combined/merges_tested/cloudslab/cloudsim.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,e0205e647461340fcbdf2de516d1cd0ad9fd1154,e0334f468311935d4d6bd424f3e0cfadf04fa8a6,c1ffe5a99703df9a2a03eb738a62b4e06146d732,,True,True,True,6,16,33,8,True,8,Tests_passed,1e5a990cd6230bd1349487409b1f854537dcfc974c057a9fdbacf61e4157aef7,True,Tests_passed,98721d9325e48626d8685176f77677fc4d81ccd4a5add362fbdff9d9dc06fd37,True,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,ff7f9960b0649308b3876d513052bb8925e676b0dc8ae12fae7ebccedad06fd2,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,ae204d2622ff03d2afe0121b924607314dc7c732e2cc217874213699bd6a4cf7,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,6908330f859111461621351c451fef064a2522ef39aeb30e84056427995e7cfa,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada diff --git a/results/combined/merges_tested/cloudslang/score.csv b/results/combined/merges_tested/cloudslang/score.csv index 94016e49e2..5bd43951d6 100644 --- a/results/combined/merges_tested/cloudslang/score.csv +++ b/results/combined/merges_tested/cloudslang/score.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,4f8ad3c2a0d651ccf999d4f65275113de84766b3,1a5906925d71a294a180455b0b3a579ce3201447,4eb7d0b731257d0537755f851cf21a752c342827,,True,True,Tests_passed,6473427f0754c0108c77e9813529afe904eddbcc92f4176f15bc16d4c8318a35,True,46,64,230,2,True,Tests_passed,2cedb69b7341ca64d71a46ed1e3a62aee9ba7a2a887007e8e8bbc12adfa9526b,True,46,True,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,89d5a7ce59e3154daafbc87975eb7c8d33467cd9e1e4be921d4f86f4084ad335,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,cbcb6ee422255c31241fea1db76a62839e165823f7570debef6d4716ef6a6668,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,02c2505ae8fd47eefcfe71b36b455c0e4680d35bd02392cd40804c4f5d7709c1,Merge_failed,d8855b1c38f989b02e90b631b8296467adf23d01999ca952ad034b0d59139952,Merge_failed,f58dfbefd0380abd47eb154acf54f4214bf843510a847fa69515dc000dccde37,Tests_failed,16716e53fd3df40911a8aab534af7f05e7ca93585f5e0a378094030c0a3226a8,Merge_failed,d8855b1c38f989b02e90b631b8296467adf23d01999ca952ad034b0d59139952,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,cbcb6ee422255c31241fea1db76a62839e165823f7570debef6d4716ef6a6668,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,eca2edd43274dc0d07c91bb1fec55c5b81a924c7b23fca1ed13106348d57794c,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,89d5a7ce59e3154daafbc87975eb7c8d33467cd9e1e4be921d4f86f4084ad335,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36 58,refs/heads/master,d014f50de7cf160caef749e8319ba6bfe009ba44,00990fbde5fb1f02e18c012a9cba5768632d026d,13f1238413977f1b1d7f6e135b50713cf1e78808,,True,True,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,True,65,150,1108,2,True,Tests_passed,9eb4846f364456790989af128dc751e4d4b43305cbbadde41ab0cae4e7a32e75,True,66,True,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff 59,refs/heads/master,00990fbde5fb1f02e18c012a9cba5768632d026d,91c4e43c8a262a9929e9711c7899163b724109b5,2c3ec3f1a8a2e769934a5a11ddaf0e3bb2c9b2f9,,True,True,Tests_passed,221bd7d00c73838f7bf2b2b570bdb2f1ae31d739630e199f75e2e3215aea3873,True,79,126,1421,2,True,Tests_passed,894de89263641acd12c1d060259d8067f32bdefec9752a39200c1a5be810d21b,True,79,True,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_failed,a7e0db2450dbc8518dc960f633fbdd5b23ecef7b9f62442128445de625b02bd2,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d diff --git a/results/combined/merges_tested/clusterbench/clusterbench.csv b/results/combined/merges_tested/clusterbench/clusterbench.csv index 541357fdf0..949cf1b7fa 100644 --- a/results/combined/merges_tested/clusterbench/clusterbench.csv +++ b/results/combined/merges_tested/clusterbench/clusterbench.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 62,refs/heads/main,d7e0961e12b218d6f6a33e30d294867c2775cdf2,4fbef42fa22ec89c8a038d6a8bfbc736de3e4ab8,8717c2df174c541b961f56a69cd858e16cb8811b,,True,True,Tests_passed,b04dfeb3ce64b9f20cf42139b6fee86b7c62196c003afd7eca052ed642d39c97,True,12,19,228,2,True,Tests_passed,6bff210ab6f75a1f9a4255f23f123458d18025bfa0ea3b51566e9a3bf2657167,True,12,True,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_failed,adce8efcdee4169e641c4d53ea3766dfcb4ce3b0df866309c8de2750fc58306d,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0 64,refs/heads/main,e218cea656fa222ca1ecf2d6fcad6f185b3ec399,19152bf8782512305b25e7fefd2fcf17527e759a,ceca9cb677db82e8317dc707e09ddf5b5facc1d0,,True,True,Tests_passed,d001ac878bb52de0ad9138acdb51b9e4031616e8ebdc15ef2e905e5676585f2d,True,14,38,145,2,True,Tests_passed,944b1e2c32707514e6366f503de83de50bb1cd14001df37664706f42ed85a3b8,True,14,True,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_failed,1c1193300e3b63c27dde8066c58b08372c4311a3c5ceebce2d9f74249c71a1d9,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a diff --git a/results/combined/merges_tested/code4craft/termblog.csv b/results/combined/merges_tested/code4craft/termblog.csv index 5275891ca9..db0168dcca 100644 --- a/results/combined/merges_tested/code4craft/termblog.csv +++ b/results/combined/merges_tested/code4craft/termblog.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,794189f4401f172745bbc2ab1e17edf70a476b66,8d34534c9a05de46cf723f8cbb6dbaf9235597c3,df6ff5a8611c4a01e4da45590158b0de3b285882,,True,True,Tests_passed,17532e417f82faf1ad9f23d8b44387ab4fed6c8936b0a741b4433a1e011516db,True,115,33,3910,4,True,Tests_passed,0c73c7a54957b0fab91aaf3b35afd8a76805edb13db411143ba69ca517f3f45d,True,115,True,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,c144f95b69e512355210ba1f780da789e90dcae765aadb4aea60838bdbf48d68,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,920bb270126c8a585dd26403b553487e048858896d15ab40463a001a972ccde9,Merge_failed,793316272118c1a0b2d8cad0de1985c01d24100aaeba3fe2aef6d719cec87a34,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,f861f05035bb7ba7dcd5a5daeb18e639c8e985613e1720be14bd145653c8e514,Merge_failed,307557f9bce695e15e06546afcc5f291ae17a578d466b86bfc8518b1a35a8708,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2 diff --git a/results/combined/merges_tested/code4craft/webmagic.csv b/results/combined/merges_tested/code4craft/webmagic.csv index 6a676ffbe6..7f1cbd623b 100644 --- a/results/combined/merges_tested/code4craft/webmagic.csv +++ b/results/combined/merges_tested/code4craft/webmagic.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 123,refs/heads/develop,2913da47637694b5d56bc3773caca473707b6aba,928f98dd93bf3a0ebcb14cb663b5cd924c59f1e7,5883ed93d759e6eb23d736a0929a84ca0cad5a3c,,True,True,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,True,2,1,1,2,True,Tests_passed,828d4f95b1410834e3ee25ac9f08d9ee632ecc6adda374b305146dbc44f89bba,True,2,True,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,4cefa1fa6916912620d8b38900d395a43fa4e7e42995d07eea88a6a5dbd2caaf,Tests_passed,5a074626ba9003a53bca3810b3d40e7e75fc6bd7cf63c8cda1e781caaea06ed6,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,4cefa1fa6916912620d8b38900d395a43fa4e7e42995d07eea88a6a5dbd2caaf,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554 163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,Tests_passed,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,True,69,89,2060,44,True,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,True,96,True,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,11631b5943c563260b712705fa030a630299ce39595b160dcfa9e747f02b2f75,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,bb66ec256429f744a381d9761df927d1056c06cf05399f01c0b0c2121f654dcd,Merge_failed,e9a47a77d84740f02e8e3b1b4a0f42ee9ab03ccebba00a50734b5bd74448f13b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a diff --git a/results/combined/merges_tested/codecentric/jmeter-graph-maven-plugin.csv b/results/combined/merges_tested/codecentric/jmeter-graph-maven-plugin.csv index 9466d3b0ac..d90d4716eb 100644 --- a/results/combined/merges_tested/codecentric/jmeter-graph-maven-plugin.csv +++ b/results/combined/merges_tested/codecentric/jmeter-graph-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/1,1a548b68d5c5dcb7e618bcefcdbbcd8dc00d209f,9d653ec06f567a6b301d02ba565f3d9023294c3c,5bc5f4eba31dc83188cf4af9f335f896115251eb,,True,True,Tests_passed,4c193d173ab4262128254e8fb4c7d2b9b1051a02d58936349182abbfe644622e,True,4,23,251,2,True,Tests_passed,034e70b63886cc1931e5863ecbad3608e754b773eb924845492f25c601dfb81a,True,4,True,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,e9b0b8e4e5bd600b93c81a336893ac8b5da6f3190c701a21df0ac47bc9c17a99,Merge_failed,f4a27384f0b4ae3c7658a6bf2a518ce08994e81dba08728c2671093e1dd9ca3b,Merge_failed,08bacb763dceb3fffe64abb928d5113f257c552154c8b71f43fb8154bde394af,Tests_failed,66e7aced202ffdeddb501ac1ea0985c6187dcc7d48ef2f3ac0cc7d992b30cf4b,Merge_failed,f4a27384f0b4ae3c7658a6bf2a518ce08994e81dba08728c2671093e1dd9ca3b,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,d1fd6d16897ea99ef7f8339ceb50477e91b6a32fcdc9b9218329cf5ce14fd594,Merge_failed,08bacb763dceb3fffe64abb928d5113f257c552154c8b71f43fb8154bde394af,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd 4,refs/remotes/origin/pull/1,9d653ec06f567a6b301d02ba565f3d9023294c3c,59d801302875318e01477fb567789668477b5f98,c92922c382f7f67ee01722e4d05e54d323bdcb4e,,True,True,Tests_passed,3de1eb6cbe6aae4d61cc88763c3177533caa5fc7d5b50456e0cf2abf306b490d,True,4,23,257,2,True,Tests_passed,e5c0e89ff132330aaf8e8f7ce661d9efaccc878188eb622b92ffb4cfb148cab1,True,4,True,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,aa98e31a0193594abc09ad8431adc9bd9d875b782f3deb0318c620d8bd8c0869,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,9842c53d96ea8af2d4ac53c8bec8de792ea013deaad6fbf9d6cb1341ac988a51,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,792c46a47f56f03d7f81308a0c47ef52ff75669a65cdb6e81dfac539c7f8db0f,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a diff --git a/results/combined/merges_tested/codedance/silken.csv b/results/combined/merges_tested/codedance/silken.csv index 241050b1a5..07d2aeb962 100644 --- a/results/combined/merges_tested/codedance/silken.csv +++ b/results/combined/merges_tested/codedance/silken.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,True,True,Tests_passed,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,True,15,84,493,3,True,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,True,15,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,e1aeebbd5d0be941701f43fc6c55812644b6b15e59a87a16da95941417caa7ad,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Tests_failed,e889d1d5c8d133874dba2aeee77ca2070d03a55c7385317a2cd813867c3183fe,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b3144631da47b82eebf2c78b49d79afe305ca25209a7a9d2f55d8ababe88de6a,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb diff --git a/results/combined/merges_tested/codeine-cd/codeine.csv b/results/combined/merges_tested/codeine-cd/codeine.csv index 31cc63495d..301032f09f 100644 --- a/results/combined/merges_tested/codeine-cd/codeine.csv +++ b/results/combined/merges_tested/codeine-cd/codeine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 109,refs/remotes/origin/pull/252,e2d8cb4d560d49a12ffb9d53efd7bf10d1867e38,2ad519701f97ad01ab0c14e9a42166ec4d86b41c,ede7bcf188bba00a4fd167385cbab6661e64b26a,,True,True,True,12,32,903.0,2,True,12,Tests_passed,6fec22c803c70894e82950145f11cf498bba0d5edb682e5e79edd77b5d0f320b,True,Tests_passed,26430d5f2bb7fe88008dc5f809d79f6868682100907b4146add2432266275416,True,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,4f6d08032d23cd608dfafb0cf43cb54eddeb40dcb081fc3355ef9220619bbc90,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Tests_failed,781f4ee526970db229f4331c1080039e21bf13b00501e0bcef8c5d2f9db991e4,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,2d1938a702d7049ea4fa7d42c7d4cd781380d89e0c206f058d25c4c4e7ba4d4d,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed diff --git a/results/combined/merges_tested/codelibs/elasticsearch-dataformat.csv b/results/combined/merges_tested/codelibs/elasticsearch-dataformat.csv index 912caf88f9..15fc0a9fbf 100644 --- a/results/combined/merges_tested/codelibs/elasticsearch-dataformat.csv +++ b/results/combined/merges_tested/codelibs/elasticsearch-dataformat.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/remotes/origin/pull/62,e0575ef213f2503660bbaa5274bcb5e9c7cd2275,975bbf35cb5cb933eb60be8508ba69efdd2b7d6e,a3630230efb687cedfcd063913f645d6cc061046,,True,True,True,8,33,579,7,True,9,Tests_passed,5290cd89f4aaf67c224a07677e9ea27c4ee05956a1d0f44f95d2db7b2d637655,True,Tests_passed,f714438fd07bfc44c3ad825546d97561c8477a89426bcd3a31607b5d97c4d919,True,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,b7e7296763b6ef09a53e98be3921d095450d98ae93c5f66d8052ae77adee81d3,Merge_failed,61bea218edcab7e9ac674665ae95963e61a6363611c9ff124559a90b74351155,Merge_failed,004a1b02b6a9f265631f56eaa30327259118976a1115fb4339dca4898ce374f4,Merge_failed,af9887ee4cdf762736a2d2e16c5b7d8493dfb267232346c62d43b381597da789,Merge_failed,61bea218edcab7e9ac674665ae95963e61a6363611c9ff124559a90b74351155,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,a98c5258471850bd12379b1c4c859ddd2ec9ee9cd0043e2dad7f7bf157af60e7,Merge_failed,6e053d308eddcc9c80dc8a606cc93982ce12b6f3e67e097cc9ff048197d98a23,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb 23,refs/remotes/origin/pull/63,7f6410361b640207341ac3b31112ad48aa23d64e,62100f1df607cdade1df3fd04f9daafe61cf1f47,204caf84298cf53c61e45b4c5ac34ac07e901e31,,True,True,True,4,33,97,8,True,9,Tests_passed,d20f8040e6a043326853f6ef8136328d7507f1cb3227af41444cd544b17bf7d5,True,Tests_passed,08dc3b66991e3b9477921a049920006a75c5049117808e931546e7f92c02db88,True,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,77217716027282e8123a61f8a68e13998a075afba453da9a7143ff35e7d77f4f,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,85a0087200faa9873202ec5fc873e16927b27f217b94ab874853706c07e7b9f0,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,f94d20836b6fcedf7cc393c01d15756f49be87538fc16cc8c0bc935a5c9cbf61,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40 diff --git a/results/combined/merges_tested/codelibs/elasticsearch-dynarank.csv b/results/combined/merges_tested/codelibs/elasticsearch-dynarank.csv index c0c39a1518..cca80428d4 100644 --- a/results/combined/merges_tested/codelibs/elasticsearch-dynarank.csv +++ b/results/combined/merges_tested/codelibs/elasticsearch-dynarank.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,2abe9cc9725a9ec581c0b25f4b6b8465be6ca2bd,bd20a839f948602a01cb0a05c7f27378cd38720e,f66429f2dd399ad0ea0dc65127321e8da4b2b0ce,,True,False,Tests_passed,013bc7dc36297c07aedfb0a9da4d4995f274e522c71fff4420ef5ad15cef957b,True,5,10,130,2,True,Tests_passed,93fea829e37aa9e397a61e6b342963c471f765dc6e05976753c275cbd5e0e596,True,5,True,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_failed,424b1dca1a519335df172b117f5bdd431b69266efd897390e4f13d5a9dff2480,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3 diff --git a/results/combined/merges_tested/codelibs/elasticsearch-reindexing.csv b/results/combined/merges_tested/codelibs/elasticsearch-reindexing.csv index 61c958fa7c..db3c8d4717 100644 --- a/results/combined/merges_tested/codelibs/elasticsearch-reindexing.csv +++ b/results/combined/merges_tested/codelibs/elasticsearch-reindexing.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5b0dea22a41d4c5684434fd59b989e7aa048b8a7,86d6547781fa856053b7c8778c5b072f3e2d13a6,5c2c406690744fde187e3edafb28a1842fbff021,,True,True,Tests_passed,83e00b83a7e4a61b49b8ed9e26e4072bd03640091211bd9e858e15d845c6660f,True,6,30,166,2,True,Tests_passed,0aa14c38fce9fa50766a74b92bf454681320be7f16c2c7735cc3eda958eae19a,True,6,True,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,8746c9510f02874603b19cdde052ca946afd2efaee06fc26aa79abe2d7d650de,Merge_failed,aadbb16cae6dd64f441a2580ed41d0c68477263f63b525be8f751651302d7dab,Merge_failed,ed1b5561aed4970ce66f58f6f10335d7c6706a9c2f374e070afadc5d6c49526d,Merge_failed,98b596d38c2ed76a19262972f1346f750c3d898d0236d3cda13785537ddd90d6,Merge_failed,aadbb16cae6dd64f441a2580ed41d0c68477263f63b525be8f751651302d7dab,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,e45a7e5ff6072a5204a2b558097cbd78a1b6fc49dbba477f33f275addc745074,Merge_failed,ed1b5561aed4970ce66f58f6f10335d7c6706a9c2f374e070afadc5d6c49526d,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2 3,refs/heads/master,86d6547781fa856053b7c8778c5b072f3e2d13a6,c1654eb26efa5e84e1ee5ba545723b4f8d5c56c9,27a389ca858f7c681aeb7ca647e71b8195143cbf,,True,True,Tests_passed,968b77301b0cc1b36d9601389345cea395bb679451638d91006e5bbb14b8f915,True,5,19,126,5,True,Tests_passed,c1f00f7a4ee79a1242c4ac77a4a37045d5cc77e65bafc1acad96bb4638064469,True,7,True,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,13984e7942474b392a10e7675ee4dabcb552ec531d0320ae8df3ba4e98509792,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Tests_failed,e85f61c02255f31557e6788bb5815e22a018b752400fc412e55e9033cbda71e1,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,12dd06ecd1bdcf8954370347969cb5336b027105c6c06a1ef96e24ba36693f7d,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9 diff --git a/results/combined/merges_tested/codingpedia/demo-rest-jersey-spring.csv b/results/combined/merges_tested/codingpedia/demo-rest-jersey-spring.csv index 2d54372b16..e78bf29fb5 100644 --- a/results/combined/merges_tested/codingpedia/demo-rest-jersey-spring.csv +++ b/results/combined/merges_tested/codingpedia/demo-rest-jersey-spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,158fc9108d0e0e0b32f9ba636048bc9901ee9e7a,ce83bed1e5da5b643f9967bab4470cfbebbfd897,05f5ee2f97b64ffb774cb8c4e0bc5b4c92374ced,,True,True,True,15,36,229,2,True,15,Tests_passed,acc2d476fc2ba686990e348d54362cd0bc845263cf2288ad429ad61cc65c0a23,True,Tests_passed,3539dfced015a9491ab87e00b89700d5a91dd009831772f5952d0b5cebf40daa,True,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_failed,c5183c9bf9499ee63e00e5a3f9acb628cecf47efe4a2e50ebb7930a3527b45a2,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979 diff --git a/results/combined/merges_tested/cognifide/sling-dynamic-include.csv b/results/combined/merges_tested/cognifide/sling-dynamic-include.csv index 59a11b17e6..4ada4ec170 100644 --- a/results/combined/merges_tested/cognifide/sling-dynamic-include.csv +++ b/results/combined/merges_tested/cognifide/sling-dynamic-include.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,4ede3baa98d3f20b494ca339783b40903ee9054d,93f68ae098594bf234f2d5249bbf2a4ac2516c04,883b0fe25d50ae895901c4650f23bfe15a78836a,,True,True,True,20,34,891,3,True,20,Tests_passed,95320c9357acf85011ac02378bd82948e49eee6d42f01917b0b7568d5591b1d3,True,Tests_passed,53ea631dfcfde5849e453b83a8dc19c3ab5492d3cb7355eb782a5be4f0137e97,True,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_timedout,,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90 diff --git a/results/combined/merges_tested/cognitect-labs/transducers-java.csv b/results/combined/merges_tested/cognitect-labs/transducers-java.csv index a5374d0672..0d5945e8f0 100644 --- a/results/combined/merges_tested/cognitect-labs/transducers-java.csv +++ b/results/combined/merges_tested/cognitect-labs/transducers-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/java8,b13061ed151598fd886572abbcf5576d8f701d44,37b7aace2623152cab33db7390d2546ca8901436,a1897ce7865dcc6ffeea78e1c3bfed26f713bcc7,,True,True,True,18,17,1859,3,True,18,Tests_passed,3955c23c9230ace087f77163a8f346abe008dfffc19ae9cfbff967f519d547e9,True,Tests_passed,4abb9548c02cfe5493ca83356fe2614e5e8b555a3afd8d0de166dc3c8edbdd30,True,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391 diff --git a/results/combined/merges_tested/cognitect/transit-java.csv b/results/combined/merges_tested/cognitect/transit-java.csv index edfd7af931..c64a91be77 100644 --- a/results/combined/merges_tested/cognitect/transit-java.csv +++ b/results/combined/merges_tested/cognitect/transit-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,641ef0f68dcd139f4bdbb55b8618f6f6d26a0257,f4146b0a0d72a3b5bb2a0363a88b670428da2241,49f9534927b70ce5882b160d216f49a951753b81,,True,True,True,18,64,429,3,True,18,Tests_passed,76823149f28ada25ff05f29753e70d69a36f35131754456f64575bc992bae96f,True,Tests_passed,2aa09c053c09ef2ad21d8c23667d174d13d9343d850f201bbeb27e1644d5837d,True,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_failed,9c7bed53f5dc935eb55b1780445cacec14f2a215b4808316b02fbc88ba3258c3,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d diff --git a/results/combined/merges_tested/comatoes/ftl-profile-editor.csv b/results/combined/merges_tested/comatoes/ftl-profile-editor.csv index 5a85734b0f..454ed3b79b 100644 --- a/results/combined/merges_tested/comatoes/ftl-profile-editor.csv +++ b/results/combined/merges_tested/comatoes/ftl-profile-editor.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,1845e9c1c92e2b70412718e5195dd212ecd4fecd,e87fe65818e726d317ec93c036d48205ed914f09,78e3251c443f913ab978b81ece93cc1a5baecf68,,True,True,True,5,79,569,2,True,5,Tests_passed,79603597fac5720c5097080f02983ecf83b9f72e626a8023b104f4c17ef37889,True,Tests_passed,d4517c9f122990fb4c41419ae39dcd3d606af8ab148e88cbf1ada64a1b54bfb4,True,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_failed,4fac1465b518113edb4d5e1cfd1e913772c9402607c020af1f946bd844eb0319,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_failed,4fac1465b518113edb4d5e1cfd1e913772c9402607c020af1f946bd844eb0319,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648 10,refs/heads/master,e87fe65818e726d317ec93c036d48205ed914f09,025d675787b49b2cdf34ee216d205248afa45f47,0e45353030b440fd729284b632da85770d40b73c,,True,True,True,6,68,825,2,True,6,Tests_passed,02a8c8a970b3f22d0251013d33c814db2609c1b0400441fd3b103054537fa8ec,True,Tests_passed,c98eef96740827a9a7d2b7f4e8807d20866c469c7d6259673fd538466c641c3e,True,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,87c963c092bca9004dd8d18fc1d1f750f9c22b23ae89920e3da6990acdb9da76,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,b4481a94ff8057373f1a2fb4c9a9a479cab1bf5e6dd3be2e0d6eb86668fbfa3d,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,267dfb230d660b11b87966c49a8af829e2735473bae2be369996259adfd7cfec,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0 diff --git a/results/combined/merges_tested/comcast/jrugged.csv b/results/combined/merges_tested/comcast/jrugged.csv index 9ef84c4099..a6bbf949e1 100644 --- a/results/combined/merges_tested/comcast/jrugged.csv +++ b/results/combined/merges_tested/comcast/jrugged.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,01f77a72310610356739f066c6babf6bf29940db,ad2d4eb4c563ccf75a7790afbbbd7810ff0fa598,6c99d15ec7ecfe7a60fa9dbaf0624b4ee9630bcc,,True,False,True,3,3,5,2,True,3,Tests_passed,fbc679085039c61cef7947bd9a3577d1658c9181d7c6d4c2f1bc7c20d657355e,True,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,True,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,b6aa9ae8a5303a16d651c4e67e3366a5a3fae98ac9b0a954bbafdc778a6e0fb7,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Tests_failed,8e3b8f5be243eb74e2b455e6b7b0cb5f57dc53433b114c5ee44eb9129f1b763e,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,26571ae064aa479207050a6a3903d26f2bb5a023fc4ba0082fdff4d1158dec70,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4 18,refs/heads/master,f11acdfa7bb956c59d015f08588206bf9dbaef44,8d63723f5e9840d4fed8e77d2939e096a75149a0,a644c8635542c6eb8b2d0d39bb31f9e1cdc5da67,,True,True,True,4,85,608,3,True,4,Tests_passed,77aa2df30169e2cafff723d5b2d921b064eddc12336ea26ac6b53a1b66364975,True,Tests_passed,3aa5fa419d57e6995042ce7d07065b1b4a5da3f8892d7d2f7270a4889247fd34,True,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,0ff2141201cf5bbdfb9a25e46dbb54d4201981d15fbec7c4851a6c2c12d138d9,Tests_failed,a2e72e90a159a955034100fca1e9640cf96ec975ba8d1b590508c801473af755,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,0ff2141201cf5bbdfb9a25e46dbb54d4201981d15fbec7c4851a6c2c12d138d9,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab 42,refs/remotes/origin/pull/60,b543562fa2bcab669d46b7f016fbfa63a3e2f53e,d4613afe47264601e58cb5c05d544e4c5867e4e0,f7dea133a9c7315155f1d3ec94f8f53856be8a87,,True,True,True,3,2,920,2,True,3,Tests_passed,e0da480819df40c9a042a86e5c581a33ae080206933b20919d734642b3fbb225,True,Tests_passed,14c96b80454766496a4b8fc5883c856983ec1592640b1899df975bddf9c78a17,True,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,2f2147698207f1dfee8f62321c185a4c02e2fe8f12affd11d8a35fa9f6ccaf7b,Merge_failed,f5caf32318e1d349696e2f5bdf52bc129dbb4845bf40e0e372b2de5151a7a2dc,Tests_passed,235d79d85d0e23bdb6ebfb50b588c09161fd82a14e0de8a6140b2896aa5baa7a,Tests_failed,2d5d0a90eb3b88fff21593d331ee72c84aa87f9c4926093801daa4ab980d69f9,Merge_failed,f5caf32318e1d349696e2f5bdf52bc129dbb4845bf40e0e372b2de5151a7a2dc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,e54a320fda5e2519998ac12fd128c497b6c76bb44d730ef48b4530df8a81f439,Tests_passed,235d79d85d0e23bdb6ebfb50b588c09161fd82a14e0de8a6140b2896aa5baa7a,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa diff --git a/results/combined/merges_tested/commons-rdf/commons-rdf.csv b/results/combined/merges_tested/commons-rdf/commons-rdf.csv index 3b474a3924..c04e10b502 100644 --- a/results/combined/merges_tested/commons-rdf/commons-rdf.csv +++ b/results/combined/merges_tested/commons-rdf/commons-rdf.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/old-master-before-asf,29010e4d6ddaf879cba34a09ef8ee544807dda74,3b2bebb64cf90441e45195b0e1149e404721b0a1,4109a6845b76b87be4c4bd31d1b2e163c3deb53f,,True,True,True,32,53,2753,2,True,32,Tests_passed,ab0af18d642914460ffdaa92a083f35d162b065cc76a048eaa9734427cb3518d,True,Tests_passed,0213e949de4a354507edba344ac281ebb3a29bc449d997097c2d1b66ec9e1aa1,True,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,ab0af18d642914460ffdaa92a083f35d162b065cc76a048eaa9734427cb3518d,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Tests_passed,1f1115fd652450e5a84820f91b7ca971370d8ed83d9a980b3d23c5e3cf616ba6,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,ab0af18d642914460ffdaa92a083f35d162b065cc76a048eaa9734427cb3518d,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61 17,refs/heads/old-master-before-asf,c3d344324564a68fdf91b0f2bca3574c3cf80951,e6b93fc8680e0d2cbba50b83c15767e6a4e64916,f3bf1b79225f243e7ebf6ebd0c8d455cc64aca00,,True,True,True,11,25,488,3,True,11,Tests_passed,1305c48cfffbe5937d39e24e5cdf779fafeb79cbb9980fa54894dc43b21a4a72,True,Tests_passed,7426c88b5b0e09b51b09236e85e057f3660fb247ba15748b8a50539fc0ddc9fb,True,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,1fbd8f8192179fd1292403d9f3d8f997659772b3df12b800e6cc6a40c33177fe,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,b59051ac3312cf15737719f7e02feed92a99a46c9028af4f2a21d78977ecc2fe,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,0f3e2b2cb7ced4622a748e18881e78a0e0c70a6c71589dbb78d19f12b30f7b4c,Merge_failed,4a4b644b5da003cb748989e4dd2e8b07a74887e2ae543da8674e8a69d1cea41d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d 27,refs/heads/old-master-before-asf,38ed7a436af8a8a0c3faa882066fe076c18bcf50,3712be9b3eec705d0ae4cc1e7fe27fcd79b4c0ad,f9cc0cc0ed7b8a23f46fdba49ed50cb839b6e8b5,,True,True,True,11,30,326,9,True,11,Tests_passed,7f3d6682dff05724cc89015bf3f23fddf04a99a241d9275a3a6a6fd7ea5359b6,True,Tests_passed,59f246f4b6cd42b3d76bb2d1f11f49361c7e0f52da8e3972b5f3b4896b554c78,True,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,42270310e9ce1ee59f4b269c4f01b4bf0d4e182e65101374955755a76fb9e09b,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,1089e1e44de00778b49de3661b90e27588679019577d2f34459a6284b6392559,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,c3713013dac3e7fa5ae00d5bc61b70385769152ab377103dea3cf90c059bc20b,Merge_failed,0658e504d95f807257d52bea3fc2a84de7fd4e1fd7c84dc8cb3790012ed74a8f,Merge_failed,317cb9882f6987a267f4076e59a9db2cd43db679df1354632ff76bdea4c925ff,Merge_failed,25a05c2783b1a7052a09a3af037c4ddf9f944423f1a8a8d75ad7bb97881e0fb1,Merge_failed,0658e504d95f807257d52bea3fc2a84de7fd4e1fd7c84dc8cb3790012ed74a8f,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,1089e1e44de00778b49de3661b90e27588679019577d2f34459a6284b6392559,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,8f59962ec846178495d345910052bbf0f4c9b4bb9289ee772dcc86bde0f45115,Merge_failed,317cb9882f6987a267f4076e59a9db2cd43db679df1354632ff76bdea4c925ff,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,42270310e9ce1ee59f4b269c4f01b4bf0d4e182e65101374955755a76fb9e09b,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb diff --git a/results/combined/merges_tested/connorlinfoot/cratesplus.csv b/results/combined/merges_tested/connorlinfoot/cratesplus.csv index 6cc4ef0411..8b93f2e18a 100644 --- a/results/combined/merges_tested/connorlinfoot/cratesplus.csv +++ b/results/combined/merges_tested/connorlinfoot/cratesplus.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,bc3274f6d0f3b06e70c50127666937fb75b179ae,d7fe737bb391bcdbf0c751cd2502e600fbd64665,afb0d0cb08ed065f89eb302cf00250c30c4aa9c9,,True,True,Tests_passed,e028ee105adf8b84118cedc88ada70e1fc61f5f784e98e2757de3fe4bb992e2e,True,59,324,4066,2,True,Tests_passed,148abb23eb48c0181962462b817a168e07e33b0221ba36af569be127a36347b3,True,59,True,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,b69c69eaf2c90d4ca2baa0ffa0c503358c05cba06086de802b81360b2e130916,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,b69c69eaf2c90d4ca2baa0ffa0c503358c05cba06086de802b81360b2e130916,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b 9,refs/heads/master,50dfeb59338bf094290dbcd1bbea1112ec966900,3e1450cf764cf02d72f03b9490f9b10fa0ae7a8b,6e15f7b0367e0ae03b9e5727d2812247d8b81c4a,,True,True,Tests_passed,cb4d31e39601ab5685a8f26dd8fb87628d4f9e8865210400252c74471cdb4227,True,19,75,374,3,True,Tests_passed,6e6ddcfb87b6fed2d8f4681bfe9cd527c094efb7f1dc6abda6e33f308a84c912,True,19,True,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,dc6ebc980ffd787da495df7720bd1fd30f2d718bb32975e704621ed7d558840b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,3a76cd21838be6aa724d28ce14503b39445d8a0542dc46bb53b917fe1ff9710b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,396831111bf429561c7bab45482d28cb88e77058f7da13665f5469e49793407d,Merge_failed,39753fde25f9bb3fc3a3335bbbc999e034851515f545b9599b8626a79c3425e5,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f diff --git a/results/combined/merges_tested/conveyal/osm-lib.csv b/results/combined/merges_tested/conveyal/osm-lib.csv index 9f24b8b617..b6fff49519 100644 --- a/results/combined/merges_tested/conveyal/osm-lib.csv +++ b/results/combined/merges_tested/conveyal/osm-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,True,True,True,20,66,851,2,True,20,Tests_passed,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,True,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,True,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_failed,6fa0a2f9780edd204386344f127aae185ef737869bc587285d18ab64ec494b2d,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3 diff --git a/results/combined/merges_tested/corentin59/artnetstack.csv b/results/combined/merges_tested/corentin59/artnetstack.csv index f8639293c3..09349e42cc 100644 --- a/results/combined/merges_tested/corentin59/artnetstack.csv +++ b/results/combined/merges_tested/corentin59/artnetstack.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,4c05f24b011bfa8d8bd18c6cad1d179708564fd3,d498a98bd7b4d4d96c03aaf6680e030a2dd52421,cda7b85e6e79a675b6687c4953e4f5928603e5a3,,True,,Tests_passed,bec0187f96d2e95f9668ff62a44341afa224be4baed4e174574ae132c4e41b63,True,18,115,,2,True,Tests_passed,8581d1091849bb3f11043edd95aa0d68665614a554e8ea613d4fb54dd9f95d66,True,18,True,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,5078138233e94f23de7a8de1b16acd0890bae668efd901138d88dc70249147a3,Merge_failed,fdd6aaa9b567e372f42d1e0c8b43e30e84d71fc8ecc11277134a274d8585459c,Tests_passed,ad220dfa19ffa97a450682861e2e81b90d09ae356a33b80f0130ca767eaf3cec,Tests_failed,8d0cab360479525bf167795d567d2c031947262ae47d696b83302083caa469ac,Merge_failed,fdd6aaa9b567e372f42d1e0c8b43e30e84d71fc8ecc11277134a274d8585459c,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,62e4301d86e8219959758545bfb485caa9f90c2c0b4865a16d0e38223e3cb5da,Tests_passed,ad220dfa19ffa97a450682861e2e81b90d09ae356a33b80f0130ca767eaf3cec,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93 4,refs/heads/master,f470681d57c8830ab18bf74db45fc67e8baecaf8,d1d1e64965cb8027fb1819b4e8657ba3f37e49c0,d10b58945b2d4ae6a7e82a83269a919bcf207f90,,True,True,Tests_passed,28b20d05bc3cb4d4de0fb2257adee1e81d3e6ee164542fc82ab54e8767ae96f6,True,20,272,1142.0,2,True,Tests_passed,a1e0dc9acf01b695c5708a7f79fb83f12b10c6140df734c66c9924bc1d1e39e3,True,20,True,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,719b241a1ffb75b4b03fed8254e81f1e14a229a4241a9b7c465905cd386be384,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Tests_failed,f758074615116886006b0ddf5897af8be30a193f592308b2f4e8b5ca52ce7aea,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,017ba4f154ef572529d41d5b75adde586ec817436c89f81a270cf6862aa8aba4,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07 diff --git a/results/combined/merges_tested/corfudb/corfudb.csv b/results/combined/merges_tested/corfudb/corfudb.csv index 01bc29bff3..43dab2a65c 100644 --- a/results/combined/merges_tested/corfudb/corfudb.csv +++ b/results/combined/merges_tested/corfudb/corfudb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 398,refs/heads/master,233e1eb18c40db72da1f101cea0b4935f8c6c880,a9e1a15d2d269f429b31d8ac197850e0321c4652,c18f2955cf32966675b363096e39f18027c51a4f,,True,True,Tests_passed,d32babc3b8fd3692ba30a7c61d343a42143192f774d57fdc34a66b8aff34d17c,True,27,79,884,2,True,Tests_passed,d9b2dc09d92de5db60297c5d088220370fc8132dbc4de8973016030ba4e01a88,True,27,True,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,04550d800ccc1af2167d29f9747451fac5ad3271f00ab3242fe0d8984925d712,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,0fda0b6a9c6923b0f0c7574c0389a59d5655c358440555549cd3a8099f764abb,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464 455,refs/heads/master,2463c3fc8f627aca24297a819fe158332733834a,89818e738f6884adc7f855022327e29a7087769d,3766c6c4793a3f1978284963cda11a0ca55b3521,,True,True,Tests_passed,3adb8ffe8f46d99e317807107603f6a1e87f569ee5b9bc782975f9624856e18c,True,2,7,21,2,True,Tests_passed,884de4926aac4cb5917e9913270b7ee2f954d9eded0b034a3809137133037740,True,2,True,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78 479,refs/heads/master,35572bc9c913d566b6748b9829a3a6e54237c1c5,fdf97dd73069b84fc6e47bcb1c44b44afbc0adb2,7ade8588dfcb25c1b5521da236af1fb88544b5b0,,True,True,Tests_passed,529772ecae46d7b7fd59e6f6b1eeae67165acd2eb2184aa7c06a87ad2b7b65dc,True,28,97,1000,2,True,Tests_passed,15fa725613c562664ea1152214266a98a6408e0937227eb99c6642631ef2d54c,True,28,True,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_failed,b8cfbf02d41b3e3a5f373bc10454830d2543d1c409b051109902f2a0f6c2c99f,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214 diff --git a/results/combined/merges_tested/couchbase/couchbasemock.csv b/results/combined/merges_tested/couchbase/couchbasemock.csv index e1b817ea46..a1f8482b4d 100644 --- a/results/combined/merges_tested/couchbase/couchbasemock.csv +++ b/results/combined/merges_tested/couchbase/couchbasemock.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/34,3d1fb1a06b418be9e80484d252cb722d0d285bbd,ccefd6269985a9732f7f38345b7566fd5a486812,0324c7ab70c7ec2e655b35beda22a73940a4379d,,True,True,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,True,8,7,17,3,True,Tests_passed,a5d6eeec2e2d55d22da79bb32fe886e34e124223a1ce8b66e9ad0ed4e8eb7cf9,True,8,True,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,5c238f19efadf8fcf9612c5e27b6ed10116dce5fdc7964135cb6ac1d75f7c332,Tests_failed,542757a60580bda20ddfa14da0018d8130229bac820a7531e678bb5510e1fb7e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,5c238f19efadf8fcf9612c5e27b6ed10116dce5fdc7964135cb6ac1d75f7c332,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e 5,refs/remotes/origin/pull/34,8a2592ff627f404c008bc22f5a62773f787b288a,2585b651a9a91599b3e264ed630242e734bce980,b49b3867e48f677ac07e870e440f1e5c3793cd5f,,True,True,Tests_passed,38b4ed1436a351259c499525cc437d9d2cd6e677bb774b7b4e4f41f2dca2e3ff,True,9,20,133,12,True,Tests_passed,df0a161946aabca831ea842e5365e622b1ec60c703e209c03dccfbb59d215c66,True,12,True,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,697aad2461df12c1c41dabea8cb0eecc9e8624b23ab33a925e15b162da87fc15,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329 diff --git a/results/combined/merges_tested/coutume/imageonmap.csv b/results/combined/merges_tested/coutume/imageonmap.csv index 81e3b49820..788b3c8e6f 100644 --- a/results/combined/merges_tested/coutume/imageonmap.csv +++ b/results/combined/merges_tested/coutume/imageonmap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/indev,094905324ef45772cf98c7887958202acf69e581,ac51032e1a0426cc4e40b525433cca4e270a9273,a45638b86c302cc93967a737e87b6e2c8412c186,,True,True,True,15,38,776.0,2,True,15,Tests_passed,27dd1f4dc5b5b025019eaddfbbd70028792f943ddbb8505ef61e1d54113d26aa,True,Tests_passed,776e10b34c839faf6745b02462fa65f4a39ee8c91093f0d199c0d070f4663f5a,True,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5 10,refs/heads/indev,20d2a60d290241fc58462ebe8d9b886ff0ac93cb,e0dc356f36cbbf679e07f1de439ddf26d7a363fe,fdcb028b209fb15f56cef22b81b64bffaf183472,,True,True,True,8,15,645.0,2,True,8,Tests_passed,cf4b9d0d3f4c5fd925533b67ed5288f9a8f3ebf0ab80d53ba0c2d718c3a619cc,True,Tests_passed,0c0c78629e56752a86c531962a5a970c7cbae4eef2fc471c83a51477503dd034,True,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_failed,e695e8984c4e75df390ee0da1e93bcb0a89e784c9900f361da3814f2f3632fb1,Tests_failed,5270fe41ff544cf6be0652d68e4ac70909f4023d2e3605a82f3d5e818736d2a9,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_failed,e695e8984c4e75df390ee0da1e93bcb0a89e784c9900f361da3814f2f3632fb1,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f 58,refs/heads/indev,3ace5f5edf302738f9c7d705ce9c81f718c800af,ce61923268b7a5ebab17d98a6bdbf6ffffbf0aba,a5d019373601989c9a028df7d1d803257ae527c3,,True,True,True,65,206,6824.0,4,True,65,Tests_passed,0211f2b9f3cd82c72a429148cd4359a1948a8d368fa3cd7781a2bb93bc6b0850,True,Tests_passed,6c60143b6060fba9991739474ab7de40bc8c7b4998d4334e7b70bee1b41a56e3,True,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,2da2915a600393daa0136dc674535b7315c667a6ca233a89713e95c2147d14b0,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,2ce7da23fb2b7facfaea32ff744a9c3aabe4443f744335a22cb946f00fc70002,Merge_failed,49c1a49881325a4933b8e87def48272bc7185000abfa4c09b26ddf78c4cafdfb,Merge_failed,d7748b7596054ccaef4bdf99a17c8425ebb8d103c412ad1ac8bf28afdb588ab6,Merge_failed,aa45d55e3f47a96d80d7b53e053603f4c0c298ad901354b71c4c1395bfe60028,Merge_failed,49c1a49881325a4933b8e87def48272bc7185000abfa4c09b26ddf78c4cafdfb,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,2da2915a600393daa0136dc674535b7315c667a6ca233a89713e95c2147d14b0,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,ef6867007135e9ca422bfab3f5dffcdeb1f4b09ace10774ae40be62aa017edad,Merge_failed,d7748b7596054ccaef4bdf99a17c8425ebb8d103c412ad1ac8bf28afdb588ab6,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26 diff --git a/results/combined/merges_tested/coverity/coverity-security-library.csv b/results/combined/merges_tested/coverity/coverity-security-library.csv index 18186dbec7..3fc3396d9c 100644 --- a/results/combined/merges_tested/coverity/coverity-security-library.csv +++ b/results/combined/merges_tested/coverity/coverity-security-library.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/develop,87f5b259742c8db2aec081be12efedf6c3b76577,06b372aebec440bc64141af4a83ad077b8b4ba45,8656ab536af9a8547ed58a3178170bf3f482813f,,True,True,Tests_passed,e98057c6694e44a17de3da44397ae4eb571296c7882d93ff6e393118019cf105,True,30,48,2981,2,True,Tests_passed,5b84b4fbfb4e112f3ffebd65df62dbc17215bad3b7df9f061e15fbfbf143b11a,True,30,True,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,8e1c351e5cda54b4004c136f0aefe1f3916a3184b16f780d293c0b0fe1d66b94,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334 diff --git a/results/combined/merges_tested/cowtowncoder/java-classmate.csv b/results/combined/merges_tested/cowtowncoder/java-classmate.csv index 6da85ebe49..665d97f7e7 100644 --- a/results/combined/merges_tested/cowtowncoder/java-classmate.csv +++ b/results/combined/merges_tested/cowtowncoder/java-classmate.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,6b9713af4e397bea11a445ee7ece81b8bc00f4bb,41e2e3f410c7fa9a0d3524766afde09a0634da50,80c4619726409b85810c4cbbb82344b5211944d7,,True,True,True,9,25,79,2,True,9,Tests_passed,282870724817032d7bf04fb78c33b64ecfd59bd1b4c278a0f882079863d945f7,True,Tests_passed,a098e050a85b2ce66541dc2a13e5c7769fadf7245d4785ac48c8d5f2e1aad541,True,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,8089f42c2d2bfd1e3302d349e3a6af6de71529fcff08b7ef138709847bfe270d,Tests_failed,5e797b625098bdc0334bd795c1adadf7481997d32e9580426fb25f640b75cc93,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,8089f42c2d2bfd1e3302d349e3a6af6de71529fcff08b7ef138709847bfe270d,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3 13,refs/heads/master,b6f993cddcb4cac4f1b8aa250f3e020e9727aaea,8aebf88f4c8bb9773a3fbdf1ca906bc83caf01b4,6f670f7db7b053c4690402fbfa60ace167b9e0d9,,True,True,True,13,21,68,2,True,13,Tests_passed,13426d420a43d9ae3c0924aeb207bd43e3993b9d4f9deb9d081420c8f1a72a21,True,Tests_passed,d9a6105f540e37aa74b7a1708f6432accc8f3f08835fc490da4afacf4e25421d,True,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_failed,808a35339aa2bb1e6963bb8c870ffd7c9db3d46f9d20c62d521253511c8fb3e9,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5 diff --git a/results/combined/merges_tested/cowtowncoder/java-merge-sort.csv b/results/combined/merges_tested/cowtowncoder/java-merge-sort.csv index e1d6e28b9c..b1d8e8cce8 100644 --- a/results/combined/merges_tested/cowtowncoder/java-merge-sort.csv +++ b/results/combined/merges_tested/cowtowncoder/java-merge-sort.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,259857f3675ea88d0f2d6361904e085ed91dafe7,37c22d00607f5618cab9a81eeb00dad848e041c2,af0c5ae57383b584ca1eca7cd5bcab218ca3046d,,True,True,Tests_passed,360643ef385c697e8e3adaeeea9449caecc7c3d799cb76850143b9d23d57398f,True,4,13,131,2,True,Tests_passed,19fad57bd5b751c6b2304ab92cb545eb13a5a2b98993b055dc04b9d9fa623537,True,4,True,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71 diff --git a/results/combined/merges_tested/cowtowncoder/java-uuid-generator.csv b/results/combined/merges_tested/cowtowncoder/java-uuid-generator.csv index 35dd1bb3e0..0622bf3ded 100644 --- a/results/combined/merges_tested/cowtowncoder/java-uuid-generator.csv +++ b/results/combined/merges_tested/cowtowncoder/java-uuid-generator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,47f4b70d8392a721d18827121cde1be0179484c9,2a9673cf1473ed5f0abf901df6ab79687bb62029,54db1d59909096e3d6c843f2d5338b18a93f6df1,,True,True,Tests_passed,44c7ba77106e5af0b0728e09032143b11c7b810bc83a3567838b528e0ea4179e,True,9,15,103,2,True,Tests_passed,78de4abb536eb2e184a2147ca779b6cc7b102fd3977af97be2ed570e3ad57d23,True,9,True,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,a9c1fda0cbe0a3089ec87b69fe3e7034698bf9b494868786bc73bfa4bfab11db,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8 15,refs/remotes/origin/pull/58,34ea9b33399f186391b0bfa1534c86a03b9d192a,3ef02dc8ee07859861f5fd73f28912e600c118ee,3d604642fdfc43763f18d805ed474b697483cca6,,True,True,Tests_passed,2942c980314fc487e7ccb25ec1c26de2d8115bfeb143a4e6bc74b1d8a27723e7,True,8,21,143,2,True,Tests_passed,ce17c516360aa49452b0ce953eb45b4e82c85578c8544b278b0828d13d6bc302,True,8,True,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,8e7d7bfa4490c397a6500c67fac4dffd1b19d8113e971f3311c9ecac1c8544d6,Merge_failed,5a3ba75f345bcd0ca9dd6b96e1a370a4f4251f5419c38b644f0762a5170810d7,Merge_failed,863d451334684e1d216db00e050063e709276e0ae7b00725a1bde6849c346c09,Tests_failed,c975d4fb6b1b55fd2ce7be8f0129e24d4566a8a089326ee5958920188fa03528,Merge_failed,5a3ba75f345bcd0ca9dd6b96e1a370a4f4251f5419c38b644f0762a5170810d7,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,4f53b3564320d28c6e3fd11f2a6379b4477c4f96d3166e1e5ddd13111239ef36,Merge_failed,863d451334684e1d216db00e050063e709276e0ae7b00725a1bde6849c346c09,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15 17,refs/remotes/origin/pull/70,48e9a51d19fecb5e51db498c1caa70acc5102efb,556338152c101ae1f6cc0b88297dcb5ffe23d3e8,18b8a5e8a288c87882bd2fb9a4d087a392f9035f,,True,True,Tests_passed,a740b9fd3436b07556e168f6e57efde4008e703bd6a2970b84c639239334efde,True,17,51,182,4,True,Tests_passed,50b90578f7b3f31d9441d3cbe42266d7093e4186c9681e540e5e944ccdd830fd,True,17,True,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,e4f06d46c02fb8a16613a3d92ed2b12206e69b40e5b03029f2a296b0957e82cb,Tests_passed,97cfc44cf8b9e3ec0e8e1519d07da83ec4590fd7f4764febda964c17df7712a2,Merge_failed,7247c6ae2321ab4f9e48ea2d097be22b25332cb98eca2dfec3a5ef101c6e9bfe,Merge_failed,c4a1b34d9ed1d57e95c7cb118e0aa2d29e085600357b0ba71a9cb3d8fd402c14,Tests_passed,97cfc44cf8b9e3ec0e8e1519d07da83ec4590fd7f4764febda964c17df7712a2,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,a608fc1a1e752b2cb70d14ea047269e3fd11496d9e6ac0bd1a75d665dae182d0,Merge_failed,7247c6ae2321ab4f9e48ea2d097be22b25332cb98eca2dfec3a5ef101c6e9bfe,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34 diff --git a/results/combined/merges_tested/craigwblake/redline.csv b/results/combined/merges_tested/craigwblake/redline.csv index 7f658a3a54..833485d25a 100644 --- a/results/combined/merges_tested/craigwblake/redline.csv +++ b/results/combined/merges_tested/craigwblake/redline.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,93d8982d66c56a3d198aaf792b4c5737295aedbd,d1720810ea8a53f15e01332d4d8cf31ad46bb381,71e1ca243fa959797728bb09c0abf3c6c2d9a697,,True,True,True,25,124,829,3,True,25,Tests_passed,d2d8a0203ef4aaa9877fcec35430e310efb7a665f2dee1effe6a7adefdfae625,True,Tests_passed,9ed3135958ce290c0bbc1910c1f3756206ae48b0787154dd6998e8cfe34c084b,True,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,7627d34b8ad0e5a3a8cda6409653016e055d00793f9a8332acf2c2ecd1f06509,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Tests_failed,f5932d025d6bbcfd68d6f2e7a138a1c0b425cf878fa51248e14daa2f9610ad04,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,f1730bda25aa5948d498c8a4630e4fcc08ba9575901918747a713db7ff032455,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf 30,refs/heads/master,993ab936856160b99794328a5b05243bf03fccbd,e751112e9417df5a2e187d59e44ef088ca45e8b4,22eb21c34edc63f037d70e908f0b630301587bcb,,True,True,True,15,83,655,3,True,15,Tests_passed,ca24ae175bd85ae6336e6397ae7337c40bcb7e8b15071a380eb9c578254c433c,True,Tests_passed,496481dc54adb23b6e92ba61a6fd6e50160d1c9c8b00ad0c7cf3a6d20ceaa8fc,True,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,351dbba28dfec721d7a17c3195606399052a09ebc46f1e108520cb260def5b01,Tests_failed,58abdee0f3e49a2224ee24b58a4b188f89acb05296afa2a80dc878ef93418109,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,351dbba28dfec721d7a17c3195606399052a09ebc46f1e108520cb260def5b01,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73 35,refs/heads/master,244c28ec8ed99f02ecd9132e5e8b93634e74d68d,3cc029d6a8440a80fb78ad66ca1f595bd74d49d4,aafc9b1b1e9f273f77fcbcc3db10af2ebb0f0571,,True,True,True,6,18,98,2,True,6,Tests_passed,ca92b305fb66a39bc0b75b7156bb535930aeada34f747fbaa1b9589972793af3,True,Tests_passed,e5b0bba3a3ce596b7598ed0e6c4b18329d6081ec693e40bf5e9ff420f2d0cd34,True,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,ed1535c2a70e0e7a2baa09fb89048ea2a8824740fbec1e6d8221df64b66b98a1,Tests_failed,174a2b929f49b5d6eb8c7130014c263b51622e7159534312adbf90efe402647a,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,ed1535c2a70e0e7a2baa09fb89048ea2a8824740fbec1e6d8221df64b66b98a1,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd diff --git a/results/combined/merges_tested/creswick/cjwizard.csv b/results/combined/merges_tested/creswick/cjwizard.csv index 6de2543dcb..9e6572047b 100644 --- a/results/combined/merges_tested/creswick/cjwizard.csv +++ b/results/combined/merges_tested/creswick/cjwizard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de diff --git a/results/combined/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv b/results/combined/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv index 12f9ad03f9..211446c47c 100644 --- a/results/combined/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv +++ b/results/combined/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,0cf79745f1072e02d4b78a76f3dd4a9d1aa1fe64,a63955a74321ab748247b5bd60b0766aa7c5ec2c,4da8cd42c2f2c9a7191d65645100747c130c98a3,,True,True,True,34,86,3348,3,True,34,Tests_passed,c6365930a58e59b9ecff062edbcaf498004dbd587fd97476b39d799033fc5e17,True,Tests_passed,9c7627e1dd0f82f779c9e09a47da7d018a3cbe4ac985e3bacc276f309a751384,True,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,1dfb7f8c6110e9810b7a834625d42c9a4e912791e6018325faf3779a0393913e,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,2411f3d3f7e375f52d6ebcd7925911366876878c727091151bfa14ad2fcfdfc7,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,4acbd576b3d223a713bdf9c21dbf22e373d91220bedc7668e6a2c13fe9d75540,Merge_failed,e70f02aaa82047a30a48ed3be22b1b0e7aa04844bc333a7fb78b75d2c7239143,Merge_failed,217c0b61dd642750ad71c0ed676a0f456bccab394a446f68d4df46f89a0338b1,Merge_failed,be4021fd1d0f2ecd886779570553d49c6f51168190305bde05418ef2a303bde5,Merge_failed,e70f02aaa82047a30a48ed3be22b1b0e7aa04844bc333a7fb78b75d2c7239143,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,2411f3d3f7e375f52d6ebcd7925911366876878c727091151bfa14ad2fcfdfc7,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,e3c10d6f31fdd2d83f998c3a1fb1252b23627f38999f4087477f716c369135bf,Merge_failed,217c0b61dd642750ad71c0ed676a0f456bccab394a446f68d4df46f89a0338b1,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,1dfb7f8c6110e9810b7a834625d42c9a4e912791e6018325faf3779a0393913e,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002 15,refs/heads/master,0b7df0edc68a40c8d79c903cb86e247f7ec190b4,56a8b97dd8be278ed2636077bc5f1b929d0229b7,3887e2c173f89684b82ab5002499c435ebf3a60f,,True,True,True,15,33,197,2,True,15,Tests_passed,086872243a2eef8176f0ffb013f0f4aed0ba3e060a3a6dce8b9e7c7a098fee47,True,Tests_passed,fa4dce8419a625b5abb82d41d22a3f2fdcd3bb917dcdd00a9fcc11ce5eacc377,True,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2 diff --git a/results/combined/merges_tested/cternes/openkeepass.csv b/results/combined/merges_tested/cternes/openkeepass.csv index 4870993e6f..403e80d161 100644 --- a/results/combined/merges_tested/cternes/openkeepass.csv +++ b/results/combined/merges_tested/cternes/openkeepass.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,3dc44ae983c2022ca0544609982fcac1ec1bff0c,49246bc507a0deb31455f5d4c7cc546ae499762c,8e941ebfb37052ae520280bf59f2bda5345fb1a8,,True,True,True,87,208,8979,30,True,88,Tests_passed,6c07885bef7c255bd6436bffe865b56d94e687fc1db6989938b8c705e8cea00a,True,Tests_passed,1fc7776b5a6fcad1f8d1c10a2c307066152a77431574721f7d904811ce80061c,True,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,4501a27626d86dd6f20a934414ea9029c6ff0e889b905cfde2ed18c7b4e93d22,Merge_failed,767ddecacfcb9086c4c739ef8f8a5934fac0c258b348730c337ad9a472483987,Merge_failed,acab791f581413ff0c5c0712e1218a6325b3cf9ac5e910ebd1795ddb14f989b8,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,411001be634e9a4b1797afeb07421a55ef692ae499e3382586f42174e0904a1b,Merge_failed,f426819b229aac3f8507881e7e251d2ebd692b039d3e052085dd6e6be4b7cfce,Merge_failed,99e589cf9f425868e9765109ad3d33d2574c9dd590e71245b9959678cabaf231,Merge_failed,5e1e0621487fc287b4829767e365aea49405aa6bf4e6c0729ddbdf45d600c17d,Merge_failed,056bc28afd412ffe9b7bed975260513c8b4a387987b8cf6d9c0759ce84d7523b,Merge_failed,99e589cf9f425868e9765109ad3d33d2574c9dd590e71245b9959678cabaf231,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,767ddecacfcb9086c4c739ef8f8a5934fac0c258b348730c337ad9a472483987,Merge_failed,acab791f581413ff0c5c0712e1218a6325b3cf9ac5e910ebd1795ddb14f989b8,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,411001be634e9a4b1797afeb07421a55ef692ae499e3382586f42174e0904a1b,Merge_failed,be4f600c8659b9b33c8b496b897980a01e7c7420e6b49e537f3b648950456080,Merge_failed,874f6d263e7bd3eb36cb7ee4e81b7cee58fb1979acef28a4542e75bbf6865734,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,4501a27626d86dd6f20a934414ea9029c6ff0e889b905cfde2ed18c7b4e93d22,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a 12,refs/heads/master,0691954e63c3576146e86809bff0c0c2b77a0f6f,6218ade3f2e50f22e5e263714197f176e856c5a2,18ba96ffbe2acabe644a155ef8c650548f3c7062,,True,True,True,38,119,767,3,True,38,Tests_passed,836933c08f60ae54c30f2e09ddc4c575aeb57ed7d1af55b8930d4eabae3e99f5,True,Tests_passed,027deee34b639e0ba83921c7135dd06ab6d20889838dda37e4edf841ad8711ae,True,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,19ce7a4296517faa89f86279bf3a90fd977c882d51305bf75abbbf2c99f133c5,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Tests_failed,e6a4f25f27dde16ec7b1430d8b6a056c83eb278028d1337aaded5ffe4eee5e15,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,d406fc0d0f684390df947eaaa6a457be4f6c4b53ac80f5683815e0159aeb86f7,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442 13,refs/heads/master,6218ade3f2e50f22e5e263714197f176e856c5a2,fe31fe2af3107170ed8d4fd59fcf2574d318ea39,5c22299664a6d192d178ee10a622eb9b67eb2d05,,True,True,True,42,132,952,4,True,42,Tests_passed,d315b473170630c6e9408e496eeca7955dec1065a27c1e2eed5739b26048224e,True,Tests_passed,a94a4d302b0556d51bdd85c2ccfe8d56bff0ea47d6da5a22acf17e690efa6520,True,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,85a4fc1581d16c52dc84bc4ef177407952b5f886017e4cd12a1d3d454c51344b,Merge_failed,a654419dd5b83b46fba6798f5d6342472aee3b66521e231126fd1ae577c87219,Merge_failed,6a72b313e616d2a7d12f06852cd76f874405921ad3c24358a9327af4a44eedd5,Tests_failed,ff8e0a97e2159c0c7a678910112e3f750f10d27a063e4f02f94b55adaadd5b37,Merge_failed,a654419dd5b83b46fba6798f5d6342472aee3b66521e231126fd1ae577c87219,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,58296e3c33744533ee69e6407a3d69da59cd592c4702f0f3ed093a6a6b5025d6,Merge_failed,6a72b313e616d2a7d12f06852cd76f874405921ad3c24358a9327af4a44eedd5,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b diff --git a/results/combined/merges_tested/ctran/tinyradius.csv b/results/combined/merges_tested/ctran/tinyradius.csv index 1ce8926912..2c60b627c7 100644 --- a/results/combined/merges_tested/ctran/tinyradius.csv +++ b/results/combined/merges_tested/ctran/tinyradius.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/20,28644bdc78775695857aec787d220e81399454e6,4332168d74101944750e404a65f01664532e1b2f,82d5baf8774ce22e2301d5c856cecd9aa7348553,,True,True,True,10,37,271,2,True,10,Tests_passed,1d380689633a029030220c020d6280aa62adedd1cba5035502ac3ecb62ba0730,True,Tests_passed,ea373092ad708087253cb44417aa7b84052b06f4e89078ad3b80c7124716bc98,True,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a diff --git a/results/combined/merges_tested/dabsquared/gitlab-plugin.csv b/results/combined/merges_tested/dabsquared/gitlab-plugin.csv index e2fd488b3d..954230e357 100644 --- a/results/combined/merges_tested/dabsquared/gitlab-plugin.csv +++ b/results/combined/merges_tested/dabsquared/gitlab-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 120,refs/heads/master,387517997c283739cbe1f4c0de882e6be6dd8b12,5e908e92ec4140e3795beb1fde7214e5c4b80fad,f2815dcb0482755e4185d2691a3a0cf37b862b26,,True,True,True,28,105,546,6,True,28,Tests_passed,d2e431db6dd60bcf45fa6b5b3a59a3f5e2723f60478937424e6e7afdebf6c637,True,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,True,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,3d60a84a5466022c80f802d3a48d5ba484081bc51ef521694164792036302d00,Merge_failed,482ed14a32d690f2b50c7c36af6db3ec30ce94192a550bcd517b68f22a8a9269,Merge_failed,ac70c0db4dc504ca6286a3ff01e06dee316eff985d1218810c9f1a586573c870,Tests_failed,b086eb9b4a1a842998b84a03c94363c52c4581498a328cfacf8b7ddf3c528e1a,Merge_failed,482ed14a32d690f2b50c7c36af6db3ec30ce94192a550bcd517b68f22a8a9269,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,ee031e043b04e2d8becaa043ab4a981a0a9c1d59e6c4bd4e67d62d2f5969ebf4,Merge_failed,ac70c0db4dc504ca6286a3ff01e06dee316eff985d1218810c9f1a586573c870,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c 121,refs/heads/master,f2815dcb0482755e4185d2691a3a0cf37b862b26,49b97dfa8f9fdc0f172af04491ba5dbd1b2b5f5b,45e754db357692047e481500269a3b3be764dd82,,True,True,True,37,159,728,2,True,37,Tests_passed,71762fef9b65436d81101674ba3e728166bf44a8c376453ea883e96b58c9e0e3,True,Tests_passed,abf6299d51eceec06b0287b2c14b80ee7337f3589c6adc121e448779569735bb,True,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_failed,481a016496d4c1b9dc5c7a3960fa16080b08010172214e9e1f8a25cc32255c25,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263 125,refs/heads/master,4cecd03592555739b0e9b6310e7d229582527f21,40e6fb8c47dd3148b8716bf90537fbf5a84e3f56,e24861f4982caea7fed85b15fe84506974676b66,,True,True,True,36,158,718,3,True,36,Tests_passed,292b21a7aeda554f52250089c6d3cfd8f9bbb811b6ce0c54dc4e82b3884e8b7b,True,Tests_passed,647d17d3b6965be9b758ef3cc996c61adcae249560587a967a52cb70abfc2c24,True,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,3058202bc1379f6e51330f9735e4081f11d26e198106cc6f727ad2544a9114dc,Tests_failed,a0126f7aadc4d09d86bab93a07af4c7fc319ad34175305e9356c1f2378f0f5e4,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,3058202bc1379f6e51330f9735e4081f11d26e198106cc6f727ad2544a9114dc,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e diff --git a/results/combined/merges_tested/dakusui/jcunit.csv b/results/combined/merges_tested/dakusui/jcunit.csv index 84943014f4..dbe4589e69 100644 --- a/results/combined/merges_tested/dakusui/jcunit.csv +++ b/results/combined/merges_tested/dakusui/jcunit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/0.10.x-develop,0b4c454e4929b27376cf7647170b7eda141f0f67,a0017f094773a8fc9960921077d3c51bab03a7f2,a3671fd83d32bd11f6a4237aeffd72a76ce0f88a,,True,True,True,15,39,165,2,True,15,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,True,Tests_passed,de3ccb8a126feb0d01758f2c3bec55924c15c3597f1116bf6a0f4ec1cdc220ac,True,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,e4cdeaa0cd0badeb84479973b4b9eb766456119fb5be1f4d604ea8fcd39ee09d,Tests_failed,bbde49d3ed9246efec561be5e832844c4bb1dc750da52b873419abc0a30c835b,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,e4cdeaa0cd0badeb84479973b4b9eb766456119fb5be1f4d604ea8fcd39ee09d,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27 10,refs/heads/0.10.x-develop,462dfb4cb47c28e87efb37d8632033bd845ed3d9,28f9a999c09c0119b65ab215a5ea093e6f7c8dbe,a584486c1c005a50517b0de771bf255121370db1,,True,True,True,15,42,180,2,True,15,Tests_passed,231ec8bc3c38afbf2aab2cdd33c9e1995584808bc42d707791013156f611c830,True,Tests_passed,de3ccb8a126feb0d01758f2c3bec55924c15c3597f1116bf6a0f4ec1cdc220ac,True,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,f077cfa33b90dfaf2c715809d3fac6eb0f24de092ec31c721c7306402f7476d6,Merge_failed,4dcdbde9177094681168b2ec2da13064670f4d68800cfe8b47edd6e845a1e4cb,Merge_failed,d2447d0b12d06888ef62d9af8d9976582c8a36d28ef08fb584cb350ddfe69f8e,Tests_failed,a59fac4990e325fb81504290a4fec0787de778bc244ed9e510a5ce0ca0e79476,Merge_failed,4dcdbde9177094681168b2ec2da13064670f4d68800cfe8b47edd6e845a1e4cb,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,d2ee6f4f0729b047d35f5beb5237013ac90523bdbc2c838dd15203beadc74d31,Merge_failed,d2447d0b12d06888ef62d9af8d9976582c8a36d28ef08fb584cb350ddfe69f8e,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1 18,refs/heads/0.10.x-develop,15193c8f28c1605de53c0717f91511ca5517e3e4,fd78062d33228c439fa17c0887b18e49c59c8477,c61777098216cf5d8391d69cc8aec415d12566d0,,True,True,True,17,67,862,11,True,24,Tests_passed,4aab9d44b898ba5df5ab8e173c486007a78c0d51a644ad0c7c75a8b717a2aec9,True,Tests_passed,a1abd535e15561a2d55b376052f57d8c5887dbe74fe0ebe9db2f2e9ae28ab332,True,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,7e66ff1c3868338644fa00b4fe7671c7d91379eeb2d67def989009c4d6480eb4,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,d8fc01497e7e0f39934ff1fe46f6e65411e453134feab2934cc75977b5913b48,Merge_failed,6bb8be2541f01d76914f0f3e3c4cb404b173729a21cacd8afd133230a7c78bcf,Merge_failed,ac1171942e0c185e04cc9fb910471f0d3ec8824516499b7ac37bad047eb883aa,Merge_failed,a55b52d2da843cfd561db705e5fe2ef09ec6989d0efcda3d06c4ebe8bd21fd56,Merge_failed,6bb8be2541f01d76914f0f3e3c4cb404b173729a21cacd8afd133230a7c78bcf,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,7e66ff1c3868338644fa00b4fe7671c7d91379eeb2d67def989009c4d6480eb4,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b97edd9b0a71b769f750b71af470175d9bb394b164663ff163fc086a86c2c824,Merge_failed,ac1171942e0c185e04cc9fb910471f0d3ec8824516499b7ac37bad047eb883aa,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a diff --git a/results/combined/merges_tested/danielflower/maven-gitlog-plugin.csv b/results/combined/merges_tested/danielflower/maven-gitlog-plugin.csv index f951ad2a37..b83dec46ca 100644 --- a/results/combined/merges_tested/danielflower/maven-gitlog-plugin.csv +++ b/results/combined/merges_tested/danielflower/maven-gitlog-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,37784d6f29f5c446fcc52dc2d7416efb51123a03,8fc7b8b26476fda7cc389de7dcbc43f743071541,9895edb225fbdc2d839b66a6fa5222a97da99566,,True,True,True,15,43,151.0,3,True,15,Tests_passed,1c6e5bdf01dc535820c82ed91bb7d2c99b2c13553fccf7457e768fd8a9367a9f,True,Tests_passed,86bbbb2f169f85319e7cb5ea8deab5825c0dd48692d10d4af44835ab1ef37706,True,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,7a545a22bdefb1d09ef9012fb580e554b03569c0edaf47d61a02eb8a896cb798,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,7a545a22bdefb1d09ef9012fb580e554b03569c0edaf47d61a02eb8a896cb798,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879 14,refs/heads/master,0bce3a1367ac611fc90a265cee3fc6de53c75943,3330e18f01f39361c7cfbb21d26d44c8f9c21a00,2007bf5f639ec25ca7b30b77ffd3f9701923a57e,,True,True,True,5,15,264.0,2,True,5,Tests_passed,3d7af16377c293a7d23528eb1afdfe603d662751e175bdf24be4c61e18051ed5,True,Tests_passed,4e15b33f4310230925b7a35e55d0ddeb1ea0073f6e1bd2387fa5d5a13b400f08,True,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,c1a62f63f057a022f6fbfcd9fb9cf5473fb81a3054a9f649aac2b4e6420ef3b8,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,c75557219c0bdb3ecf1d179f3955073ce44f6e31b81f9a62ce93bf5c3ef24615,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,d8aa325463536df9f46d56f347633a457d1c7a5ff8834b175739770091e83706,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e diff --git a/results/combined/merges_tested/danielgronau/highj.csv b/results/combined/merges_tested/danielgronau/highj.csv index 59401dd456..b010f5c52a 100644 --- a/results/combined/merges_tested/danielgronau/highj.csv +++ b/results/combined/merges_tested/danielgronau/highj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,57cae0eb2d9be81f18f7e6f05cb69e68cd731c7d,a0478ba744b7beb5b2c71dea640a6cf6b26f5594,83e3f970c0a9563ba289bc1d35204dfbdfa624b9,,True,True,True,254,698,1975,4,True,254,Tests_passed,293ed24c2bdf911155197dcdcd4b66c5add192b0f3ce37628a1a917f45bdbd8e,True,Tests_passed,69a85ed3e02b92d8bdcb0fe8cd66a630995461d02088a6af88c4c53dfda957b0,True,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Merge_timedout,,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488 diff --git a/results/combined/merges_tested/danielnorberg/auto-matter.csv b/results/combined/merges_tested/danielnorberg/auto-matter.csv index bfc3e0e938..a7e2e39988 100644 --- a/results/combined/merges_tested/danielnorberg/auto-matter.csv +++ b/results/combined/merges_tested/danielnorberg/auto-matter.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,a076352517d328fcb10a4cb9d1dd25e823f47e1a,32b943613299e13becc4ae5ab310d3f911776964,978b269eba9f5fdd9c4b88a98d6236fd03c0e8ab,,True,True,True,26,72,716,8,True,27,Tests_passed,77c4cbc9f7f4215fad0b8f58abf46244e7ab064ac85ad7c8c13e918590a00280,True,Tests_passed,40e78e274138c689c534014176d9606b965135bb2e47197a9b1b77166d19dfb3,True,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0dc994035403edb4259cd0c3e6fb470a6e18fdc0c560ad9f23a8229dac5ec3a7,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,1595a4e90182371ff02cb073ae63964c5c91b6b65fd8df066b28e1a5505885f5,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,662a4e305c2ef760d58f9e26426d481d94b4b0f9429af40ddad614a8b8649f3b,Merge_failed,489931d6f9048e1e9f1ca3ec0037757d86a9f08d02f430d2c0a95cdad59ce854,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d 43,refs/heads/master,5739d194fb360dde65820538263efddba683785f,d002f08a59d0dad558abc9f19aaf03e462e7122c,64a1cc5bdb1ea9c61ab848161777795b79f04481,,True,True,True,29,128,1828,3,True,29,Tests_passed,54e831d7d264a09f9599d207f90cc863f99c119247a6811b81b1ff421fc3ce44,True,Tests_passed,8abef44feb5149d6ab652405c4e3109d47859112401e3f6141980d4e3609d248,True,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,2c4778bb8468490a35324d2833280eacdec9aad91af98b225d4a652dac7d1dfc,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,cb4f9f5ab3dbd8615bcf9298b41dc28fe81a54f2946db82477ac3a3e6afde913,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,b9b9d767a5fc2f8e17c61826b98c9b23727317b1a5a2f3fe18a29ea37e407a1b,Merge_failed,a8a26570fa37d815be9dfe24933463e8313293dc8e1386590bb9e67ac2504f99,Merge_failed,414fd83640077bf0271219297d4afbafe3e1658073280ee397b6f981f56a3493,Merge_failed,9c4f8c70e6696f4ee907771dc0ceb634c02cb1728e703ce79bd99694578dcf11,Merge_failed,a8a26570fa37d815be9dfe24933463e8313293dc8e1386590bb9e67ac2504f99,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,cb4f9f5ab3dbd8615bcf9298b41dc28fe81a54f2946db82477ac3a3e6afde913,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,32d7d5a43310df47e68683c6afb9e617e12ea77ffded784d58f9db143162073b,Merge_failed,414fd83640077bf0271219297d4afbafe3e1658073280ee397b6f981f56a3493,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,2c4778bb8468490a35324d2833280eacdec9aad91af98b225d4a652dac7d1dfc,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f 68,refs/heads/master,196291d257be7fb635992246199269775461b27e,01f1a7ae713492e3b4058411bf08efe1bece95c4,fbae6cf23b6184e19ed13032359085d744a71023,,True,True,True,3,15,104,2,True,3,Tests_passed,5333bcb74efeeaeda31f1d7b9d27538b2e79100394bc8520ebe7cc7921e8e4eb,True,Tests_passed,468f5632374e6fd1bacbecf908585493c3ffc47a8777d4abdbacaa9ad4275cec,True,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,d9b517574a6869442522d48b1a945b6f859443f8020e4f3c5506444764c712c0,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,725f73917d6a28d47ce2099b86e482ecba7cb5b67fc8399f0f99bd3b8c05b7d6,Tests_failed,419573f72fa1fd5d198b3f459ef162b877ea06c0acb18b4d0dbde26a5b501b14,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,725f73917d6a28d47ce2099b86e482ecba7cb5b67fc8399f0f99bd3b8c05b7d6,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,d9b517574a6869442522d48b1a945b6f859443f8020e4f3c5506444764c712c0,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5 diff --git a/results/combined/merges_tested/dankurka/gwtphonegap.csv b/results/combined/merges_tested/dankurka/gwtphonegap.csv index 837e153075..a5a2f11728 100644 --- a/results/combined/merges_tested/dankurka/gwtphonegap.csv +++ b/results/combined/merges_tested/dankurka/gwtphonegap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,e19aa67e33166f958e2cb1181d5811cbde2ff6ad,72aa0c929b6fb675fa29d56a0daf0405caf85906,9037a4172b06032e5133e95f0fc4f0fc9c3651b5,,True,True,True,21,63,419,2,True,21,Tests_passed,28b9675d2af90cfc8a0741471a1ba40af03a39fbfeb06b5ae912d0259bc27665,True,Tests_passed,6152f84e95cd50a4fa5d733320cacb3af9ded85e38b0f27aa14be15ef42da51b,True,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,b8e26278e5cddf0af3c37d17525b3002d0b2f21e7786758d150f93a582ad37d3,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12 41,refs/heads/master,b4738dff72d699a21141f607b91dff8fd2266f04,b176e68f80a0e6f4e02adb6a2d873ccd1b381874,0dbc30a752e59c1117b2b4a72f94d30533160b7a,,True,False,True,2,1,7,3,True,3,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,True,Tests_passed,b0ff3dc74b18b798b476ed91375324bbf9d559f1b337c376c7098b0582c29c63,True,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Merge_failed,0a4827deb8d7aaa49d1dac8657a3608846d5ffceb4ce751d798cbeaa32f008dd,Tests_passed,f2d80d77384484caedae2a8f63a64637f01a24f27a1ba16d90f1a9266410f439,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Merge_failed,0a4827deb8d7aaa49d1dac8657a3608846d5ffceb4ce751d798cbeaa32f008dd,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,f2d80d77384484caedae2a8f63a64637f01a24f27a1ba16d90f1a9266410f439,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7 43,refs/heads/master,0dbc30a752e59c1117b2b4a72f94d30533160b7a,d9fb6e9c684f0b2d3f228edd4fdcd4927d10c078,001a376762dd43609c0c11def14f2b0ef77754ed,,True,True,True,7,17,571,12,True,16,Tests_passed,fafcce3af877a7aba26588138f2923c756aa539aae59e586d9d94c5ecc1f045b,True,Tests_passed,4672f13c281b75a7a82405ef4e47fef0f336028323131312f0b4d9bfc128ac35,True,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,0b26c38bf7835411fd2ecf10f9695ea80d2e63cb8942975b598cbccd435687d5,Merge_failed,08691d8e85bb5d81577307cbb36a8867804c5ac7a74efd3c3b5e7ed77278de4e,Merge_failed,877e7dc43890bbe798be3d44617490be0f3628edf95d8ca275eeb91f80244961,Merge_failed,d51bb44529415a7592427b7bc4f259a0154baa256e2c770b3fa8cd7fb3e01421,Merge_failed,08691d8e85bb5d81577307cbb36a8867804c5ac7a74efd3c3b5e7ed77278de4e,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,d817c19bdfbfcd169c7bd7e9683a2f50caffcca3f64d51f5e84bedaa510ad533,Merge_failed,877e7dc43890bbe798be3d44617490be0f3628edf95d8ca275eeb91f80244961,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba diff --git a/results/combined/merges_tested/dankurka/mgwt.csv b/results/combined/merges_tested/dankurka/mgwt.csv index b44b3ff482..3e02c2e8b3 100644 --- a/results/combined/merges_tested/dankurka/mgwt.csv +++ b/results/combined/merges_tested/dankurka/mgwt.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,74856a7a070dde80f5ef866eb6de0ec77d4c6baf,49d43a7d9cb9aff1d7409edc47a858653f1773f9,39d049502be0f9b1ecc7dc572b93c5e112d75f08,,True,True,True,25,62,137,2,True,25,Tests_passed,3e8368c81eaa5de1031f85deaefdbb715cfca6abc82d04133f9ee629a9a9cbca,True,Tests_passed,885e081f41745970e619b1b47a3fc5b497a8d2fbb9bfc43bde26c26c5be6d7ce,True,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,821def53ed549e07dfa5d5e8fedc9e112ceda9e32adf39179c091204a727a55c,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb 24,refs/heads/master,d956e42a28a4d3a0293b3a014c3d111e9f9ddb37,d6995585788e8c18392697ef3006157646cab2bb,15f1a389e0096140e2e31609b5a8eb8ca5514582,,True,True,True,57,84,885,2,True,57,Tests_passed,54f80e0cec2be7f46bc038fdfef88ec110946518c31473ec7928b05f863fc034,True,Tests_passed,7358a0be9ed48e8cd3c6507d78d35b0c0182fbe93fd335a933e4e38cfcb2a957,True,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,e0ddbea18206d00f0cfbf4371c7e218a475c7c725d4dd989bf6a380e4d95ddd6,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,e0ddbea18206d00f0cfbf4371c7e218a475c7c725d4dd989bf6a380e4d95ddd6,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8 108,refs/heads/master,8db3e82c37cbb95d1a0b0d374373234f25a7ab58,010e4540b4f3002a8b62144da4ba637fff522186,8577c4421c4d29dc64704f0f9a7ba629456ac8be,,True,True,True,1062,1825,22241,2,True,1065,Tests_passed,a03c16b73d6406af18cd5333475047a93a632c3c1a964b7f2d4e30360ed1f010,True,Tests_passed,1dc1f316cad97360068ec402f16fc75d815e91b8e8bfa0d5c4e79ada9acc2065,True,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,d4bc4879d5cfd80ab80b8dd94057044117d139f5f680cf23106d589a6b106d6f,Tests_failed,629297a2d691b8e085f5ee589d4947c0aa2dc3f29332e5389b3793624da6e1b1,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,d4bc4879d5cfd80ab80b8dd94057044117d139f5f680cf23106d589a6b106d6f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f diff --git a/results/combined/merges_tested/darcy-framework/darcy-ui.csv b/results/combined/merges_tested/darcy-framework/darcy-ui.csv index a7fde9881e..db183a8932 100644 --- a/results/combined/merges_tested/darcy-framework/darcy-ui.csv +++ b/results/combined/merges_tested/darcy-framework/darcy-ui.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,2b85384321014d352afe7bb43e8b0381ceee9585,8795cbf2b5163c4af38c9c3391e126514c6591c8,583f308198fedb6474dd9db08b9e9b43ad3c8c9f,,True,True,True,43,118,2013,2,True,43,Tests_passed,13747875c69679aebf3a001e9726b6b683a213dfe9804d72dea6c1fd833dfe4d,True,Tests_passed,1352358b99932d811af9fad293c2eb6982bba457ffc728f00e326f045e1cc9e2,True,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,8d75478d9eca4261ff5e04a64c34203a3c673f01a77cc744a84fc0dd6c5611c5,Merge_failed,2ab30e8ac278e43efa87031c8dc4c37d610174b775f905d9960b1b810a6cb656,Tests_passed,d68d54fbd43b87ca8b72655bfa4127f22ff323c0c331812384c2eecff4ca62fc,Tests_failed,65722539b595d54ebf4b137f54c8305ce41bdaf91aad6d47c373e687f4267bba,Merge_failed,2ab30e8ac278e43efa87031c8dc4c37d610174b775f905d9960b1b810a6cb656,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,d7a1ca72a0ca6e3a3d28eed86d6151387283eae69bf68e26be75f33e77fe2e93,Tests_passed,d68d54fbd43b87ca8b72655bfa4127f22ff323c0c331812384c2eecff4ca62fc,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972 29,refs/heads/master,5e1d93a56c5c0ba82cfa8adcd706b1fc0214493a,3c9c0fdf31a278bbd8c65071ef901aaa731c0bc9,9ee241447d187a0dc5bfd5d05c9c89fdd196205d,,True,True,True,6,9,95,2,True,7,Tests_passed,12eedf2cdaa4653d0c84a03ff15518a526bb15fc690d073248b54b19fd5d689d,True,Tests_passed,97486b57bf593bf5c7c5c2c12f1dae25eb306ee1219502ccf54bc0f376457cbb,True,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,70a5eb4204f75505c73ab3ef840e144b2b292d82f1115aa84ca73390ede142a7,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,2ce79117ac6e5d7412efe54c83d6833c58751a338b09891d839ae67f678e0ca3,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,9b9bdacebfd235f47ecd2e95b4e1a7ab2165fdfe972bc24a9513f46924699124,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935 diff --git a/results/combined/merges_tested/datanucleus/datanucleus-core.csv b/results/combined/merges_tested/datanucleus/datanucleus-core.csv index 541d3c2cf5..15a9d690b8 100644 --- a/results/combined/merges_tested/datanucleus/datanucleus-core.csv +++ b/results/combined/merges_tested/datanucleus/datanucleus-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,8bff557466f08b633c5e33856b83518ca6ab1a60,3828238f6d5647f4d38692745ee1cee610700ca7,95c9e42c5d1c33906f3b3bf8dd1218577ad2d8fe,,True,False,True,2,1,10.0,2,True,2,Tests_passed,781c23b0f581e0170e248f4c68c6fb707713644e2e114e271a338bc81b72ec22,True,Tests_passed,238863cbf8b631ff4466907b2733c4402699ad2ab404f9167deb36a043e37be6,True,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,87b585e824fd58878ca8e11dbd73a6f4f67d7dbe80755330c5619540516db72a,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,8d7b6aa9ab010e23e96ea9f6c1e83398ace48c9676ba982e27eca64d16895f7f,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,297fbaf82d7572f39be9063a58bac1689dba9a12701bf6ea6586ab2b66f7b7b7,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0 diff --git a/results/combined/merges_tested/datanucleus/datanucleus-rdbms.csv b/results/combined/merges_tested/datanucleus/datanucleus-rdbms.csv index d41eb598ed..9a2ed776f3 100644 --- a/results/combined/merges_tested/datanucleus/datanucleus-rdbms.csv +++ b/results/combined/merges_tested/datanucleus/datanucleus-rdbms.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b4f243ee7357b22c82759725b42e2532be164f33,fe9b306cf2bcf248e8aee28dd6772411b4399ef6,cccfc1ac759e7bc84cb1476b1f8e6757f3cc3ecb,,True,True,True,8,30,260.0,2,True,8,Tests_passed,12799ab22c7d2de31e7dc17a9759c720538743e04c7f023b46d07eb740b76481,True,Tests_passed,b7d24e454edd062be367e1646d65cd6412b0ae3300c4e33fca452ada14bc70e9,True,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,ab9ef23635948c90c41b334bdd6d1d0a3d5cf428177c163dca062d7e27fbb40a,Merge_failed,4cada42deab5f39efe998cd1c0f02b8e83f7c8b4229c4bce3f49ad987f415070,Tests_passed,d9559b5709173872a3fb29511e1aa074f42d05ebe6dd31c17b675621b8a40840,Merge_failed,b8199e8300b3dc179a960997fcc414e8feec104307169149f76d9779a4536e5f,Merge_failed,4cada42deab5f39efe998cd1c0f02b8e83f7c8b4229c4bce3f49ad987f415070,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,f816fee23d31d19cf533cd73fb8687c27b00f1a10250a9affec842ccb03d3208,Tests_passed,d9559b5709173872a3fb29511e1aa074f42d05ebe6dd31c17b675621b8a40840,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a 14,refs/heads/master,8b0f2651b6768a96482214f18b37ed8e7db530ef,90bc13f2a6e17c7342db60332ffbfbc57352e46f,1e531d71634ca9c6c04014e18d22be290fcaa95b,,True,False,True,2,3,7.0,2,True,2,Tests_passed,bfa4017456838c35160dfabad2fb9e4f83ea05a13206de95c7d1a60119f7beb7,True,Tests_passed,3524b702f68ea620a94b34751a753bc714565ba1c5b8a6a9ac779d58e457825d,True,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130 diff --git a/results/combined/merges_tested/datastax/java-driver.csv b/results/combined/merges_tested/datastax/java-driver.csv index efaafc8a68..bd7ebe5c7f 100644 --- a/results/combined/merges_tested/datastax/java-driver.csv +++ b/results/combined/merges_tested/datastax/java-driver.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/4.x,92097f197dedd7f9036a0b56123cddca8103a1ec,5e1e5107c91c3546e5cc81a29cbccdbbaff0f82b,1c0a0be3b09cb3c699190478b9f108abfdb2e4e7,,True,True,True,56.0,157,1089.0,14,True,56,Tests_passed,bcb24373a437cec9d2da9ff9d2732d8e4069ab5a92da2b0ecccc218dd63e4053,True,Tests_passed,b84c6625ac3f317c109c4872c331b713107274c2758bf1a376e501e9a43043e0,,True,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,3c95e55900b7afc5da4d22e3b4b3585492bf0926b706ae12bfa73b542ef9c190,Merge_failed,37d2e51b0fd5b4c195e788de2f372b43b93f23dda69404de7cd5b2317d90df0f,Merge_failed,cf253f0c5d763ec4f026208872e8ad96b7a6d2d330bf1468cf0d8327576abbee,Merge_failed,0827f472ee9e7ee6991f24b541ca03d2baee40660ebfb36d75df4808f8d2091e,Merge_failed,37d2e51b0fd5b4c195e788de2f372b43b93f23dda69404de7cd5b2317d90df0f,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,670fc893cfe9e22e688eaf2e7b6322c4e1fc806bb5efad0dafa653cb4efb42e1,Merge_failed,d736ba646fb6fe20df158b4fa840e402488c4631fc810833a88ccb232d0c1a7a,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43 59,refs/remotes/origin/1.0,e54b132914323677d786da896064b553effd4761,bcfcf986a50695f1f0be1e502ce2f8270ab9dad5,b9f7e9d52d9c64fad86e63544d3690adc7be2b7b,,True,True,True,59.0,154,167.0,2,True,59,Tests_passed,c1662fbff0b27e2316672af4999c4ceb6102bb3ec9a550abf5c8365e99e4c5b1,True,Tests_passed,fc31509a0b01490f3a1a02fface6db2eb4521a184a80846920828f7c18bccad1,,True,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,db645da9fc6a438c098ddbc031a5b5787796e6cef7e9ab965f6c5fd4d7b68273,Tests_failed,8ad676ff79513022124c6272af617a3c29bfadfb8f4b4c3e13cc9f6c059d8b2d,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,db645da9fc6a438c098ddbc031a5b5787796e6cef7e9ab965f6c5fd4d7b68273,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694 63,refs/remotes/origin/1.0,089aacb75cc86c67b8d2f650ade1fe041e66323d,51d99f49daa0c54d9ec3ef4977e2e14ef9ffaf6c,2d2715d7cb1af85c19d0aef4b0cf1b3b79acf999,,True,True,True,11.0,56,203.0,2,True,11,Tests_passed,176cd4143b964065be4e28cc7399aa7837621991e12edbe8b3577ae691c5d5b8,True,Tests_passed,cc91796f7640f7d31523266cbdf6ce323ab7349aa96ca04ca9b9c4f6e9e21704,,True,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_failed,ab139cd3511b564dd7a35b31979c50eb3202bce94b94c51f0defc34697de443b,Tests_failed,41a2002305f5ef59e0626210d1cacb2ea89fb8cf3431e4f6c5ec866211184c9c,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_failed,ab139cd3511b564dd7a35b31979c50eb3202bce94b94c51f0defc34697de443b,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a diff --git a/results/combined/merges_tested/datumbox/datumbox-framework.csv b/results/combined/merges_tested/datumbox/datumbox-framework.csv index 12fcaa3f6e..d95187bd52 100644 --- a/results/combined/merges_tested/datumbox/datumbox-framework.csv +++ b/results/combined/merges_tested/datumbox/datumbox-framework.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/develop,5e74399e9e7d77bd82dc672ac73d17ac124f2eef,1f17e05fc3a9ae66322a9f33d34f40e2fc0de7ff,173ec6e155639b676c0ab57b22e17e5696039899,,True,True,True,85,607,4493,2,True,85,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,True,Tests_passed,cb67313a5f1acd7c804d0d6b530db5601ceeb99f67ce9350af8a88bd6ad9a5b3,True,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_failed,b15f9f4f92b8995269e43c18e6a2aeda2054147b05b85e35db3766b8f83ff626,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e 18,refs/remotes/origin/mapdb3,e58101b86b800b4bbef36028d92bc74110f5fcaa,c83114fbb7a24f2f88cc996420b296caf6e5f1a2,6aed0cb71dfb7cd387b2533fe355aea3325a25de,,True,True,True,5,22,83,2,True,5,Tests_passed,f544b09b754b3503d2c6d3a9c174ed961e1ff1678701aeeb0a14b975b2f79fbd,True,Tests_passed,894a2e225c371cb83d4319cc5bb9862d977f8e1e442b94da136fc13d051f52fc,True,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,ff3189f33e8676526ac3e0c69df7b1991d7ce303d20be182ad5e89dda0c7837a,Tests_failed,77dd28aba083256eaa4409a4892c4249c225d488cc2e8dcb6f7380b8793850f4,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,ff3189f33e8676526ac3e0c69df7b1991d7ce303d20be182ad5e89dda0c7837a,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e 21,refs/remotes/origin/mapdb3,75d43855a05020bda5a864cda7e1603998732742,d5f0e5adaf3b9edde9e6e4afb9b5ea54b249bd2c,1c7d7caf2e188f3494dd8218bf07653771a4e3c5,,True,True,True,8,34,494,2,True,8,Tests_passed,ea3107bbd3e9e7b101d553831092f44ab68b7781a4d37f999246da472584a6b7,True,Tests_passed,4500883973eaaa087db6032f513572127627983976703343adb4b56ea42a67db,True,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,8dc956c6b5cd484984dfc5f3e86ef9cf874933c0a50f2eee1068fc47e8f21553,Tests_passed,8e443b71bd634ef9af7e781e9356def82c26559ab17265350ee7a10d33f1c7f9,Tests_passed,6a5d45c70ee223560a85d1fe78b4604ef6009cc3f2675386a79ecabfe686cc5c,Tests_failed,2b211c506fd3dc71f41e9166d0ed7f3892db9c5dbff7bb814e757d2b924992fc,Tests_passed,8e443b71bd634ef9af7e781e9356def82c26559ab17265350ee7a10d33f1c7f9,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,03767a20964a3a373cd881069f37db88a3481f59b6491c3b3fadeb04398dee86,Tests_passed,6a5d45c70ee223560a85d1fe78b4604ef6009cc3f2675386a79ecabfe686cc5c,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7 diff --git a/results/combined/merges_tested/davidb/scala-maven-plugin.csv b/results/combined/merges_tested/davidb/scala-maven-plugin.csv index ade7e37d2d..a3779eede9 100644 --- a/results/combined/merges_tested/davidb/scala-maven-plugin.csv +++ b/results/combined/merges_tested/davidb/scala-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,2116bb65fa84f7474c6f0d65e91c34e2b0b756fa,85c8870ef9fd59b4d2ac0a3cfd8ea801ffac12e5,256825aee5165fee9dd1a7cdc2e5b97282c23e68,,True,True,True,8,10,875,3,True,8,Tests_passed,60a088cf0215ba1788dbe7ee9241480535489bf690df8a0475d39ae73fc0d485,True,Tests_passed,5354b3a5a6842e5a31966099849f9b4b21ed8fbaf0b9cacc021ce7e0bcd7b56a,True,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0935ab7116e9a06d30bb603e17f62cd972b0ed8235a1957dfd978dbac04f1275,Tests_failed,f32e61d319aee49a0cca24ec6c5e875ff024d4dc9f21c02aaf4eef522c17683e,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0935ab7116e9a06d30bb603e17f62cd972b0ed8235a1957dfd978dbac04f1275,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa 117,refs/remotes/origin/pull/322,c74fda72e2ad911abeef339d9503dbff1b4926e2,4c96c81343ff125d9d49ab19285a63dc2518a032,2c9ef6494c144cd7b23ce44fa64ef84fcb6f02fe,,True,True,True,23,139,1226,3,True,23,Tests_passed,250b5c4ca9c1651c23dd24f33423a2c65ccd3fc6be8cf6122f2194ab7bdcf7ba,True,Tests_passed,fc805a2095666ac7e4c49269e7d023d59111cc91b86643412ac81606dea2bb63,True,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,fbb71acf8904bfc3281edc293ee6737529715cc45d783abcc5a9456215fca24a,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Tests_failed,cb912c5d9bd087b5c31e83a7449d1eeb5d31466f6b637aca6e2fdc31da172179,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,f0ef12b15e6728f40ee43552537e6281670c262c1b0d6d0285d94df0ccc62e52,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431 diff --git a/results/combined/merges_tested/davidmoten/geo.csv b/results/combined/merges_tested/davidmoten/geo.csv index 2993738774..7286e3c128 100644 --- a/results/combined/merges_tested/davidmoten/geo.csv +++ b/results/combined/merges_tested/davidmoten/geo.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,d280483edeeabc57247e1753ac0c161039f6e604,20107eeab64668b6f8793a293b0b1d293b4af69c,fffc34fcbd3cec7c8ce0ea88d7f3435fa020d3b7,,True,True,True,15,50,3795,2,True,15,Tests_passed,f485549a8998ccdbde26be431a12323ab5c63de3b2b22a742c3b85e66197d985,True,Tests_passed,65b8a4dd6b915f61048b24974e4c01f04cf2f65cf0fc76d00573b0c938d03d35,True,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,9ed8ca123c6e56174a5dbcf94e4ff275688ab0f9a397de3b2ab7bc47e574206f,Merge_failed,bdb829dee348c52ebb7071d38ad5c10b1b2a96b1315926873640bfddc60ecd31,Tests_passed,93592619783dd7ad61989d9169196fb2907f87306a29c702dbea7db6a257247d,Tests_failed,e1de3e52c534d383b166f676a6e009fc574371c7e2b7b713388ea99a17324a05,Merge_failed,bdb829dee348c52ebb7071d38ad5c10b1b2a96b1315926873640bfddc60ecd31,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,5510801a99fa2740d04bf3fa8d6fb14fcdd9786ef5a6ada2cb5be9e570176416,Tests_passed,93592619783dd7ad61989d9169196fb2907f87306a29c702dbea7db6a257247d,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1 18,refs/heads/master,7427c57b931e1c9548227a7a0ea10dbead15edef,faab400a3cdc78dc7f9ef221d79129043c414baa,54f7ed3a72afe1ab1626269655ad64d824d7a5e2,,True,True,True,10,32,133,3,True,10,Tests_passed,cc78c9a90f15cc1af397195afbcf2b287a34dc4f4e134f09c31fb54756d78c6a,True,Tests_passed,db69dc60d0c8900ab08d3cb70719f8e82fb9b22d2f9e46c62d1ccef4cceb15a7,True,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,e907c6272ee7e4fa03cbc3df0d9460fb5af0ead7957e61ea2f6fef87f35b4ad2,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Tests_passed,017d1dc473e42e9664eda365ecea2440c5d0042015fe51140b882ef3a323f62d,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,4b0dd50bc64858993f073d28b21b2c03613db0f1e7db03df802c04da13b0d6dc,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e diff --git a/results/combined/merges_tested/davidmoten/rtree.csv b/results/combined/merges_tested/davidmoten/rtree.csv index 68ab599954..8b9f4259d5 100644 --- a/results/combined/merges_tested/davidmoten/rtree.csv +++ b/results/combined/merges_tested/davidmoten/rtree.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,dd478c4ea8eeeede9848bc596dda5454a648541d,5671a0f6b7ac05c2b09f66facb7068ee40ef2113,ef97ceedf041d60b1cd421c8d16cec707b120960,,True,True,True,10,60,189,3,True,10,Tests_passed,7eda454d833a50fd276efca4f4f90170d87db6c427c9b75db01e5ae7bf1620bc,True,Tests_passed,3e286b168432f16fa4ea261527e79de4300088f4807386b4e493b15b239438a0,True,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,0094c489e959cc1130a5d27c96da03b2a300638f995f381324193109ac25e500,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,a40378ca43e93179c6cee0544ef5d1962a8090e846fbfb45921bd2dc5d3ad217,Merge_failed,b3e39f6ccc2a4b2eb6b6a790c66ca9464bc0950381ef178e6099119b1d0e3bc9,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,7757b45d31b6a32ee372c44509eac0f080603ac63476841f72c75e581d5c4ad7,Merge_failed,91dafbc58246c3632823520bb920acfbfa65865fca67ebdc05349cf32e28ba98,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644 diff --git a/results/combined/merges_tested/davidmoten/rxjava-extras.csv b/results/combined/merges_tested/davidmoten/rxjava-extras.csv index 0f4e514d81..6a5a53e113 100644 --- a/results/combined/merges_tested/davidmoten/rxjava-extras.csv +++ b/results/combined/merges_tested/davidmoten/rxjava-extras.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 44,refs/heads/master,f26ebf28972a5e850b038932360c89bd703d5a63,30a492f6aa66bfbe6dbf5f37a1fd20a575a49d46,ede7921057b88302676cb975e159b6240079b81a,,True,False,True,3,3,17,2,True,3,Tests_passed,f4c07085564a583cb7c3985b3b73bae3b6b4e6640e0e9edcebd133a546a8cee4,True,Tests_passed,fc004f335bf0a19fb93780b64f594b07cafe5454d681267cff5cb1e4d5284342,True,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_failed,2fe834683fa60c7b3d0d76d1352808b08dfc4db1eeda9e39869ecf48c85639c7,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613 diff --git a/results/combined/merges_tested/davidmoten/rxjava-file.csv b/results/combined/merges_tested/davidmoten/rxjava-file.csv index d0546a11a7..8e01777e8c 100644 --- a/results/combined/merges_tested/davidmoten/rxjava-file.csv +++ b/results/combined/merges_tested/davidmoten/rxjava-file.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cb7c3d9a00024b03b9d23c6d5ad47ba35b3e092e,672a094ac3efa58a30de76fd0ebb66f0e07450ae,af848d22b776b5286ab49c817ec42ee8f333f940,,True,True,True,5,17,99,4,True,6,Tests_passed,dcc2b58567e5bf759ea07a21e0163bd5957e0b7c9189627297b898951d4542e7,True,Tests_passed,282a203f50ab8926da46ad1785286bf5281b892b1b5fbf86676795578f114e76,True,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,09c3e588bd05e96b4a500b2a747a0c2774f3dfaee8d6b6f6251e11a40d2e389e,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,1a422dffcf66d98e073cc65b72b61bee7eda9dc87039ff2224f23997e18756f7,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,cd2d7e5a54375eebdec2d2c82d1b8e01ff42a11bcbfcfa0955182303a3883756,Merge_failed,d8ba378dc47ab36fdb61c374502fe2da5a5fc32372c1e991d16993d974b7eef7,Merge_failed,0f166e0cc6b39a00ee476fe68e7e21f546269f2d8292715939671d48fe3d9b85,Merge_failed,fa5e5b39a470c80f47bc0b9cf7bbb3ea52238a54d0d40e0bfadd6801119b2ecd,Merge_failed,d8ba378dc47ab36fdb61c374502fe2da5a5fc32372c1e991d16993d974b7eef7,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,1a422dffcf66d98e073cc65b72b61bee7eda9dc87039ff2224f23997e18756f7,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,90eefdb5a7a3d6b846e77d5fd6d881565e1b6ab10aea370407f001be07812342,Merge_failed,dbe089b8ff94146c15104c55213e2eb1f2df95e566e9ed12d6d1852cb57d3217,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,09c3e588bd05e96b4a500b2a747a0c2774f3dfaee8d6b6f6251e11a40d2e389e,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d 5,refs/heads/master,c7c2b3aa06bf4f2d022360aa6a0270798ea3590a,dda511e5d55e736906986d7fc3041896b04de9f1,d40c31053d8f9bec3b3d62465884559649ec1dd3,,True,True,True,7,56,328,4,True,7,Tests_passed,0318cbf469e559fb1528941c75de16ced0613ce7a205e71aa16ea9a0686e4304,True,Tests_passed,96452bd1137dada929286aedefb343a7d23babb3ef6e7c1850478aff8c67472d,True,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,229d330da1d567006a68610ab0f717f4e7ef547c057b301c9bacf7d40f98e9ef,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,a2bc0a570772e66814134889d1383ecc64eefb8af97b697139ad0ee7004a5e53,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,7f09b8ee03df48a32558138badaa2d26b8a96310faefd379cdbfb487e8990be0,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0 diff --git a/results/combined/merges_tested/davidmoten/rxjava-jdbc.csv b/results/combined/merges_tested/davidmoten/rxjava-jdbc.csv index 01fe9a1c19..6f93003661 100644 --- a/results/combined/merges_tested/davidmoten/rxjava-jdbc.csv +++ b/results/combined/merges_tested/davidmoten/rxjava-jdbc.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,d9e6ede39af87c9bd5b4a6033e321c7ad4ccbd68,91ca77ae28a0c8e1db63e401895eb8802b913568,645a7d003e27be87a372430978f9ce55d2d7e676,,True,True,True,26,98,810,3,True,26,Tests_passed,20a4933eb905e10bf5afaca5411eb8d3d0c6884e8224591f2d315b6e3bae608e,True,Tests_passed,c0b93d1f95903fb4c02956b9ab2b41eafb618800ceab2cab8c16d7488bddf834,True,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,2e41975b9d51b4fbf8abf7c70aee80172f2ef79b8910e30cad21441f36133f39,Tests_failed,86c1384a62dcaeb06309e9d23f71c5b3e0ee45cbcbca2f7f0ded44ec3be48bcf,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,2e41975b9d51b4fbf8abf7c70aee80172f2ef79b8910e30cad21441f36133f39,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14 36,refs/heads/master,d14cea6ff1fd8032ddd006f555ae2f599bc85015,2a14e99e2eb35aec8476030458a4952b48260de2,9a3f632e59b95ee08fa175127269cdaad5e09fd7,,True,True,True,14,30,614,2,True,14,Tests_passed,230362b3fe1e8a8c8e2edab7824b2d519e4ec12c2faa1c2f3cefd9c13555306c,True,Tests_passed,179efcd744e1ad3859053044fb2cbc29691d5e9f5ce0080c4265e54ca3b9307f,True,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148 diff --git a/results/combined/merges_tested/davidmoten/rxjava-slf4j.csv b/results/combined/merges_tested/davidmoten/rxjava-slf4j.csv index c1991156e9..877411f506 100644 --- a/results/combined/merges_tested/davidmoten/rxjava-slf4j.csv +++ b/results/combined/merges_tested/davidmoten/rxjava-slf4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,fbe2fde40ff49bfd3c7454e4e9a21c33f1929f5f,a5182bc62d261c1cb8ec42d0260602248151876e,e0e2a3a97fbb66f524ff624a52ea40629de09bb4,,True,True,True,3,8,673,2,True,3,Tests_passed,9ed5426a2f180bf448bba74a95e7d90a7d5276710f0f6c79e7f5a59ede9a5953,True,Tests_passed,5f3b4e55baceaf572ffeed201f7d4830bdd03d13dccf990b0024bfb9ed1b3bd4,True,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,ef684bd36a5ac9b2f1d34819f1f1d49aec0110b2fcef94bebdc203ec386bf93b,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Tests_passed,91825fc16de546044d6cbe1fdc600161b0e525f25a998de2521fc0633b61d602,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,d7e6366444860a2feb770a61962c65700ddd4e7dbaa29ed893156cdb2685a007,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d diff --git a/results/combined/merges_tested/dbaeli/conf4j.csv b/results/combined/merges_tested/dbaeli/conf4j.csv index 1537cc9e08..5ccd3b0805 100644 --- a/results/combined/merges_tested/dbaeli/conf4j.csv +++ b/results/combined/merges_tested/dbaeli/conf4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,aa63090d1c2b404d752cbc1369184db7766ae53f,a720763413c0f438b8ce65dcbb19cc4ca0e2b057,c4880a9bbc645b96354db770fe69c7c6c891a96f,,True,,True,13,38,,3,True,13,Tests_passed,292d070cf4a8dfa4c851b6228b97178f47454eef92b57f42994f4bdf7af283ac,True,Tests_passed,517245c84132729ae6157e74769ba0d570782d45706e2e85978bf253e918f84e,True,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_failed,eda096073f7d01646941b78bd9f6e7854fa33f9a55d6549a64cb5358eda42872,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9 diff --git a/results/combined/merges_tested/dbaeli/ez18n.csv b/results/combined/merges_tested/dbaeli/ez18n.csv index b7d453e5dc..d0d7a6eefd 100644 --- a/results/combined/merges_tested/dbaeli/ez18n.csv +++ b/results/combined/merges_tested/dbaeli/ez18n.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,acee2a6039d3810a8424f77fb7b72017b31bd92d,b7cadc87f3b62d0e6ebf49608417a50f8666da7b,5c913b3a4e8dfeb9b9c1d268fc5684f327ffcfad,,True,,True,20,12,,2,True,20,Tests_passed,21c6ab0738fd31764a062cc042512ab56e788e185d49b740351ce545bdda8876,True,Tests_passed,b841f396d1a9c547184733966766702278a7563ac24838816532764ef68abfba,True,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181 diff --git a/results/combined/merges_tested/dblock/jenkins-ansicolor-plugin.csv b/results/combined/merges_tested/dblock/jenkins-ansicolor-plugin.csv index 1393dc0aae..0e6454ef4f 100644 --- a/results/combined/merges_tested/dblock/jenkins-ansicolor-plugin.csv +++ b/results/combined/merges_tested/dblock/jenkins-ansicolor-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 39,refs/heads/master,8383277430b4034662ab125edca8e76621b1e240,ebd0ac2c904e88dcff5e9440560846476b70eac6,518711af7d86fedfe00ccea08f9e9a2d53e72ae4,,True,False,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,True,3.0,2,3.0,7,True,Tests_passed,a4bee8680284c7a209ebaf204490cf121bda5091554e5c9bb309dbef8cb55a2a,True,8,True,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,d6f93781b321cc7eba5ea8a390827b10594ce08f984d0cf4c21f2a122280c2d6,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,2db01af6751306f760c9ca83cc68280cff2a75047a00359f96ae406a3ea63c62,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9 diff --git a/results/combined/merges_tested/dblock/oshi.csv b/results/combined/merges_tested/dblock/oshi.csv index 8fb103298a..a665a1a0f4 100644 --- a/results/combined/merges_tested/dblock/oshi.csv +++ b/results/combined/merges_tested/dblock/oshi.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,987020e7df7c7bc094e5b051f423b6e3ad397ed2,6927b5d40eec5bfe8222973bfb944525acfc55b8,5699a09928eca1e6ecea5b658c9b3901da2501f0,,True,True,True,19,111,1352,2,True,19,Tests_passed,68006c4dc8cba9b1768730a2a6c470da757582b520468c68b80acb1b8f3d61f6,True,Tests_passed,876407d0e18995dda187cfc79c68267490460c97bff8aa3a9fff3175121645b6,True,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,99dbe34c867304f2589fc34ae4061a9086d3e86fa9e52648d2a9fdebc7f51dc9,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,99dbe34c867304f2589fc34ae4061a9086d3e86fa9e52648d2a9fdebc7f51dc9,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7 34,refs/heads/master,7de1f90a6aa5317e87e60c690c16565eda7d3b09,7d0e1a4d9d90b3ebb916e69a71dbe767423ba4a9,74d7f29da9cc3b2da6cf73f746e2c2a282905f12,,True,True,True,54,404,5892,5,True,54,Tests_passed,5a7132f58b18c6f1bb6593edb7e4d75bd647c0c121341e88d3c01b88e094031f,True,Tests_passed,7b058140dca0f282834f7053414c14e4eb116312b0d61c2c3e4f3addf1d93366,True,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,752283a4d00ec1c14ec57425583a37b58495e82588c6f594a7e18757d7b8bb63,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Tests_failed,039615f08f5c744ddfe65fefcac754882f486958f64816c2a7f73a9d6e572ce1,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,0b44ad6acaf4aedaf688786186fbf8f72060980f6d0d37af884469685c27706f,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac diff --git a/results/combined/merges_tested/dcm4che/dcm4che.csv b/results/combined/merges_tested/dcm4che/dcm4che.csv index 51c8176da4..a18aed2ab9 100644 --- a/results/combined/merges_tested/dcm4che/dcm4che.csv +++ b/results/combined/merges_tested/dcm4che/dcm4che.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,f75864c454f5acdc33ba375f7f2c049ec765bd37,666474daa259e84068a610e1c0654464e03dae4c,9dcf35d34f8aef3053a12499f62eb70faa77dfd5,,True,True,True,268,774,24103,8,True,268,Tests_passed,9ea0be03ae519ccbd1bf3b38ef34f3688ec6aeff4ccea7b9515cc95fc916f053,True,Tests_passed,c27aad28c36cf90f1f61d7177347c3a4d8ed514607a89939fa4ce62003f2ccdb,True,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,a058d4d3c1b75ad3950c0f5a8715e74cd1fe511df709086abe5e992fd41ff101,Merge_failed,f9ca58955d117cbc8e7944cd349f8f0cb6c172e36ede8e85db27e985e581db91,Merge_failed,a7bf894cee046d9dbd509ed26b1439ecc99f4494460775e65a3e68be010a658d,Merge_failed,bfa786cc651b8b241d574ceda3618126dc8c1f15b1fa917464d8dc4033596afc,Merge_failed,f9ca58955d117cbc8e7944cd349f8f0cb6c172e36ede8e85db27e985e581db91,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,ce840f7acb15292a24fb55b9b5982075db451a3c2cb60d38dd8178bb10f32d63,Merge_failed,a807f0896fafad011c81f95987692ea760b920948e1b16e5d96b758340e585da,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9 20,refs/heads/master,fa3362aa6435c3879b060d7db032c553f914b869,05ca041d775372ed4798fcc759c438adf02ad08d,e584877aba94468467c3bb179171d85bc06aaf4b,,True,True,True,129,173,711,2,True,129,Tests_passed,a79abd72ed158dd2f603aea5df2d2b853f82fd6d1e16010e75c94507bfdc64c7,True,Tests_passed,dc3f698605c57770a47c5a6b5af5000fa3a3104d354c32d5b5bb6cea2f34e0a8,True,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,fdd3d2588e057dc9216624227ab2a189343ee8da297f8db7e4d1bdae13ba8fe6,Tests_failed,4046b9f09a462d9813d0001e9146ce6ddb2cf92dd30146f464800033a66f2e79,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,fdd3d2588e057dc9216624227ab2a189343ee8da297f8db7e4d1bdae13ba8fe6,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8 25,refs/heads/master,39a46b5bc5f7ae3b1298aad7e0e1befa615f1404,6d74b1b9476cc790cb8d03b36778c23aa8d22683,2100085fea8f1cda915761b752b2183075b3b7f6,,True,True,True,198,499,4097,2,True,198,Tests_passed,8a2de182eb01a279e8710048e221e264e08398d7fd975e11347ef637ac03082f,True,Tests_passed,494f4b2e62b4e63ff42553a52f1484d49f8a33b975df8f457a9e4827633574f1,True,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,1e3df9e7240804ab573f7707acb9e7f187514136bf7381f0c27dff574ce52b79,Merge_failed,9a644d99109027af500899240fc803c25d297076353aeaf57c17943105083e39,Tests_passed,7b2259c648aef9ad189e6de7055697529b5ae9d26410be11d8c35547029ebdbc,Merge_failed,d897acb8eb169c31189f12063e70bcd20a2ebe9c464ef9538c33c30be0ec39c8,Merge_failed,9a644d99109027af500899240fc803c25d297076353aeaf57c17943105083e39,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,843fdae3a86d9c3f692e946a8191e462261c9e06038cd52134b1b8b1a971d0ad,Tests_passed,7b2259c648aef9ad189e6de7055697529b5ae9d26410be11d8c35547029ebdbc,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709 diff --git a/results/combined/merges_tested/deathmarine/luyten.csv b/results/combined/merges_tested/deathmarine/luyten.csv index a15748deb8..e9be0e5e3d 100644 --- a/results/combined/merges_tested/deathmarine/luyten.csv +++ b/results/combined/merges_tested/deathmarine/luyten.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,f1ccf991d7276bb172fd1d961ffd5d1dab2a5d71,577c8124218ed32e104b95c023fa4fdeffcdb535,00cc8f7d7402646075f923c3a85a8539be084a2c,,True,True,Tests_passed,bc447c7c09b2dce5ca1bd491624ccab4688598dd19327bb9d718d4030cd51a63,True,10,60,179,4,True,Tests_passed,9178c523be5737a10cbe34759ddfb5e29f8c41c5af59fdae414b325844e49d1f,True,10,True,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,d1904b7ca91e653fbbe96f6323ac334053638ae15a4359c9873c1b1cac2b54d1,Tests_failed,1ea23d2715df08027bfb24d11a35e019014ded691082f51ce7a649a8824dfa43,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,d1904b7ca91e653fbbe96f6323ac334053638ae15a4359c9873c1b1cac2b54d1,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca 19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,Tests_passed,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,True,11,84,332,6,True,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,True,11,True,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,f99aa30790233e62f9a2f7b0640846a01cff0f66770282c9bb36ac007334ee77,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,ab2db68a05781df04462e6e41e0929fea5d140d08b8aa26ddd0a757ed65adf21,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863 20,refs/remotes/origin/pull/152,c6cd5d8c8ef78ee339561dbf844332d9aa4a5f8c,b9e83eea5caf895a4d189a6c2d64302b14c11475,75d5603b2f12d74852261c0f402f3d53cfe62ce3,,True,True,Tests_passed,28f0b4397b36f88cd422ec71ecc705cc952708caa5de734bd0e076b48ea8c6a5,True,14,77,460,5,True,Tests_passed,df02b9bbbddd8cdbea53864b61a6f7148ea6ab16a1ae814e9aafa190ff881806,True,14,True,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,98267cbab37b27267fffd40c171d039003cc8bcde170589b23c78a1624e9ba14,Merge_failed,60f9b5aca173ca937cb16e40ee57c9186a0865240de1e19e8eaf536f6b5d25bf,Merge_failed,e25310b1f7dee9c69642b72ff9965efae46267ac3f2d356b70c693436be98c41,Tests_failed,24014416d7e6c6280e498054db56bedc26fda8fb7d8779dca2c599fd496a0ff4,Merge_failed,60f9b5aca173ca937cb16e40ee57c9186a0865240de1e19e8eaf536f6b5d25bf,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,42770bc83916266aeb5fad88b14e6330a0ae797752cec6badf9d96734219db02,Merge_failed,e25310b1f7dee9c69642b72ff9965efae46267ac3f2d356b70c693436be98c41,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3 diff --git a/results/combined/merges_tested/deemopen/zkui.csv b/results/combined/merges_tested/deemopen/zkui.csv index c4407619b0..7552a4d1fa 100644 --- a/results/combined/merges_tested/deemopen/zkui.csv +++ b/results/combined/merges_tested/deemopen/zkui.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,True,19,79,508,3,True,19,Tests_passed,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,True,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Tests_failed,8ac7873650a0138d29417f2066c72baaebed3c15831f67e1684bfa699a69536d,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,b14ea75bd37183a1ccf65a6b6347eab48c4306349098a167166dbb5a4e3c94d9,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1 diff --git a/results/combined/merges_tested/dennisjzh/gwtmobile-ui.csv b/results/combined/merges_tested/dennisjzh/gwtmobile-ui.csv index c7f24e06a3..9caf4d3a9e 100644 --- a/results/combined/merges_tested/dennisjzh/gwtmobile-ui.csv +++ b/results/combined/merges_tested/dennisjzh/gwtmobile-ui.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b1d29b7602f643ed5c7dd04acaa1d63631910a61,d64644d33bd0f11ce6e3b9c5b5118a19f7cac75a,a10abd5c23e2010d995a19a390e58459cec4f361,,True,True,True,68,496,3765,5,True,69,Tests_passed,9be271cb89f6b1c4789f148708c0c7d2b1de15153fd705b9b5008801fd497bc1,True,Tests_passed,11678f44f2f3da590d24dfd1fb40c603b963413bce96e02f0bd8bc07dda2a615,True,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,36988666a03dbd5bac826eef8542d642fc7097ad04f69bed816496a0d182ea60,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,abd7352279cb6408e6293a2a5825197039fdefd5508782ff2cf6ac9d257cd5f8,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,2313780fbb55d2895c594d5e073905cab07e061acc5c8d7c6b7a0662a1925501,Merge_failed,2da4b74261ddb4dac20d2c0a5e810eb79564e0321a2511d11cb13defebe5f140,Merge_failed,f1c6e27ef470219dd1443395bc62e5952bc0c73bee5da2024660e6ba42fdbb73,Merge_failed,ec4a34298d996122b7d8e744d397bc91bb7aa24bd84884f1053479740c93049a,Merge_timedout,,Merge_failed,f1c6e27ef470219dd1443395bc62e5952bc0c73bee5da2024660e6ba42fdbb73,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,abd7352279cb6408e6293a2a5825197039fdefd5508782ff2cf6ac9d257cd5f8,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,2313780fbb55d2895c594d5e073905cab07e061acc5c8d7c6b7a0662a1925501,Merge_failed,b1769ccc2779110209f714d61348c9e3877f231b66a5f9ac65398573efb3f63b,Merge_failed,ec4a34298d996122b7d8e744d397bc91bb7aa24bd84884f1053479740c93049a,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,36988666a03dbd5bac826eef8542d642fc7097ad04f69bed816496a0d182ea60,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535 7,refs/heads/master,a0fa55093e7066a5356535bdbcc382f78daf23ef,c138b79d228f266a79b3e1059e0d717cb3059574,48843d4966dddb16e0af6ec69b8ed200638b2e0d,,True,True,True,8,22,273,2,True,8,Tests_passed,21d70804264e5add543795452bc2179fa93b8e1e75f40701605d7717678013bd,True,Tests_passed,13ef0184078bd2cfca4da13fadf9e95ae83842fd291ac6e2f8c5caadf845836d,True,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b diff --git a/results/combined/merges_tested/dfabulich/sitemapgen4j.csv b/results/combined/merges_tested/dfabulich/sitemapgen4j.csv index 91335e8963..84e0c17179 100644 --- a/results/combined/merges_tested/dfabulich/sitemapgen4j.csv +++ b/results/combined/merges_tested/dfabulich/sitemapgen4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,a46ea9ffe51e0f77969a39cecfb2fc9fd479b19b,5ea973b161dd9f9606305784c087afdfc1e71803,54138163cee4508b3f2b28c461e75c6b20c9d7fe,,True,True,True,17,81,631,4,True,17,Tests_passed,2f9c9c6d06d8a0c22de8f31b953d81d872c52de2484c19312142667e68393c25,True,Tests_passed,95b879c19e25cf8b5540b01982587d2f63b8af67ee159e81f51b8e57f8abe004,True,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f diff --git a/results/combined/merges_tested/dgarijo/widoco.csv b/results/combined/merges_tested/dgarijo/widoco.csv index 5d9da37d30..ce18e96503 100644 --- a/results/combined/merges_tested/dgarijo/widoco.csv +++ b/results/combined/merges_tested/dgarijo/widoco.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 109,refs/heads/master,dfa60976ada8bdced21ff043fe763dd86314b7cc,d57b8de32106b44b9ca3e00ecab1b20998a4a703,6f217334138887945085c9b24924f881f8cb1232,,True,True,True,11,123,885.0,2,True,11,Tests_passed,36d963fc2e67f2073cda9b2cffc2917f0059b4d2396f16ca33b45731994fcad3,True,Tests_passed,9772c3d82fc1f914621d7cff668b1c14da39d1ad3c4fd9c3c4e9ad0cab75f4b9,True,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,f1400af762691284f6ae1453549d42bb18427913582350db6e79a455fea2e1e4,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,66b888631afef1f5229f2a255732abb53d6e422a69f03e3a5d63c64681b91bd4,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b diff --git a/results/combined/merges_tested/dgradecak/alfresco-mvc.csv b/results/combined/merges_tested/dgradecak/alfresco-mvc.csv index d679d1710c..23c75d9a19 100644 --- a/results/combined/merges_tested/dgradecak/alfresco-mvc.csv +++ b/results/combined/merges_tested/dgradecak/alfresco-mvc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,042d59bed8b1651367380523918f4e1145c9d9c0,ee2bb44d6352d83a1f6e322f464b326e90fc571b,18d4beb52eda96ae1898937be0539732b0757254,,True,True,True,47,101,1976,7,True,47,Tests_passed,bbdefa6792386b5057bca2cb5075bbfea0a5a9469e7bbc2f630500f7b532cd23,True,Tests_passed,cb7f688e83e2a7f7af20a83a98379bd5aa1fd11f425f5606771bcf27efe0a9d5,True,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,b76a640c49ae347c444620dd1e075f5864f232b5e5a2c74f5ec64235390e3957,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,25ee4db9cbb1181c979a6bd58ef2d592cb8d963df24aa120cb18d559fc1dd75e,Merge_failed,49d0eb5111a9200963af3c883afa5beb4bfaffe5ca4b0903ca909d89a5464de5,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,678d51b5fb840a99ea955f62f14981c872561a9fedd76c4e753d5e298693bba2,Merge_failed,0099f6ad0056ce31cd2e11b336a8f1c29c2506470dce09fd5bcc20ada05ed319,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f diff --git a/results/combined/merges_tested/dieselpoint/norm.csv b/results/combined/merges_tested/dieselpoint/norm.csv index 22a432a474..8a43466f4e 100644 --- a/results/combined/merges_tested/dieselpoint/norm.csv +++ b/results/combined/merges_tested/dieselpoint/norm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,f09183b3a52d7713dcc6a1b6036bcd3819f947c9,bb4c6525f96b050686cd07f699eed6eff08ec003,8acf20e0ce8d99523927b4fcc4eb90b92a0a621f,,True,True,True,3,7,14,2,True,3,Tests_passed,002068f268c446f8615ab6f7bf2b705e06e8b168de21f0021ce115be246c40c5,True,Tests_passed,b81a7154da85ddc115baf5dda5a5b37eb97e608ce390a64d013a260c116cf302,True,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,13ca96e9b6a6a70cb227118fbc3dcc2df35e433c66549412f0e2e643ffa1453e,Tests_failed,8415999c99d855aefbe6258db23b3c6fd4009c8434541b525e5534c7e193bbd1,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,13ca96e9b6a6a70cb227118fbc3dcc2df35e433c66549412f0e2e643ffa1453e,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939 30,refs/heads/master,f8d53daf63a983bf21265165ea8b129400f132ec,a4a52133ef089e488bea27496ff0be716a6cc477,d1d69a623dedc255fbe98a446e1f29054bd475f4,,True,True,True,10,23,1228,2,True,10,Tests_passed,f3e3b7ae5e0ebc970955a30e835d301ab79715f6ac40edc3d2bf63894b96068e,True,Tests_passed,d0fe1f6b5e869dae8d572c51fe962ec3d395520e39fd9f3c9fe0e28fac10f4ce,True,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,165eaf1384bdeae0a034ca29e0531e3c7744af60f8457329a6eb6849362bd609,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Tests_failed,85c7c80c4bf82aafdf00a83093f1074e8474d8e7edf2aa40569f2defaeaf0259,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,6a9c00b944276a4e117657f9b0fbd9bcf695b609c354cfdbe4d777771f77e96d,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2 diff --git a/results/combined/merges_tested/digidotcom/xbeejavalibrary.csv b/results/combined/merges_tested/digidotcom/xbeejavalibrary.csv index c1995794ca..25e3102df7 100644 --- a/results/combined/merges_tested/digidotcom/xbeejavalibrary.csv +++ b/results/combined/merges_tested/digidotcom/xbeejavalibrary.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,6279f85f74a80a9f651b3fdd0228fa0ec737060d,b359ecc56ceb9719bf00ade9d4beee4fef6fe3c8,96eead5f9fa275c93be11b9af8317c777828cebe,,True,True,True,72,492,20450,2,True,72,Tests_passed,e8b67e8e0794fc762fd35cc628592f7615cbc9629588f6523206ff57a045e8c8,True,Tests_passed,8b6d9cf1e529a48406b0b9ff6ae9b670bc6606ee103607e77c765da736e1faae,True,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,ccf012fac1cb6ddc6d72d7c7509f35e1bfe6fbfb9d44084427ada7f380cbe431,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Tests_failed,a2eb7275b4ddfc74a98d77ae9671fdc3633cdff589a006a8ed1edfeed86618a6,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,d6e813adcf06913e0e2270dbf25de8e46e50b080897c894c48587e19c41977bd,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433 21,refs/heads/master,7436990c0ba30d4245bba56cbc344978648ec7f5,4527eb45f37d38903ffa14ca88e32d90cf76ef3e,5a4db57de99d7aea4d5b49c1ccaca0102ec8aad5,,True,True,True,82,856,4405,5,True,82,Tests_passed,a3ba4f24d3de1e57f6d778a991eee71f6ea9ed7153caa769795e4e2518eb58c6,True,Tests_passed,1c563d9ade3c33ca7680ab33db9275749aed0962733351b398a9b79d6cc31f26,True,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b48b121140ec80022aaad82c7632925a40ba9ef8b1d8dd83f5c91f85975261c0,Merge_failed,6a9c8209ba0556ffd61b662eff7d5aefe94a78444ca0b335065d81c2a3e89834,Merge_failed,6a553f0dcbbbb8ed7c4a4719fa487e0aee096411b5b33a59196ca0b9f9419c81,Merge_failed,67ff9099150eb4bb7804c1d476f5e02f0f393583c04e9d2d44b4f8003a2eb812,Merge_failed,6a9c8209ba0556ffd61b662eff7d5aefe94a78444ca0b335065d81c2a3e89834,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,4d1a005131715f274bea69273d62e5622da77c75f11b6544d1f7270dad1e5b78,Merge_failed,6a553f0dcbbbb8ed7c4a4719fa487e0aee096411b5b33a59196ca0b9f9419c81,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441 26,refs/heads/master,b93d1fb5307232991a8db9db216ae99239edf483,819a383ff8d1fa8b05025856e6d1b4d878bee24d,ae2b691756e0a7f63e8931027da33c97ee20a74c,,True,True,True,20,292,2505,3,True,20,Tests_passed,26f83063a5a074f6f96a59bc19eab5764e75a8653e359575e2ecde82bfe00f29,True,Tests_passed,9c8342bfd33f9833b579a1eb1b19d9465ef0e2ba4d49abe791753099316f6992,True,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,3a85f172e740bbe3841a553a2c0dfd6c18fdaa2578f1b217b2dc4b13dfb3a4eb,Merge_failed,33fa0ba18590e729e3b87e5b320819d4514ab1460f18101ebf5ab1d3f2d53eac,Merge_failed,a428477d1e1fbe9f3b23befa63a9829bb3ee602dfd4906c70e927a0068ae5e46,Tests_failed,448519ba1337d3d9a7f2be6a1d31bbc4a80f4fba9f4e008f01d1e6bba768e4e8,Merge_failed,33fa0ba18590e729e3b87e5b320819d4514ab1460f18101ebf5ab1d3f2d53eac,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,3d4a00373529266d56afd3308aabd952e85e39080c8825eba811e2147d670f80,Merge_failed,a428477d1e1fbe9f3b23befa63a9829bb3ee602dfd4906c70e927a0068ae5e46,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43 diff --git a/results/combined/merges_tested/digital-preservation/droid.csv b/results/combined/merges_tested/digital-preservation/droid.csv index 78b9100476..a95a61325c 100644 --- a/results/combined/merges_tested/digital-preservation/droid.csv +++ b/results/combined/merges_tested/digital-preservation/droid.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,806b8defec13350fd40018aa550f83f8622a9bad,29819eda1f7c9cfa8590e1fec829be57c39e4713,c2b98114e7404662914b9eea5af0ef8d624b6404,,True,True,Tests_passed,c38b8fea3b86c1e05f000a64aafd85eaba0fa2e5db27becdf81aa3562eeb9b1a,True,615.0,705,1618.0,4,True,Tests_passed,d161e475a61c86a36284af59b8b3b616f09ad3d6fa14fdd1d0f9b6aea4719e5b,True,615,True,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,f5025cf9d8642ad0e13ef89d8ec5d3760ce2f03710e56d17a971968b665f4303,Merge_failed,6e12868af89b0bc293e862b02ecbce1558c4e240237876053cc8ef7799f9e052,Merge_failed,a27efb642973e9becaa4502493c61ad1019aa426391e8efc3757a3d0bac47335,Merge_failed,a27efb642973e9becaa4502493c61ad1019aa426391e8efc3757a3d0bac47335,Merge_failed,6e12868af89b0bc293e862b02ecbce1558c4e240237876053cc8ef7799f9e052,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,9373cf085b658ac560aff16046f8aadb8ef5e64ad72def85735143c984fc4686,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65 437,refs/remotes/origin/pull/907,884dcf7cf3988311f20fd94dd84ead7a9b6ecf2f,2fdeab05e76191e920e91aadf0c4add3a3169f40,d2a137537d96599342213ac9976c7cff38aefb20,,True,True,Tests_passed,8266dbd6e11343bcccae65c3b897ae0931b6c2299ae13f5f18c706af7247d7dd,True,28.0,59,251.0,49,True,Tests_passed,7f1ec6c6f28c70f39259ba7653ac31cf9abad3b42c7d894064296403763d364a,True,53,True,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,b7a3409120feffe51b50bccb9cd6d8d39910c63944ac25316e8b39934287d0cb,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,e06f3853544cf5ef92a99829bdba3ba7e95c4f1212ae8dbf3f06a4d37f5047ee,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b diff --git a/results/combined/merges_tested/dius/java-faker.csv b/results/combined/merges_tested/dius/java-faker.csv index d6acc76527..82f24368ce 100644 --- a/results/combined/merges_tested/dius/java-faker.csv +++ b/results/combined/merges_tested/dius/java-faker.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6f72cb24c50fa83d23a92aad65bcd57efc6bd650,f5efa7048f29bbf3f7a7423e4ac0e8b1a645928e,1d884a03d6cebf07de6fcd24d416f4b187f1d83b,,True,True,Tests_passed,084a0323468c37a50b9c51507abb885e92ae649c3c1130143bf844ccc74bea50,True,14,24,375.0,5,True,Tests_passed,45060dd0675364853a53d39266d32f2c103162231ce9cb842af279462831eb23,True,14,True,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,0aa3783a701cb76150c1ee98b9725469f3c0a882b39c2022ac47c1014f4df648,Tests_failed,1c5b66a8bfb8b2bcb0bd5c91bb8059c8db8597d526fde6adb408c3c819d2488c,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,0aa3783a701cb76150c1ee98b9725469f3c0a882b39c2022ac47c1014f4df648,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e 9,refs/heads/master,b60f23a54a511cf7e24c09366b2957219b448125,6312699f5ed6492f3b9005d849d4a57376f21f7f,aaaf8d9e4783a7e5a2d693f5b870fd2a3756238c,,True,True,Tests_passed,fa34cdba4acbfbc63ab111a36e7fa1aeaf7eb053684af45ff584fb4e3e62cf9b,True,11,18,894.0,4,True,Tests_passed,618d84f9fcf8ceb73a5ae82b6493c069870273a2e24386289433ecc72afa4760,True,11,True,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,05bd0d2ab3662829240207139bcc1831111eca79c247ba1d9442c90738797774,Tests_failed,6a645b7a00e9703125cee940a8f1dc257bca12861be0a342758ce420e45523a4,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,05bd0d2ab3662829240207139bcc1831111eca79c247ba1d9442c90738797774,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1 11,refs/heads/master,aaaf8d9e4783a7e5a2d693f5b870fd2a3756238c,e09c6d4d31b373f8e68fc6c8d00353b77d472730,4fce1fad9e76780fa24aa3d4af22a29aef538593,,True,True,Tests_passed,8e427c885ce76d15d2d7826ecd19f0e7727c62ad7500939d51b845590c92e60b,True,42,68,1228.0,5,True,Tests_passed,0f262510f19962c54027ac5eca7ac64b688e9b1ac113b91acc43dd608df404bb,True,42,True,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,14c26c6250e5c20768aa6febaa2ca54e3273ebd6f71f10c0689bbbcb154b414e,Merge_failed,13536c220a4b533b58470d03f6802dac1e12fb6c72f8c29e2d29dbc3218f5d34,Merge_failed,994fe419e004a802a2fd4d5736d0b3a3704b9124b2c00ce3b66bca06ed906c3c,Merge_failed,0a2222e659eafdf79cfb74902b818f21a62fd2fbc089360f0e4ddd737ac41912,Merge_failed,13536c220a4b533b58470d03f6802dac1e12fb6c72f8c29e2d29dbc3218f5d34,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,12cc80b93159ebd6ce18c4fe872aa70000dcf772dc6baa97a45937548fd798cc,Merge_failed,994fe419e004a802a2fd4d5736d0b3a3704b9124b2c00ce3b66bca06ed906c3c,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56 diff --git a/results/combined/merges_tested/dkunzler/esperandro.csv b/results/combined/merges_tested/dkunzler/esperandro.csv index 02a5fdb531..8f6d73d505 100644 --- a/results/combined/merges_tested/dkunzler/esperandro.csv +++ b/results/combined/merges_tested/dkunzler/esperandro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,a504784178f32a425ca7bd38f97b9a77a2eb6dfa,e156637fdb31048b51adc5755955513eb79dd2bf,ea419131fe919ea4348d96d36120dd6691b9c4c4,,True,True,Tests_passed,918de87a6baf9ecfd333d88564636d8efde9d724ba231dcc737ac5794e9225f4,True,63,294,1208,16,True,Tests_passed,ae1837beeb423f43a5d7c85097ee3cb8768f1243faac88ba40af58233fc5ec95,True,68,True,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,d733da41ac521e1c851db1807df4390ad8013cae50f7ac93420671b14c592d36,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,17cd4b1c2c5ec36b0fb026d0597b0cf63aecfea3d80988d8d56e6347a268c819,Merge_failed,109773588707330c1e6e0b45eccd556c6c571fa2ed64a37d6f8600ba323b19fb,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,cab6d67826f483968487e6de1cef99cb56af4eb190d33fea1d6f4eb26227c818,Merge_failed,00b770a9a2f970fc5cbef9d537fdddabe76f3083938b354d121aed9d5fadf85b,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302 diff --git a/results/combined/merges_tested/docopt/docopt.java.csv b/results/combined/merges_tested/docopt/docopt.java.csv index 5e664bd101..7eef27b23e 100644 --- a/results/combined/merges_tested/docopt/docopt.java.csv +++ b/results/combined/merges_tested/docopt/docopt.java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,2802ccf5c458dc747b15d3ceaa89889d41a4d0d6,2d23774813b99bb9edd75bbe7e9cd6370ac5f7ee,85e1eff2c7d4b171c5dc2139e484ed4dfe7d443b,,True,True,Tests_passed,06b2ab0fbb0ed241e3c5d54cc447839d3ad1540efd29e12e625b54b6e85a1a72,True,6,109,474,2,True,Tests_passed,ba91a7277eb2fef18a6cc6e603c9908577fb1b96f951dc260979fe67c29e10df,True,6,True,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b389e60baf2c2922876741920cf4de0cedeeb041e945266b0b9c2d9eb5f3c42f,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,2639434219ab08d3931d129dbe96bdaff133a861078796b5c021de3dc11fe309,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b214a77bb2b4287cec1df5fd30d738a170f5aa0a49816ee4daac65f2873e5124,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175 diff --git a/results/combined/merges_tested/doctau/garbagecat.csv b/results/combined/merges_tested/doctau/garbagecat.csv index 468dfadf43..68e0ec111b 100644 --- a/results/combined/merges_tested/doctau/garbagecat.csv +++ b/results/combined/merges_tested/doctau/garbagecat.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,4af1d9c4fc71246add443b99af9cc47e5464aa89,e7c37428ea20228556d3ef1e8fec5c553d47547d,269f0a1387d1586db729ca9194436a2e9fda7c8c,,True,False,Tests_passed,d042669a1907ed474f7983458cac03651aad805d1d9ca218d4a9d18f8e3dd9c6,True,3,5,13,26,True,Tests_passed,bf6e7fd09d4b305d78e471aa512b3e256fb613dcd894e901375d61e95fdf5b9d,True,26,True,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ea135dd2ba5c6de3093dbdaf3941515173fae2c2dd7c8757c664fa5690018d66,Merge_failed,b956596156bfd972ed274386197dfbae2ed9ea9e3b809e2464f733ec13a2e233,Merge_failed,31fd950be1d2f6b2466affdd7aeecb6fa085cbbc2ea1a56aab83a2685f742638,Merge_failed,2bf0e68e5259188c82bc81ff20e078be20944111323af3db08c6acaf350248f5,Merge_failed,b956596156bfd972ed274386197dfbae2ed9ea9e3b809e2464f733ec13a2e233,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,088c5160da6215d593038fdbde877c6f8e0852203df038803fbae1e110ef6cb3,Merge_failed,31fd950be1d2f6b2466affdd7aeecb6fa085cbbc2ea1a56aab83a2685f742638,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b 8,refs/heads/master,583416b443b6e9679f87705f5b98f0f42e3cd19d,9a6da251a0d88bbd1607fbefb75a2ddc2393d51e,b9db442fb05065af24a43906a02bd4201e9d265a,,True,True,Tests_passed,24a27151170cdb00180e48414ce3d9433c051aacadbb769d6b1a0836d5392dee,True,14,91,795,3,True,Tests_passed,3b63e37caf69facfed7fdef20d99533c34e7ab252e24647184698a58014f58f7,True,14,True,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,d2bccb4adfe40fa75578f77e396fe8908393032e4a0d59ef6229df9067b1a8fd,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,35d1366b2805181122d3aec3b037f6afde80a37fe89c61b668f6685706f99ce6,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,ae04cc7b3073b3b659eb535c583b05652fb73d875c85d05afa1ecbe6e1fbc6d8,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e diff --git a/results/combined/merges_tested/documents4j/documents4j.csv b/results/combined/merges_tested/documents4j/documents4j.csv index 7169f60f3a..1880cd38ca 100644 --- a/results/combined/merges_tested/documents4j/documents4j.csv +++ b/results/combined/merges_tested/documents4j/documents4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,36,44,655,2,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,36,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f diff --git a/results/combined/merges_tested/douglasrodrigo/bfmapper.csv b/results/combined/merges_tested/douglasrodrigo/bfmapper.csv index 537ca44bd5..d28e095a84 100644 --- a/results/combined/merges_tested/douglasrodrigo/bfmapper.csv +++ b/results/combined/merges_tested/douglasrodrigo/bfmapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b0056fd6f8d833d7f7dd54543504f344787b53b2,6639eadfdbdaa63fe81a02bdb3f78ec38123d758,bf85cfee8a96e9e85ab29ea2d1021ec97dbe5e58,two initial commits,True,False,Tests_passed,b591f19e6b53b09c3202cffe91eebab9c80d020f7afac058e8384079d15f571f,True,62,8,244,3,True,Tests_passed,96efdb52c0f05045d148e13b2e2642ca1330633388aa85c73f3b213d10dcb7c1,True,62,True,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7 diff --git a/results/combined/merges_tested/dozedoff/similarimage.csv b/results/combined/merges_tested/dozedoff/similarimage.csv index 4776d3f6f4..d48a81554b 100644 --- a/results/combined/merges_tested/dozedoff/similarimage.csv +++ b/results/combined/merges_tested/dozedoff/similarimage.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/develop,5f69834a3348fc078da6db2a849edd3440126844,e2ca5ae1cc6c201aca9ed4c3bcd8f29f748de4b4,f1023bd8dd3be8a8ca144a9597e3221061226dc7,,True,True,True,6,46,237,2,True,6,Tests_passed,cb5fe5d0d0679ff725e5cdd29099fd6b25f23ac7019daeebf3c1eaf6ad2bb334,True,Tests_passed,b0e8b0da1d6331a5bf4559d3a15c3488d8780d560d567dfdbb10fb8d3301908d,True,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,b68861db1ec760bce19b456ab5352a0dc26dc5e394499a8a6b27d04dca3b09b7,Merge_failed,b0ee3d8e554d675343781e918dee587164e4794527253296af025cb947c3623f,Merge_failed,3582c0a835dfd4b9e8218a8974e08cb5045f34357af6d812428b510a89b9a6e3,Merge_failed,3007855a734060a53e7ff0467b49fcf01d7c8198025d16c3a63b0b4f8c38232d,Merge_failed,b0ee3d8e554d675343781e918dee587164e4794527253296af025cb947c3623f,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,3ec15eaf61864a73c442a45d516900dd14be7b1188ae2bdfb522c93b3fff691d,Merge_failed,3582c0a835dfd4b9e8218a8974e08cb5045f34357af6d812428b510a89b9a6e3,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420 24,refs/heads/develop,8137e10d6d6882c6461a20848c0699404328c767,65dc547c6168c01e2399106e022edf1aa6bc8711,33070ec5138938496f3349197d8e0f0d84bce790,,True,True,True,11,59,364,3,True,11,Tests_passed,4a5639825ed45d13ad085d24d4b845a17db97c219feb349cd5be18d964332041,True,Tests_passed,dbfb2449c2152c7cccad58a1aadc3f8196ecbb40e832a6423e8cb0d2aeb265b4,True,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,d0ef92d365b73e8beb51d1ab0a2d228feba105727f1917bc53b8f7a41e88efb4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Tests_failed,9d4b9d111ae563d40d7b8ceb1aa39ade0e7e4e4e92d795ca45a2b35c413edda4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,9eadde18136d4315f6d395459c13dd7b245f38bec3c1545fee3898b06d56458b,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3 diff --git a/results/combined/merges_tested/driesschulten/dozer-model.csv b/results/combined/merges_tested/driesschulten/dozer-model.csv index dd883ac02a..d718b17d4c 100644 --- a/results/combined/merges_tested/driesschulten/dozer-model.csv +++ b/results/combined/merges_tested/driesschulten/dozer-model.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,b9bf37c27199cb309f63a58a902be3730ba67f07,a392ef24a10e13721a6a04123350a19f17b81a02,95a465b3f6607140536011100231e2af4be9fc04,,True,True,True,5,25,181,7,True,9,Tests_passed,dd9c88dbd85666dd685fff0a8febc3ec69ef0a17eadc466b8c1110dc72ee7750,True,Tests_passed,9566f2a6ea13883d96f366c1444d84188af8fb5055d6b99e6c05c2e1054a7c5a,True,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,2d1046826cecbcedaafda3e09113bd2c6e5a94970b5498be152caec893a15ed2,Merge_failed,ce8da56636b37eb6bc38fdd9ecd4f0925d915f7bc5aca1a82e34253f02a39819,Merge_failed,0fefa0257ba196fd722060467638b39a6053b82cc5f511502770bdc8ac3e264e,Tests_passed,170d5b3f1cb555bd0b279d2f38183f6ed34f6f1ec52ebaccd799dc65353bb8b7,Merge_failed,ce8da56636b37eb6bc38fdd9ecd4f0925d915f7bc5aca1a82e34253f02a39819,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,061b08fffd071be46c2b12dbaddfa94803d3f106bc0c81ba756f481d6db87503,Merge_failed,0fefa0257ba196fd722060467638b39a6053b82cc5f511502770bdc8ac3e264e,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f 9,refs/remotes/origin/hibernate3,c7260c73f58d242b6181dfb05d588bbd0b23d5a1,1ad2803395b57bb2caf6d866f8afc1e8283712c8,00dc759c0edb8defa788bf42ef8888fb40e913a1,,True,True,True,12,32,104,4,True,12,Tests_passed,cbdffd8a86739d9a1c7ddbe2698323e4a6ed294312a141d82cc14bd61e879b8c,True,Tests_passed,d688e4dbbe71181e65399e6d5440602208e3ef8f9c48251c74165fb95ac5f353,True,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8bff437674b2a1923b335a5236bdc465a1fcc7000fbf10746b3a8b972bb24a3e,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Tests_failed,8cbf56ff12e76d6183bfcf18ca1b4e17b3dcd09cc95a615edb7ab0ea134e1f66,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,86d0551959c198a203a04caed42f694297b391e6cc974cf92dca4032f9611bc8,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1 17,refs/remotes/origin/hibernate3,393c355622cd121e1f1a292f2afad5490603357b,3acca52d1af519bd1e79060fc1bca0d4e040fbc1,f3402ee476995f820d0ed87c3d8493906a334811,,True,True,True,12,38,166,3,True,12,Tests_passed,fa439a1422305359981aaf3c98f7c79d745657b8d6c2c03c3370f44354eb7cae,True,Tests_passed,b1f9ac7f18e0974bc92c8e58478409d05bed760eee94a10528c16e00c213806e,True,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,9c1661e20b9f68341378931f9f049b25adb9fe80e67de772be4f6df428e48541,Tests_failed,94cf3547f72a03bb83885a7453becc2815de05d63a95abbaa611a6b9277d6fc8,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,9c1661e20b9f68341378931f9f049b25adb9fe80e67de772be4f6df428e48541,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d diff --git a/results/combined/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv b/results/combined/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv index 64f4bf7749..9276ec391c 100644 --- a/results/combined/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv +++ b/results/combined/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/7.x,b7c5e5eb55c90c36520b89c88d4b0886e458cb5e,7a2dc873c017d5e6ee34dafdd7d5e177463a3756,7fd75d8287091e6a2b6d2bd549ca526ef47778e9,,True,True,True,69,221,2772,2,True,69,Tests_passed,6baaa34ffb4c33c1c88ace172efcc35d9d205bd27b962d508958501d653ace5b,True,Tests_passed,429bf44be992718b907b1acb0af1bf9f706328051fd4fcbdfad948f164a41354,True,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_failed,b5606bf79546409679dd187002b8afb3b48a6f30ba52e52246a32cdca4a03fa1,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530 diff --git a/results/combined/merges_tested/dropwizard/dropwizard-elasticsearch.csv b/results/combined/merges_tested/dropwizard/dropwizard-elasticsearch.csv index 2bb7ff8198..908c4cd091 100644 --- a/results/combined/merges_tested/dropwizard/dropwizard-elasticsearch.csv +++ b/results/combined/merges_tested/dropwizard/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,13,58,227,5,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,13,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,0a66b38321a70768c7f2a5a3b2ea115e8de82c63c465b5357d6356c76605d9a2,Merge_failed,b5bec5ff58eaf8910fef70949a53df1a55bb44112fa4f0ac6a6f83700add1cda,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08 diff --git a/results/combined/merges_tested/dropwizard/dropwizard-flyway.csv b/results/combined/merges_tested/dropwizard/dropwizard-flyway.csv index ecf8ed02dd..9c498caea0 100644 --- a/results/combined/merges_tested/dropwizard/dropwizard-flyway.csv +++ b/results/combined/merges_tested/dropwizard/dropwizard-flyway.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,8,90,644,2,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,8,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,b8e1d01d40238d7cc4f1ef6647931f2626e443173c14b0294769196984842bb0,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4 diff --git a/results/combined/merges_tested/druid-io/druid-api.csv b/results/combined/merges_tested/druid-io/druid-api.csv index 812014a81b..3b58230920 100644 --- a/results/combined/merges_tested/druid-io/druid-api.csv +++ b/results/combined/merges_tested/druid-io/druid-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ac15c8e6c4baa07aecc2208f13952c0adcce489c,7ed6284ffe6bd5542a2d9060c96e8ff55515c99f,f1486a2f94d2ba816ec5495a0518768ddaa429a6,,True,True,True,14,41,709,2,True,14,Tests_passed,424ff64fcb36e661b96cf7154f4680b4de82167844ebcb395a40756cbdc0ab45,True,Tests_passed,ca3f47c8223d6b93221232b342ae43abc8217f8150e27ab31e47a3d1c85dbc39,True,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321 diff --git a/results/combined/merges_tested/dschulten/hydra-java.csv b/results/combined/merges_tested/dschulten/hydra-java.csv index 7b2af99329..1949d8be99 100644 --- a/results/combined/merges_tested/dschulten/hydra-java.csv +++ b/results/combined/merges_tested/dschulten/hydra-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,99ad5cffd98a9cdfa439c08e7b131c184f72d9eb,f7f84299e02364513f7fdbd16fb1d844ce9bf6d0,28406ae3bb54f42c7b3be38871e33f94aedf6cc0,,True,True,True,2,3,7,5,True,5,Tests_passed,c8e2113564643be4863b70121e5d15843cc6ab363cf3c954a6701f91e3b6a91c,True,Tests_passed,059befbf1865aaf95c6911c49579036ec5c0dff7cc50d118eb6c348304075c8d,True,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,9aa158033aa79a6881600f529be36d386b05433c6bbc54be21d59e89a4a60550,Tests_failed,d273d86e474681d198d703ced0a683443d9c98b4daf8ec4c472bbd22839aaeb8,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,9aa158033aa79a6881600f529be36d386b05433c6bbc54be21d59e89a4a60550,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85 22,refs/heads/master,31477c32b5705e46811843bfede533dae9682322,fad819e0f8ca98108ceaf081a108c18f51eedaf8,320e7b3e13f86b6aae1424df7a17bb67d75d96f1,,True,False,True,2,2,4,5,True,5,Tests_passed,e76023079412f3860140021a6b4f64fc5853c8c3068942a9bdf226a2522560e5,True,Tests_passed,6fa12531d9406c631dfbb6f1a9944961a505e6d176c485c10b0f7f7d9d02af0e,True,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,9f32ce54e0339718fa9b37244c9f4cdaec80c25b9a97808ddae2e0e4937e1ee1,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Tests_failed,79e2c0461f6f937a6dabec287b42c2f87c3377e49f21206d8bc37ed9354f8f15,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,f813eaeabfe8070132a0a40573a8d6046b8a7b5eea2a9d09cf36aa944c287ce4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3 diff --git a/results/combined/merges_tested/dspace/dspace.csv b/results/combined/merges_tested/dspace/dspace.csv index e6ffaa3740..6760a3175b 100644 --- a/results/combined/merges_tested/dspace/dspace.csv +++ b/results/combined/merges_tested/dspace/dspace.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,e9204416db86218eb4f08c36935411381c19c5b7,6aaabb2dd3974460048b6b98d85f796f97952b45,af0ead1a70e10b45f8453fb5c1920971cdcd549e,,True,True,True,59,247,1302.0,2,True,59,Tests_passed,4d9576d9a07b3e597964657f433a77fd4c4b708b79b2fbc3dcc8610e51fa0bb8,True,Tests_passed,5c9ae2fd30b6c22458c58b51f335d07a75b862d45afdead13b85d337f663727a,True,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Merge_timedout,,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9 8,refs/heads/main,78013143efc8aa6609c8303afa0148f25f10d0a8,c74e769d24ad9dec223150174c5cf57e3fe3cd1b,c1d8303041dd7b1631505d3b4f3d7af8ff96bb4f,,True,True,True,40,157,1509.0,3,True,40,Tests_passed,bde2997e758e6f90c101d28c3cada6b44684a2f18e0fb4f474d087901787d0b7,True,Tests_passed,76b8256177062c0abe5171b24490bdf8be2258b28f0312096f50a3d6148ef618,True,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,d6747d3e08e6e9c65afb29e75c3177395d69e1c43ba214997179e1917d9c27ff,Tests_passed,961aedb3912a3ee59c3b1274cd7cacd5c04a381119a167bd0e7db01b23a6479e,Merge_failed,6e855086ca4335f49b498c378d7047b3182c19b8b2ac0ef4410e8114be0f5bdc,Merge_failed,6e855086ca4335f49b498c378d7047b3182c19b8b2ac0ef4410e8114be0f5bdc,Tests_passed,961aedb3912a3ee59c3b1274cd7cacd5c04a381119a167bd0e7db01b23a6479e,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,d13c0d4c218f1749a7a237e74afde8a565012379cc356333a71b127524439d3b,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94 24,refs/heads/main,eb50fa03eb2a64323bc3f71bad4fa9d2cbf71935,ec0853ddad290f20cf4b7d647891df2011f1eafb,c538b9cbedd2d7ab7ab88b912a5eeb75a180e10d,,True,True,True,1053,4461,94559.0,7,True,1053,Tests_passed,d150650126df1ff1743d6a2afac1287148fbc01dbdb35207da7a8abbca31288d,True,Tests_passed,aaa450861e836d6db6ff99e9dc7dd0077300c2e920ea58bda586855da9f1e2e7,True,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,4626b627bacf35ff0a77a801a9983ee7c6a359ceb56652a9e0e9ea3c6d6032ab,Merge_failed,f265ff3f2afd47ef2fd57411846510e2f6320fa96a3be513551ac4033a76337a,Merge_failed,8926f5c75a9adc138e8c0fa57a3db81f2ad97be425a2408e76596a6a563e0e24,Merge_failed,8926f5c75a9adc138e8c0fa57a3db81f2ad97be425a2408e76596a6a563e0e24,Merge_failed,f265ff3f2afd47ef2fd57411846510e2f6320fa96a3be513551ac4033a76337a,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,f76c78b4b9496b41527a0f8fd6cd8c442f872f04a17b5e554d86a23b7134dfa6,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3 diff --git a/results/combined/merges_tested/dtrott/maven-protoc-plugin.csv b/results/combined/merges_tested/dtrott/maven-protoc-plugin.csv index ed683e049e..318b95c4a7 100644 --- a/results/combined/merges_tested/dtrott/maven-protoc-plugin.csv +++ b/results/combined/merges_tested/dtrott/maven-protoc-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/10,281edcc995e2f5511028659d923d7fe3d64cb2f1,eac96db995e348d51598234bdebbf4087d128a81,46b12f14c32aeed746f09c5c2ff308cf77bdebf4,,True,True,Tests_passed,bce0079b1987d97312ee662acf26b668a1d73e3aa79b664e6ab7f4637e0dc2aa,True,32,149,1141,5,True,Tests_passed,6f90a9557c293d3c569ec672e125b7ca2340b796016cef75236cdc8bbcb32068,True,32,True,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,5523ea576afef1b75aa6e8b7c65d08c3183c93fdcb1182543821b46b13e711ab,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,03e0391d7f2de8ed4ffb2950ce569f630b468eae95f35b62fa037a1a372a8524,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,6d1ccf76c96b6ea5dcd63b26a79b2835bd5035474c68b62e288a9b571d9ee698,Merge_failed,0d7349baaff2fc5efc3ae011df1a7b948e4aa767d5ab5c791759c6c39739396b,Merge_failed,6b405e6981e6c20f634fe8850fa2db5aed73c809fafbf9ef72fdba19a2923326,Merge_failed,2702353157d3c86a432a4327eff0f8c606826da5cb921522270dc80c53fc6a22,Tests_failed,4e268538635389327c2dd1e6fff4f55484b668b5d62dea7d71bcde0d3e7cdc85,Merge_failed,6b405e6981e6c20f634fe8850fa2db5aed73c809fafbf9ef72fdba19a2923326,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,03e0391d7f2de8ed4ffb2950ce569f630b468eae95f35b62fa037a1a372a8524,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,6d1ccf76c96b6ea5dcd63b26a79b2835bd5035474c68b62e288a9b571d9ee698,Merge_failed,1bca0089ee6f08435a008cf4fe91130e6eece4f4d0c0c788e5bac6159ab7f9ed,Merge_failed,2702353157d3c86a432a4327eff0f8c606826da5cb921522270dc80c53fc6a22,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,5523ea576afef1b75aa6e8b7c65d08c3183c93fdcb1182543821b46b13e711ab,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7 10,refs/remotes/origin/pull/10,0cab1f593acdfed0347285c8518987a96711236f,3fc1708da72ad61c9066cca02c03bad8d68d4a4c,405ccd79c722155c0065f7d0f5eb676ac6855e66,,True,True,Tests_passed,07855a510bd356318e5f80a1951ec8054b6d6c05fad7abc9b0cbebb9cea21f9d,True,23,78,606,2,True,Tests_passed,8d6433aba4f09d54a08af06fa7bd22278f17464e23b971f1ba2c7e313a58fb1e,True,23,True,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,4ec3e2fe1204736edae2d265bb631e7bb4c8579d548ee2b1795cb66bbb26c5ae,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Tests_failed,d765b3588a9593c9ace208badccad4d6885c3b3c87bd7c9bdd4890f49d8e2dc3,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,7c2bf186dc092648593013e54f9477e704ec1e02489dfa23b4a664292bbb0214,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7 diff --git a/results/combined/merges_tested/dtrules/dtrules.csv b/results/combined/merges_tested/dtrules/dtrules.csv index 372571ec19..0775fd3a46 100644 --- a/results/combined/merges_tested/dtrules/dtrules.csv +++ b/results/combined/merges_tested/dtrules/dtrules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/5.0-SNAPSHOT,6f91cbdda5d9d2ff783833d2b7fd43fcefb81f12,e48a828c7ee4c90f9077beed380282eca16b196d,d83934d0d79aaa1c1dbd84b4009c05f05e222654,,True,True,True,184,425,26318.0,4,True,184,Tests_passed,6a30be910fdeac9495bd74619a2772a404a12c528a7d804d61ce11840206cb53,True,Tests_passed,c859fa4729382e964d1b8bbd783a4c502c1f2eb4351b20d41be3bdc867a261ae,True,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,6219c070ced46b4eda40de8bbcefdc919a7883210a628e38e618e07f98fda474,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,ffe40fedf3731d3a9e934d8d6c88930d979c51846c56c53db6f2a7e3bc315ab8,Merge_timedout,,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,bd7851b893afcb0536892bbb9df1bb5d59a1073b3cf8cea27da30358b95f10f7,Merge_timedout,,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a 2,refs/heads/5.0-SNAPSHOT,79860cfaaaa993a462d330d489cb94c6d6681b55,5c7bc9ee0a942e4a87e176187e536413050b1b78,aeabdcb763051da30a6c5fd76031f602bc09e333,,True,False,True,2,1,2.0,100,True,100,Tests_passed,5a55dad98b62bf39b51533cc13be9581a2d9a66d7004d4742cd01efc90e40d15,True,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,True,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,9f3cb6a2bb8176fe6f31dd43ad7f9e5b7907446804670d4c9aa2e72d5d41f25e,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,9f3cb6a2bb8176fe6f31dd43ad7f9e5b7907446804670d4c9aa2e72d5d41f25e,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69 4,refs/heads/5.0-SNAPSHOT,d096b2548a64863a658995b9e1f2f863d8fa45c1,2cdcfa7edac6d4f4081a6a58b89562e974ab4c21,0b8779e73c8704fb3d5ff3458cedd1e978928ce9,,True,True,True,121,392,23893.0,5,True,121,Tests_passed,70513f50e8915d8b931525c81c81a2fed1fda3049b94141ba0ca9da4665ddf26,True,Tests_passed,44dbbb236cad84abdce2d44f67d5de08e197f1d1c63a3eea7a06135a744e801f,True,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,9e74392b29577d595f2ea13baec005a0bd2577dfb8d21a9c70a13bfb6127d987,Merge_failed,5dd2b4a81f5c9b95ba19f8dc01d20e2f609a380062449497cb34fe314ccab0ca,Merge_failed,67cd3115ca07a71a06d85e12772561e8b259a4c622b880c5276db7fb5f1a086a,Merge_timedout,,Merge_failed,5dd2b4a81f5c9b95ba19f8dc01d20e2f609a380062449497cb34fe314ccab0ca,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,0ccf909a60e99161283760598000a9e829cea7f0bbbfcfe35a4318258df4d882,Merge_failed,67cd3115ca07a71a06d85e12772561e8b259a4c622b880c5276db7fb5f1a086a,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53 diff --git a/results/combined/merges_tested/duesenklipper/wicket-safemodel.csv b/results/combined/merges_tested/duesenklipper/wicket-safemodel.csv index 34a5933080..a0bb050af3 100644 --- a/results/combined/merges_tested/duesenklipper/wicket-safemodel.csv +++ b/results/combined/merges_tested/duesenklipper/wicket-safemodel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/wicket-1.5,09940b84110f272a498b0956740d17684d48f1c3,fb62ed543a7b7e36412f501ffe1eb4906cb92dc1,eede8623fdeb4c0b07d4a37c6da1e5abe23fe37d,,True,True,True,5,16,90,3,True,5,Tests_passed,b4f0103eb7ebd57aa6c32cc98b88decf44f436d2ed182f2c409c58c4c84c6801,True,Tests_passed,13cee4d48a55de96ca5dafac1489d9a4af378733434f92b701cfc22eecf1c794,True,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,5e349304cfc4b2683eb4966c9b8e370593d115f0948c9e4eded54962c5fe4e21,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,369fef66ec15a5957089ca27b9dc122d6a8c84d0a4a00a671f948e6545de3703,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,6018247b4ba7d628ee254f36d751f165eec652aa080ab707dcf269c6e1f15611,Merge_failed,c54e3fc61b232e0a5fc62144cbe48641fe95de1b48b761304b903b9e29c86535,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1 diff --git a/results/combined/merges_tested/dvcama/lodview.csv b/results/combined/merges_tested/dvcama/lodview.csv index b3b0ad230d..be97434c72 100644 --- a/results/combined/merges_tested/dvcama/lodview.csv +++ b/results/combined/merges_tested/dvcama/lodview.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ce117080514feaa63100345095aa4954a9d6d4bc,39f794baac72a3024ff3ca69a0b0fd9c1e830ad0,9cd0988f15b5adec4454a0527c1933d3154ad4c4,,True,True,True,11,29,177,5,True,12,Tests_passed,c43a1da7c4910dad4f7b2434f912ea7792c11c595b890a549052d491d0f60e13,True,Tests_passed,b460c7acdf763d86f5421153fbd3bdd971e932294f8a8542d98ad55658633e55,True,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a803fdcddc819cd727fdac19418fb634e2915672bfa0e3f6e657568708b7e2e4,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a6d1bf3967eaaf8fa72c46e9afe9b81d5cb92761fc55aa207d43f430453f7727,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217 6,refs/heads/master,954530ea8d3843332cd8dcbf232fad2c8567e10f,9101df822fa35ba15a3705443ea84a02a8f425c6,29e42df9a0e2263c2f38d020a2050a6d6dfcc222,,True,True,True,14,62,212,2,True,14,Tests_passed,d8b800bea264e18b852d88a33288db484b55614f40e2ba10be24e31297333d2c,True,Tests_passed,e24d9a07690accf8cbe4d2c756c269a741d5c01ee91f2579f62f7073c30c5a02,True,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a 10,refs/heads/master,e9b0969167486f088981703db0c645fa71f71cf1,7ce43c381012c20615a3ca84fa732d67d284192c,3552af92fdebf6a6c3cc9abc7ce07bbb83f36961,,True,True,True,9,57,130,2,True,9,Tests_passed,4a440f82e351f4e65a861a8b8bc8735e82e9ef3ee45dba6ee5d7ead4559bee01,True,Tests_passed,cf0a71e801412051b5fef593eee10a876f3f93892b3935e016c8929dace8c440,True,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7 diff --git a/results/combined/merges_tested/dvdme/forecastio-lib-java.csv b/results/combined/merges_tested/dvdme/forecastio-lib-java.csv index ad1780f496..37c109cec7 100644 --- a/results/combined/merges_tested/dvdme/forecastio-lib-java.csv +++ b/results/combined/merges_tested/dvdme/forecastio-lib-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,60570820cae9c489f6fb00a1c64a73ea7fdfdfae,c5157ff590ecd99bf07058d779a52818af0ce056,de802a0f9736572038a2147ec3cc804f0ef3cf76,,True,False,True,5,11,70.0,2,True,5,Tests_passed,cde9a0c15a1347cc20c80cfeec748d3e382696333655b691085cdbcf8fd314e6,True,Tests_passed,6575b7205c3762dc567541e31b58be4586b9db00c23c4275aa28ee71529688fa,True,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_failed,9b4be2ece491d0250c4ff5e1cd7e242bad152e0711f3d882f15581ce212b08eb,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1 11,refs/heads/master,4f50017151d1ed7529bf4c2e59510aafc2ef3d77,8dbb0c0d246cdde682967433e825c311bf3ad5b2,d110489d89521d07d5d8ec2bd5df5c80567d30b0,,True,False,True,2,2,23.0,2,True,2,Tests_passed,810378e6ad405e11440814a73d6f050da62bee1765cb9c7823a3912931e66d5e,True,Tests_passed,22ed544db2dca14c9697339c75e25da5b414d3605855cf519aa3636c037b1776,True,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,938f9487bfd9d1e9e19b555fa0ba5af4c7210ea1c4effff6039251aef6408880,Tests_failed,0ca0dbc0fad8fb0c40b3d2318b6aaf10395f0384c544f9135bc8354f7dcde84a,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,938f9487bfd9d1e9e19b555fa0ba5af4c7210ea1c4effff6039251aef6408880,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde 14,refs/heads/master,a800a19565c4d574b03a3f11ff3376b1f47aa80b,09c7bd29d1d27da59e7d0058118a146ffe07f8e6,e964933a3b6e30ed7e965fbb68425c0e622cb4bc,,True,True,True,4,18,46.0,2,True,4,Tests_passed,cbf9122dd30d113ba17fca4e605b05459f586f78d6070377a310a74ac372c18f,True,Tests_passed,ca46666d807a1d4f9b5570d9337fc2b2cb7755de6404d2ff11876a1af552848a,True,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,207b8e2afad69fd55f4f71000525642429ce7034bcf54e0b9a5036d1066483d1,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,207b8e2afad69fd55f4f71000525642429ce7034bcf54e0b9a5036d1066483d1,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2 diff --git a/results/combined/merges_tested/dwslab/dwslib.csv b/results/combined/merges_tested/dwslab/dwslib.csv index 7c53a72c68..8b9c0920a4 100644 --- a/results/combined/merges_tested/dwslab/dwslib.csv +++ b/results/combined/merges_tested/dwslab/dwslib.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,b42af2c0ddfe2c92c1194ed0d7b581525f382ffc,8559f65bc3c3c04ec5ada926d95a416fa8a5ed46,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,True,6,9,166,5,True,8,Tests_passed,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,True,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,True,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,ab4d0b464a7c8d688be4d837b11c8bc807eb1e41c733575bd7ef40d938710cd7,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,a0e258ba5478c5c735f97db728dc19f0f876eb4b6ae74f97cbe2bc3241107a63,Merge_failed,b8f987e324d544fbaa86aeca4473f5c61e97af19005c28e8cca9d34444fad2f3,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c 4,refs/remotes/origin/pull/1,83dc42bd1fb663dcb6e293c7d9a951d373248c12,8cd70aed31c7b4ec1cc67f682b036236a4836e38,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,True,6,9,166,5,True,8,Tests_passed,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,True,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,True,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,ab4d0b464a7c8d688be4d837b11c8bc807eb1e41c733575bd7ef40d938710cd7,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,8fcd4cf8abf6e2b715725b325671b460a6da722708cbc1db005884a7ce2abca4,Merge_failed,b8f987e324d544fbaa86aeca4473f5c61e97af19005c28e8cca9d34444fad2f3,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c diff --git a/results/combined/merges_tested/dynjs/dynjs.csv b/results/combined/merges_tested/dynjs/dynjs.csv index 2fa8b8425c..e565670fd3 100644 --- a/results/combined/merges_tested/dynjs/dynjs.csv +++ b/results/combined/merges_tested/dynjs/dynjs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,ee2219fc8b7178f9df605277b89200011093a534,b0f3e1e3217792abd2cec6e18bf7e376f56ae1d1,cf7bbe9e06fd28c686ecbc47ba59bfa25c854e47,,True,True,True,227,923,9393,4,True,227,Tests_passed,1a5cac1a138de84dfc3aca1145091ab3248fcce4c3e5839282e8540dd71cb981,True,Tests_passed,2b963c0b558bb7d88d02e3bf7feecc8edd731b36f4e00b825eb47ecf1acd951a,True,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502 26,refs/heads/master,a98c081265982db02dec1543679620aae7783b47,014bdb874bfdf7b2dd631b6f33bb55ecf5e52010,b827311d06a240018788dfdbbc7bb4a4de4e102e,,True,True,True,22,83,997,6,True,22,Tests_passed,41e1d8b083ade11bef615501df36902cec3c371a5a6aafb5620398d16e1ebf08,True,Tests_passed,03be4818c742ac9f174f694f827d9ca0f035f6ca62706437eaa30318a8910f76,True,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,631ad6b062121948904898083cbf1ce6f1a19feb0f7616c5e6fb0485a363c72d,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,631ad6b062121948904898083cbf1ce6f1a19feb0f7616c5e6fb0485a363c72d,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097 200,refs/remotes/origin/pull/154,2c3aed23807abb8b7cde4101d94d8fb693b13be2,58262908cc2185c202bab66fb86d95b4a47aeea8,3a193c195adfb290b80ed42226dd13be4462fa09,,True,True,True,208,450,5168,6,True,208,Tests_passed,53130362358d4c070f7407d68becab67f765ebd1c9cdf774a2258fb39b019692,True,Tests_passed,b3eea15dbab93ebf68b4e443fdc704f796b3aa3dc01ccb1bcda0a7f7d5045163,True,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,18450eaf13ef90506504f6e6a8f0053c029a54bdfdb3b67810066cf82db4bad1,Merge_failed,40f8cba6123ac6fc47c4c2cda0537ad2b8ab849d66f08933477a70b41c69171d,Tests_passed,27ca8f22822bcf95f8ca37fa1fe8f124893315505ead2d8d285bd4678fff4390,Merge_failed,25029ce101398070c80672480456206fc2fd6ef4f65cae7e4da472750a6a8aad,Merge_failed,40f8cba6123ac6fc47c4c2cda0537ad2b8ab849d66f08933477a70b41c69171d,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,e55ad9468a2306eb98708d1fd32a852e2466dc5896029db8838c4f24c80fb816,Tests_passed,27ca8f22822bcf95f8ca37fa1fe8f124893315505ead2d8d285bd4678fff4390,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a diff --git a/results/combined/merges_tested/e-mzungu/rjc.csv b/results/combined/merges_tested/e-mzungu/rjc.csv index d75bb28bcd..415fa8260b 100644 --- a/results/combined/merges_tested/e-mzungu/rjc.csv +++ b/results/combined/merges_tested/e-mzungu/rjc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,3afc92b5e097f29763b600a8192f557f66752039,31a91e743de4b0de8bb25f306134117e887c6364,653b9123f2057024bca7cb4333d6f26060231bf5,,True,True,True,10,68,339,2,True,10,Tests_passed,508940ed4108d08289048940b0c9f0524c5d3e0085b4459c1ea1ecf7b4234486,True,Tests_passed,3c298e1930b87e25093586c38d4f790f64ae1aa480c2bee9029bc00d3387a0c7,True,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,88438f8d58fadb73e75beab0fc6a98c6fb7f98cdbcbd25f2291a61de7d396d4e,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Tests_failed,bb6da254f8d5178b3a151e28169177c6930134fe9936263c9b11c0243a3d3138,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,8ac1a05b6145ba6f68a3f3fb8993eb1c7c9f9daca75dc1d348ead0d9309ba3b9,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b diff --git a/results/combined/merges_tested/eaftan/hprof-parser.csv b/results/combined/merges_tested/eaftan/hprof-parser.csv index ab246cf6d3..3b9d0f5ed6 100644 --- a/results/combined/merges_tested/eaftan/hprof-parser.csv +++ b/results/combined/merges_tested/eaftan/hprof-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,3668fd734f79c2b949f0703654dfda812c800707,cd2019e5a76d7b2fffdf3cd2faa7738caefc47a2,4b860f8b50791fad8ca96f54899a20dc34d3ff04,,True,True,Tests_passed,5a222e78e931916fdf6bc576d04d4a197d0240ee1b97abd912d80bfbaba8ed5b,True,5,55,301,2,True,Tests_passed,8c1c891754ff5c8b94684cbe76d185011952bb913f4b4abba77ed5c39df42285,True,5,True,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_failed,ee639548fb0f39a770e1cd8d09de0861377b6f89705464579bdcc63806bc5fc7,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223 diff --git a/results/combined/merges_tested/easetech/easytest-core.csv b/results/combined/merges_tested/easetech/easytest-core.csv index 36569cbb35..b88d0933db 100644 --- a/results/combined/merges_tested/easetech/easytest-core.csv +++ b/results/combined/merges_tested/easetech/easytest-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,4446e601096aa1bcdad3b88c6814cdbd5162a6cc,b93fb76bb3d52991f492354d7b60e7cbf0d50430,2fe840c6d539ce0afdf0bf55e50b5de25b1c3d75,,True,True,True,30.0,105,321.0,2,True,30,Tests_passed,535d28373b48c00b2bf19758056905e385d2cf0aefdfe165ef0ccb303b83118d,True,Tests_passed,54985f92d8620d6f1d5ccb2515850cb0aa8432c9d53e9b50b9c0d2055617e839,True,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_failed,78b4e0c38c003acaaa3688da60e2a72eae25d49f05824dc9be233c3dc7bd2570,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_failed,78b4e0c38c003acaaa3688da60e2a72eae25d49f05824dc9be233c3dc7bd2570,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7 7,refs/heads/master,38eb005d4af26d4efac55ee553a324707ca75486,0f668972d2ea34b04685aa7d8ea4dc20924e1dad,0671ea4bf8142f1731e00ac44c10b73abce310d4,,True,True,True,20.0,79,265.0,4,True,20,Tests_passed,9251f95f877e91999a10b5e5d5cbaa6399c9e608b994e19cd3d317d04f07b032,True,Tests_passed,640b135b2fcfa2a26afe641df242f6c416b7642895fdb16e6ab9f5da7967f1ae,True,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_failed,bbb08dc4182042bb9077f9a693da810758b7b54d1a4c3ca9f3b759237c2b96a1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2 9,refs/heads/master,6e79bb2e0be82c7275b311de37af11a665452928,18072b1256c9b409789af05143f9f396a348ad4c,3ea91ab06b0126adc71a59a28d9956a9408a8a76,,True,True,True,19.0,73,213.0,5,True,19,Tests_passed,7303bc2e2514d2044169872f413198a74ff3690cb624d583ab605b0a2e14ebc4,True,Tests_passed,00cd69be234e5e2200f9e110c743381f38c2c2d8db42814e271fd7235ef8ad13,True,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_failed,db939278ce4442a2729461bc018725da17c4a914b093708b466a94eae2600aea,Tests_failed,4d8472273767ed1c9270b2037ac3b09090a729d5a987e224d3e85491a7323574,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_failed,db939278ce4442a2729461bc018725da17c4a914b093708b466a94eae2600aea,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde diff --git a/results/combined/merges_tested/ebay/xcelite.csv b/results/combined/merges_tested/ebay/xcelite.csv index 52e504db5c..bb2c69b8e2 100644 --- a/results/combined/merges_tested/ebay/xcelite.csv +++ b/results/combined/merges_tested/ebay/xcelite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,40e1d22a1ff208cd99f014eac25fe2a51f1cc6df,bbccda650a890b30b8d5c0d8a6d66f03410fd4bd,9d35e9ae77230c74d655add3c90aaf8f12b235b9,,True,True,Tests_passed,fef4029c160fe05d9304222e308a66e3638074ad5c551451281b70331d407c5c,True,32,185,1748,6,True,Tests_passed,058de228a3943c458a8060ffa41d569491948f475c927805c9fbbcd394ea0e32,True,33,True,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,dd072898d1a0cbe648ee46231953e634b4072648a9e350f0a23f4083a6483464,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,1c78627a73d7c9f10b39a0a0217d04e6b369f4c5cc8ba345f9faa8bcc8133ee0,Merge_failed,80b6baf42292210754186205546c996005e35197d8ae1779637e530a934abc91,Merge_failed,6db6a01bf1d72e6e0425741985d8e3e6c970e2709181dd7e31c17a46d6242382,Tests_failed,57f5f7a549f593af2c20ad73cfecda8e408b17e2b0c8df824e05883ceba27207,Tests_failed,cfd1d34d44565ba00828c705c3a749a561c385aebed251b10e096293475e6d82,Merge_failed,6db6a01bf1d72e6e0425741985d8e3e6c970e2709181dd7e31c17a46d6242382,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,dd072898d1a0cbe648ee46231953e634b4072648a9e350f0a23f4083a6483464,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,1c78627a73d7c9f10b39a0a0217d04e6b369f4c5cc8ba345f9faa8bcc8133ee0,Merge_failed,2d84842a63ddce1df21f93aa3e146875c8a2efdaf4ab04a0883ae3caf011c294,Tests_failed,57f5f7a549f593af2c20ad73cfecda8e408b17e2b0c8df824e05883ceba27207,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255 14,refs/heads/master,e43a4a1bda8dfa082dadd823d9b125c1b97e9378,46654b2fc1e9bd680156663055a6f185a5faca69,8330785c9980d941bab29ae076a6db86a0bbc97c,,True,True,Tests_passed,f90a42e7f2cf5ed9742998c4692fce28ac487ecadad12315d48e5a849dce4c46,True,71,101,1423,5,True,Tests_passed,cfce61083c42a4471bdebda5cd8d255ce282066e5067c0af88b8713ccdedc230,True,71,True,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,5b700d3946e447c3eea43f2172289943ba7184e2223daef00b1acdde8813759d,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Tests_failed,d92e8b39ddf4d6f5b3f7434fe047302d802f3e15dcba136c12435c7981f2e5e4,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,8b908b3ac6ca8db3c31d1305e9a937b9490585a9162066df357f45dc18bd5455,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d 20,refs/heads/master,66cde34b01ea5ac3a5db132e6f11a8038db98a84,3ff819b2d7577c611765146688057fcf2f6e74ec,7aeaeb356b01124e9aa6bdc9093f75ba3a5cebd6,,True,True,Tests_passed,998a8f39658f1d26d573007760e97f82d246ad0ba0f1c328febf1c1296777389,True,58,151,3205,5,True,Tests_passed,267ed23ed879fd65afb1fdde91d763b0369ba240744020c172b1ab2a68710812,True,58,True,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,b06bb2954b432ea9abb30670cbfb73ae040e4fbe743b7cd08fd9af6e60eba0ab,Merge_failed,04e704239316954bee9af810d010750e638bd03a93cf761ba0f7b1328cc0f176,Merge_failed,6c3a36672d0c5aa6663651861285305141f0b6b2c79442e24382841e477a057c,Tests_failed,cb99c20a0df077f0aa71e34cd65a1087f694257febbabd1343c76d65cdb71598,Merge_failed,04e704239316954bee9af810d010750e638bd03a93cf761ba0f7b1328cc0f176,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,b5fdeb76197a80edc3de13788a3948b222f7b118f9fb98cf159999a2c6064191,Merge_failed,6c3a36672d0c5aa6663651861285305141f0b6b2c79442e24382841e477a057c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7 diff --git a/results/combined/merges_tested/edwardcapriolo/nibiru.csv b/results/combined/merges_tested/edwardcapriolo/nibiru.csv index 0da3e6e5b1..d5cef8fbb0 100644 --- a/results/combined/merges_tested/edwardcapriolo/nibiru.csv +++ b/results/combined/merges_tested/edwardcapriolo/nibiru.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,bb6150cffd19a67941797bb3a08739c24879fb3c,8bedb7731007d3d3d8db24a0d67df0c0d09def18,7de5733c62c302475108df8f50ccf722fdfb4cc3,,True,True,True,48,158,1174,5,True,48,Tests_passed,c808d2b2d57bb7d2d4f26ff7121fb99409f51a15a42aad87c64ca1a4130b0442,True,Tests_passed,b97a78992177a8b155faded63c13955104a84ed12fbf04d25c77b26a1c6f5c5f,True,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,17f4980eb3f395fae234c36379ae08a7750aa4b958943636771ecc9624fa10d8,Merge_failed,491f0a7c8f6508e9a4996e6b0e9f61daed9538a9d91b11e5ba1f25dc8d0cb6b9,Tests_failed,641440b235df1831f116611c54450ee241aa762b6d669c40ab7d28628c234b70,Merge_timedout,,Merge_failed,491f0a7c8f6508e9a4996e6b0e9f61daed9538a9d91b11e5ba1f25dc8d0cb6b9,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,c89acad9d9740a54d4343640fc1a678d9373611aef749a698eedf7ceb4812afd,Tests_failed,641440b235df1831f116611c54450ee241aa762b6d669c40ab7d28628c234b70,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371 23,refs/heads/master,d4ad3fb0016120d5ff27b81f991adc2f98fff89a,9b75f2cf605b3da94473a9f7ab419ded5fbe43bb,6f38f28681cc5223d14ce5fe344c96ccdda32114,,True,True,True,14,46,224,2,True,14,Tests_passed,9bc55f49034361ce4f416cdbf492b4719b35b22649d07f6fc4bb627c5f341112,True,Tests_passed,f2ea64a4377d3741da1193a261091344807606998fbc4af1d01ecdcdbb71c228,True,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c diff --git a/results/combined/merges_tested/egineering-llc/collectd-fast-jmx.csv b/results/combined/merges_tested/egineering-llc/collectd-fast-jmx.csv index 84c35d51da..6e97edb311 100644 --- a/results/combined/merges_tested/egineering-llc/collectd-fast-jmx.csv +++ b/results/combined/merges_tested/egineering-llc/collectd-fast-jmx.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,da86adcc3eae767206ff283909d43d4a94cdd8b6,292d4b40fc4f7ce235ce8055efce4b5c272c8a07,b4562fd17641bb0a03449bea9ea4651d6ffc9f5d,,True,False,True,3,7,32,2,True,3,Tests_passed,c5b1f3bf2be7ec9cfe42c76b3634ea618b20bb92761fd92f0c63d7ea91c71e15,True,Tests_passed,96c4a5b285385e95748c2e79bd97cf6fcd80f2716d6d3728dee6b8d59eedc4a4,True,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_failed,cb72ffc0e807bfe83cd517c2a8feb1ae247bd9e88eaae3e8fa4209b105381c33,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8 7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170 diff --git a/results/combined/merges_tested/ehcache/sizeof.csv b/results/combined/merges_tested/ehcache/sizeof.csv index 64a60afebc..f77b0c6fe5 100644 --- a/results/combined/merges_tested/ehcache/sizeof.csv +++ b/results/combined/merges_tested/ehcache/sizeof.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,0e8fcbf4ca3b391acc623d6d0c07908db180b4b6,f50d8bdf1403cb9855223cbe33ac479fa1606221,d632def2a5dae8f942dbc10546f2f0379387b088,,True,True,True,11,43,491,2,True,11,Tests_passed,c0861911e4977f4a47d09ab8a73cd15979a92df7f966acbe3152eb3984807696,True,Tests_passed,b8be5c75a518f100d73e3ca0c25cd4ec9102ed9694f988c7ae3df48acd146342,True,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da diff --git a/results/combined/merges_tested/einsamhauer/disthene-reader.csv b/results/combined/merges_tested/einsamhauer/disthene-reader.csv index 7b9d3d8877..67069bb910 100644 --- a/results/combined/merges_tested/einsamhauer/disthene-reader.csv +++ b/results/combined/merges_tested/einsamhauer/disthene-reader.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,8d8c28bd2a9238ebbc6ff483aa18b2632e27806b,abf2f0ef5b03fd5eaf513e5935f24ea6ed719e20,5bb6dc15f0e17f31029f175da1ab15c047bc9a4b,,True,True,Tests_passed,548452c738e1fc81241c3aec5491614e904cb69fbb8bdba4a758db263fb1b9cf,True,159,641,3085,12,True,Tests_passed,bc17cdfc30fdaea86c59f60630e2d6932f13c7c81f990e8619bd236c596b0c24,True,160,True,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ddae62cea325581966160f952c45b1734cfc22c6932fcd21362446ca9996060d,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,4523bcc9ac8da0c79930e42144bfabcde16915e1083e2eae214bdbfd14f21efa,Merge_failed,bb1c09b804eb62fe50e82c1b01c6948eee0baa6f841612b810ae915d75495b4f,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,991127d2347d3d58e875965ff4f0969d6678b15e1ced07732bada368b9638b3b,Merge_failed,8ff0feaaf88a8ecafa45ea7dec6d0502e615547fc66274db38135bf94ac72bf0,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b 18,refs/remotes/origin/pull/28,be61bfb7079f3f19e2a9c9729ad00229a15383fe,28ea18ad767f7c82cf0ad7cac92e770b97911831,7ce50658fe88b87e3f2bed25c968640be69870f7,,True,False,Tests_passed,cf4a441b39e375044556479b404fc87315331e6f9a33417bf533b5f763b47626,True,2,1,5,2,True,Tests_passed,27af42f5f8b973fdf39768c78cd880b8ca2d1566099f5519a0ffd46b0bc5ce46,True,2,True,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,105448a7c6dc6f675fd06e77030c35dcd17dbf2c88fd38608a4e1c4139a1ae3f,Tests_passed,cf4a441b39e375044556479b404fc87315331e6f9a33417bf533b5f763b47626,Merge_failed,025addab3e843c59e5bbd61c3014cb9a90b18cbb77193a0cd07c31cdbab8c54d,Merge_failed,3a972b54ae60c8076de37d7be21af32b912fa186653247d7ba7662e3fff2d66c,Tests_passed,cf4a441b39e375044556479b404fc87315331e6f9a33417bf533b5f763b47626,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,ab0ea58284e9762346b909fba09fc8e4621f6dfcc502af8b1cda626491230d4d,Merge_failed,025addab3e843c59e5bbd61c3014cb9a90b18cbb77193a0cd07c31cdbab8c54d,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f 22,refs/remotes/origin/pull/28,28a8ab2adb083fdca0b512255193aeb06dc1726a,031fc9316c6f71e2fe74af3cb62037e47384fa47,0dddcad8b99c0821ce21ee0e335bb0d60333d19b,,True,True,Tests_passed,4c37a5b37135c7dc9e9cfedc5a29c8ca8876e41c715ea7d07d152f7d5b9e388f,True,12,38,336,4,True,Tests_passed,61905a9d89e702fd7d4f8b8d2ac435d227f5c1b14fd5a285eaab26a6281ba93a,True,13,True,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ac2058a72cb01f1802fac5da7920aedd0e0420c94da4601d9c82ef462672b5a0,Merge_failed,e8098d4c865fe5dd61e321d0a4bfc0823f8692b88f59e0617353f7dcdf824e7b,Merge_failed,5d4fd99c133847518e1793aca40b57cb6317db923ab5ef71dae4eb5b093d7d24,Merge_failed,a68933b13c7cb9e15f93aae4d028e468218e2a881ab72af0de6dfb28d2ce1778,Merge_failed,e8098d4c865fe5dd61e321d0a4bfc0823f8692b88f59e0617353f7dcdf824e7b,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,6ae13687a71be9b841a036dd9aedfcf069efb8109d16e7b7527ced820ecdba57,Merge_failed,5d4fd99c133847518e1793aca40b57cb6317db923ab5ef71dae4eb5b093d7d24,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280 diff --git a/results/combined/merges_tested/einsamhauer/disthene.csv b/results/combined/merges_tested/einsamhauer/disthene.csv index c55b0ad7ac..06ba078ec5 100644 --- a/results/combined/merges_tested/einsamhauer/disthene.csv +++ b/results/combined/merges_tested/einsamhauer/disthene.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,8c23ce22f44dfa88b1093a590f68cddbb7856da7,8d7751c6304a42dc11dcd3d204abb4ea45de8e16,9505994746edf1fcdce2084d4f57befccde1ff41,,True,True,Tests_passed,87ea9ff829fca26e11810ba5daed0179d9aa8828a4f060ba831e096dea3f2655,True,52,393,2564,8,True,Tests_passed,807bd2f4a2c235586ab2afd847f64cc8592617c1b024e05ef083d6c43b48090c,True,52,True,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,7dbba322bd5fa96da5eeb7d88119da8f5ecae0776189d72ca92a58b74362a292,Merge_failed,0752c7d4b0df80155e0a77bf7d3a3448d0fb49c4d4d131b5edd1c6b42d333dce,Merge_failed,f74aa19ca5932bc752614baeb86f7fc61638de5c286cd731d550f9c5a0da162b,Merge_failed,ec0043022953821c8299da81099f881ba43509fe2260720d15bdc88485068f20,Merge_failed,0752c7d4b0df80155e0a77bf7d3a3448d0fb49c4d4d131b5edd1c6b42d333dce,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,914bd2bc9b79d5c896942a441d9768eefc5c45223d9043bb431a17f487587842,Merge_failed,ea3da5520b3b251d5ee507182dbfb6647ffed71cba9bfa4d833897df5044543a,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195 12,refs/heads/master,981e50d964a248b47b78104d0d9caf678e8abd81,efdf6e7a36f19e438ad2f1aa1803174b3b82b9cc,aee2eb5552e5e0723c23d8aa943b8c2a39fd3648,,True,False,Tests_passed,671812d6d3b15e4a4445abe235ec243d84ae6e7e79e1e8a344912bb3800bfd2e,True,2,1,2,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,True,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_failed,1d8e4a52f61a9c7c0512a6f59e52747d804e1ca78b8877c6e53bd8630efbca3b,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd diff --git a/results/combined/merges_tested/eirslett/frontend-maven-plugin.csv b/results/combined/merges_tested/eirslett/frontend-maven-plugin.csv index 080150f9e5..7a3e7649de 100644 --- a/results/combined/merges_tested/eirslett/frontend-maven-plugin.csv +++ b/results/combined/merges_tested/eirslett/frontend-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,374f2be4451a2e49c234736ca7e22067722c1c6e,d059da07326c358227ed34c76469fafae4005b71,26740c875cde63eb0faa1abd801408cc62f9533e,,True,True,True,98,268,13006,3,True,98,Tests_passed,1d6e431e99a211d008cfea7c5642e88547d86c338587caef4f32bec54618680e,True,Tests_passed,c1d8bfa45a86a8698fd813896b461bb4d90fbe674fe658df70de12a80d48e63c,True,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,1bbc8da9a774bf9f7f73687a69bfc3b8116a5955e759d712916a43e929094d78,Tests_passed,ccdf200805a8fb5616551e5bac2675b360a652690b5ca003daa9a198e324c79c,Tests_passed,e29f570687ee54f1d67a09c1a2a23565be76f179b559dd54539678e8b3088f18,Tests_failed,e5a6157a97537c5f6094dd753022be31792561018968d88488766fedb08a9e6e,Tests_passed,ccdf200805a8fb5616551e5bac2675b360a652690b5ca003daa9a198e324c79c,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,7af4fac796e2d3ffe802f8108e8efeb8fc258bab3c3bc7bc6891a36ade5b03ad,Tests_passed,e29f570687ee54f1d67a09c1a2a23565be76f179b559dd54539678e8b3088f18,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326 90,refs/heads/master,bd47851ce5a12bee22e36c45e18ca8839271431b,04666aef48b8e3e9b5f3dd0e5e7d7e411bc7b2fa,e568debb5af86abf8467af1ae0c1220d178e941b,,True,True,True,41,137,2590,2,True,41,Tests_passed,58551b7e6a308379cb1ef1bb69ad9a67159fa5b610ede1f8146b998caa62451b,True,Tests_passed,7309ab1651e6c83267289a05f1ad228860ed371ffaec7a3cdf69e37009325624,True,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,b6e7b236d1b0b64103acf9574442f8b89a7feb28d54f60e478cc2775342d0112,Tests_failed,c40a7b69d3f0015a93f9b1330aaa22c8db871be46a28f4d115a28a4e8a780e6a,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,b6e7b236d1b0b64103acf9574442f8b89a7feb28d54f60e478cc2775342d0112,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7 120,refs/heads/master,ff8a15cb812818112592c0bbb4121af3b5ad0844,76120dea4ac1cdd8a770632e9ea35b5a0ecdf278,e0d5fc7377a636cbdecdf55c3752ec94b9ed9ca2,,True,True,True,23,77,406,2,True,23,Tests_passed,24c0277a5a1f4e7973d1c72f9dd3467bf99ad5e4e659b805ef20b7f8b30a06c0,True,Tests_passed,b97d0e88054d86d0392ac5e4db99979b9591274a3dd5824770fba969ef4ef0d9,True,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,b51b96897cfa26870dfaae8101e6b097bc8f91b7ef6dae91ec08553a0b79201b,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,b51b96897cfa26870dfaae8101e6b097bc8f91b7ef6dae91ec08553a0b79201b,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1 diff --git a/results/combined/merges_tested/ekryd/sortpom.csv b/results/combined/merges_tested/ekryd/sortpom.csv index 67c4086fa4..86064cacaf 100644 --- a/results/combined/merges_tested/ekryd/sortpom.csv +++ b/results/combined/merges_tested/ekryd/sortpom.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/heads/master,cb19c8c127c6959d2c605f3b05ad8d992e0a8f09,138e3ac1ec94003f9c65ff99447d82ec463edf32,5bb68340866b21585cf35b2b4917da3e432c17bf,,True,True,True,23,53,1115,3,True,23,Tests_passed,da5a379b4f05d39db884ef205a7fc4dd52d6ea9e479774827e21893c0f7110a7,True,Tests_passed,c2ae68e74f305703ae8ae2774a6dbd88a41fa9e37754cb54de5c2a5b58351b39,True,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c 85,refs/heads/master,f19edf0092007b36d73316707be71448afdc40cf,65db6732963f71b39434913dd4015b9fd96e9a20,64311fe38c9acefaec6dcd3ae2428168c0cb0441,,True,True,True,11,16,102,2,True,11,Tests_passed,d548b7d60a51a877438902662082d6b568f9ad2cfe3b263786713b30a4ceff69,True,Tests_passed,4db3df2452de700e6b3009d88e249c8565c470c8f20fc92e260ce8282112f85d,True,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_failed,152c9f6a414e466fd36ef5aca7969edd77329873fbf03b6e01358f5194de5aad,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2 187,refs/heads/master,b918df820e139af36241be955991b9e5a69d361a,8b2e212fc24f5e3d4d9850233dceaec5d20b9dcb,c532af1c326ce6b77d672c091b4db512136b446a,,True,True,True,46,88,1131,2,True,46,Tests_passed,c8af9bb7fbdb095c5b93a7c16c94bebec833e43dc61cdf91c27c1368566ad391,True,Tests_passed,41049ac91e34d60f32c8c4301f480451170e55077dff49d9a57131f32be08884,True,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_failed,e5190abee35827e3af6704388fe945aa6b292c2358799d5bf2d460ad684eef52,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f diff --git a/results/combined/merges_tested/ekt/biblio-transformation-engine.csv b/results/combined/merges_tested/ekt/biblio-transformation-engine.csv index ea1c115922..38abe1749e 100644 --- a/results/combined/merges_tested/ekt/biblio-transformation-engine.csv +++ b/results/combined/merges_tested/ekt/biblio-transformation-engine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/version-0.10.0,e1a8fcececc66007b4a770ff37f17a5eafe79718,e2cac286ffa6742f7365f3cd58f83038c0986451,a01da4c16a61a3e9e1de11655011de6c1ca71a5d,,True,True,True,24,82,858,5,True,24,Tests_passed,487d31ee43db08b0917b31521a41d78f4394c1d23fbb64cb5db020086aa4c630,True,Tests_passed,a8d98f83950ad6acb0c5df1a951382458845fa670dc3a9dc5792d0253be1f3b5,True,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,0892aa8ea8e411a83ddac03c373bf07c2e1c7af4a41c965f308efbc42fb23aed,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,9fb627ac3b2d025075fabfa7e9b79c2d9e89bd37b2380ac52fd2b2beee4a4067,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,402606eccf1bc908020e22ae924dfd654732b702a551e2796957ca03e89e4ab5,Merge_failed,fbef72efdff05f86326dced689510e65abffe3e579335f72d19655de0ca1a484,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab diff --git a/results/combined/merges_tested/elasticjob/elastic-job-lite.csv b/results/combined/merges_tested/elasticjob/elastic-job-lite.csv index 9ccf6d9aa0..d1d6bda677 100644 --- a/results/combined/merges_tested/elasticjob/elastic-job-lite.csv +++ b/results/combined/merges_tested/elasticjob/elastic-job-lite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,2495503e688486eb2c9e56c57bbed14bf9821c45,d52707f7f365b3d838337b0af63b23ce61c65da9,0b9aab879a38adae1faa3e6e3bacd0ad1f2b60ab,,True,True,True,10,33,119,12,True,20,Tests_passed,97fde93754d0edb9bf6104a23c887de5e5518a5620073d43e882f010066c38fd,True,Tests_passed,5d931b96ade64599778526a9c561084342e642bf7b70274d201f999330e83cdd,True,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,cb9104ec6620cba9f13d569b969ab63dcc1e262195c5091d1d5c4204699db0f2,Merge_failed,9314e8e73474037ce52e6f5243e82be60e65f4cf8db2e454f87b0bd2c118c39a,Merge_failed,02e4fc2538fb3f98645c834d680b15ad72ccd4fead99df71a970e14a58d5ff08,Tests_failed,08a4da369adf8ed22e63de8c4926ffca79c40df0c0f0272568e3e82c5d4d6136,Merge_failed,9314e8e73474037ce52e6f5243e82be60e65f4cf8db2e454f87b0bd2c118c39a,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,704bded99847c0038b8a985b92a6462434d784c57c8057769a6683ce6e948d6d,Merge_failed,02e4fc2538fb3f98645c834d680b15ad72ccd4fead99df71a970e14a58d5ff08,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be 196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,True,True,True,27,93,380,2,True,27,Tests_passed,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,True,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,True,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_failed,5ee890331e8e255c162944d2208db2338f29849649649c226e8c2fbe59081bec,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2 287,refs/remotes/origin/pull/2092,6381f6c7e98de6ac0957cc2f89400aa9dabc2edb,c5e2c9f23096117dca0e9c0c3f17dcfe56c549b4,9fec9e51c2d031381a107372fe804d1c5feb3b47,,True,True,True,15,38,237,2,True,15,Tests_passed,4d12a0f19d8becc50f1199d646c3e9c9caa29d36fe29f8865ebfdffee8747a6b,True,Tests_passed,c4a0f983c33a243b7ea436dc48fb9c04cd56024e681bba66458fad1a06d00e58,True,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,add0cd7cc21dc334c10856c168c52f01b88025fafde646e3130f708e336fa05e,Tests_passed,46f3cf434a6fa26036edaa5f0afd5040e21dfdd9a829abb9371105abab84f817,Tests_failed,61782daea1847febb109062d92e45568bf2a3f85ff8e579fe4e781951db6c369,Tests_failed,27d596b306468f82ce4ea2625169d3c986da5ecf40d1df53432d68e7525de8bf,Tests_passed,46f3cf434a6fa26036edaa5f0afd5040e21dfdd9a829abb9371105abab84f817,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,9b6f63f8bab0fb4e4f23bd5515cbef1dedb188b948eca60fbe36f59b80258ba4,Tests_failed,61782daea1847febb109062d92e45568bf2a3f85ff8e579fe4e781951db6c369,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7 diff --git a/results/combined/merges_tested/electronicchartcentre/java-vector-tile.csv b/results/combined/merges_tested/electronicchartcentre/java-vector-tile.csv index 8836990854..7c0348f304 100644 --- a/results/combined/merges_tested/electronicchartcentre/java-vector-tile.csv +++ b/results/combined/merges_tested/electronicchartcentre/java-vector-tile.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,51ae3d6f9532a95ef8ca01c471eaaab0129ed881,dec357737d60018e79e3a67e14673e7264db0eae,24fa5942cfe7b919b1de6ba54b447073e1814a1f,,True,True,True,10,211,6682,5,True,10,Tests_passed,a930f825c0b2ea2f6e55d2bc2d95883ba38a8552f5ba33db3dfc57a06143923e,True,Tests_passed,2c9c2346887d51244f97d74637cd2bd3c5e5e1c13bc12f74f5a68622fffa264e,True,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,034ff9aa9a182d47a319365c144f0e2b87c5c74d721c1e0eefe2058cd414a4b7,Merge_failed,dc6d6ffdd053f5eed5a1162c54bdaa8dd7b0a4efd7bb1703f454027a060bc716,Merge_failed,bae7d0b303be890a5216a24b97b0e13f31b715559dd224db56f6c297a50e2184,Merge_failed,efaca69b6147285d9943e1f9c37b2a10827c8f1f33dda5ce2ca48052ba0a02bd,Merge_failed,dc6d6ffdd053f5eed5a1162c54bdaa8dd7b0a4efd7bb1703f454027a060bc716,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,0c24fa3dbdec6cc569a3804a62789c9110aaf2bc1242c1915c9da70ce711d00b,Merge_failed,8a80d8199db807ef98fa73fb8986854a655e2f1f24a54d5df9ecc41c63f0c8fd,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860 20,refs/heads/master,293520399db5206524d7695f666682cf60ddf05f,da7c0a0c0d0f7ffd2766dda1f15d147bd41b5a03,2e44156f767570103439d8b484fcca031790d28a,,True,True,True,6,26,154,2,True,6,Tests_passed,8b6a4e0cd1e494b230a33db9822d306e2e6b646db3c4e395b07ee348d3bac6b2,True,Tests_passed,4c45468c0045fce3d00a1f5759af9da8ec9b12ea7709a326e22a3ad8aeec4f46,True,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1 diff --git a/results/combined/merges_tested/elisarver/selophane.csv b/results/combined/merges_tested/elisarver/selophane.csv index 6684fbe2bd..4b5441f44c 100644 --- a/results/combined/merges_tested/elisarver/selophane.csv +++ b/results/combined/merges_tested/elisarver/selophane.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,56eb40e68919920ba7f973b114536e4620788ed5,9bfa023e2de211afa8960e0d54108439a72c3379,95e696bedd0c7d5f5b183791800a3aa271eb232f,,True,True,Tests_passed,cef4989f2763609d5690282b0c2335cc2505a0ac36b81cefcb25a1bb2a09d0c0,True,4,6,19,2,True,Tests_passed,f54fed560023f8bd449a8d9c5010b8732c89e1e57aac2ad9207b7ee9ee93eaf3,True,4,True,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_failed,c2209098bd06d31f872d7b7d33bfffe6c24bfa4a7f679464216977a7c5267c0c,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d 10,refs/heads/master,5f1ad31005888993ca93522dd2b14f142d2004e3,38590df24c6b4e9bba214261e6d312d6264d1130,ee7b5147aebd6355418268cd81b675566b81bdb9,,True,True,Tests_passed,dbb198c2438d1b7ff836fe505c4421c9d01a2e0e3d519694a4c92269837f418f,True,58,90,1590,6,True,Tests_passed,64fd0481d44a9d2764d1666101934c6ac10ed13f04a8fb185ef5923d722f5627,True,59,True,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,c504da4fa7bf92ad8dc9c5aebc5ad3bd8d9caf5fb81fb0f3dfc4eba2bdafcced,Merge_failed,dcce9fc1a179abcd2b15bedc24e47e432e7b6f4ef242eef1cd8fa5b0a5331455,Merge_failed,9f90183a80003748c418c1db1045243ff68fe7d4206f200b3b7ee35366d7ce1b,Merge_failed,f914d50ae5428b8155e1e05fe22c69b3d2416a87625bc25799851eb92d176652,Merge_failed,dcce9fc1a179abcd2b15bedc24e47e432e7b6f4ef242eef1cd8fa5b0a5331455,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,597273b412abdc923a30ac42adbb1e276212b7a50fa3ff28e4ca9c2ffed3ba07,Merge_failed,9f90183a80003748c418c1db1045243ff68fe7d4206f200b3b7ee35366d7ce1b,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709 12,refs/remotes/origin/pull/14,4ecc6000170804f1ce07031d285aad8efaeb4256,dab74114914d8747c1acc2ac757c398e30e70791,4d9325b46bbb4b16f28842be0dfb4295df74c118,,True,True,Tests_passed,4b3325529f7cb75ce37396c6a07b876314291bfa96979a02b4581f08e947e441,True,32,62,346,3,True,Tests_passed,7707f55aa892910f7c1d8d68742895cba19f7d77e5c525473d1ce1b8b8d63967,True,32,True,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,aa2d80ad6293ea82d344fefb116fcb9169ed0e874d307f18338e9c8d10e62d89,Tests_failed,38959f604a9b210ee9a13932e9fabb27084b824d26287cf73fde21ab0c82d9b8,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,aa2d80ad6293ea82d344fefb116fcb9169ed0e874d307f18338e9c8d10e62d89,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56 diff --git a/results/combined/merges_tested/elunez/eladmin.csv b/results/combined/merges_tested/elunez/eladmin.csv index 048f3e9dfe..4505dac30a 100644 --- a/results/combined/merges_tested/elunez/eladmin.csv +++ b/results/combined/merges_tested/elunez/eladmin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,True,45,139,771.0,4,True,45,Tests_passed,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,True,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,True,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,fd1ca2df337a47240b9a5bc601b47b31d53946c97a2c304993c435a546b4df85,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,e1c74d2275975a3570bc6be7d75f10f1c313da6898928b1fa9774fc860843448,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c 17,refs/heads/master,8b7a1ab6277b4228c8561b0033e9fc9122a100f6,8def7ea9a016c137cbd8344542fe4e827ef364ea,fe77f081c580912c28bc146a3a941d2bd37c414d,,True,True,True,2,2,7.0,5,True,5,Tests_passed,4ba8286b9b9836474e4bbd0ace6d49b282b0d1b3bd6e3013fc587484b0c83d2b,True,Tests_passed,baf38292059b312d12893fc080e9ee054a4d3452d295e3df2e822a2c6003e0b3,True,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,317ed9d62ee7ecbc10cddcaf39ae9ca5efccad7e5574c6633192716cbbc1988a,Tests_passed,4ba8286b9b9836474e4bbd0ace6d49b282b0d1b3bd6e3013fc587484b0c83d2b,Tests_passed,6fada5fb8cd1456a721c62227931a9a0457f5d0127d89a6f688c1ee2b1f70939,Merge_failed,fa1c8879840406d3d9dd95101270fd3c43727321654843a9714ba8830a4b12c0,Tests_passed,4ba8286b9b9836474e4bbd0ace6d49b282b0d1b3bd6e3013fc587484b0c83d2b,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,900e3649c5037cc8e66abdbec7cde3dda0ead5eff29220cd58c28cfad7cbb9af,Tests_passed,6fada5fb8cd1456a721c62227931a9a0457f5d0127d89a6f688c1ee2b1f70939,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4 52,refs/remotes/origin/deploy,e67300e919771858e4e0d7240b55a6257f261f2a,d98c1a1db6e9d62e48ff77aae855ecad268cc811,484785c22201802bb0a37ae5f872325903c4acb6,,True,True,True,21,58,281.0,4,True,21,Tests_passed,e4962a80a03aa228d759effd7ecc578712da497ba00be6549a2a1440fba059e1,True,Tests_passed,f7cc4c9932d480e5f7146d8ec8d4dc60d427fa880850b08aac3882e65944519c,True,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,fa7510e993f70a299f15db718a8fb9460bdb7b9ce580d92d9de57079fd727cca,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,5b52d0475a874af5253e55c0123cfc7360891b6107e4f0f8584ea551fdd62066,Merge_failed,b3e6cae9466ab20601c6d332052732a8e7336236b696d987345ce19cab9c8f36,Merge_failed,3ceabcd1d4cff924b6f70c65a69929c833d65a8982cd42172da3e0611d4dda01,Merge_failed,9f91cb490f5d3ad8675930fa894c1e0d5f79a8c0e6035e4cfea594d2d26dff88,Merge_failed,b3e6cae9466ab20601c6d332052732a8e7336236b696d987345ce19cab9c8f36,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,8fd70350b2c6835a953d9eb9f320388926ec11ee61ecd67961cf4b8497a7e017,Merge_failed,6584261e29c72822b7c1e328638ab2f4d0aa856ef70483a8787ef50e43d049d4,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,fa7510e993f70a299f15db718a8fb9460bdb7b9ce580d92d9de57079fd727cca,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9 diff --git a/results/combined/merges_tested/emicklei/rendersnake.csv b/results/combined/merges_tested/emicklei/rendersnake.csv index 10e6f5ec83..2657578cb0 100644 --- a/results/combined/merges_tested/emicklei/rendersnake.csv +++ b/results/combined/merges_tested/emicklei/rendersnake.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9541c886359597f23b41f86c5f5ca95dc4d59a51,eddec186e79131f4569769a86a0f9d9aaf2344b9,d238d52e4129a95a4a3f9314c4eab95f008955de,,True,True,True,311,656,49552,2,True,311,Tests_passed,378531769f40766716ac1acb132c5927c194fbc2ec68458723cc569a9486a04c,True,Tests_passed,f3a7559545782aedd0cd3fa04210190213db3796a482964b15128c1a8c0b2fd6,True,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3 diff --git a/results/combined/merges_tested/engine-alpha/engine-alpha.csv b/results/combined/merges_tested/engine-alpha/engine-alpha.csv index ca5cbc42c5..217d151c64 100644 --- a/results/combined/merges_tested/engine-alpha/engine-alpha.csv +++ b/results/combined/merges_tested/engine-alpha/engine-alpha.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/remotes/origin/pull/45,7d935a6d1499926397b0398ced92dafd1a327b9a,6934f3ffe87a4be23eac32bcfb2af067b9d6126e,b7b724e78cd51dfd08e67bcc7062c1a1d4f43d04,,True,True,True,10,43,161.0,2,True,10,Tests_passed,23d0d5a49d372d5023e420f3f6d5ae933e322fc456661d3186399d070a8ed048,True,Tests_passed,8766dba53940ed639f72a60a7513406198fb3d0522fef7c112fc835b8c726035,True,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,906989f77937d02f9aabeb338d343e10c5f0830dc4d996ecb3c917c2e75616de,Merge_failed,4ff4003f6b24a730689148ed8951ac488d94133cf06404073c126797ffc42b3e,Tests_passed,ad783c1d5b77b4209f2894f33974112fcdb7c1f9a881d2cd0a6476731f2c91a5,Tests_passed,722a258096f3e81cbdae663767e860c6c882470d841315a5604b292880a9ac8e,Merge_failed,4ff4003f6b24a730689148ed8951ac488d94133cf06404073c126797ffc42b3e,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,9ca9334ca158db589a30bd886bb1af4df97d748a80120836133041acef7e5669,Tests_passed,ad783c1d5b77b4209f2894f33974112fcdb7c1f9a881d2cd0a6476731f2c91a5,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a 54,refs/remotes/origin/pull/46,ac8d5c637116ce3b88e46a1b0c30fb182d93e49b,a5fcdfef0794ea44d7094526279857f614784f3f,a959ad427a8b29c48f2d7b68e5fe32240a3b4413,,True,True,True,8,28,106.0,2,True,8,Tests_passed,00f2f2edaffc4af622c215fdf7bc3b8851d9be1bf38acda316222d9e3a90f5fa,True,Tests_passed,c960383e7a57030afff2d0ac1b8999f083a7187b4c80c274554600335a29ae62,True,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0 diff --git a/results/combined/merges_tested/englishtown/vertx-elasticsearch-service.csv b/results/combined/merges_tested/englishtown/vertx-elasticsearch-service.csv index 4c2be9f5bb..459986ba61 100644 --- a/results/combined/merges_tested/englishtown/vertx-elasticsearch-service.csv +++ b/results/combined/merges_tested/englishtown/vertx-elasticsearch-service.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/develop,cf3917c8b163b40e711a9e4fb2b603afa1ce895a,0dc42f08ac8011449cdd6e459ff13920b4e05d2c,7f0e9a4245b30624120e0bb30a0bcd7955815616,,True,True,True,15,51,145,2,True,15,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,True,Tests_passed,9c8dadc43d2ac91389065e3ca9bf523e3935bc4e238de7b9a72b4b2e4e2c5704,True,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,7f1d9c1cdd07ccf57b288ed3ec8cd581dd42d928699b1118ba40523ebfe749cb,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,7f1d9c1cdd07ccf57b288ed3ec8cd581dd42d928699b1118ba40523ebfe749cb,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9 27,refs/heads/develop,93c7adc9b131682ead437c867f95a1fc354d3333,eccecd447573468cb83867a7c5406809de2693e5,24a5c26a6f40b32f5cf20211fb1d455e3b4653b1,,True,True,True,5,28,211,4,True,5,Tests_passed,a21eefb561e742d03b247b4615acf710d1682f58e717a30ea4582867de439653,True,Tests_passed,cb8916d8d080e09d6f8fd4a30789361c4b45076cb8d80f957ce88dd1c01ba711,True,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,e8d66bd8a9eef3f2c94342ea32d3657220b6bbe15dcc7c8dc55f362fa17a480d,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,2ec50b1c116d3ad08c3af6052f20d758f29cb6b2d36fc8daecbafdbfb6e13d64,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,dd1a5767a9152e7af2d46bed5522bd45113c0ef04ba0051395fa332d85e59eb6,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce 36,refs/remotes/origin/pull/15,3745c464a47721706f5d344d3cda60fbb5e5f233,1cb4a4fe6792040eb508cab9da700e55eff81963,cf3917c8b163b40e711a9e4fb2b603afa1ce895a,,True,True,True,18,53,345,3,True,18,Tests_passed,0fd99f7b1e2c688735b909b7a9690b61f7a7a7bba576e3252c70e9c344bf4f2d,True,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,True,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,f51f45d220723cdf9819b511d59e0be29a7206baa146067c27c8c749b2ef400e,Tests_failed,063579c6bfe25a7e3625dae9c3d954947a2af0a5ccbaaf1dee97458dded25451,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,f51f45d220723cdf9819b511d59e0be29a7206baa146067c27c8c749b2ef400e,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b diff --git a/results/combined/merges_tested/entertailion/fling.csv b/results/combined/merges_tested/entertailion/fling.csv index a19cee5989..d1381c20ab 100644 --- a/results/combined/merges_tested/entertailion/fling.csv +++ b/results/combined/merges_tested/entertailion/fling.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e008cc1cee6c339a24627ec7e00cc5be46f916ee,3704388c693a2a7cd10d61bb994c0874d003afcb,a4124a4ad635d102c78fcfce196713a40477586f,,True,True,True,5,73,394,3,True,5,Tests_passed,45da5b4c590a5bd7fee5cccca2d4dc1cef38870097cc473e0a841e0e45f1296f,True,Tests_passed,4ead57055be8e8c276029bd3541c33bcedb26fe32588dacbc5b49fffe1dc0ce1,True,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,1bd2fee6fb6cb8d155d14f04533f07ed4683a901d03820192e94a515414a7758,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,a00c977d01185d13230d2a2c8af05ad54cdb4065ffed5ce71dbd87cfc9b47497,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,0cc22e74004c23361c833fe5ff3d7f8b118d2f143f211b7db41ea6033f88443c,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8 diff --git a/results/combined/merges_tested/erudika/para.csv b/results/combined/merges_tested/erudika/para.csv index cacb0a50f9..69a63e0de4 100644 --- a/results/combined/merges_tested/erudika/para.csv +++ b/results/combined/merges_tested/erudika/para.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,f23fd5855ed00257a78a115e484beec4b32bc3b5,5f848ab478afd2ee38622ecea00733f5dd70a1c8,ebb0518a083d5b7b53e8d1d86002c44f51a77fa2,,True,True,True,15,136,1141,2,True,15,Tests_passed,1a73eadb2df66b4bc004f3e0ba73027b5e977352eaaf7ec9fc5176838fb7d10b,True,Tests_passed,f90e628f0b86e045d6cdac71f155eeb351945fb2e67fa57e395e0c32daccb019,True,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_failed,89fdeecff3d137e710d0b60f6d6fdc50e7ba71ed6a8217d5df05b12ebdca53ff,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104 21,refs/heads/master,a9e67cc8b39eb9b5112786e5ecb1422afc8fd4d8,55e20414dd9dc7697b18f8632dda5f49995cf6e4,f8e479e040f5e6e8c72300dc3bc30a476bddded4,,True,True,True,11,110,837,2,True,11,Tests_passed,2cf8e2554ab3d38c4b4c7f22c4d522daa1e3ccb2eed74874e40cbb9fcfd1c175,True,Tests_passed,4f8765ca97baea489eb4d4543362d1896df82d39c9662d81ca317b86ce013758,True,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,025d5c9f1d915ad716ac0dd3b400828a5abbe11669ce04ff9bbc8691e3322f48,Tests_failed,ae66c8fff2bc6218ba01fd27a7f8749b352bf06288cd8374f41429b19ff8bf58,Tests_failed,e29019740c628d9cf7e20c43de946fa6a02a7b6855355ecd281e1f588251353e,Tests_failed,b422502e4856d9f471b3503f0c367d459f4afdd4a33a1827fcb1b5d3b0f2e21b,Tests_failed,ae66c8fff2bc6218ba01fd27a7f8749b352bf06288cd8374f41429b19ff8bf58,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,bf459772f1734e8cae9ba38c251203dcf562e55775563dfdfc4ab910a45d0628,Tests_failed,e29019740c628d9cf7e20c43de946fa6a02a7b6855355ecd281e1f588251353e,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711 24,refs/heads/master,64c16f69950b8cd73e8b27612633a2888d1c375f,e4e5d80f8330c1fe24469ae9b7081d2e8b8ca9ae,caef0cb424e9628c3467ba3e228c9d3f34ea3316,,True,True,True,11,32,1540,2,True,11,Tests_passed,9dba176ccde8ef931eff6f15bad977b84b950226e6de268fde9756a85d8073a4,True,Tests_passed,091e1056478d505196d3f28c8a557eacf4be6ed112d69b8dc4857c8190495fef,True,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_failed,ba8deff1287959cb3732591bfe7634b8834281ef63c1abb33b1ac3b797b51fd7,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_failed,ba8deff1287959cb3732591bfe7634b8834281ef63c1abb33b1ac3b797b51fd7,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d diff --git a/results/combined/merges_tested/esapi/esapi-java-legacy.csv b/results/combined/merges_tested/esapi/esapi-java-legacy.csv index 25c4d612bc..ee6520f341 100644 --- a/results/combined/merges_tested/esapi/esapi-java-legacy.csv +++ b/results/combined/merges_tested/esapi/esapi-java-legacy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/develop,0b0da0ce6155e38a0e4fc469b6911107e399b60c,77c5f26cbbf28c6c963cbabd4b1163ebaeed3a70,6452cc9eb369a4b8068a1327632606a1343749d2,,True,True,True,19,106,607,6,True,19,Tests_passed,948738cf294ffc4276624b0a05a6d1e5fffc3b987c58b9b63fa5d829690d70f5,True,Tests_passed,83f61fce67d88c5b88d57799fdb0fd310e491f5e87792e568c956d0f376e8c8c,True,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,807b5a9b20265f3e7134aa64bce423b1f473da9c52bb350c65bdaa246c80f873,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df649ecf3a556fc3b5ca759601209cb429b37dcd0f43074c232591470b19f0ab,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133 33,refs/heads/develop,09a027f874dd8d9b98378cbedbbc18976c4d632d,d1a9e34e06778e9e509bd171d6ba54dd616ed087,0f9ab8a0431032431e88fce454e735833f1ae698,,True,True,True,21,92,474,3,True,21,Tests_passed,03ea28123b2796b943d98210f0486c2241aeda31ef613b66918298368313c70b,True,Tests_passed,7a49d721ad15f5437d8b94a104b9bbe60bc539b90c33fb34d13a3dc404edc0e1,True,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,982c687e171899ff7d311ebe28816d405e17f7f2062a51f3989c8b4ab1d55def,Merge_failed,ba69d9086b9bf5dcc5c681392bcafec1cc68111ef2c5a6cca199709c8f5b33a4,Merge_failed,e514099ab1cf9e4c5b27da1406ca20bfcb508c4fd33c26e891fd88e709a3bcd3,Merge_failed,e514099ab1cf9e4c5b27da1406ca20bfcb508c4fd33c26e891fd88e709a3bcd3,Merge_failed,ba69d9086b9bf5dcc5c681392bcafec1cc68111ef2c5a6cca199709c8f5b33a4,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,bd2b1c1b32db494e1d412a7f889cc131e53ef604386e136f84acd5539e10d96c,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5 143,refs/remotes/origin/pull/714,12a5696c9cff9dd655b5d89e1635417dd6985f09,21a16f350749034c369ecb7a763b0a5c3d9c88b3,232c27d61eb1ae4807868af990383947ce4bcd56,,True,True,True,312,2699,57620,10,True,312,Tests_passed,9f72b26031742f18ab503c4f7570960b1e8a1a2ecbc1adf9ca1b9ac77e91de63,True,Tests_passed,9fb60b9d56a8994b3d045a0996a1ff1e57d2ec73f37b71e94a7c02138e1d6b0b,True,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,470fe3d3bb7bd0a32d5e16e00b8f3fa129a67f8a012192492e390dc98fbde91d,Merge_failed,723dac407becd0d02f0c2879126752ffd1a3045bdcc57c50ffda05ff0cc274d9,Merge_failed,a2367b34fc105533c94d24cd41d9e0a7efe8d24253264a65ae76ae799b01aeba,Merge_failed,a2367b34fc105533c94d24cd41d9e0a7efe8d24253264a65ae76ae799b01aeba,Merge_failed,723dac407becd0d02f0c2879126752ffd1a3045bdcc57c50ffda05ff0cc274d9,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,53b1a97405e11440dfccff1e7fff88337f3e09d2a51ad8c403d61fe5ed830921,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43 diff --git a/results/combined/merges_tested/eskatos/asadmin.csv b/results/combined/merges_tested/eskatos/asadmin.csv index d8b1365b73..21692a96ef 100644 --- a/results/combined/merges_tested/eskatos/asadmin.csv +++ b/results/combined/merges_tested/eskatos/asadmin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,6fb154963dfd021025038412792ef1dcc5399017,9c8a4553a27a6f727e039fbddd1cf9d32c173368,0383186b3106763ba62c548ef170fc26149839c4,,True,True,Tests_passed,1ac65393efa5367508a3c7738d8dd00f346a52724489864da6d80e2893f9b065,True,34,73,669,4,True,Tests_passed,14faa9c7f724b81054087c29a30b315459988d6c6c44d10079bd3a1c0d1dce4d,True,34,True,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,0d392409d46e8102560a03f2319a08e58a8eded186b836a18ba5553539888a6e,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_timedout,,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,1992e2bc12fb16b96b495a11fa86d0d094a9b781f2ff2f897cd6f0378681459c,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52 diff --git a/results/combined/merges_tested/esotericsoftware/kryo.csv b/results/combined/merges_tested/esotericsoftware/kryo.csv index bece0c9ffb..8021ed5639 100644 --- a/results/combined/merges_tested/esotericsoftware/kryo.csv +++ b/results/combined/merges_tested/esotericsoftware/kryo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,True,True,Tests_passed,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,True,18,54,1905,3,True,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,True,18,True,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6 24,refs/heads/master,5d1b90e313d71b31b38feeceda9fa7c682484aeb,469cd2169b0d0b2856400aaf368f09865e4ad9b6,ac885ae0bcedb43ad0f1736a5eb0fdc0dab3ee49,,True,True,Tests_passed,0db04a4b326a77dfc610e13cf2b7f2a7925665666b8670b96d7d3d7b1b55e509,True,122,134,1217,2,True,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,True,122,True,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,268a987d613a0d241bfd6598454b79c23e94a6427661e2244fd6cfbc4970f8d8,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,268a987d613a0d241bfd6598454b79c23e94a6427661e2244fd6cfbc4970f8d8,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea 25,refs/heads/master,ac885ae0bcedb43ad0f1736a5eb0fdc0dab3ee49,ad2459b48e13f49a78b1868fefa7c988fa53ef06,8b3310f8f3ffe3940a7a838e0fad7c0f2717c578,,True,True,Tests_passed,686f558e9d21a324a15a8c2d7bb74f93e4f51304983e2eb33c55dc88df5e649e,True,121,130,1211,2,True,Tests_passed,acc334304c7a8685ee77a59e4f6cef2b6f5eb404df8913c934beffb97eee5aec,True,121,True,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,eb85182323dac4cb89c1d13b378ee8319825b42f95a6b5e9451e70a0f86c53ce,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,eb85182323dac4cb89c1d13b378ee8319825b42f95a6b5e9451e70a0f86c53ce,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a diff --git a/results/combined/merges_tested/evil-co/nbt-lib.csv b/results/combined/merges_tested/evil-co/nbt-lib.csv index 8675f6ef68..1c058f7d4b 100644 --- a/results/combined/merges_tested/evil-co/nbt-lib.csv +++ b/results/combined/merges_tested/evil-co/nbt-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,637ae9e87d7feae16db8dcb39b5d40ada9950583,5114126caf920b3f91194892f3812cc1de4d71a7,06e34c4a95cf30b65feaaf9c3803a9071af42180,,True,True,Tests_passed,a6eccb8f88bbffcd341121c2fa8103534e9e9268e97a1b114ac1119fdc3a9cbd,True,8,11,341,2,True,Tests_passed,da025bd2ac4a52ad189aee1eeedb6c4573cc9f9808490d42f95f2aa37321e16e,True,8,True,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_failed,c71d20d10427343d5e5ebe6cca51e30234b820e6130fe44bbd586b7d26580a31,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc diff --git a/results/combined/merges_tested/evolute-pt/dbtransfer.csv b/results/combined/merges_tested/evolute-pt/dbtransfer.csv index 51b56da936..c3ad759ba9 100644 --- a/results/combined/merges_tested/evolute-pt/dbtransfer.csv +++ b/results/combined/merges_tested/evolute-pt/dbtransfer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/14,4f86b711a6e540041abc183eabc4592e211cfcf8,b1a2e5cb5c94b95c6604d080ac3471fb15305b4a,b660bb89c629f2ece0737128ea94e140ec06fbc0,,True,False,True,4,7,21,2,True,4,Tests_passed,a71352f49d3419dab667d2e40e17c40a532d28f2e06bdd32bb17e824ef6caa3e,True,Tests_passed,184660a7f31b1e22fad3e93100deff29b2ed6a5a730cd29fbdd3eaf9c3875e26,True,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_failed,27200d30760a0b6929e7755315524627147a4e1c0b8eaaa560ce7e774c981cd0,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71 diff --git a/results/combined/merges_tested/facebook/jcommon.csv b/results/combined/merges_tested/facebook/jcommon.csv index 61d1c850f8..6f52fe5ce0 100644 --- a/results/combined/merges_tested/facebook/jcommon.csv +++ b/results/combined/merges_tested/facebook/jcommon.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,a6c08d81e3186d83a020f84b01b134fc48f3822a,11b32f0c28057eedf224655fa2019b0c3fb19536,6ccd11e9354e9c0ea8f9f329e658a69f1af5a610,,True,False,True,2,1,15,56,True,56,Tests_passed,5468675109d3dfa10e88e500bc51a153c17161b39f5b41e9dbd65f2c606d8303,True,Tests_passed,384911a66b6903164e7bfc2476520ea51a4bcf77ac3e2b1cbb65bbbecd4a58a3,True,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,34b0252300999fa6857f47c7d59a966a031b61a8f9fbf03b9fc612aaadc3f9db,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,393c6952d1b8f7123bf8886830538d2d803ffbea86ca376ea51b75715e701853,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,9c50931100d9fa906210b5024fe4619638b5119368458a853b7275de0bdcc889,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc diff --git a/results/combined/merges_tested/farin/jcloisterzone.csv b/results/combined/merges_tested/farin/jcloisterzone.csv index 32ec6939d2..69809f8daf 100644 --- a/results/combined/merges_tested/farin/jcloisterzone.csv +++ b/results/combined/merges_tested/farin/jcloisterzone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4a38e3b9265bc7b704f645b82c81f9465009dc62,47bf0439e3ef6eb0d4c104bfa9eced2294ae515c,f86c2db9ab9a7c5480d1e5911d0e116c63911319,,True,True,True,29,67,592,2,True,29,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,True,Tests_passed,055a8425e5685bb883817ae5da8591e993b411baa04a3634d1dc1036e5fa34fa,True,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_failed,29c966452cbb03da496614c69c5227c8d27912347c829af913b039f0e865e493,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8 2,refs/heads/master,47bf0439e3ef6eb0d4c104bfa9eced2294ae515c,a79e330a70d1a29451cfc48fcbeb618f6a33e594,a20e50f591287886a6d1a962452b3d79ab3bdb6d,,True,True,True,36,79,651,4,True,36,Tests_passed,44cc1c3a7f1de6b3ab261fd6eede3fe012d05ae4fe47e2796290499c0ee55580,True,Tests_passed,044f967d9ade98aa8f6ffdf20b26d778a371a8b5df187af89c4c14475f1f0104,True,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_failed,f9e0d7879a12183abcef867fe0ebfb8dc5a5c8844b6c5707221950dfc36b6b33,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55 156,refs/remotes/origin/pull/419,6535bd1add08898ebe26bc9440e47be238cf8241,90bb6ff516d02ff4770a66fad9eb615e3f45518d,29a156154c75ad7bf5a3af6e2e5db3eaeb1af76a,,True,True,True,14,50,214,2,True,14,Tests_passed,7f8efc01a7d6c14f2c9bdcdc3d6fc4e8829b19179127ed660da680e46f78dfa1,True,Tests_passed,82bf027066a9bf71dd35564e10ca05eeed8a2ac1558dc926bd69196ec845cf95,True,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,4378d4f9eb9267caa63e2273432b0276179de1f04e450a64b14ba240a9599f8a,Merge_failed,8e9f59ba095064b01e1c65e3cee4ef1ca639bcde8918d227cd138984d38e3435,Merge_failed,ad8687387b5bb22e9ffe17c3b98067a4b138d51243a555764a7beb8ecbf24a1e,Merge_failed,ad8687387b5bb22e9ffe17c3b98067a4b138d51243a555764a7beb8ecbf24a1e,Merge_failed,8e9f59ba095064b01e1c65e3cee4ef1ca639bcde8918d227cd138984d38e3435,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,a7e2d4533a00f3bd19ac57d49005d79aed3c65914af12018fa7a76befd140319,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828 diff --git a/results/combined/merges_tested/fasseg/exp4j.csv b/results/combined/merges_tested/fasseg/exp4j.csv index b70f24448c..316ea88f2c 100644 --- a/results/combined/merges_tested/fasseg/exp4j.csv +++ b/results/combined/merges_tested/fasseg/exp4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,499418fcd998f1155c9242ebc2b1baa514f54ec1,e977f199cc1222cd5232582a03a3742324710b9a,6ca71ae2c1f99466f126ab3424ae22ed3dc8f198,,True,True,Tests_passed,0bdb4b325ffaff0988f885c69fb4c6719882026b73862ff035d5d7cf9dd9e8d8,True,17,117,1048,4,True,Tests_passed,095effd58983b8c6ff6c19c666c26d82524aa122a5748640a1d9d9e581340836,True,17,True,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,b01a1d65c6c5ae6a7addf828e85896251cbddf8540d04abe0e6ab02cb3e60f06,Tests_failed,eb9be2c846d7194cfa743ae71ae3758004cc2e030ebdd42f3003615f05c980b5,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,b01a1d65c6c5ae6a7addf828e85896251cbddf8540d04abe0e6ab02cb3e60f06,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198 7,refs/heads/master,15b49d5d40377b24b54bee4a471f08c883e766d2,fbb3fbee150c17f024f199f5d9e2af4fa20703d4,3bada4e6c2bf4d0ebff48bfadd83af396b08696e,,True,True,Tests_passed,f590985f298f0dd963d16428e619bd365719c4c4cd11f5334a4b6be0614a206c,True,5,5,211,2,True,Tests_passed,f523669315bc819e4dc25fe4c1d51d9ada4748303b60a3ab186be5500748adb0,True,5,True,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_failed,6bf5f44a2d424d6ef00961200ea1c12b9dfed6d54aa2cbc5c0bccd6049c38cc6,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c 11,refs/heads/master,cd6db04298f44c4d63cf91a1838ef3258a485243,e75c1e6e4397135bb5ac97e893a736bd3fb069a3,dae7f1f99afef0fea313b0ce1e43f0c3c3766e33,,True,True,Tests_passed,8c67d71414eabf69f4b7a86d69ce9db3b4b4469b1848b2f643b4ed0afb775097,True,4,6,293,2,True,Tests_passed,ddbca3163464bd9e5f132ea9444498ddd5ba8ea63574e050d7630a662383337f,True,4,True,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,e24e7ae75c130fda38fee80c87df81a463939301d09713ba6e69e5ab2806db7b,Tests_passed,90ae3f006ac8efb50f6d79e3eabba135ea6496239f0af09d55003b0084b10a98,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,e24e7ae75c130fda38fee80c87df81a463939301d09713ba6e69e5ab2806db7b,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb diff --git a/results/combined/merges_tested/fasterxml/aalto-xml.csv b/results/combined/merges_tested/fasterxml/aalto-xml.csv index f0d0d9f1e2..03c472fef2 100644 --- a/results/combined/merges_tested/fasterxml/aalto-xml.csv +++ b/results/combined/merges_tested/fasterxml/aalto-xml.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f70a6b8de7f5bbe434fa3bd241c9604158c53697,e4030f9ee15b2e31c519b15bd9edd686b10d50a7,82a326c36d6a1bf4786ea022b52430ade8eed5d9,,True,True,Tests_passed,2603c7889b7b6e3e51f0c13518ba764d41d640891ef2f65db65f36f258ac8b04,True,1438,1573,531315,2,True,Tests_passed,a6126ab6a880662be87d0115e3dc9c2edff7165314ce51a666aed16a3d362382,True,1438,True,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,87f954a3d7c35d54c79244519c332bcb501b09090129f6c32f471148f6aa7240,Tests_failed,adfe7a91e73a14ffa3971a1f2abf160dcd2b77526014ad3e61601fdc5f916c3b,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,87f954a3d7c35d54c79244519c332bcb501b09090129f6c32f471148f6aa7240,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0 10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,True,True,Tests_passed,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,True,58,697,15326,3,True,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,True,58,True,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_failed,5059c1ebe34124da36ed059290398228c9f4121027adda25c8bff0c219ebbb0f,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874 diff --git a/results/combined/merges_tested/fasterxml/jackson-annotations.csv b/results/combined/merges_tested/fasterxml/jackson-annotations.csv index 5d259f9447..0eb6b782aa 100644 --- a/results/combined/merges_tested/fasterxml/jackson-annotations.csv +++ b/results/combined/merges_tested/fasterxml/jackson-annotations.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,Tests_passed,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,True,6,21,194,3,True,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,True,6,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Merge_timedout,,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04 83,refs/remotes/origin/master,ea746ea4efb59e14f6af514696b63ffc2ddface2,2c63ffe80138755675acc5cb0b94a3aa2347c660,b1245811a100097c0db00af73df45dbac387991a,,True,True,Tests_passed,6716d8d98ce62783e39c068d948d58871a2efacb15f953e63282acdb88bbaceb,True,39,218,874,3,True,Tests_passed,bcb5a2a4fb808ec240fbff8596c061f8a722648ab0b22eac567e46248198682a,True,39,True,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,31aae69e3962d074268b0c1e09dc57ea2d762f0399108ef297cc8537871491ca,Merge_failed,8215ff101ff15a7552df991e62067654938fcd018425e3f362f5cdaefc962bf9,Merge_failed,e5628cf531079d321dc1a1f3d714b953a050c63b6c70a0cad4d6b496e874ab04,Merge_failed,e5628cf531079d321dc1a1f3d714b953a050c63b6c70a0cad4d6b496e874ab04,Merge_failed,8215ff101ff15a7552df991e62067654938fcd018425e3f362f5cdaefc962bf9,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,1b93d5dd8962383d4cd1d0675a5c241591efb4fe06b28e93ee84ce21d52d8501,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e 89,refs/remotes/origin/master,79b31c49abd82ad6802f9b3075d700de2af26ab2,c58f2dfabf288b7861740595bbfffd76fe95c7ad,b7ed5e83ebd286dc955f054933af406ac6a07ef4,,True,True,Tests_passed,41796e02e31a7675e086aa000b34f3346782615d4f5444384c168874e3c2eb6b,True,40,220,885,3,True,Tests_passed,d15055024ec6aec818f5d248a202a119e925e208c0d89dcca6f5b69f9290875d,True,40,True,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Merge_timedout,,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b diff --git a/results/combined/merges_tested/fasterxml/jackson-core.csv b/results/combined/merges_tested/fasterxml/jackson-core.csv index 0da9acdb8e..6b9eeae851 100644 --- a/results/combined/merges_tested/fasterxml/jackson-core.csv +++ b/results/combined/merges_tested/fasterxml/jackson-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/2.17,a01cf6961cddf10ad7fa55f7185fdd141381d929,cc991e6678e9360353638b99511b3a6bb1f1ec06,03013f25241303a41c62655f8bbd2397890ac2cf,,True,True,Tests_passed,400e698f3a4e7aa4774eff6f36cfb64e9780f1ac42de328118cd84554341b2f5,True,58,329,1395.0,3,True,Tests_passed,64ad0eb9e73d8bddd9fd4e5f434cb6287335276952f876ae3685a9e78864c625,True,58,True,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_failed,3acec4cc84bf0d63389fe8a1280a2e91a1f21ad44b95f4ffa924521e21f2e9eb,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b 30,refs/heads/2.17,0066b88023debe6dc7243675a968895f3a0b98e6,c67612e1312309b160ff42d092da3af22580a01b,c37bf18c26a51fa241c2ebe074903abb344f4be0,,True,True,Tests_passed,1f2c7d089795c22b7011e58752b0741c6c99f885f8a206e0d70f50f048baaa33,True,300,1726,13941.0,2,True,Tests_passed,3e4855e7f001a54c00ee631048f867c9768a076e4e4f40d6f0ac2eb2ddaa936f,True,300,True,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889 31,refs/heads/2.17,c67612e1312309b160ff42d092da3af22580a01b,9fa856c1a545018ce40a86b918b514c3329edd86,3aa1ef0497a032cb3267e5fe45ffe09891fe012b,,True,True,Tests_passed,9dadc266e12dde16c64e3359890eef52b603f7bcdeb8b37f67ac1efc790acd78,True,300,1727,13956.0,3,True,Tests_passed,46a3b0545c977924ff822224a90b4b4a9ed4ca7cae4f520c7782e321a7f30099,True,300,True,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,8fa918d0a68d60c645bf5f18dbe1e51a78855716bfcdf25e9859ac296bbb3d8a,Merge_failed,90599e88afa52b236c06361d3484a1e5b1fcbbc882281f7831fa3f522220c8a6,Merge_failed,db1cff4de081aa12d424564139b80e2ba8619afef6fda5333db5a6d939f629f2,Merge_timedout,,Merge_failed,90599e88afa52b236c06361d3484a1e5b1fcbbc882281f7831fa3f522220c8a6,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,16d6caa7534373292c21746b427cbdb9f93c8b66ca1f540beff57945d4fdb0a0,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa diff --git a/results/combined/merges_tested/fasterxml/jackson-dataformat-avro.csv b/results/combined/merges_tested/fasterxml/jackson-dataformat-avro.csv index cc643ca114..1d78771663 100644 --- a/results/combined/merges_tested/fasterxml/jackson-dataformat-avro.csv +++ b/results/combined/merges_tested/fasterxml/jackson-dataformat-avro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,8a73a14551e402c3993e2ecd2c690bf54c5e2134,a893c4c717b1e36e2d29ea61c96d8e7a159298bc,5ec8c0022a993aeaa66f992d59f7578225111410,,True,True,True,9,48,251,5,True,10,Tests_passed,9162c70845c55c9e4a78b2f48740e15cda68591c4ba2858dae89b731c87e16f1,True,Tests_passed,a94f18403d255016df80f52abb023e38b18deb3f07fcdee3a3608bc51353ffdb,True,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,f9d6021a68f179b99ab2ba6964576393b7350df48818911d477af5744e3f21d3,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,d44c7fc8b3cd2a645685592547c781a5f6cfa8954134e03b51ac5dd56bbad609,Merge_failed,33ee68a1168f928c7c5ed4cda524cd4a18ee1be7b640b27781c84a1ef5f5ce34,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,31405568cf0fa0931430f9c29fd495fceead39d0d3c1d68ddce8c7f614164f77,Merge_failed,d42eb8dc99b04544c26b423b00a7dabd49d62e0ade9d03570f06510902eaf63a,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4 diff --git a/results/combined/merges_tested/fasterxml/jackson-dataformat-cbor.csv b/results/combined/merges_tested/fasterxml/jackson-dataformat-cbor.csv index 0dcd954a88..ea3d35929a 100644 --- a/results/combined/merges_tested/fasterxml/jackson-dataformat-cbor.csv +++ b/results/combined/merges_tested/fasterxml/jackson-dataformat-cbor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,322be047e0f277689edc5b67a1bac8f95cb872da,814deeab98870e3693b2b6ee6367726c7d597f67,23f798831374aac0e6d88681392012dd27853d4a,,True,True,Tests_passed,6dcd7fa89d907f32c2b3ef0e654c1d2b223d39df35912298310a9566e713c553,True,10,32,272,4,True,Tests_passed,fb11f5108fc8dd6d040be110f58983ed3cfa398cc08a50917d98a08d36ee5af0,True,10,True,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,cfc6b37dd2c0497592e42981831535d3c093150edf824a122d0ef743bf634534,Merge_failed,9fc8991b7b7699e673eddfb5e3c7f7c1cea2989bb9af7a82da827d3752ba674b,Merge_failed,b3be6a879b5d2b969616a3cf4d6da1c454b5e2b292f776279393692a8b5434d7,Merge_failed,182aa1b28e83ab41f1008185d478bb466372570b023ab10826cb6a44af8b9979,Merge_failed,9fc8991b7b7699e673eddfb5e3c7f7c1cea2989bb9af7a82da827d3752ba674b,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,1c876c32696311abd2245a40d3f482368a9925170c9627bc4537c171bd9f3238,Merge_failed,0acb166ddda1ce9dce127efbfbee63e641d8b5a1dc2b4ae4c96e76bed7434da8,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897 6,refs/heads/master,a671acb0bbd66df72cb8acd9885801b47063dd75,c3979dd1f7ac324d66110da1447e9b27bc8b6ad6,0caaef68fc59d26cd32a6f4a2395f54f63630485,,True,True,Tests_passed,870c680dfaa9fdf6988d23aaf3ad22c63aab7cedefc74e2ae081a11c7b3b2519,True,3,5,92,2,True,Tests_passed,3f48bed992736c6a5c121660c706e069a230dcfa7def2eefa1f716b3af13aaab,True,3,True,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_failed,925e9998e376d8d51638c279317d7402f0a228dc3c8cd214729ea0376df950bb,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31 10,refs/heads/master,17a63ada108ac3c16efd1b17885423cda74a60d5,8766a3edb89a284b8dffb0d69f91e5cb4c2bc35c,ee746dc9c799ac051cbb933e439ccbf7c35b719c,,True,True,Tests_passed,e5af86805b625650a06ea94ccd32710734de6b9516b4c00d99a0b1be4c885cc3,True,14,125,818,4,True,Tests_passed,60a0b9b8d71081097fc16cd0977fc132f701e87d09f179580dfac7ab870ce981,True,14,True,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,aba76af40fb476fb70e6adb1d3797409113a8d0d6a7ef9c14750501564df7560,Merge_failed,a0c377f58eb9cfe1faf64750c3d98d860186c8d1af8f1e27511502507aae323f,Merge_failed,8b66b8f437cb7acf4efa5ea1138590d2fdf95635f904ee677907dc335a37dc4f,Merge_failed,0d8ad1fddada84514b2bb0c21d5c3b5b2780bb04b6f094bfbad9946375d6ea61,Merge_failed,a0c377f58eb9cfe1faf64750c3d98d860186c8d1af8f1e27511502507aae323f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,5713ee1b7c8d87fc8b942e54624e56ba14287bba013589083d02ace03a9145b5,Merge_failed,e5da7770ef62dcee05684d7b5cc4c909249d223e9ec1f2d05b3d769d7ab39a77,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f diff --git a/results/combined/merges_tested/fasterxml/jackson-dataformat-xml.csv b/results/combined/merges_tested/fasterxml/jackson-dataformat-xml.csv index 3c8c2b1204..7a89637c44 100644 --- a/results/combined/merges_tested/fasterxml/jackson-dataformat-xml.csv +++ b/results/combined/merges_tested/fasterxml/jackson-dataformat-xml.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 140,refs/heads/2.17,fc385bcdf62f4f3d6cd64470fad796be36bcd449,0d30430d78918a3e01bec62a5192a584cc56ce88,09db8e1ce1d2ecf0ad4ad4b0d8335999f42577be,,True,True,True,17.0,72,409.0,4,True,17,Tests_passed,3119c49e4ec878189770b999aa0bf5f6f53ba26b2dfcb0bce391d3538e69bf40,True,Tests_passed,9588420cd4abc570bec4f2c72bf54597076d6efa6c9c796e25f877ae5fec74ad,True,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4747bc5022457ea9769707ed4704badf2abae9f170fe5f1e1e12aff581a47bbf,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,cbfe6c457830cde5aeedf5e3febb39e789edaf8dbae26f906b9728b3adbec254,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487 141,refs/heads/2.17,e2c043d220496a5f8744b7d0d08fee2c0b740e30,a78aec20fa08d6e79d0b3b651ec50ec1595967ed,79a4b57f2bbe08ce46e6dabb0a8b76f4a787141c,,True,True,True,18.0,73,460.0,3,True,18,Tests_passed,b2159ef4d68e61acc270d912f270934cd1540d433efafa8dd096a72905626ad7,True,Tests_passed,7a4f479e40fafe26dc0a15d6f490fc17e7b456f85c31d0b644bf83fef242e3ed,True,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70 142,refs/heads/2.17,a78aec20fa08d6e79d0b3b651ec50ec1595967ed,98a9ff25a121e0129ac8b068b7b8ac97b8b35495,23ab583c46a6a20b0c1232ebb91b16d4058c7502,,True,True,True,17.0,73,422.0,4,True,17,Tests_passed,3f8552f9184cec21e3e968d0b2fd1706e553baf18220f52f82139c9791e849f1,True,Tests_passed,85f8000b10fcaf46799cb5b0a287c984ee5f20785e6fce74fa985745e6d45ed5,True,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,e5a41042ee40627af98e57178619fea97073588271419cf39849b0f2f27eeec5,Merge_failed,a6d1e9e5463c60d724239d7ca9873e5901cc34595ad4825d7d0e8ad33a0c3f60,Merge_failed,634079426b8726fb7b2f648a44a887c4b643a21fc1cf35377aa94a5fbfbda09d,Merge_failed,634079426b8726fb7b2f648a44a887c4b643a21fc1cf35377aa94a5fbfbda09d,Merge_failed,a6d1e9e5463c60d724239d7ca9873e5901cc34595ad4825d7d0e8ad33a0c3f60,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,e7960e12ce6970f5f9db79552b9a851a3fbdb066457f54302e4603fc741196fe,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796 diff --git a/results/combined/merges_tested/fasterxml/jackson-datatype-guava.csv b/results/combined/merges_tested/fasterxml/jackson-datatype-guava.csv index 28a9b010fe..e36d2c2708 100644 --- a/results/combined/merges_tested/fasterxml/jackson-datatype-guava.csv +++ b/results/combined/merges_tested/fasterxml/jackson-datatype-guava.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,d99575655de8749879e2a231027eca2f15996bf4,3eb649f103eaa43cbb0428acb7bbf275f1207133,4399c5d04f3e301c1a48ddbd8ac54539b322ecf9,,True,True,True,21,108,643,4,True,21,Tests_passed,59893b28cfe4df29206b4679624a3fbfc8b0ddcdbf1c419be09eb1b78753de7d,True,Tests_passed,37f0be32b4edfd3256b3b82b6ee7d07ea1dcdd5056a62c6d9fef948b20e2bb74,True,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,ccc4c71e749ba0129762b534fbf79f0261569de63df8cb04b0d52ba045c19ea9,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,18c002ffca48c98d13402c43414730ef5509c3fc097bae1ca6fc2505d5a63f1b,Merge_failed,66d37469133934af734cb3a85f41f3a0febbc8a8a1d66c8c2602d8943ea65956,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,f371597b2d347c8d75d297f19720fc307866dd07a1bd1fc74e0f1b067556b5ce,Merge_failed,ff7695218b12a224217ab788b7fb0f2263da723390d742647324f9d28c5071e8,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a 30,refs/heads/master,3ee74a3b1dfa156c398cf910fda03bd37cc40b59,73816433ae4fd6a78782ee96ff370a5c98ad4d95,db9d8217cf96b503afe6a768c365cfb3fda0cfad,,True,True,True,15,91,510,5,True,15,Tests_passed,b28086949a90489954a9658a6fccad6998c843913e80aa006c4d28727ab93439,True,Tests_passed,fec56d30cf92e07f54e2ba8619f01ff1ed8d22738ff170ded7e4d503f17e0678,True,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,6cb06f4432a842d43a8a8ae0b8cc3fdf60600e4af9078d18476c4a278dd07087,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8705263facb3b93ebfc73f80613b4ed1d50871cc9f0f6cb6b3def67e58080f0f,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,41fcda8011e2a7c982f5efbe2f210df93961dd49047d8be532da3bb83c1514cc,Merge_failed,0bc8c1c6a98071d626972b77f287c1bc5015561b17851d73ee39c78c1350dc4a,Merge_failed,a07c9337d62db190109ce7150082a5d488591e5d96d1e4c433e00413af90f5b5,Merge_failed,8c2d3095e1ed99095059b3398baef3d61b3f3c00af9ff212ba1be41d4459302d,Merge_failed,b495e7d871e6addb35a3cc2faf7f51dd5e9d61e9f19de53ccbd1d8f761be1bfe,Merge_failed,a07c9337d62db190109ce7150082a5d488591e5d96d1e4c433e00413af90f5b5,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8705263facb3b93ebfc73f80613b4ed1d50871cc9f0f6cb6b3def67e58080f0f,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,41fcda8011e2a7c982f5efbe2f210df93961dd49047d8be532da3bb83c1514cc,Merge_failed,b388df0124d1148c1b856c1149c0303bb07601d15e41d950412a6750cd9ddd74,Merge_failed,66d51e3c986e2ee4c861202a8d64bb48711b3d8ee385bf9fb73e59ff2134f205,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,6cb06f4432a842d43a8a8ae0b8cc3fdf60600e4af9078d18476c4a278dd07087,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264 32,refs/heads/master,b08f5a2dad867c4665d7e5d56926d52545ee32ae,c41fb771807eada9b6418cd2e56832e80062c6b8,d48a4b867d15c4467e81b5d3515be729a502c9e5,,True,True,True,12,69,467,4,True,14,Tests_passed,b0025829a3127e7979b829b73dae64a5eb52d9bbfe7421de6653b0d2d5a8cc57,True,Tests_passed,336df0717e946924212d13b8c6df7c14efddca55d0064077ee66283ddafa43c8,True,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,08471b507f240268f1fad34e141a7bfc9372af37f30c90df748b6c98538d0f44,Merge_failed,4f3bdd1300fba8513639ca48d23ae8d00676f18021610704b04f19dd03329791,Tests_passed,0e39acd8df8b8a77b86b6e613d5783803f49105b5d2e0b8828ba00d5d67eb822,Merge_failed,0caa6e632b938fee45e95895b9dc5145030b19c170ae9f7c6ee9e8f0bc61563a,Merge_failed,4f3bdd1300fba8513639ca48d23ae8d00676f18021610704b04f19dd03329791,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,19ae223a39e3c1fc0ddc671df83480e40f729fb69f4190091860372b5efa0383,Tests_passed,0e39acd8df8b8a77b86b6e613d5783803f49105b5d2e0b8828ba00d5d67eb822,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284 diff --git a/results/combined/merges_tested/fasterxml/jackson-datatype-hibernate.csv b/results/combined/merges_tested/fasterxml/jackson-datatype-hibernate.csv index 70b6b3aaa1..f8ab4f206d 100644 --- a/results/combined/merges_tested/fasterxml/jackson-datatype-hibernate.csv +++ b/results/combined/merges_tested/fasterxml/jackson-datatype-hibernate.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 46,refs/heads/master,c6625bac0b3ce44c9bbbd46015ce6ced07bcce04,256eba41b901a903c11f13f2d880e729ab49ed30,a33127007537099bfcc869a056ad9de500753406,,True,True,True,16,54,741,3,True,16,Tests_passed,78f49b71e3fc770648e2fb701ee021859cd9412b50f40b6c3b76aab41485d0f5,True,Tests_passed,9862e0e45b13e07eb22c0f3eefe23f46c425dd234f98577465b8d90f2e5b4156,True,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_failed,086ddb81a6178d11c338d1d9be78b96f6fbf67c6435668d78300b6d71c1ba2f8,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07 52,refs/heads/master,ec355d58fef047aba272302f7b8ed876a648c8d2,d2652d9386e6e9caddc4dda60c8334ebc17b8473,fc4ab3f3618c09dab8bd008eb50d867ebf565c64,,True,True,True,32,169,1289,9,True,32,Tests_passed,ef21352311ddeda5a68c679e599ee6558780a893cde3d21f70ee157f96323f2b,True,Tests_passed,8f3435e16361464351727dbfb96852c0f304aff3c363d5374463cd43a9a5b776,True,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,9d3ad5531196a295c127a27050e1e7f8d0dc714954d79f233f34a68ec133748e,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,79eb2a3f427305e7cd17f9f7ed5a9d4279e7f7a4c429e7e90caee1d9e628c3fc,Merge_failed,952bff311429b8e31991a9887a4d7d3009af781e4e79d6692a99b8eacf9f7022,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,19c2eaf92802bb3c65f37ef9177468e8490d28928a39c9a5898f845de32a0ce8,Merge_failed,7f1a99949247fb66ff50b71835ba7515a48f7d1802421f1afe5b7939c2c30ba1,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731 55,refs/heads/master,19bf759f45db96683b7e07c370723518318b9a12,139ec0c2747ce3471734cf1d39d808d8095076ff,f4f71542669f8ebc129ee190e860e08d31b07c22,,True,True,True,29,104,668,7,True,29,Tests_passed,072ed923e047d64f99bb6ed5b30c427ea353c896757e92cbdd2f4cbbdd2b56b6,True,Tests_passed,06339768615a31ae57656a750b277d00fbfe06ae5af38a310f5d50c88b4fb9f7,True,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,436cb919753b13fc09e653fd7421b148a76806247a2d6201432d8683d50c1dc2,Merge_failed,501b845d9cb4ffabd5df9615027aaeedcff6c0dc6252f039ae50dd3a35826b5f,Merge_failed,f4066ef6b46716cc8a5fb68c1dc693896a71df65803710e91eab4d5654b0f30d,Merge_failed,230f7d57878866663dab05e8fcd7c1feda79d1a1fe328ec168028aab459b0b19,Merge_failed,501b845d9cb4ffabd5df9615027aaeedcff6c0dc6252f039ae50dd3a35826b5f,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,e1a6a7df3910e5d3d7e425695d5dc58a85d63f5d7905bd00d8f1519db3e177eb,Merge_failed,ef66d064b8914adfa92c22d94231f90ca791c2c04985b0dcb915d8af1b34b22e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e diff --git a/results/combined/merges_tested/fasterxml/jackson-datatype-joda.csv b/results/combined/merges_tested/fasterxml/jackson-datatype-joda.csv index 33f84a404c..c8850f1c06 100644 --- a/results/combined/merges_tested/fasterxml/jackson-datatype-joda.csv +++ b/results/combined/merges_tested/fasterxml/jackson-datatype-joda.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/2.17,1545b5fceda7c70bcdda4cfdbb5200e75b6b93ce,61c7d1f9ca063d644487a3e95007bdecddf27173,96c8a8402b2509bd16813c21d2429de1ea93eb79,,True,True,True,17,50,269,5,True,17,Tests_passed,e147970ff6c5d7db790988b572741ab5abbd37542f4332260307d7b760ff2f57,True,Tests_passed,e1a06fa8fe396be17e7cf5df1df01a857901797b2e16c8cbffb77896230c2b45,True,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,bcf0fcb937881987a33a2b9b20e3966a097b179c3f2518a0d012d54a3fd1b1cb,Merge_failed,d3ccbe764eb6b5a2e946063c5706fa4e336c6ba7b694b43c81442acba091b32b,Merge_failed,6b002af03fe02fc3015e25984d04065fd8293f782490ab4cf6f5bd364b084bdf,Merge_failed,4b90276bc24761c7957b740d3a4ebd0596918d695a566e82e54ac2936f206724,Merge_failed,d3ccbe764eb6b5a2e946063c5706fa4e336c6ba7b694b43c81442acba091b32b,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,59dc054954ad3e0e6524c2df1b6cec98918fa19fbebf346322984e71ec7080f9,Merge_failed,205a77df08adc383b65cdb0f21318b6f2b5feeee5775232bbd94e08338241098,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9 59,refs/heads/2.17,f5cad0fe66ab6090c676f778acb305e8dd6e87ec,db7ba1a4007f49abe9c3675e2ad8c116380cd8af,88439bea90371817c81e9a0f4bb71e14f3366c3d,,True,True,True,18,20,70,3,True,18,Tests_passed,2b230a38089e5be4d7fe9122730070748e0c68c98ef8bedcc27c5dc41863c448,True,Tests_passed,1a8fb7623fb2a22ba8eb2e41bca5b5bc0e978d3a57fecedad02e27f108e5166f,True,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,5d9504509f2e11c35c8e0881e36b97488cf1eeea38948bd188999b9db790b5d6,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,33a66a6a8e65fe95658e32ae85c974e8e5cd7ad939727833470ce436d0f57b23,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,287af51b82e642ad9dcdfdddec7dc8fdbc40fa4314c4078f167ff68826733c0b,Merge_failed,418bc44f9419536545d1c598924055bd6f537374140f100c0b35e89dc2b3d888,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3 66,refs/heads/2.17,4e6c26633974375e34bbc9152a952284ce4fead6,393dae28fba2b05122a26058270855d81c32efe6,75e8ef7f139e323a9af80858ab5eeb47a0871149,,True,True,True,44,241,1344,2,True,44,Tests_passed,7f5e87ff97a8a78f056771e576674d262abdcb443a50d0fadd3e8f07500adfa3,True,Tests_passed,426d6029fad5d20ec2505145e387b3ccff6aa90cfb0b7081155b238914e89a70,True,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,b26a214638c8a2a62eac2b346f86535db6728f0ed2174e7cb9c58570007b5f8a,Tests_failed,8fe2c059a56351c7dba77cf625111987b67583de2894bbcfed8167e2b5cd9a4d,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,b26a214638c8a2a62eac2b346f86535db6728f0ed2174e7cb9c58570007b5f8a,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7 diff --git a/results/combined/merges_tested/fasterxml/jackson-datatype-jsr310.csv b/results/combined/merges_tested/fasterxml/jackson-datatype-jsr310.csv index 2a0b183064..34c0e3ed52 100644 --- a/results/combined/merges_tested/fasterxml/jackson-datatype-jsr310.csv +++ b/results/combined/merges_tested/fasterxml/jackson-datatype-jsr310.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,e9c6de6bfabbc10ed960b8eba3b1804805431f66,3a7976ac9c9a7c5ac0ba508d059e5ebd1933b8ff,79a7250d9bea32183ed2c6c613923c31b7ae0a8d,,True,True,True,75,370,2268,5,True,75,Tests_passed,0befcdd32f4954544456bc64babda797d4acb93daf1ceb7b50245e3168fb92ae,True,Tests_passed,231541ba6d07710e22b074a731cdac87dea49b2d47d8e5a0e728aa9320abd712,True,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,aaddeef16eb52738ff74adf522e4a64a1c8a12012fc54b7702c39ebea044d325,Merge_failed,4dcf9ae8d5733eb26e2623ffafbfca68270c4890422b414e1137c5634571159c,Merge_failed,829a250f973211f6bed8c645856d31c038e6ce87cb6577efc26496111ead5e48,Merge_failed,a53fb9d061f155adde6506f45fccca8314ae93c7cd7cb68ecd12e282252a085c,Merge_failed,4dcf9ae8d5733eb26e2623ffafbfca68270c4890422b414e1137c5634571159c,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,ef4af3007029e38ca9044c3e39965c8f7a35fdbc146c7988f0766afbc53d05ed,Merge_failed,5c1d1c6ecd1ab0c52c550911b591cb2eddc8d7c9f2c2b2d6895d9c74f8d8461c,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10 33,refs/heads/master,dedccf4c3baa8d6d7aed9423504ca1087302483b,af5a5ba93758ff328e2c11f9712f40deff7eb095,bffc44b7f9a039fe2776850e320c8dcfe1ed1fd6,,True,True,True,46,92,2216,2,True,46,Tests_passed,9a1b4bff4524f1a5dccc4aa69745209770e73c621cc13e4196b9a93da7ef5d1a,True,Tests_passed,d866e15d67a3c0c158d2feb92399a64c99ce0897847ec56dc12cd641759f74be,True,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,d93823422600c76dcee87fab803749c20d32e334cd32eba0365000c4ab010c33,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,ad04c66d4229b25a90113729d9a43bf412995de2d0258c47574ac61180e72a5f,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,8934e39154ae9b6cbbaec1041df0d42e9d2d2e9b10bcb2520c40183e9ec7f15f,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a diff --git a/results/combined/merges_tested/fasterxml/jackson-module-afterburner.csv b/results/combined/merges_tested/fasterxml/jackson-module-afterburner.csv index 1021750b72..961fc2ed5c 100644 --- a/results/combined/merges_tested/fasterxml/jackson-module-afterburner.csv +++ b/results/combined/merges_tested/fasterxml/jackson-module-afterburner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,cf754766cc0776745ea9bb9bd7fd5d18d58f67ce,bda2f9b194e7b5e0d1f001e1aaf951504f96f1c9,3f73cf73874dca6b827382c13078890bd0dd86c7,,True,True,True,46,239,1565,2,True,46,Tests_passed,2550d26473506dbecde5f79aff09f9a9d20b1391b6d9b7694137abca35877ea8,True,Tests_passed,cffbc0103e9800c62680ebd96f61171caeda23facbf7f4ad829dd781ad855458,True,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28 diff --git a/results/combined/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv b/results/combined/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv index b9f847b0d5..70970f51ad 100644 --- a/results/combined/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv +++ b/results/combined/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/2.8,e6d155829ae3829ad4ab08939671bc78aed86db3,cf5a4220e89cde4b4a71f7431dc97a918c205654,be331f8e2a40e0aa5bb058e63a05fdddf4f88232,,True,True,True,7,25,187,4,True,7,Tests_passed,e5c740aca7bbabab5e43bc941179d316fd53a50764f491823344323d9bf2a58e,True,Tests_passed,0637219c19337a52f0d08bb3bfd4e0301d3221f981410f2b5840c4821184d610,True,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,477286331842ef19072a9ec478fc8f3f57263ceb43d3094d1093732d2492b31c,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,0f42a9ff32490c5fe6f04f1e18615a34a0a144faf1120666addacc55b293febc,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2 diff --git a/results/combined/merges_tested/fasterxml/jackson-module-mrbean.csv b/results/combined/merges_tested/fasterxml/jackson-module-mrbean.csv index bd034bc326..71b4b629a1 100644 --- a/results/combined/merges_tested/fasterxml/jackson-module-mrbean.csv +++ b/results/combined/merges_tested/fasterxml/jackson-module-mrbean.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,98089dd68e02c743964636260303bbe67895c07c,a6928de6aa37cff1c03804063c8c31a45b7d768d,05bc1fa15947a884a43f54dd5f9b6cb975256bce,,True,True,True,13,30,252,4,True,13,Tests_passed,11376e5aa6419e491a2e950cbbbff1db3d23b61abd964ba7fd8eaf253f4e1c3e,True,Tests_passed,d96a6d92de59fd8c055f60c4bbf7f6ad36b072c7f6e2c3d5c1e9ab7a6ab588ad,True,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,0ef0b4af868cc83680705284e68d61f8018b8a05ad8364163d203f5ad89319f9,Merge_failed,aab2e971cb6f5ad8da8e3c687f0e54ad249d6001e757997582239b3a28cfd18e,Merge_failed,e85da5d8198bae04b1d957c42f0e2911eedd6b7eba121094b5ebfe57ac35b884,Merge_failed,853cc692f27c0179162e1382577418b0884fc21b341f795e9aa1127e95cbf7e5,Merge_failed,aab2e971cb6f5ad8da8e3c687f0e54ad249d6001e757997582239b3a28cfd18e,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,94500c16b05a6e68dda781c2bf03770e779e4172255361e01757bb1ffc2b1fc4,Merge_failed,3cc082575219d482ef2f4df82dba8917ea6d0d0654fe9f9bf0f71bdc53dad385,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032 6,refs/heads/master,9e3869a0b016bf011f31ea195e628ae7e1223a1e,6479b6edc0b5a9633b4b811a4e44a9bb6dc6190d,8bb0db5f44968c24a61fbf7e2306daf15c2a990d,,True,True,True,5,10,97,2,True,5,Tests_passed,f2c40be298c72a6ed9ddc06f0497517212f20caf48b62e233318afac29106c07,True,Tests_passed,05e7a888ae08f5534a401210cd64c10e5776de1dabf7519b74d4f4e8a4b7cc4b,True,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_failed,ac31eb4d908ff4b5bbd1761719d9cf9233f416136a684e34da450ee6aff66be9,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed diff --git a/results/combined/merges_tested/feedzai/pdb.csv b/results/combined/merges_tested/feedzai/pdb.csv index b046321879..5438f5fd44 100644 --- a/results/combined/merges_tested/feedzai/pdb.csv +++ b/results/combined/merges_tested/feedzai/pdb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,011ba2e9425f5451db1da70cccfba32722de0eac,d626297e911d4770e18d5cd19c8260edbe70d8a5,1f1c20edee25d2785f036d51720a028e3ec3b565,,True,True,True,15,43,360,2,True,15,Tests_passed,86cd9e7ac57139b7ba419f4718d7af7c7246cf17aa51dbf884b11043e7cc7c7c,True,Tests_passed,a34ef601f7600e32a81c7131b2d414fe0cb90b88c0301195d54a6b6478034227,True,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf diff --git a/results/combined/merges_tested/fenixedu/fenixedu-academic.csv b/results/combined/merges_tested/fenixedu/fenixedu-academic.csv index 496ed37a65..90f720ff5e 100644 --- a/results/combined/merges_tested/fenixedu/fenixedu-academic.csv +++ b/results/combined/merges_tested/fenixedu/fenixedu-academic.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,0ebb833b3f09a28a19b06f2f137a2cbbd6080b78,8e69c9359a86a8b672dc97e17b053c94468c2736,ba82fa2ef5b9423d11833443e683b92f581c5438,,True,True,True,5,20,97.0,2,True,5,Tests_passed,6327a726a6c9736e5e15c6f241b94b4f31a6e6f69a85463970ab45980c53f733,True,Tests_passed,afd04356df09ebd82258a1709999e03578a6288e09641bcb92a00f301d6dcb6a,True,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,8ac3798ecede997434565324d5072d90aad3bd0f090502ac3af58bda2bdc00a7,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,Tests_failed,977b2850c1d7b199c558eedee3557318001fdf55e71e1ff1cc5dfe1d36900127,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,2e3009a7c7553804e2f8a50bfa7b0db76e3279fdd4f8d2f005a0aaf82674c89f,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825 52,refs/heads/master,176ccf0de6bc088492471d379bdc8d6c1c558262,2d87cf466828cbdd13d92d330fb5f05bf6456af9,db39d6a21db511d9bd2615232f62e27dde268f29,,True,False,True,4,6,29.0,2,True,4,Tests_passed,81af69d53e2686a8b6b38ffdd271b29330b80b5933955523a5a3386353aa982e,True,Tests_passed,4a1955ad3582af2f6c6ef32946694d67ff2184a2aa2f9c48cb23dcaaf93a427a,True,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Merge_timedout,,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53 130,refs/heads/master,14cc234c622171cb5e799b67f7a2a5754153af6a,e99b5466f2221a2586f6e8de6abe3fb789e57477,78a7750f480fc9d4b3747014d7a1a7f335fd5f06,,True,,True,46,98,,2,True,46,Tests_passed,161211d4df3aa3ab4aad325fc0e6728b787f8a7a5f4ad2fe96d5b850ba521d81,True,Tests_passed,f1e4b3a0aa53cb69dd2f746d27b643587ddce3ff752461ba997581aa638c3652,True,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d diff --git a/results/combined/merges_tested/fernandezpablo85/scribe-java.csv b/results/combined/merges_tested/fernandezpablo85/scribe-java.csv index 5bcdfb0aab..42685f8259 100644 --- a/results/combined/merges_tested/fernandezpablo85/scribe-java.csv +++ b/results/combined/merges_tested/fernandezpablo85/scribe-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e 6,refs/heads/master,3b0c0e14ec2b6bf6f7adcac3ecb46c68caa26356,6007a9e712c4b7219d86a4e945835fdcd875943d,3f1cd63ae5c41dacffced9fc0d73446af9f1ca89,,True,True,True,47,123,2150,2,True,47,Tests_passed,5f4672078016a5b34965b94b52b65e71f09f516b32fa5861d65a5cabb5e81947,True,Tests_passed,63c3b896197a3bf80f4d79f734ae11d7fc1970f0427244abc2230b2e547183c5,True,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6 21,refs/heads/master,665092d619617b44711bf80f0652c19ce0e32a87,82f38333b9fd53291f32f29638ee473c578f9900,523769736fb350efd9c3db9a3a48cfe1785dd5ce,,True,True,True,26,60,581,2,True,26,Tests_passed,9cc82caedb284f53c5d8621c44c5402136ca9f972e18950daa8f49ca35278ee0,True,Tests_passed,a66507f002b88eaef352a5c641fc08d66b4e8d0c00609d4165efb82a620bab34,True,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,2b5666f9a1de6c2e861fadf450e8421922c413adf4000a8fae8bf0e8f02abf8a,Tests_failed,f803e6ee04a752858655771f5c693ab55d9dd6dd26a5267f7286cdf6f6e947a1,Tests_failed,18b89899ddf07b7167af0bf24e38d783900955affd6348814c3d648c2416bf01,Tests_failed,5a391e1c68eb328a6153f307ff34c2dee03ddc2886d4e1e3ad130550912e41f6,Tests_failed,f803e6ee04a752858655771f5c693ab55d9dd6dd26a5267f7286cdf6f6e947a1,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,3f81c23bc7f5fc0f077f5704089d241181f9881b4fc2db093e350a0082f1485f,Tests_failed,18b89899ddf07b7167af0bf24e38d783900955affd6348814c3d648c2416bf01,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed diff --git a/results/combined/merges_tested/feroult/yawp.csv b/results/combined/merges_tested/feroult/yawp.csv index dcd430bbc8..177ae1e62e 100644 --- a/results/combined/merges_tested/feroult/yawp.csv +++ b/results/combined/merges_tested/feroult/yawp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,918dcec5fbd9a540c7c2cb692da4499f2b4944aa,0dc78eb60b4ed1f34da66c301831a15a2c4a5059,26c18a007dc026508e0bd5f45aa4ab35940f3b27,,True,True,Tests_passed,b4507cae6c372722ba00b5478eee022eb582a41e66f8f48aa81dd1172054b23a,True,42,126,655,3,True,Tests_passed,f073c7b9de70d3e10e893181c9cd38c44ef25dd12a534ab4cb519163d3b0de4a,True,42,True,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ed8ee39b5f38a73902442b3f1a007f11928b14602d96fa7596c42b0764ab11a6,Merge_failed,917a180bcdc1ac682fbfdd0cf29d0427ae5bc92699a39c3bd1bd0c3df8d2d861,Merge_failed,6285132ea0e6ee6b8dcb3810af4a271cbad161bc8b15f46d682de76c4f5a9cc2,Merge_failed,f628366e40438740bd4579037f5dc2bf08aab46bc2a5d538dbc8591b9472c339,Merge_failed,917a180bcdc1ac682fbfdd0cf29d0427ae5bc92699a39c3bd1bd0c3df8d2d861,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,e3acb39c96524db7210f91e113db700cc01cfe31d5afb63ffd28c575edd696e7,Merge_failed,6285132ea0e6ee6b8dcb3810af4a271cbad161bc8b15f46d682de76c4f5a9cc2,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c 70,refs/heads/master,98f9faa81b829792ab6746cb581f07f88f5619a5,7364aedcccb1e7d0fb4bb75ca2487a9396423574,aac6d5321cbc12d7efaba2fa7e2c79e21bbc8991,,True,True,Tests_passed,40cbb88e57ec5f59c25db37dc6ead22533dcd2497d256eeb180e40c53f6a0f20,True,85,294,4011,3,True,Tests_passed,93fddb0ac5f7aba49c0ec4326118afdf1bc689a1c35a60dec28fd61c62bcaa10,True,85,True,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,dc9585880402ab115e4b27bb70bbd157cf21e60f5c8a5d466ae6a9edf5630c0a,Tests_failed,7b6ef53ca88e52124492174a9f506f79deb8e9a337b3480ef183447881acd163,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,dc9585880402ab115e4b27bb70bbd157cf21e60f5c8a5d466ae6a9edf5630c0a,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866 71,refs/heads/master,853c2071a2c006ca115b1d5f6c9b5d6d3b042aa5,71726b765557751e8ed35b5a34ee50e1ea6f827f,60a46c4d8cb70b1ea8e5fb7ccd63c969db701fac,,True,True,Tests_passed,6f961d469715d70ac28e7d1f143ab44a984869071af71dd0acf5070c5642e6ab,True,7,16,69,3,True,Tests_passed,75b090639b13f9a961bf63ec0bfad6c5dea318b330bbcec2e38a83eb8856bbab,True,7,True,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,7962f53a3e3c7493e3ef53ffb8e355198f7db3b3d357acb8e405a64bfdf658a8,Tests_failed,5fbda8795117ab989076a3b35243dc39eaedea575e6216a53086ba515e8f95a3,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,7962f53a3e3c7493e3ef53ffb8e355198f7db3b3d357acb8e405a64bfdf658a8,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523 diff --git a/results/combined/merges_tested/feuyeux/jax-rs2-atup.csv b/results/combined/merges_tested/feuyeux/jax-rs2-atup.csv index 9f1d2b6c6e..54c044459a 100644 --- a/results/combined/merges_tested/feuyeux/jax-rs2-atup.csv +++ b/results/combined/merges_tested/feuyeux/jax-rs2-atup.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,b05c8c331560c1ab4be5c43c20912dbaa3d93839,7da8cbd0d675798ef263ae8655827bb2abd93ede,8776ddbbff972b7a828cf087b1e5089640f3d090,,True,True,Tests_passed,db8ca669464eb0ae2b24297266e483b4759e0f39b6dd265f997c2f2af75cadc3,True,61,248,1253,17,True,Tests_passed,1314c746cc3c6e983d8b017760da4d5b83b440e82acc9bbc0a39e59eac7f7286,True,71,True,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,4582f043c8ab0f51f6e8923cbdfaa827add918e4be843c66034bfd689f149742,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,e3a61eef8df016d4aee66cf062bd68aeed4ce799e9ca63f071aa05d8bde9f914,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,93533125dc55460fa046f3f06fe9ba6dde57ce015bfbcb37bafbd056e681aba3,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173 diff --git a/results/combined/merges_tested/fex-team/fis-velocity-tools.csv b/results/combined/merges_tested/fex-team/fis-velocity-tools.csv index c498155b34..635d7d9517 100644 --- a/results/combined/merges_tested/fex-team/fis-velocity-tools.csv +++ b/results/combined/merges_tested/fex-team/fis-velocity-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/remotes/origin/pull/25,203daa57c2464ed7b348cf79a71c4e18ad29610a,f6c512bcca04ce3c4805d6998f81599fd314d848,ad06e07408c1bc9b31f597320399d53c4077b92b,,True,True,True,6,10,67,3,True,6,Tests_passed,f01110f2675603fba17aa7473a5da69047c68d399535a3a3e2d43edc97f83285,True,Tests_passed,0dcaf2e0568bed6e479652e0a3efb4c64f931c8c738b6f2cfb9fff25346895cc,True,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,811cfce7dc9171c2720b046db6239f4388e7ee566f1a49570f480d0f39eb48ea,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,2672c2f254200054cf85be631b353e844c77eaef566ca5a7342c9855a6c513d7,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,dc5abf7b92c66c3e8295c2c4674c8b98b88ba517b400db035bf890207b327fbd,Merge_failed,3b76eba51de804fa8ab5c74720a5d3f0ef966512647613075882815fa70f0713,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5 diff --git a/results/combined/merges_tested/ffay/lanproxy.csv b/results/combined/merges_tested/ffay/lanproxy.csv index 009a6077d0..d15cea433c 100644 --- a/results/combined/merges_tested/ffay/lanproxy.csv +++ b/results/combined/merges_tested/ffay/lanproxy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b398ec123de9c959a731c6d19ba4b4bf8d39a9ea,d247ab06fb9f448c690de5fc7e91ba22cd82c19f,ca4d4c4753fcba9783abb3395800abc39afcd019,,True,False,Tests_passed,fec37a13727460eb7fbaf3636292bd86d77d9d491a758b22480a5bce97041e72,True,5,6,145.0,16,True,Tests_passed,e1e759aab60d5b19d141a79e4f2153a8d41ddc40d68ff6a6c2cb8ca1d795e052,True,17,True,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,ad04d3693f1ced2134013679bb5eff9ac388894e3203abe75f23cf8341a63927,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,4f7c6c58e8cc3550cfebce63a4807dcab0d7695a51f86bdbec8525167bca8e93,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,7c0158787f0801d223f62df7920a930845d64ee77869fd9e9279543ba2feb3ca,Merge_failed,c257f879688f452a19ef4db2cd236127b8dea8e54f1acc9b3d54de1b3e8a8bcf,Merge_failed,29ed96728ce88cd648a9b4a25cf509cc7f5c401bf04a2ac55a3362a42a8a433e,Merge_failed,ab34fec52113aa49429acafdeb4cc3f448ba7d6502de221ae9db6dedd3e3be82,Merge_failed,c257f879688f452a19ef4db2cd236127b8dea8e54f1acc9b3d54de1b3e8a8bcf,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,4f7c6c58e8cc3550cfebce63a4807dcab0d7695a51f86bdbec8525167bca8e93,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,89cd2ddee6b3b02cc1fc4eee33b49c2ddd71bdc14a846ac452a289febb29bc0a,Merge_failed,0109a135aab2259ca10bfe6a512bee17ffcc3c97978fcc75e83f4b697be71ae5,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,ad04d3693f1ced2134013679bb5eff9ac388894e3203abe75f23cf8341a63927,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7 4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,True,True,Tests_passed,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,True,4,7,22.0,2,True,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,True,4,True,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a4ffd56c32fd83e35aab0adf73bb0055ded766f6ee4fe16fa000a4983ceebc6d,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,50c832a6472b6834724947aa37d92a47c356e84f438b5e9db569de5784fd45b6,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c diff --git a/results/combined/merges_tested/fiji/trackmate.csv b/results/combined/merges_tested/fiji/trackmate.csv index c46320ad21..d18f9ab5dc 100644 --- a/results/combined/merges_tested/fiji/trackmate.csv +++ b/results/combined/merges_tested/fiji/trackmate.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,1792dcc505c244bf846950c12a8f802d79ba418f,e13e6198437f3aec3d70270485a0c27e6b4b12f2,6ddda4bfb299499875c437baa0b89a18e81de96a,,True,True,Tests_passed,d211b82c8abb67f0967efcb8472b0c302f63c7ae67e95197439cb6bfc97c5cea,True,29,103,1522.0,2,True,Tests_passed,340b6313632310b6ebdc02fdfcac50867af1fda576e1f7fcac443e7860d70af0,True,29,True,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,bb0837060560895afd55f808cead5f746ce5b8b3f26de960fbd39a110612fcd9,Tests_failed,8b0c7b277d2d5c595237bc758cba5e276d22e9c03bf2d45695d48d7426385be0,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,bb0837060560895afd55f808cead5f746ce5b8b3f26de960fbd39a110612fcd9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9 48,refs/heads/master,31e749c77fd17fb77bb36433506765f44784035d,f5291051efe7a525211ef3072fd924485a2e2793,2733e4e2236984e2eb9e14aff6a79fb858282958,,True,True,Tests_passed,cfec539e9b563f5ae03a4a5cbfc8ccd594257b58bab47e069240447a7eeba03d,True,34,80,1085.0,37,True,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,True,64,True,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,0b8af7826d26a19a6ab8cac21897eef18265b6f4cbd10aa2d4f6393eb4800052,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,10ad5fba9849379dfd4c2a2fa3dec2260c7167820388775b11bc87f61eb8c37e,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,eae7dce39debd7aabb677864cf7fed590e29e590a691654975739b6d1faf54a5,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54 50,refs/heads/master,2beaa31e3425255f0ca66f2c9d979617c650a723,e9fd83ec1cee916c0233327a36de928f90aaec7a,8bf380780e7eccce6e2c16ca7d4fb574dae7e168,,True,True,Tests_passed,4e680ca253195254752355cb666ac01b1cbdfcc2aa5eb5b553421cf7c8dcd03c,True,42,504,2238.0,3,True,Tests_passed,a583e0967625b14206f1bb953b9d0041ea91dc8d97e7c0349ced1a8ed49b6cc7,True,42,True,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,c65b7c6f3ca593981fb4fe2fa048393d26d6df8ffea35a2163360ddcd2688496,Tests_failed,b9a96b66f72417a470a9ebbdc1f8cb193d3881d8b57cc864e8922aacd3b6bc7e,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,c65b7c6f3ca593981fb4fe2fa048393d26d6df8ffea35a2163360ddcd2688496,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22 diff --git a/results/combined/merges_tested/fiji/trainable_segmentation.csv b/results/combined/merges_tested/fiji/trainable_segmentation.csv index 7afc330bec..5019597cf8 100644 --- a/results/combined/merges_tested/fiji/trainable_segmentation.csv +++ b/results/combined/merges_tested/fiji/trainable_segmentation.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ea4db9f554493e5fc9cdaffa8a2bbdcb18aa9cbe,be1c5a8c175ead77e194dab6a24779ecd64e90ed,5264eb25effaad7d1bbac8047286684326f31012,,True,False,True,5,7,18.0,2,True,5,Tests_passed,f252b4adf27afaf2e4c8a119af0e9bc1dc50cfb77b53fa4207be5572dd745421,True,Tests_passed,9ff69e96818c4ce8e3c04a97f04c32b5a63e1d7c821be80ea1342c7aaae1f391,True,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,73b1d68af93044932cc4083dc5e495872493bfd758a863bc7356a639417b016f,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,73b1d68af93044932cc4083dc5e495872493bfd758a863bc7356a639417b016f,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3 3,refs/heads/master,5d0af9b16565e370fe5f8f53577f8c9cdea8304d,0bc26fa993ddb0b234a47ab147f74d3c55e25889,c7fccb4aa5101ab3c68532df85888a87659266d1,,True,True,True,4,7,10.0,2,True,4,Tests_passed,6f77a735a2ecfbfcf601669602412bc9de61c7cf7ffb15859f79e8bb22a8e49e,True,Tests_passed,e2f2e7d0e792a06528581939dba6d38179af6f26f02fdf606160f94da9f124bb,True,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_failed,2cb63ce01d49707a07f2f4c2dfb07add135ab61640eb12fb9283ba36c99b0d7f,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750 diff --git a/results/combined/merges_tested/fincatto/nfe.csv b/results/combined/merges_tested/fincatto/nfe.csv index 3dcb9084c0..c9835922a6 100644 --- a/results/combined/merges_tested/fincatto/nfe.csv +++ b/results/combined/merges_tested/fincatto/nfe.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 67,refs/heads/master,a4be269d5dc77dafeedaa7986ce331f1dac5bfae,91de0e91f16bc8ceb36eef115e342774e4e44f51,ae6fef661e7b04999477b190b5bfddf3426d6e90,,True,True,True,437,2293,7936,2,True,437,Tests_passed,3ca6ae5a0b04b7a5c9748d94372e1ff76ef8e4cbc03009e0b039d0fba61ff913,True,Tests_passed,33a2d20dcaca871905024ca83f0cbdcd7d9cb6bdd682603a43ac5e91a0b70913,True,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,52e229022366dbaf092cf46a32ca7ffae182259467fc4a409e9882548892203e,Merge_failed,378559cf01166f5b7610a4e385bee3168aab40935d3dc1057ff44b43db9672b9,Merge_failed,5a5d5f850614930bd987a81805df70d72c012c18f160f20c6767cb95fdaf0175,Merge_failed,fbc00d5c7bf75b25385189ae593df60d573bd1f6a35a074649ebc4d5aeec9d7a,Merge_failed,378559cf01166f5b7610a4e385bee3168aab40935d3dc1057ff44b43db9672b9,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,f8e389580c6305ce0658817d9a88e85140ffd255a9a2961287614345ec8a7953,Merge_failed,5a5d5f850614930bd987a81805df70d72c012c18f160f20c6767cb95fdaf0175,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3 71,refs/heads/master,7219068602d38887a94aaa6f8d725f045c7c33e8,e909fdc75bab2eb78544de31668dada9a6a527a5,2cb8efa13415bc59cfcc4e97f0e4c108e655f5f8,,True,True,True,376,1988,6490,2,True,376,Tests_passed,508ae5728a5736d2ce3113b1dddc288ca658dd6e56b16add2195e2f477dea8b1,True,Tests_passed,3ca6ae5a0b04b7a5c9748d94372e1ff76ef8e4cbc03009e0b039d0fba61ff913,True,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,66f0037f8ba08e27ab3f5102fd1e53fdb774838d4a9f5ae709728e6f1ec22ce0,Merge_failed,12222d7d91af20e14144e21287ee1f29f707ec499c042f379e8feba0159c418e,Merge_failed,d22d5fd0ce867c597ea7de4abca15c0a02d8adff8bb1016ee06340337d52988a,Merge_failed,01d4d74a6ce23ba1a8750c13305ea4acbfef054da7d2c2c1d6331879f1dc3651,Merge_failed,12222d7d91af20e14144e21287ee1f29f707ec499c042f379e8feba0159c418e,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,ac0be931062306a9e300d0620bd243e9e7261508f4df71b460d12e4c399f2538,Merge_failed,d22d5fd0ce867c597ea7de4abca15c0a02d8adff8bb1016ee06340337d52988a,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585 117,refs/heads/master,bd66db2a724bf9440ab00d35648dc3877ea6a75e,6cf3332a23a45eb14035f20a5a9731016a7c94db,5e458f91eea0a89f236a8ef2f3b3b2bcaeebb2d0,,True,True,True,110,234,16474,2,True,110,Tests_passed,626d40c732ddbc9283f39caad1000977e663dfea6cb985f3b9a3a997b6a9b35e,True,Tests_passed,94c06119e4bca82454db29ca26bb8d3442ef54c92f761c58b9e6f3c108e7795c,True,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,80b9d8779a218583b22618ec4e0c41530320f97b9d659ddd152a64c511ee93e5,Tests_failed,df5961391bdd2ee9f84f37511d34992a71f04e45c3b5edfd5d8791a2ee5e98d6,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,80b9d8779a218583b22618ec4e0c41530320f97b9d659ddd152a64c511ee93e5,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba diff --git a/results/combined/merges_tested/findwise/hydra.csv b/results/combined/merges_tested/findwise/hydra.csv index 9f48705ca5..a1d2176246 100644 --- a/results/combined/merges_tested/findwise/hydra.csv +++ b/results/combined/merges_tested/findwise/hydra.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,cbbf7a2c0667ae20a79b268cd19c0c0d1ed4f450,cb868c7dc9560c3f38faf1d3d8945636b05fd79b,,True,True,True,46,283,2673.0,3,True,46,Tests_passed,436235402f88fc0cf418aa6f303517f941ba338e8e17115c17179d64242a9238,True,Tests_passed,59be9bd8ba036993f0c98c79370c56d759530d1feef4c5f418ee9d9033766657,True,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,e9b8e1d3e639a4412b2e6ba74a45ece9d31bc4792fa69d46a8bc15e1ec2dcf3d,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,e9b8e1d3e639a4412b2e6ba74a45ece9d31bc4792fa69d46a8bc15e1ec2dcf3d,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9 227,refs/remotes/origin/pull/260,df0e251a4325ded7eb9baef25fb1c5cfd1be3fa5,837f3bd1c230fb42327721f55818b0a9a722afad,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,,True,True,True,37,175,2858.0,4,True,37,Tests_passed,e74cb388ba7be6229d3ed2a38c9eef7430917042d9a099e7ef1df811123715ca,True,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,True,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,a2376caa4a260e03b9f6b94798ea81cbd9a7b18fd4d186f76815435da0745be7,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,d252f4d5259001a032861383675b3cf7b28ce44a8a8535c82da4bb6ff9cdd30e,Merge_failed,c7d91362ed2b6cf33f83b4ea9ec2388f5524845d959d5941be2a3282b017f20c,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,8f47e6e350fd90a28ed371faca38e6c6da7c7ebdd6e03869726b20c06389013e,Merge_failed,10d2dcd821e40f97e3c1534b3b3dd5f327f3d8de1b6fd01eec548889305ac2ec,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f diff --git a/results/combined/merges_tested/finraos/jtaf-xcore.csv b/results/combined/merges_tested/finraos/jtaf-xcore.csv index 868ebc7086..1797f285ba 100644 --- a/results/combined/merges_tested/finraos/jtaf-xcore.csv +++ b/results/combined/merges_tested/finraos/jtaf-xcore.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,9165bd1b60aa447fe40c713040bab897a9b2af1b,b6653fad72ff311b1f98414c4cc547be0e908ea2,e3545e4d595e66e89cdb0fa1003a4580179a8062,,True,True,True,125,584,3062,7,True,125,Tests_passed,01ee66c96d1b5e793eafa82f3c2d4f47a00f98c722dd479a7575e769f5229682,True,Tests_passed,a23c571e24986e8041bcfbf3acbc3087095e1ef9d45f7985558dcd4e0c8dcf92,True,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e14683a7cdd27a98d3ae63d05b0dcd1bef3f04d1e2cd2841cd3fe426ded266fd,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,262a52cbdfeb5afc79716602d956d89bfc526f195e617149ac94c71bb747d85c,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e085e1642123b209de091cba8b1832dbb8c5a3b8a15e296417875431ac1ae549,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2 5,refs/heads/master,9e7c6643c2bf965761e910898998bddf16bd6106,7abc9dafbe88ba1b6dc83a5fd0bba5c93e4f91df,d809ab958c031380500dba1b61769a2ab2e5a9cc,,True,True,True,118,547,2944,4,True,119,Tests_passed,427725a7b34f9f1d2cf912f0d01d85e6bbcce347dfc924f03216c920a4f9b3fc,True,Tests_passed,c4bfff1591bfa1f40d11296c725f4ddc62704302f2f86ef00d3be88fcd1bbefb,True,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,ea2386eb043aac4d2a4a94e31c9a4ac624107c861e535cee298e8a9d2a12273a,Merge_failed,99ec65ceee0b4699542365b4492fc75a202c2ef628cd8d9bff537e6b156a2871,Tests_passed,19a27df6e0d0a3c7c923bc51638587b5478d9b5f03ace3ab36994e3946b012e9,Tests_failed,b296981f0244fe0a8c6ca65d63c2e46f5e23600632b64d2e7f9cbc96303b5f99,Merge_failed,99ec65ceee0b4699542365b4492fc75a202c2ef628cd8d9bff537e6b156a2871,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,b42fc23021085ae0bb216bbd889d231b33448ee8a566388f0f1a0c3414be0e22,Tests_passed,19a27df6e0d0a3c7c923bc51638587b5478d9b5f03ace3ab36994e3946b012e9,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573 7,refs/heads/master,0097c94a20ea815ed971d051e268137dc3bcdd2a,db31b6024fa26af7a08364636374e2c9938fe0d3,6c27aeabea418e13310b69b72c2ec9c22a6aedd2,,True,True,True,119,560,1497,4,True,119,Tests_passed,5bd7195e44ad136edbe5a044a06f1d92d7e7843c7f3c024fd845e7c51c0dc42d,True,Tests_passed,6c1efd375021f20136a2f4da8bb04731153d56d27c3b1211d30a6db01997d411,True,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,40377ce233b0798ae4db38dbaa3f51d3ddd483bd4386ae5203b62ef74b6957fc,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,40377ce233b0798ae4db38dbaa3f51d3ddd483bd4386ae5203b62ef74b6957fc,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea diff --git a/results/combined/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv b/results/combined/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv index d1679eeef8..db51a643cd 100644 --- a/results/combined/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv +++ b/results/combined/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f96e05486c8dd41084214f4b838a87f178be0aaf,5447d306ea80a0456d238bfb9efbf00f751888ec,0a428f6e1666a631634281f20d25247cc5113391,,True,True,True,15,50,393,4,True,19,Tests_passed,fabc06883f3f15ecebc660147510299fb0202b9e403e0f6cfdf7b36ee7bd85a3,True,Tests_passed,be577c7ab7725fb84c2ece1e68b42ad70e3305cdc1a4f05914713a7bb4586935,True,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,723e791ba41f0fbc31c821bbda7ab42e4e56dabd7b9794ea2bd8f32f1925e564,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,723e791ba41f0fbc31c821bbda7ab42e4e56dabd7b9794ea2bd8f32f1925e564,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf 7,refs/heads/master,995c25dc87eca84847991a1217944c665e69a7e8,90602c52df891bdf08c0679cc136d4eb55fc0416,3535f3bd940d81277f5f4f4c0677664370f0ea5c,,True,True,True,12,21,370,2,True,12,Tests_passed,2e0a5ff305606962941f26297bd7e52c44df441b71a370d21cf81559923c5c1e,True,Tests_passed,807337aed3817eebcaa308e4df75bedeb82a9f5c67c2590e56392762b74238dd,True,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_failed,b623cfc2d946b38ad3df6b7080dc3b777699993bca702b7a65e17525c4f09e63,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3 diff --git a/results/combined/merges_tested/flaptor/indextank-java.csv b/results/combined/merges_tested/flaptor/indextank-java.csv index e34e202732..f513c09d89 100644 --- a/results/combined/merges_tested/flaptor/indextank-java.csv +++ b/results/combined/merges_tested/flaptor/indextank-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,d850b46a2e92c56a63af99d7380b11e97c36e3eb,78aa405f383682e8c44a2071f95f0c59651fee89,315857eb3fb000eed355fcac261719f1d46901cc,,True,True,Tests_passed,aee0e6024df8606fec1a4cd9996240adaafac8195f5175e037633d19c2e4557b,True,7,28,128,3,True,Tests_passed,0fddcefa37afb2540571f98ef5380c2dd5f9114995e4b2f63c106542f40c67dd,True,7,True,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_failed,51866e7309dca25e3038479870bd8c1d49555600a779f8640b603ca9b03355d3,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a diff --git a/results/combined/merges_tested/flaxsearch/luwak.csv b/results/combined/merges_tested/flaxsearch/luwak.csv index 0e9d38605e..4ae281796a 100644 --- a/results/combined/merges_tested/flaxsearch/luwak.csv +++ b/results/combined/merges_tested/flaxsearch/luwak.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,a9360739280ff9153d8de5ff4cb89162499c67d6,81a6c412d1cdcbbf6752f3ed2faa0af5690f187c,b4064f200ded716e75b3eea6865456063a1421bd,,True,True,True,18,83,1043.0,2,True,18,Tests_passed,484cf409762fedd7e0921683fba26711e84908a5dabbb352c5061290db7eacaf,True,Tests_passed,0f589386b3ce2ed8d0032408f9840339676edc270028b2a15e662ef2d1f5be4c,True,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,4c7bc9ed250f1088d81ff3d6c15c707d4cf13451b8b29a282e84ad6541ea7f42,Merge_failed,31f1ca8a1b58d9266d870fb68c7c585ec1c244b413a93dc3ce526e0d8d863567,Tests_passed,7f171a8e5f93f7404164beade8f494fc28a24cc87d29fa07e0e8ab78feb2dd12,Merge_failed,06b6081ade9b6295de0087e4d9dd1880f61e4327376ac0c426cf269384939db1,Merge_failed,31f1ca8a1b58d9266d870fb68c7c585ec1c244b413a93dc3ce526e0d8d863567,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,988429e39c4d15b9df2cc98a61ce6393bf3c8d401a961a294950a5af4f60729a,Tests_passed,7f171a8e5f93f7404164beade8f494fc28a24cc87d29fa07e0e8ab78feb2dd12,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae 17,refs/heads/master,3127e7cacfec616e0b6ea7bee472cd3c4b8b829f,d539a1fc858a5648876a4a2acc4d932edd7fa8c8,6722dda66a7cd580c807685aa878112d2125760f,,True,True,True,24,35,874.0,5,True,26,Tests_passed,6db383e9fedb451f78b9f5d55b750156fab3a24247b65f1e8c47db9840142756,True,Tests_passed,d7fd89093d3dc5657abc40afaa5363b4d75852f97cce3a9900dc1b4635852757,True,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,db19623b134d4e675c42ea5e568594465fea5528ca97c388ee6c47e40c6b092e,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,be3277489fd3152dd3a4e6cc2ba8cef2dcb96cd6d252ddd6ce6127b4df39bc8c,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,73c977005152d1b48b7c1c8893bcba77c523d7bb6532049fe6d53f42ee0bd74f,Merge_failed,a6650ecd8b9e4648c69aa666c86fdad0de2d408bde9219902da6868811e809be,Merge_failed,a7651937d6208e8261e2d0328d92cd7331bae7d0a0b3dc8d7f71cb8e537f5f57,Merge_failed,d35a6644a412305c73b5dac763f1584cbe697b7b1a92345e4cca0ab97a646ff6,Merge_failed,a6650ecd8b9e4648c69aa666c86fdad0de2d408bde9219902da6868811e809be,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,be3277489fd3152dd3a4e6cc2ba8cef2dcb96cd6d252ddd6ce6127b4df39bc8c,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,4c7cf6770453f6563cfcc75a30bf225916c275d6c9d1221e46d697a55470f89b,Merge_failed,a7651937d6208e8261e2d0328d92cd7331bae7d0a0b3dc8d7f71cb8e537f5f57,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,db19623b134d4e675c42ea5e568594465fea5528ca97c388ee6c47e40c6b092e,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12 19,refs/heads/master,cad281c6da899e58fb7963f4e1c4bd46f06b27e9,1962beb0736dff5c917362a1f9cae378e3c46254,d375175e2c957bac8151d37997d8ea2a6f98b938,,True,True,True,24,40,878.0,3,True,24,Tests_passed,2b4432ecf9d7ce9f76481f5d36e4c03d406a47a5872a4599ae2311287c7317c6,True,Tests_passed,65c73f75a459f9350aea1536569eb1af8887a0520b8b06292123f6e39a60cb68,True,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,e8d7840775d908b5721a2a0ed9cbd8b2ed100cab4b54acf718f64b243f2ed5ce,Merge_failed,9dd742bc1f8f9f5687a4d04bfb01ff1d2871eb2a307b6d23c993c760833e31e7,Tests_passed,3e53a27ca0f0b6e858557e513af21567997a30f48db942ee41da8ba102e1630e,Tests_failed,0ae7844776dc54af0b8e0c9113f00397fe153eeda137bf929efe8c44be0a6e68,Merge_failed,9dd742bc1f8f9f5687a4d04bfb01ff1d2871eb2a307b6d23c993c760833e31e7,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,752e8cb995f932546bf60e2edc2381b01bdd1872e73207388121c79f11c39d1f,Tests_passed,3e53a27ca0f0b6e858557e513af21567997a30f48db942ee41da8ba102e1630e,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56 diff --git a/results/combined/merges_tested/flipkart-incubator/zjsonpatch.csv b/results/combined/merges_tested/flipkart-incubator/zjsonpatch.csv index f6bbc40d1c..80663f0a51 100644 --- a/results/combined/merges_tested/flipkart-incubator/zjsonpatch.csv +++ b/results/combined/merges_tested/flipkart-incubator/zjsonpatch.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,3a4c27d3b02856e9dbcbf917a764336d78883c73,2fb50aea7397183773b990af9634d166c392013c,9f367408ddade0f2cbb1f562975941da12a66f9f,,True,True,True,9,40,141,2,True,9,Tests_passed,d2807689bd36eca627ebdd7f02ebeee1c698eaf338af8882be4486ab8ecf7afc,True,Tests_passed,f0c803aba2709414567dbb301a52f53280070459dd93d888db95ecf7b55fbac4,True,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749 27,refs/heads/master,822884f65e0b7c5da938e75c1941be8f9a5c41f7,a7c1de97405028ca3fe0078d57b6599a46354604,852ed479032275abf1673ee97e40a1082afb2857,,True,True,True,5,14,96,2,True,5,Tests_passed,7459b25c8c570b4dcd17b7f2381656b46cf97f67622e851449b50fa30cbdc962,True,Tests_passed,c243d55566836a5c9d115253cd733783cc91d5e9eb745d62711d3182e9381807,True,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,b53f12d42d827e1bb56f9133ca7fc6bca676ebbf3529cb93c83241d7f097fb78,Tests_failed,4ab7a0c7ba39bface283335e5c6444265370ae8b0231de72596629b06e987b56,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,b53f12d42d827e1bb56f9133ca7fc6bca676ebbf3529cb93c83241d7f097fb78,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b 50,refs/remotes/origin/pull/73,feb9d9bbcca397901e4d0a3e40706f8f165df1be,8a5931d17aeaf15c5a5cf7334ba777d56a9fef0e,cdda139dbd971f0e0332b12248d6c8825062f225,,True,True,True,44,92,824,3,True,44,Tests_passed,17e2369e28f8291013c8514e2e5b6d860c6b2924e8f44f2c4cfdf0435d54b8b0,True,Tests_passed,6e6c88e3a340b8e5ac13122171283fb23376c7f16732f3ae1e4427b29f58f5d8,True,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,1fb28c561749a12990fe8efefb0da1c0196fa4e36eee6543c8b0380fd1c78c64,Merge_failed,31e8c6d8c4f73481f30b5b598500c380eecfe4fd95483b024b8e97d2d50e11a9,Merge_failed,a9b1f56536cd4747730c73c5012a41e18e5ae28fd212bacf4da7aa1d4c34231e,Merge_failed,fe44e07b78e6f2725f751977338bbd87a7db1dd7cf62df3e71cc497f0f353203,Merge_failed,31e8c6d8c4f73481f30b5b598500c380eecfe4fd95483b024b8e97d2d50e11a9,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,0e5c19f81a3a322e43f3d1dfddd2aeb1d86f9457104cc43f830ae1745ea870c2,Merge_failed,68124386243284904371a0d26884960cae13be34f18d9784aa857bd75ddd36c6,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e diff --git a/results/combined/merges_tested/fluentlenium/fluentlenium.csv b/results/combined/merges_tested/fluentlenium/fluentlenium.csv index c12c897e20..01dc06d142 100644 --- a/results/combined/merges_tested/fluentlenium/fluentlenium.csv +++ b/results/combined/merges_tested/fluentlenium/fluentlenium.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/develop,830bfb6878380410b593f893bc36b29c1831e8c2,5084054c90e52eac508c270dd1d769f13a7a92cd,fb62ab5343eb698c93774da9ab82da32a28b48df,,True,True,True,47,137,317,2,True,47,Tests_passed,12fbc66a1ca2725f6283b44a8ca94b135147826a2fde2fbc129fcaaed0dadc7b,True,Tests_passed,a5f8b8f1dd9b0b537f1cc94a5adaa5326aa2dfadc6a037294f4a459be2915ed6,True,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,39a23f27cbf10fc2ba17ba3ad6343bc730fdac55c7330d4b7928ea28422372b5,Tests_failed,a0ebebb45a9ea59b173a91c31868974211a0a0a0772546ed0402a03fc0b14a61,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,39a23f27cbf10fc2ba17ba3ad6343bc730fdac55c7330d4b7928ea28422372b5,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b 202,refs/heads/develop,6e596eb139bcc79b4575b86d302525a665cc128a,b88d0c2d51b84d28435aa4053df0214adb6ddd03,d93f4094c7593de9893d74795adec0ee2f482a21,,True,True,True,167,814,5278,2,True,167,Tests_passed,de0d4dea042724e8723b1bffe82dc049a283ad2400eb8d91c4d537d5f6275ab7,True,Tests_passed,f2b9df7d68bfb97adca1d4ae5dc4b521826666ca2766a21dc75c0a425fc2a1d4,True,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,3a06540064cc260325e4f5f6c845e7923db92608150cf9ac248402befe37e85b,Merge_timedout,,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,3a06540064cc260325e4f5f6c845e7923db92608150cf9ac248402befe37e85b,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8 212,refs/heads/develop,66d1ddb3128c56fa065ebd928b1831cf2cb21da5,f06fb97fe45e2f108baf78eca6173bc37686c677,16c62e8d0e54dadee5c744aae310af8dcd00ffba,,True,True,True,20,28,4261,185,True,199,Tests_passed,bd766fcf9f99d293e12c41092b12c75766c943cf09c0e1a6dc4f2b151c50ff19,True,Tests_passed,952edbfcf95b9128836c6a74dd9338f01938614bd37e45dd849cca2228ec77e7,True,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_failed,6e1b29a28232d5391059d0c7a583cece9b03f45131c56d62f9f9e5a9dbe4b874,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b diff --git a/results/combined/merges_tested/flyingsaucerproject/flyingsaucer.csv b/results/combined/merges_tested/flyingsaucerproject/flyingsaucer.csv index 20ac435b06..0ae78a77f6 100644 --- a/results/combined/merges_tested/flyingsaucerproject/flyingsaucer.csv +++ b/results/combined/merges_tested/flyingsaucerproject/flyingsaucer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/main,fd481a7b6628dc246a537b748a9aa3c11ce66e13,6e8b9e04f82daf7acc981639ee9017338fe9b88d,1f5882cd4c7ad76898e12bc405aae431842534d1,,True,True,Tests_passed,d01336b8943c79b9b3d24433b32a452bc4ce7aedea19c42494b6550a479d0a5a,True,180,3269,50348.0,3,True,Tests_passed,fab4bf83cfbd7b795bcd8c51de6e367e82852bc756b29a2e6c78d8d34fae5d7e,True,180,True,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,b6b5df9fd00ba487c81dd81880beb34327dc03d55df7f19b60640e9903da43a9,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,e4092c73a3ae9d5f34756d0a7d58a1e74b6d9b3a4937cd7b4ff7e6dfb4d87a2c,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,b700910fc2b985b323f936053f64bfbade1f7a2450a366f1b83bc97b0609c86d,Merge_failed,6352489c3b02c2ed3ea6f5bd75ac7de0dce3d0f4109f58991104ea721ae104cd,Merge_failed,b0554652623d304de033d1073326391aa1f6761a2156453c4b4cc28801600398,Merge_failed,549229dd61cbaa463a160bc13f6dc1b6e8d1f6c0ec2670440737b20c1cbd5366,Merge_failed,6352489c3b02c2ed3ea6f5bd75ac7de0dce3d0f4109f58991104ea721ae104cd,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,e4092c73a3ae9d5f34756d0a7d58a1e74b6d9b3a4937cd7b4ff7e6dfb4d87a2c,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,6f61e7d8f7b9239e78852cea614474dc1682be6f8bebbf14c5607c19faca72e5,Merge_failed,b0554652623d304de033d1073326391aa1f6761a2156453c4b4cc28801600398,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,b6b5df9fd00ba487c81dd81880beb34327dc03d55df7f19b60640e9903da43a9,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf 76,refs/heads/main,9b83c56a8c1de53c9ea1c2a3141e48b36bb2d3e0,d68f357e0e9dd92841971a30f6e070cf3df002b9,e6104cd3d85a4932ca5b88b7576cf0318b86b044,,True,True,Tests_passed,14e16b548038b2e7d34eb122a62efe84cf7185dfa50ef9e5db147da681cf0f4b,True,67,385,4216.0,2,True,Tests_passed,6b650919b1c5bbe887b0bc71a3581f08b1edf1163ee0091f967cfadc411ab90a,True,67,True,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,22089bd40825e5533d0da6b30fdb26ab488f11287a6dfe5734decb4880350155,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,22089bd40825e5533d0da6b30fdb26ab488f11287a6dfe5734decb4880350155,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917 79,refs/heads/main,b2ef06a76fefd6cd69ba13fc251afe583f77c0b2,0a03f0cbae52f5623a94bd67e6788817c8d9aa47,e1df2c4ef25c45e536c90c552319710837af248b,,True,True,Tests_passed,b2018e3733f06f60f60b1e75c8aca8366c6b4394950a5b6ed2cea4773530ece4,True,66,370,4012.0,2,True,Tests_passed,8fd0d591146abefe962f1adad8b23d1e4855ad2ddeb23072eebd4d13ec78892d,True,66,True,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,80b1037f7560c8bb59647b327d757698910819dd6b9b18e6d0bf6fe9d0a365f1,Tests_failed,a942b130a9edf2d4d7df338ad7fd335819e3de9c87a1e1d2a51a31452746cf70,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,80b1037f7560c8bb59647b327d757698910819dd6b9b18e6d0bf6fe9d0a365f1,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0 diff --git a/results/combined/merges_tested/fmcarvalho/htmlflow.csv b/results/combined/merges_tested/fmcarvalho/htmlflow.csv index fb903294b7..5bb104ba2a 100644 --- a/results/combined/merges_tested/fmcarvalho/htmlflow.csv +++ b/results/combined/merges_tested/fmcarvalho/htmlflow.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,a89a8fa0e3425befa5503896bca392ce1bac437e,d5ce30d0c44ba34fcb4846c193cd06320362516a,91c5c4b27e1d315ebdd7690049050e7fe79addc3,,True,True,True,51,239,3010,11,True,54,Tests_passed,858aded6720e1a3da234601906cc10bb95833c0c7520e26a847f1f14df0fc567,True,Tests_passed,ffa0a1a959ca0c5738576d4f617e728cd3c05208795cc0f2433903933568691c,True,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,b73e9cc4fa516c1dc9821a1fed589e12da3f825be2e7377c2c004930fde2692e,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06 diff --git a/results/combined/merges_tested/fommil/matrix-toolkits-java.csv b/results/combined/merges_tested/fommil/matrix-toolkits-java.csv index c6e084be73..e95f8b6e5b 100644 --- a/results/combined/merges_tested/fommil/matrix-toolkits-java.csv +++ b/results/combined/merges_tested/fommil/matrix-toolkits-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,affdb7b35e8a309c4691e94a9f265dcfa9f34094,52744544515f2b8b56cedc2901398610f08b235f,98234e974d0467722d7188001e704bfeb518d848,,True,True,True,17,72,383,4,True,17,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,True,Tests_passed,4ed79d826944a4fb6d09a63127fa6cda76769d97219f58c809f738be2040f0b3,True,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_failed,c2f4f3aac99754826962e420c427f4649b9b52f8011c572bbe7efaa27629f6d8,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f 2,refs/heads/master,52744544515f2b8b56cedc2901398610f08b235f,55c0157b50769b802dddae37defe735649a760ba,f6cdc9896a9aad1de0bb7916cde285fd1d1e0e29,,True,True,True,10,24,286,2,True,10,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,True,Tests_passed,908a3dd301c07f0391dbc95078706bb9ddf1ba6131221dd82fc4aeaeb80eac53,True,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_failed,57faf72903fff28a17b40099bef64c996d5257e0d722f44182ebd24df19d7e44,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_failed,57faf72903fff28a17b40099bef64c996d5257e0d722f44182ebd24df19d7e44,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328 3,refs/heads/master,55c0157b50769b802dddae37defe735649a760ba,ab12647475cd734fc95ba3725ad053652ff04713,ebb7411aedda4dcbee97eded6958f3f41633fbbc,,True,True,True,15,50,109,2,True,15,Tests_passed,6b26a17cd2b000b0f926e66ee8ec5038ba1d54557f9d7bddb9c44600e35f4dbe,True,Tests_passed,d10059262183890ce5129a078ecf62a8ff50c9ecb193b0e8d429715a3c34856a,True,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,0880f40a4828879194569f700febe428488fa78cd3c73f1c490fcf42bf0b8416,Tests_failed,3464094b8fad932cd37bd55a4a8af668601f2b115cf88b0894c49a0ecd7160a9,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,0880f40a4828879194569f700febe428488fa78cd3c73f1c490fcf42bf0b8416,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830 diff --git a/results/combined/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv b/results/combined/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv index c2b1d1e9ff..00b39baf45 100644 --- a/results/combined/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv +++ b/results/combined/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/4,bb64fe4fe44310042573ff697a10286c76181f27,7f5853b50212f8f062a683dc590025d23e195449,5bfe592ac634bb45f48175f5c455b69568bfe54a,,True,True,True,9,33,128,2,True,9,Tests_passed,2d56ceca7685cd0d42383dffc1b8bc5b472c543fea43865ca8db7d668984d509,True,Tests_passed,0c0a3402ebd89cd9cf6f7f799c9bed85b79283578da63ff3c8c1c5565e8d9470,True,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90 diff --git a/results/combined/merges_tested/forcedotcom/sitecrawler.csv b/results/combined/merges_tested/forcedotcom/sitecrawler.csv index af68341bb0..0656d1dfaf 100644 --- a/results/combined/merges_tested/forcedotcom/sitecrawler.csv +++ b/results/combined/merges_tested/forcedotcom/sitecrawler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/remotes/origin/develop,bb56b3dd8e132d8d625dab3ee71ed828754cdde0,e581ac9a860103411577fc1e43f419202fc8d8ac,db6e75c0cf7dde53d208b30dfad7ca1eaf3e3896,,True,True,True,13,79,1175,3,True,13,Tests_passed,79fd9ded833ef95cff46349527c8002380321b3fa12371969023f7119fb65ecc,True,Tests_passed,64ab76e3afa4e811164c11715aaa520e84b189be22918dc67de3ffb6dbb0f930,True,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,198451b2a698f649956e8b1062a032242016267bd2cb4ff3b67440e370c7e0fd,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,235025f90acbeec11c19436916c6c1ebc5dda3205c079d8f2e6bffac774a4ec2,Merge_failed,5b383d513ee9800f18493e1c55d5c284d863fa835de27a92e53b578b3f2b8d0a,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,9a69a5806aa087385659401a15c759af2e62c8cab3beb5c8514719997024a943,Merge_failed,f94943e3c1f3a307e66290fda52d77e707fb7f53e91c7075bf9749434b75ad8d,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a diff --git a/results/combined/merges_tested/forcedotcom/wsc.csv b/results/combined/merges_tested/forcedotcom/wsc.csv index 80ac2c23e9..f7eeced8b5 100644 --- a/results/combined/merges_tested/forcedotcom/wsc.csv +++ b/results/combined/merges_tested/forcedotcom/wsc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 95,refs/heads/master,9394831a11e1e6b561c8f02e04d1c5a526038567,33d423017258526e56b667c2359dc340cd613db2,88a50b3f22bd2798afc8ab485fa4e3e9566b7208,,True,True,True,152.0,177,645.0,2,True,152,Tests_passed,9f158c53799e42581b0b1496756f35b3342d28b68cfb39af26c98cc3cc2f5613,True,Tests_passed,a5e3adb2aa160d93a654d779f4116e387adcdf894e1292ac4167f9eff488fd2d,True,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,89cf5d15285ee364e24311bb28380bf4b6b51fc41634955ff82dcbda1956994d,Tests_failed,e0f65d5ee81e00ae80067189de8f897959d555e7e7146e99993214f734aa1dd6,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,89cf5d15285ee364e24311bb28380bf4b6b51fc41634955ff82dcbda1956994d,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56 134,refs/heads/master,69d39ed6fe26f04b1132ff17984ae3c77ef7ed77,a0b230e5c07ce66c36d64a638227d33d67816a9c,bd5c0c1c03c5f26f32d35a1febe16979c797b1a4,,True,True,True,9.0,21,191.0,2,True,9,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,True,Tests_passed,5bcf3ea9f25ab6a08f5642e6472c7501bcc89809154b3281fb2634639c2b1eee,True,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572 136,refs/heads/master,a0b230e5c07ce66c36d64a638227d33d67816a9c,58664bac8717aafa09c5c5edcfa9ef7fd4dcb240,0b145011bccd9bc1c48dfec1c7efcd435f773631,,True,True,True,7.0,24,107.0,4,True,7,Tests_passed,438a10d07d96e44d3954bb9b72ebc8822f08f01c1668c7409e0c89a6ef4bed69,True,Tests_passed,d095c7e06529062e27178dc5e6deda1c21fc216ccd9f76c8d8906eca03ddd226,True,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,3d2134acdb470840fb10b18f0521ea33ed4847bac67caae7ad6aada95fb1b9c2,Tests_failed,088b443a24841dfe582be8f0578be8139bf5053624671e9b790604bd8d2134c5,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,3d2134acdb470840fb10b18f0521ea33ed4847bac67caae7ad6aada95fb1b9c2,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c diff --git a/results/combined/merges_tested/fordfrog/apgdiff.csv b/results/combined/merges_tested/fordfrog/apgdiff.csv index d616fd58df..978203760e 100644 --- a/results/combined/merges_tested/fordfrog/apgdiff.csv +++ b/results/combined/merges_tested/fordfrog/apgdiff.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/develop,a42c3242b6e78aa612e362f409e373225a9c4a2e,6523c52d919cb5fd73af3ef718f691740b19db1b,6c6defaa50aad109de8a85b37202591c0b98f784,,True,True,Tests_passed,4e41691763649629f374a62af1412666df1a6255fccdcdc44d73f98c82dc74e1,True,50,103,1852,4,True,Tests_passed,f5df258ffb7207cf731fdafb93675b62bcc7601bd3f5da9051bba37f37784130,True,50,True,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,22243ee00dca01dda8337b1f988cc40435d63a4c06cc5ad9a49ab82037b8dc37,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6dca7c0f41be616b80403179230b371dcb790262dad5a6004d617eddb9007143,Merge_failed,30f1d33b7f3de209d5e8abbae5a3c970d13654070eff3587fd10f47aa422704b,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,7977690ebd5b042d236e43be39e34b866321121c3af6400990f587c6f0d9cd4e,Merge_failed,848305acd4c5249d542ca829e5a226bc2540f4ecf22e0fa52a18059d9f79d57d,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4 8,refs/heads/develop,6184333a9bab436893e9d501b6cdba86b0c4b0c8,08ee99018d9269125e8d30382462c49b5966e516,735c05c6868a3d66f47b4df6fba5b6ff55050ad7,,True,True,Tests_passed,032b520742e378c3eb65f8f15373b743be99de30c12f47944213d4942bb90fd7,True,15,27,920,43,True,Tests_passed,a9b9a234327abc3026092a0c25abbc1bd4b994feca7eb437ee6fa729fe5c4726,True,53,True,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,ed12be1f136e227fcba3179df2def03b2b357be6f06978cff176f50da6e57c56,Merge_failed,7bb52ad5ed6f46a0768e8a340ff3c0d48ab91de8599f0edf9365435f1e8f6741,Merge_failed,6a51bf11e0642c77a569ee2b97b0db9ff03b57287e12f028ba2a0466bc2e4b56,Tests_failed,5b6aecde65ff5410d59b3816042c7c7ea804adb1549313fdc3d4ae1c2238b8a1,Merge_failed,7bb52ad5ed6f46a0768e8a340ff3c0d48ab91de8599f0edf9365435f1e8f6741,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,ecb502e464e4bfe48892ad4fe7c9a3c77df5540012cf30823c388217f70ab5c4,Merge_failed,6a51bf11e0642c77a569ee2b97b0db9ff03b57287e12f028ba2a0466bc2e4b56,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a 48,refs/remotes/origin/pull/222,e87c0a43d2a289df3bcc87b2530487bfc9953a26,605490c47760c1a87c180a1794e9343351174022,735c05c6868a3d66f47b4df6fba5b6ff55050ad7,,True,True,Tests_passed,9e17cb536367852e21b8fb3685cc6e402da5fcb16a26fad08c36fe646007fe40,True,60,134,1830,5,True,Tests_passed,a9b9a234327abc3026092a0c25abbc1bd4b994feca7eb437ee6fa729fe5c4726,True,60,True,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,257ce6af90580975d79b267ca28d3afcc96fa08e107d57d3d9b17bc744a3cfe8,Merge_failed,a8007fe08d0e91f267cf63d999c488985a3615b280fe99b996e3a6fc6004cd48,Merge_failed,ad87fe17313b2a54531d85229298c048b43712ec693059d897188104c1b4c061,Merge_failed,92d6c6a722bcedc198facf75d623942ba08515a6691212d13fc180fd682df3d0,Merge_failed,a8007fe08d0e91f267cf63d999c488985a3615b280fe99b996e3a6fc6004cd48,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,75b84c94d2812314ba83e9e71f0eb1ec56b5f646c13a12d831c55ace5ebcb1b4,Merge_failed,ad87fe17313b2a54531d85229298c048b43712ec693059d897188104c1b4c061,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8 diff --git a/results/combined/merges_tested/frankbille/scoreboard.csv b/results/combined/merges_tested/frankbille/scoreboard.csv index 321346fa9a..0f2b8e1927 100644 --- a/results/combined/merges_tested/frankbille/scoreboard.csv +++ b/results/combined/merges_tested/frankbille/scoreboard.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,e33b43a29231d1fbf2ebf0be8661de9de8482a77,cb6bd0992da7d98546caae3fb7587f0670348c41,c4feef892a21c76d26d8da136804a0d88a30948b,,True,True,Tests_passed,ffaf9868364327ac5d8b8d0f71b084c30d0e492b0c42b0ce56a53a5aff1ee1a3,True,190,232,3683,7,True,Tests_passed,99f160235372631dbdfa95e84fd57b631bc31fc07eadf9c39106873234433098,True,190,True,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,25f8bf37f599dfc3a7105707adf00a83e1ba5fdfb228cfaaf853a29298e79006,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,a7fd4a0a657101f3be65f82524c269256e32e8b119f84ac70bf29f63fbab4b79,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,a7fd4a0a657101f3be65f82524c269256e32e8b119f84ac70bf29f63fbab4b79,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,25f8bf37f599dfc3a7105707adf00a83e1ba5fdfb228cfaaf853a29298e79006,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133 21,refs/heads/master,579ea54251bad446fdac546dc20fa813a3525b46,6c9298023a14f62bd50384b4fdc49213749a315e,5b07cabc7b31fa27c7e862f86e7226a91117d4d4,,True,True,Tests_passed,bda8a39b930cf2440a92798e14de49522715efb16cc182a83b00107c88fd7631,True,21,58,530,4,True,Tests_passed,7bd91f92b03e3a34b367b9555fd2b2db9eb8841e0067703386f1f7215561209d,True,21,True,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,15701243fe47888c0094f83d53076858acbebeca79a8cb9a85563822452ba52a,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,69e8ee0532fe611dcdbcc03a168da87e62449ab8225674b2d0aa2fba84a35d74,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,27ce3628e99c90b91b5381c784f6fb6dee6f2555aa0ef85d1ce83fe4e6772a31,Merge_failed,7b7b379fe65284ee969e3715c020347d0c546e22922cd49c73531f70f0abca41,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf 27,refs/heads/master,890ecd0bdb07d80650ee9df19efd535085970431,bd29f82198c11fa6e8b42486d36e7c3e476bfe64,abe84a82f4ddf9e7b532becdad70072fb0b464c9,,True,True,Tests_passed,8e394f1854cde6b05527bd81d4718b96bd1337b284e7c043d71e89a2026c6f32,True,59,106,3790,2,True,Tests_passed,86f9f543ee41aba1e304e739b274d01872f5639f0d5045175dc85edca24bad5c,True,59,True,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,6360e019af5e546807436b5cec23510bc5ca2301eb76a822142174ab291a1214,Merge_failed,f88ebbecdfb29e5400d80b6c3346909cfd4649bc59f5b69d1357b85095fc3d6a,Tests_failed,6b1bd19bd3a944d68e5e5f61b923924b5b9b15f29ebe25ab64606ff0354a7beb,Tests_failed,09a7695c21a9dc279cc8a933daa3a6bd1215ce11642c520013c377a9cc0383d7,Merge_failed,f88ebbecdfb29e5400d80b6c3346909cfd4649bc59f5b69d1357b85095fc3d6a,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,ff5a3f4c10d2a8655216dada8c0585eeb866738dca0e56b68250d7837775fc0a,Tests_failed,6b1bd19bd3a944d68e5e5f61b923924b5b9b15f29ebe25ab64606ff0354a7beb,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570 diff --git a/results/combined/merges_tested/freehep/freehep-vectorgraphics.csv b/results/combined/merges_tested/freehep/freehep-vectorgraphics.csv index 4f20772ec8..b77c1fdfad 100644 --- a/results/combined/merges_tested/freehep/freehep-vectorgraphics.csv +++ b/results/combined/merges_tested/freehep/freehep-vectorgraphics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/50,5477c71d3adde8d7029035133d94c44e32eb9083,0c94a082a4516d72c89cf6a860096325f391ee13,176d281f6570afa2f72f50b692bcecd63edfc140,,True,False,True,4,15,97.0,2,True,4,Tests_passed,d83d176ae5862505c73da986a5bd6bc2b8003e0e16666832ac550998607c6899,True,Tests_passed,fccd14e100c3f44856fdc57b1b82e3d5204b6a404264f35733c3ac57369732ec,True,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,5119dd46dbff4b4503af306a540d71c19aeabbb4484ffbe43c8a7d2f68d035b9,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,9262832b8f77468e4b1253d3e4f81a453a639fca972d5310c2ee179819c665ee,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,97c9ca2e54923820f678069fb3c6283539af10db989df0671060ba40e3a2c487,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1 diff --git a/results/combined/merges_tested/frizbog/gedcom4j.csv b/results/combined/merges_tested/frizbog/gedcom4j.csv index 66246f518a..11ab00548c 100644 --- a/results/combined/merges_tested/frizbog/gedcom4j.csv +++ b/results/combined/merges_tested/frizbog/gedcom4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,dd044dc5d9b0969c4e6b6be853d35c02c10df487,04d73516cb7c31f070d2dd51ebb6333a96d5b6fa,c1542505ba6dec5d30768eee726256c54fb9e5ad,,True,True,True,380,2682,36167,13,True,386,Tests_passed,48db079634314b266fc84ad28103e88c76c7d893ac415fea28ea35343a5a8237,True,Tests_passed,b756e1a78c5cbda01016d20f8b5f633a929ef3760159b2ab690fdb43af936337,True,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,380b4e1e6034b2a59dd48de32eedbe90b4257370957b84eabe36c8d259462634,Merge_failed,32e04593f649b0d5cc006990f96f1333328127ee80d96a7f6afe4596f5ea9b48,Merge_failed,69e79c544da4f6ada05dbca3e304661e3cb9abcdc317c7b05804e36d2e2264bc,Merge_failed,69e79c544da4f6ada05dbca3e304661e3cb9abcdc317c7b05804e36d2e2264bc,Merge_failed,32e04593f649b0d5cc006990f96f1333328127ee80d96a7f6afe4596f5ea9b48,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,8302a34eccbbc5f83d94f3c6bdadefd6893b556fd7bba20d443d1ab1ec4364b4,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7 12,refs/heads/master,11c8b3f6955f298ade7583d2fa0d000b282e597f,cc87e520a8fb31791ef6f69c87ee6aba8247ccbd,7c93589357fcbf3c1e8dbfb7fd6ffc0158e94c04,,True,True,True,293,2906,38766,6,True,296,Tests_passed,c0289db9626674ba122dc0f9c353412e50329ef520fd84ea9f400c3a0b7dfbfc,True,Tests_passed,c08160c1250a318b3a848595a32f8b0c4fdd8309513fc7c40d815013d7ff920b,True,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,cb79a7cad84c59f537e0d35013388697fefccba1d6dd72a21178f119060c9139,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Tests_failed,22efdfa9c05eaeb1fb34d77cd8ec69021b7ff4e09ec1fcd7e98f33a6db0c3225,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,063fb33c54a4502f94b3f4fa3ba5739594e27458228258fb9f00448c4912b897,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3 15,refs/heads/master,9a01e3a39a34ee91718fc14ac5a9136a06bf8795,162c2313a948f4bdff04629e031e59bce8b79a8c,1f96d69b7438337c6f9eb54dcb2ad24296e54e73,,True,True,True,19,39,370,2,True,19,Tests_passed,9722a6e19319f1211cb3efdf92392d45aa1a1ff4f2f969118b385a468a008ce0,True,Tests_passed,872b12da90e7acc2df6f11500cdaaf734c934f7674a020e1b3d7721f3d412b4b,True,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,56de9e3a3c674ad2fdf832f793e3d2332b4ca6cb453dd2ff80cbb72fc72c5db1,Tests_failed,44a48106c25bf9909a1d58f6ea090bda7b1a20b615cbb7d11a2082a26cce4d5d,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,56de9e3a3c674ad2fdf832f793e3d2332b4ca6cb453dd2ff80cbb72fc72c5db1,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd diff --git a/results/combined/merges_tested/fusesource/hawtjni.csv b/results/combined/merges_tested/fusesource/hawtjni.csv index beaab1e8d4..5e42509d99 100644 --- a/results/combined/merges_tested/fusesource/hawtjni.csv +++ b/results/combined/merges_tested/fusesource/hawtjni.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,8678713caf00652f4f7d52e36b8b384cf611dde5,d145a1dea37bbd8f98c9f1e6f21d756f849d7979,2c64ed4134de9b3cefd9423382a59f60c8f3ad25,,True,True,True,15,70,1139,2,True,15,Tests_passed,d1466a3d12f3064c8dd90f83120c547f0dc7aff845d8f8cbc2663e64511dbd8b,True,Tests_passed,b6fb7066bb00778949dff10fb3844eb8efd49a0bae9a4e6d3607d2a1044d0f81,True,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_failed,ce547a0cb8364caf47f370f7c636cf1195ed536e12ecb136d365ef25f3fec943,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830 4,refs/heads/master,906aa158c24d3603aca6f3766b7fa0da306d23d6,c5130eb900279531f67d4734ccf1ad2f2ad95a70,9d38df2f4a25ee55fbb0dc921fb2004b33c59541,,True,True,True,13,61,326,2,True,13,Tests_passed,2a9987b7df1476825e0d322905a5b3bffd4d134677aafeca0a2e9f6f07333b66,True,Tests_passed,8120b6e8cc58b54032e7b4441c7c39a303b879e17bb4ad17e2ab85aef6c7bc4a,True,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,6b20a2096e549989a1fb11aa820f1150d52f18556af46b7fe222bc17a2097fe5,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,6b20a2096e549989a1fb11aa820f1150d52f18556af46b7fe222bc17a2097fe5,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438 5,refs/heads/master,9d38df2f4a25ee55fbb0dc921fb2004b33c59541,1c42406ec55ed1955d2fc573e3002e5fa557c984,8f464d07bc9a807acf33f0f2e355065471f15235,,True,True,True,18,81,515,5,True,18,Tests_passed,8e3c79b32f7de971a09ab76d918c6833500772705c09a13affa9b631b80dd0a5,True,Tests_passed,e0cd29b3ffcdb8bcafbdc84880176716886f5c63d4d559fd8a6895b9c53655ca,True,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,98165938821cdc194c73ff5c86dc29ce2917e4cf878f2b9cd86881d74c3d2c24,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,bbf578954b2f1aeb7e85eeb7237d50e306cb1f497bf5a3d3e6d9d53ac4f1fd4d,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,12aadd5871f2cd411695d090819f703d5c5314210410d77a1257a9e2574a28d3,Merge_failed,7a9f24769acd48e3e5f161fae1a24c0f360fb00fac86ac0db2baa0ac98a33f45,Merge_failed,cfb903330042996b3b5b886f2c280f9dbfd782277be0baa73207d833a0d97e00,Tests_failed,aa9f21f6b4c3ba1f9fa64ab69a6085b36f889cd013ca3c45aa897b5328eb2e88,Merge_failed,7a9f24769acd48e3e5f161fae1a24c0f360fb00fac86ac0db2baa0ac98a33f45,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,bbf578954b2f1aeb7e85eeb7237d50e306cb1f497bf5a3d3e6d9d53ac4f1fd4d,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,3eee1b6a93f87eb88b3f778a3258fcbaed58ff687163765a490017f52241ddac,Merge_failed,cfb903330042996b3b5b886f2c280f9dbfd782277be0baa73207d833a0d97e00,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,98165938821cdc194c73ff5c86dc29ce2917e4cf878f2b9cd86881d74c3d2c24,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9 diff --git a/results/combined/merges_tested/fusesource/jansi-native.csv b/results/combined/merges_tested/fusesource/jansi-native.csv index d2f5fdb66b..2cd192556c 100644 --- a/results/combined/merges_tested/fusesource/jansi-native.csv +++ b/results/combined/merges_tested/fusesource/jansi-native.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7b45d3462ff7a1b20bd1b0f281c9e23277b852e4,5f76e86c28c80eb8b03e1713e9eb0ea3099b965d,216892efe74cea133993c5afabc154b576357412,,True,False,True,5,7,48,2,True,5,Tests_passed,a8aec9a53e59265118e01bcc03d6461f39e00d7cfac69a6eda96a64cf7576c9d,True,Tests_passed,e73edec4426c6bece1f9f127aee911dad6f683a40083320d74c05448742568a1,True,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,9e45d4aa63afe3c14a8eaa210c9d8a4d6d58044c7b5880f9cf7d3062d49f7d7a,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,9e45d4aa63afe3c14a8eaa210c9d8a4d6d58044c7b5880f9cf7d3062d49f7d7a,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865 6,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,True,14,41,2080,2,True,14,Tests_passed,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,True,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,True,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,bcd03031a2f084a5e33a73be1d2d1f520d72df44aa9f3c1d485d042b76287df8,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Tests_failed,f82a6f26707e51ee65e5f267e9bfd72aa34c192d7af752a580c4c8ac4f7a39b1,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,57e270ad851e7142b3e5ed234ead3ede78785e0269153ca0b1e9a9b5aa914405,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652 diff --git a/results/combined/merges_tested/fusesource/jansi.csv b/results/combined/merges_tested/fusesource/jansi.csv index 6a292c6449..09acd9956f 100644 --- a/results/combined/merges_tested/fusesource/jansi.csv +++ b/results/combined/merges_tested/fusesource/jansi.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,769ebe03655169b2eb380600912a55ac88b13efb,3ce698726b353dd06acaa76777c6c2451415b850,f33497c0117b556e39fe806581e717292e6862ef,,True,True,True,10,45,369,2,True,10,Tests_passed,eb53ff36ade260ad3f7acf3dc544dc05825940bc27ae944c64c042528a4aaef2,True,Tests_passed,c2b438d44c637de6fb7b3a0b6c0613047999314b77dc417abe36c0a576b8ab2c,True,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9914333f66fe419702cb8a0e63bcd00acc1f605e6cf2aa4121f3a3d6f8933156,Tests_failed,f35e4eff1fedec62bb65bc046bf473df00b228332c0e00437c28b248e7e74873,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9914333f66fe419702cb8a0e63bcd00acc1f605e6cf2aa4121f3a3d6f8933156,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d 21,refs/heads/master,eeda18cb05122abe48b284dca969e2c060a0c009,b84df55b6c6a0688cf8ad790d4a3ac952ea6b9d0,5a3a670c911e4491195b6d162d456dead1497824,,True,True,True,9,24,127,2,True,9,Tests_passed,7f122577588d32b76e3e566b52d4fc21d998de86bdf889f9a50d85f9a2cbc729,True,Tests_passed,c12ff958e6fd5092a2a7a12d26ba20de99771366aac098b4ff19173d624180a5,True,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,ac29640fb1e96782ca82c247d990e9ba922f931dd231c4c3b6c4b2d93867c583,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb 46,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,True,14,41,2080,2,True,14,Tests_passed,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,True,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,True,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,bcd03031a2f084a5e33a73be1d2d1f520d72df44aa9f3c1d485d042b76287df8,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Tests_failed,f82a6f26707e51ee65e5f267e9bfd72aa34c192d7af752a580c4c8ac4f7a39b1,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,180c166c7c15b4aaf3182b49d9c8553c98e36d220078758c261b91642fa06dd5,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652 diff --git a/results/combined/merges_tested/galenframework/galen.csv b/results/combined/merges_tested/galenframework/galen.csv index 50c59044de..ce8e35703d 100644 --- a/results/combined/merges_tested/galenframework/galen.csv +++ b/results/combined/merges_tested/galenframework/galen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9f0a13079558fe495b6ea2a9b7f46e818639b4e1,807a06e637a1abf53be4575182fce01811c045e4,bf409f4ff5aa1ad3a51195230112967f38a5a5b3,,True,True,True,527,1096,33791,3,True,527,Tests_passed,0a7c40482c731031373bba526988e79a8c19193592fbeadfd4f83d0d41daae32,True,Tests_passed,195d52203e15eb03a676063ed8305852d13f390a953ac5053fabf21a8b3ffe8b,True,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3 2,refs/heads/master,fc7692383bdfad5d1c7cc7239be1060df5eec466,df924fc4c603b447cc8ff8e52e499557ae7f414e,05399c5c34f4e19190c6c8ce7f508d81324caf88,,True,True,True,514,999,26455,4,True,514,Tests_passed,8bc400d3901b9f6402041e8bb6c9e2e7216ac9b7d5456371d395f839adb50037,True,Tests_passed,f12d5357d22170a884813159cb3e86b7dc11e27f9a45b6e06ff5a0c56cdbdf99,True,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,8eaf0da6c848fffb7f4073cf3ca9096d9c2584c9ee9689bb7087ad34ac9c7c6c,Tests_failed,e8217d3ecd957a2d5a515a332f5f731fa34681a52f950a84a319bfd3d5b9defb,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,8eaf0da6c848fffb7f4073cf3ca9096d9c2584c9ee9689bb7087ad34ac9c7c6c,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd 10,refs/heads/master,a1f212b188bb97b3692edf01df89bb56b62e907b,ddbda5269b86ee322fa22caca856fc24fc6e6b68,8bf7914f5baa69adbb1a10c5b19637987b9b6b6f,,True,True,True,63,107,3169,2,True,63,Tests_passed,31cf23a2574cb0ca476cba61bece8f1edf261ddf088686395e83d2aa8c676b50,True,Tests_passed,59adf33ccf8b1e89f521c312fca0587f79ed6b631d61afb53b481f5578d0fd75,True,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,3557d358d11dfeecc7140c08830896d7c3e5ac0ce9489ca8316da29b5947d384,Tests_failed,43f57e6cb63a5cd2d6a1f366ff3788e351ae76d0705140ce8c4c7460a0e43b3c,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,3557d358d11dfeecc7140c08830896d7c3e5ac0ce9489ca8316da29b5947d384,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9 diff --git a/results/combined/merges_tested/garbagemule/mobarena.csv b/results/combined/merges_tested/garbagemule/mobarena.csv index 9f9889b917..ffa5ddc627 100644 --- a/results/combined/merges_tested/garbagemule/mobarena.csv +++ b/results/combined/merges_tested/garbagemule/mobarena.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 44,refs/remotes/origin/1.8,b34dc0d5acb744a0b1d9c997f986a9ffce06ac3d,cd7aa71f5709f0a36d381307379ebbca4dd6434a,b08c74afbd996e0af858ef8bcbf45e53d1c6cba8,,True,True,Tests_passed,dc98c2ebb01b5dc31e61d4df14c3e59d7590dfbf3c46f89aed42e8da73feb60f,True,143,453,7800.0,3,True,Tests_passed,df1af5298f136e6e242ff37f0cfd4f3090f4dbc6c9cb7a9f0e1b7fef9cd352cb,True,143,True,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,3c2f5016e4165bc9df55829658e2e8e89fae1e45313afa1ff8f1a6f610b28562,Tests_failed,c955db5546369e17a8fae94a6f5cb62b064137befd542cc979d080fc97cc563a,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,3c2f5016e4165bc9df55829658e2e8e89fae1e45313afa1ff8f1a6f610b28562,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f 77,refs/remotes/origin/pull/693,c0c07ed2230ad53326afe6a227c61ef7275a9cd9,5c8c1939640d29a1aff926a01d07ed59746d320f,6be130daf1af0f3fd0f9842177cc3ceac12f0fa5,,True,True,Tests_passed,6d6e5550abe40a46bd748cf20f4082f0f661eebb7edd7bcf872334bc77f55774,True,6,16,48.0,2,True,Tests_passed,bcb0a8938973b55d69531353df104c3a6f9716e3ff4431e5f37085ca9acf2719,True,6,True,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,31360513ad0b59eda1476cb95bd847df1d58553b11fa3398a84724adeedbd64c,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,d5af3729a299a3733aede7d597a283c465f703361504fbd0180682df8486da79,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,ad7bb65904f04e2eedd3bf5081f9d246a8241dfe1f44ad2475d0bb01280fe7d9,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c 79,refs/remotes/origin/pull/714,bad2700bdab561919b585cad9810fde8e939bbfc,bbed0c5ab1e6b0bf2c2a299b19fdeb244463a072,ec644df05bde1a877d5fc55757966105d6ecd355,,True,True,Tests_passed,c1b4cd88c9e28783794fe639c42be0d2be6c1ac9d8e2f74c466d969cc1c79ac6,True,12,54,183.0,4,True,Tests_passed,2360db5f65edc9a20e0bc0f5e07dcef258a34a471bb4f1e77993e4752a132383,True,12,True,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,86808f774e5a9378c11cde3f88aa4bb965d99763a1c1cdcd556cc24bb576fa59,Merge_failed,d6119d98486db4ff12a6472a1bc5576fa8b49a07e5e3610b19b89bea5a40abe3,Merge_failed,8c45cb4436bfc7a9036ea5e796d13cb452cf371bfc4413caeb858d582eca645c,Merge_failed,e4ff858d120d5e4793dcb4f22990cedb53a2ba01ee6bcbe9228168d65804b102,Merge_failed,d6119d98486db4ff12a6472a1bc5576fa8b49a07e5e3610b19b89bea5a40abe3,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,66206dd6906ea9b09488e0ffe336b81223dac4dea0858aeae1995121b93fd787,Merge_failed,dc566fce3fece3d4606cef4aebb12cb4a44d426a8ef3747b04cbf7bd41838506,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2 diff --git a/results/combined/merges_tested/gatein/gatein-api-java.csv b/results/combined/merges_tested/gatein/gatein-api-java.csv index 58ec71f5ca..07a35e0b42 100644 --- a/results/combined/merges_tested/gatein/gatein-api-java.csv +++ b/results/combined/merges_tested/gatein/gatein-api-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,1ae0553ab8dd0574e86a2b073e35f3a0331ada3c,8693b9e5c6ab2b2f04acc311a0bfa37ad157c391,dc25033b5792eb3b2692252bedb363bafb2a6ad3,,True,True,Tests_passed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,True,60,114,7232,8,True,Tests_passed,6312f583ebbaa3f8b7089e2ab24f513bb713c54a8f32df638ce77c6aa0b3fa68,True,63,True,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,40c6f8a01d5f775e60fdcb0c3059bb9d51a5f28d7348bf21a39227f1880ac561,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083 diff --git a/results/combined/merges_tested/gbif/name-parser.csv b/results/combined/merges_tested/gbif/name-parser.csv index de2d731596..6493fd277a 100644 --- a/results/combined/merges_tested/gbif/name-parser.csv +++ b/results/combined/merges_tested/gbif/name-parser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,3c1d815c087b4201c84f5bae97c9760487776e06,4213386167ea41f8e4b31a116b56c6b868341217,c03e7b1b10faf892ecb30d6022dd671b4b994f5d,,True,True,True,12,14,73,13,True,15,Tests_passed,75ef1e0f8caad0b8daf6b1e6d4d538dcd89f6ed7f0086603fbb623e947dbf978,True,Tests_passed,adc5a433af359ddc5ba1eed1784bddfe805e1c57c80f652e9cb5975bc50a180b,True,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,7fc3903196138c8f1169ae97e733808c1959f1c9077d929ac746aa3f2ab9b4b4,Merge_failed,66af3e919dac573336dd2eede3de3f19aff8f16d4181d0c05c1e1706cafc764e,Merge_failed,6d32e44f61101c328e60477189e9a2197b42bb364a8f10fb312ad933fcf13468,Merge_failed,5cacd9f9297d950fb3eb5e093cec36235b43f4158ef7d9199be4233d2ac8c0e4,Merge_failed,66af3e919dac573336dd2eede3de3f19aff8f16d4181d0c05c1e1706cafc764e,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,7e11e8a7b18b4e787bf68249d8287d85b71cb84180f2915ab1c570ef013f3821,Merge_failed,57a49352be629c8b031fae767f851536d7a0bb3fdb49eee851690e5e73b7b0d0,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387 4,refs/heads/master,d8417e10fb442f6cf0342569ee1de8cc5257facd,79712709a91e47093fde22401fcfb87290790597,b42bacaf155d146e60825185902d264d5981afa4,,True,True,True,19,58,2802,3,True,19,Tests_passed,8807934239dfe00ccc91427e0eceb97c944420517562c1fc306ef1969a00ff67,True,Tests_passed,b0a1ae7e75622b7ddbf87f39c53d8ebe7a7baaa893bd1e117e10d0bc0a712c86,True,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681 diff --git a/results/combined/merges_tested/geisbruch/hadoopcryptocompressor.csv b/results/combined/merges_tested/geisbruch/hadoopcryptocompressor.csv index 52c257d7d1..982a8eb792 100644 --- a/results/combined/merges_tested/geisbruch/hadoopcryptocompressor.csv +++ b/results/combined/merges_tested/geisbruch/hadoopcryptocompressor.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,fd94be7cfc23758491ddcbf03b92de026f2d7647,a7b200a263560412b9c08d113781e98511fb4923,00fedf4f5ab1e7a3b82dae331e279dbb0ee83c82,,True,True,Tests_passed,762eda49ab01ba756106731bfdb94dfc6b68170400e872a221b8e366814ca8d7,True,11,62,1207,5,True,Tests_passed,3a5f70430f6227b6ae7bc15ff16665f2f7d701c96e37b8fce50c5c6f62f0f12f,True,12,True,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,4648693aa675469e5046fa33f61b4423b08b4f2f4c3aaf553be3e5c0556485c7,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,484239bd1efbe04612fb3bd46e2f50dbacd1d525d136b20cd5bbace47f5aa1a4,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,827af8618e7dd7ecf7cf6c7506c56ec4caa3a137057b2e2e03cab83cf8eab4f8,Merge_failed,5a9eb66e9907691cb1e9c7dbbff07e6896707faf574c7379ee8abff1ef583af4,Merge_failed,87debe1a4ca71416e1e91ca90ec6b08268fad99c2f42a8cc5d4fd82e6b3ac9a1,Merge_failed,fa9b21bcb5bfd48f5e43bb3985488db5253528f21f334139cca9e952d8d35926,Merge_failed,7abbbc28e2fb0371dd2f5172dc8e014b588fb83b6c1fec8801928633d5a8602f,Merge_failed,87debe1a4ca71416e1e91ca90ec6b08268fad99c2f42a8cc5d4fd82e6b3ac9a1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,484239bd1efbe04612fb3bd46e2f50dbacd1d525d136b20cd5bbace47f5aa1a4,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,827af8618e7dd7ecf7cf6c7506c56ec4caa3a137057b2e2e03cab83cf8eab4f8,Merge_failed,8d4ac47d02bfbdbe3b6d7f33a79ee14c55427f8d873b7fb77ed3cc8b5e27b488,Merge_failed,4d52b7b9f0e43468b44f9625bd576d955b11695948da2ee800a881edf055d3d4,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,4648693aa675469e5046fa33f61b4423b08b4f2f4c3aaf553be3e5c0556485c7,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1 4,refs/heads/master,f98ce134b844a7864b43803c6e7ffc3f1b7d4e5c,9ca8d7782c731dda67fef1419c27b82e7e80617b,72132711af2ae9fbd4426f72c37afab61afa92a6,,True,True,Tests_passed,74efbe59af6439cd5139bbbee8aec9360084924944dd2737dd2e3a5c7a4c124b,True,16,52,863,16,True,Tests_passed,cfcdea3830c463505a71359096886b29a5f6aa119e1038e81291733961ffbf5d,True,27,True,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,bcd0042e77d9366f9b487ed4dfeffca59eb795f2168c464ee9c82f6d422e3f13,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,d7f22c7864302d4e697f8d933ec7b402b331d2ef3c9c351cf8a28d710ab2807b,Merge_failed,964bc66528ebb89c190d5a76fb277807adddda6a105d5a7e737231be90196450,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,274351c39d97c01a77168e57ed819dee72ba919148505e7e9ab82d2584ac9665,Merge_failed,517bcdbd3d68dd185d8a89982f625b3a443c00ab10220cbcd2e443155c2a6028,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49 diff --git a/results/combined/merges_tested/geoffreywiseman/moo.csv b/results/combined/merges_tested/geoffreywiseman/moo.csv index f7d7151117..a227acd3ed 100644 --- a/results/combined/merges_tested/geoffreywiseman/moo.csv +++ b/results/combined/merges_tested/geoffreywiseman/moo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,c87b8cb339acf2e0e5d38ed55775bd9b6a3c3d1f,736976881b149b25ed7c051198933e47d3a99494,dfd80886d7f9acf8e4de719d2876e668dac92d1d,,True,True,True,18,90,428,3,True,18,Tests_passed,4f41e2065e911154cb29000823a47712b4316f475a3bcc2b6d32e1fcf0f1541f,True,Tests_passed,b29e2909ad9d5f27a7d9927a070901bb936df4cc568e1672a9e19996a1ff39c8,True,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,d154e8dfdce5acfd29d0157810b80d5b2235717f6695a391e123e4a92207c0c5,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,14be6ddc97fe0b86417f6c664aa6a07a1bb0845973d2cd2a447b76f4ae907c59,Merge_failed,ba8a69a5e10b5157ab281d5c4962aee263096d450d1dabec8d0244f9f5e4b788,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,0cfc7f7fefe6c07b16d6c763ac775f8518406401227d6223dc40ef722991cbf6,Merge_failed,669a31d4ee910ffccbebc8b0474bfc3342fd582fc9dd4db469d57e2ae0779913,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0 diff --git a/results/combined/merges_tested/geosolutions-it/geoserver-manager.csv b/results/combined/merges_tested/geosolutions-it/geoserver-manager.csv index 4da937cfdf..4e87a46e60 100644 --- a/results/combined/merges_tested/geosolutions-it/geoserver-manager.csv +++ b/results/combined/merges_tested/geosolutions-it/geoserver-manager.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/master,8073671631cb3f2be2ce5c96fbafe1c35d81b2bb,471c860007c6c0a9853ce3d3cd5e2dacdf97d18d,b7bef77052a50b347d59119b1c5b91d34c5bda73,,True,True,True,9,16,437,2,True,9,Tests_passed,9798888e4606350edbc1dc604512533f1afcd3d102315e815a89cc028c12699a,True,Tests_passed,28cd9894526d49360f3c978d4fc4869f4dca39c0b6377c35d38d5c46cc2265c9,True,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d 51,refs/heads/master,352e241e0bf2b9c4a7d640dd5ca7795e1b5d303a,c54b8a92a8116c25ec615fa6dcd25c3785e9ea03,04449f8bdb8d9599a319397e13fb2341573302be,,True,True,True,24,220,1770,26,True,34,Tests_passed,2ca0be9b8b1bdf7a68155dbfb7b569b52d36146cea9e2cf58f0e0cbf8b78e5fc,True,Tests_passed,b8c911ed8bf31c3bc89b9f46c56d9f99884da8360a5b4d4d12b8e2ac4b3c05b6,True,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,7d2a516ff6aa94e6de3c9189c3f0b81500dda79c378cd9beab86e4ad7f8b5343,Merge_failed,cda10caedfc68a17f38fb5af7541d574bb35f6e9b2a7334662e01b1d274d4621,Merge_failed,74690a3311fc10d1c053ab778855896a60152007b9c3f0c9d06c99991e5881d8,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,f86f47b73adb50b91630b2b922dd65b716c84218816cf82aa4f5bd25b327741f,Merge_failed,d6cfdf36b386ac7aee6aaccdc55c835a3ff7f17537a73f2746f8ac6c6366d0c3,Merge_failed,f561b849b73f43daf915387d46ebd4ce3b077a602b238f1f99cb9d4c633dcbc2,Merge_failed,382daaf40c6dc28e7fc4e6d9df132193156a54942609a0bb4b2a4de37be0a852,Merge_failed,f7b167b1df0c19763a901ab299042eae4cef6c636d47d303bf321a3698f3d73b,Merge_failed,f561b849b73f43daf915387d46ebd4ce3b077a602b238f1f99cb9d4c633dcbc2,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,cda10caedfc68a17f38fb5af7541d574bb35f6e9b2a7334662e01b1d274d4621,Merge_failed,74690a3311fc10d1c053ab778855896a60152007b9c3f0c9d06c99991e5881d8,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,f86f47b73adb50b91630b2b922dd65b716c84218816cf82aa4f5bd25b327741f,Merge_failed,43ee67606feab9b68da488ef362df0061d6297be10a583002941f747f8403176,Merge_failed,382daaf40c6dc28e7fc4e6d9df132193156a54942609a0bb4b2a4de37be0a852,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,7d2a516ff6aa94e6de3c9189c3f0b81500dda79c378cd9beab86e4ad7f8b5343,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65 74,refs/remotes/origin/pull/198,1c845f11708c837e4eb5351a309618b68c316935,255fd8eb4bee0b7c0ab9a23eee956e3e96afb40e,c588f2c66ba1fd1aaa5c0fbebdf6d345df42f321,,True,True,True,7,20,638,43,True,46,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,True,Tests_passed,8c492f196f2ebe9a4e7672745155c099a9f300e5c84c666f31b3a28a6639c1b7,True,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,1856c14246b46db38b3c9eda4fee4bb0a666873b945c8e6183ff2693c3e9d835,Merge_failed,de3b1e35606ba09d240da3bc458462f41d62afba06b97037b1c303ae698f31e8,Merge_failed,1827547d9b78c91a91105667e2b40c2ce77a21071342218cc330f8c5d2924477,Merge_failed,e46c1f5f00f546bff51f9594184e75728681f817e00f917bf9069fecaadec52d,Merge_failed,de3b1e35606ba09d240da3bc458462f41d62afba06b97037b1c303ae698f31e8,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,7b2870486229755e43094f831d059cedaf2e6348e60f0627f25acdf864a1cd88,Merge_failed,db1a9cb0d7da7be5d49ac2d03674f9f79e310b77f6f2d4a63bf39980f7e21800,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869 diff --git a/results/combined/merges_tested/gephi/gephi.csv b/results/combined/merges_tested/gephi/gephi.csv index c918587444..70aef32c23 100644 --- a/results/combined/merges_tested/gephi/gephi.csv +++ b/results/combined/merges_tested/gephi/gephi.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 248,refs/heads/master,08f9c3e0263df0310cbb975b00b4eab67ffb2a77,9924b0b871a4131c1fec18beacf956f5f839a332,4c342a71593161d772e8e399718bf748252bc907,,True,,True,480.0,1436,,3,True,480,Tests_passed,d4cde71ecb1eb6ce94e44bef35daadc6bafacda78024ab43331fbc26b31a8d22,True,Tests_passed,b05cd9f6c499aa650d215ecdc0ce4adc0bb38f7a546f495836e61f1b022d5bfd,True,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_failed,072f4ab06fa1c253e92b8085c164dc51a8b423ee9af7669deab70d8733e6cf5f,Merge_timedout,,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_failed,072f4ab06fa1c253e92b8085c164dc51a8b423ee9af7669deab70d8733e6cf5f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c 665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,,True,246.0,632,,4,True,244,Tests_passed,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,True,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0 681,refs/remotes/origin/pull/2608,e161809510d2c809c5d9c338bdf90fbe1c32a3ad,f613c0a4ca67c34de37ec9818e8bfe7241d1d9d9,ca58408c314e068c070699f87f910ca253c9b011,,True,,True,1031.0,2546,,4,True,1031,Tests_passed,be104a52cf31665df637e7d15453eec6b81072fe5d02018d323baa7fa310917c,True,Tests_passed,0f769759c85fcd263a1421431d82cd406b16e38be1df08996caaf6017bb796f3,True,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,b78aa20e43be7d979814cb512cb277d84cf876d15d73e530424ce14254d77a48,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,3ecb2345437bbdaea31a8ed8d3b2c3c85a8048ef9492679910d64c5255b7ad53,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,a381fad5f4013f5b6c118b886d01f6c32deb1021833a675b544c83b37c5f6142,Merge_failed,dc80184a4c3540c8587580105a1ae3df34a650784d29b0ff810369cbeb0ccd05,Merge_failed,547a05b624e47220eb56d9253e5057dfd6d8b4a455df34c5fff284f532cbd014,Merge_timedout,,Merge_failed,dc80184a4c3540c8587580105a1ae3df34a650784d29b0ff810369cbeb0ccd05,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,3ecb2345437bbdaea31a8ed8d3b2c3c85a8048ef9492679910d64c5255b7ad53,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,ac629ae16bfad11fa5377dd647b6d6b841cd0629736bbb0fce2adc95b6c06872,Merge_failed,547a05b624e47220eb56d9253e5057dfd6d8b4a455df34c5fff284f532cbd014,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,b78aa20e43be7d979814cb512cb277d84cf876d15d73e530424ce14254d77a48,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc diff --git a/results/combined/merges_tested/getbridge/bridge-java.csv b/results/combined/merges_tested/getbridge/bridge-java.csv index 0ca57cae44..bfc8426944 100644 --- a/results/combined/merges_tested/getbridge/bridge-java.csv +++ b/results/combined/merges_tested/getbridge/bridge-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,35d226d99b31bc824c3a3460ec0611c8572a081c,39385be68dcbf46eacf42c29320fa09a9c27a642,de36e6eace5a1de9121d9fdbb234ecd27efdfe7c,,True,True,True,12,40,942,3,True,12,Tests_passed,091b3765abe2aa56d7f5c1573af9354f930e9de2c7177c89868b711905761bae,True,Tests_passed,ca47144f2183cde325593f9303d1592b1ac5cd08e659f0e9cee28823d1bccecb,True,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,7c36de8f2681f99e91b43c5160b3d238ee7542eaa03f122405b303be8e2f6a4f,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,25d9988fac354423e5f8451b1174a5145a9670c259edf490a7be9cdd24bc13aa,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,cab497cd10a734c87c7961750f6a411cd83f96f44865b2bac08115cc3aedfa34,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89 diff --git a/results/combined/merges_tested/ghillairet/emfjson.csv b/results/combined/merges_tested/ghillairet/emfjson.csv index b5fdef7d21..eaea84362d 100644 --- a/results/combined/merges_tested/ghillairet/emfjson.csv +++ b/results/combined/merges_tested/ghillairet/emfjson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,7aebd6f36990fc52abeb4c10e24f8d987b5be744,e7d28b22ce7e16623e9950d7677c18282e71212b,5bad44904199431d01d5568985e8e28e01951ad1,,True,True,True,34,719,2696,3,True,34,Tests_passed,f19df67228bdc9287b0a7ac458d47f1ca553f3bde7e4c938429e94f304083360,True,Tests_passed,c14394d99e13a4ee10a4a19d6f93ec7ee9a74c8d3c5e9388ecd2b0b2decd0518,True,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,b9d7a70ce8896be7b942bcb4238f0c4871a45849e607a0fa7d23d8ece3c351b1,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,5ed38c52965c4a5bb89647375af1809e5726bd1ded03e025b3faaa1dc59f2372,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,3a8b37ad2b921966f8fbf053ef534e8a3dfff567cdbd5a45d96ae1d10dad583d,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94 diff --git a/results/combined/merges_tested/giltene/jhiccup.csv b/results/combined/merges_tested/giltene/jhiccup.csv index 83ad529b3a..05a9dc08d6 100644 --- a/results/combined/merges_tested/giltene/jhiccup.csv +++ b/results/combined/merges_tested/giltene/jhiccup.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,d16d4676cb1f00ad992149606cab5c8c72dc8c9c,b7cd7f85004b8ed6ee2b8f3c0293d6b1bd22a254,253be6118ea66939ad5f033ac06e07f5f429d2c3,,True,True,True,7,28,96,3,True,7,Tests_passed,1589cbf80c943f530f7837c017761e1552e518d9e056b74286a312191a47815a,True,Tests_passed,8e2a585005b065b3dfb63f16b9f6d5aa03677ec10aed46a6581c380794d68648,True,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,e6e209ca7da34daa1fc28cda4d10ea95a60137a6ce7549ea18a44a69103cefb7,Tests_failed,6b8f458bf1f9b54205f2105bca07ada6a7404c9c8733751a088e04c912b4c7c3,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,e6e209ca7da34daa1fc28cda4d10ea95a60137a6ce7549ea18a44a69103cefb7,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a 24,refs/heads/master,d7891ccaab5a84dd05d0c5272609b89ebd1b0a22,cff9ba508b79a8ea7cb050c77e5d3b67a5e85ebf,04d63c4409f7fc55c85c4ed96274252b4613f0f8,,True,True,True,6,8,14,2,True,6,Tests_passed,0fdfad91f0832933588e70df22f37fc4f9ca0841640e1f006a0d742cec42d1da,True,Tests_passed,26f21b04480af7c661e3a78bbd4daa51958edb2a85d3c57b60141aa7893523e7,True,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202 diff --git a/results/combined/merges_tested/gini/dropwizard-gelf.csv b/results/combined/merges_tested/gini/dropwizard-gelf.csv index 96a74f05a9..e776c1d746 100644 --- a/results/combined/merges_tested/gini/dropwizard-gelf.csv +++ b/results/combined/merges_tested/gini/dropwizard-gelf.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,b1cd41cdb5bfe0b33d5db7718beaa984692e83ce,f6e7bbc12ed553c961d6500d003758b558eb2eb6,7bd73b3b895934e2745d4e86a224ee5de6cfe403,,True,True,Tests_passed,8acdc5b2078b573101ecca3d863d9838fdc65edb266090772b12cafedd52ecf6,True,9,20,57,4,True,Tests_passed,c445b3a0de324fdbf75ddcada0e1df47625412c029afc67ebde4c0afbbf4511a,True,9,True,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,7a93f13f1e4280edcbd8412cce3f92aaf82a9a5df884102a0ed302d64d4925bd,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,5d567941153a325083d50c3cd83b92f336177fc09ed043bfc88eb08eef0a6e41,Merge_failed,dfb2b1ba7d1f2183880da9c1640a5668df3af0ea1af23c0fed41c218c717ed6a,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,94f3a835bf9bb8601f7e7a2faec3870f347c7e9e1d24fd196e9ef1df8ccd845c,Merge_failed,9f140cc7f2258ce2969398904642668f60e503191ff338d2f19ada81fcb721ef,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134 diff --git a/results/combined/merges_tested/gitools/gitools.csv b/results/combined/merges_tested/gitools/gitools.csv index 0eb9023c2f..1682d31db9 100644 --- a/results/combined/merges_tested/gitools/gitools.csv +++ b/results/combined/merges_tested/gitools/gitools.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/develop,ae8c217d5c1c1382749dfaf6a80bc597515b50ae,d91dae59889794ed2bdd72642c465f972f88db3d,92399c10ae77960eb1b64ace0ba25817f582baa9,,True,True,Tests_passed,dc1c77d709db16dfe891fd84a0310e86b7170e3ec460820ab7d5876cf5076c19,True,107,331,1564,5,True,Tests_passed,cabfd84345f258409a1e6cc666c85b51e7f48a9e133db1b9fd4ea7a9cbca129c,True,111,True,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,bcd55ab8e5de19216df6bcf142b519d908891363647e0494eadf09a3990c774d,Merge_failed,9319c4c9e8d94923245d50b7fe69e1e413a0ebd4e412e68f8dbd9dde2cf4c2ec,Merge_failed,88113bc54e2f7cc74d8ee0a2898c45724c5d6e1d502ce74b97e8a25dbec70794,Merge_failed,c2377bde5190cbcd94ff2a7bec9b7420998553b2e868782a19367d6430c2378a,Merge_failed,9319c4c9e8d94923245d50b7fe69e1e413a0ebd4e412e68f8dbd9dde2cf4c2ec,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,bcd55ab8e5de19216df6bcf142b519d908891363647e0494eadf09a3990c774d,Merge_failed,ca7e9ba9a563759f32c70d0b4e364ce1f80f91bbe5e05d612eca9bdff34931a5,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3 21,refs/heads/develop,0b5eaca790bcfa8fb61281c4f6fbc18561a7d352,2c205ff3eb4ad5d20267dad46887f539655a4e7a,1fdc1af81d078557ff92260ddf19d6ca529fcbc7,,True,True,Tests_passed,30d64da2a6878ce1c31d683fcba8c91c65eabad8fb558d09ca053336aa413ae1,True,35,92,671,2,True,Tests_passed,b6738abf256ed5bb7d92db23d1dab0a007b41f94dd8ef21a62dee264f4129c32,True,35,True,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,65543665735681087371d884b0c6198b2397db5e06664e34159449763dd9eae1,Merge_failed,19a961a38cc1483936b794f47367f153d42fab469bcd45a69259bf64fc4a1647,Tests_passed,14f90f8622ada9404add6afd14888b8097ddc9dfbae490c4a81690ca4c0ffb83,Merge_failed,22411332415672e9fd6552926516241bd06749bb194831e33b05407e63a649a6,Merge_failed,19a961a38cc1483936b794f47367f153d42fab469bcd45a69259bf64fc4a1647,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,c6de59c438781b9a8c683053c514a58507910af7c6c0448f78cec84fff079879,Tests_passed,14f90f8622ada9404add6afd14888b8097ddc9dfbae490c4a81690ca4c0ffb83,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb 24,refs/heads/develop,6f133251f129797ec4871b6c6ba906a1be415129,84d46ebaef9debb9dcb9bc698e6d1baa08f606bf,49c8589ffe0ae331e160f07773147a4515d3e2c9,,True,True,Tests_passed,5b69781563d564698a18b96021be3c0186346b00daa16cb4cb437a972e0307d2,True,22,87,290,2,True,Tests_passed,339f12b265cfbbe386f83d6c519225e9c6376716dcc9153a7b15a46b507b98a1,True,22,True,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,acced8cafbb270986920a4af4be367c523064e0717d0c3b758c4b072f93a3b03,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,acced8cafbb270986920a4af4be367c523064e0717d0c3b758c4b072f93a3b03,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705 diff --git a/results/combined/merges_tested/giusepperizzo/nerd4java.csv b/results/combined/merges_tested/giusepperizzo/nerd4java.csv index 3644e3e0a8..e8cba9f7b6 100644 --- a/results/combined/merges_tested/giusepperizzo/nerd4java.csv +++ b/results/combined/merges_tested/giusepperizzo/nerd4java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,2aadca9519e8fb2a4deeebc9b9ea84c80ea99bc6,601cd85d90c07c437fe308ece191569491a4bd60,7d6f9ef82321090583acc0f9df5d0fa8963f3ae0,,True,True,True,2,2,52,2,True,2,Tests_passed,cf61ee6aea03216e56e36dcd3383e236dff6bd0530d5132733d2f098179ac981,True,Tests_passed,b2ab4c6a026133cfba798cba574544d9beee86dd3a5b3d8e284b0e8de6800723,True,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead diff --git a/results/combined/merges_tested/glamdring/aardwark.csv b/results/combined/merges_tested/glamdring/aardwark.csv index 7711e7899a..a238157b8e 100644 --- a/results/combined/merges_tested/glamdring/aardwark.csv +++ b/results/combined/merges_tested/glamdring/aardwark.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,816b3dcbe225e44aad654576e877b58b79f10df4,3ad4b9fb5759883439e0b8b2fa746ca1ae34bf15,0d3190e5ce36843e2991ae5fa4ee2e482f7043fc,,True,True,True,4,18,111,2,True,4,Tests_passed,5b30f75c1f524f2567c06f93d0cccbb6d1d01187a7663be37f38e1a459c0d67d,True,Tests_passed,5bd66791b9fc8fcbcdce120dd7a2e78be0e63aae887e637f68456fd224b9dd8d,True,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,a601d508a3e4ee4bd270696328ee37ec82fa0aa9f9789281ac426b053135cb7b,Merge_failed,f561c15d2b1aa605bc79f1e94b0484696683c6113360d805ffa1d74770648cfa,Tests_passed,6ad8c979f0dc29a9859d011a5009b02a4caffe2b2e608f9e3fd708096ce48751,Tests_failed,c67090533b818138d93d4aa6fecf7620c92afc4d30008c895ea5bb807209d86b,Merge_failed,f561c15d2b1aa605bc79f1e94b0484696683c6113360d805ffa1d74770648cfa,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,9a1a2421c60256fcd91695963533a969f654b9e2ef85f45e97d713415b57336f,Tests_passed,6ad8c979f0dc29a9859d011a5009b02a4caffe2b2e608f9e3fd708096ce48751,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722 5,refs/heads/master,8bab377cc754b72f9b0d1181a98227787b43758a,12af56162aaf2449a6fd642ba890112a38f4e7d0,4bdde8ed558c76923d845169a63b03ed35162761,,True,True,True,4,42,208,3,True,4,Tests_passed,7cf3e7509213b3a5efc6e8e5ce377cb7dd31333d087e92390d0555bf621b34e9,True,Tests_passed,b183aaa6130ecdc7cf137a384d50d096599a2374722fa163b181c20d20252c61,True,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,4f7241f3fd33c9fe3e20b08b277a43ecbf1a53196bf2b03be6e83a52e521de6e,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,ed3e0e1b261da130c758f645813f5862c012848b683eaec93aa6c00b9b0bb351,Merge_failed,a83acc620d07cf99c37263ace4b016e2f83ba3836545648d4b7b780fc6b2b206,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,2c86c694c76c565ab816b18f8616280cead675094b31c8d3f9a487dab4ff5cf2,Merge_failed,24fc2fbcced7c590d3a4937192d5dd08727295e70cdc7d752791fb63647d34d6,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401 diff --git a/results/combined/merges_tested/glenkpeterson/fp4java7.csv b/results/combined/merges_tested/glenkpeterson/fp4java7.csv index edac8edbbc..23059194d0 100644 --- a/results/combined/merges_tested/glenkpeterson/fp4java7.csv +++ b/results/combined/merges_tested/glenkpeterson/fp4java7.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,27ff032312795971580bf0955e9546a1d3671d5fb0908690dc0410dbb0e76168,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa 10,refs/heads/main,6244c5c7af67fe2de6cd4e29b383bf25ffd623af,de5a30ec5f888ceca9893d2d79b8312c20c7645b,6b90238ab238a893c094f7c2a01a8ee9db0db058,,True,True,True,50,157,5024,5,True,50,Tests_passed,a8889e5ef497004555b9a61ca759fd48806200f4d886c022f06109148a1eaee6,True,Tests_passed,a147b9381cae45a6bc8186814735c2d136291ecb56cdacb886f6b739858accc1,True,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,664938212d500c1f5fb5e4b2c5d65bdfed867c0b3c2f4e5605852d33a11c83dc,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,1b0215ebe916dada18bf241f4cb4c5811ff44f0656e404ea69628f12310003ce,Merge_failed,446e88d0665b5b3edf0ca440b686134f0869c146f7f09ef04a7c1fa261dda92a,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,5d456342549d7dbaceeb6eab8ae3fc395701fa665de889f6813490cf808770a9,Merge_failed,8874ddfac000ebb635c63fa28e33f7e6f2e65577e6b38e7e4ed3b81612949c39,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354 13,refs/heads/main,4ddc1a633e1da26cd56fbd4a20936283cc0ac731,2e76297a322a0736fea62aed0a0c0684d2b6035f,37b3c6fede124aa6d2d672c136562a6fea231837,,True,True,True,101,997,9329,6,True,102,Tests_passed,9555f7d749d34d31d3e05a8b53cc75204bbd8650b5a0d571b46e1557c0d07423,True,Tests_passed,0f460be226a3d0f59ee8d9e947e3bc981254f6027b027f41cb29cec8a713a8c4,True,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,b4f7d8a6a0472b59fe62643f210b488b7fe8a50abbcc51b99f50472084309e90,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,7bb4dc3612443020d97109901daaed259e331fa123f2f1d8910bc0851856f042,Merge_failed,6933963a2a93f448cb60003deac8234a5cd13a8b8eae2e6fc01b62b34ff6c19b,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,5963d52466d5547139c6570e39cd6714e3d0816ededfb7c8f627e2e0e54cc13c,Merge_failed,d9fce9541286153ee42caec7d6573138f90d73b0fe4fa24166c3f48399f95f46,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5 diff --git a/results/combined/merges_tested/glenkpeterson/j-cicle.csv b/results/combined/merges_tested/glenkpeterson/j-cicle.csv index d1448fe757..cae1df5b62 100644 --- a/results/combined/merges_tested/glenkpeterson/j-cicle.csv +++ b/results/combined/merges_tested/glenkpeterson/j-cicle.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,3132a5d74058033d3effa9681735028eea63e64fed17dc7a7d0a0ba53bd231cb,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa 10,refs/heads/main,6244c5c7af67fe2de6cd4e29b383bf25ffd623af,de5a30ec5f888ceca9893d2d79b8312c20c7645b,6b90238ab238a893c094f7c2a01a8ee9db0db058,,True,True,True,50,157,5024,5,True,50,Tests_passed,a8889e5ef497004555b9a61ca759fd48806200f4d886c022f06109148a1eaee6,True,Tests_passed,a147b9381cae45a6bc8186814735c2d136291ecb56cdacb886f6b739858accc1,True,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,664938212d500c1f5fb5e4b2c5d65bdfed867c0b3c2f4e5605852d33a11c83dc,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,1b0215ebe916dada18bf241f4cb4c5811ff44f0656e404ea69628f12310003ce,Merge_failed,446e88d0665b5b3edf0ca440b686134f0869c146f7f09ef04a7c1fa261dda92a,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,526e0f559471080b0e65ab66b2236ea4e1ea1d8d0f926d41e09f1d8065a57e6c,Merge_failed,8874ddfac000ebb635c63fa28e33f7e6f2e65577e6b38e7e4ed3b81612949c39,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354 13,refs/heads/main,4ddc1a633e1da26cd56fbd4a20936283cc0ac731,2e76297a322a0736fea62aed0a0c0684d2b6035f,37b3c6fede124aa6d2d672c136562a6fea231837,,True,True,True,101,997,9329,6,True,102,Tests_passed,9555f7d749d34d31d3e05a8b53cc75204bbd8650b5a0d571b46e1557c0d07423,True,Tests_passed,0f460be226a3d0f59ee8d9e947e3bc981254f6027b027f41cb29cec8a713a8c4,True,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,b4f7d8a6a0472b59fe62643f210b488b7fe8a50abbcc51b99f50472084309e90,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,7bb4dc3612443020d97109901daaed259e331fa123f2f1d8910bc0851856f042,Merge_failed,6933963a2a93f448cb60003deac8234a5cd13a8b8eae2e6fc01b62b34ff6c19b,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,e0bfa6095b322b942347d66f67930ce12c3cc64d192dceefb5abefa97ebb9ccd,Merge_failed,d9fce9541286153ee42caec7d6573138f90d73b0fe4fa24166c3f48399f95f46,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5 diff --git a/results/combined/merges_tested/glenkpeterson/j-sicle.csv b/results/combined/merges_tested/glenkpeterson/j-sicle.csv index bf0d109315..11ed355785 100644 --- a/results/combined/merges_tested/glenkpeterson/j-sicle.csv +++ b/results/combined/merges_tested/glenkpeterson/j-sicle.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,31e00884b3d9abcd9100d95c354e69464257469353db9f5c1b4fcda8641360b6,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa 10,refs/heads/main,6244c5c7af67fe2de6cd4e29b383bf25ffd623af,de5a30ec5f888ceca9893d2d79b8312c20c7645b,6b90238ab238a893c094f7c2a01a8ee9db0db058,,True,True,True,50,157,5024,5,True,50,Tests_passed,a8889e5ef497004555b9a61ca759fd48806200f4d886c022f06109148a1eaee6,True,Tests_passed,a147b9381cae45a6bc8186814735c2d136291ecb56cdacb886f6b739858accc1,True,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,664938212d500c1f5fb5e4b2c5d65bdfed867c0b3c2f4e5605852d33a11c83dc,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,1b0215ebe916dada18bf241f4cb4c5811ff44f0656e404ea69628f12310003ce,Merge_failed,446e88d0665b5b3edf0ca440b686134f0869c146f7f09ef04a7c1fa261dda92a,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0a14fb7c39a41f31f40f6eae84aff385e15f9aa5e9206182964bffa0441c49f9,Merge_failed,8874ddfac000ebb635c63fa28e33f7e6f2e65577e6b38e7e4ed3b81612949c39,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354 13,refs/heads/main,4ddc1a633e1da26cd56fbd4a20936283cc0ac731,2e76297a322a0736fea62aed0a0c0684d2b6035f,37b3c6fede124aa6d2d672c136562a6fea231837,,True,True,True,101,997,9329,6,True,102,Tests_passed,9555f7d749d34d31d3e05a8b53cc75204bbd8650b5a0d571b46e1557c0d07423,True,Tests_passed,0f460be226a3d0f59ee8d9e947e3bc981254f6027b027f41cb29cec8a713a8c4,True,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,b4f7d8a6a0472b59fe62643f210b488b7fe8a50abbcc51b99f50472084309e90,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,7bb4dc3612443020d97109901daaed259e331fa123f2f1d8910bc0851856f042,Merge_failed,6933963a2a93f448cb60003deac8234a5cd13a8b8eae2e6fc01b62b34ff6c19b,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,25a4b1846f4ff2f7aa25ef1cd2775ff18cc524347918b066c4012043fbb8357e,Merge_failed,d9fce9541286153ee42caec7d6573138f90d73b0fe4fa24166c3f48399f95f46,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5 diff --git a/results/combined/merges_tested/glowroot/glowroot.csv b/results/combined/merges_tested/glowroot/glowroot.csv index c0bb48ef4d..99968c349c 100644 --- a/results/combined/merges_tested/glowroot/glowroot.csv +++ b/results/combined/merges_tested/glowroot/glowroot.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/1013,e8c978e053f83b6550d4c4102fcd7c99cbb5c8fd,e7eb1160a6246dd879aec61388cc67a24ae818a7,9d20a168dba0481c8cc15326f4079ed7040a7ae3,,True,True,True,488,647,1660,2,True,488,Tests_passed,0ab3b477a2229db3d6a48621d52b0f051bdef817cbebc3531fc948935ba56196,True,Tests_passed,a4c343af08bd19dfae9f98ab6ebeadb4fdac8b86bbea09ca1656ebb6cd24e6ff,True,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Merge_timedout,,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7 12,refs/remotes/origin/pull/724,5edc6961f8576c72256fe9d28b358dc6e35ff997,dbcbb453a0db7c77cf8cf7a43797d4b9e2d214f7,b65d9a9f8972dca4e392c61a329110a32d3826ce,,True,True,True,437,1583,8291,4,True,437,Tests_passed,29c8903501e26b98c7b7c54ee02b034c3c6bb59aa0fdb3b13ab5e21657d06a62,True,Tests_passed,1496169c6b0ff819f6c459675878b405b429592a0a7889bdf6fafa87a9f8683d,True,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef 14,refs/remotes/origin/pull/747,cd742cbab46c2c628a0482b2a85bd1d9c2c926e1,c2bf1564766df2aa8a4ccf36577e49da20b34ea6,e61c50a4a8a844c0b417a241ba6b09f13534dbf7,,True,True,True,430,1537,8064,2,True,430,Tests_passed,f69b67b67f7accd2d0d77f95ecbb6a5a4bef413dc0d8b0cf7e07ecc45652c6c2,True,Tests_passed,8c410534ba97335b002e95a13dcdb0f5c5acab77ea77a2f98bd3775f086532c2,True,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,5877e2d3d4589f2c46b22071dc2c2f3fa3f58a260b4f40204543ac593827bdff,Merge_failed,3cd016f91dc75047275a5942d34f1d2fb848a3a8c176f459c9e3912f02f25018,Merge_failed,3b2d50486d6b165e8f00b5606617bf5c79e5bfde2123e9016ff778e6eca0b67b,Merge_failed,3b2d50486d6b165e8f00b5606617bf5c79e5bfde2123e9016ff778e6eca0b67b,Merge_failed,3cd016f91dc75047275a5942d34f1d2fb848a3a8c176f459c9e3912f02f25018,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,d969868b2fe5e9faf65377b7cae2e28408f34fd9de56588369dc7871b13c5418,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a diff --git a/results/combined/merges_tested/gooddata/gooddata-cl.csv b/results/combined/merges_tested/gooddata/gooddata-cl.csv index ae5a61236d..c379339fa8 100644 --- a/results/combined/merges_tested/gooddata/gooddata-cl.csv +++ b/results/combined/merges_tested/gooddata/gooddata-cl.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 79,refs/heads/master,3e4b6e9be621f2a3369afc42471e3c73fbc02c87,34ff195bdae97dcd61e7593c9ba401163fa564ce,e426b4467358bd5e9b7b1abf11e99ccfe1281642,,True,True,Tests_passed,a1e27c7f29163bf05fe9187dad4a39d6dcab9bcb8cef4c2d9cdd47cd0d50979d,True,4,15,99.0,2,True,Tests_passed,91a5fdd8dc7355a7336b42a01cd5cc3c0dadcfa42e82c289b69b4470c3234d51,True,4,True,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,46fa6fc92de1b37a82287e04d502936e1591665e619a987e0ceb2643035afa95,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,46fa6fc92de1b37a82287e04d502936e1591665e619a987e0ceb2643035afa95,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5 83,refs/heads/master,6d9e980fafb82e19229dc2b8cce0bce82e06b6fe,f10188e01fc145bd6ecfa6af3c7a523ddf0534b7,68d3bcfe5371c392e10d369e32bfbe42e9e9146a,,True,True,Tests_passed,79d09df689fe367cf74d1d5b7797427adf97db6fbd876876f22bf726599141af,True,33,308,1334.0,2,True,Tests_passed,413887506a531e1dc2b013cadda43765008816ec83677a7d66767873e1959354,True,33,True,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_failed,0868b4fa71aeb4e0ef71cae9156409b1e9c3fe137f499bc14f7becbe00593417,Tests_failed,9d4fa608a98543986b720c91df7b3c40e7502254e2315a44e70bdd53869e53d4,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_failed,0868b4fa71aeb4e0ef71cae9156409b1e9c3fe137f499bc14f7becbe00593417,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e 85,refs/heads/master,4f5b49dd22c7b737534066e11c28d8c1dfb781c7,3819363e5e3d428510525ca3fdd574615ec157ee,f50305973ee77d0d4c8c27b2302d60c0f6bebea7,,True,,Tests_passed,93b1f2ee7dcdd18adc1339a3a51eecd8835b78ef328e5f7731df424cfa6383c6,True,47,179,,3,True,Tests_passed,61e3e0816e06f2960d6298d8e72547dc748524c628193adfd730a25abb4b5f67,True,47,True,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,9626ec4f3a0ae55d32f6e46736a29c8a7830244c0fa75296323cdca2c3731711,Merge_failed,9cf97de2557c616ee0ca91259681e7823c6c5a3697f1c0681d2ddf20584dd89e,Tests_passed,55475e0967a54452a128da339c7b04c8bdedded5cc9520ec5f6505a533f22865,Tests_failed,fce85b75550e8e613c474aa10094b9c8e7a394f439b8a0c964a45f0704dbcbe1,Merge_failed,9cf97de2557c616ee0ca91259681e7823c6c5a3697f1c0681d2ddf20584dd89e,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,9d47130cd6294181d9d6802fb91ac58f8f579cc10bc5d3ce21e0f25f3782860f,Tests_passed,55475e0967a54452a128da339c7b04c8bdedded5cc9520ec5f6505a533f22865,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56 diff --git a/results/combined/merges_tested/google/closure-stylesheets.csv b/results/combined/merges_tested/google/closure-stylesheets.csv index 2c5a1837b4..47c94332b7 100644 --- a/results/combined/merges_tested/google/closure-stylesheets.csv +++ b/results/combined/merges_tested/google/closure-stylesheets.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/79,db92c42dd890921c3f05b3a5ad70436b6d77f9b4,f7fe702fc889653584011e04580f2a17acfe3384,d2c0cce5c11891c086a3d055ec84e96d5b9cb559,,True,True,Tests_passed,d1cb7d86dc008c515bc6d50dad932d23ba24e7b120494ac95899a207fd332ce4,True,162,2577,11090,5,True,Tests_passed,a5fa43b88ad30c2a5aa421ca7c3bf481a28d6397e415a3fea44e55f0fe02d386,True,162,True,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_failed,971e253b4153e9f7cafa7e5672ad217affe6bd874e3877833344868e6f436f65,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd diff --git a/results/combined/merges_tested/google/compile-testing.csv b/results/combined/merges_tested/google/compile-testing.csv index 3fc58c7829..5ab968b44d 100644 --- a/results/combined/merges_tested/google/compile-testing.csv +++ b/results/combined/merges_tested/google/compile-testing.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/main,b62b506d4e7f5029d1ef67d56893f9219e1cf998,51077bb186720fb68249f9bd09de051fc0c53f19,20ae93d1383ea0db964cadc4aa16f9808210bd51,,True,True,True,5,21,88,2,True,5,Tests_passed,76d4410648ed69ff2d49805dabcb5bdd48a316db0c1a6ebce8e9c2c14178f46c,True,Tests_passed,556b5df16f7a7d10131c4f868bee154788743d703d307d461a1b78024286bab0,True,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,ad34eda740e27fa42e0bf44da8238416c65a9d32e02e1a22dc03a58425d3406c,Tests_passed,31d883c9e0ae87b5bf9d8748899e18a5f356c0e0ad4f27bd1abf0f184e4b8573,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,ad34eda740e27fa42e0bf44da8238416c65a9d32e02e1a22dc03a58425d3406c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c 36,refs/heads/main,608e1cb92ab715862a2f545cf3c57e6d35ea8216,68793277942607913ed80406a80bc85e5f704d93,e4526c30efb60151257f09ebc7195b2c850acfbf,,True,True,True,14,64,548,2,True,14,Tests_passed,255f5503903ef25b5c4b1e70e49d93440bd497b95b73d207b44cc4e2a7c55e97,True,Tests_passed,6e32f9694974e9b09a3c3d28bcbb2a22632453716e92279cfb2dbb4170850915,True,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,fc29f1f7ea14f6d80b25f5d80bb72c8339f6dcb83a6734a2b561234b2a84c39b,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,2777ba35e93e405f30548acbe3e64e7d3c2aa7eefa15ae1e4f54f0669343be31,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,41a372faf0dfedbaf29f85ff72bcfc13d3a6e1c9ffe6d4e6d9f3e10f343b0f2f,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33 diff --git a/results/combined/merges_tested/google/error-prone.csv b/results/combined/merges_tested/google/error-prone.csv index 2f1aee4a7d..51331b6e2c 100644 --- a/results/combined/merges_tested/google/error-prone.csv +++ b/results/combined/merges_tested/google/error-prone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 142,refs/remotes/origin/pull/2946,c77eec536553d66d9500dcad5f962cce744b89d7,d5721137f8f37f138befd87fbc6b02ef6b53221c,f546548a41de98d6e4da4e513ce7b791de55057d,,True,,True,609,1609,,2,True,609,Tests_passed,12f9ae7410c5a659f000b2b3f715dc434e3e42351458e8abaac2600612f810da,True,Tests_passed,31660ff72321a7f63d2da283f013dbef6199e426164e076c9b6f9c890afe2ea5,True,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,c6b26a5321911fba857702c15ec4808123e4f6c8719ff6da6788199806392fc7,Merge_failed,ff4f24cee99ff1a1ee27585f15dafe204202e3f61703b9d39b173418138d3a8e,Merge_failed,a8d37777fc6a09fe65bb668a1545419ecc1bae803253bd9fa542f52e0a9bb745,Tests_failed,478515016b452c09640d72e7be9868b5d69ca9d2cc620aa46e017866ef547ef5,Merge_failed,ff4f24cee99ff1a1ee27585f15dafe204202e3f61703b9d39b173418138d3a8e,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,c158fca1364033c0fc2f4440f8c76a09a303b0e1e2a20d066c123e0d321a6ae0,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2 148,refs/remotes/origin/pull/3037,7c82fb57c57be56bc8276821c37372d1f2c3b8c0,67e44eb939e948219dbd6a44e80f1453bf64dd76,bc5c994d5cdbdd9e06afd636c21c99e82ff3246f,,True,True,True,5,11,47.0,3,True,5,Tests_passed,f6e7391365b398d6e0949117d67df87c22cced148659b875a80e83f5a8a9378f,True,Tests_passed,d23dbee252084f2200a601c21af777c87250b538b39c22f7c9bda9265453dce3,True,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,8c1c887aa3a90b51389033d85a621c235896337274fd0ab17dedd0f497b1fcdd,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,3a0f7882df8e4a3b69d1f683ec57ef3dd91f6f49736d96d3fc50918afc08cf7f,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e 153,refs/remotes/origin/pull/3837,2ecedd4f92f9056fea2dfd73b790f6d422e10943,89e2ba9efbc6a3f1ff0bf78183a6f7b95971a5ab,1c1f0f873a82cf657eaaebeab878e017de42474f,,True,True,True,116,340,5226.0,3,True,116,Tests_passed,62029fe52a5c266c6db910d12de7b0a7a5859f1ee38b4e8f3b8bba79fd638d21,True,Tests_passed,529130b74ed59c904a22c1e470f718811f65e37a81ac139ab66214488e530569,True,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_failed,b1eeec0cb917bea78ef72f160aa67934c6a98f739e7d971bf1a5e5ad43d8b2af,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace diff --git a/results/combined/merges_tested/google/google-java-format.csv b/results/combined/merges_tested/google/google-java-format.csv index 7277c6500b..c687def347 100644 --- a/results/combined/merges_tested/google/google-java-format.csv +++ b/results/combined/merges_tested/google/google-java-format.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,True,8,26,91,3,True,8,Tests_passed,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,True,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,True,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,a2bf12c51e1298751cec7a732cb1040197b20263453e1380caa519e96100d774,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Tests_failed,dc9dfd5b92c0c56ce6537f6922a3ebb94a51ff5cf9e13941af84ddc60dcb8e53,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,f35c7e0c441e2597ff0129de7f72f046f02bf70ac2f4111b988fb3acedb13474,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4 5,refs/remotes/origin/pull/237,7f8dbf83332119bf2a5524b75f93e7b519094c97,29b4457888df1c067af81d530f2b6878522d4ed0,f29bcc9479fff1a465f322c72c040a7e51483b4c,,True,True,True,4,4,78,7,True,9,Tests_passed,d08c475f37570ec422d27c2d3ba7d41e44735979015372d9ed7dc40647bdba30,True,Tests_passed,ecf4e1d7011be21b3887a45de74d648768751535b52b2d54064b190fd5289a61,True,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,fbe0f829114fa1273ab1a01a75a1d8eaa0f0331bc742717236e34dcfff9719cb,Merge_failed,79d8321cda44e86b4dbd16e6bc64a0b28e90b08909b482041740e8342102bfc7,Tests_passed,88394a0738bc6174c11aa8ec70f35e636f635df94fdd265f2b4ba9992ff4e9fa,Tests_failed,343428701852afc53ce08cca27d4aa9d6c3ad3c5dfd287c664fa61ddbca13a4a,Merge_failed,79d8321cda44e86b4dbd16e6bc64a0b28e90b08909b482041740e8342102bfc7,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,78627019a1431cce25bc4e8c3fa71bde103b27005d92207cd45d33b1a7f70a15,Tests_passed,88394a0738bc6174c11aa8ec70f35e636f635df94fdd265f2b4ba9992ff4e9fa,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4 8,refs/remotes/origin/pull/558,ff60675a0c7780375b7c6e25eeca4ffecaa6bfb2,c537db84f71204dcd0d79c3374afb0424f368fac,32b63aa2e4675cb03fb853ea84cbc37792e442a4,,True,True,True,35,95,495,3,True,35,Tests_passed,6ce9a9ddeeaf0fb7685cb846ffba6e1b85428c82acd3b4b8bfd8b1bb6772f25d,True,Tests_passed,1fea2929c36307dae063016420eadd4daf5e1676eb90fcae87b22a1a991484e7,True,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,e23153b2aedfe6176414accdc8b94ab43076fc38902b01596799d295ffce6fa4,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,e23153b2aedfe6176414accdc8b94ab43076fc38902b01596799d295ffce6fa4,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c diff --git a/results/combined/merges_tested/google/guice.csv b/results/combined/merges_tested/google/guice.csv index e13cc33853..66c4abacd8 100644 --- a/results/combined/merges_tested/google/guice.csv +++ b/results/combined/merges_tested/google/guice.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 91,refs/remotes/origin/pull/1337,ffe30c7e3aaed880abdd03d3b9c1a87a723ba163,64180387bbb3e154427a2a37ec32a8fe5fdb3cda,338d0039c1e30038f22f0d5544842c1e87406a8a,,True,True,True,300,1899,27721,3,True,300,Tests_passed,6ed1fc4f6c90560a2535b2cb804e7a565acb6250f2d6c2286d1a8e56a020519b,True,Tests_passed,33471759706ea8d0fb998310a24a6ddee14321e3408978c76b19f5213b2c4dfb,True,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,1d4430f8e61c48f2eb391218ad5bda11c8c90e6a4618e1546fe30905eb3da570,Merge_failed,1dee3e6a0c5915156de28efd35129b8c4fba03a68684844a39118f9c0dffbc66,Merge_failed,0eaa006f6ccbbfe262a1e9e6efb1ed1cb2114d9c926f9c40665350ef076b8c79,Tests_failed,8b1ecd751934bb5f5b195eed525d7a7f9c25459a6b5e26e9d45f10c0d2e6a92d,Merge_failed,1dee3e6a0c5915156de28efd35129b8c4fba03a68684844a39118f9c0dffbc66,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,bd85a1092d0b4f432dd48a607218f600d4f196facf97aa24d324170a3fb3cbb5,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e 107,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,True,106,455,5307,4,True,106,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,True,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,3a1f77ded00d278912d1bb29b2c00bc14142b278ab618eeb3e1ce926a7a48be9,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d 108,refs/remotes/origin/pull/880,3582277dd2180a3561c903f5baecef9817a41463,92903d3974fcb8275e7c610e5eeda89059b060d9,c040e3797e30f4b52df1a10637259b2e08f1c0de,,True,True,True,2628,3640,1590662,18,True,2628,Tests_passed,9947874066e2629adf52c572abfa8dd615895b40ab5080f0325094b38053d911,True,Tests_passed,590a30ed04cfd168dd19c8bb1841b6fd75d234c23f558fdb7fd4a59ad2bf33b4,True,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,690d16e0fee78d047f6d492b675c4c08c4af7760de4d234ba7b1ec9349595933,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,36033a809a6ad414a7f8988e6bd80c6e6a70be8f8f08668db3dda329e7213bcd,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,161067042616ba8c81030ac990b71a668844b31196f2148035b40e0a5a3e159c,Merge_failed,ada6047675a4663170f5f35abbdcdf96bcb79ce3c26d98254ef0908e7ec6add4,Merge_failed,e8eaf0bb226611eb5b8b8347a4edc58fd74c2624d1f34695ca15ceb4bf02878d,Merge_failed,59849b17bd4b3fba05de50bdb47057e40389e466111c42bc6668d00ee55f725e,Merge_failed,e46a0848aa29e3c07934fbb04697cb5cafa55b951b75fbd7840ed1e02ddc2117,Merge_failed,e8eaf0bb226611eb5b8b8347a4edc58fd74c2624d1f34695ca15ceb4bf02878d,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,36033a809a6ad414a7f8988e6bd80c6e6a70be8f8f08668db3dda329e7213bcd,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,161067042616ba8c81030ac990b71a668844b31196f2148035b40e0a5a3e159c,Merge_failed,2f98eaec517bf6d8033b4f760923c083865fb39ad546184bcd3f5b6a97c06b62,Merge_failed,9a1ffd5ba538e2af4d001ab9307af0cc6a22a6ff2768e217f1ad39a75cab8dc4,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,690d16e0fee78d047f6d492b675c4c08c4af7760de4d234ba7b1ec9349595933,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139 diff --git a/results/combined/merges_tested/google/gwtmockito.csv b/results/combined/merges_tested/google/gwtmockito.csv index 2897d38918..23364e0c05 100644 --- a/results/combined/merges_tested/google/gwtmockito.csv +++ b/results/combined/merges_tested/google/gwtmockito.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,eec530f0d51313698a334c7dbf5906d950994698,3abecd684fe2109616c9cbf2e9c84c9ac962f129,392723cada499dd23b6808932e3007614dbef0e6,,True,True,True,5,8,125,2,True,5,Tests_passed,05172c84133878ea46ab524752cf6bf05b88f3a47c8313479d48f7b3717bbe4f,True,Tests_passed,b5fbabb3e1ecf8afa1b951f857fd02b4be01a0e14172382e845d35a259e75ae2,True,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd diff --git a/results/combined/merges_tested/google/identity-toolkit-java-client.csv b/results/combined/merges_tested/google/identity-toolkit-java-client.csv index 7a216002c7..8fc12583ad 100644 --- a/results/combined/merges_tested/google/identity-toolkit-java-client.csv +++ b/results/combined/merges_tested/google/identity-toolkit-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/38,f6edc3c022d66b33913deaac59cb7f42ab46303a,b86a722430a5458bc1183b2133b55de75eb71c2e,7d39b4815e3aef9aa5944f44ce7a96fb4915a7ba,,True,False,True,3,4,14,7,True,8,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f diff --git a/results/combined/merges_tested/google/truth.csv b/results/combined/merges_tested/google/truth.csv index 4ffa4429ab..7496f9cdfd 100644 --- a/results/combined/merges_tested/google/truth.csv +++ b/results/combined/merges_tested/google/truth.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/master,6bba06199f634cae5daafbfd70935a7d76871fe5,39fa8ab5fcff494fa1ed70251869dad3816be3ec,0282392866a66e4828d75b1475dfe17b8e827e44,,True,True,Tests_passed,3084884d2027fc037bda642caaed427e4ed51ef4b912921b309165f3df3308d6,True,19,50,288,2,True,Tests_passed,103fa94c7ce6ff4f1b0fe84bd2204daafa69879d0bfb89d2329d6957c31ec674,True,19,True,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,85ed3b8eaa233ef29e8576b8b0e42ad43b240e0604764c5f41079c969a6c67c5,Tests_failed,d177b4181eb95d346a50ed69b2052e1cc595bdff1454624df14b7e2de2b92e46,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,85ed3b8eaa233ef29e8576b8b0e42ad43b240e0604764c5f41079c969a6c67c5,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4 50,refs/heads/master,ff195129ec6e45449f583a049be3b5a1f9c56a20,d87f02dfb380742e3a27374025cecbe0fdf84f68,1a99ae4aa2eb3d4df4ef4c1779966c6d66721b63,,True,True,Tests_passed,01326b5a10a18929ed0a57a32d0b7eec82faa0c9a83d5c008dde65ff95ffc089,True,13,29,501,3,True,Tests_passed,b861f94b18c119b25fe907f2a49e3935f92560e727f752f70b4191634481af31,True,13,True,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,2614a7aa06caaeb02d3f656e4e46465248f8192efdc3afdbaf83b67e8d65d00f,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,2614a7aa06caaeb02d3f656e4e46465248f8192efdc3afdbaf83b67e8d65d00f,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4 57,refs/heads/master,2e4a23bebbce280861453c0d6f6f0a3dfd0e6dde,a9381d46a71766517f5df21c00a57a3c3f4a0417,5dda414fbb153f5cb20a88611f034f0ba14ffdd8,,True,True,Tests_passed,e62f6d500f4d21fa0095de89da0eb963dd154425eb243055592ffadf0a35a72c,True,4,42,279,3,True,Tests_passed,dfca8ba1e00b31b0e1d91cd18641319bda821aac8cd14291314d6150ce598b75,True,4,True,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,1ae01ccb08ea33ce973ab4c97df359bd4c918e567a89aed28e594ee96a76d19f,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,d7e425adbddf3edb58192f0844ec22cdf4223439831f6a5924a0805986024080,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,f152122c809bfc3e357af51bf0e8fcfdc1cdef4916bae4bac891444ebb7803dd,Tests_passed,38e20705ffbe6e8f0e5efe32f7ab85cc70cdedd23c70ee77478f5e6233e07d78,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,d7e425adbddf3edb58192f0844ec22cdf4223439831f6a5924a0805986024080,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,f152122c809bfc3e357af51bf0e8fcfdc1cdef4916bae4bac891444ebb7803dd,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,1ae01ccb08ea33ce973ab4c97df359bd4c918e567a89aed28e594ee96a76d19f,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab diff --git a/results/combined/merges_tested/googlecloudplatform/gcloud-java.csv b/results/combined/merges_tested/googlecloudplatform/gcloud-java.csv index a51d41f48b..5d86cd7e13 100644 --- a/results/combined/merges_tested/googlecloudplatform/gcloud-java.csv +++ b/results/combined/merges_tested/googlecloudplatform/gcloud-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 897,refs/remotes/origin/Neenu1995-patch-3,bba6925b685635ccf0890a168192f093e1b6138d,b54c501ca4af73f91bc3a2cdd5badaa3e1c204e6,0dd3d971bafc2d724787a76e69fdde6dedba51df,,True,True,True,144.0,1041,11124,9,True,144,Tests_passed,57ed68ae04620b0a2ef5e86f91f3dc377e47a3bce957ed513462782aae23fd67,True,Tests_passed,20455c0389581efede595f3e26734a3371447d50f3b303482b8c97a2baabbe2e,,True,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,340268d2080a1aec4f5917e7b7b4d9e55bb51d769b18f81e955a10c1688f50af,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,ac6a4924241533112036710a3fa034e442e69a042081deca15bff0f6b43d5dce,Merge_failed,98d754a41c590f0ffac9286488abc07536f6f0a7959ee9e4ee483a48c842cfbd,Merge_failed,4169f996892878fe587f2989af69cde06a3ef22d83846e034a2c5dccdb71d29b,Merge_failed,b156655d392932ad65deb01a8a0c2bcdf3525d661d79afc13b56c18f65bb8831,Merge_failed,98d754a41c590f0ffac9286488abc07536f6f0a7959ee9e4ee483a48c842cfbd,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,340268d2080a1aec4f5917e7b7b4d9e55bb51d769b18f81e955a10c1688f50af,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,07bf0fd7c18317ffd7745763eacbfc9331d0790b128b142d747fd9508c8e8743,Merge_failed,4169f996892878fe587f2989af69cde06a3ef22d83846e034a2c5dccdb71d29b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b 955,refs/remotes/origin/Neenu1995-patch-3,1fa53a817ac6c3962ed89645b0ca86e276e73bdb,5d8d1237244e0c8b9a76dc66782d6c69cdd916ac,86065a7fc7d130977a40b99b2bf77d6889d84418,,True,True,True,9.0,26,503,2,True,9,Tests_passed,b16ac46f049d06e80e45614469dbf59bb2d368b58f4ce792b254fdc5d93449fb,True,Tests_passed,a4d336918f7ec4998f682688726e185c62d12c2a625ac21823c68101e574b9a2,,True,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_failed,585b43a98be190e944262efc2216f5397c62cf30efc88448f4602f9d1256382b,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019 960,refs/remotes/origin/Neenu1995-patch-3,48458d345e33459aa7d477c820f7a83923cddc8a,0a71721710ff8d78e0f174e7f31e399d151a6a21,800b7090409203833b61cfaf4ec227eb26e1d82a,,True,True,True,18.0,77,1413,2,True,18,Tests_passed,22e39c888e0486b949ae2bb5088e3fd0331e4eea0875812a2fd77d23d94659d0,True,Tests_passed,8decc0cad225eb113fed17f21ad7c94dcaeafaa6b850aca7a1505d084aa577db,,True,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,10009536a88e6c6b34121339050503125d808e7dbb6ac4290cea8076c951695b,Tests_failed,e06c5ea0a5818da6e8419529ed9b3818a8e0c804543366f24818822de01f6810,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,10009536a88e6c6b34121339050503125d808e7dbb6ac4290cea8076c951695b,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117 diff --git a/results/combined/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv b/results/combined/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv index 9cc59a9f88..60096aaacc 100644 --- a/results/combined/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv +++ b/results/combined/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,8e04ccd0191c04aa74799a10ec32adefa0e1800a,cf3945112d4fb7b8d6907b6d801cd6f0ff33c1df,dc10b3241e4dcf41b74259f2bee758a776c3e4da,,True,True,True,10,54,371,2,True,10,Tests_passed,dca5e099a34494c2542109ed2f67e540e6b1a8cdfa9025a535d9508a4994ef55,True,Tests_passed,4d6107c7ac2a21b62880c061b98a066df5393838964f2947a295dddf5f3bb2c1,True,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_failed,44e51bf2c931f78cdf98afbc860646c3038d89a45dcbdad5c544f7974eef55aa,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec 27,refs/heads/master,ab0b73492be70ee1d298428f918b5d0a2cc95a19,7de13dab06f0d842de8a255f84128cd549875375,990444129cc2e53bfe3212d4fae0e5919e93c00a,,True,False,True,3,4,19,2,True,3,Tests_passed,37666d96223cfd79630c36e54e1dc065320cf7555c0d80ef8fcc4772971151cf,True,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,True,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,175dee53d59fa2b25223f0d581dece86ac1b3d4a9054436f6518e85bc3ddcc7f,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,393745284104d93efe516739d1827b67c3ddce24d2acb31e5c010e714a7f7a9f,Tests_failed,40615774150692c7c1d4105d47df87e7ddae2c0f82d405955af8aa177caa882a,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,393745284104d93efe516739d1827b67c3ddce24d2acb31e5c010e714a7f7a9f,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,175dee53d59fa2b25223f0d581dece86ac1b3d4a9054436f6518e85bc3ddcc7f,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1 28,refs/heads/master,990444129cc2e53bfe3212d4fae0e5919e93c00a,5db10d957d538d938d32f5d929efa713e8336456,53211292d79b368c32bf8514065f6c3e48c12ecd,,True,True,True,9,97,757,2,True,9,Tests_passed,86499d89a39784e05457eded34c77f4c7c25da997ae6fca072b2738f435e7874,True,Tests_passed,3b07d01f704bd329b797501787c09fb761c2556acf5b46594ef96d1e8f2e4956,True,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,6ff29ba8d642caf6806715079d5cbe9e877c834d7150092c36a1dab76686c259,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,922fdb13fc367543c4844efcaab0334b992d939d5fccfeb1acf35756ad60173d,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,922fdb13fc367543c4844efcaab0334b992d939d5fccfeb1acf35756ad60173d,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,6ff29ba8d642caf6806715079d5cbe9e877c834d7150092c36a1dab76686c259,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e diff --git a/results/combined/merges_tested/gpedro/slack-webhook.csv b/results/combined/merges_tested/gpedro/slack-webhook.csv index e593760157..9f630f9f5c 100644 --- a/results/combined/merges_tested/gpedro/slack-webhook.csv +++ b/results/combined/merges_tested/gpedro/slack-webhook.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/41,566974e6f460456d9dbd46a27b39d49b50964c67,66aa7d7688037883abc3af82259df71ffe030fba,bcb855e94165d363b7594ad88124ee4e3691dd55,,True,True,Tests_passed,3fbc2ea8ee1656d19e9b4eda46020ae9f7cb5d0e775bfbc3c361aa930890974e,True,11,97,1569,2,True,Tests_passed,b8cbd74e5aa723b4164bdc734ed836647972b3f2f5dd2e72f87c0945a726c25c,True,11,True,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,e55ef79de5e925f4d4a90a181b6ee9aa93cb7baa48fd12bc030d5a0a507d2847,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Tests_failed,80c0982c27dd5b27c6639d36d6b0b46b8a692f0369afa27050eccb8aecdd02a5,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,fd9182372c3b207e33fdf5a8456619a3d79cd0daba81be3f8f22ebcfa4a66a19,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e diff --git a/results/combined/merges_tested/graphaware/neo4j-noderank.csv b/results/combined/merges_tested/graphaware/neo4j-noderank.csv index 340543bfd4..052882a5bc 100644 --- a/results/combined/merges_tested/graphaware/neo4j-noderank.csv +++ b/results/combined/merges_tested/graphaware/neo4j-noderank.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,01ca7a83cadb126fcef90405f4a8036ac2a22a02,b78badfb88462adb87978da091e7b7213e3aa6a1,19602ad06a849def37a2de307a320871c1328fa2,,True,True,True,13,34,289,3,True,13,Tests_passed,b739cf8e7d2ddc904d23ed4d66172c163ca413d14e78fe6d07f25048595de770,True,Tests_passed,76bc71509d3cb6f40997b441785bfd2d0a99c13d3ffaff70a495597d6db6eeae,True,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,a0b8645cbbfe24cecd504ca8de488be49dda1f96327e7a8fd7242a793a3ed225,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Tests_failed,e6e4833c9cb895916b90b152dabfe992e39d6d10805fb7bb6ae788b4a21d4aa5,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,c9d4a819d219de3f4df3de9195da68448aaea089677ab6ee7762eedf447a6d45,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7 diff --git a/results/combined/merges_tested/graphity/graphity-client.csv b/results/combined/merges_tested/graphity/graphity-client.csv index 777fa50130..64b739d756 100644 --- a/results/combined/merges_tested/graphity/graphity-client.csv +++ b/results/combined/merges_tested/graphity/graphity-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,2a8e8c75e97d82b9c1bf5562af018b45f86d3120,4f9464b5b8eadf89842546b95f4c25f03d6de7a4,5d8fb283a53c4f40897bb50f7003c5453bb2d1df,,True,True,True,2,15,138,3,True,3,Tests_passed,bca72e5f7a121e2b7c9742dd6d912b8bb96c19728bfa385f97e30cda07bd9a5d,True,Tests_passed,e58d47f1eb3a9defe1a30ee25b100aaf65649fe7c9b820adb971c9b192f9c5fa,True,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,609096401f319af53729556d12df86a7ffa839aa409a7e7188eba9f92f672a7b,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,295dc05b06b9a474ae07c712784fd5605e6feaf3daa0158b4b822d0d6d35c607,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,4bb621c0f92fb8e448ad34d7ac4a4b4f441a816b7f4bd4cf381903fd10e5097c,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496 diff --git a/results/combined/merges_tested/graylog2/graylog2-alarmcallback-slack.csv b/results/combined/merges_tested/graylog2/graylog2-alarmcallback-slack.csv index 100ac7b268..9f429f2cff 100644 --- a/results/combined/merges_tested/graylog2/graylog2-alarmcallback-slack.csv +++ b/results/combined/merges_tested/graylog2/graylog2-alarmcallback-slack.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,63afb94bcd157b7ffe10dcef43743a33946c65ff,3d1fd37c02b7c581c557a51b252d80769486b6bf,69d6d1cfd2703a67895e69a54b3fcb023486ceab,,True,True,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,True,17,80,544,3,True,Tests_passed,fd24f961bdb1aecd6946626939129009f14f5d0a88ed8a33f96958841217a762,True,17,True,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,60bfb63b214860f427d22fc3be2973563e6309b787ab9744312b3997658a06f9,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,2ce71682c30b454d6ceb2382b4ea0e12d76a7a0aa76aa540ca8be9f9e27b6d8a,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,2de73c0b0bb79e757a5839861d6206857043bffaa2ce7ae66a3686f400110242,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd 8,refs/heads/master,3d1fd37c02b7c581c557a51b252d80769486b6bf,8ae2537efadef9087ca49058c93d059a0c69f10c,22c5650f8df37377e2cb03ba6034bce50e9d184e,,True,True,Tests_passed,8755903f68aa49a0d85a7d607664f447b4abc794545fe5e2678c8d5a351aab24,True,17,74,524,3,True,Tests_passed,f9b45ac034aedfe19df776adc0d72f9fdc3dab80b1d0c7d523c7db36785acda2,True,17,True,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,7f7a0fa04bec660dbcbbda9af5d6d63c0a6bb68d8a8b6c587b5dc88bc17901ea,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_failed,a505cba4d00535502af2d2377c1c6be3c52bf5cf4a49ae32a88986b8bbf00232,Tests_failed,fd4d3160b36423a9f15bc1e2e1f90d4a007eb102781bfddfc5f0dc3446613e12,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,7f7a0fa04bec660dbcbbda9af5d6d63c0a6bb68d8a8b6c587b5dc88bc17901ea,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_failed,a505cba4d00535502af2d2377c1c6be3c52bf5cf4a49ae32a88986b8bbf00232,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb 11,refs/remotes/origin/pull/32,c9a4912adaef3596c44b1fb7f501dcdb96190977,567f612e286b64e8414c5e4bafe8a0a2c49897a1,33f4ee652e2ad0055dc6576700db6b3118612968,,True,True,Tests_passed,6635ce4509418b5dab260931557708b9f13c2c7643b26aca0162ee5d712927fc,True,12,81,373,3,True,Tests_passed,0f88e4d198ed13f4c49c2fb6f1f1c9e85ad8933ae3981fabbabdbf1ab439befd,True,12,True,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,ecbf88bf994d65df628f695887c8a30cdebdcc4352dc8238e4ed8d0cf6e68ebb,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,d42cbe964fc49b61e08f1897933bf1c0ecd11e32ab245b3b4f6fe2549125be4c,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,29c5cdd0d6203194588809c444694aaa0bf492eace19c6c47ce5b88ad77c5904,Merge_failed,03117d06631c5b10b9405fd1adc5fbcdaabc1e4160f4d047de4da129d81513e6,Merge_failed,041aa2939b7be7cf71e49a8eadecc8345b0088c92f76f7a1805feec7f92617db,Merge_failed,3303b87410284678a4d55e55852719d6c9b0caa0dc1c7520b82a94542419e64d,Merge_failed,03117d06631c5b10b9405fd1adc5fbcdaabc1e4160f4d047de4da129d81513e6,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,d42cbe964fc49b61e08f1897933bf1c0ecd11e32ab245b3b4f6fe2549125be4c,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,ca973f569db4b7961a95857c9d46cf9d8bd8f49e679a7d985383f3265316fa5f,Merge_failed,041aa2939b7be7cf71e49a8eadecc8345b0088c92f76f7a1805feec7f92617db,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,ecbf88bf994d65df628f695887c8a30cdebdcc4352dc8238e4ed8d0cf6e68ebb,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87 diff --git a/results/combined/merges_tested/greenlaw110/rythm.csv b/results/combined/merges_tested/greenlaw110/rythm.csv index e9983c9c3e..d897b20896 100644 --- a/results/combined/merges_tested/greenlaw110/rythm.csv +++ b/results/combined/merges_tested/greenlaw110/rythm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,cd7e25b33109be5019be4c5bd155a4363a699aea,1e248bbdb7aa47033d9fcea34673c2492b293f25,da619ebfd8d34cbc272b1296bd79ab0e577d8176,,True,True,Tests_passed,78b248e96b4a88fa2f43128c895feec9d264652f84312319c75131a87ae60a95,True,211,212,4215,2,True,Tests_passed,f03afdeef57eca78a921a636cb411a3848ef21053c7d70a2fa1d0c3ed28acbb0,True,211,True,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Merge_failed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,31a19882ccd9b02e3ff5027ec8fc81f77ea28c7e09e60f324d6ac3d17daba075,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Merge_failed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,31a19882ccd9b02e3ff5027ec8fc81f77ea28c7e09e60f324d6ac3d17daba075,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3 15,refs/heads/master,d9f68867177eb40765426874c583d9a70c5a4da8,e088577eb5a25ca06c9c4d9b55f90411af1fed87,7a55514a2ed5fbe7bc1b7a62b1ef8875acb5022e,,True,True,Tests_passed,0ab73f64daea558fd3c8b4439fce916828af4f6be054b5b414cbbf8e2224a00b,True,15,149,783,2,True,Tests_passed,44f6503cd197e144e642eb737680fb2579d2e56ed3f9f2b96d79fce244385aa1,True,15,True,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb diff --git a/results/combined/merges_tested/greenmail-mail-test/greenmail.csv b/results/combined/merges_tested/greenmail-mail-test/greenmail.csv index 739156ab18..b39fd714eb 100644 --- a/results/combined/merges_tested/greenmail-mail-test/greenmail.csv +++ b/results/combined/merges_tested/greenmail-mail-test/greenmail.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 57,refs/remotes/origin/pull/294,e152dc4b90c0ad478ee886f8b110c5b220d46b05,d3ea847b346eb8879c2509681601175362e98875,2029ffd8f633897fa35c933c3ef46f969664dafe,,True,True,True,33,79,507,4,True,35,Tests_passed,25c6de389e070410d9bd2baf703df18e116736f675d91bfce83fe2188f3c799a,True,Tests_passed,face7a5e90020187a96ed0a13ab332d8091de7f093cc0f42386589e7aaec5c8d,True,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,fcf3902c1881a2fbaabbb9ea6aafbc391dada549566c98750e95a21ee4d81031,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_timedout,,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,b26bc4b08d89123133c47fde0e3940da901c5905bd692d67f12ee7c86fca170b,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac diff --git a/results/combined/merges_tested/greese/dasein-cloud-core.csv b/results/combined/merges_tested/greese/dasein-cloud-core.csv index 17fb85b33c..f652173878 100644 --- a/results/combined/merges_tested/greese/dasein-cloud-core.csv +++ b/results/combined/merges_tested/greese/dasein-cloud-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,74a489c92f34f73958a6ae8ae1806a4f1f5ba571,bfd75d205caf7b4e5b12ea10111d6d6a3b10f785,4aef48c13cdd045001c75554d44cb3d5b2f2a070,,True,True,Tests_passed,a7f20b65424d884056e9d4e902a7cecca90a778e5b5a15d543998a1959f3b5b3,True,45,185,1671,3,True,Tests_passed,6cfe512f67b86b693a098a18fd147a7bfa5e9358616ed50e687473564868db64,True,45,True,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,92773701f449fbdd6c2c0bf2b14e02d02adbb8936025e1ab382b857e847e37c9,Merge_failed,87a7cd00bc0cecd22a7af44517c776135d3bb26cfe47e398b8a5627cc22f904e,Tests_passed,c43a0a05b4e02cb536eb70b32aef8ef9cdd1773888daae99d4c5b9395358e662,Merge_failed,e27827e1dc0a536f4daffe31029bd805088d1b80827419e8c9d0cd20109aad89,Merge_failed,87a7cd00bc0cecd22a7af44517c776135d3bb26cfe47e398b8a5627cc22f904e,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,a113a03fba2457b431f88f090dea48bbc891bd0dd2eedcbecc8db35d14ee5d56,Tests_passed,c43a0a05b4e02cb536eb70b32aef8ef9cdd1773888daae99d4c5b9395358e662,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b 26,refs/heads/master,c502bc6b3374bf7df609bf6b30545268b15d28f6,bb1c9bc4db7d22c7a3becfa3e82dfe7e272db08d,a33b1b3a1b77c53d54838540ccee68c7ffe584ad,,True,True,Tests_passed,793ecf50775136809929de1898e6241e91923e32ebd486a40ed0d09b6277df00,True,7,22,208,3,True,Tests_passed,b89ba6c22036dbae19ca717bfefbaa801780429a2987b9300d5c91b1ada7b8b6,True,7,True,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,14d52d783cda3a905c6896c21b0f623dbe1f458bb8d3f5719ad7f86e258b1485,Merge_failed,7640eebc866d78240e0a338868fde4b5569b396d5e23807f920e92be9e47ad4c,Tests_passed,f8b5b45f79be2afefae8fea27c5f27c50274fbc47fe62f398b9fe75ea694cf1a,Merge_failed,50c174918cef25b89c8abcd8c765ae3608922107e332f35f50e9403efd0b7991,Merge_failed,7640eebc866d78240e0a338868fde4b5569b396d5e23807f920e92be9e47ad4c,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,44a9b7ac673cdbcc76042af71c1430b8a1905fd350125969610248b2e5f29322,Tests_passed,f8b5b45f79be2afefae8fea27c5f27c50274fbc47fe62f398b9fe75ea694cf1a,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533 41,refs/heads/master,a06b7693d76afdb92aa2187de52db638f1cbf688,a61a51b03a3baa0d30fd9a5d76be7cc4c17a1c1d,67afaf303c178960a4905c9507de98e5f4f53f2f,,True,False,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,True,4,6,30,2,True,Tests_passed,6982b6d91cd2bbfe9f4f6fc9255ace3ba702ae522ad8d4ae4771186a017d97de,True,4,True,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_failed,f3dc59fd5e83d7b352832aa38c78468d78abf71eb9c4630983220f70df3040fa,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_failed,f3dc59fd5e83d7b352832aa38c78468d78abf71eb9c4630983220f70df3040fa,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f diff --git a/results/combined/merges_tested/gridgain/yardstick.csv b/results/combined/merges_tested/gridgain/yardstick.csv index abf0589815..236b8ce8cd 100644 --- a/results/combined/merges_tested/gridgain/yardstick.csv +++ b/results/combined/merges_tested/gridgain/yardstick.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,094b8c16a3d14302e26113a542cc760f07a36007,32183ef3c8feb4b54a40047ea9aa93e2de372abf,b112625effff3d71f6d013960afe1c39d433a923,,True,True,True,7,9,539,2,True,7,Tests_passed,036666862ab023d692f66b134b3ea54d0a1979a98b2692d6cc5a44f0b1b45373,True,Tests_passed,f1952b5c43a667a084ebf1d5680f6eaa5cad790b9f422d70248f23084d31ead4,True,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_failed,fccb598a3b4da346cc542606cb6961435458d510505d99717aad586e9ff323fb,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548 26,refs/heads/master,26cbe1302e1a08ae9f04033a22c4593ac16faf00,7fcc0095da01e2783fa87a8e3d8f593bcc651657,8a13eaf3a27aff435a167034da63c1a30e6b16ec,,True,True,True,18,79,694,3,True,18,Tests_passed,faf16b48bb98a20cb162122db253ea5adafe3a329a5a6c0df93e021f6c789daa,True,Tests_passed,656589828e0ed759acf2e88328aa930dd4a505bdae8dda4d4330ba9ffc0acb9a,True,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,0179de6da769ed3bef8347807e20ddb70ba6e1c82cb498c79e15a3b118e6ec0f,Tests_failed,cb252dd3a744183a2e18ed24e9a2b20d2bb026b68e28c8d908d4007fdf06aadf,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,0179de6da769ed3bef8347807e20ddb70ba6e1c82cb498c79e15a3b118e6ec0f,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135 28,refs/heads/master,903c7f8ba68821de261d46d6faa53c7c4f966423,3b588131ac31435109009fce19ad896d234e9d6f,5329211282f0de4ad1461b8694b2a8edd8d0485e,,True,False,True,2,3,14,2,True,2,Tests_passed,4f31445a83f68172f10ef8627db4d82c26f8da6a6aac0b5725f53eb7407778b4,True,Tests_passed,42cea347429f09a3697990ae886d3aac12151b5ccd6a243401a4fe6ce0b0908c,True,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,95e094b23e4746fee1087845d50ed0833253013e9cb3a8972ad350987759b41e,Tests_failed,56262674a3ede0c50488b94b3ff4ac7601ac79be12a9bd0ac8baf2db1f682d0c,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,95e094b23e4746fee1087845d50ed0833253013e9cb3a8972ad350987759b41e,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56 diff --git a/results/combined/merges_tested/grove/presto.csv b/results/combined/merges_tested/grove/presto.csv index c55ced4ff8..6263d2e671 100644 --- a/results/combined/merges_tested/grove/presto.csv +++ b/results/combined/merges_tested/grove/presto.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 35,refs/heads/develop,36ff2b171e7967eb97a0eb56bff9b9c941e54445,685b5b1ce7c2f703be674ab4f843957a6eb85307,3ce4a2408b27c4f1f174fde6f2b15420564f1078,,True,True,True,6,27,126,2,True,6,Tests_passed,1fac110420c37c604fdd799042edbf23c0633801b316e67dad7c235e8944f08a,True,Tests_passed,aceaf9148ba582578ed210498c3b422a63901c4fec348628c832abe581f8a6ad,True,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,08d56461bb8e34ee9b45571572d353b19c6f9cfed0165ec2c55a17c0f0861dd5,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,08d56461bb8e34ee9b45571572d353b19c6f9cfed0165ec2c55a17c0f0861dd5,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae 64,refs/heads/develop,a5fd26fc395910e29b06fc2ecd2c1b73e23c5302,dea6844b19d27a50e13b38583b9725f0dafdee9e,574ca670a35f9747d61a248662614fdcdfc1a2c5,,True,True,True,13,72,531,2,True,13,Tests_passed,074f92109209ed78678deb35bcee52a7a6669a4096ae2372208cba8c64a7ef5d,True,Tests_passed,c3751098e5cf4e4b0d3708b9b539c9cf6016699fdb92310fe0c8aec276f9aee0,True,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,4df4b7068192a1f70a43fada3ea08714c75db3a0e7cb553f8ab7695e3ed9a485,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Tests_failed,0700a67a9ab05a621025a0dc2b31ecb1686d80b344d5f83ddacb40e862411e17,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,e4fb6ed16a336f5b06b7504fba5bc21ca59e29d5b65ababe8f473e99fe1f2e8e,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2 diff --git a/results/combined/merges_tested/grundid/nfctools.csv b/results/combined/merges_tested/grundid/nfctools.csv index e48b18ea2c..1548582b78 100644 --- a/results/combined/merges_tested/grundid/nfctools.csv +++ b/results/combined/merges_tested/grundid/nfctools.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,204ab4aad5ab01dd597fe78654f814650b62c425,fe75c6932f070833ca3ac127989503d660745608,5cb34b7db3d4b109d92ebe444a4e4e8d8882d481,,True,True,Tests_passed,27cebb6e54b58d275f6a4126390c4b8ff365fed3adaa26c0eecbbc21f1f631ec,True,210.0,478,8813.0,3,True,Tests_passed,23e92d9e511886260e9316a76340afe8d2626830acd02b303e344609cb123e7f,True,210,True,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,9f584cf70f81cfb79762f88ef54ade59cfc0dd727780760841226c6404e38e03,Merge_failed,375aa698dae2b80aaee6e539d3b1ca3652db9e13761476d85f13608e6882cd66,Merge_failed,babe3ee0aedd3376c4605c5cd34496b1f01944ac068b34e44ab0a6babf6bcc2c,Merge_timedout,,Merge_failed,375aa698dae2b80aaee6e539d3b1ca3652db9e13761476d85f13608e6882cd66,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,88a818d36bd254bd8b41cf2f2f8e5e305eb602f17c5a88d3c4d2c8f8173f5639,Merge_failed,babe3ee0aedd3376c4605c5cd34496b1f01944ac068b34e44ab0a6babf6bcc2c,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2 7,refs/heads/master,2c2a51262a91233576dbe1b94adf94d040103525,ac436f67afac76d8cfe416884952d513653d04a9,5f456359d7dc8abb41247de59caa2d896f5fbbc2,,True,True,Tests_passed,12149ef240e3568470e93a8efdfca36a4e284154bbc85b95d13a60cbc8e39c09,True,114.0,215,4751.0,2,True,Tests_passed,5f556d386d8daa754e9d75a00f96d9a6dacb73afafeb6b53b31dc78fc24a263a,True,118,True,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,3ca2f672944a5c869a19ce9253cc9decc71d846b4f7855cb8ede6408a759625c,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_timedout,,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,19516b29490f3054a0678386f17df7f49712f5cada3191bdd5a43ae300906565,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0 9,refs/heads/master,15659385c0127435a9d7ed840ff8f444d3d63053,6349c83782d4ce327af8ae862d283976f24ee264,653a89213a313f6f345cf44c6067d6cf87964f09,,True,True,Tests_passed,2186dd8fe178c0680894e68b6827ad3579378500709bd2cfc6150b80659d6ca0,True,47.0,165,1200.0,6,True,Tests_passed,c6235e248807be869730110c6cb507c859579cdca8d5198c2dc0e4b037b8da55,True,47,True,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,0d5fa0f4df06d8cd4c3b232ddaea88dd44db9e8bd9113ec13c911856c507eff7,Merge_failed,897af4fccf917c58eaa19867dbda52fbde30543a51ff9497cd92d29cf5aa9b16,Merge_failed,1296893132e89782b62c7f6e4b953376c97b3807bb54d96666f125d83bcb0198,Merge_failed,8e4c9a56e4543be80f975ef73fd1fd715a493627f09bde40044e6ed44368cff4,Merge_failed,897af4fccf917c58eaa19867dbda52fbde30543a51ff9497cd92d29cf5aa9b16,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,c8a76dd738cc544193e7d4b9d47b2bbfc0de3cb5fa1cb6de4b8a4490369a3600,Merge_failed,1296893132e89782b62c7f6e4b953376c97b3807bb54d96666f125d83bcb0198,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30 diff --git a/results/combined/merges_tested/grunka/fortuna.csv b/results/combined/merges_tested/grunka/fortuna.csv index 41cdecad91..7eb180bbbd 100644 --- a/results/combined/merges_tested/grunka/fortuna.csv +++ b/results/combined/merges_tested/grunka/fortuna.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,7475060adde9b911d104d64d02aceaee05fd9e4b,1147cd2e5a3da1272d9d771ceb4436351c574afb,7bb821bec10da6c91bb2f09992b86484b8e864fc,,True,True,True,27,90,695,21,True,28,Tests_passed,c8f845049af1e9c373021accd0568f693e48e945ea922d89d242285e5c1ab391,True,Tests_passed,c56d60a183af3255d50232947d6eca28f39d35a423b5303bd87e4d2dbcb76c49,True,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,05e7c18fcbf87f038a7bc7dd0e796dcaa236424a3f6731f0460377168ce8b0e7,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,d1189933a5f867e39cd40e1507906ec20f13c21af5ddecffaaa23c8004998d4a,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,46e4bd42372f103fad85e7947dbb508024be30f0c70c5ad3c076326fda74cdcf,Merge_failed,1254da680eccfa2598c1a07e7217dba34fa2bb845fe79448f2ce9a839bc74f42,Merge_failed,a5dd218cc2d6f848363312d881429950df4ece781e37672e34e66b9b21b27d4b,Merge_failed,d450ef3be5e72dcd0f4ff47f56dc5bb7d922b3e60bfc0bce0582959bde72c724,Merge_failed,70e974e6a17f0d5c2f1d3365f8c5b19cc62a4a54578be522ea5626ca94139006,Merge_failed,a5dd218cc2d6f848363312d881429950df4ece781e37672e34e66b9b21b27d4b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,d1189933a5f867e39cd40e1507906ec20f13c21af5ddecffaaa23c8004998d4a,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,46e4bd42372f103fad85e7947dbb508024be30f0c70c5ad3c076326fda74cdcf,Merge_failed,49cf4c52b7b4650686ce74596d4ab5a242feaac09b9ed753298cb79f9dbaf278,Merge_failed,d450ef3be5e72dcd0f4ff47f56dc5bb7d922b3e60bfc0bce0582959bde72c724,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,05e7c18fcbf87f038a7bc7dd0e796dcaa236424a3f6731f0460377168ce8b0e7,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b 11,refs/remotes/origin/pull/1,b53b9078df7906fa163e52bf892e8f120c7784ca,e387b50474e7e19df4428a630dfa71e60c28824a,d038300dbf0151a6bde3a1c9dd77a7f7ac4df050,,True,True,True,42,104,906,3,True,43,Tests_passed,c2353a21c685c4fe46db4c570183b1b46cef1a2daacca8cf16f4ec0e6a8939ca,True,Tests_passed,8eddbe1d714bcb573edaa2f601f83af565afe376078aeee20611b344f2787f16,True,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,e39a8f0616da2f5097bde218baa825d7ffcc73cdd4fa7b2b76ca12bade4f0e7e,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,3a376f471ccbff178f421675e314ea71ba8aad4a4faabf558346f57521de2517,Merge_failed,23a05aa1f8ae94d72a505a8994de4733f0f5e067c2b8998e40bbfdd620c063b2,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,d79b73e0ec12721d6178da26a28d099f75cbbe004c1eab0ea4d2082f999605ef,Merge_failed,a48cd0f09d10e2419ecd0c848f5cae614d7e3bcf6a74d8b8da8c1fc8995f8554,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e diff --git a/results/combined/merges_tested/guhilling/cdi-test.csv b/results/combined/merges_tested/guhilling/cdi-test.csv index 42371ff701..5d752b6b5b 100644 --- a/results/combined/merges_tested/guhilling/cdi-test.csv +++ b/results/combined/merges_tested/guhilling/cdi-test.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,728b39ab384467c2a5bd8949528901cc9e532da6,558ef6bdc34c99dbbb3c1b43b683765af23b451e,e59f3187e74b6c45bced49be01756309a26daa31,,True,True,True,133,195,807,42,True,140,Tests_passed,2d495716ef5fe5cae34e639c6401f5a971c63f0f51b3920087919ef33ae24e8a,True,Tests_passed,23bd722855ff0f4a9b8ad8aa0a951ed06e32d99de77b09636f2f72f05da10065,True,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,d4b079d43144dd60f225f9326bb298255014464810c2073606bc51365d4457ac,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,078c5f4e4e8ddb47a4bd5e78feb2481b9fd80b071ff05dc5c711d84372395d45,Merge_failed,78ad8afe5e4bf5ff19e658e92be85fb2bf5ce0e2ac2a868b3415affbb86c4c95,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,77ac8a7ca9b9d8e649bf46096e88bab393c98a1df1f8f581bd598e147ebfb3b0,Merge_failed,937e757be7689bcc3aea2af11870b3a86e3e6ea1fc65a1780fe9c9a48d3cd100,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7 4,refs/heads/main,04817bb259d3c82197bc7e163c7ccbfb76a5e7f2,c1ba7b04172ae79c02a49bb1963fa80f79cc20e0,67502b17fdcbd99a255834121d3f82315b96bbe5,,True,True,True,127,176,821,4,True,127,Tests_passed,182b0e33ac67129dc1c949bfef2149879c3321c5cc91954ad3dd99bd26f0bbf4,True,Tests_passed,f1d7c54ede5c9036d4f844cb6407c2caae1fe9b08c933698d0d7dbb193103355,True,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,443aab962ef49b568cd656c6a70175ddd436039e120f89dec44d680a58433402,Merge_failed,3dd1deb53c1fb30555b6059421d993f1a8692476efdc7cbdf73f639b7b7d31af,Tests_failed,b67cfddbaaf4e9c670792fdb723f7d2449661aeedfc9bf2de7ac2a5a3538f1cf,Tests_failed,a0a90f96aa34238592a7711bcc64c004cae04d3b7cdcd4dbc36e5c17ed8c0bcc,Merge_failed,3dd1deb53c1fb30555b6059421d993f1a8692476efdc7cbdf73f639b7b7d31af,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,1f3eb8a65bed42fc3e6a9f3220f055efa78b80ce00ace6e94fbf7d296b19e507,Tests_failed,b67cfddbaaf4e9c670792fdb723f7d2449661aeedfc9bf2de7ac2a5a3538f1cf,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79 373,refs/heads/main,4f10c2209f0564d9ceba04b6be55dcefb7fbf9a6,7b6eb2b6aeedd54b183cd78522bdf66b2a34e6dc,d7ddd6f5527a52a18c3dcc57c68113aa5c9207f6,,True,True,True,3,3,5,28,True,28,Tests_passed,4e2d92cc54e0b21b3073ef04b9a792b6bca1b1dea8f9f7db9651067b01de7d46,True,Tests_passed,eda100e2dad4ac3223eb1880877926147e703fc3d357e22430fbc9015070419d,True,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,103719942742f5ec47ee50a6b1ad141fdd62d7e273ac15b4ee5a1452a317002d,Merge_failed,9ef89b6bd7af13f37a4e4d24b0ce46f5e58eac7e4f15e0166f912e9868cb12ba,Tests_passed,8bd8abae538fc3d6f93d7e607d27068d9467a7a737f29be9ff4119d97940abfa,Tests_failed,f5487bdbe499be2f643ba8fb4c1d7a386b5cb172bb5e203da0f451f3dcbaea4d,Merge_failed,9ef89b6bd7af13f37a4e4d24b0ce46f5e58eac7e4f15e0166f912e9868cb12ba,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,94392d241907727197897a077c897fd0e0983cb6e39a4ddfc3e205aa1980bb83,Tests_passed,8bd8abae538fc3d6f93d7e607d27068d9467a7a737f29be9ff4119d97940abfa,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704 diff --git a/results/combined/merges_tested/gwt-test-utils/gwt-test-utils.csv b/results/combined/merges_tested/gwt-test-utils/gwt-test-utils.csv index f7a3c56323..506b1c0c32 100644 --- a/results/combined/merges_tested/gwt-test-utils/gwt-test-utils.csv +++ b/results/combined/merges_tested/gwt-test-utils/gwt-test-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e65277e5e16f96f58ece40a889b291953522193c,efff4f30629859a45cc06fcaec59a8e15a66756a,7f9f72c2ed3a2ca75cc4b124ded0be4fdb247b36,,True,True,True,177,522,3657.0,4,True,177,Tests_passed,efd41c8f4772cbe50b19df2233114f2f0652169b520c8a69a5801e1b8e7c36de,True,Tests_passed,5a180168eb246b2256e408e2b3520fd3b64f1bdde485d6ba6d6f0000a4bc123f,True,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_failed,3ab99c6b3085cd3e91565690395fa0e03827daf102b151ef73c11a4062d36cc7,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162 diff --git a/results/combined/merges_tested/gwtbootstrap3/gwtbootstrap3.csv b/results/combined/merges_tested/gwtbootstrap3/gwtbootstrap3.csv index ce27d23de4..b5dc367238 100644 --- a/results/combined/merges_tested/gwtbootstrap3/gwtbootstrap3.csv +++ b/results/combined/merges_tested/gwtbootstrap3/gwtbootstrap3.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 124,refs/heads/master,95ea992b12ee3f10c8cc34e03d98d5c67f07a62a,68214c2c52342f3ea16d30562b62ae6a67f6681c,b16343da0ea3b48e53de0c33f8d0e38eda8e9990,,True,True,True,22,48,274,2,True,22,Tests_passed,c8f10c664d0cd3f3f0de64fb1477cb130e34d5ca9db86c9c0d7318a144b0804e,True,Tests_passed,6032e686ae2aae6f882ba36cb90f135cc6687a7d7ce15f7f773036cca6eba700,True,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,bc68698e3f98668da5d5a818814093a5a8a3098a1c7c588016947da1ecdc5f97,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,bc68698e3f98668da5d5a818814093a5a8a3098a1c7c588016947da1ecdc5f97,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2 132,refs/heads/master,5c0d1eab79ec3b3d0e8c11cf7ee05e9364bbb5f1,6113162c5ff8d2264eb0a7a5b7b576047aa24553,d5df47741ae781c23a4340a9230ebda6ed114fc3,,True,True,True,44,117,2252,2,True,44,Tests_passed,9d268a356cc93fd4fa985987a9f2cd57fc64bccf47060d27eb259433859d98ff,True,Tests_passed,e8312624d23ba23ee02ab3c356a6d9c19933639f17a616c20b12e341402a6dcb,True,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,564c54ca23a5c30cbc7fd357ce489b2139b6c86563a386b946dce94c040e305c,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,564c54ca23a5c30cbc7fd357ce489b2139b6c86563a386b946dce94c040e305c,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9 156,refs/heads/master,f8f2c0c1c490760083f2416a9f44177ac30a40e1,236cbca39e193e5a213de06f22f8681bac31b333,354f79f1b9ce005759cab6fa3bad12f945d0ac39,,True,True,True,174,336,1145,3,True,174,Tests_passed,35a65bd471cc4efd9a00b358bc5dda1405d892c334915878c8b747b4239968ec,True,Tests_passed,8e38b4627e3d24a5ce7099eadc283630be210eb2207cf14dde86494f1a9e29a5,True,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,ea6041288112d2609e573c2b276fbdf140df452dc802dbace175acc2069a5b1c,Merge_failed,326ec0229e5700f8a4bfced16ab75f63a4afbc4443e21565c24d3c6b495dcfab,Tests_passed,a0040b03558e9b7b2866e63c4924436c2671f384886a2926f3d054611b167fac,Merge_failed,8f073742be3934f08384d606d4b3f81dbceb8c1d96342adea79f41468c8edc04,Merge_failed,326ec0229e5700f8a4bfced16ab75f63a4afbc4443e21565c24d3c6b495dcfab,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7313662a751e5cec9bcb54dfeb6672a22151357f25b1b487257b1691161c404a,Tests_passed,a0040b03558e9b7b2866e63c4924436c2671f384886a2926f3d054611b167fac,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291 diff --git a/results/combined/merges_tested/hansolo/steelseries-swing.csv b/results/combined/merges_tested/hansolo/steelseries-swing.csv index ebbe782d1b..4528d56b69 100644 --- a/results/combined/merges_tested/hansolo/steelseries-swing.csv +++ b/results/combined/merges_tested/hansolo/steelseries-swing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cedcf92cbdcad2cacbd5024e498fc27743b9a3bb,1dd3e17fce2fe179b87f09d05280cc060c1c2cd1,f8353e7a7fd40ef96510bb7c916c7d98c1be5dc7,,True,True,Tests_passed,c5ed1c77a88572d015ce9c1a57ffef874ff16034108983ad86af17e5441a9a34,True,31,244,576,3,True,Tests_passed,595be49e121f26a4ab8df4c3315ddf66690a84e1ca37af74df4858846c6325f1,True,31,True,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd diff --git a/results/combined/merges_tested/haraldwalker/user-agent-utils.csv b/results/combined/merges_tested/haraldwalker/user-agent-utils.csv index 1c73211175..78b97f2a00 100644 --- a/results/combined/merges_tested/haraldwalker/user-agent-utils.csv +++ b/results/combined/merges_tested/haraldwalker/user-agent-utils.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/trunk,97242682eae8013625be47c8c513432d99ed305b,3d692feb91e6438feed318bcfd0550f1cedad290,4f3f972165b6407adc775b763649ae1b7ddceb4b,,True,True,True,12,46,528.0,2,True,12,Tests_passed,600c3c40d5a655bc1d04abe0244a7d75ee41728152a9d319f59e9fcaa941f6e9,True,Tests_passed,b2d8f8478caeb7907d7b7843ad009c33d341e9646cc9b4b8b8f8c609795812e1,True,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362 15,refs/heads/trunk,4e452fdc0e37db5cf1e7f48b2d885781c955354c,a862db4d3fb552cfbfef5c3521220f6de8616530,971b1b715509bdbbb3bb7b52a6ea06fb6c152e1d,,True,False,True,5,9,22.0,3,True,5,Tests_passed,5bee84460981563d731eb012b491e9cc203bb8c3102448c6b2ad9fc5aae24640,True,Tests_passed,c5dfec434173020da2a1f79f88c5d22b5c51f0ff9d95baee04d0684fb447d9f7,True,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,517f6b100490b7121c93243e3f6b987a32da601036358dbd08c0abca47a87dd8,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,517f6b100490b7121c93243e3f6b987a32da601036358dbd08c0abca47a87dd8,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504 23,refs/heads/trunk,eaaaa1488bc87d2e857fac91448c6492cef72b5c,3be86ef11ed66e95f7cd996b5bba28b88826a1af,8a9affe6a9f580686cb3e66ac50394c1fe147807,,True,True,True,26,208,849.0,3,True,26,Tests_passed,00a198841359e97e8e02f284397bb807dc06eb34e9bbf46693ccae7dc1a3a074,True,Tests_passed,f39ba3f17206f7a88e6217f20b2850788840f3102a9aaac965a0f1387fa9d8d3,True,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,7fcc0e3fea14af7f5d119156cb09e01b8f321adecf8fbbfab303e25200ade2d4,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,7fcc0e3fea14af7f5d119156cb09e01b8f321adecf8fbbfab303e25200ade2d4,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe diff --git a/results/combined/merges_tested/hdiv/hdiv.csv b/results/combined/merges_tested/hdiv/hdiv.csv index 7309d5f703..e0273b3357 100644 --- a/results/combined/merges_tested/hdiv/hdiv.csv +++ b/results/combined/merges_tested/hdiv/hdiv.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,3d002a41907d808d059bb7c1ff4aaf3a3a76f411,76f1f9fc5bf03cd2ff1696b65444189675b96ca2,50ed0486e9c518c3c9d3a6919e38effbe871f91f,,True,True,Tests_passed,033cccee63cc3f7670b7a9e770a5a1790ee7cd90008aba465cf22a22766136cf,True,22,43,191.0,40,True,Tests_passed,fa75224b7fda1adedf30ec0339207cb18df05c988621cd389b86b2bee35c2afd,True,50,True,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,395e9c222363a8b766325192303c6748463916af1004353f0c36ad014ff00b81,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,d1310bfda8547bd309eb384301584c124872d0b62c63fa251d1954008fb5021d,Merge_timedout,,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,50040c4538819702f7014e4f1bb47cbebeba2bffdbe3f131a6bd72df81ede795,Merge_failed,795505407e640377a2657707a80cbf9bd8debed66a5fe2fc159bf1e6b6345a0c,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e 6,refs/heads/master,b018f08537d904981c8ef9a7ecf6b5e400869682,c482fc4f6a786a68d0a5e084e752337b2988f683,0f0bc5e0733991002bf425ae75960974dba3c400,,True,True,Tests_passed,9aa33d297a9f81f86a8f30d0674bdf80381ae6a76c152cf887a52b0f8cf2b6f0,True,19,34,137.0,2,True,Tests_passed,e07ba0b0746af5e284eed6750ec7979a4c21a769aa93e7ccba92a311b2f141ab,True,19,True,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,c8fd05f39194835e1c62c8ee4f4d2731a6a4f044befd6f4af75ee31ab0efe56c,Tests_failed,86a0572f26a205e598f411a04d9c9a577c90a4491b8a110f577a177b11ff19eb,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,c8fd05f39194835e1c62c8ee4f4d2731a6a4f044befd6f4af75ee31ab0efe56c,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040 8,refs/heads/master,9f06aa7519eaeb4ce3778d78e4751aeb251ec0d4,fe78060357f0a1a86bb10fffdf970b7e880b16e9,2abc4263fea334794d35b5c308462e69cb9405e7,,True,True,Tests_passed,7a702124a11bf4d6516313e5b909164c41e965f392dbf61399976e7f292c21de,True,17,64,238.0,3,True,Tests_passed,58ede13d4f68118960452557a04feef0aa488d657966ca9c847e84e0a4da2887,True,17,True,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,da4491fef54af5346bae615bf6d049e128cb7d54a85544f0ba0c617fcebc4858,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,da4491fef54af5346bae615bf6d049e128cb7d54a85544f0ba0c617fcebc4858,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133 diff --git a/results/combined/merges_tested/hdrhistogram/hdrhistogram.csv b/results/combined/merges_tested/hdrhistogram/hdrhistogram.csv index 4d9b5c18da..324686b6df 100644 --- a/results/combined/merges_tested/hdrhistogram/hdrhistogram.csv +++ b/results/combined/merges_tested/hdrhistogram/hdrhistogram.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,4faeeb6c175ff46fbb6bf38bd8b91c21d205c866,d279c913888f2fdf8dbec31f77ec2d3573f01c59,941dc5e12699dc2e4e26d0135b0823ad94a5569a,,True,True,True,20,81,1062,2,True,20,Tests_passed,94bf2bc7e83c7d8b072390cef486b68e761fd87c8338c0cb2f8ee3ae97a3ae3c,True,Tests_passed,35f0499c462e3d496567a48c771a6c5e348d5f60108e2ee075ba30f302e4dd57,True,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,be355067efdaf75b779e09a39d225e9312423e4a8ab5f80e78bd080c4e632de7,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,ad7e6b5639261b73ea86ccb9eedc737d2c10080764305f1b7a1dd63ec8057c7f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,115c91cf0b02dc638a145f987f30c06c98e69e04a16166d9f0459ecfa0b6f088,Tests_passed,4e9af85aa690231ce584ec4c6856f6ca84c7bc1a84da891070465928d94d470f,Tests_passed,06993b1ced4b7d0fcdd9a591071612cd5ab9ad11a14783a4738d19ccbec9b0a1,Merge_failed,1808b62041a58ca8c5c880b0c2168ef485c2eb7500765713950a7eb61ef9dc1e,Tests_passed,4e9af85aa690231ce584ec4c6856f6ca84c7bc1a84da891070465928d94d470f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,ad7e6b5639261b73ea86ccb9eedc737d2c10080764305f1b7a1dd63ec8057c7f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,3dc759f00d0a3cd4ded331c66a25f11ce1c5d3df9341f7c14cc7517fbead53ea,Tests_passed,06993b1ced4b7d0fcdd9a591071612cd5ab9ad11a14783a4738d19ccbec9b0a1,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,be355067efdaf75b779e09a39d225e9312423e4a8ab5f80e78bd080c4e632de7,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b 11,refs/heads/master,1b51671cf06062671af931f98a8af2a53d335a70,89b0d5981bafb6b4b4ac624473a1771405d4da20,b7622c26c63437dab6399fda38deab974d0b665c,,True,False,True,11,36,189,2,True,11,Tests_passed,936f9a91c8c410963443475df8c5010477b0f7bddeaf289e14e30183a74156a7,True,Tests_passed,6f60e1e250944900dc954f3126a307d37592d4aea76f7cab9505725c776f088c,True,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,f33b5d9d23947cf68bb0ad70a505974904dc9dad0b22fe6bfc0c4e599e0e30d7,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,f33b5d9d23947cf68bb0ad70a505974904dc9dad0b22fe6bfc0c4e599e0e30d7,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951 15,refs/heads/master,a9592e15cbfc22a9ea0777124708855ecadd4fcc,2c11bfb43d91749a731a69c1d3223a27c682c577,0f13675abe6afed9aa574c0296a0874c977e12de,,True,True,True,10,59,473,4,True,10,Tests_passed,31dbb11d70d8e48f73fca145a4e5c8c2ab4ad514d6ca237e4ed6367b786f1b01,True,Tests_passed,5be2535a9827c234398f93e39678c1a4bb0f866dec4474adbb20ad8caf8426dd,True,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,86a654b661a4c45a5ee4c75bdfbf78a81758878b74827845b93f9b04788ad035,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,86a654b661a4c45a5ee4c75bdfbf78a81758878b74827845b93f9b04788ad035,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17 diff --git a/results/combined/merges_tested/helpscout/helpscout-api-java.csv b/results/combined/merges_tested/helpscout/helpscout-api-java.csv index 248963026e..34beb54499 100644 --- a/results/combined/merges_tested/helpscout/helpscout-api-java.csv +++ b/results/combined/merges_tested/helpscout/helpscout-api-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,f606dc7048e32d8953594011ce7a80f8f325a5eb,f6b775455a0f59685e5a40fc597311bff6f01c7b,8f841dfa133c723515a234b19f123b8c5b2a4e83,,True,True,True,45,168,3089,7,True,45,Tests_passed,fa0d20130c3cff3b3b8f9913dc0afedd830cf8c8fcaa6fe22a50d77d09954e08,True,Tests_passed,32d1ec04af7938d97805196b6701280b7da35d683e3047b1ff26f679ca0ad17f,True,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,45fc83145ad2e907d40aa629e7c1202e987a6152850994d826a81a42132cf8f6,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,33d866029c769678c78bdccae388d87203c447ed2351d25c937d29d64df13474,Merge_failed,c8da6b370a1d00d54da443bb6c35e0a4532994cc63a7c0f65f5390480978eaf2,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,e46cd3e5fb199574407d13a52946aa3df90ea644d54e07b8fbf32a30aed85f6a,Merge_failed,12762ea42ec675743913e47ecb222b3a78940e777a7efd4d5ba82bf4805f25b1,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71 27,refs/heads/master,1d75aac8e8656d8b7dfcff38087209a9c590ae80,7dde5bbe5d07ba446e8d8b7b942d378b40f2b5c3,0d774af5f76f303ab1e35649c7d92176933cf612,,True,True,True,28,170,1009,7,True,28,Tests_passed,b49846109469cdd2ebe69adf5a400b85838256f0ece4188884efa88fdf513ba3,True,Tests_passed,2b42646a8d1ba80938a74abdb1b5bccb846fecd27f959490a5988e1c32315e27,True,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,a930fc2d4d4dd5dfe989bc6ed9d8c5e42a7ea9d1f11637f061dbfc0c291e416a,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,f90e30a87927ce4e36ea73f7cf6f507e13410697d96218b6fa2b01f03a1e985b,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,fb9562fea099e75b2b5feb5e6784c58404d42554af20e51cbecafcd8f0d92417,Merge_failed,4acc68a1a8768b8ea331f518a8250d83cbbf3ebf3b8bc0dd4416e038530f48b8,Tests_failed,69f6fb3f48fab5ed73013f29fc24963b8407d17fb240b4a0ec8bca3505696d02,Tests_failed,8871fda908ac7329de4e738daebf12906545866ffa87ccb13806cb6d534ebeaa,Merge_failed,4acc68a1a8768b8ea331f518a8250d83cbbf3ebf3b8bc0dd4416e038530f48b8,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,f90e30a87927ce4e36ea73f7cf6f507e13410697d96218b6fa2b01f03a1e985b,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,580fbacd33cef30a0613251f173a97f3b4bdc5d3c2a36fea2cbc6a7a9d2ec031,Tests_failed,69f6fb3f48fab5ed73013f29fc24963b8407d17fb240b4a0ec8bca3505696d02,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,a930fc2d4d4dd5dfe989bc6ed9d8c5e42a7ea9d1f11637f061dbfc0c291e416a,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896 28,refs/heads/master,397295ddede909edd6af0276694088841a9d5039,0d6430428c081cb940f0d9d73fca5697b5df6662,aeeaea55d1faf6b43cb8603fa418cc7732ac4b70,,True,True,True,20,152,612,5,True,20,Tests_passed,d5296b22d2983db2c909090f06ab897ac001ea621ec552d71279d1da35990325,True,Tests_passed,3063770ce2dfce5674163a580e7f479e73194235e4b23ad61d39679c21ef4774,True,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,3192545b9e5d60e2f787a39778b8b53900e9c3135538ee6dddb02b9a7ad6cb11,Merge_failed,f13c14228a9cf9e0033455e0b112cc19b5d4240ec476ae60437abff1979ee862,Tests_passed,d4839313ce84c37f16f3ccc32da79459ed9576503b74788f91c30b8fe1e23ebd,Tests_failed,01d8eb92de88a70a9a0cf9290d1c8d590bea62e84b6b6e97bb252ff478e3b1e7,Merge_failed,f13c14228a9cf9e0033455e0b112cc19b5d4240ec476ae60437abff1979ee862,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,a7529da0c1041703b18235733eff424b9b3ae903f0bb2b3bf9bec27abb36ccbb,Tests_passed,d4839313ce84c37f16f3ccc32da79459ed9576503b74788f91c30b8fe1e23ebd,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31 diff --git a/results/combined/merges_tested/helun/ektorp.csv b/results/combined/merges_tested/helun/ektorp.csv index c43e8dd15c..622a29f238 100644 --- a/results/combined/merges_tested/helun/ektorp.csv +++ b/results/combined/merges_tested/helun/ektorp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,e99a4dc4d57b353982c4695ef27e796ceec1278f,e1a40f7912d75e429d63fd01f4257b24bb191f2b,f4637590d7b49dc2cf60d6bd04a533d60236c20c,,True,True,Tests_passed,b90894a54016b08debfca457bba44f936e61f62ca5f7bdc1850d880c5bd12762,True,21,61,357.0,2,True,Tests_passed,e07f8842ad7067520cf628d4e9e147c3a6f9c462701bb2a492e3603c63bde5c5,True,21,True,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,67d647b8934c4a2957414ac9df88fc92305cc4c74ca135753e49a189f8a66fdb,Tests_passed,78c17b633666027b882c8d394813e4f9b0fa6fd58b9ebee757100083785ea1bf,Tests_passed,547ddc65538f63ba11a8006e079c9de9487053f39d3d87ac6d17358749651643,Merge_failed,a9505f9557406dc513b27c1c42fb7884e4abed2df30f6968774fe7c3fc15c811,Tests_passed,78c17b633666027b882c8d394813e4f9b0fa6fd58b9ebee757100083785ea1bf,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,37da60de4c9ae29a88739db464383df8a9875f37aee8ebfb1e2a3c1bea00d0ea,Tests_passed,547ddc65538f63ba11a8006e079c9de9487053f39d3d87ac6d17358749651643,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f 26,refs/heads/master,2070fe94b619ffd972f24ac23e9021768162c5fb,edbcc281e23dbfb2aed710f2375a6c6e97c5b543,783a5e19a88b46c849ea137554ed57b8c9ea3a53,,True,True,Tests_passed,0cc3984619146e6a94de6b15fb86f773ddaddbb71fb7f5db95dcebd2680ce20a,True,3,8,130.0,2,True,Tests_passed,7824c0b0c9acde4ce627764123296053378df889bae05448c171630873f5787e,True,3,True,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,f808f86b340b315b2560b3b7836f5ba0221422beb1c85ae0e775b5a4b7f477d7,Tests_failed,9f936108e6d76703f62687040de57f298b686e82c3369188f73d787429554408,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,f808f86b340b315b2560b3b7836f5ba0221422beb1c85ae0e775b5a4b7f477d7,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455 50,refs/heads/master,da0144b9d5de6034cdeb219467de16ada91fc561,00899f1d877e21341d11e03666baf8a2ed89fbe9,3c7f21edda5820820f5168a8b14194a7a08689c3,,True,True,Tests_passed,bfc7a1f33e8e83309901e56858da458102025d06ccae07fd4d0969233525e4d0,True,7,45,367.0,2,True,Tests_passed,de8d6f3c9ae437f2c69e9c9c34ea02301c82202912b99a7c2fc2f02581b32b41,True,7,True,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,3c885101325b3996fb9652446ed4a8c4e82d868763e96b062f06f9428448771c,Tests_failed,fd053f07231623499f8c9708111733378fff262338abef76f62f8db4f0fa7243,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,3c885101325b3996fb9652446ed4a8c4e82d868763e96b062f06f9428448771c,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38 diff --git a/results/combined/merges_tested/heroku/devcenter-embedded-tomcat.csv b/results/combined/merges_tested/heroku/devcenter-embedded-tomcat.csv index d8414c0383..13d77a3d88 100644 --- a/results/combined/merges_tested/heroku/devcenter-embedded-tomcat.csv +++ b/results/combined/merges_tested/heroku/devcenter-embedded-tomcat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/7,c69377866c8614d5a1ef047d3061fcfed5203232,4f181be7c4b60cade09afd674ea02da5f593bade,5077d499c5c7be0952e9a191be47757df1096102,,True,,Tests_passed,aadb84a0424e3b658e3c90e517ae410accdf02cf55d7e5fe1eccce7f58794ce4,True,31,41,,2,True,Tests_passed,9b199fb6874ae2a58f6b7b2c55cd50157e2fab2047434ac13c7bb5d7e614f5a2,True,31,True,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_failed,aac3326a6bfc75590b4f34191dc95ce5169ef88eddd99fb0bac7d873e62a1551,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93 diff --git a/results/combined/merges_tested/heroku/heroku-maven-plugin.csv b/results/combined/merges_tested/heroku/heroku-maven-plugin.csv index 0fb140d0b4..bc4e1eeb3b 100644 --- a/results/combined/merges_tested/heroku/heroku-maven-plugin.csv +++ b/results/combined/merges_tested/heroku/heroku-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 40,refs/heads/main,a935a91977e0132509028b7d13eb8c2f4e4a0f0e,0009fe317d0c15efa8520595eb84f566edfee509,09bd48fe1a79a07a35bae8f6b7d37e523f13c7a4,,True,True,True,16,39,774,2,True,16,Tests_passed,41e34e7e8fee4a46c65e09f28f464b64a1c76bf830b8374d72dafca32279ad1a,True,Tests_passed,f87d7b4a0f82994172506cc91bc4a890c62f4e65a0f7d8a4492069e063066f33,True,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,6f12e991325e753dfa8a5aad351c039e9f25468ec26458bb9c4ad4c9b6390cb6,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Tests_failed,38a8d2f5cee4a627fa3a095d0d588ca0f0ad55a308d16a6d8744946164fdac23,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,d0b8f8a5265a526c93a79b391d262692ea7d5d57c680864c48b96a410b46a37d,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0 diff --git a/results/combined/merges_tested/heroku/java-getting-started.csv b/results/combined/merges_tested/heroku/java-getting-started.csv index a3d2dfa061..75f2469935 100644 --- a/results/combined/merges_tested/heroku/java-getting-started.csv +++ b/results/combined/merges_tested/heroku/java-getting-started.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 40,refs/remotes/origin/pull/21,5b7ee28950a64c58ff7f882a2e664283361bbfbc,0996f9d404961388c1133223684928251d87f889,395b06ff2cb3ac6e2dcca5ea7dc06e5d37ea653c,,True,,True,10,12,,3,True,10,Tests_passed,d1d742bd339e1b5c46a3d37bf2d4fa4295928ddde8875e2b34550dbecf78d751,True,Tests_passed,17d1ab556df2d3cbe7accf29e8f75c3765669b3c4910083708493a2e78e17edf,True,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,7bf05dc82cc4cad0104817714f3067dd9c80dc7f8dccc0280defcdac452bf212,Merge_failed,3e6f02e63d6e004b962fd1b5619ce311f6efcf7e1cdd6dccca67ecfb469c8126,Merge_failed,ceda171568b7c7ae166fed33312eaedf2506275dc11161799bcfd950b0afaaea,Merge_failed,18aac52f7dc84378cb939b9f345474a888a6e79e6cbaa46a545ede82ecbe905d,Merge_failed,3e6f02e63d6e004b962fd1b5619ce311f6efcf7e1cdd6dccca67ecfb469c8126,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,4b1a9423bb1009f096232bacae7b0a915ee6e2d78ad6f3f85f4ae4984f6c9d8f,Merge_failed,818b397b740b507653d4da53ed1e681016f38ad54f98128a717ce464244bf07a,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e 52,refs/remotes/origin/pull/61,ada8e6776a47c7ddc9bf33aca353d2b895416c4f,c25acd5f8ed8ac7675266798fe99fcfee8912dcf,194c69c5fc86c19188504524cb1045ef8c57b1b5,,True,True,True,4,7,34.0,3,True,4,Tests_passed,b4e9fcbbce415f112c292035a9ba83b97842fa926d400f43ea1db91db5986ce1,True,Tests_passed,ded4a4908e9d74279b7347f449839a1f7f498dba88afa2ffbd1d79e720c7eb6d,True,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,b208f31f33d4982887fb8f8736c568dbab3e29fb2892122bc61620898e3391e2,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,a682a58c2a2d3a18d9e045d02fe5eee6f6301a2d1f5e3fb2929fbba7a3881899,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24 diff --git a/results/combined/merges_tested/heronarts/lx.csv b/results/combined/merges_tested/heronarts/lx.csv index 76bff36580..985948a74e 100644 --- a/results/combined/merges_tested/heronarts/lx.csv +++ b/results/combined/merges_tested/heronarts/lx.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,198881dec136d9149da48e998f9c96ff27ef87b5,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,09c8e07784d7a8f456737672eab034f162e7d45d,,True,True,Tests_passed,5c15c4056d6004c740f059cf48fcf5ea144337527d0c2a6c6bc33ef2045ea7d3,True,37,183,1980,3,True,Tests_passed,b947f69fa325ac688a4bd4a196bf7860985ed39b04694f9e144a4125c473dd0d,True,37,True,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_failed,25137a3530ea8aee407dffb843f5f4f5f4e9b672ebe817c487aadcfef71f0852,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5 10,refs/heads/master,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,e29ab79381ac51d8c5d4eb1d14a9b75353151459,6b8e4c16a3ec7eab180e369d1f32ef5df2f9c239,,True,True,Tests_passed,47a1084210eba86c0c24cd78f226066ca8673b9b4386a0fa20fd425138938fac,True,37,214,2300,2,True,Tests_passed,555f3240f986a92c78ffc645335c855000c1ad8096f2a235ab366afb013b11d6,True,37,True,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,23ebe0e24e3ab20daaeaec57f81f77e8380e2ef97ae205e1fadb6a377a2be1b3,Merge_failed,5d273e670dd1afddb64f9b568335f554677925eb1cde75348c926d346dec0bc0,Merge_failed,9d17431227fe206329902ca51612d0da41d7c54bc7a75d8d7589232f63937106,Merge_failed,c434bcfdec8d5f7ce1a6267058952f30921299343028e989ca2bda320f6c6e90,Tests_failed,4af1738024fb3abc8a37b633692acfbe544a1e26b33bc0515790227aac899c82,Merge_failed,9d17431227fe206329902ca51612d0da41d7c54bc7a75d8d7589232f63937106,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,23ebe0e24e3ab20daaeaec57f81f77e8380e2ef97ae205e1fadb6a377a2be1b3,Merge_failed,153b12fc3266a6270f41d0c28bcde5be035bdffe49b04b982d16e7b5b8cc9797,Merge_failed,c434bcfdec8d5f7ce1a6267058952f30921299343028e989ca2bda320f6c6e90,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485 56,refs/remotes/origin/dev,ab0db9e858e35e7fe01ea103c7cee376e6946220,b88cb8b7fdc9444a18bd96e85e6003e6bf1fa04f,f587a9faaa86442dea40f06c9e7e29a2e0a0f431,,True,False,Tests_passed,6d6ce9ddb4e1dd02105d89744133483f22cb7d810c00c7935d06d58393c9f6c1,True,5,15,90,2,True,Tests_passed,58571645def6a35e028f084e1013c6b6bcd9b68e0eb701380d82d3d997548689,True,5,True,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,02a211f1fdf04a1450b3256767db3bf736a875c415b7eea5d46cd08cd6812cea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,02a211f1fdf04a1450b3256767db3bf736a875c415b7eea5d46cd08cd6812cea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea diff --git a/results/combined/merges_tested/hmsonline/storm-cassandra-cql.csv b/results/combined/merges_tested/hmsonline/storm-cassandra-cql.csv index 0c7d0729ba..fe27749195 100644 --- a/results/combined/merges_tested/hmsonline/storm-cassandra-cql.csv +++ b/results/combined/merges_tested/hmsonline/storm-cassandra-cql.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,756905cd9e592caaaa963739029bca5d46d20b77,4d30b5a9670b04b1b661eaaba70c10360f5514be,db445a4528d0f6b316777bc641344f1b97cfa8fd,,True,True,True,4,13,47,2,True,4,Tests_passed,2314ad7e11181c347e73430cf592faa500fecf58c475c744817ec356c172b6f0,True,Tests_passed,2afe07950097068c71b595917ee694ea81d121b400c610c828b923b5144d8ea3,True,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,fe9e3080e241e3fec03c35ac67d4e934f4da72d9e7d768797e6d6787e1537c5c,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,6df25d02d1136d58f63e25e456f39ac81b2bfd03e84f212ad6958ffe37dc9140,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,aaa7a0097ee57658cdb08199a088b3863c4c6d980bd64a656baf3e14f64bb85c,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87 diff --git a/results/combined/merges_tested/hoijui/javaosc.csv b/results/combined/merges_tested/hoijui/javaosc.csv index a682fa1028..f8489c4b29 100644 --- a/results/combined/merges_tested/hoijui/javaosc.csv +++ b/results/combined/merges_tested/hoijui/javaosc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,f806396898fdfbf9533f2ff881b05ff5b6df5f6e,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,129ad0d5979f9de902186c1ff9914307a9291e73,,True,True,True,18,110,513,6,True,18,Tests_passed,d8a86f358399c05baefd8d244aece38be8c933fec24279dc6e76a2038371ad1c,True,Tests_passed,387fff3decdee2b6585d3d66363e05cb129d661e43fe06a7823ccd47cc684ff5,True,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,d8e2d38026b7501ecd5d8d7e27e01107c212742aade63f38165f778b72eea220,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Tests_failed,43c0ef8466b08b1999263cd456fff7102995abdc14ec8310e64fb4cdc5e7f90a,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,4bc60c8a1c35f152a36b3fb850664ebb6681646f50416fa7381f8ac381660eab,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b 13,refs/heads/master,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,afde7c1c37e7b7694d0faed5aaaef3b0efb7f463,e2a1667cb198675958012d91a374f9e9705195be,,True,True,True,15,110,444,7,True,15,Tests_passed,91bc85968ae2d947812b047835474adf2d99d1ade67cb28d6b651f5ee070c708,True,Tests_passed,33ec367078d1bec50a80794a5deac035e6ea46089108e057bdf6ed6a9940a79a,True,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,3871c093c19c17471e17f4d39828cbe9c55f7efb2d86aa923ee6885c8a1621ee,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,b2fc5ba5661d818e9807794136339c9116ef69f2e49c07de956628333bc3ecda,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,bb04eba4139c6cf771e92f1eabf46a5809dee244e7fc65f73e2a17b969af375e,Merge_failed,efb9df448a8de4d1b522ec77527725b45f320f26e0ee74129fac573a9dad60fb,Merge_failed,f07e22a6616d6ce80a425f94b785f8bf929783713b8c35a6b16b5454bff67f08,Tests_failed,4ea871ddcd6476d40c46891ef228bb4f0093d2feecad9b5ffdedca0ac58a8b21,Merge_failed,efb9df448a8de4d1b522ec77527725b45f320f26e0ee74129fac573a9dad60fb,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,b2fc5ba5661d818e9807794136339c9116ef69f2e49c07de956628333bc3ecda,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,528fb4972a7ade2e9db3024abac74ca804b7327dbba4462c29ce4314fd6836c0,Merge_failed,f07e22a6616d6ce80a425f94b785f8bf929783713b8c35a6b16b5454bff67f08,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,3871c093c19c17471e17f4d39828cbe9c55f7efb2d86aa923ee6885c8a1621ee,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc 14,refs/heads/master,afde7c1c37e7b7694d0faed5aaaef3b0efb7f463,443d0261f9ce1e15f0db8cd9b92071a2d9136c94,678b2715c634ad6e3ec86d97fd821b48c446ecbb,,True,True,True,16,123,477,6,True,16,Tests_passed,bcb0c351665d731cb91b16185797491ab9851b5f24109260797c746278fba433,True,Tests_passed,1b56fe38339b19b0fd8ebd80ed743c7c3b2f3f35447f772fec446f2f97e38c4e,True,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,2164453799810187c671052c5855f33befefaeab45d76f6cc68b32a195178e23,Merge_failed,8ce498779089cf518e48e38892c9b920f5a82f8e88bd08a6a1b2e81d94fb8004,Tests_passed,d53113d45e93fce5fcf6976705ba181a134ee750ca1b0128d2f538cf7b7ac09b,Merge_failed,a8820abc6f6473d43129b47fc15637ab382cea1504816bf7914bc3a123c04956,Merge_failed,8ce498779089cf518e48e38892c9b920f5a82f8e88bd08a6a1b2e81d94fb8004,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,9ed039ad88e2eda566d11832b0043eed291cf22c8688cd769d21cebc54badd9e,Tests_passed,d53113d45e93fce5fcf6976705ba181a134ee750ca1b0128d2f538cf7b7ac09b,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db diff --git a/results/combined/merges_tested/hoijui/jawk.csv b/results/combined/merges_tested/hoijui/jawk.csv index d9336406ee..313dee089a 100644 --- a/results/combined/merges_tested/hoijui/jawk.csv +++ b/results/combined/merges_tested/hoijui/jawk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/12,b60fdfaa97a9a12c8eda22d7707295bbd1ea90dd,a1523a0d3dad5590e8b75bd6252a788512406bf2,e5c8f2601b4e7af1b587c3677e464cc6c226d36c,,True,True,True,13,119,327,2,True,13,Tests_passed,8e6904b4360bf56eb3fad4272171b1fc4cdd37376620f4b0af8f2a1dc6a3b960,True,Tests_passed,dbf04cd3d1cfe48fabcd285561e49aadbae7e1a829fc2bf6b7cbe9ba3f4bb133,True,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,117a596f3b63779c3ce121036f850701f4b82a70fedeefbd5f2d5a1255e5041f,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,1812123933c7a87fb59d171934a0c260f2a0c69ee758777921ebaa11ed7df63d,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,b7cbdb07e1e5d083b5911f74da9cf7623426502dc4198e3f5aaacc6f2acaf9bd,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8 diff --git a/results/combined/merges_tested/hoten/java-delaunay.csv b/results/combined/merges_tested/hoten/java-delaunay.csv index 1c6de75109..66ec991cd3 100644 --- a/results/combined/merges_tested/hoten/java-delaunay.csv +++ b/results/combined/merges_tested/hoten/java-delaunay.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,bfbc8c5bb6efc4a6044df3c60d5e2fe8eeaaef60,a5dbe4c4472bb3da4ccdc9113bdf6c7681d68d60,5ed77e94f95e191e769255471ff01967cf606b96,,True,True,Tests_passed,666b875fd2076ef05b2e6ad421a39d36a9f0912601eba9de68effd13f3c2f5d1,True,10,30,417,2,True,Tests_passed,f9cf342dbc758e852e5fd8227393ceaaab341f7d8faedd0cb4f63a12e1a5a392,True,10,True,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66 diff --git a/results/combined/merges_tested/hoverruan/weiboclient4j.csv b/results/combined/merges_tested/hoverruan/weiboclient4j.csv index 5af810554b..1d25c8e1d8 100644 --- a/results/combined/merges_tested/hoverruan/weiboclient4j.csv +++ b/results/combined/merges_tested/hoverruan/weiboclient4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,62fb9296e8a8a0c3569630db86f72c4431a59af9,1d5f41e216cbd256148e0b617d4f9497ac1cbe81,cbb8c34c2182cd3c290acedb85cbd79a18da2f71,,True,True,True,59,152,3352,3,True,59,Tests_passed,3779289beac5d75a05e316c1f6bac5e4372eb5050efb56df8055012dd6cea8e4,True,Tests_passed,5a4668df1a151e1ec4ba95aa17d7c47ea86111da6c8d5793bf62e9cc8ddc6ad0,True,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,f29c7e7600d3cfd21c4feaa944e8e1b2018db220085b9f42f792896467f77d9a,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,9141cfea402f7c8e2213dec22aca0018467769b671f67230ec086103ed0e0644,Merge_failed,df28c98f5d44597d38b47c70001bfe6ea1c0124c4ce2b73d832a0aa5d845aaa6,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,16ae23ffe50c2c06d5545f7946b57153d5f4a3692c9d7aa775d0c993585feb1a,Merge_failed,a3cdc9200e3a496b5edc63843fe72af016b839f11ca9ddfb17f9cb476be2dffe,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067 diff --git a/results/combined/merges_tested/httpcache4j/httpcache4j.csv b/results/combined/merges_tested/httpcache4j/httpcache4j.csv index 5ab31ef03c..3c373c9e62 100644 --- a/results/combined/merges_tested/httpcache4j/httpcache4j.csv +++ b/results/combined/merges_tested/httpcache4j/httpcache4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/heads/master,ccdc581f7f9d3b683b03af7c474160d3a3d1594f,b7a15c040c8b08b14e1f6434a73633c44381118e,24fa341f4fe3d819067b80de67bdf98e8861a8de,,True,True,True,10,21,324,9,True,17,Tests_passed,5ae13776c25399f7834d05f4603ad0221a6761b3e66e78b048c64550a3f7500a,True,Tests_passed,69cd33ab0d1b4602132d7d32d182fa177e41dfcc5940703ab8e76430173aa9ec,True,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,dc927934833f49dc701bfaaef25c108f22eab72ca7387e3c78ca56892b8183ad,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,68540763f9004a8f0b82269558d941b609166375f1a1277b97f309e34aec992f,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,85f53464843aaf18443dfd072fab1944a76e9d47ab89b6245b2d5cc994ef00f7,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5 diff --git a/results/combined/merges_tested/huaban/jieba-analysis.csv b/results/combined/merges_tested/huaban/jieba-analysis.csv index 561fe6bc76..a9d30e1a3a 100644 --- a/results/combined/merges_tested/huaban/jieba-analysis.csv +++ b/results/combined/merges_tested/huaban/jieba-analysis.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,f56461b33c95e386ee28e5b745968b7cdd20292b,8ef8c236a8622f1f98decb9961065f2181a24d4e,e6487e17818416dc1d7050cced528515795e8ea4,,True,True,True,6,51,395,9,True,11,Tests_passed,ce47953878cda46771b538a55dc7b788e1dfeb438d4f3179dbaa533defc620ea,True,Tests_passed,21f4b40fb686b341febb5b37f3c226bde3ad9e2a8a213dab37c6a2cec0f8b9ce,True,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,d45987ca7d3c7b7b5abb598a5485524badff0c4a1b64a50b32388fd8bf54e404,Merge_failed,5fe7c1823e34ef0818f833131d3b2955dfac3ada72e96a85ed40e1505ad708b4,Merge_failed,2103aabc6d2c51dfa21dd257d11ce3e362333550d208f82096192c022164177a,Tests_failed,7104260e1f0e9d2f3a284a14ce3b657c571f09be06e5a9c83c5b9b1bf45e2c52,Merge_failed,5fe7c1823e34ef0818f833131d3b2955dfac3ada72e96a85ed40e1505ad708b4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,a23de3a0c75d942145b957329d25bdef19c931dfb7a0defaf616fa24a5cf1a0c,Merge_failed,2103aabc6d2c51dfa21dd257d11ce3e362333550d208f82096192c022164177a,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c 28,refs/remotes/origin/pull/50,8eeea21716d2ea2563b92c0e3fd901ae715b1ea6,e657cd03e1bccbbd7b71981997e756699fe161b7,092dbedb1fbe0cf2172f8e10707f8b52764bda31,,True,True,True,5,10,608548,2,True,5,Tests_passed,168cf6b3515e4d6b88fac756675ea2b6db9ec3b9776ca33ce1a7d9801a6995a6,True,Tests_passed,0121015a37af6416d93feedc57de2c258686a7b824c850e17b1b5635339dc372,True,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_failed,17cb9784fe07197d226dc2e30b6ae904888757989cecc2ccae08accfba19e0e4,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7 diff --git a/results/combined/merges_tested/hudec/sql-processor.csv b/results/combined/merges_tested/hudec/sql-processor.csv index 2ce691307a..296e6138f2 100644 --- a/results/combined/merges_tested/hudec/sql-processor.csv +++ b/results/combined/merges_tested/hudec/sql-processor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,4e7851a544957454ab1795647f56cee208cdabb5,999cdaecaf30a71a3f740315799c6b75c01bf83a,aefd6d3f51a8b69487281fc61bd2bea51a8c1983,,True,True,Tests_passed,755cfdb12fd1e82e08400fd797aa5e7796f64425f676ce18921d81a7f71f31b4,True,7,16,2099,6,True,Tests_passed,3e4adb0971f73f29a1153c3d016742f6bff5e7f57c6fb23a21d495a52c57c7b0,True,8,True,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,7d97a275af463087d8370254a80c7fcb4ec25fd67e70ac4e07fdccd6a6695357,Merge_failed,01605e85cc746fbf180fe08bbf824eaf0bc9f5084986c688dfbc41b286da4026,Merge_failed,66ce56bf0861b1aee588e84972437354bf35e9463bfe7bdb34a0b8da54517b23,Merge_failed,0c10e489e751e7d2e38614454cf39c1d49312059c9ebcedc13251b9ec1d71795,Merge_failed,01605e85cc746fbf180fe08bbf824eaf0bc9f5084986c688dfbc41b286da4026,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,c68f0b05e3575df1c833c2e12c92ad18309ce89465d74d6920aca3b08fa866c6,Merge_failed,66ce56bf0861b1aee588e84972437354bf35e9463bfe7bdb34a0b8da54517b23,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc 5,refs/heads/master,ed303915969a93ac2f220d6ab3042426dda05c89,f32cab29eb45b3300f5a968f2cfd070c97827e98,12a47dcce612dd5b4a3907d00ab7bf3d04b0d8ab,,True,True,Tests_passed,62c216718764015d1f307d0a597ebec0d7c6b316fc02a4396134c1391bc0f8a0,True,81,460,1619,37,True,Tests_passed,2a2dc0c5aabfa0ca9b961ff84a40ac4b4d73160a4a48aebb7bebe5f59917808b,True,116,True,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,da4dcf3ae5860f8617cf23a981b923c07c09c2dd756457c8db9ba9ce3c49e626,Merge_failed,c85e70177f22707ddc48ec1e11ac1c899ba436a4651bab5bfa4b254979432c1b,Tests_passed,c629b2c9a056750bfa512d464f28bff07f8b37c6686431e73c0ef9febc2b825d,Tests_failed,fba98ec8f1d0a46a73f5ea73a607bba96efb91be8de49a0ca3b7696272dcb7d9,Merge_failed,c85e70177f22707ddc48ec1e11ac1c899ba436a4651bab5bfa4b254979432c1b,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,bafed269b63adecd88431cbedf2d7b41ea901c7c0b020ea1681c25174dd4b3ab,Tests_passed,c629b2c9a056750bfa512d464f28bff07f8b37c6686431e73c0ef9febc2b825d,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1 11,refs/heads/master,bea67fca06eff381e48a426d7bb23f3e5560167d,76d15bf96876fd4e1dd8772fece6417d2986d575,3e8fa6cd3ba8b791cb219b36cd50625207d4d688,,True,True,Tests_passed,07a3997a4378113b4ef7e8ba1ea967278bd6ba9a5317ff7fecfadfd0500b961e,True,251,701,14543,3,True,Tests_passed,2797fbda845d8b1475666b074ca00bdf9d33257cc54808f8f2e5f5ff9c5a2c81,True,251,True,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,58244e52feff4680e9f16c6cac6acd522601b3fc3284031d4aa2b1a36ddec8c1,Merge_failed,4675b3a40d2b05a726996ec69b30a407ba163ecd0d5c24d96abadbec7d42b9d9,Tests_passed,9c3dbd9ead80c90ad973d4bb6179e0a1173ab4ea56f49cf05f620102eafdbfc1,Tests_failed,3862095dda32c49146174538d3f76d38be10d6cd25c799d9560d3d09537d083c,Merge_failed,4675b3a40d2b05a726996ec69b30a407ba163ecd0d5c24d96abadbec7d42b9d9,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,1f200200bce0606906d58582947fd7ba24b8693ec74065c94f2046fef5b7628b,Tests_passed,9c3dbd9ead80c90ad973d4bb6179e0a1173ab4ea56f49cf05f620102eafdbfc1,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5 diff --git a/results/combined/merges_tested/hyphen-ated/djbot.csv b/results/combined/merges_tested/hyphen-ated/djbot.csv index 40ad9203f8..366d2ecfd5 100644 --- a/results/combined/merges_tested/hyphen-ated/djbot.csv +++ b/results/combined/merges_tested/hyphen-ated/djbot.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,13212b187da3dcee9d80fcf3b441aea4888a6240,e7cfb41c9432faa02d641a90cceb514a01efda4b,19712ca231a974c4bd69c40ae4e43fc03d5bba15,,True,True,True,14,90,607,4,True,14,Tests_passed,eec66b2b13823752b4f2587b2976f6b9cf2ac0c1278fe3f1b4edef8018e140e1,True,Tests_passed,b2bcc1ae67caa7d047f42dc8534f1778b3bc2ea1b2907a9830affb4681b9ea99,True,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,7223dc5495246e5762f7a5548ece41ba09e607407db1d0c79352df1dd6ca6ca2,Merge_failed,48ef5fb6d3fbfb61fedaf8b8a1d3a0185c3dac83c8ae93e980bd6991e27c5762,Merge_failed,73eeeb0b3270dffdf1ed92d634934ca11ea8f4072b6fa0fc9a05dccc25187d39,Merge_failed,38c3243273f96fa925ed081d7d6f398ccdab78b58d43d6880a27ce6d1bf3a722,Merge_failed,48ef5fb6d3fbfb61fedaf8b8a1d3a0185c3dac83c8ae93e980bd6991e27c5762,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,7219cf358a6f8158f2219e02a89c17447263383d23cd13988acdd508682a8102,Merge_failed,315a1f1837938123a3a08e8bf02b5222a2791e7326c70465f081c88b188a269b,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e 3,refs/heads/master,74d4ec8c8eaf131d157dfac6a8e0a84c99720126,6299377a3edaf452b914d61a70d4fdd8afbe3be8,4bb2d7d65ad5f1dfe1e417e0febff7f9e60aa382,,True,False,True,4,8,33,2,True,4,Tests_passed,1eae806f6a437b529d62117e99611b9fb474c2920559ea56600358cc4c3e0c6d,True,Tests_passed,eab0b398b76132ae4e23ed8864d7abca07f9878addbae12bf779f479796e3aec,True,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443 diff --git a/results/combined/merges_tested/icoloma/tldgen.csv b/results/combined/merges_tested/icoloma/tldgen.csv index e16454136f..d2ea280f33 100644 --- a/results/combined/merges_tested/icoloma/tldgen.csv +++ b/results/combined/merges_tested/icoloma/tldgen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,a124b6e2241bd4840a91df9a382fb8f702e76464,26e62ee81320302d85a92e2c112f3826fc25d604,001adfadb665abf8ae379febb1e494121b1d8827,,True,True,Tests_passed,59430136df62d87fddcdc0cd26200995a0f66e6b465fe03dca0461a5943ff288,True,18,53,441,4,True,Tests_passed,8d35eb54f2445ef698bc6fdd7955b9da2a9cdde8e6777c8faf59a49f54499079,True,18,True,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,4bc1272e39de57b0eae6eb60eac005386985f84603b9eadd30e9d90c794bc00b,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,70a63b5747472c1cef0816425fe81dd6ab2caeb04cd3d24dd185d80bff1080cd,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,834bcfd77524e5fa956164ab6b52bf5185ddcb0eb4ee2e1455e404f2ad3199f2,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf diff --git a/results/combined/merges_tested/idpf/epubcheck.csv b/results/combined/merges_tested/idpf/epubcheck.csv index 8614772ca5..ee5407b7f6 100644 --- a/results/combined/merges_tested/idpf/epubcheck.csv +++ b/results/combined/merges_tested/idpf/epubcheck.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,23cee7b1b22510f633b006d5540c3a4198a3ccd7,c133d33a71a6e5aee8bcf8684deedc5655459fc5,d1cba214aba957b44052af0f509a98e3e0761ff8,,True,True,True,569,983,36392.0,13,True,593,Tests_passed,ae183d6ed5e5871e2441380a2991000c10fd195c5184eca890b83262d3448d5f,True,Tests_passed,4c9c65fa36d11b98e66e3b4eb8c471e4723310f787eae4e3877cec4ca4371c60,True,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,b0121cdcf1778d00696ffd0ac8470931bb9522c0ab46a6b993319fe74914a249,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,d77f44fa67f6e5d65c269ec3b81249029feb14c9cb18d79e2b92216f41b1f0c4,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2 diff --git a/results/combined/merges_tested/idris-hackers/idris-java-rts.csv b/results/combined/merges_tested/idris-hackers/idris-java-rts.csv index 8a2ebbd115..c5080d3197 100644 --- a/results/combined/merges_tested/idris-hackers/idris-java-rts.csv +++ b/results/combined/merges_tested/idris-hackers/idris-java-rts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,c35f926f298bc670fa197ec7aee03aa74a1a3e13,b500f781a3204060f80fbc613b7e6669e3bca1c0,c4a734fa57af809cf249b389bbadbeeac2c32246,,True,False,Tests_passed,e0333570c8cd9ed805a94d3ecf0e08e411091df9c86e06fbaecb0d5f3e5637d2,True,3,14,197,2,True,Tests_passed,5aa12b1d82b44e7b43fc31a74c4f9d9628a26c650173972caaff8f7700a8437e,True,3,True,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,9d45e51eb47d71f11afc9a8dcddddcb4717bea558f60ad59c86e5727284a74db,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Tests_passed,0649e92f16ffc1b673eaed99e86938efdccfeee54be22244b62702b1536e8d57,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,cabb0c5e6aad04c2b11381c8cc19f98c21ffcbf1ce623a0f78ffd2f9f357ada4,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe diff --git a/results/combined/merges_tested/igniterealtime/tinder.csv b/results/combined/merges_tested/igniterealtime/tinder.csv index aa24c73a1f..573e5cd121 100644 --- a/results/combined/merges_tested/igniterealtime/tinder.csv +++ b/results/combined/merges_tested/igniterealtime/tinder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,c99be3f06ec9c816c3416f2c1963d6b19cc412c9,d43b195d7ac6ed93cfc73635732a3fa3f26d42e8,4462390ee85eea8ea93c15a95d0c8c45b2f49dd1,,True,True,True,32,43,17892,2,True,32,Tests_passed,ae53a361c29ad082499147f51e47428fec3f4a5955a80e14d90876e705dcbdb1,True,Tests_passed,8d30990c278e62e26bf457b5b92c672a770a76a427b395340783f5140c47b04e,True,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,2819a2e403f2f5b3495b3b867e64f34c1743a4b6853ec0ccb0e4fa6274fb3af5,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,b1c783e3d8f6a0f39e78b4d25b75b87532740760689cbdf1dac26248f2162458,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,a9a96d571a713c1390958441c58f35f78c39f6a4ecce2813de93fa470cb50e21,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa diff --git a/results/combined/merges_tested/ignorance77/transformiceapi.csv b/results/combined/merges_tested/ignorance77/transformiceapi.csv index 3b212cecf1..88c76df9b9 100644 --- a/results/combined/merges_tested/ignorance77/transformiceapi.csv +++ b/results/combined/merges_tested/ignorance77/transformiceapi.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,9a65b8374fff0fea24c5be16c94b999c57c18955,fb6fa941b74b57a81e0230ceb0ad15567f5eb2bd,ea4d04ea1a61a899462ed617ffbb312416af0f8e,,True,True,True,6,11,73.0,2,True,6,Tests_passed,1f327f894630144a2fcaf9615227d20ab9de221253cfeecbdf3324af00e70772,True,Tests_passed,776ff7ca01d929a1d6b47dbb92c5624e5e14bd947a66c4074f511cb4cf823ae7,True,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,ffd083d6a57306a0aa5a1a7b0508d08d1b998fa934b18fb917535359443a0102,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,ffd083d6a57306a0aa5a1a7b0508d08d1b998fa934b18fb917535359443a0102,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be 13,refs/heads/master,07df219c63851a01a3ee6040ca0811d109544375,cd82b7006cc9fd7e7a1d1444575abf56683ac3c5,93d4346a4e4e0421081c5649f6d49f5fe1648464,,True,True,True,11,20,219.0,2,True,11,Tests_passed,f63d55ea93748022f84067fd5a65dc9e8119ffc876cdb5fb179eb4da9b834356,True,Tests_passed,467209e6fb7fb6c7eda2ed67d93054bdf6226a61d70ca41657752d8ca2ab77a2,True,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,f471e76f601c689ed985bf445f3f91fcae57f5edf77f91196deff4b070e756ea,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002 diff --git a/results/combined/merges_tested/iipc/webarchive-commons.csv b/results/combined/merges_tested/iipc/webarchive-commons.csv index 0b0de7a756..3386fc2a65 100644 --- a/results/combined/merges_tested/iipc/webarchive-commons.csv +++ b/results/combined/merges_tested/iipc/webarchive-commons.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,3d0cdd721a11dea44731904389ac4a54dbd08df5,4586a94a79e143a450d66c2673df9f776b2e8b7e,79aed910b44510294367a4acf4f3e6376b1c62c0,,True,False,True,4,10,111.0,2,True,4,Tests_passed,a0c2aab409ddbb7032f700e03bb6516cb64c516bbb7ac357f53ccf47f07a87b2,True,Tests_passed,0e042dd60efda06752bda17f1dd7e659698639f9faa72d691fd55643a7993621,True,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,cc1bd71d8b1be39f3ecea7a109943f8281d60991017af5b93c9a01f71c1189ba,Tests_failed,366116227599e78616a0fd694666a7a5d40dd9f013d4f2d0a8ffdd33183d3d29,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,cc1bd71d8b1be39f3ecea7a109943f8281d60991017af5b93c9a01f71c1189ba,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1 70,refs/remotes/origin/2.0.0-DEV,6b33f9b79f1d3a913ca5e1952149a72ab1104a43,3ba7b47bd90a81ce0b0d4c5ba638c8a3d1d7d4f4,604f05959596128785028863dc72ffc7ccde6536,,True,True,True,25,312,1033.0,4,True,25,Tests_passed,a5d15cb5190e6d3a49e6646185430fad8df619fff0fe535099725c4b939c4ff8,True,Tests_passed,55a24d0e9afdc5e68707f30e56d5a5602a7a32085ad6785988f836071e8c74c4,True,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa diff --git a/results/combined/merges_tested/imagej/imagej-ops.csv b/results/combined/merges_tested/imagej/imagej-ops.csv index 67e8e55fb8..fb75546483 100644 --- a/results/combined/merges_tested/imagej/imagej-ops.csv +++ b/results/combined/merges_tested/imagej/imagej-ops.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7c6c029a911f721467b552bd446a7d9206ad46e2,d2b46095b23c72389a872e109454a05dddef915a,5d3d50356848cfc1c147774878fdf9662eeec966,,True,True,Tests_passed,9ac97ba1f434c5f3fe302c7312040abf04f836cbaa660b5a0e0124db99d0c34b,True,944,1079,2408,3,True,Tests_passed,5843bc0639c6c697b032ad92a4ca7c5d5ea13f9ea343876e3599e12a901bcf01,True,945,True,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,1322d884c2391b4d1fe5fccf5224ebbaca9c840dcf50128dccfff8e1c7e34195,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,1322d884c2391b4d1fe5fccf5224ebbaca9c840dcf50128dccfff8e1c7e34195,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b 3,refs/heads/master,4a3b273c23ad343d026a0e4770cb755b81032f9d,eccaa9a1b5b85e931114872a1a0d47e81da9fbba,a2b49e2a77f37952520ea214fa21efa7838461b5,,True,True,Tests_passed,14cd3527a14f07111d833f4af1ac2192e2fe687280208f351b6e5497a6d01250,True,966,3076,16077,3,True,Tests_passed,bcca8620da4b5b3caba604ee11f285b3ea9cfe6e936111410168f268da1d2b1a,True,966,True,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb 5,refs/heads/master,bbf2d7e78454d9dd0fa95f9082efd4b53f21ad47,1db6c2d1c781ed066d61ca6731e1f310562b3499,ebedca370d45d786233cacfbc4ca1324313ae3c0,,True,True,Tests_passed,fba146a482b17584c28e6af8561a54326a8ce0fb3231c5b354937b86f0d09ca7,True,953,2348,9486,2,True,Tests_passed,4832e3bfea0354204f20b10bb9f859e03cc9df725f024f22bed0ddec7eb34ff5,True,953,True,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,6bc31c6a3c89fb5e4e46c6b0406014da3c2eebe84e182ade9552b8db0d0c625b,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,6bc31c6a3c89fb5e4e46c6b0406014da3c2eebe84e182ade9552b8db0d0c625b,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f diff --git a/results/combined/merges_tested/imglib/imglib2.csv b/results/combined/merges_tested/imglib/imglib2.csv index 0ad542ad41..71f70577e1 100644 --- a/results/combined/merges_tested/imglib/imglib2.csv +++ b/results/combined/merges_tested/imglib/imglib2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,e7346e55e937c576e23dc3a0668e7798468554f1,55d1176eb8f7eb680db287c1794db210c9be9d89,215f65b62b8544c490b38e4943fa94b9efd46ac9,,True,True,True,660.0,973,4364.0,13,True,661,Tests_passed,c3fb3e1ac5b762ad0e7bf1f72cc57b5a9fbf0afe505480c65f129f9340b077d5,True,Tests_passed,15c25084399797f7e4dc8c076d8ebf38de33e8db0a44fc962d5602b36c7931bf,True,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_failed,5ccddcde1911fecffa76e5cfd3d00e5ec332611c98a90e344ac1778d30cd9072,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_failed,5ccddcde1911fecffa76e5cfd3d00e5ec332611c98a90e344ac1778d30cd9072,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5 17,refs/heads/master,871b03b9a7cb624f9959679a4009a689ddca8b7b,ecaf4fda351ebf95beb23d7a27b46bd5b57a563f,e27654f74b1cdeff03c97018cf336bbd4319fbc5,,True,True,True,40.0,160,2888.0,2,True,44,Tests_passed,33211836c04416dfcebac1042fcda3be9b090385af547ff644bfc581ab3d07b0,True,Tests_passed,e71bcd4a19adb551ca12e861de18eff9145caeec656c6a52335562ae232e6b7d,True,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,91c6382a08b27d4528fa46212c5452ac6ce03cfc36e2b3691f87320817e723c6,Tests_passed,ccca0bd868135a833c3e41b3c2a62ac5cec56b712ea01dffbf46fba95a04f161,Tests_passed,66d5195c53202c7880339f14f08aab7c79d1354fdd2891aaa1dbbadd19a0e377,Tests_failed,7a9b6f9e68140d4cbe67a52e9857e7b40eb4fef5ab13f70fd59b228cb9edc770,Tests_passed,ccca0bd868135a833c3e41b3c2a62ac5cec56b712ea01dffbf46fba95a04f161,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,9a523381b3277c26fc125a55c16df1f2e287ee4cd07eeeca1fb7865ea6b735c7,Tests_passed,66d5195c53202c7880339f14f08aab7c79d1354fdd2891aaa1dbbadd19a0e377,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34 73,refs/heads/master,dd4b342823ffc8756a05e5006dccef4bf47ad066,3160bc982d2ae97cee909dc7cccde9515b003a7d,86c79fbb711ceb89f8535cb3a6ca1d3d34cf4b4a,,True,True,True,160.0,1114,6126.0,4,True,160,Tests_passed,8332bb7c2f31214eb01a08f0c40a43b27290bb05f75c0f4d09fbb5cf1a46be37,True,Tests_passed,c23c4415708cc86ed611dca4ebaab27cc2abf3493cb85bba6696713dc8092f7e,True,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,d4066cc3390b01e65639802c15074a4345ba07655d17a7f44816762f2cce198a,Merge_failed,725af1888da5ff0aac2fd9076b6983d7344db54b59df504eb0dddbd41c10f796,Tests_passed,ce04b2d2dfd08804aa1e94f35f861e1c6f0285444546180f5165a5452cf3963a,Merge_failed,a3ee916105a8d06c8393e3338dc11b822935cec5c22b002bcc898d973045d299,Merge_failed,725af1888da5ff0aac2fd9076b6983d7344db54b59df504eb0dddbd41c10f796,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,a040bf7bbe0d78f91d34538b4f9d72b0f28fddb42aab241df9c3202c8ae74249,Tests_passed,ce04b2d2dfd08804aa1e94f35f861e1c6f0285444546180f5165a5452cf3963a,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d diff --git a/results/combined/merges_tested/imixs/imixs-workflow.csv b/results/combined/merges_tested/imixs/imixs-workflow.csv index c6d1b6f971..c7b0fe94d1 100644 --- a/results/combined/merges_tested/imixs/imixs-workflow.csv +++ b/results/combined/merges_tested/imixs/imixs-workflow.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,c7213a8599927a2e82c9cd0fc28d32554167125e,2a98c0f5c974fdb822dcac40cb44872b34e0d9d6,60667c03a8eab638f51dfac73aa160668a9cd7f1,,True,True,True,151,540,11966,9,True,151,Tests_passed,56cb99ec70b59ddad1a93f40c8d50067fb21f5e190c827c8bffb9a5e523e3d1a,True,Tests_passed,e4ebdc9caceab62bac5673096cd7063d4903b04e15b2ac24931fca55e472e025,True,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,b6ada3e60bd4920686b1a3cd5dc0ee7d42972c3087b980c5d324753678dfe916,Merge_failed,e15af75682b852e07c245cba5b1eb69d02c29b64db0a9d3a020db75e845efd8d,Merge_failed,e30d7652ab02bf1a2a2b852b747c378318cefcd1e714e45bf9c2ffebfb668b43,Merge_timedout,,Merge_failed,e15af75682b852e07c245cba5b1eb69d02c29b64db0a9d3a020db75e845efd8d,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,705db50b89696efdbc9c5293a4f41e608795e0843cdb54a16af2251dd50dea1f,Merge_failed,371f96832203d333c29fcd3a04d3f95288636055d47423ee7c1cca6d5ac4fd17,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c 11,refs/heads/master,4f71db6de76da70d3bf01363201b369f39946f4b,e23f82ff6405944f0ff516cdf4fa5e51961224bc,4fbc3221b024b3c2c11b7e16e9c610f96f9900c2,,True,True,True,151,542,11972,2,True,151,Tests_passed,8dbeae3125db04385bc17eb4f00a7ba8225272e07c0eaabc17116aa2580d1e92,True,Tests_passed,94e2cdda7508523e7b9a8a11a242ffeba8127efa246e4b8571a9745753ac4f77,True,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,476f7aee1b7f4b4f55509739963c812a4c31f9a3eb014de6acb893c1b9b89110,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,476f7aee1b7f4b4f55509739963c812a4c31f9a3eb014de6acb893c1b9b89110,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e 12,refs/heads/master,3e72e74ecd667e3e23531d180f3b2860fafaab27,e58fcff3929cfb7ab84e1333b1387a6b80f10548,58fa11564f4525e6bd6bf59244eb396c73dc75da,,True,True,True,151,539,11980,9,True,151,Tests_passed,41fe0659db4cf1d19eab42b10db6660dccaf684a6b26edc0ed93160b97f10173,True,Tests_passed,c2bc92b34a31861bd02d4cbc1f85869d009a83810be9dd5a7ee811c7660b74a3,True,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,50cde6286f14931159d533a0a9c35137c7c040ce87ec745f749c505089300721,Merge_failed,24dd59db44c1db0eb49c7af8768843c1b0f46a9552094af092cd179086c30c7e,Merge_failed,263eef70cf32fc31973a63d25762cd73fba2212abf91243d7687f3478c133abf,Merge_timedout,,Merge_failed,24dd59db44c1db0eb49c7af8768843c1b0f46a9552094af092cd179086c30c7e,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,3d11dec3ac3c92e8e10da23e550e84b4958fb36b72307382cb07bbee68b09dfd,Merge_failed,0dbc8e5c43737578b0bae7695ebb618c0281ef82b73dd0ad8a22b010549b2a8f,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694 diff --git a/results/combined/merges_tested/immobilienscout24/deadcode4j.csv b/results/combined/merges_tested/immobilienscout24/deadcode4j.csv index 590481d497..2eca351521 100644 --- a/results/combined/merges_tested/immobilienscout24/deadcode4j.csv +++ b/results/combined/merges_tested/immobilienscout24/deadcode4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,abbc95c30c2fa999e87557eb715e51b00556b802,df31162ba10e6746a77eb7c4967987ef151b2304,9169f1deac0d3bdf8a2ee8e5de7482037dbc24c4,,True,True,Tests_passed,b0e98c3eefa9a4eb48283ce5b5b8aeb9837473180e31f66ca28712242e553b85,True,91,130,3109,2,True,Tests_passed,ce3fb56e88f9a9e94664c8658a58f05c3c68ed3b11a8f5c61e8f5af9e307ec4b,True,91,True,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,07a2e460363132a2e4e6adc6edfbb8a0337e6e2c5f9d8f661ebc41fd291be18b,Merge_timedout,,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,07a2e460363132a2e4e6adc6edfbb8a0337e6e2c5f9d8f661ebc41fd291be18b,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662 25,refs/heads/master,5aee1194b7e224d667ec4053676fd48f72cd2317,f3c7faae1cdc0f42cf6a57d31b56759213ba7daf,5c07de747b84c0ee5f21a07127aba90a1c96eb66,,True,True,Tests_passed,48aa1862b555ce7b2ecb51c58314388926057cc5611ca3f71cff88e70e47deab,True,72,84,2531,4,True,Tests_passed,8c249514f541354ff0466ce9b69806b31eaa3bb5c3aa99d875af6ae2097d7358,True,73,True,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,76939ff6ad8c161b8834acc45bb2556d13e7a2ee0292af019dc1e58340aa5c76,Merge_failed,d92325cb6996be543ac449e8d10e1cf0872965cedca1739f4571dd8909599c5b,Merge_failed,8878a7971c32843ae5188feccfcd07943713afbc715bf41fdde838e1608c991b,Merge_failed,b85ce4a6e7a0298093db0978fd98b273ac6558f35cd3cc3c37ded1b600fc5cce,Merge_failed,d92325cb6996be543ac449e8d10e1cf0872965cedca1739f4571dd8909599c5b,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,3d1ded0503b7b99c14f60d99eff949ea66c86baf4836e56ccd69e35a2380c3c1,Merge_failed,8878a7971c32843ae5188feccfcd07943713afbc715bf41fdde838e1608c991b,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea 26,refs/heads/master,4a894fe5616a8290f6f5e1458b3e077c0d5e2106,79e31d8cf4f9aa17154d0e71ef3f7c6805bdb9a6,98128ee31a5b0ecbc2d90c03714e4dac42d36670,,True,True,Tests_passed,222484735e881096caf5780c63c5fba7795a39a63d0d9606254eb2c588a767c3,True,88,227,3509,3,True,Tests_passed,c4405c20930706372b7ced2d3794f0c20663522b8f2104392114601cc1201438,True,89,True,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,839ad7425051fcec9e451a390d951c9c6b9e6c7a99a808a4aef882bd1f12e484,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,4a96eb655d51e731a65380d733a4fb477a08b82036f40e45d746e5887c1d85c3,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,fd0d4ee1c8ef01bb21d5f59d05e38ef821f6e640f6a5d78e4aa17e401c4824c7,Merge_failed,9fdbf81b5f5e3a71e0724f69d8e9f26c115c4386d7e0c6f38ae57b236f0e24fd,Merge_failed,cf3d870f630c826df543a4c90bc10eba93c021daf6c63cda36f11501c0126cf1,Merge_timedout,,Merge_failed,9fdbf81b5f5e3a71e0724f69d8e9f26c115c4386d7e0c6f38ae57b236f0e24fd,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,4a96eb655d51e731a65380d733a4fb477a08b82036f40e45d746e5887c1d85c3,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,db5a5ab0c8e0edade6f2b7f65289f87d12611c6b7ad319c4033cafeafea24b98,Merge_failed,cf3d870f630c826df543a4c90bc10eba93c021daf6c63cda36f11501c0126cf1,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,839ad7425051fcec9e451a390d951c9c6b9e6c7a99a808a4aef882bd1f12e484,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a diff --git a/results/combined/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv b/results/combined/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv index 14a719e72a..860ab36d4c 100644 --- a/results/combined/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv +++ b/results/combined/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,93520a37d008510ab7d8b0c2f7c904c526c02296,6097377d96d0bbe4d8bcadf767d366c50c641ee3,bf21478ae52b4c81eca759aeadd89324986aa1a6,,True,True,Tests_passed,b6909260bf934db2d5aef36578b0fe3a78a6be02c57952f8a942d48c4f8a1f63,True,7,31,285,2,True,Tests_passed,35406290825cfe22742a72e9487d1fd4a4a52d1c4a037864df6b6ecbfedaa9fb,True,7,True,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,5aeb885ec033f26f1c5d862555309034aa6220d9c727608315a04a85ccec11c7,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,c48b9fa611a372870dcc944d5f50b9278c395fa5c4a2c9f0850c30b4ef0fd382,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12367e53b746318a109dcbcc57afe73927ea2484534f0969670b9284668e1f4f,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef diff --git a/results/combined/merges_tested/inaiat/jqplot4java.csv b/results/combined/merges_tested/inaiat/jqplot4java.csv index 8b7346ae45..ddc6f59957 100644 --- a/results/combined/merges_tested/inaiat/jqplot4java.csv +++ b/results/combined/merges_tested/inaiat/jqplot4java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,c86f902735495376b859be63a90203832b4d92b6,65229dd370b0898ec9eeabf030302ed889ca1886,6ead916aa215b4efaff44fe4aeb365f9cc50fdd5,,True,True,Tests_passed,db84a3f637c33d10c51bdba3688c9c3d8ac79052296b6c2e37137c77bd137559,True,33,440,4426.0,3,True,Tests_passed,682d9db5eb6f06af921f1ce3c94cfe360fb9f058a09c58bc0d89c4764367933b,True,33,True,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,081f94adf50a2b5cbcb59072aa1f90589980e3d106836e81ee279b101051ca7f,Tests_failed,88afcf6c095180f343b1f597f69e3b0a5c9e9570d0d78f2fb5f045429ac89d97,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,081f94adf50a2b5cbcb59072aa1f90589980e3d106836e81ee279b101051ca7f,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb 13,refs/heads/master,6239c0dc07dc0d45ccf92b81ad4ba91d70137136,acee7209f0ba8e8ff196132182a77c7b620d8bb1,b7033b00afeca37605535cc7495bf9f6b112e5cc,,True,,Tests_passed,3338119461b87ef064f62bd8e152002ba2a6f4093b8628973c67ad671e23bd58,True,21,246,,4,True,Tests_passed,4889f248db533de82d6259abffd91a3da155dd7e5b7c2886f2c7812a6a83de69,True,21,True,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,6421e852240343f8a109b56296306376f32de369ff94e549debd31ce4d6e9177,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,d1e0dc2ec2ff6666897819f35f8b941bd961e4fdad58a578b0104c234c3b9ae4,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,0350813c054172d1547385c2e496248315989e80d5b974a990d50e953d583b82,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a diff --git a/results/combined/merges_tested/ingenieux/awseb-deployment-plugin.csv b/results/combined/merges_tested/ingenieux/awseb-deployment-plugin.csv index 939b18dc3b..32a0633c86 100644 --- a/results/combined/merges_tested/ingenieux/awseb-deployment-plugin.csv +++ b/results/combined/merges_tested/ingenieux/awseb-deployment-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,527e238ddf7b25402927371510f22e9a01ac8750,3d8ed54a7eb32de45b50b57cfe2975f58212f9ed,688514ce6ee363c40f3f7afd8946e6b84eb3ff5b,,True,False,Tests_passed,797e25d8ac159c1996acae92a69eb46b6f0ead3fe804f691d6b3b305e3b6ddad,True,2,3,15,2,True,Tests_passed,02b38fd2fadecdeee51c74fab5982924939ecddd2815a44d1e8331e9638832b0,True,2,True,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_failed,f5ed4d693e60707e5a519600ea6dc7bb034075511e01d058c0e73463d9bbd7fd,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0 diff --git a/results/combined/merges_tested/intcode/sweetie.csv b/results/combined/merges_tested/intcode/sweetie.csv index b0f8ca8a6a..0d531a408c 100644 --- a/results/combined/merges_tested/intcode/sweetie.csv +++ b/results/combined/merges_tested/intcode/sweetie.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,a9dd1a794eb1d4b3e7c9e26d4dd716df84189d88,3f18be686982e9c85e421ec672acc397e8296a97,001aeae00779c70a403f427ed33adf50ef85bfaf,,True,True,True,39,164,1595,3,True,39,Tests_passed,3dfaa9858762e1761a24f8fb6fb4fd11434d99dbf23df754d12276c1e26bfae5,True,Tests_passed,fe3fa22e6b0de4a57bd80e280fd82439ad791216e18b73c2a605a17c2d1f72ed,True,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,0849fb832b134a4036520f0777bdd77451d08481777788b0db5d513e77752d85,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,Tests_failed,fb10e31e247138acd3d0f9789a16a0ed2046caf31c5239e4a68847130712f26a,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,57b94158f2bbc74c1b982bb4d24636f3ed4c4d2e1ef7044c765286bda5571bf0,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90 diff --git a/results/combined/merges_tested/ipeirotis/get-another-label.csv b/results/combined/merges_tested/ipeirotis/get-another-label.csv index 37971bc27b..89cf7672fe 100644 --- a/results/combined/merges_tested/ipeirotis/get-another-label.csv +++ b/results/combined/merges_tested/ipeirotis/get-another-label.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,ac8fd271f85a8adee28bffb01bf892ddacbb66d3,0989f5097729cdfcfe91010095351bd233596880,e132f19c89ad735a3a75b173fb833acfdb6fbeb6,,True,True,True,7,32,147.0,2,True,7,Tests_passed,2909cf287f63c0e1df62669d37d30422c96b6574758b32e9c9a96bbad1b04a4f,True,Tests_passed,9e873c54ac25d1e2ba614103167e71cdc676332aba6e100b028805bef8921e64,True,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655 diff --git a/results/combined/merges_tested/irobertson/jpa-annotation-processor.csv b/results/combined/merges_tested/irobertson/jpa-annotation-processor.csv index f24575cfb0..d116dbb043 100644 --- a/results/combined/merges_tested/irobertson/jpa-annotation-processor.csv +++ b/results/combined/merges_tested/irobertson/jpa-annotation-processor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,7afb7f707acec7dedb8da5a37d80ce8b28a2ad5d,9945edc9998ecffa0b9796887a6b0309dcc3c0a9,36cba17aa2e95effcea8f835318559301e0471d6,,True,True,Tests_passed,0f39920997c185c204ab490e7745e00959f5a795f53feafcdd893faab75ac33e,True,4,26,95,2,True,Tests_passed,443572ca1c16e6e1e832edd1fb2f0cbee50fa3e91b720da5a45f583e636d6c28,True,4,True,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_failed,5c4aa6b961e7014fe586a892174fa0e202f0cda654d74e20b9dc7e1c7746097f,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb diff --git a/results/combined/merges_tested/irstv/cts.csv b/results/combined/merges_tested/irstv/cts.csv index e64f8f8f47..d72e8c843f 100644 --- a/results/combined/merges_tested/irstv/cts.csv +++ b/results/combined/merges_tested/irstv/cts.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/heads/master,237a62d67756b7e6562eb1ef75ae18bd26f4f768,944113ca8f5a75a9984f9040328dafd54443fbf2,b8db8e790fcd6725cbeb327e9183587ca3b9cb72,,True,True,True,16,1555,20597.0,6,True,17,Tests_passed,6af8635da82c1a54d9232f9afa809a48b31d5673dbca7464af810be13d104cf3,True,Tests_passed,16bffec354ea90f6fc59b690b9895845d0089b9c9c1ac5147779510dfb6548ad,True,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,aee0024e947e4c44fe62c68cf2b86d4b5d745e449792353bd8fda5e42ccb153b,Merge_failed,1649ff9ae02be849d17a718360bc64a131e9fe238dabac733dfc14bfa737c5a3,Merge_failed,75c9476497ae93c41d94f4a6d561010b7bc35b0a3fee29729e151b17511d62ed,Merge_failed,2fe77c42e96c2f434b68d9c9bbcd875d36d0dfa4191311c33f92d71a4d03c23a,Merge_failed,1649ff9ae02be849d17a718360bc64a131e9fe238dabac733dfc14bfa737c5a3,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,410e46681955cdbda897e9e55474927d13cd00bc5ad57ce82b7c40a5b2994506,Merge_failed,d68a75169415f2a72da9116ee972fcb39608de4b838c1c1a531e79feb50f2fa0,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d 68,refs/heads/master,99e5d7dd4375466d8911dd12651d632540656789,b5e40d1851d46d0b5b1d745e5f9baf96d195a9ba,5ce3f2355416a9203dd1b12b8ff9d224d2b796a5,,True,,True,90,371,,6,True,90,Tests_passed,021788f737e7b9774c09b3d85ba338c8470362d69b7013e0c3f5936ccab75df4,True,Tests_passed,d1fd7ad07c29541c44c84a3dc043b1717375e9e155bf511736b8adcbe37cb190,True,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,5d9e3dee72f78bf5870e1850992b13e969a4f54bbe4ed634e86796aff869e991,Merge_failed,a7e77180d8c155d893e9bc544006267add5b09cc385143e033ee142fb736eee2,Merge_failed,3d634aedba0552d16c7dfb4669011ef58b223404531d4feb814c873ca12dad9c,Merge_failed,1df19750687f085e0026e7ab05d6fb795a2a21ab9d32a37b25d600bd24e0c4d8,Merge_failed,a7e77180d8c155d893e9bc544006267add5b09cc385143e033ee142fb736eee2,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,97a7942f01e936ece646dfc7b11963a2dc9ce90463710f831833ba026ecb7d01,Merge_failed,3d634aedba0552d16c7dfb4669011ef58b223404531d4feb814c873ca12dad9c,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7 70,refs/heads/master,e5ac2fb4e8ef1b4418f9d55477b664e02193101f,f0d036b91ebf1b39d8189dc04cb75e12d706da2a,99574c8e55ca1d77866827d98b3212b3a3f60170,,True,True,True,102,1107,28522.0,11,True,102,Tests_passed,37ac7bd9b801733444360ca3c443c7384a09cc4be321a16570d745f67f5c630c,True,Tests_passed,64ced37fb36a907e94fd8e8375fda13cc28a4d4837291276439c7d4d9a02f222,True,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,14ecdb07e5b3dbef530818aa40db581b83f7f9b0e0c9172b38b374a533c0c34b,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,4cfcd7f32b77d8e044879847524f770ac48f338ed4bab9b6c6cf9adc94f99016,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,d84ad44fc3b0bdb1802947db4c59e548e2f7f0e2755fcfb70c7b227645435a2d,Merge_failed,b10b3231b34b5fc2779d393bd1634168c6d9fcb0fecf5f409a92a433aec74cd0,Merge_failed,1b86b2c1cd7df662901cf9cab0d7f08c9466e3cfef704ffbe77dc673ad771013,Merge_failed,0cfa070e21b9c021b2e3d77d4e36061fd61cd969c23dc6a787b0081fe1311ad9,Merge_timedout,,Merge_failed,1b86b2c1cd7df662901cf9cab0d7f08c9466e3cfef704ffbe77dc673ad771013,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,4cfcd7f32b77d8e044879847524f770ac48f338ed4bab9b6c6cf9adc94f99016,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,d84ad44fc3b0bdb1802947db4c59e548e2f7f0e2755fcfb70c7b227645435a2d,Merge_failed,6c5449bc3938b0923b6866711452afa421b09eddf7a53969767ea78db3150ca0,Merge_failed,0cfa070e21b9c021b2e3d77d4e36061fd61cd969c23dc6a787b0081fe1311ad9,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,14ecdb07e5b3dbef530818aa40db581b83f7f9b0e0c9172b38b374a533c0c34b,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162 diff --git a/results/combined/merges_tested/iryndin/jdbf.csv b/results/combined/merges_tested/iryndin/jdbf.csv index 3bee9e361e..8114b30047 100644 --- a/results/combined/merges_tested/iryndin/jdbf.csv +++ b/results/combined/merges_tested/iryndin/jdbf.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,9853124d737de64723a5fbdc879aed3b3d907656,6873736fe4071a4ab6e1cf0790f2c3eb252146ee,7855c84d1ca249ed60c5f43634036c6c34c334bc,,True,True,Tests_passed,decc28d7f0fc97bf55ee9c3becde0b585c246a4ad569ab3ef73e21162a80191f,True,10,41,365,2,True,Tests_passed,e6156306513b246fd88141be270e51fed49622d50b84271889eb80cc14b811d1,True,10,True,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b diff --git a/results/combined/merges_tested/iterate-ch/java-openstack-swift.csv b/results/combined/merges_tested/iterate-ch/java-openstack-swift.csv index f737a061dd..1577db20c2 100644 --- a/results/combined/merges_tested/iterate-ch/java-openstack-swift.csv +++ b/results/combined/merges_tested/iterate-ch/java-openstack-swift.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,8a6b85283157ee0e827e9f4b99848372bb20e770,45818c6defaaaf55e9973c210d069877ac708643,8d3f1c990fd8de009a13a9b67769c8c80ae5f7c8,,True,True,True,5,25,580,2,True,5,Tests_passed,492d0fb3ffa41989fa930aae319f5fb19bcd2c00a5fad6c03781efd0dd99c10d,True,Tests_passed,dcee5e5189caee7da235f3f57dcfd19e9c012a3bbd7dd5bb693ade1d60c49eb2,True,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,15ab040df872fb06c1ff4c90669754f28e3c9d2a5713b7bf94196a846dd208c6,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,aa768e2365a03b752ac98dcf3226a0889f47fb0618a48a5f94794b19a51d264e,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,6b14d809f56a3bbb58f806b0cea74dfd93f4115f115ff542adc3219244ca537a,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358 diff --git a/results/combined/merges_tested/j-easy/easy-rules.csv b/results/combined/merges_tested/j-easy/easy-rules.csv index 13d7930586..3e0285aa18 100644 --- a/results/combined/merges_tested/j-easy/easy-rules.csv +++ b/results/combined/merges_tested/j-easy/easy-rules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,a437b010651ecb8637c2d4e675c83662d4d529e8,be5d61bda9781047a72876d45ee515fd4977ac9a,be98dc5ed7202577836261a52712b115a9b23a7b,,True,True,Tests_passed,3b0f831988334338cd3c00bc5c56345535ad3e2db03ee3da4c457c5d65c7ef95,True,21,31,213,2,True,Tests_passed,85ca110bce78ef542ddae007fe55096293313bd905e74846ae1ef11b14e57a3d,True,21,True,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,0c792da9439532c52d0ae8dd85d4f899aea28c4c3e686e3dd9eab5467d233a89,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,0c792da9439532c52d0ae8dd85d4f899aea28c4c3e686e3dd9eab5467d233a89,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4 21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,True,21,47,688,9,True,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,True,25,True,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,6fea9e71ad7bada002aba69b755bfa4b6f75b93bff15f16bf40f432b5986cafb,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,14e7694fb3206570917e6e747919adc676f7052e8e35fd41b12a73faca532956,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99 28,refs/remotes/origin/pull/184,ba07071a49b4ef022c745d13c6502b38794ef956,192d3fb32413f101c07fdbc9f5965b41a47daea5,12ef53dec57066f111a7ce9f1e72765469d0fec4,,True,False,Tests_passed,8ae063bf60773dbe12a9b1ab6fdcc9c7f1c0867d34f285bbc7003b4ddf87ec5a,True,99,127,266,2,True,Tests_passed,48e3adb0e6bc49f758017df58201dac8c127af6c9196395f3d493e6f7cec23b1,True,99,True,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15 diff --git a/results/combined/merges_tested/j256/ormlite-core.csv b/results/combined/merges_tested/j256/ormlite-core.csv index c09adc790c..f08012be65 100644 --- a/results/combined/merges_tested/j256/ormlite-core.csv +++ b/results/combined/merges_tested/j256/ormlite-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,69a425eba7a7415c16d341a1ba34603604c06349,8fd3946900e2ef1f8b14729f3e08cc9dda7d01b7,c15b47ca259110e870ededf66195275d18298495,,True,True,True,96,610,19457,3,True,96,Tests_passed,14428c2ed7a2231c5148582ccccf2525b107f59107332e6c34bcf913f43a79b4,True,Tests_passed,d6c76e5450a337ac69ebe8e8af503d086120a3515f203074fb22b7c6e9cdc1ae,True,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,4c64e9dcd772a16b9078d5d3c8e8bd9b61b122501345f3a894959de3d3780aec,Tests_failed,9c14466ff6143f1141c20c36297b92a83850d7ba2d4f1c80a523faf424bcbcc2,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,4c64e9dcd772a16b9078d5d3c8e8bd9b61b122501345f3a894959de3d3780aec,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d 10,refs/heads/master,606986f118bb8c4de534c102f93dcbdc1241abd7,f46f05f128a1bde083a51b6f6e9f8f4a0981d7e5,1b78b22f5834adc7b9c1d0d6f93bc818594bb4a0,,True,True,True,74,554,2219,2,True,74,Tests_passed,a972f400f6fcc6d9ee2ff909c932ddc26fe443160251f3c095bc5840d3501966,True,Tests_passed,12083c250dbd413849a212a432fe7c60ae3cfe4c4c126e7bb6021d51bb54aed1,True,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,20fc42555015c8eb603cfe7924a782cbed1844871b59c6457ba9b1d2f19c21a5,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92 11,refs/heads/master,2c159335d40ccfbc9e4451da16b7af9e89f7c412,8838b6c3959d164b3de65fb66200c64a974ed2c1,ad22a3d91da11fca0c0f768011a92707e8be1ec9,,True,True,True,65,523,2075,2,True,65,Tests_passed,3a09f5e5b46ff479023f000713dfd6e5c2f1b21cab7caaf9b03bcb46f0acf6f2,True,Tests_passed,a37ee0ef3b4d7edfb023ecaecddade605fac67f0fbb40c4eeb1667c3730eb460,True,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_passed,192480cddf95ecac52abb8f4fd4650efd2fa4bad8e1a4ffec66c4058dfa0973a,Tests_failed,e91be332dbf707fa6d966d1843ca3b90307fdd388a7223ae10d0c3f0b07d377e,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_passed,192480cddf95ecac52abb8f4fd4650efd2fa4bad8e1a4ffec66c4058dfa0973a,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010 diff --git a/results/combined/merges_tested/j256/simplemagic.csv b/results/combined/merges_tested/j256/simplemagic.csv index b1e1b01c1a..6e50ef8f9b 100644 --- a/results/combined/merges_tested/j256/simplemagic.csv +++ b/results/combined/merges_tested/j256/simplemagic.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,8c81457a6fd8c2b72841d5c199016ab637c56e35,a673161dd269f27452bcedbfb293be0cf9c0a290,862c6faf669d9daa1d84c5ec01f2be4a886f7fe1,,True,True,True,22,91,613,2,True,22,Tests_passed,fcd3bd7e6dea130834b4b3abb075ddb4e0931625cfc94dff614a7e2a3f325c6c,True,Tests_passed,a81fe97a85fba31eb520ef6eb514bbd7f8da8c5bc91cf3c4febaa37d0cb8e236,True,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,8f8dba8e819c20e2f2272ca5b4baadaa7681440a8080090c400e4438beb04565,Tests_failed,02c204f71f863ca4c708ed2e3b7d9528fc74e4711675f9defaf87130425c4f75,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,8f8dba8e819c20e2f2272ca5b4baadaa7681440a8080090c400e4438beb04565,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340 24,refs/remotes/origin/pull/62,a2fee571fbe304efa8981457403471a2504062b4,be23be93333aeb434b823ec988702e9a782e0091,360362b52be76e31d01182abffe73f25e170221d,,True,True,True,26,83,226,3,True,26,Tests_passed,d03640f23aeba27e1e1897251a2c6aec7d0c8675284b845a9b3eb9a413eed29d,True,Tests_passed,0b1abe883085eb51e4bf3615986acb3cb28d1a78a5ad220644e3e714f293c907,True,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,bbf689443b2c45bb6447a04fabbe0b5cdc1f5bd959aa1fdb9c4ae59a4894df40,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Tests_failed,50f85f927c2b3eb03a25d83363bb9823636dbcf875d1e4adc520c1af3ff54cfb,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,e972762f15b11296a2fbd9114ffd8a0ba58a7a7092632c311968b726c4d90338,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba diff --git a/results/combined/merges_tested/jacquesberger/jsonparsingexample.csv b/results/combined/merges_tested/jacquesberger/jsonparsingexample.csv index 0d13d3d7ed..91d9474637 100644 --- a/results/combined/merges_tested/jacquesberger/jsonparsingexample.csv +++ b/results/combined/merges_tested/jacquesberger/jsonparsingexample.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,452713c93df4e8122c080c9cb9b360c6997a0a7a,de2cb9487fdc1f74fdabb99cf51feaf7a32e2dcb,8a9f356fb2bffc7ddcfe1894cba6c5b060a309c8,,True,False,Tests_passed,8a633b9736ca5417a23e531004ea0927a01e7368dc153f26077265199eefde92,True,2,3,7,2,True,Tests_passed,c30148634c23e9012ec9bfcfdf48a9e5be0cb4668fd991f584007a0845d2a92f,True,2,True,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,921e78dde9bdbd5dac1f5f36cca2956a3be38254c90a418df004d4269cf6d565,Tests_failed,85f6300b079fbb65b87e96e61d9e6d2b8706c67f74be493dc7b3515095f6baaa,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,921e78dde9bdbd5dac1f5f36cca2956a3be38254c90a418df004d4269cf6d565,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950 2,refs/heads/master,ac521954c2d20f93d597a8dfbeae1e3f008befda,09ff67b95c86658c563e180e2675768b845987d9,9b33d2d1e147bd014e2bb503ca0a38657876ce47,,True,False,Tests_passed,30b2ef34340761d99265a2fe661f6a3d29b66e4ae4883458cc38229a4aa68972,True,2,4,15,2,True,Tests_passed,c5f74055095f11a18db09272a291c7d5d9ac46a8b437ae1dc5cdeedce0173a68,True,2,True,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,9b4a2d8f81e91d2fcbae9134c5cbc551c0a4c717a8d2967931b95ccc9d22e314,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,817aabdc1c7c260b2b6640f8612a0c838ae9c30bb2d62a225fbdee9c58fbc6e2,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,4b12efad7f67d92f72aabea2c4df7cce7e052ef9c41a323cb69a393598218220,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55 diff --git a/results/combined/merges_tested/jadler-mocking/jadler.csv b/results/combined/merges_tested/jadler-mocking/jadler.csv index 3d44516864..3edc53ca66 100644 --- a/results/combined/merges_tested/jadler-mocking/jadler.csv +++ b/results/combined/merges_tested/jadler-mocking/jadler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 117,refs/heads/master,c022c949608a874cfc3c2a47cc18b3cf6ef0f161,3b24b879c4bde13d48c40c9afd91250aa5b18368,a29d0b7c2f1e21f1cbcf088c3bdf13640b569749,,True,True,True,17,103,249,3,True,17,Tests_passed,6c7ce2d9a83c0e602b91d8c1448f5d6bc2d59f42ceaa2495a9c8fe1c9e9f2fc2,True,Tests_passed,91390ac5fdfd0bf29cbc1e6bf3dba5332c215e20f2dd20fc7d0185d510e908a8,True,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143 137,refs/remotes/origin/pull/129,294a06c3fcf8679d90a65e2f9bb73de7f7a0a0f2,dd9a8d0b6ca858a54ddc1a52627e16d0b9dba600,973006503619b77b204b0eaf73ea940823445813,,True,True,True,40,168,5487,2,True,40,Tests_passed,c85e23ca4103a70e3b23f04192fea5228b62f242c51cb27caf6cd42f997ea497,True,Tests_passed,b4c9e15e0e24ee143e5b92dcf641cb6b3a43b6120237285c2bc04950fbb242b8,True,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,358af74ec0b411d191f7cc8985cee718765b561d888df745fbe97ab87508a0ac,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,358af74ec0b411d191f7cc8985cee718765b561d888df745fbe97ab87508a0ac,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58 138,refs/remotes/origin/pull/129,dd9a8d0b6ca858a54ddc1a52627e16d0b9dba600,38e09d8d02b6f198fdf9a5ce02ab2a639ff0c5dc,39dd9593b6c8156dc08848062a931e830057b651,,True,True,True,3,9,156,9,True,10,Tests_passed,190663b15a1d717089c8208a131b48166ab400f79145be3e71007bc85cf00bc5,True,Tests_passed,0b685b8e9717e071d882519a01b42740391eca226309550735b41b0681f76ad0,True,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,b7d223a1920256313a19af9c2c0c34b3e1b64043282d16bbd17a02d47d741c10,Merge_failed,ecbdb78a90c7d47fe6ac37ce03859eb21d9ebb6b4d5cdc49c8f863f840dc986e,Merge_failed,d96dbd0e4604758230ac2af2f1954b1f34ee1cd15751bf8b676dbcf561bfd281,Tests_failed,1ae8304730a3096e7daf9a08511fdb36374959735fc6ce117848560ee5ee8600,Merge_failed,ecbdb78a90c7d47fe6ac37ce03859eb21d9ebb6b4d5cdc49c8f863f840dc986e,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,a5f5afb7847184bc276c5595ed00fb2cceccee7507709001823cb5630a89fdeb,Merge_failed,d96dbd0e4604758230ac2af2f1954b1f34ee1cd15751bf8b676dbcf561bfd281,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107 diff --git a/results/combined/merges_tested/jahia/jahiapp-newsletter.csv b/results/combined/merges_tested/jahia/jahiapp-newsletter.csv index 6349bc3b09..a5e7ec9b23 100644 --- a/results/combined/merges_tested/jahia/jahiapp-newsletter.csv +++ b/results/combined/merges_tested/jahia/jahiapp-newsletter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/1,1d8a06e1d3bf5116c4d900bc808170310aed675e,ad6e58fc6b376e34a9b05748a456db9a7a2b35e4,51a1b0ec89c37330997c4af05f0e85c02d0f0312,,True,,True,27,170,,5,True,27,Tests_passed,f7e61f2816286bc68da15c29011967ae5a420ea75589589d219ce2d85c4b7114,True,Tests_passed,2c71690a52ac6d921d3ed2af69eba36ffe6d2840c064b694b5e1576e16e47c53,True,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,f1edc6884f942d8fb4d69036a63e43683f09722f9c7c191b4d99daf73ea07d60,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,8c6f56fa334e7e6393f4e5e184c96037f25e09d434d710946e9a48a0090b973d,Merge_failed,d2cd9824dbd0da6e15afe313768b1ed925c4326d116d48ffd3a97650fd38fa84,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,6f8c1ddace43684942699ebc103ca7532525385f55b7f36b9818cd33c2d9152f,Merge_failed,d376e620767ec4e7dc952350734ed0995b4e28a49ed84f92b945633825495274,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754 diff --git a/results/combined/merges_tested/jahia/ldap-provider.csv b/results/combined/merges_tested/jahia/ldap-provider.csv index 4e2c489f08..382a04e65a 100644 --- a/results/combined/merges_tested/jahia/ldap-provider.csv +++ b/results/combined/merges_tested/jahia/ldap-provider.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,6d1c8ec4b6fd4b940368f7290fd5ab315efd3240,fc5ec6dad13d304cdfd981ea9a300b005fac4bb6,9f02fba71d5f3bad70d553709d718db715276f48,,True,True,True,20,40,311.0,8,True,20,Tests_passed,165a535fcc358261b96ed31f503ec7c5e0699da0eb44a4dee7acf1a09832015a,True,Tests_passed,900b71294fa88c05a9c4354beeb2645da4428586bf5aa04085cea58e231e3e3c,True,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499 diff --git a/results/combined/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv b/results/combined/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv index 15e0250c3d..cb8734477a 100644 --- a/results/combined/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv +++ b/results/combined/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,96f3e9ffc1450a7b27819ca751a462e1048517d4,2ae1a9c110f059051c1b0792b9e07758827e6e03,9f11694895337febf5044cd3b0ea52291fdbea13,,True,True,Tests_passed,68d1a993b7f806a84c36f6d4abb3a73cfa7c08b6514e2a2e2ca70056ccaf550c,True,6,32,173.0,2,True,Tests_passed,d1f9da1d3872811a7f1d539e8f8b7b51a547c537942f86b09b2af12e19e9852b,True,6,True,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,f713fc42a15d33998d162ab8195b40b6ed49655219389ce41340e591df8df001,Merge_failed,f1cf66428d56caa069105d5691097e6e7d03e90d9088c9a86c6d56769b156ee8,Tests_passed,0e6e9bfd269863354882d08c4bc31ba59bb9c3753c8eb659e6266e93618bed48,Merge_failed,c7e4454b3092ae59192ed83c839d6800e10e53452ba7dac9e353bc29ce0810c8,Merge_failed,f1cf66428d56caa069105d5691097e6e7d03e90d9088c9a86c6d56769b156ee8,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,df93818db73713ac25a1d126763d25125492e0b48bae1fa32607f33e641ed91c,Tests_passed,0e6e9bfd269863354882d08c4bc31ba59bb9c3753c8eb659e6266e93618bed48,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592 11,refs/heads/master,3db9087392f4de4fd2ac154c811678fa6d29465c,0bfd01b19961a6511f71d083a6bb45d76502f196,1ce5e4a41c1b229d07643e0746fdeb91841e7414,,True,False,Tests_passed,2ae40e4ccee6b5f7205b4bd5dcbb255df235604bb28e8df519d41e495299271b,True,5,16,137.0,2,True,Tests_passed,fed1d63258b2c38fb9a467c6182291bda1a3ad5cab91d063ba311ba09f434b1a,True,5,True,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_failed,8d6b8d7765f20bc196d84710ac0e4772db75ae99d8ae4813a8d2961f082e597c,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477 diff --git a/results/combined/merges_tested/jakewharton/disklrucache.csv b/results/combined/merges_tested/jakewharton/disklrucache.csv index 8b16909163..fcb502e2be 100644 --- a/results/combined/merges_tested/jakewharton/disklrucache.csv +++ b/results/combined/merges_tested/jakewharton/disklrucache.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,Tests_passed,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,True,3,15,135,2,True,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,True,3,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa 19,refs/heads/master,204d41abb60f981a3f8521b7b5cb41deb43281bc,747e27fe8d35145c0edced0a6f4eda240a75c774,d0ef4584f651220b0189f83bfdc9caaf6a1c9158,,True,True,Tests_passed,50679c63faa75c6b2f8df6a11090deef31368696b0b8151d61ec4a20ccf2c833,True,4,27,47,3,True,Tests_passed,72aea9eec98e99634c934023009283ecb6e123b63be8470eee57f59891e92c4f,True,4,True,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_failed,dec66372ca71bc6b1c05d494d1fa5b24a08fdc84d0dc6436d090623d3fc15adf,Tests_failed,abe143cfb15d5307bad87845c939dfb2cd0a1a187b72042501e1e4cd084ab97b,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_failed,dec66372ca71bc6b1c05d494d1fa5b24a08fdc84d0dc6436d090623d3fc15adf,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad 28,refs/heads/master,7f28919d2a63436d1f4f762c880c16f1cbb4f6f1,aaaa511ae0cb28450d71f66b50e371983fdcc504,f0bcf1c0afe41ae0c2925dc362c72e0c71d54abf,,True,True,Tests_passed,90912dee9f9c78c0d221ea00da63b680f9521942f61d59272060a6fcec1fb1ec,True,5,58,347,4,True,Tests_passed,120480e0f2af23b1d3275934be29a006ca9575bce5affe29a98a7240b0ede917,True,5,True,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,308c60b14e1ca9951a89379aa2cb806d06bf8cbbbb6f95e74079816775f25cac,Tests_failed,c7910b63b1279c57b1c906532de14e5732166bfc00406c647a9c703d5063122f,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,308c60b14e1ca9951a89379aa2cb806d06bf8cbbbb6f95e74079816775f25cac,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d diff --git a/results/combined/merges_tested/jalkanen/speed4j.csv b/results/combined/merges_tested/jalkanen/speed4j.csv index 9ae4642aaf..81c2b04eb9 100644 --- a/results/combined/merges_tested/jalkanen/speed4j.csv +++ b/results/combined/merges_tested/jalkanen/speed4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,18370b95449b0062c7f3286734bb393cf47e02a1,1f224d4a60b62e76f9cdc0893e477e85295c3f13,1164f50c09c8ea4be8d59bc8cb8f01e11180e3ad,,True,True,True,5,13,69,2,True,5,Tests_passed,2f02793aa0403b6d25b6dd70488e1d1c286d04a41899d5d93551163078660fba,True,Tests_passed,fda8748049efa14bd2fb5c8c12aaa8e4d9b692cccc4f9f19182769752afb977d,True,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_failed,be64fbedf45f373e7536fa4ecccd794b7ddcd51bf8c5b5bb3d8306cf9eeb8502,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121 diff --git a/results/combined/merges_tested/japgolly/svg-android.csv b/results/combined/merges_tested/japgolly/svg-android.csv index bf36cf210a..5cfbebec17 100644 --- a/results/combined/merges_tested/japgolly/svg-android.csv +++ b/results/combined/merges_tested/japgolly/svg-android.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,d1f6374f0fbb160444f998d4dda6a351d24b7f83,c92bb808ebdd240679593f352cb0ef139b43ec27,5610990acb1dbb9de9d4145e4cdf0416091d3a31,,True,False,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,True,2,15,92,2,True,Tests_passed,8bc0206708fe01382a8ade358ca33ed84b7c02a4dfc15aabd4b956f76a0bee4f,True,2,True,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,d6ec2c8026634569fa22fdd491cc57df520dcee98d0eda041180c189c7cf8894,Tests_failed,b964b660222696fc8c9e6daf5cf941a3468dcb0e8c707144efd196a463e680cb,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,d6ec2c8026634569fa22fdd491cc57df520dcee98d0eda041180c189c7cf8894,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f 2,refs/heads/master,c92bb808ebdd240679593f352cb0ef139b43ec27,f62966b068bf8bb8e96d4592ad12275549a4f2ae,93c4a06d20ad8c29305cd5604a387bf37d5abcd4,,True,False,Tests_passed,c64d70b547edb86cf23ef9683c1c8ad0feef84b572951ed57de742b9bfef6a16,True,2,8,17,2,True,Tests_passed,46d4d1b2217297aee78e7f99cebcdf7e4c913a1f8db3e7e77d2656272008369d,True,2,True,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_failed,78cfb6d1db3c56fd82528683ca62605fd77390b92f9b4dcbe1ee1b44fb3acffe,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9 9,refs/heads/master,9c601773e2b843f770effec06e50d80a23a4598c,6d611e2185b007b649e29659156384f99397357f,8d982f7b79ee66d72c8ae004d39c211a7fb6cb10,,True,True,Tests_passed,0818e7ef7182b95f956c31ae57f63104f867270c56bfd4055a532b2989c95139,True,5,75,477,2,True,Tests_passed,02c03702ac0560a94bf37c5371bd393f80e1484b6c8af703707a8440099ef333,True,5,True,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,e659e066ee24fe1a0c618f5775ba6db8a0828b17275c56177ad42ad520884927,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,262fd1c0f7db4c89e2437da169c9166668aaddfd76b307fb0b6b2c16bea94644,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a0c12739b393789642fac821c04d3b839bb1b6a32667d43f650a7e2b9939a637,Tests_failed,00a0e3013fdeb549863fbd8522ea216e3b1ed55b6ebbbf502e68c7542836e9f2,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,262fd1c0f7db4c89e2437da169c9166668aaddfd76b307fb0b6b2c16bea94644,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a0c12739b393789642fac821c04d3b839bb1b6a32667d43f650a7e2b9939a637,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,e659e066ee24fe1a0c618f5775ba6db8a0828b17275c56177ad42ad520884927,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5 diff --git a/results/combined/merges_tested/jasig/java-cas-client.csv b/results/combined/merges_tested/jasig/java-cas-client.csv index df429995f5..25d5b53628 100644 --- a/results/combined/merges_tested/jasig/java-cas-client.csv +++ b/results/combined/merges_tested/jasig/java-cas-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 363,refs/heads/master,c8e50905bbba72d8e0fd0cab49bb0b379c1443fd,eaee34b3611df101bdf6ded2f68445d193d813bf,e1e12a5f3f94703611b8a50e1c2acd1843393f38,,True,True,True,10,40,1048.0,2,True,10,Tests_passed,0b7a608c9a247b17377119e5accac9d490132131156dfff4a25d297306a32748,True,Tests_passed,bd7c43754c7379496351d1985cad3ceae4fa73fd9015bc90b24244f1484f54b5,True,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,1d7b51cdcc299ff405bde8cd288cfc22890052191a66f9b5d32224ceb34681cf,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,1d7b51cdcc299ff405bde8cd288cfc22890052191a66f9b5d32224ceb34681cf,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5 366,refs/heads/master,f98e77686923e7ed87a10a0d9a5462e776aa368c,c61dea96bfe4d6b227b2f83c1044659a950d33f7,607d53a2aa7a4b73f0d0cfaff925aeb6af800648,,True,True,True,92,292,4705.0,2,True,92,Tests_passed,cd826c9d293f32b923e809b00581108a955d2f3dd1043e293d9a925ec6967762,True,Tests_passed,01c53fbf7e405956be1aa6398d5006102137dea18533e8dd331645f317ad5801,True,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,620693ae15c280fc79ec0a280205a218662bf1336d55a240e2b8c4ba78c5c437,Merge_failed,1a9c89c8d60e7fd3ab7ed7b45428bfe083496fbfc8b41a9282a880c8a9d9203f,Tests_passed,b6043e2b9f26f5e16c746812a880122405ba69bc9dc089c67a360aee74f3cc37,Tests_failed,87f1769c0195404da746be9558a573d5ab206887541db02910b50535c96b3547,Merge_failed,1a9c89c8d60e7fd3ab7ed7b45428bfe083496fbfc8b41a9282a880c8a9d9203f,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,47370e67c344923f4f20c2b1ec5adc68e600175ece0a8d063b56712e2abb3e4f,Tests_passed,b6043e2b9f26f5e16c746812a880122405ba69bc9dc089c67a360aee74f3cc37,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf 371,refs/heads/master,863038605f7567aa5d0f1a2870dce0231a686665,0652f4ee230962403d64b4447f5623fa38011177,f5b2275913090136b70681eda703422d0b7b4102,,True,True,True,32,76,1229.0,2,True,33,Tests_passed,2a7aca671178b966ab05a58649a5d64946ddba669940669d56c6c552edab5a1c,True,Tests_passed,d86f4459d6d5225d2e43c844f2fb6d5fdb2b2d65719eb64c5f55f924b78b67a1,True,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,24fdba724f34473aa58dfc9abf6b607aaa187c966ec91d62d628b629c01d3528,Tests_failed,110d4568c9d9dbc50b5dc154d537e3e187592ecabaa7c78c994b4c2f22027498,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,24fdba724f34473aa58dfc9abf6b607aaa187c966ec91d62d628b629c01d3528,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa diff --git a/results/combined/merges_tested/jasig/jspc-maven-plugin.csv b/results/combined/merges_tested/jasig/jspc-maven-plugin.csv index c5187095aa..30e9669280 100644 --- a/results/combined/merges_tested/jasig/jspc-maven-plugin.csv +++ b/results/combined/merges_tested/jasig/jspc-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,1ea62650f81dfb722f95c0878b8d49ed45e1149e,96e5b1d72738896df1e0a7c3d0c19e50e9d2026f,448cddfb8a0fdfa129f96247a4863d60ae70b648,,True,False,True,5,8,24,2,True,5,Tests_passed,a2cd8a1fbb8723186b1a57c1eff2346cf635be462eb45f53b90f49fe704e4ab3,True,Tests_passed,3c5cbcfdbda7dc0b5ffb709df3aed6315a34510bacf21844794227e72b075014,True,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_failed,907a965dee6c03aec73deb4d16d0a9aa6339681dbe85ce7b3e2b9ce8cc7a5082,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b 17,refs/heads/master,6a1f4e7b3fb61c8c2e25b2618b3da025a4d5fee4,6ba53ff595e070f847ea19a1575db6cb94c7ad16,0d8f0403c95afeb250e5be8f1e6b4a7ccf9f92d8,,True,True,True,19,41,1299,3,True,19,Tests_passed,ef339d8f80687a558f5760ddce3d2e3729726478b27c658f2e9a1fed628a9a59,True,Tests_passed,a81935f94fa653e55ee49f786da52d13a21fc70bc740b5936bca5c791f02c9e7,True,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,4b7241cda3649a7f3ceafb7b08933cb3591b59f3a0edcdaee6544ff5ec0aa3b6,Merge_failed,43d958748aea7776b83ca14b3021a88df00d5d933382e810f8fabe15d3598edd,Merge_failed,da089110e0c8f6dee794729c2c9a5087237020da782c5ccbcae02027adbaa04f,Merge_failed,059708ba0af47fd9a710d5b6517aad3d390036e9587d0bc3f4f7595905a3071d,Merge_failed,43d958748aea7776b83ca14b3021a88df00d5d933382e810f8fabe15d3598edd,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,49685bfd8d7faa56208f77fc55755be1a8858a9ab5da6026c2eef0406104708a,Merge_failed,da089110e0c8f6dee794729c2c9a5087237020da782c5ccbcae02027adbaa04f,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56 19,refs/heads/master,634922effc3238357db5ca24c0a5feb8e8f5853c,2970792b02d0fd1ce607ca9825a1ef932e637552,b3646f914368fb4b42e2dc60836ee345034f9ff3,,True,True,True,18,36,1266,6,True,18,Tests_passed,b5c56d223e5785fee9f27bab2a9becb25aaa12bda902a230c03f1d9e251133c5,True,Tests_passed,5873b20245a4bb4980737e57fa222d90e7e362543e9c2f84c81da349d92f44cc,True,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,6174e63e9b65dc63dcf10ac4e1ac75ffbb1747ff5298ab16addc68c99ca8961e,Merge_failed,cdf03270e5e88fb3e3a88f3eabde127fc629bbaa18ad6464ddf012a1db07a0a9,Merge_failed,32a2db2171c1a55154edbe94d21990f68325c586330fe848d5c5e9b72e7389ed,Merge_failed,d561583a7ce29acce150afdc19256cbff401a9334880ddf8578689f85a501b69,Merge_failed,cdf03270e5e88fb3e3a88f3eabde127fc629bbaa18ad6464ddf012a1db07a0a9,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,2ab5a1f35e3b03d33e2c106c84c1ce2de4f36fc2d1df7218bbf55a524bb12da6,Merge_failed,32a2db2171c1a55154edbe94d21990f68325c586330fe848d5c5e9b72e7389ed,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e diff --git a/results/combined/merges_tested/jasig/webproxyportlet.csv b/results/combined/merges_tested/jasig/webproxyportlet.csv index 06619b3731..2d7d37dbe3 100644 --- a/results/combined/merges_tested/jasig/webproxyportlet.csv +++ b/results/combined/merges_tested/jasig/webproxyportlet.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 141,refs/heads/master,aa92c74f5e24668cc8312270702585e14c649b11,b008613b5a9adf71e75776098ea5110b794170ef,11306f962cabe54ce892c328b432041dacbb83dc,,True,True,True,13,47,175,3,True,13,Tests_passed,694ad467e24df3ddcf2ff62e9be3d67bc584561f8aa89172c6075b7cce0b545f,True,Tests_passed,8f9bf557172eca435165112d4c29e1c511b6b503650a14e1e6f8a5bceb07116e,True,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_failed,5cec65c37b520ae6ebd76811f00131f9e7238b5367721765e5a6ad97ac796a6c,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9 154,refs/heads/master,2e2f16c741dd7cd4e0f77dbe281912e9455f04ef,e1bf72bf755925ecc51dc080444e61eb73805050,0a323edaa22b8207420a7f9e44bcf9b13f4bf459,,True,True,True,92,522,1611,4,True,92,Tests_passed,3f40928ed0aaedd1c28d2e6d7dcb21f7259235d895fa85005b4249bdbc51298a,True,Tests_passed,530e7fc21a92307b8258160ceaee7bbe8ac89f17a5716ee9d1cee3a7858dabf2,True,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,9cbabd3944d3ecf494d98183409faf3810093331ad6268cb7e091298840077df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,9cbabd3944d3ecf494d98183409faf3810093331ad6268cb7e091298840077df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2 157,refs/heads/master,8fa875fa24b9d8743f49b87aeac3701f3c5aeca3,a8b9ead6242bdd320f0ea81ca59cab5e00261dc9,f26bc29a09a4faa7d20968cdfac37166852abe76,,True,True,True,44,224,2065,3,True,44,Tests_passed,2e9f738b8d39f04de1f553beaa2c31a25c044a795d824ac156040461903e1523,True,Tests_passed,5edf7678fa40edfa318a8e38d871caf0087f939ec4b591714151e7229cb6ad87,True,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,bd1905c8b01ba3ff56492450af8a77375a1a2ae82c70137693edab049f8d28e7,Merge_failed,844bd5b90e57ad186461d5336e0e1a32228d3d9e822ddc6717232db868630392,Merge_failed,bebd4862333d1b4ad77f41660f9e9aedf52e640c8bbd8664795daa178dee01b7,Merge_failed,9f7b307d56c9f419af6113c1b93aa298fe4c824f79f8aa06c173c851d6a3ebed,Merge_failed,844bd5b90e57ad186461d5336e0e1a32228d3d9e822ddc6717232db868630392,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,711c6980c92b68dcfdb56bd3afb2a68eb65b623f6f122fc335dc6680da5d7c09,Merge_failed,9e4dd2b3bce7ca3b749de27eb276845d739840a79e6142f7431ab18ed6ecdde7,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6 diff --git a/results/combined/merges_tested/javamoney/jsr354-api.csv b/results/combined/merges_tested/javamoney/jsr354-api.csv index 7932f80d82..49aea05b56 100644 --- a/results/combined/merges_tested/javamoney/jsr354-api.csv +++ b/results/combined/merges_tested/javamoney/jsr354-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,133e18fa9cf8cfbf7bfdf5397090940a2c9c2ec7,68872305846e8a143b3f1b795a83b956b63f9bf2,00c3d1604183baf214d9f302dba9352206ec6c1d,,True,True,True,6,7,49,2,True,6,Tests_passed,9c7e1cd750d64918a87cdd2ac756f1cd9146f48d6e209214c2f0ae3705f25490,True,Tests_passed,5c1ee8da2468c5cf02d9ac17953215b4334b003093155eee346ba8a5c2f54552,True,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,508d5072524be697290ce299531b442f348929cf6ee26214abb1aeea394e2e83,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,508d5072524be697290ce299531b442f348929cf6ee26214abb1aeea394e2e83,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50 52,refs/heads/master,b5c1fbf3e07e805e8351775ba0a67133e5c3fe65,aa27d919aed5d0a37d5b19e0148ef2e39a5a7e23,c4d8946fae0546a9f1f9313ec71e42c9a88f64a0,,True,True,True,50,318,1520,13,True,50,Tests_passed,cd1378769dac03f9410ffd28fa62de21193568d275f8b2053a547f597aee6e3c,True,Tests_passed,14f51a32891a92949c1646f434c220156942d854f215a53e3c7cd1504c2e0988,True,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,737c743d2df475868f893ff1cef59b5e3d8bc66565a9487f8be3b37cd41ea987,Tests_failed,515832e3d865aa90ecdadf5cd715d14f69958ffbfff6ae0149b40153239c10ac,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,737c743d2df475868f893ff1cef59b5e3d8bc66565a9487f8be3b37cd41ea987,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817 60,refs/heads/master,86df8837ecf3a584848aa9887f735e7da91ca61d,d85183a7c710272ae06bfbacbe4c0ae2263d9a84,abcef1ae459ea3db7e7b16288d8be5a11cd856bd,,True,True,True,3,54,124,2,True,3,Tests_passed,5b8c51b5bbbf9b8619222cd2775283e7704d9acbb7231acc9a12d8d01874de24,True,Tests_passed,07f001a05870cda7fcb4edc1c4bde7d36d766495a16ab10a576e7aab48640efd,True,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,334baf9f1f052ff9bc2eb3e6094783d613fafaa278a61ddb64488f98fb6c970b,Tests_passed,5b8c51b5bbbf9b8619222cd2775283e7704d9acbb7231acc9a12d8d01874de24,Tests_passed,01c96377e3998daea756c76f242090042c13c23817dd0b2a1f678862f2f1d5b6,Tests_failed,00aa41d76e03a9d08e5186e3a4c4bee306e117e48205a98154dc01bd1c36596f,Tests_passed,5b8c51b5bbbf9b8619222cd2775283e7704d9acbb7231acc9a12d8d01874de24,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,4e66c686cd4aa3548ad406e19bbfa344d13c120c133dd9d6ca90a2e9b0b6d41c,Tests_passed,01c96377e3998daea756c76f242090042c13c23817dd0b2a1f678862f2f1d5b6,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9 diff --git a/results/combined/merges_tested/javamoney/jsr354-ri.csv b/results/combined/merges_tested/javamoney/jsr354-ri.csv index 70bd312abd..0c6416dbcd 100644 --- a/results/combined/merges_tested/javamoney/jsr354-ri.csv +++ b/results/combined/merges_tested/javamoney/jsr354-ri.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 124,refs/heads/master,bf07022ccddab3171412db1170d03ec24c77c41f,73024585e9348d07013a2cb4f10907f272638324,6ecd20662ad4ca485ca6f2b847c96be408866aeb,,True,False,Tests_passed,2cabcbda40f4b38bd5f07ff71e46daf13a82c59c7492a5dc47ff5a49b3038115,True,2,7,20,2,True,Tests_passed,17b3f856026a0b53aa106d36233b3ff01c7eb3c421c8d90b4fe5cbfbb26f2e4a,True,2,True,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,c54875644236b618258e3a223b4f9aff6e546c8143b5f7257a3ac0c944fdef6e,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,844eda3244d6700bc3d32655b3ff68b28efee1ce1e89438fd4549f95ce8c5c8e,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,6a0d2520999f43ec8d5aedc105799f158802f0362ea78024e3b0208436d5ef50,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569 126,refs/heads/master,13abd52447b60fd8ae18b118e48fbc2790639e7d,ceee2db0e1e1c5abe20c77591efdb6a2c64b2bf4,b67ee457410d23ff1b2619e105f0fcae4d6f0aa4,,True,True,Tests_passed,3ba3229d9fba9eae0036728985eaeaf5e201a288321e4e3bfe800e1abbc96cd0,True,124,514,8898,3,True,Tests_passed,75861e8f60298e90e50093159ade72f3a7f08dae3bf829d18c5895810e7b0e68,True,124,True,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,6fcf97265e68ee9f1c6a9a175c71e71bae3e4405de4aca67ab8e92c1b40e64c1,Tests_failed,16815e6bc9104a4eec57918f33157ec08d07543653f7c9d0d2b1924782de4bd5,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,6fcf97265e68ee9f1c6a9a175c71e71bae3e4405de4aca67ab8e92c1b40e64c1,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53 129,refs/heads/master,ea8ef076f9210376f366622046c127afd816f8d2,2db48cfdc0b32cec70a70953cec77ae4b450a2c1,25e4bd18b41557663058ddec43156e3222d74b32,,True,True,Tests_passed,85b15e1f4277350876eb86e9d00ba5d0c394236c1803ff9e5067746c56c049b7,True,25,113,437,4,True,Tests_passed,7520de8d2ae4e6fd5978b61a831d08e5b13b63a204cdf6aac4a825af183ac4f0,True,25,True,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,927c274029634d24072385fbc491343bad5fc439df82ba2de87355785b1d017a,Tests_failed,3b5248b7076dba39253e39238d84741376d7cd8a383691cf998023a989e5ac59,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,927c274029634d24072385fbc491343bad5fc439df82ba2de87355785b1d017a,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448 diff --git a/results/combined/merges_tested/javaparser/javaparser.csv b/results/combined/merges_tested/javaparser/javaparser.csv index 050f86e682..e2d95f68bc 100644 --- a/results/combined/merges_tested/javaparser/javaparser.csv +++ b/results/combined/merges_tested/javaparser/javaparser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 146,refs/heads/master,fe096eba51b728f5f0b836f31490b32a842e93b4,a9358d2dea7e519ad6cdd01f568af37194476984,2ec5bbb076fcc057638f54ba532af10c95dc19e9,,True,True,Tests_passed,9b73d58fb2aba12280b83dff7434c66dd97a8a99027d33f8c999eab5e72b5e9e,True,140,533,2521.0,2,True,Tests_passed,68cadf6c862d69cf36107a9025df2899a2d4a2f27af93d5b9511f2dd23675a6d,True,140,True,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,32171cf46f53393613ab116e34c5eeac1b8ccf6817864a51cc0726eeb3c24a7c,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,32171cf46f53393613ab116e34c5eeac1b8ccf6817864a51cc0726eeb3c24a7c,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15 153,refs/heads/master,41a398414f1cca3a82d62121158ee82662144fa3,45acd024e1b331fda75fe66942aa36a52aa4d82d,837758135a7b49391643fb56f24ef3c3193ff18b,,True,True,Tests_passed,0c7e779d6c042228d34f6ced134ffc15c1775c3c85a7e5efc1fe41f60aac6817,True,88,505,3399.0,3,True,Tests_passed,9c03a2a1254fc044b3ebc32ba232d54a53087a00204919352e24a66fd2112dd6,True,89,True,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,240917e5e5089a15801cab8205403ef4fb2426f31b2f52f833e9b5b02098976e,Tests_failed,8834a9d4910898a942fc96f5fa56f3b99f2c495d95b5a9877e9ed02f17a34774,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,240917e5e5089a15801cab8205403ef4fb2426f31b2f52f833e9b5b02098976e,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db 160,refs/heads/master,764600211e14871dfa43e68b6961403a113edb56,a57cd75a62d88f4dc87b23f95b5007ccb82b3378,008452082678aa5e21593eb4c2fccd745f610efb,,True,True,Tests_passed,4e88667f477a920519dda58bb58f7459f6626fb02447338c6f5eb1400a4d5aa3,True,293,2043,8318.0,2,True,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,True,293,True,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,60f1846b847760765aeff2e6e6d2fd2ef75a94cff2ab5e487efb6b597800e3f4,Merge_failed,73b581fb85bf9be6957675df851cb1d641c52dbbea57447800d8ea255adfdaca,Tests_passed,45817939fe7b5188b5a5e6c36b581634823ed30732a172f619d6636e0ff41bf7,Tests_failed,bac06569fd731ef9d254d80ce8c98357c7cf7c1e981bf5065fa43a8850f1b5fd,Merge_failed,73b581fb85bf9be6957675df851cb1d641c52dbbea57447800d8ea255adfdaca,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,6ca7be626a59a7689408140cc2f8280f6369f9a464bce2ff91343093774a6f88,Tests_passed,45817939fe7b5188b5a5e6c36b581634823ed30732a172f619d6636e0ff41bf7,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40 diff --git a/results/combined/merges_tested/javasoze/clue.csv b/results/combined/merges_tested/javasoze/clue.csv index 0086301dca..98da3a6a24 100644 --- a/results/combined/merges_tested/javasoze/clue.csv +++ b/results/combined/merges_tested/javasoze/clue.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,a0e4c4affb26558cd60574073c39681defdcf954,7a7a348040753f9ea915cb5a8f06e66fba1b9adc,d8ac1e2274071f67eb86643b71bc7704772a045e,,True,True,True,28,149,952,5,True,28,Tests_passed,16221b2b7a88556270dea2d1ce13961f7ac08814fc04e2774206107367c9ead8,True,Tests_passed,bd0e1cdfe3c8392f6b2b533b04ea4fae823450491407739a0be829c63d6d5b21,True,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,237ab2beb534d42a88ffb8435069e6272ce8bac21bee88457800f6685f2d927a,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,974e587e953802e68e0723eac5d8fa155ee3176ec3e7bcf8c976ad14867f941b,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,c3818ead7af5e2c7a3490fc74aa4888cc1ed863561f0674da72ea95012921fe5,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf 9,refs/heads/master,96d01a536c4d99deca3f20d9fef19949f60ee13c,63f75e522af7a9ea9494b85386ba20689a7ec570,2628ead17d59abbf608bba9a1ecc1c2ef671d8bc,,True,True,True,11,18,46,2,True,11,Tests_passed,ac707592c761827ef631ca09d363d1108b8636ac9381704cb0fef1d4d51a0b4e,True,Tests_passed,652e1545a5dbb3a3654b12e64553c6340c68bf8a07e7c4aec9a8eb354af00962,True,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,c2285031c23ab5a9402a8a8eca26a67d90949d0ce7cb683c6b65c3efd201af93,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,c2285031c23ab5a9402a8a8eca26a67d90949d0ce7cb683c6b65c3efd201af93,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418 13,refs/remotes/origin/pull/63,50ef81d6971ce97277810a9f4f2f013e7c76477d,c1590a3dfe464180a839fce83c46e303a5160134,d03dadf097477fe84f38fbc27cdf917174ad18b9,,True,False,True,4,7,15,2,True,4,Tests_passed,36b011185ec77aeab7b5544e4584ebf7b96604e2e0553384cc9ffd610d8a51d2,True,Tests_passed,859393f6dc3311a2fd081cc1dfa2b43e26093d1bf12e2e84e413ac9bfc4ca484,True,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,dd8694852dab7240c73c0e09642e843ca22acb8b60f90b874b8d964d3a09216d,Merge_failed,94fa2ee7103e330415513de006ada4e8c56ddeff944ca40e412cd491f009b07e,Merge_failed,b83aa56fe63c1aa95c588d67d295a41e4479e6a9e45497092a1db3d60c6f07ee,Tests_failed,021c355f56ed3fe78a6fa58d255b38f3a4d766f273ed59762dfe3f4b06f6537e,Merge_failed,94fa2ee7103e330415513de006ada4e8c56ddeff944ca40e412cd491f009b07e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,b5d81fad93beeebefaf1c0c97a485f8449fbe52be4001f6be1cb8a5c4c1e7ade,Merge_failed,b83aa56fe63c1aa95c588d67d295a41e4479e6a9e45497092a1db3d60c6f07ee,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e diff --git a/results/combined/merges_tested/javen205/ijpay.csv b/results/combined/merges_tested/javen205/ijpay.csv index 4238faeec6..3af46f9854 100644 --- a/results/combined/merges_tested/javen205/ijpay.csv +++ b/results/combined/merges_tested/javen205/ijpay.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/dev,7c0c75ff0f7feba78cf465dcc3bbe1cf0b23d16e,8be9b0e0ef39f0da1f7801b9f5841d5e7b754fa7,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,,True,True,True,13,15,34,2,True,13,Tests_passed,09f32db842e055faf624ee5f9423511d0a3fcdbeffe3ac249cd6a2b093cfeeb1,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,True,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,accd107d438eb00234be42c2188981ccd28f4863bad2fc789d1956914d91f468,Merge_failed,1184a90ca5952caec407603c33857c221152d2f6bb82c797c352f575710e2fb3,Merge_failed,1e3c18a723a4e3677697e455587c6ceea53de831fcaa5a7938f33d914d1a0c03,Tests_failed,38544189cfef7b473f33de0770cd1cec632f7a72f086beb609c4a7be66307424,Merge_failed,1184a90ca5952caec407603c33857c221152d2f6bb82c797c352f575710e2fb3,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,b0b207940a805d80c8c9b61ee31165a500e0144b0cc925577fb9503e4390544e,Merge_failed,1e3c18a723a4e3677697e455587c6ceea53de831fcaa5a7938f33d914d1a0c03,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8 2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,True,True,True,136,274,10642,2,True,136,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,True,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_failed,fef54fb88648ec223b6dbf3d01bc06ceb8419acafe99490dbac92e212d48563c,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90 26,refs/heads/dev,1b109c938d69349065a467e7fbf8bb9053243372,d158e9488e6e3d1996a3bbcfe4753baff66bbefb,66ffa23413e5864c84b2e460256ff8250dac16ba,,True,True,True,5,5,74,2,True,5,Tests_passed,9e847fd0d3cdf06e620aadaf7fa2c89587c2e8ddd6eb11884b1c37033a392bdf,True,Tests_passed,6407cffcf52fd06916e27c27a472564cd27b384ef02537a81a5b5cebd5e860fa,True,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,cb9084ec2f863216f7981e1503c7f6f43e3e8b14488a4f3727e59428b95be0fb,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,cb9084ec2f863216f7981e1503c7f6f43e3e8b14488a4f3727e59428b95be0fb,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438 diff --git a/results/combined/merges_tested/jayway/awaitility.csv b/results/combined/merges_tested/jayway/awaitility.csv index d60a183e1b..36c9d5fb07 100644 --- a/results/combined/merges_tested/jayway/awaitility.csv +++ b/results/combined/merges_tested/jayway/awaitility.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/master,715ad2ecff73829eade318cdd435a9e91d8c2162,cf261505ee2a2308e270ec9a64a80ce9e5a59f10,6949468fb680f667e0d67e5228d7fabbeeee97ba,,True,False,Tests_passed,d1112acb55e9eb9bc6aa3e29ba486300b985ee1f7bbab4372905682f543dba9a,True,2,1,2,7,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,True,7,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f 45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,80be464e3838de7c9886959a4e9565453d52466b9851d2ca4502d7dc0bca255a,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41 diff --git a/results/combined/merges_tested/jboss-logging/jboss-logging-tools.csv b/results/combined/merges_tested/jboss-logging/jboss-logging-tools.csv index a4bb481867..c706a0ad29 100644 --- a/results/combined/merges_tested/jboss-logging/jboss-logging-tools.csv +++ b/results/combined/merges_tested/jboss-logging/jboss-logging-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/heads/main,83df5d49064f76824cf23bad4e7fcb8776af855e,818acf752e1230fa945be7a2ccab3ee88665a32c,f7c761bb675a4ef7a0b7b5e245ce030f478546d1,,True,True,True,4,9,32,2,True,4,Tests_passed,0fe51dc2c490d0382682c06a1b2bc93bf005e557d0f09443bdc71e4ec920637b,True,Tests_passed,d27cfeddb1cd3c49098d3b4a3b126fdd1c48d522cb2a19814f769842d1f8fa1c,True,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_failed,7f1126281e50cbaff1f800444f39e7a8acc04ee06066c88c4810a02a9b83087e,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840 diff --git a/results/combined/merges_tested/jboss-modules/jboss-modules.csv b/results/combined/merges_tested/jboss-modules/jboss-modules.csv index e8ab59829a..d9f55c8e64 100644 --- a/results/combined/merges_tested/jboss-modules/jboss-modules.csv +++ b/results/combined/merges_tested/jboss-modules/jboss-modules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 155,refs/heads/2.x,86ed5a70b195eb0e6dc7b43826b5bad32ec93232,b13e25e04244fdb8000f649ddccbdabec9c6c2de,5e3d058d3c58015f9f6c5801c52285761a76f01c,,True,True,Tests_passed,7e3e8c943f661ec946d0b4cb3f53b1e9a83edd90e3bbddc5da498dacfada848e,True,26,153,1119,3,True,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,True,26,True,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_failed,a12ab425b174f3ea94927e1f28ef4559d962ea0d127638cfcb8ea67d94c28361,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_failed,a12ab425b174f3ea94927e1f28ef4559d962ea0d127638cfcb8ea67d94c28361,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf 156,refs/heads/2.x,5e3d058d3c58015f9f6c5801c52285761a76f01c,2772d3e079099f08b4bd32d81f26549bb3d6a88c,32ffe5d4942aea74307f6146613c19d7a086b7b3,,True,True,Tests_passed,fccd9de43811ced4c6b325316a39ade676de7b313ab3c9b8207426133f40c103,True,21,87,634,2,True,Tests_passed,677fa2a3b5ba4290f87612f943557e529f86d253eba5a712b1d8362d0a699c79,True,21,True,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_failed,4d1e2c482b3c1af903bdd6130c98a1395c9123864226c043a72d963f112903b2,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d 162,refs/heads/2.x,223bcc9142e45c1f3a1c970a586ccf330f544877,e103797c14175a1a17ca0c06f14f51f1121f7cee,2a5da125fa808687b4d53e7401892e311180db2c,,True,True,Tests_passed,376386a1b79687e4bd3aaa19a8c7cb05509616bb8f30fb2064db31803a39a936,True,7,26,425,2,True,Tests_passed,eff28e65f82278ee1552d189179fdf768936f9e2742279a747f94b1f4f37167b,True,7,True,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,0196a9a5fce1632086690f826d2512dc9e36a868446ace7bc20ec302d582048c,Tests_failed,d25bdd43a80caf7a93b9337ba679ec7495798d3ace914cb55c7cc3374d2c46d7,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,0196a9a5fce1632086690f826d2512dc9e36a868446ace7bc20ec302d582048c,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75 diff --git a/results/combined/merges_tested/jboss-msc/jboss-msc.csv b/results/combined/merges_tested/jboss-msc/jboss-msc.csv index e0985dd542..1feed11ca7 100644 --- a/results/combined/merges_tested/jboss-msc/jboss-msc.csv +++ b/results/combined/merges_tested/jboss-msc/jboss-msc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 44,refs/heads/main,2109ea6f82b5ab20a1a6b918654f7f0e990a5c06,98ab9419c2e91f16c31e50f5acf9b5f55a7da7ee,1a17f7befaa22cd08fe07c21033bc450bd09f5f7,,True,False,True,3,93,280,3,True,3,Tests_passed,13114c37ee83516642ac08e9fd85c70840d9ca7eafada24af9db523a7969475f,True,Tests_passed,35d503dbd81d2adeb3a10bd4c33c1c2d41556ade7ecf209397a6c4fbaa995e89,True,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,7846f6f0411e6dce3c20697a249505db79c8b66242344d4291e5f794e08feebb,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Tests_failed,4f7c57167caab4a1fbad985f6e7204e9d9528226f592cfe126022dc79854bd37,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,3449abc52b7f4b54087b54fa454e2626221b7b4caaf1783987f538cfd1ec5602,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2 49,refs/heads/main,a4e21a3b10f4b4253329bdf153eccd97cc36531a,26352a640d233dd92851a174a181f6d77bf36fba,9fcb50d7abf665bf5629cf197db708fcb7cea89e,,True,True,True,12,76,476,2,True,12,Tests_passed,0ab45d84c2ad769e3968f8ea5c15586331fe7eb574b8e95232af9e50de0809de,True,Tests_passed,d4960b199f3c4ad9aadc54463a623b0626cacae00c5c5158e3b9867b307ce69b,True,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,f4e6371ef847689a1ff054de07ac960ac9b2e5863d2fa5f97e14f82a30d09266,Tests_failed,ddead4a137dd47228e346afbf179d6c2536186cafc977cddd3100b373ec9af08,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,f4e6371ef847689a1ff054de07ac960ac9b2e5863d2fa5f97e14f82a30d09266,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b 52,refs/heads/main,1d9b8d45ffbf332ad23a5ece15c23becd199dd63,91f7ee699502a700fee2badbcfcc985832a4abd8,69a1532b5dc2d7d91770079e0f097db64b71a88a,,True,True,True,23,49,196,2,True,23,Tests_passed,2fe333aa5f227c677bce07f9e2216c23ff6225c39fbc4504a47d960720de409c,True,Tests_passed,830cfd6e095f635ea66fe6f377cdd59575a24dc5a54103e29b4a69b62e30ff81,True,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,9d71d3b63bc4a5ab210b3e3829491b788402460da454d93c787348d7c65883bc,Merge_failed,38c12b41b5778e35f98ce3afde30703e8b73ef21be6e7df56890ed1bc7b1b825,Tests_failed,508ffe1a6899b6100965a4c55d2fec4aec2d1b8ff237fa652201825b75ae0857,Tests_failed,73f79994748098e2b9d13fa9434b3e53dba7a0e67d5cc74724f52a1dd4763ea5,Merge_failed,38c12b41b5778e35f98ce3afde30703e8b73ef21be6e7df56890ed1bc7b1b825,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,95f135d6c5e47602b50a7764139f08577f4e0516cf02ea919e664064a25e1cc4,Tests_failed,508ffe1a6899b6100965a4c55d2fec4aec2d1b8ff237fa652201825b75ae0857,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e diff --git a/results/combined/merges_tested/jboss-remoting/jboss-remoting.csv b/results/combined/merges_tested/jboss-remoting/jboss-remoting.csv index 36d68732df..dec14c61fe 100644 --- a/results/combined/merges_tested/jboss-remoting/jboss-remoting.csv +++ b/results/combined/merges_tested/jboss-remoting/jboss-remoting.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/main,fa12e275a2d217fdbf49a391aac7cf7b33b842ee,ec01151b604414acdd80747d3644975a1d866696,be046dc8e84d928360f05bf2f37977e8b9ce2828,,True,False,True,2,2,3,2,True,2,Tests_passed,66d6061879885f2c4266104516af070cb8866012b981f3867b0aa3a2f9dcb3dc,True,Tests_passed,bfa25ce1f81587fda2b6ba6c7ba9a302e7d1345ecec3c18787ef845e49aadaea,True,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,f9544d6ef0848d371ae26b00e60d3223755dbb0a154f629565b39d17f3bfce60,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,f9544d6ef0848d371ae26b00e60d3223755dbb0a154f629565b39d17f3bfce60,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b 40,refs/heads/main,a8b1a9515e267852a3af22bf610cca028e905ed8,c1aee2651506e83b09e7a0eade417ed70e9fdb15,f543b871f3fdc5ab00689a11cccefc6af4a58852,,True,True,True,10,23,478,2,True,10,Tests_passed,7934db91b0711843ae61c05928ff909199f4a283dbcbdee4711d152d4d197a7c,True,Tests_passed,38f14b28e5c45e928eb55e169da9b6a0f956361b465c70d3e581f4cd690c5083,True,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,bb3e60978e6b1148f18b08d5b3ddd1e4b992d4c974843a5bbce42a174bc27242,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,bb3e60978e6b1148f18b08d5b3ddd1e4b992d4c974843a5bbce42a174bc27242,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01 77,refs/heads/main,385ba29f16bc08ecce978e0c5114513f4779d41a,94a78295dbf5fbc01975dfae38e43c3a7c25f189,c1c95db78f2a84cc3961187c5b4c48396083ac24,,True,True,True,19,60,272,2,True,19,Tests_passed,06cc576406fe393f35573347683dc6746acdcc736a232ed287146b3a171b4e38,True,Tests_passed,48904359a370b66838458308b2a6ed1eb9d4f7a371409cdcb52d6b4a793836bf,True,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_failed,18d2c6bdd00a36d91f3fad0881739e4e9c727ecbec9ae10a3c709844aa9aaa6d,Tests_failed,ee70e27d99a311c3b2bf71469acd3b59474aefa0cfe23b92a644d782389a565e,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_failed,18d2c6bdd00a36d91f3fad0881739e4e9c727ecbec9ae10a3c709844aa9aaa6d,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf diff --git a/results/combined/merges_tested/jboss/jboss-jacc-api_spec.csv b/results/combined/merges_tested/jboss/jboss-jacc-api_spec.csv index 63130c733f..aea048a557 100644 --- a/results/combined/merges_tested/jboss/jboss-jacc-api_spec.csv +++ b/results/combined/merges_tested/jboss/jboss-jacc-api_spec.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cc96050a0c52dd790b2f50959011209fe84dac10,687df30fe259c3d9ab3d1c8f4a443a51578b0e12,13ac2c0b60d875e69080e327a8d83d64d1521494,,True,True,Tests_passed,5c30c5f8f5edcf2f29b5baa68b65ec0aca99cdd6f065fc72e01e9d9383c02160,True,13,12,39,7,True,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,True,14,True,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,e3c7b83036e1df9ae15d3c037ec73e050f7a8be46e2255cdc507da45c0cfd60f,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,e3c7b83036e1df9ae15d3c037ec73e050f7a8be46e2255cdc507da45c0cfd60f,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270 3,refs/heads/master,c462f40aa4634e8f135b9c5231d3de797d3290b1,8a114ee6daebc64bf9fbd46e097d197f46946220,e534feedc32806baf77693c27558b17bb9023eaf,,True,False,Tests_passed,d7d73dff718cc5e2355b31660c858940ca925af56b2e841338ad742ac3fddb22,True,4,9,32,2,True,Tests_passed,566fce4c7484fd2b63f24635cd5dbfbf9216c1f7d7b449ebdc07f10b11121c82,True,4,True,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_failed,090f0bf65d1296e57b7438aa95d332f58b496fde89cb9473be700a77194f757b,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7 diff --git a/results/combined/merges_tested/jbossas/jboss-dmr.csv b/results/combined/merges_tested/jbossas/jboss-dmr.csv index b1d65675f5..d64f8b37c1 100644 --- a/results/combined/merges_tested/jbossas/jboss-dmr.csv +++ b/results/combined/merges_tested/jbossas/jboss-dmr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/main,2a31e46d096142fa30d5ddcf584cd0c971ada12a,c0430fb6272c5beb96eeff49c0c7677f84be9665,1696eff49c95b72f32a68cfe701f67d4771e8592,,True,True,True,2,3,36,2,True,2,Tests_passed,0d8a983b2b6d09b2503f6192889ddadf7000165d821ef1e7f6548298a2f6df34,True,Tests_passed,f3cf155211d0182fcb9d3ee80f11a8a50ef0a8dc05cca58ee304a011be0e0343,True,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_failed,e1a36e8b4b81538d80ed2ad322adc415f856cf28a7eebc0e602a876ee110d2b0,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d diff --git a/results/combined/merges_tested/jbossas/remoting-jmx.csv b/results/combined/merges_tested/jbossas/remoting-jmx.csv index 91e6f8365c..7b0fc8a4ff 100644 --- a/results/combined/merges_tested/jbossas/remoting-jmx.csv +++ b/results/combined/merges_tested/jbossas/remoting-jmx.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/3.1.x,b9ca42ed29dac295c11413a095c7f20a4c818ac4,da141df9a273d361c2317364add9302e66b6ceb0,9dc2bb688ee3b5be65dac1bec419c816d734ead8,,True,True,True,72,314,3039,3,True,72,Tests_passed,fd315bafa64a993c9ce029667b7cc6f59f162d60ac2b6e8c4f2ff640348a9c1f,True,Tests_passed,091b3f0829802b885280dfd2f870688e02132fbdfed6a90f0d5bda35d162492a,True,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_failed,701bd556b407a533313375c99f08f230233f95528f94d9a2a2314727ff950185,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee diff --git a/results/combined/merges_tested/jbossas/staxmapper.csv b/results/combined/merges_tested/jbossas/staxmapper.csv index 33ccaa1baa..68627d5f36 100644 --- a/results/combined/merges_tested/jbossas/staxmapper.csv +++ b/results/combined/merges_tested/jbossas/staxmapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/main,8df8c6aad07328ccec3c4326485074342d85673b,6c21060a407fa75ffb47a90b4aa8a3f929ea08db,625397a3c0056de4fbc20ddf6cddb8f47a00b695,,True,True,True,9,68,225,2,True,9,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,True,Tests_passed,877fbef5f9ac8b3cf678987c016f228ea215959a773fbd8c4e5d818f35e949b5,True,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c diff --git a/results/combined/merges_tested/jcabi/jcabi-aspects.csv b/results/combined/merges_tested/jcabi/jcabi-aspects.csv index 1db0a9b913..ae2f3dbe40 100644 --- a/results/combined/merges_tested/jcabi/jcabi-aspects.csv +++ b/results/combined/merges_tested/jcabi/jcabi-aspects.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/master,5780cbf85c5170db6de69ea735b8ccc73361b05f,bfd32ffe36542cfeb011e18f745c306e0cc59570,1d2552cb4cc1242e3c20432ffadb304808681d8e,,True,True,True,25,91,805,2,True,25,Tests_passed,a067de3f37170fe8342e109fdc0e2f97293756f8b5bf2569246227a2fe4e69c1,True,Tests_passed,dd5238278ff1088ec09a93db0f3313fd4ef1ef2b71b017bef5ae7f11c4bda8c0,True,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e diff --git a/results/combined/merges_tested/jcabi/jcabi-dynamo.csv b/results/combined/merges_tested/jcabi/jcabi-dynamo.csv index 8b2adc2387..b060563d1f 100644 --- a/results/combined/merges_tested/jcabi/jcabi-dynamo.csv +++ b/results/combined/merges_tested/jcabi/jcabi-dynamo.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,a3e4660c7f264db9a33a64604ecc70a35afabe0e,9361237bd624eacbcabd5d984afb5bd01f0f806a,e9466c87dd6725d33a9f6343286b1079e62f08e2,,True,True,True,10,20,473,3,True,10,Tests_passed,bb2fdcb870946b9f6c9225a64bbc6198de35bb0a9c9f70ebe8c855a04600cd7d,True,Tests_passed,840a7426966ed546225524efae10dbbbb419ea8a1fbd16637a94fa9637228d2d,True,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,3511fb4d56640d64a166685e4b30c2a4cb3962b55ccddb10f4197110f2cf498b,Merge_failed,ec2b59d8a4a78672f8a1cdfd7938396f231ec4c54283b5b49b068b591a6f2825,Merge_failed,755cf2c6fcaef66a4f9a960f7dc39a4b5b0e64e6fcfe9c764c1782c442288832,Tests_failed,83209ea7fbe26e56b1b7ea6d07b3c8bd00cd8429f3673438866517d11d10513c,Merge_failed,ec2b59d8a4a78672f8a1cdfd7938396f231ec4c54283b5b49b068b591a6f2825,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e6165488bcf77cf6e40214f740e9f1529f1b2eb8313429f628a81ffdcb65295f,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3 29,refs/heads/master,06bfb00c7a266e151242c512dc82a81be6b92d76,1a80242486d7908971f3b156974f3f63c94bbda9,ea8513f79eb933f61166d8f83b52df386ff54a8c,,True,True,True,5,18,103,2,True,5,Tests_passed,17dc2c7d04982a7e8869aa0848337fc500b2fc6282eefeaef59058f281822914,True,Tests_passed,d2aa2c8f411d33b809f1460c91f99a8239c06539a84b61aef039e6a365118e39,True,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,ec408189b017722049068fe65dc20a5a9fa3bc67b14ee152f589be72f771d007,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d9a17efffc7bf285a420eefd33da231cf8d7b0d59e0eb852d87904531ae27f4d,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e diff --git a/results/combined/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv b/results/combined/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv index 9e35e4fecd..770c81a2bb 100644 --- a/results/combined/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv +++ b/results/combined/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 36,refs/heads/master,f338c10bd50912603f7c310831244485e9af2df3,1d7c27797979516e6ab4052e3aac3651378da823,2c1bb0dfdc2cb70fab5a08c25269727c6058f019,,True,True,True,11,15,304,2,True,11,Tests_passed,57d2272071c087975e1b6966f3eca7e31271f0fa0c51cbfb1f7366f494454baf,True,Tests_passed,dce284cf7b0a85d53b6982716e7a003920af2477db966b8d7f266026e0ee3440,True,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Merge_timedout,,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc diff --git a/results/combined/merges_tested/jcabi/jcabi-github.csv b/results/combined/merges_tested/jcabi/jcabi-github.csv index f0cbaf245f..c95ac7e2d7 100644 --- a/results/combined/merges_tested/jcabi/jcabi-github.csv +++ b/results/combined/merges_tested/jcabi/jcabi-github.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,287c236e196b6131585aec05f348b253c74d5dc6,81e46811c79cb77e42cb90847bd24caed525d8a3,2ce2bd2ddc35a6c2c89ad05b8f2b1ee9b98fd5de,,True,True,True,4,5,48.0,2,True,4,Tests_passed,81c4d5378f32354a1b61d817014ebec6af6a46cb18ec5b639787b2f392b636c0,True,Tests_passed,ad849830e6ba17a4554b9e53aab1ac0b5bf21eacc09b5cf0040dc5073090b258,True,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,e0ec5af95727fa94009a117d58e56752b5d4202215f1c625280c00c235638ec5,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,e0ec5af95727fa94009a117d58e56752b5d4202215f1c625280c00c235638ec5,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4 40,refs/heads/master,58081f40b7bc2f2b811485f8dc974460e0c0ee13,6b2ccb3a5453675979cee90ce70384d7f49b4aa9,a68b100fb26de7172ec938260b189a12ed8eb83a,,True,True,True,18,55,941.0,2,True,18,Tests_passed,fc6b9ae478d4aa3e00d1e8191576037796bbd5750b29894b838de66634f91928,True,Tests_passed,6e82f190ecc4cc23f3152c2066e6966053a777d4bbfc3bfa7e62e691f879d8d2,True,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,8a1a530774e3d91386fd092b30c4e5d681569aa9694de38a83d6f55f56cc74d1,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,8a1a530774e3d91386fd092b30c4e5d681569aa9694de38a83d6f55f56cc74d1,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2 42,refs/heads/master,ea45e9cb7d4ddd6909b735e649963d74490d23f9,9ed8fb6f192b23fd83562f83be857834d6eb8973,910abe07275a484506dba7e6730fabe94b9ded68,,True,True,True,12,35,540.0,2,True,12,Tests_passed,403fced7c787f6d0a58702d3274d0e1c98a6bcfa66b8192360fe6b3f6353d546,True,Tests_passed,c39b8480df33e1156350cd6a662d41e0859069299d36221fa6f88f62748004bc,True,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,3ebe6eb202a8f91b930f71e408661bfb2c323c784c57ea64c0d2eb2e8c5a651a,Tests_passed,5dfe4b7730cea4576d0cedac4e31c24c8ffa8fb9951024bf7d5062a49a1f698e,Merge_failed,87ba497117c913da1eb7a13d5ab62c178e2c9313c5d6a0d7623f593fac48170d,Tests_failed,5b9ac674eab741dc4652457978e5ed46940ab2c70ae59b11faf83b77477b81c7,Tests_passed,5dfe4b7730cea4576d0cedac4e31c24c8ffa8fb9951024bf7d5062a49a1f698e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,143d2099e3e693a0517c6631a61d4b0a2f17d90189fad324305e66fb2f0c6c6f,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e diff --git a/results/combined/merges_tested/jcabi/jcabi-http.csv b/results/combined/merges_tested/jcabi/jcabi-http.csv index b3f0502913..6d40e455c7 100644 --- a/results/combined/merges_tested/jcabi/jcabi-http.csv +++ b/results/combined/merges_tested/jcabi/jcabi-http.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 81,refs/heads/master,0c63dd0c7521670361a6b8b54f23fc4efae247cb,6ce8a0910083d6f849d7802efe761cc792e0e002,e0aeb6b2fe7f76bbc7f9f1e31942882ff91ad79d,,True,True,True,5,19,147,2,True,5,Tests_passed,70decc44afc9f2545fa6c82bac15dcfe7c0b78e932ee38230dcaea7b9bdb2c3a,True,Tests_passed,5bb4614d01983011c60658d7ca972507fb1f2da46923b165e62075768f2de1e1,True,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,9902dbd55c865d6ee911acfbb00b2c4c7804bf24f149c8a761f71fcd42950ea0,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2 86,refs/heads/master,b00f0aa072e64ad270214d8a80222fc8c5e9781e,d97d312f86e5f916ea72a5cef88030000ed25934,60552a54624ce28e53c5b8e6a3bc55aaa1db7b3c,,True,True,True,11,158,829,3,True,11,Tests_passed,80c5b9d941784cd06d2d57b9075bfb2765a4e70bd6ee3364156568e8f7105193,True,Tests_passed,7281c0b82968720305f4dfff033bc5b500551eb5d03ae72bef79ea10f4c452ad,True,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_failed,f0dc57454c7f0a5713fb704c59b8fc7947ad5efdc62cd053784d11b852b36f53,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d 91,refs/heads/master,3aab65595a636aa22bf2fc02ec514ffad2ec401a,7906e1069cf046509ab8dc34effb7e343531602d,d4c4a01060b8060855ce97655520e44cb24b5136,,True,True,True,104,232,2956,2,True,104,Tests_passed,f229d784bd3f5fd0f1626fd0a7decc33b223b8c7f61d3cf972f39ffe0ea0f09c,True,Tests_passed,1cdb08e8cffcf87de452156615583c7523bbae0784e496f4abcedbcc6f4b1fbd,True,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,ebe8870898bf067af7bfe2f22272a1fad006da5ad546bb28edbbc80101584dd3,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,ebe8870898bf067af7bfe2f22272a1fad006da5ad546bb28edbbc80101584dd3,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b diff --git a/results/combined/merges_tested/jcabi/jcabi-jdbc.csv b/results/combined/merges_tested/jcabi/jcabi-jdbc.csv index c30c1f07f1..a22ddb22e6 100644 --- a/results/combined/merges_tested/jcabi/jcabi-jdbc.csv +++ b/results/combined/merges_tested/jcabi/jcabi-jdbc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 80,refs/heads/master,40e95d792465ff63e698273a475a8b256cf11a5b,0955e011d84b9cb0365fb3d208c1ed279679e93e,4878681804738bae9a1f3140c5e5a67eeaa17bd5,,True,False,True,4,4,8,4,True,4,Tests_passed,a86414b4ca81197421bf87e8a766fd154cd787f735ba36f6e34e5b442f0b2fa4,True,Tests_passed,ea01f49037426a0c9c8e202564398b3ba587d7864410bbbac099e194d877419c,True,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,1da3a869425ebb4e7539347002f7912b4d963378289e6564e8841ebe191c6ba1,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Tests_failed,1818a6ee41f80ac8ccf2b3f0f375a848ba30dacb049d2471157516c10dbdfb9b,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,7a32390eac88ae039582543f31ef57e52585d085089b3eb58d88f1c197647e20,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011 diff --git a/results/combined/merges_tested/jcabi/jcabi-manifests.csv b/results/combined/merges_tested/jcabi/jcabi-manifests.csv index 447c33467d..fe39d4b28b 100644 --- a/results/combined/merges_tested/jcabi/jcabi-manifests.csv +++ b/results/combined/merges_tested/jcabi/jcabi-manifests.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/45,84bccb34de372d8914bcc9c797705a155a71c516,6fab189edce64223226719803772cd8c9e98d0f6,feccf89447be6c4e13fc814d662d5d1b11f0c1c0,,True,True,True,23,92,816,3,True,23,Tests_passed,71528c2302785399766e84ca685268448f89ab87aa8e9c99ccb3fed9c096c311,True,Tests_passed,0e96359525af7d5c6d41b547e1248138efda706a9a658442dd57a8d1460c3e6b,True,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,9e85fef7ba0378babf6bfa1a4b110cddb7d9b2e6ae33c4b0c73e494c9dc2443d,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,Tests_failed,b7b8aefef5551d20ccc3b2fd26f1853e7900635bc0cd4cd2f90ad2d12333321d,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,7bf669f8db1d5073384d68f2ad34181ac078c28560ac5831afb8cb873bfdd50a,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9 diff --git a/results/combined/merges_tested/jcabi/jcabi-w3c.csv b/results/combined/merges_tested/jcabi/jcabi-w3c.csv index 5174bf9a64..2fc4c29071 100644 --- a/results/combined/merges_tested/jcabi/jcabi-w3c.csv +++ b/results/combined/merges_tested/jcabi/jcabi-w3c.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,23fe00a21fa09bd2e74031f21bbe216fcce51734,c43bab15e5de136c1c5e2fa5e7754436ac481328,dceae84af1401fd04c808a779f322f31f7d1e543,,True,True,True,8,27,222,2,True,8,Tests_passed,9dbac1a006de34bda6583b276196754eb03bedf4c3638faf2ffcb9fa742531d8,True,Tests_passed,1c4495d4eec1ff55e7ec34fc6667cb0203635e076f710813a16f96e8f8e97116,True,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,4456d7797372795ef47cfb92ca0bbe94307fd733b353e69f84894fae9fa6cb03,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,91b66cf571216e2e917f6bfafb622f996e08c266a7e4c09ac7d649a941247ff7,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e diff --git a/results/combined/merges_tested/jclawson/hazeltask.csv b/results/combined/merges_tested/jclawson/hazeltask.csv index 3e4116c864..00a902db14 100644 --- a/results/combined/merges_tested/jclawson/hazeltask.csv +++ b/results/combined/merges_tested/jclawson/hazeltask.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,9f9809f46cd73b80f333774d552565e5ca89f302,b2dd16e728a751889d4b24489c2dc3b0825b46ca,21c83e6c0520540de424bea4af4068826b6b447b,,True,True,Tests_passed,6863884ce35b3b3fcf6efd0bf8a3a3dbe06bae6ec921152119988287e7c27566,True,17,56,1153,2,True,Tests_passed,8a0b1d50a2aa45e693fd985c7df80f9938b47333a999a18f6fe5219fd71994a5,True,17,True,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,8b59e5d387cc6e32584e4d8e4559e16c7e91889e98d0bc3243f52227180059d4,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,36aef089a5fd613bc2a5ac5e756d57a67e8e9ccad7b762cfeeaaec4eaa82f4f5,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,a07ff57a37a98c2babfcc24ed40ae3180df0291ec38c89951746b6928d7fcd5e,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20 diff --git a/results/combined/merges_tested/jdatepicker/jdatepicker.csv b/results/combined/merges_tested/jdatepicker/jdatepicker.csv index 191671f7f6..8eaab81d32 100644 --- a/results/combined/merges_tested/jdatepicker/jdatepicker.csv +++ b/results/combined/merges_tested/jdatepicker/jdatepicker.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ff57324d1d699b55b89f674a4689f50633a77f9b,7c33934557fd4009431dddaee5597487a51c0aca,cc74e94ac3eb76272cfa0a23481487e551c528e9,,True,True,True,25,33,6205,2,True,25,Tests_passed,384b5a8b0b25b7166a3e58719caec7a71abba37593928faaee916ebda8deb54e,True,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,True,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,5050911a269db55a05668375f531e588c71a01158675e5fbbf9a40167ab3d411,Merge_failed,b3294f02d54a92e540b95af9c51fd5e2685ca5e750f4065fdc44958cbb81974a,Merge_failed,e069e3cfe65211b962f6ed83160b71c985f78b39147554e11a9d76a4913cf8f7,Merge_failed,e069e3cfe65211b962f6ed83160b71c985f78b39147554e11a9d76a4913cf8f7,Merge_failed,b3294f02d54a92e540b95af9c51fd5e2685ca5e750f4065fdc44958cbb81974a,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,4bf378b315092df4c5a08215d7c9682791ffbea4a9968e86307259dad09f6737,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166 3,refs/heads/master,cc74e94ac3eb76272cfa0a23481487e551c528e9,2984c3f9fe78688e6bf34b0b23f7017657a6d4cc,a36294b8dab9448757932c766c55e7fb93dfbc49,,True,False,True,5,17,84,3,True,5,Tests_passed,2a37c87a0c14fed8c73bffa0dd97349b5a5240f2e70e687c70e197e4139ab482,True,Tests_passed,34cdf839b21828034a12732d95cc568e2098da38fec394c0cb21cb82a4bfe7d0,True,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_failed,897a07c308bdebe9216af091174188483d589531d2b0397ed6b7f227a198a628,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee 5,refs/heads/master,79d78dec3a82066a97aa03456bb4c5bb9875ac96,0f4e989d218df97ab14c542144bfda6be47d255e,87536c372b5d9417aee85db0a78bdf833b8f6cb9,,True,True,True,53,270,6420,2,True,53,Tests_passed,882360918b3bfcee0a285a7062dfae3f7921b9d9c90f4adf3dfd4a5b2d75bbc7,True,Tests_passed,1be822e06ec0fe8d1b55351bf4e96da942d71c896c1b36071636a5769724be14,True,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,1ae5eb70f430b1737cf335f855650f8870253eaa4abb4b299967f57af78cd42a,Tests_failed,c24498e879595f09e2f6f00c69039763b11c167f55aff51991d7d7d4de59285a,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,1ae5eb70f430b1737cf335f855650f8870253eaa4abb4b299967f57af78cd42a,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c diff --git a/results/combined/merges_tested/jdeparser/jdeparser2.csv b/results/combined/merges_tested/jdeparser/jdeparser2.csv index dca20f1b95..9c72c35a01 100644 --- a/results/combined/merges_tested/jdeparser/jdeparser2.csv +++ b/results/combined/merges_tested/jdeparser/jdeparser2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/main,02fe20fc291fd127546c703cce697ac85dea09a8,8b8a1a284992f9d595eb28bde5cb3c703c9ba91f,fd6310c3745ff6d61487df6b8804760bea9cb866,,True,True,True,38,82,744,5,True,40,Tests_passed,e65e65953d6c3a627854b5f20e304a6ea7f061d5822ee65557007f1eb03fa190,True,Tests_passed,47a5f174e4385faf9c4058f8b0dcadda1f5cdab5ed5c4e76c8550a2e7e572823,True,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,148d0ba26edb9709a9b610fb921a51588a0a673ba53c583e67f1521cbe19d200,Merge_failed,048d12eb2b7b86c5c616321c4622716b984d2b653359e20fc40c6bc1e7eb5260,Merge_failed,2c450a33af64398bcf5a065ab7778ca53011f39e462e9e773653d210bb2842e3,Merge_failed,1d456e5ca5a78b829f1d777ac7ad1d6d6251a7436a4b3c97332bddebe353ef62,Merge_failed,048d12eb2b7b86c5c616321c4622716b984d2b653359e20fc40c6bc1e7eb5260,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,f8717407b11b5bdffc141140060ef00c196ccb0f9e2a70092dc198368995d313,Merge_failed,a024115d0a63562ac3fec7f2f5a0bb50f91ce3f6ea1e886daa08b997118621de,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c 12,refs/heads/main,1da0e2349af32efeef7b5a1874bcc20c67c51fc1,3e7b519565d03b9d669338f591cb2deb0e33845d,8b187686848386bcbfc37c35c830ae50213c0120,,True,True,True,39,80,731,2,True,39,Tests_passed,c926970c508bc1f6f9b6bbc74f5b4491c644db587348e97016dd882ee3b9fc84,True,Tests_passed,f2c40051dea0b73f98eb69bb0335c4687c8c285053386a888f534aa7c4903db1,True,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18 25,refs/heads/main,868afefbb4efa5ab31cfdd9130758c2117d44948,f6270f89a8ed8b0f8322298dce22b45305fca316,c91fd39e62301264325af0f9870908fd29b9c4cd,,True,True,True,28,58,617,28,True,51,Tests_passed,4891b44f4179f8dcd678ade404a709b473294f84615052813a5ddb4a1d052d6c,True,Tests_passed,1b60fcfb5cf6137b329651b2e4c0a39d1b896e5e3333632e3f5b40bd36c33d4c,True,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,72b8747492c38dbcb2d3b36e4c6798820a00a140afea49069953f5089b410bec,Merge_failed,d637d8e0266d676631748777317d3718d2579d95da48c6df017f81fdee513ae4,Tests_failed,929bab2d4a6f644a9734de5378e27d6137985af9d6683308c44335a31a93c776,Tests_failed,c3d95635b76d22a02c65c491790c85b16941342585c21acc8c988d36b0c80503,Merge_failed,d637d8e0266d676631748777317d3718d2579d95da48c6df017f81fdee513ae4,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,63f31fb0c15b962fae234e4869bcb00623963b1453a6094818bc24d13b458468,Tests_failed,929bab2d4a6f644a9734de5378e27d6137985af9d6683308c44335a31a93c776,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e diff --git a/results/combined/merges_tested/jdkcn/jabberer.csv b/results/combined/merges_tested/jdkcn/jabberer.csv index 2b3b70391c..ffde0b073e 100644 --- a/results/combined/merges_tested/jdkcn/jabberer.csv +++ b/results/combined/merges_tested/jdkcn/jabberer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5037a3d573c3e162e8de170b15258f76ea7aaca4,bcad97e1dce084756c25cf5b4f9bfba6e600408a,6ffe4e1c62789f14cf959876672e3d77b09699cc,,True,True,Tests_passed,73f44c203480ed18c03358e341da6cec5b87042ce96c1b72a79e9bc9de81dc0d,True,28,1523,28602,7,True,Tests_passed,1eaa3eaa12a543b88c9addeec39ea3e45e8c34662556ed533fa4d2565f7de5c9,True,32,True,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,42326de104e28ec37378ff5212c6c9af3f6d1ee328ffbd0b0e9d87b1cf14d107,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,1ba4589cc285be5f219cef0af049785d289cef3bf44391a32946a0f95cab29aa,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,f6b820dee8c6b484adb5571d530c614199ed64cdfe6c2f4a6d4e16fe03f63ba2,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5 diff --git a/results/combined/merges_tested/jdupl/lancoder.csv b/results/combined/merges_tested/jdupl/lancoder.csv index 5b01490186..3abee0478b 100644 --- a/results/combined/merges_tested/jdupl/lancoder.csv +++ b/results/combined/merges_tested/jdupl/lancoder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,407742ea19966c62f0eeb9d47dce6afadf9f672b,1355727fd68e75d9e97387b2fb92355fd3cd1a92,80ee8865f90c66b4c90c833d5beab4943da35d3a,,True,True,True,24,58,548,3,True,24,Tests_passed,9a9b8b271a5a4d5bbcc627b7da9e738daf5a76dcbf483340eb27314d37063382,True,Tests_passed,1fd8f3ef0dd0e1591cf79eb252a18bf1e7c1cb904f9760b5e18a8e19d596b78a,True,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,2f7017498acb1c51f498ed3d952d3c19a0038f36fd55d790ab5193fc6baa6b5b,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,4bf8e2addeb1f4af1abab84ec12084c9964a30f3691cf6fcdc3b3c9565c05680,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,b0043f763d399a0464906737f3b859cfd0c6787324183c718f6f7079f054e63f,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384 diff --git a/results/combined/merges_tested/jeevatkm/digitalocean-api-java.csv b/results/combined/merges_tested/jeevatkm/digitalocean-api-java.csv index 292bf44887..a2c2c8fcae 100644 --- a/results/combined/merges_tested/jeevatkm/digitalocean-api-java.csv +++ b/results/combined/merges_tested/jeevatkm/digitalocean-api-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/remotes/origin/pull/87,8514768f75faa664ddb55d35a80f33960bdc4fbb,260cc90fd7c11dd719c3fd3ae8d2e125e3ba59a8,59583a5cc2f1a36025f2186208ede0135ead51f8,,True,True,True,22,25,56,2,True,22,Tests_passed,6eefd3ae1284b01b3a435e91fd010c86711ea5f6e902212044d0dba33e3e26d6,True,Tests_passed,dad290bc780ebf16a797261d48ffae22e47680ae194f0d5e320c8d0ca29f81d0,True,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_failed,cdc1d5909bab1768e6ddf79755205a06d086d6d8b988b05fe8463731417498ea,Tests_failed,ed96bde133537bcd46942e453a2bc407607d0b904640b85108b10733f85c5fdd,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_failed,cdc1d5909bab1768e6ddf79755205a06d086d6d8b988b05fe8463731417498ea,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386 36,refs/remotes/origin/pull/99,997ce11f32044dd4702fdba7e1f4e5d60bae99f4,111275a7557b313dc7b0c1dee133b1e117b7d22c,780847a2b697201474857ecc249c40ca3251a4d7,,True,True,True,101,1900,7360,5,True,101,Tests_passed,ba8949bac9b136e076aa60eca3f3423420efb743b6da11fb7e3bb757dacc4ef3,True,Tests_passed,16739c8ccc9b5d92d986094217e30d32fb54fe5c0d500d8bcdade0074201b850,True,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,0a1933a6273f4a982e7f2c70d49a7d2734c835bd0dbf041578b18f5ac6d06805,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Tests_failed,467173f8a0db0890d219884a5f8554a0c6c1f97f63538761cb67eba2ab9a8530,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,ef1a273ddec911f4a80876a57d6f49ded5294ddaa8184631c388662c628a68de,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e diff --git a/results/combined/merges_tested/jeluard/maven-plantuml-plugin.csv b/results/combined/merges_tested/jeluard/maven-plantuml-plugin.csv index 2b48adf50f..67ae96189f 100644 --- a/results/combined/merges_tested/jeluard/maven-plantuml-plugin.csv +++ b/results/combined/merges_tested/jeluard/maven-plantuml-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,729b0bf15253d09e809b1c8c9a6e5e8f1c43c682,c44bda80f054272e9c96d0a4bdf74f1d141becda,0885dacfbdb42af4595d33ee63901b99ef1b3700,,True,True,Tests_passed,028323517875ee73b3ba3fbbf148247381ec57bb4622ef83426e29ae46d79933,True,4,8,12,2,True,Tests_passed,587e4b38a2bfc52f622a611d99511cd010c5339f2549741b2ec7b4339b0695d7,True,4,True,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_failed,a4187a4175966967375f1d132b47f65096aa9d9a3f1876960d122384ec42a6e6,Tests_failed,dda1d3e78d62c0255fb80f1a243e8c2a82b7a048d898795909c4fc7c3e86cbc2,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_failed,a4187a4175966967375f1d132b47f65096aa9d9a3f1876960d122384ec42a6e6,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014 8,refs/heads/master,571616267c56bdf33ea5eca14aec7f83d0355ae0,9f7e64cd7e24fb6ff8476e235d5839c553885ace,509cb7c52169df2b8c4d726d189474979b5a78d0,,True,False,Tests_passed,f5636c00094069e71499c5290d47d8aea35d45a913dc1720ac0e93123ab533be,True,7,17,239,4,True,Tests_passed,dca15947900abb12e8629399e881d43e7bda5686d4ab0d2f6f2ff83c9b762512,True,7,True,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,1e968b92e88920928ee826fd1b16d6f49a161c8e598072481d339c36c717d071,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,86b188848c437e0ae5556f45e4bffbd3744aecdd6d6922b78ed5749b6a18bd98,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,d944683d224eefc411ae6b649bb19d6d10596ea76553b20decc2ebd29afb21ec,Merge_failed,3805c213fe547e1ddfe8a47a6c324191ffc4c75279af940998061410baf4912e,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850 diff --git a/results/combined/merges_tested/jeluard/semantic-versioning.csv b/results/combined/merges_tested/jeluard/semantic-versioning.csv index 7dfbdc35fa..8f364f47c7 100644 --- a/results/combined/merges_tested/jeluard/semantic-versioning.csv +++ b/results/combined/merges_tested/jeluard/semantic-versioning.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,1130c9261b179f0efdf49badba9554d1c9d63822,37639815664ce78bb1d2c1f2240d133209ba1398,69909650ee34de32eceeee0b4dc6e0ab89f2a5b3,,True,True,True,23,77,819,2,True,23,Tests_passed,6e548b5daeca9c35e200cfc812d71b76fc5fbc59a34a18e2b3202fa542ba4369,True,Tests_passed,ca2c32fd8a7daee5a886c1ff4c8cfbda2f70e246d8bc4fb9aefa95d53ce94ef4,True,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_failed,e354c63339c54b523ea2b9a6152a02c314bb6cdde32de378695f442088e3343d,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2 diff --git a/results/combined/merges_tested/jenkins-infra/ircbot.csv b/results/combined/merges_tested/jenkins-infra/ircbot.csv index d73da0f8fd..0893508c4e 100644 --- a/results/combined/merges_tested/jenkins-infra/ircbot.csv +++ b/results/combined/merges_tested/jenkins-infra/ircbot.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/main,25a15f084b1d8cb7805c786f23ba0f468c874d81,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,8b3ac03ed765013a57f4f2753e64fe5a05290598,,True,True,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,True,10,79,470,2,True,Tests_passed,b8d2455954af73eae15eaf48ab424015b4c20c7e2b759e3a51eb7d5e19ec9358,True,10,True,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,66bbb396e6f2a68a4d1cce6602e5593a2f2cf19f4838e491cea119daf8508454,Tests_failed,a468a50c36684b2f84186489b151f8e5f9448078ed8619de6b9df42e09d93e87,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,66bbb396e6f2a68a4d1cce6602e5593a2f2cf19f4838e491cea119daf8508454,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1 9,refs/heads/main,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,069e970815bea3760fa9dc6609c724f8635a7c10,0b27dd256a1ddf2d51e7f1a2f28ed8bfab3779f0,,True,True,Tests_passed,19b5730003060a87c66505944f3eb408773632f05bbfd422e79e0e350d81ca40,True,3,64,302,2,True,Tests_passed,d556a6dbb753e631aaaf6fc380a44cf8add0ab3fc7614bb4eae0f046132a607c,True,3,True,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e 102,refs/heads/main,bfa5471c7907101997c4630690a033cb82a677cb,fcc594a5c477a8ea55309a4c910701b3fd9b0f04,b8e5882dfa503fbf2c179eb683a2918343f4f90d,,True,False,Tests_passed,054f3970c9d2f1ff452b4978cedbca74db67d1fb9d80c51662cf1ae8073c5a60,True,4,11,73,2,True,Tests_passed,f1e1617c1c52c91d534a73820a36a66ac44bc8da64e7d1d439f4fc912a924dfe,True,4,True,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,287330f4c061a3fea304f1f08b5782bea9b718acded7e333f13ad99240bcaaee,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,287330f4c061a3fea304f1f08b5782bea9b718acded7e333f13ad99240bcaaee,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99 diff --git a/results/combined/merges_tested/jenkinsci/active-directory-plugin.csv b/results/combined/merges_tested/jenkinsci/active-directory-plugin.csv index 168f8e2e37..1c105c7f4b 100644 --- a/results/combined/merges_tested/jenkinsci/active-directory-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/active-directory-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,d5ca0a8db535780dae86777eb35abe4cc2b202d0,8af37b499905c64dd3df3041cee645a1a819facf,1e35c12fee1b13d7d6a11aca78a69dab801c0f67,,True,True,Tests_passed,aafd61fe1f8f2d848c5da1a77a5b4a7ba5d58a482c6f63a2c81b8f699b7e2d3a,True,16,58,120,3,True,Tests_passed,7f6b7de2698bb1186287fa4fdf44610271e354c108d17e414247a41bb801ea08,True,16,True,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5e814f600832ec832feb7b22ceedbb16ea41e2670be9e2e2fb3c177e3d8d7e3a,Tests_failed,bc738d07f3c937332366aab652e43877f968209bf4cfcbc63b33cb678449563b,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5e814f600832ec832feb7b22ceedbb16ea41e2670be9e2e2fb3c177e3d8d7e3a,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f 42,refs/heads/master,3f894f3216914f72244dd916e073fe7410530a0c,bdcfc6a63f73d344b500627f2db0d982aec7ba54,0530887ab2160489002c5e5866221abffbc0a0e5,,True,True,Tests_passed,2a0f9cf3207976dae038b21c883b540dc99088044a040169e8ec51c9c6b82e41,True,3,5,31,2,True,Tests_passed,4d3ecb248aab18399e1ead20dea5bafe49b2989bafd8830fe68ee1f84795078d,True,3,True,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_failed,d709efd627fdfc36c4ee64fd6f17fabdb63f09ab00b405acf2731096cc5c3b96,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8 44,refs/heads/master,943701dbf3d5ba4988ae60c875a1953163551d5c,9dc0b0f2e7fdf4801c2fe17dcf13c9166678bf26,94f88fa711af225992b09a2675f23e72ec5bc993,,True,True,Tests_passed,97bb69bdbbf747bbc838ab188b81bbe248df7ea6086314618cfd7fe0f7a94cbb,True,4,17,72,3,True,Tests_passed,a08e29b9cbf86e570ee4b32d98a1d3273094a1fe66dedc6365d0b231c956c3b2,True,4,True,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,fd90dbb99c150511371c46bbe8870469622f634c3c4ac71cf59dc038ad31dcec,Tests_failed,a2dd1f8b66687ede9869d6d428d63ed176de8076b11e7af55eb7307314f8ec39,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,fd90dbb99c150511371c46bbe8870469622f634c3c4ac71cf59dc038ad31dcec,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99 diff --git a/results/combined/merges_tested/jenkinsci/ant-plugin.csv b/results/combined/merges_tested/jenkinsci/ant-plugin.csv index 63c65f060c..c866e801dc 100644 --- a/results/combined/merges_tested/jenkinsci/ant-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/ant-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,7025e65f06ee3934db303960a74846cc52440a26,d1c5e13f88ac5ed82c12de0a5c41434c1e55cf42,c57e18f6ac9c01ccce927930aed0221853d38ff6,,True,True,True,3,11,69.0,3,True,3,Tests_passed,48ed5a84e692574544be1c42c8aa8ea51c0c3cb97216a21cd549995e1cd726c2,True,Tests_passed,ba7cde4d005aa3b0fd359698c19ad6cdd147849c304b5c63a20b68e866609461,True,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_failed,58bfd6c2f2a666a0a94bbc1e1c2464d2f94e626663290822ef8f039b5391ef82,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5 diff --git a/results/combined/merges_tested/jenkinsci/backend-update-center2.csv b/results/combined/merges_tested/jenkinsci/backend-update-center2.csv index e7433c38b0..161fe87f47 100644 --- a/results/combined/merges_tested/jenkinsci/backend-update-center2.csv +++ b/results/combined/merges_tested/jenkinsci/backend-update-center2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 75,refs/heads/master,ffe5590d446632dfa271013e842badbbb9b47170,3a70a66f43951d8f9dea0b83af1fa00a3ca84a71,a60eb5abdc8146a5003e4f5552625b88203bc1b5,,True,False,Tests_passed,e628f54f8738d68760abe1e703ebce7e4ce9ee5195f72a5cd2aa85069f564153,True,10,21,66,2,True,Tests_passed,95bd31aa354f9c9c32ee5e93fe625ddffe0333fe2d5a3f8b82fb3a1e39f09336,True,10,True,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_failed,cf2130329fde88c942563eb40fd51e68ec63bb86aa93def7bf62a13234d5b247,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369 372,refs/heads/master,bd7b6d3e21a3b04ce94806b548ca9df03796a769,e076346d30b18e47aa253096f2c7304c6695e2fe,8dcb6331d7edc90bdc92929ae5590c62831ca285,,True,False,Tests_passed,14b07b5ab3ebc85e1eadfbdd91a543bbfd2451803f250980ba3925021a69c028,True,3,9,24,2,True,Tests_passed,1837cd7351d871090753b92323d47f9d1b99b01f9e23d2744cb98dec1624ffa6,True,3,True,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,59229d49d1b1c57787ee7527b46b6a8dc73f5e8afc139fd4485c196ee67ea6e2,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,59229d49d1b1c57787ee7527b46b6a8dc73f5e8afc139fd4485c196ee67ea6e2,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b 393,refs/remotes/origin/pull/355,e2a2e33ea822cf3999e642f26bf9d1b17be958de,52ae29180ec5a12f2a2b136b35e6c2c6d13c4e2d,ce0b447d038aaaee7b95ec5eabb7f0f459aa5dee,,True,True,Tests_passed,a124a3cf68b6e68155be8d6e46eb68b8da299835ad76c51b214ea516159ad6e3,True,12,36,2691,3,True,Tests_passed,fa5ebb6edabd5daa90348d78e32f6ad2c1fe2197c433312e09acec216de75b6e,True,12,True,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,b8d4e4e46d3ecb3c25257237e9c63dc92279f9d236186b6e03c703fd12b42802,Merge_failed,a8331a3e2144b644a86f8b505b8bfc250e9617436d6f47a47fd31d4f5e5224f3,Merge_failed,33bef421ade57297098649019310b3191a12a3d6422d32b375803a508daefe16,Tests_failed,2fa721da4f1a3e27a643537ce6cf9cdd87d9e7e69d797db2d99867fcedc0d8ee,Merge_failed,a8331a3e2144b644a86f8b505b8bfc250e9617436d6f47a47fd31d4f5e5224f3,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,8bc986fcbc5b00eb9af873a3ca19c9f4ca16eba88a740db97d449086da89bfe0,Merge_failed,33bef421ade57297098649019310b3191a12a3d6422d32b375803a508daefe16,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1 diff --git a/results/combined/merges_tested/jenkinsci/bitbucket-plugin.csv b/results/combined/merges_tested/jenkinsci/bitbucket-plugin.csv index 31609e1030..f7d4b5d4dc 100644 --- a/results/combined/merges_tested/jenkinsci/bitbucket-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/bitbucket-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,da518043f34583234ad250c82869d287b33ee483,b368656b472799b0ffb5f0617797040fa6335ad6,d29d40216fc8a16d2b79c9a4c9f3d8b5b3a37343,,True,True,True,8,20,104,2,True,8,Tests_passed,cbbed6c64cabad96cf0dfed829bdad8b969a6932d2f2fe0adfa87d6fdb46b0a7,True,Tests_passed,603d9bb311f51fd03cd49eddc4079769304681fae442acffcf6dd24675402893,True,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e diff --git a/results/combined/merges_tested/jenkinsci/build-timeout-plugin.csv b/results/combined/merges_tested/jenkinsci/build-timeout-plugin.csv index d851104849..5ec1c04315 100644 --- a/results/combined/merges_tested/jenkinsci/build-timeout-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/build-timeout-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,00d3a7bbff50feb5bc56db4ea1160b58dcb39af0,c3361f79b73d6b3366bc66f9882a05792402f3c5,2633bd942947f365384d093a848750fcf973a860,,True,True,Tests_passed,7a087ff73e4bd078425f5aa63d3631ee4dc43c58c2f9ce8d81557506044c8643,True,12,49,164.0,3,True,Tests_passed,ef5f065bb77b54df5889b2c0fd419494db8c57c744a02a6884c3f55d5fcc5c8d,True,12,True,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Merge_timedout,,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33 24,refs/heads/master,d51178be1cd90cf9173edd1705a7bf0dc75ab16d,c3fa7ef50c3724eba371ad179782c43631ee0626,068600c260f97abc7e4cfde959dbaba889711ad2,,True,,Tests_passed,88788e49f20f9d8b7c1095cfa56964912c4720856dff7686da859ed9a0d90554,True,46,208,,9,True,Tests_passed,967801baf73c9ca89062858b0c1545f899bac0a413184c49ed7a47377940ef0c,True,46,True,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,5aa8c5a233125aef46eae0d6f3e5fd22297897404174977a9059de4a55e6a60d,Tests_failed,2bdd3c477f48ca3c02df78ab384739276293e2855fa775f8adbf09f69a274f13,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,5aa8c5a233125aef46eae0d6f3e5fd22297897404174977a9059de4a55e6a60d,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1 87,refs/remotes/origin/pull/83,daeab4a1ee26e434bcc2358529b78b852819068b,6cfaaf002fd87f994de9e1b8a0e9e9e03848e209,00987e30a260e5e7028c0e1dde986578daf4cc10,,True,,Tests_passed,201490f737e12c6d21673801f80aff48b24aeab0b35932d1a0cfe59ea147f2c2,True,86,411,,5,True,Tests_passed,e22de3d42df99b660955e16dc7991af623467a711c33857e473729ec78b24b90,True,86,True,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30bd398b4a11797ab4f6ed039a23613c3ee66f9cb301605269fb8b13ce4e7b88,Merge_failed,a5eb13eb6e64f5b2efbaabac6365f18c2157bfc8fd2fa4c5d11d6ee384e87900,Tests_failed,be2dde5bfa05919f0f20c9f3f71a39a0e66ee00ccb3b9657e094d7eb61c0d541,Merge_timedout,,Merge_failed,a5eb13eb6e64f5b2efbaabac6365f18c2157bfc8fd2fa4c5d11d6ee384e87900,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,781476756e05a96a8b93331106903cd48405eb811d0cd5dc72f282df3dbb54ae,Tests_failed,be2dde5bfa05919f0f20c9f3f71a39a0e66ee00ccb3b9657e094d7eb61c0d541,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91 diff --git a/results/combined/merges_tested/jenkinsci/configurationslicing-plugin.csv b/results/combined/merges_tested/jenkinsci/configurationslicing-plugin.csv index 9d8fbcae31..aba9602d19 100644 --- a/results/combined/merges_tested/jenkinsci/configurationslicing-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/configurationslicing-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/master,3aa14abb5005dfa0c3ae3ff2c370cd85d07b2865,03f9ecac2f383c6bd34b1bdf010914022a4f04ad,8cc81869e343ce10b3ffb7934f0b64c14cbce250,,True,True,True,36,131,1270,3,True,36,Tests_passed,95c52fb85da951e02d7ba6d265f3a9b6a4ba294ee5e411cd53241c281e04c482,True,Tests_passed,8eb1c8f598258ad06f9b663b77f9c2a02f128979b6171f0787ff4e6ad3687f64,True,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,7216f8379860a8637106583a601d90a5e92fab69c174fe025a468efb46f4a26c,Merge_failed,9536dccf384340072333b482c278f40da425283562e2260a1da8940d09e1e687,Merge_failed,c6b5f2ce291a70f0395fa5d62055b883a3934fc686caeeab810878c09bbbce7c,Merge_timedout,,Merge_failed,9536dccf384340072333b482c278f40da425283562e2260a1da8940d09e1e687,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,96fe85fd4ee38e25055ba7c02f1ec85017e51c34caf040ccd0cb60e817b55460,Merge_failed,ed79b2a2d4eda2ee7d2e39792ac1af848a390be89d8de2d6b8faab81c526a1a9,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5 66,refs/heads/master,55269af42ba6e2edd3b17cf20eabc76143d56208,b98750751ff6160add3a0a782bead42d06e3568f,2efc7be3a9ab350b884e202fe16e03166de7a126,,True,True,True,5,8,114,2,True,5,Tests_passed,01f79cca4b838b33ee97b13e7a3e78b1c21b493c4015fa7b57ec659ea42e7c45,True,Tests_passed,27411121b15b3b572ee8c41ced45c5a339934b820495741ea019085c58bedca7,True,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,31af740fc7a7ea1e44452c877d661a671f93ff37e86e6360caad338f2470a205,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f diff --git a/results/combined/merges_tested/jenkinsci/copyartifact-plugin.csv b/results/combined/merges_tested/jenkinsci/copyartifact-plugin.csv index ce7d601ecf..241c11fc33 100644 --- a/results/combined/merges_tested/jenkinsci/copyartifact-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/copyartifact-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 124,refs/remotes/origin/pull/125,956cedccfa4eac549c80b15c1b4a7369618a4d39,7c5e9c0d73c1db329c9990f868f25f0637cfc862,9f6cf7bab6c7017ca16e9349d3cf754de4bc619c,,True,True,True,6,19,128,2,True,6,Tests_passed,9ee0084b5790365504f2c0a9dfe0e12e1cb5e3ec48f70ac23f0bfabeb230fb42,True,Tests_passed,76848720ec24edfa57ce4cf4efb47c4303b7d93f68279238d260d20b09bff186,True,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,151d651cf8e8730ef818d41eacb050bde94654cca15b8835f0df795b143bf84a,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Tests_failed,ff213464c2e0712a41f939541d450661ea00109ebeddcc27888515910f4d7662,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,12eca70cefa93fd8a3883a5e0407a515de4884ed9e41bc5d4e549196d1aa4308,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942 diff --git a/results/combined/merges_tested/jenkinsci/coverity-plugin.csv b/results/combined/merges_tested/jenkinsci/coverity-plugin.csv index f382bb48d0..e836e6d9ef 100644 --- a/results/combined/merges_tested/jenkinsci/coverity-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/coverity-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,0589289d51b2d32417078669ccdc472714a4decf,eeebd2a6e7c4914cf89110d933b5cbd7d55bbf83,560729c237ad3f846ecde1cdd9b25a4909921bc1,,True,True,True,3,15,86,2,True,3,Tests_passed,0b3ec02a6c586458685acb0e16a37721ab064faf645c0d79d8462b4a67cac895,True,Tests_passed,4779ffce89c3399588112cccfb529cc1878f6d42f40ab21e285e5cd6692bad79,True,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,70e2a844efb176835066f8b902be6a86690377d3fe4bfd75835f50ca294969e1,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,70e2a844efb176835066f8b902be6a86690377d3fe4bfd75835f50ca294969e1,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7 16,refs/heads/master,b5a1cda2570db077e62dcb721e9eb76d1581c3f0,93e9504821767ce10cfb2852f4dc611f89f568a1,31b19cfbb155accc5303d5a34299af611a439e78,,True,True,True,18,68,767,4,True,18,Tests_passed,a354f8118a476a3060950f6002c9b57dd577e8eed02d5a4dc81d242e77b3a9e5,True,Tests_passed,3ede2f33895d1ea9c4604f0c66f16247669bbd8cb2b2452ce55a2c41de57c248,True,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,267d9ee6638bd4c6196f79d49ca8eae358c571f7e96be3b913c0e8c49f41f0e2,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,267d9ee6638bd4c6196f79d49ca8eae358c571f7e96be3b913c0e8c49f41f0e2,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c 37,refs/heads/master,e55009e07305c5de8c3ec77b1446e8b81dec433a,60c56b8aa766a8b463e4abf21431655cf2ae1d85,8c5fe23555a4299d66d0dac3edb5fb5aaf483ce5,,True,True,True,181,318,883,3,True,181,Tests_passed,60a621e49b1edee882dd076af815244b734d8e36cfa8709940ba6f528bc97f67,True,Tests_passed,30c279441251b78cfad77931bb0cf5c18fbe96b31ac15e8bf41dae2c3ec9625c,True,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,65d0e3a132a6cedc084bd87f38b74e0fdc3390bcce9be2b92c5d60b640e9bc87,Tests_failed,6f6bbd0131da5f7c563f9fc0cd4f87dc02898e504aa19cda1a329af2d541462b,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,65d0e3a132a6cedc084bd87f38b74e0fdc3390bcce9be2b92c5d60b640e9bc87,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d diff --git a/results/combined/merges_tested/jenkinsci/credentials-plugin.csv b/results/combined/merges_tested/jenkinsci/credentials-plugin.csv index f198fff823..512528bc43 100644 --- a/results/combined/merges_tested/jenkinsci/credentials-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/credentials-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,ccd45a5263d0b9ffb20a66965a9124e15e2b8e03,d71602e7cc03a96bf876171da18a19d8dcb7efb9,ff276f7134736281d49e9ae9a8bad6b7d2a59587,,True,True,Tests_passed,487b7c31de55091409cca54f2edc43b5438e657ba0515be6bfd392245af7675e,True,10.0,29,223.0,2,True,Tests_passed,020414aa0adb6906f0cd225f64596900921863e6f11f42e7e00aad1c85f5c630,True,10,True,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,7f0cb8ce1c0dbf43ad3c07888cc080b653797724555886d06dbb76cd675ae2a8,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Tests_failed,d7b05d4cd3301b133e546fd831315495c61285dd8fcb56abcb1153f74a6e1303,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,bfc9eba2abb4b6d216353cf2c786d167b02b39f4d852b1259d99b0cf053c99c1,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49 23,refs/heads/master,5994ccc36b5d4cb577ec65d45dd9c5e8dba4a72a,e4f1b0ae217bae7bd79c157253a6c95f43e0dcea,059a6092fcf5e38d5dcc17577221376801e4575c,,True,True,Tests_passed,d2b6a94bd4ba7d0f890cb47ef14b8ca4d81a45fc3014792c16e4ed3e4237cc53,True,57.0,89,489.0,3,True,Tests_passed,4c9cc4a18ac4cc2cd80f52ea04c9c5ddf150d0ac694f656a50e0fde82544b527,True,57,True,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,84746a9801cbdb5c0d9c9f9090be6202ba14cd3fee3b44977efc27380491f745,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,84746a9801cbdb5c0d9c9f9090be6202ba14cd3fee3b44977efc27380491f745,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced 81,refs/heads/master,b4e24ac78b811901d635b7c382cdcf50562a63d5,745bb467b714821065bbdd448c4384af6dc03fbf,b1ac9f7c3a9c11409c3a4736cf430b82f861d9ee,,True,True,Tests_passed,893590bb5c2a0283989d9e08231ee1bd505574c43984a601f78aef55a4f212fd,True,39.0,90,1694.0,3,True,Tests_passed,aefac92437e3379c1cf105122922df7f6685a268aa9db8ce9350d5a7d8ddf100,True,39,True,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,beea233fed30464503c2d269c3b137bfbda8c315e9fd687787478e5f2ac95794,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,beea233fed30464503c2d269c3b137bfbda8c315e9fd687787478e5f2ac95794,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b diff --git a/results/combined/merges_tested/jenkinsci/deploy-plugin.csv b/results/combined/merges_tested/jenkinsci/deploy-plugin.csv index cf74341424..8433a9bcc8 100644 --- a/results/combined/merges_tested/jenkinsci/deploy-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/deploy-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,True,True,True,7,17,125,3,True,7,Tests_passed,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,True,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,6fae7fa785cdf985868217984567746130525b59ba61434bf2cd60f35759c731,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038 23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,True,28,103,571,15,True,34,Tests_passed,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,True,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,True,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,766113523606078212e8c9bfa18cc99f2ae044b72061cc7144332f649408622c,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,fd310d7dd2da56fb2142a587a0aec1f97985c39d92aa11bfd5feafef85b26abb,Merge_failed,8039bde4b63c8f50a419eada684945f9b568350c3bee1f0122c23c3229a63ddb,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319 diff --git a/results/combined/merges_tested/jenkinsci/disk-usage-plugin.csv b/results/combined/merges_tested/jenkinsci/disk-usage-plugin.csv index c0fc7f96f8..3a640a0ff5 100644 --- a/results/combined/merges_tested/jenkinsci/disk-usage-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/disk-usage-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,2093c61a2874370fa8b0fe47c41450021a49060f,b0181ac70a186c074331f07ee2f12cb0afde2ed4,2ede1e8ec185d8255744fa996c84ada571323ddc,,True,True,True,10,27,91,2,True,10,Tests_passed,1174aedc3e0c7289445a2bced94bf55ee46e55f49492be8d8fedb2c8cb13daa3,True,Tests_passed,50f44b38fa41911677ac1b1cb9561c31d8219043fc732b5d098f953186363741,True,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,95a8f0a8f2835f66799da197f4b5632b317fb67536ba3ce217c0a2029b8ee56f,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,95a8f0a8f2835f66799da197f4b5632b317fb67536ba3ce217c0a2029b8ee56f,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072 34,refs/heads/master,f527c92357bed2cfa432c19b1673edd642ea49ad,43277872e6203cd15347adc35edc566d7df9de93,0dc146859f808c46831250519fe00eadf238e58d,,True,True,True,27,84,252,5,True,27,Tests_passed,e2a5e580e4e9c822bc6b0506a2849a5d08946b1de35523a81890db7c4af995c5,True,Tests_passed,de22ffec737eed49b98f57465f6c67e6954803c285ad0234b4b1a9c9ed991aa0,True,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_failed,7f3cbd6310fe9988343fba379b69435c728cc6714cc7db21c02ba2f46103236a,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df diff --git a/results/combined/merges_tested/jenkinsci/docker-build-publish-plugin.csv b/results/combined/merges_tested/jenkinsci/docker-build-publish-plugin.csv index 73b037b805..408e1c1b90 100644 --- a/results/combined/merges_tested/jenkinsci/docker-build-publish-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/docker-build-publish-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,9d4eb2caee75e0914e50d611c33ed709d11e2923,18b13198466216b6ad9ac577f1f3ef78e233452e,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,,True,False,True,12,34,158,2,True,12,Tests_passed,062155a0025a6c794e457b5a17c520169db88438833b440027576ffc77eb9914,True,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,True,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a 13,refs/heads/master,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,7835651b39ed5314ba81876bcca56ccbe3a54e4b,b476c9b21cc83f74a82be0a38a5a8c7027d029b8,,True,False,True,2,7,16,2,True,2,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,True,Tests_passed,5666db336d92e799610b6b542fbe09fa0ff854f7012ce2e2bd4e9ea07761c229,True,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,0fe199dc785ffe734c0bb2b3f877857f7bb6e60675d676c4b4bed2bbe3cdea5b,Tests_failed,763eb96f71eff2f29e3ed109943848e7112a5df88f2ddb16c357db95680439d5,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,0fe199dc785ffe734c0bb2b3f877857f7bb6e60675d676c4b4bed2bbe3cdea5b,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1 50,refs/remotes/origin/pull/117,59faa9673cf41b1fda25361ac3a32fc7d64af5ba,a61e140eb90a352621f16abc3ba490160c94ad20,666a9d65a5b49c1a5d727e558dc67a6e24cec7a0,,True,True,True,13,40,185,3,True,13,Tests_passed,d6309e25fb1f703ada71a4870c53cf76cf19a8998ead09db2ff956f53d1aea2b,True,Tests_passed,dac67b85609d39986e4c378907970fb8e4f566712aecc822d499295792a0ced2,True,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,21533765d3390751e27d5bdaa545fe28cd2b970445d2a61bdb8806032d268faf,Tests_failed,1a645376edfa7a53422a6250caf660c60a28f033ecda5a4eb19aedc72ae7d0af,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,21533765d3390751e27d5bdaa545fe28cd2b970445d2a61bdb8806032d268faf,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6 diff --git a/results/combined/merges_tested/jenkinsci/email-ext-plugin.csv b/results/combined/merges_tested/jenkinsci/email-ext-plugin.csv index 610638a399..64decb1ce8 100644 --- a/results/combined/merges_tested/jenkinsci/email-ext-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/email-ext-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 45,refs/heads/master,f995fa0ecca2296eff1dbfe2efa60948179daec3,18191e987eadf2c56a95f927ca2136acb93d8450,d0cb6f5249000db8233538c7f94d0238824ab5c0,,True,True,Tests_passed,a1295c024fa4022e9015cd9ad4036b82805ec9b0e70d0ce632febb000acdf47e,True,19,107,3480,2,True,Tests_passed,9a60875e4edc770f2b5418a283f6a4958d747dc740caa08b2d725939689776dc,True,19,True,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,9f53586338772150b0ff35fea1098d2529bc732a98c5671492d272a59c5312de,Tests_failed,76523a0ebbb9e972e2eb22a145754b9d1f2c1d7ac289a982bd3de6693b7514c0,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,9f53586338772150b0ff35fea1098d2529bc732a98c5671492d272a59c5312de,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129 51,refs/heads/master,bbf162f5d50c3d37e3ee8940a0f13d3a4ce4ff59,312def504a573f3d4e5a80fe39fccff9e4a7a485,3fc56050feee5e84d074b7bfe11c15e22a15fd0b,,True,True,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,True,21,145,1700,4,True,Tests_passed,f35690ebea5ced8492cf7847eba831c71b721e898f3c7720d1664480528a8d5e,True,21,True,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,b1abf47a9ef7821afc644a69c839101fba92f78a1240ae3e06d0eb3fd69c01f2,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,3b1ed1a4f9029416cc3268d04d89d2e3a30c54935a38567d57d1e9b95a3ef03a,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,5d22edbe9f7b989116324a9cc642c9c1e81955fd984b37e496dd332d14be2c57,Merge_failed,a91409e53ece24a84c7081360108367301adddb1e023006acc15b194522ebce1,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef 52,refs/heads/master,312def504a573f3d4e5a80fe39fccff9e4a7a485,6630e7b8c527b6b103efde1b55c44e2d65947e30,dd8b9f7bed97a0413ec71bb1212579f6b1224005,,True,True,Tests_passed,8b0a1f236392c1b277e4cebf597b2e38390e9d87e8d697276015ab842119d8fb,True,3,6,41,2,True,Tests_passed,92a59fa383701a82d048cd35e66cc652caf4cfb68676bccbdbef7efa5851dccb,True,3,True,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,e38716ca8b6ef9e16597f99a52f97c6580bf2cdb9ef4591ee18b4a12d3c22ea4,Tests_failed,3c1b967d871993d3ab23f73bd808b9a4b49e08029c118336f2b136670ff180e1,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,e38716ca8b6ef9e16597f99a52f97c6580bf2cdb9ef4591ee18b4a12d3c22ea4,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588 diff --git a/results/combined/merges_tested/jenkinsci/embeddable-build-status-plugin.csv b/results/combined/merges_tested/jenkinsci/embeddable-build-status-plugin.csv index 67d4630df5..f152f717c7 100644 --- a/results/combined/merges_tested/jenkinsci/embeddable-build-status-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/embeddable-build-status-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,606e4e382c71ccbb434642b94e3f766f0b6d4a9c,63aec092e7e76076a143d46d5dc6ca14f084a2ad,fb9b573e63c4d5cb5de20f3acfecfdc6d4c20a87,,True,True,True,17,29,315,6,True,18,Tests_passed,e5454b620f979f96485bed73879b909ab44359eea1f83d422605a37bce43f2df,True,Tests_passed,4188e47091ab83c5cad72cb3b12f0a3ecd38cec22b428c41069d3e1d577955d5,True,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,078d8aa846bb337d905ed2e39021307c79c368d16d6fbafbd7ec822b814ac870,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,525898d72132d67926d2052505af8f2ddd4043667a395ffa569aced4ffa60d74,Merge_failed,2943a2817221de0bed9e6506a5e71ad1f6c6fd06828e67ddc914b7242134541e,Merge_failed,012eec7cf27bc8e6d9393384b319745d95aad9356d43b88c2d203e9354b580d7,Merge_failed,292e4cf33bd53c0218769dc51e8f79ca922eaf2a1d34f0ebf196700db2ab9fc7,Merge_failed,2943a2817221de0bed9e6506a5e71ad1f6c6fd06828e67ddc914b7242134541e,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,078d8aa846bb337d905ed2e39021307c79c368d16d6fbafbd7ec822b814ac870,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,a53a204ff6b7ed07a04fd42dc2c2754f22ebd314285d7751abe9bd51df18128b,Merge_failed,df66fa27a406955585e1a714e77b48fb5b7f0760bbe4f4c417fb3eff2b7641bf,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b 74,refs/remotes/origin/pull/248,83edeb11f30652257c65d2df6292d608f8dabb1c,a26365da217d87b98b5c0cb01fdb16ae3e72a07e,b1e6224d7c9b0d2a4e61ea296f5ef975272e72cd,,True,True,True,14,26,387,3,True,15,Tests_passed,26ce1c1c330d68fd456c97d1d33391a1c0c0b6494e9843a16049eba523bdd4c0,True,Tests_passed,221f3d1e87f2d50f76f4c89a310e8f8594f91af1f6b26f939a57c6f5220d0c2a,True,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,e0e8d99415622abc47a1e5e69151562867d98d6ae15daf5c3d91c0ca74914e7b,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,1d9bceb00342f316c6ea1d8059a0b81b0a68d03a991113f9cdce7f356dd4ef43,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,3eafec2b18933b2c3a89903cba1515536f2f8023be50bfafb4bec18853874478,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef diff --git a/results/combined/merges_tested/jenkinsci/google-oauth-plugin.csv b/results/combined/merges_tested/jenkinsci/google-oauth-plugin.csv index 8e314aaea6..c2523f3604 100644 --- a/results/combined/merges_tested/jenkinsci/google-oauth-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/google-oauth-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,b2e845aefc227841fc8f34828ed2be13e0704bdc,7c3bdc7dd3fbfbb5638e5fba83a54f35b0ef59b9,b4e7f9568072518943e97b8a12d2d0b1bfa3f626,,True,True,True,12,83,399,2,True,12,Tests_passed,86e9c3194594bd588fa99235b49a7a3a2ea291215a09c3857a45758948759d16,True,Tests_passed,53592a8a0d271b5a66e4a66cfe8a209b16c4f19c074413c1639edeb43cd837c8,True,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_failed,5a607b1562ecc5beab8b0e384e2ff7112602f9187a2394eb5cd5749ca9d4f9a0,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_failed,5a607b1562ecc5beab8b0e384e2ff7112602f9187a2394eb5cd5749ca9d4f9a0,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d 9,refs/heads/develop,94f08c7c32d576d99ddd3e215b67653fc99eaeca,b5ac60d0f624ffc26d9c4ac499219fccddb01520,f28bfdf65c3d9df5ecb00be60c44a38fa1c0a153,,True,True,True,10,55,158,10,True,11,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,True,Tests_passed,3ade099905f25d2168a71c56597f7df29b3b04a066fa144b1f4cf018265d088f,True,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_failed,5b2b2ef97c4658ce866b20b64cf8f1c4539fb8b2205053d7051d6bb96ce5fd03,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866 diff --git a/results/combined/merges_tested/jenkinsci/instant-messaging-plugin.csv b/results/combined/merges_tested/jenkinsci/instant-messaging-plugin.csv index 114db006c8..f6c744c131 100644 --- a/results/combined/merges_tested/jenkinsci/instant-messaging-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/instant-messaging-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 111,refs/heads/master,4110663ba811f5ac1d99f3997dbd5513dcbe784d,a88f487a4e2095c2d2c55980c38e158217b3ec5b,5315aafdbe128c07fd15c4493cd6a275ac140119,,True,True,Tests_passed,7ac61f26f56e9a0dc0dd0701f8970d65d7255480da7aad88251b00714286f2d3,True,11,27,190,2,True,Tests_passed,64f9ca7519c2846d5e3acd4a3f7174e0bfe4ddc1d5024974fc02938a8a0d2bb6,True,11,True,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833 diff --git a/results/combined/merges_tested/jenkinsci/jira-plugin.csv b/results/combined/merges_tested/jenkinsci/jira-plugin.csv index c8ff8376ff..20bd77b32b 100644 --- a/results/combined/merges_tested/jenkinsci/jira-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/jira-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/heads/master,09485920f4a79937bd261b623b9fc4afa14d2dd6,b06c175aa4d8928c881d90be65c6b81ab92266fb,639d44bf810a9f096ada141df5f265cc79c3087b,,True,True,True,40,180,1188.0,2,True,40,Tests_passed,b1b8166e77f0e0cd2894881c301e9735787f600f75e42228b0f7a0baa3a8085f,True,Tests_passed,fd6a2a71cb9d093a3767b1352620ee800d8b8eb96e61b77d903e096cadcd3c6a,True,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,1a0249bead2832f1277789d4bb5e07060cef6ea94607e68fdaef385fe08a6833,Tests_failed,4e606964c9184d082b012cde42b3f5672d5d441fb1be8411e347a3b12577a5d3,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,1a0249bead2832f1277789d4bb5e07060cef6ea94607e68fdaef385fe08a6833,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301 162,refs/heads/master,6ad78581c99587e433715daa56d29b61201e5590,dee906a5f334519d178023f61cdb659473830721,cb12c4d50da9a33540830c117b398589f85d6239,,True,True,True,35,154,831.0,3,True,35,Tests_passed,5e51adb79fc8acb192b330dc2df954de3b3711e44b60fe08f71b634545c6149a,True,Tests_passed,e6d3a99d1509ae354d0d0abfcae9e6207b569d26f96aa38e96d01b01fad04bd8,True,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8 165,refs/heads/master,0eec353cb535b0cdc844b5c74c443e17cf76875d,a7265287929bd84489f9bbdbba3a50d658830f36,99f68c29420cf21eeb6fcc7db996f5f7424d27ca,,True,True,True,13,44,419.0,2,True,13,Tests_passed,b04a59b076d8d8c50a33b3c22d875cbb2e121b0ba220af2438d616f5deaf4c03,True,Tests_passed,ee7f540639439cf455390f73e89840e852918748af0038963bc00f7574f88490,True,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_passed,10153a199f7ee19a89a53b9161262a02a672004289fad6ba4061d958e1f4a7b4,Tests_failed,535716c25ae56c7efaeee5f7ad6a02588d3296274007392b23798234b3c3b0dc,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_passed,10153a199f7ee19a89a53b9161262a02a672004289fad6ba4061d958e1f4a7b4,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851 diff --git a/results/combined/merges_tested/jenkinsci/jobconfighistory-plugin.csv b/results/combined/merges_tested/jenkinsci/jobconfighistory-plugin.csv index f2e3f29d9d..5eb8061a43 100644 --- a/results/combined/merges_tested/jenkinsci/jobconfighistory-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/jobconfighistory-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 120,refs/remotes/origin/pull/79,7feab60b0e47b5866e16881a0e5c86e100fc54eb,fc25ab3f98aedadb6062db1035f66aa3d2b82c03,59e266729e67209ab31606ce161ad4e46bd0159d,,True,True,True,25,129,1307.0,3,True,25,Tests_passed,adaaa463bf65ff8412311a92c532464b3ce547cf70db04eece7153d91b1c4512,True,Tests_passed,fbe0375142d9ecf36171a214f10bbd015f52970d0de84edfe357e6aba091526b,True,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,7a1a9f66b22e0001e5c7a1bd0518b7697f44a82204a70652981b5747f5f1e18b,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,d33cd7f15e5fd927ec3c45d1b70e33703ff381e6d42b7981bc512f679a2cea56,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,30e417c6da820245b486b99bd78dd674c109b360548ff1d07afbd639c4f7f63c,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088 diff --git a/results/combined/merges_tested/jenkinsci/junit-plugin.csv b/results/combined/merges_tested/jenkinsci/junit-plugin.csv index eb50bba234..c94fdf1466 100644 --- a/results/combined/merges_tested/jenkinsci/junit-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/junit-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,39859834f417ccc9f010344e4e67af8b66f6cb94,bdf558b98b467330afd1a22f7f8e5d63b1bfd6f3,8e215f7f5f0d77aa116483ecf37e8970d571ef55,,True,True,Tests_passed,5023d72bffb4fe991afb78b4f7be1e225073ff960bb74ae7972647c8091af715,True,59,231,2939.0,2,True,Tests_passed,c85819f26182fc76489583d1964e61a94c33744fc366c5f3c389d240f887f883,True,59,True,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,0d42075d041678f9ceacbebe0eefaeaa95173df374a3eaf2978cce1fcdfd5fa7,Merge_timedout,,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,0d42075d041678f9ceacbebe0eefaeaa95173df374a3eaf2978cce1fcdfd5fa7,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384 33,refs/heads/master,2f4179baf22a128be210110ef0752c9a333e3a66,5d5a97fd1a1918a764a08653fc86d1e42d136c99,a70eb66a170d82beff6865a95891740c872daa5c,,True,True,Tests_passed,d58d201698df63328f9de94e1b844de17cc597ea8763a5c3efb7b514e43af744,True,17,143,534.0,2,True,Tests_passed,37546d70380f886331fd366e9cb5968d5aef5e6ef473a9fbbabe888f07f1b9b4,True,17,True,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Merge_timedout,,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9 38,refs/heads/master,b0bf660633fd6d2aa8890d447f19c092fe7d3f4f,b5621f3d33b34d05584d9efba81290701d783b23,187cb92178f05d2c8799dcb5d1c0c47cbe7245f0,,True,True,Tests_passed,8b637038cb33e88ae9d8a74c91317e218f8e8fc3fd0196767648ce095363e63a,True,30,167,2334.0,3,True,Tests_passed,8d62dd9f5ecf968a08eb2446666a85f35e18d5be699e09bd62c6fd36befd0836,True,31,True,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,4b79696f8ac1b2c75985e45119317ebffe7ec1dc8c327be8b56b8a686c2043ff,Merge_failed,03eeca02c2619ee9fc6a3e6e830f93c8846b6dd9c38c5b9578b1f6a1fa19123d,Merge_failed,6ec6d1a54476a4fa77da13a17559486b6fae5d8389bf310d5a9399a081f670e1,Merge_timedout,,Merge_failed,03eeca02c2619ee9fc6a3e6e830f93c8846b6dd9c38c5b9578b1f6a1fa19123d,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,b64aa049634f3bd5a8f71b298fbbad273cbd10a2d6f896e37dddb10d2b9989ec,Merge_failed,1a7d2a0609650927dd8342d33f39a0404102630764dcb2b891ae6c0509039a7f,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592 diff --git a/results/combined/merges_tested/jenkinsci/ldap-plugin.csv b/results/combined/merges_tested/jenkinsci/ldap-plugin.csv index f4a51140bc..618ee3ffca 100644 --- a/results/combined/merges_tested/jenkinsci/ldap-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/ldap-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,65487513156cf2c83c16957420906a914a4f2be1,e670ff87d7f5bdf3ca9725fa95669ac9333dbe7b,8cabafe79fad1d461c2f337a9fbfe5046f151f31,,True,True,True,15,59,320.0,4,True,15,Tests_passed,149e43dbc75abdaf82b5d561c244739080b8f341c37d35ea2df5290b0f8d114b,True,Tests_passed,5accbeb4d91349d1cf8ae22b0e84fec8088e8eaa919462730e3cf3f09e3a7a54,True,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,b0ec7c682d02857359424e68be9db53e5d37a74a84ad709658dd910efb62d6fc,Tests_failed,7fd32482d0dc31ef3fe526c4cf922b68ba8652145e6185a0294d2123b5d1ca83,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,b0ec7c682d02857359424e68be9db53e5d37a74a84ad709658dd910efb62d6fc,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01 63,refs/heads/master,f77946931ebcddd5865622831247bc965008a83e,69fa05a0bf6671cb0028b1133e7e640d2e993f21,ff2c95a970df0c0446fe31d3b218c8bded827c2e,,True,True,True,23,272,1034.0,3,True,23,Tests_passed,bc9d70e2230424a39bba9a0f75a49213d4f06a7c67dcc4c30820f67970850121,True,Tests_passed,7122a8017ecefb6341d1fe2ee00bbbc81fccaa94437f0d0eae3b500340f08ef0,True,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,fcd267e6e1413b5ef6c596daf319ae0d1bfe1fbf189601ec5dcc2d31cde8a971,Tests_failed,da723b120fca87548fc84eb0e88605c5c23de097907a0e427fdaa6d86579eaf3,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,fcd267e6e1413b5ef6c596daf319ae0d1bfe1fbf189601ec5dcc2d31cde8a971,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1 81,refs/heads/master,544f4e74e5d98d3bafdc48e1525f60880742eb9f,39f3705a6a8f5c377adbc62dd71164065990bae6,be37dd5b9a7890b2279f7b9146258950bc716ca3,,True,True,True,25,118,1349.0,4,True,25,Tests_passed,eebc580ee86cba3d1d88310e473dd30f7d14a553f33d895e6859ec7adbc9e014,True,Tests_passed,77e35020795d41ce1ef5119afc7dcf8a0f873d9f03543b6aedd2fe4e9c24c473,True,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,579a1fd17d3b3e843530b3d9fbdf70d561d41f17d55656a7dae146303167b75f,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,579a1fd17d3b3e843530b3d9fbdf70d561d41f17d55656a7dae146303167b75f,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd diff --git a/results/combined/merges_tested/jenkinsci/log-parser-plugin.csv b/results/combined/merges_tested/jenkinsci/log-parser-plugin.csv index f4b744a841..4ce72a3060 100644 --- a/results/combined/merges_tested/jenkinsci/log-parser-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/log-parser-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/develop,a4d0e3ca611eef6567b9ac34a8b8453a35fb4fd8,b57168beaa534d38eb0fe3d14b5a647ea967e378,13dbf9ee6740a819a5fd36fb9d35601f690dc220,,True,True,True,15,73,291,4,True,15,Tests_passed,07648d91aee9d0f6e494194a78a97607be539191d4020ace934218fccd873032,True,Tests_passed,dc6f04a493944036cc570f7ba9b270645760c760cb0951b8834da36419cb86db,True,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,8497082d49ac979b18d77baa35fe16f401dd413db07b7ea62ead99f5216e5afc,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Tests_failed,4854fd361dd4337592a341e97f427ed13172da8b4710e1146c7c665479d88d0f,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,1d7e615078268d2e9b07088752c5df47b6c79ba89b02559556101dac6ee3e173,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4 diff --git a/results/combined/merges_tested/jenkinsci/mailer-plugin.csv b/results/combined/merges_tested/jenkinsci/mailer-plugin.csv index c47f9f2bf5..aeecb8114a 100644 --- a/results/combined/merges_tested/jenkinsci/mailer-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/mailer-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,06a11a1de909d15bacd04459d29807af9e0882d8,7deeda155287f04384088e250f40c59ef151d305,cc4c337146011301d9c6f4ab9269bad52a83f8e3,,True,True,Tests_passed,b7977e1d365e6a0d3243f110fd22a3593e3970de3d9085b28ba869648e1cb443,True,4,10,27.0,3,True,Tests_passed,d03eab9b6e7b54c9c752a738fa4147450f60425db3c9da196bef9f45f9f41074,True,4,True,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,6fe5e06a9fbf2177ec70c9b280f66c9989a72c2252bb7f8b4fe6af999ec4d90d,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,81b8dd259b81a17907dc8c6c6765a61f5f964cd70fb64bc88776818b595fd4b2,Merge_failed,c37a2489b6644311855de201a164a7ac8f50b45c7f5503a6802664e709566425,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,740dc7b2f94a22f18623aec60c94333d0985dc0f73a98475b4a81e0fecab9b44,Merge_failed,a555c00fe21a58aaa6c9bedfbfaaf6d8dc476c7d089e3734181c43c99c6dd603,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1 17,refs/heads/master,67ab48f1a6d2f9f568f07ad61f5b0c5b6ae165fb,72edb8559177432001e9c4ca884a152f9e2304c9,d726a1130320076b82e004f675ec97875e9b5fbd,,True,True,Tests_passed,79149babb1505b08f27045e32515084abbcecf89709efde834af570228fe3180,True,5,12,62.0,2,True,Tests_passed,78ed702a2661a6f5ece85ee92ca6406bd119455528ae3cf452c20803a8d9a314,True,5,True,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,4c8b1426eda828aad1239cf33bae8b1295f1acb9ec20d6f454a7566aeaedf3a1,Tests_failed,c9be11053f1026e4cc10a1062c309d2d04d341d4415cc2521328a6ea753fac32,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,4c8b1426eda828aad1239cf33bae8b1295f1acb9ec20d6f454a7566aeaedf3a1,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4 18,refs/heads/master,d726a1130320076b82e004f675ec97875e9b5fbd,ac3d82b437a724e24928b94c507dfb50e8299e0b,cbda5ed9f567e1a5793f0e8be50c6a960a9ca597,,True,True,Tests_passed,c0a21be88d9df23bbb816d4611d7465a5e14b6b13eedd13fd4f23a0cac623933,True,15,72,270.0,4,True,Tests_passed,6e0eba6784d00ea32d961b4a009c077b3b93fad31eee79fc61a7160caec9a292,True,15,True,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,29db0aafd6e431b3e31754d73273bd15bbcb19b3b91696b49d0d1bddd1ff0643,Merge_failed,a7c6306c82402b6c44d430485915c33b94c8bc92998a2cf614f564af1adeda70,Merge_failed,c2dfa14ca440c6972b6dc5f86782dfd0c3b9761b7bdb9aa9d2c014e6f60132e5,Merge_failed,79250b56a66953cda4113d8833ba996c32e4ab6f6ce30db24096740931f7a7ef,Merge_failed,a7c6306c82402b6c44d430485915c33b94c8bc92998a2cf614f564af1adeda70,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,8c8d726f6a6b7646decdb31464adb85ca33841fffd206822e3c9307975073977,Merge_failed,782c216435c46e0d2c1561db493faa92465221b4806ef32491c205cc2a2f1611,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9 diff --git a/results/combined/merges_tested/jenkinsci/maven-hpi-plugin.csv b/results/combined/merges_tested/jenkinsci/maven-hpi-plugin.csv index cd7ae1766f..e62a65f9ee 100644 --- a/results/combined/merges_tested/jenkinsci/maven-hpi-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/maven-hpi-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d65f4ba879cf14e39c5e502787d736afa054ea92,210884d2a6f1aedd6df012ec1e525759529917bc,a6c6ae730091a96d8e2dcb2e78fd22ee7244e2de,,True,True,Tests_passed,3914940ffe4d46619f1a7cfc97d4f2a119bfb790aefbfe4267a075d863fde88e,True,11,13,207,4,True,Tests_passed,61cd3a31032564341c9c8e19549572e9d94393c4aab2ec7d3bda116e54ad0288,True,12,True,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,c4831746fe50c72c53e6118d1d12637da5b95cacace219b98aa2fbf222681206,Merge_failed,97007d1abc92c799a369a61c746994fa2501babbd2172b22ceeeef7a51e949db,Merge_failed,a21e34f94bd532914c6bbb4a672070e6abd33f5405321b821c0be85d59c7b9bf,Merge_failed,b5d19b6c240af1f8002e7db755def89aa00b8939cc6d8f646206248a2763c7cd,Merge_failed,97007d1abc92c799a369a61c746994fa2501babbd2172b22ceeeef7a51e949db,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,3eb586407275005b6153b3615c1a954cad6c6e162201d033cddbd64eb0799438,Merge_failed,a21e34f94bd532914c6bbb4a672070e6abd33f5405321b821c0be85d59c7b9bf,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f 12,refs/heads/master,a5a4fbce7a8d2985df9057d61c9d664ba145121e,fd40b6d6f87c40af14c496b5b124cd22d52a5c35,1c45754eb08f767d2f144234fce232ae8e1843d0,,True,False,Tests_passed,bb421f8119089039567ad83be94b0221d49a6af1f767b242463bc3ab511c3859,True,2,3,13,2,True,Tests_passed,f67a1b1e2ee0b1af9ef1dbfca1bed7593e41353a998c796174592559088bb77b,True,2,True,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,4a19e1beae660b7bc7b38207ca58c6ff1b43c6b76de9e50bf63beb8875bbac07,Tests_failed,20cec80f990bcde3eaaf8cb711e3c8f6ab72ba0e41997d4985e5d32c22a7ebce,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,4a19e1beae660b7bc7b38207ca58c6ff1b43c6b76de9e50bf63beb8875bbac07,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1 16,refs/heads/master,433cb4d66954d957616211c059228b7d1531b800,fa4c6d88a63dcbe5807cad24127c28a1c2a54c7b,00d6ea26b6cb143f97564f02864e5981f8314ae2,,True,True,Tests_passed,24463a92eac28fd03c6afd9fdf7e244cbfafb05725628e496d40009457fdec06,True,12,34,131,2,True,Tests_passed,92f007a56f8f4055e226a2b62ffca3eda7e553a6c323aa5d239b808ca76a7524,True,12,True,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,102abe33b88d4205907f703ad7ad27c054f9b3a65f5c615341c21a350f716d08,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,102abe33b88d4205907f703ad7ad27c054f9b3a65f5c615341c21a350f716d08,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788 diff --git a/results/combined/merges_tested/jenkinsci/mercurial-plugin.csv b/results/combined/merges_tested/jenkinsci/mercurial-plugin.csv index 6223b08199..6f9785171a 100644 --- a/results/combined/merges_tested/jenkinsci/mercurial-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/mercurial-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 41,refs/heads/master,442c688d35c5d22fd37822285b997c0addc5c3eb,7ad0c7ed48378c86e23c90fadc32e647bbcd45c0,2a6bc4be4425be43e355067e0c3bfc0c8db5ee76,,True,False,Tests_passed,9eac327212a73c1e75f93937810cb27ebc80878505ccdca34c96db826bded004,True,7,13,22,2,True,Tests_passed,82844bccf5727fd47ced32a688634253da9682292f5caca1946fe9e8c189c363,True,7,True,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_failed,7cbf0bde3fba0b3eaae6aa5816841ae432b9598b1e4262178a174ff6bfb3f2a7,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67 diff --git a/results/combined/merges_tested/jenkinsci/nested-view-plugin.csv b/results/combined/merges_tested/jenkinsci/nested-view-plugin.csv index b2a36caa58..717da61a67 100644 --- a/results/combined/merges_tested/jenkinsci/nested-view-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/nested-view-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,94ea285c76a8bd6fec6c17193488009557d4ab2c,e8c66c2217dba216df05030200e0704684c1dda4,fd7070ab51330e9a4919a773408d927f43b6b6ec,,True,True,Tests_passed,0b8a32a4f448291b6a1d829f2cdb29c7b970b74b4a1886047fba917eb1d9f98b,True,6,10,59,3,True,Tests_passed,c45470d6a8e382d7af6526f9073a25f39ff27ddfd09883300b0ff85bf54b3141,True,6,True,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_failed,49eddc9338ae6376106f47c2ac52c666fdce0aa6be69b340b221af4aa50b7614,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e diff --git a/results/combined/merges_tested/jenkinsci/oki-docki-plugin.csv b/results/combined/merges_tested/jenkinsci/oki-docki-plugin.csv index c6487c846c..7788143464 100644 --- a/results/combined/merges_tested/jenkinsci/oki-docki-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/oki-docki-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/remotes/origin/pull/73,1b83e76b9746823f89b48506efbc043c0b42646f,e3731a6f6485dc93f46c48ddc81882b20bc54d5c,c3da4fa3e757e55ce78e3477d3e6f96b7ab865e2,,True,True,True,5,15,46,10,True,11,Tests_passed,8dbd36c05296e7bfe203e5c54f5eba61c2ceed9ba969bf390ec6830c98450004,True,Tests_passed,bb1debed5b38d446f4e05acb0a158cd995a3b386406ccfd93d10d9c381c59ca2,True,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,29e8f712f7498b4ce8934980ee5269722aa7bf91c67d95911d57f695b598b25d,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,0d177e124dcc4350398208b97f329c9d1eb6de5ec26cb9bf993c5fb90c2e99e7,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,eaa74fbad7ce8852c7c5d205a34c0b41b02c3f5b569ebdf0e5f1599d3f599151,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150 diff --git a/results/combined/merges_tested/jenkinsci/plot-plugin.csv b/results/combined/merges_tested/jenkinsci/plot-plugin.csv index 1c025f6c5b..ae87dab85d 100644 --- a/results/combined/merges_tested/jenkinsci/plot-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/plot-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 71,refs/remotes/origin/pull/71,047e97312d44206b7c8b3f19c46aea40cb65b22a,448c2265849e8ab8953aef9fc16c510c879450ea,3c1ac06b43dcc820faeca28b71922231e682d429,,True,True,True,33,89,640,3,True,33,Tests_passed,49e0cb0ef7afeded35b5996aea911f00758729e3eda26e8a7940029f126492f9,True,Tests_passed,23eb6d208ecc54e9c35c0b9f45b372253960606ce43e8a326beecf38fbc90bed,True,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b diff --git a/results/combined/merges_tested/jenkinsci/promoted-builds-plugin.csv b/results/combined/merges_tested/jenkinsci/promoted-builds-plugin.csv index 4ec4af5d37..147f6d8d38 100644 --- a/results/combined/merges_tested/jenkinsci/promoted-builds-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/promoted-builds-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 49,refs/heads/master,90cff675a1008c2167bd647a27a4c62f3b9a9c6a,af28c1241fac960920e8700cdde08c8f4d54414f,219727bd20bac7fad6f71fa77b33d192a36e72c6,,True,False,True,3,8,26.0,2,True,3,Tests_passed,e7ff9c59df7a232ff0c03172efcecf68ce81a3b7b9a8a4843edf911e4dd3fb62,True,Tests_passed,ea06d927f2569648bb447f8d065ec5e6d0fe724fb4e3beeb14829af3164e1c52,True,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,83cecea0eb6657d355449d158a277a7369da867da4f5930fb4cc907a69c99487,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Tests_failed,8bfb68208be97fb2b4bc4fe739872cfa42d8faf17fd77eef2a73fd4320aebe3b,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,72d62046038596ca0e325b22beae11089b9a0ae4115aa34e68f7f4b0a06abd97,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18 diff --git a/results/combined/merges_tested/jenkinsci/rebuild-plugin.csv b/results/combined/merges_tested/jenkinsci/rebuild-plugin.csv index 5cbf85fb78..177056563f 100644 --- a/results/combined/merges_tested/jenkinsci/rebuild-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/rebuild-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,e36c878d58a95640c051a57e906ac94e7b3bd121,5073626fda5900cde847e50810a89edaa2bd1810,105a66408d9e9713a6cc6838c5e3a9ae59e18f60,,True,True,True,9,20,179,2,True,9,Tests_passed,76bfb77dd766de70f702c8ffe7c231a5a574dfc9e613a36e05d74c8a37698c2b,True,Tests_passed,e10165dab3511ecca632976c146c893532397c2b7990e180ce1d32161669d5bc,True,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,ef3135930766601e503a92bbf7c5444ad0a018ca3bc09cd55db8ca07717dc425,Tests_failed,f6e49e7b91f5b89f462d6db9acec1330911329e23cc3faad085882c83201e174,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,ef3135930766601e503a92bbf7c5444ad0a018ca3bc09cd55db8ca07717dc425,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631 71,refs/remotes/origin/pull/64,fa2a472f46cbbfe1e0c7c4d0e3f0d40a1bb33a19,1adfe8fb9559836a45a99c86ad80605f2c30b1b4,fbf91ab63db56523914007976c7d2a369be08065,,True,True,True,14,33,240,2,True,14,Tests_passed,ba1dbb64f06280d9e24bfb04575fe72dc269545f18290c6fdf41d1b3c8e68baf,True,Tests_passed,4b277c7cd1ea44107ed47f25e7da9f7a2c4938e07ff7b0c06333fdf4411cec5a,True,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_failed,2a1d0455bddb945c4de9deabf8153abe34c9a4f502ab539371f06d5c3d29c3a4,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b diff --git a/results/combined/merges_tested/jenkinsci/ruby-runtime-plugin.csv b/results/combined/merges_tested/jenkinsci/ruby-runtime-plugin.csv index ce15a6607f..d0e2e98a27 100644 --- a/results/combined/merges_tested/jenkinsci/ruby-runtime-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/ruby-runtime-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/6,39375b570201fcf8b133343bea4d124bf7351210,92be9dc3bb9db0abf462653b236dd5ee69d21156,3d8ce2e3cb1e769fca79b0f08be9d449f83dea21,,True,True,True,10,21,100,6,True,10,Tests_passed,8fc2c75921936a7c2fc8979207818efe527e802b6f9ab513b8db0b1e85ccf78f,True,Tests_passed,010ab39676fafa2f98562da90f6b8b1b2f58d8d61fccae47c884f13f428a1ffa,True,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,4a99ebc6e6d72fc46608dc9b97e88820f08df5c89113ac4f6330e78a5a3ab031,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,c489a634b9d773226ee45f18c9be35e42e6bc866422607df51edf53e3000e756,Merge_failed,c4839ed75f4cbeb3965a407db6687138200d6e34cfa0e7090ccc5b95c6657bba,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,6c718065b8a254a4d55b7dca851982a44e35a86a5ab30f1ddcd62f0ee56154a3,Merge_failed,abcad57dc0e03effcda66c6a651bf016d78af653b031ebaeea7385e466a8147b,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a diff --git a/results/combined/merges_tested/jenkinsci/ssh-slaves-plugin.csv b/results/combined/merges_tested/jenkinsci/ssh-slaves-plugin.csv index b681d54350..fcc1e7e313 100644 --- a/results/combined/merges_tested/jenkinsci/ssh-slaves-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/ssh-slaves-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 68,refs/remotes/origin/pull/260,67b86f05f7f5d4cce393b8a6eeda9ebf5af23307,6d732bfe8d1d195fead4b2c1753b4c79338f0d6d,4b3a02a729f7376a1794920af7d1b661b310339d,,True,True,Tests_passed,25a55b9dd6eb461129f7e7ae1b8fbec6b1b0ae381f310f046337cb96cca825a5,True,10,44,89.0,2,True,Tests_passed,a0c904e5f5a467c4a98640f4391c7ee1d6827367b32ddba1d3422345c372079a,True,10,True,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,55c797321bc21aafc117a253a72c7b26b721bf24a604bceff1e3f0619e2668b8,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Tests_failed,247c65ac07be30bbdcceb08b503ff2dff45fed1db4c534ad64c246e97b4262eb,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,877aaa3029535d58c3f197d3fb9856c03c6234ab8be6ff254af0c488a8e922f7,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7 diff --git a/results/combined/merges_tested/jenkinsci/testng-plugin-plugin.csv b/results/combined/merges_tested/jenkinsci/testng-plugin-plugin.csv index 29359ae369..a5fa33ce88 100644 --- a/results/combined/merges_tested/jenkinsci/testng-plugin-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/testng-plugin-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,2df4e9dca40488bdb4d10816d04c1f672de4d57c,cbbe722570d1bdd06267e642af03ddc32ff5f39d,a0d5f66521e3bc470047a0b683004ce8889d3369,,True,True,Tests_passed,5da7031c76120c5751f7cdada2178ba36af2c442ffa4c19590ffde5e18b6a861,True,24,60,471,3,True,Tests_passed,08ef0bc46c3164762ed860b24683da2aedf5ebdb899b56405be7c34fad3dc99d,True,24,True,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,34f8420a1988bf5a2ce07eb5ccc059ae141948afa9bdf469e754dec7fb76d221,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Tests_failed,2358ee24f1292b0cf125ef0b56ec8a93c392ecd55fbcd7d280ea8a49447a53ce,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,beee047f6718af217cde790aa28fa7340404c059f905aac92d616cfbf179ebac,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c diff --git a/results/combined/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv b/results/combined/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv index d42f08807e..430e66a953 100644 --- a/results/combined/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,5032e15fb75155d73e9fd1bcccc64ce177fdd57b,4bfc64f6985f1303bbf23f9ec15dd1a952b8cae4,c31b212352d2ff3f87404cf546cf22e53a105269,,True,True,Tests_passed,732d9321738e21f9182beca1f01b6aa530ddece503824d8477b90e2feb71fcd9,True,3.0,7,57.0,2,True,Tests_passed,76f4d30888d5787bcf45fc7bb881cff5c277c96625b6dd93ae7f7099179be25a,True,3,True,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab diff --git a/results/combined/merges_tested/jenkinsci/token-macro-plugin.csv b/results/combined/merges_tested/jenkinsci/token-macro-plugin.csv index 4ff069bc1b..09f6b4ab8d 100644 --- a/results/combined/merges_tested/jenkinsci/token-macro-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/token-macro-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/remotes/origin/pull/201,b81fa6878b4f2e512ca115b620bff635f8f4fc13,ff1f4313d35e6a4c707c98666618af169389b352,934f268591ced72572d147e6393db570f375fc41,,True,False,True,6,41,120,2,True,6,Tests_passed,ec167640747beab83d5e975cd9d70c72e764c6adecc1d73f756b4a3c85464493,True,Tests_passed,4ccad620cc303dddee75f5d093cecac1e7128855e1c74bdfce3986e8b479a84c,True,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,0a99b4d9314a5e0e319f5d5d57f8af514bf43906d29794d55e5a7c4fc8df79f7,Merge_failed,6438dbc6bc49eeaf76463f51e038981b146f103ba39278b0ab6678f35dc3f4ed,Tests_passed,027e08ad5319d3cd417e8075dba1eac0a35372625693ed5b37139aa570e8909a,Merge_timedout,,Merge_failed,6438dbc6bc49eeaf76463f51e038981b146f103ba39278b0ab6678f35dc3f4ed,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,096cb9d5d7c4b2bcc5ff5c240b21f7ef3d1002211918fdf4a50ea9e1d2d54806,Tests_passed,027e08ad5319d3cd417e8075dba1eac0a35372625693ed5b37139aa570e8909a,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3 61,refs/remotes/origin/pull/88,47d8b7d061275a8c961c9f0fd17bffcb2a656b89,7c063fb30ca13cca989b49f3834f86504995799b,b2ddd4c391c910628567cbba43e5e48fbd3e16b5,,True,True,True,7,73,963,3,True,7,Tests_passed,871803410282e8e4366c7f14398928a0a3e35656db91dd1f07c559ce97a46242,True,Tests_passed,4dae64f82b3a67fc14640f9845d7b7e2e6f488771ddfe642c11ed7ff6512f095,True,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bb353d80ff39078e74ca1328f8e9e92c84241964b06c4ed3003de465c68f1798,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Tests_failed,6b86ee49e56096a49df4a692ac2e035a59f30b9184980cdd81e0035152b9e16d,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bf655cc2312ade40baf005493dca60e12441c429e2c1825ad55ae8e2b42a6f08,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0 64,refs/remotes/origin/pull/88,b206c7045b9d38a5099933af3076b63a6c77c82b,147d367e0ae8fb9d373a812bad2e7fcbb7f6e163,712021dedd16dd10baa4a320ace0274871eefe98,,True,True,True,16,104,993,5,True,16,Tests_passed,bbec0a4d934143a85cb3dc10dffff187b303c8044519408ba306512aeac8c687,True,Tests_passed,7736f97a4b52507eb2d2cd8342691bd4fd615e9b376c241d212d30a9c9e58aab,True,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,815f62f86ab8a78b61fe0ef2e45c12a0988036673aa1939019183aac47e78914,Merge_failed,c917db2474e26f940a80a6687d115444a43fb74b4514c70922242ee92d4c98be,Merge_failed,4cb7a1f228abcdf9f9a03edadfc39327501091d91e4e8d5789c83ec940bb85da,Merge_timedout,,Merge_failed,c917db2474e26f940a80a6687d115444a43fb74b4514c70922242ee92d4c98be,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,9ba09ba0b705ad72825a3bb3077da87a93442dc3d1b75f6a21c6b7b8fad02c40,Merge_failed,4cb7a1f228abcdf9f9a03edadfc39327501091d91e4e8d5789c83ec940bb85da,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc diff --git a/results/combined/merges_tested/jenkinsci/ui-samples-plugin.csv b/results/combined/merges_tested/jenkinsci/ui-samples-plugin.csv index 9488a02863..d769f06939 100644 --- a/results/combined/merges_tested/jenkinsci/ui-samples-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/ui-samples-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/remotes/origin/pull/14,179ee92cdf658ab0fefbb2e20d341443fbaf5ddd,cd322943dcc1363e90555c011d97ffde1807e6e3,d7e88884dd90310b67193b4aab8139998a107486,,True,True,True,32,50,240.0,2,True,32,Tests_passed,6761b9b89eb5f3b7e18758f9876712fdd0e1cd766d367e678a691197d01e6677,True,Tests_passed,015a7155f157be9f6ba6af0e0df998c3e6a140cf7d600492a1fb581b1f86e5c9,True,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_failed,a52259e58a8fe0d27ce1c9ad8a466249e03a5aa56ad09898260f67e08185b232,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985 36,refs/remotes/origin/pull/14,c8af2261afdd68800803c8595a112644b653ce96,cff342b0860bbff4312fd7eeea9fc0a58d3dcbe9,d58a5af654da46ba8c28ebef923abc97d282056a,,True,True,True,48,79,944.0,4,True,49,Tests_passed,4f80bb4e6d3988d590e02a277977bb4365a758ead60216ed33cfe2793505945e,True,Tests_passed,f94d2c7aa56697663d7b039896df9aca60fd27302dfb331883f36a5ce2f33b59,True,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Merge_failed,0db3ac9881c07c9877ecfde4f1e1d5265bb459bd72699b7173a742fa4cbe4f9c,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,18a2c0e3deb66d6d44aeff48c0d6aba0fcc7f31bed5c318142b39ed140ab6b66,Merge_timedout,,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Merge_failed,0db3ac9881c07c9877ecfde4f1e1d5265bb459bd72699b7173a742fa4cbe4f9c,Tests_passed,18a2c0e3deb66d6d44aeff48c0d6aba0fcc7f31bed5c318142b39ed140ab6b66,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f 66,refs/remotes/origin/pull/85,81bf937a3df70590fc0bd9863fa042fca33b6373,27bbd0089038840c8f5f7031cf8372351acd9601,5adc77727645641a0c723afe6af819cda9aff26e,,True,True,True,10,17,337.0,2,True,10,Tests_passed,5eb465960460adab80fd439fb08ed4b3b86f47af4d0663d85ba06048d49a8b2e,True,Tests_passed,8b50329f3af4c0c1a6a0a7ca44252a94c1f0710f0e1de00b33166f3a49478805,True,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,b5e4a63feb89974e5650e8f265b22174f57cc4cfa54d8e5af22d3d765926af61,Merge_failed,d4b5c2b65b3e82f734bab119b265e0056e9c3ec4b48dc66c002c120ae0a05e2b,Tests_failed,42c2cc581c25483a995fb98c5997f5637a6b88788119c516528a8847bc05f6de,Tests_failed,67dc0d399f1af9a1e146c33adc0246c0037967e683bc10639cea47166cc709e6,Merge_failed,d4b5c2b65b3e82f734bab119b265e0056e9c3ec4b48dc66c002c120ae0a05e2b,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,cd79d0891bf45a2ab6b7bbf291484333bfdefaa91d2da72f2c1d0cd8b6e7315b,Tests_failed,42c2cc581c25483a995fb98c5997f5637a6b88788119c516528a8847bc05f6de,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577 diff --git a/results/combined/merges_tested/jenkinsci/urltrigger-plugin.csv b/results/combined/merges_tested/jenkinsci/urltrigger-plugin.csv index 838e678fcb..29efdee49b 100644 --- a/results/combined/merges_tested/jenkinsci/urltrigger-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/urltrigger-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,636236f91bcd67ba35a17a01f43f271fb6150021,52aed37f45183395978126b7b547cdc6372c0126,739387ce7f2b1b61231fb7f5c460ffefde4cfe02,,True,True,True,20,23,74,2,True,20,Tests_passed,082b0839f729d1ea6adba90dda0aa0bf06854764125346c6207b4a75e3ef4de9,True,Tests_passed,a89f5f20c1cd9c02cda65a4cec851eeae7faabd6653b32fc347f9046bb3fd1bf,True,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_failed,5ba725bbd793e70b3bc901061eed3c86b2d7491122535a555900193e95dbd6b3,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02 diff --git a/results/combined/merges_tested/jenkinsci/vsphere-cloud-plugin.csv b/results/combined/merges_tested/jenkinsci/vsphere-cloud-plugin.csv index 9ae2b3713e..a201d9ee67 100644 --- a/results/combined/merges_tested/jenkinsci/vsphere-cloud-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/vsphere-cloud-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 95,refs/remotes/origin/pull/112,9d608121dd2c89e1c5eadb6717ccfa7c412148f9,f5f88b588c8c76b53ca5a569b8f38084bb368c74,e81bbdb1045efc0513bef1271216bc624d375fb1,,True,True,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,True,28,31,751,3,True,Tests_passed,1d41135e87c8ab2c58592179fe5698e7397e6d6054ed65ca76547ef1943c90d0,True,28,True,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,968c1a920c711ae831b5432a59afb923651c20893966b873a8490546a5696c1c,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,Tests_passed,91952eeb51bd58c0bb4803229f4130c48dea1dd56bd61aef157d4ae67f4bbda6,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2c67cee965f401b3cdaf23cef6ddee45e6775f30a027af29eb172179cfd9ea6e,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee diff --git a/results/combined/merges_tested/jenkinsci/windows-azure-storage-plugin.csv b/results/combined/merges_tested/jenkinsci/windows-azure-storage-plugin.csv index 7389e8cd7a..435ce53414 100644 --- a/results/combined/merges_tested/jenkinsci/windows-azure-storage-plugin.csv +++ b/results/combined/merges_tested/jenkinsci/windows-azure-storage-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/remotes/origin/pull/192,68f96cee84c20a9a94696b400e3a5231f0caae4f,40521b451ea70ac7055171aba07f761400fe4e0a,36c07129d7d345a276e8760e33a60e3b4c4f6b3a,,True,True,True,12,21,356,2,True,12,Tests_passed,1cab803bfe52b220bb4063ed752b3351f6117caaed56c5e93f14edf4a865ece2,True,Tests_passed,7c572faa50c82739fb4e5d45354fc7cdf2fb0d93ab7e330a9ad292c5e5e778dc,True,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_failed,4f33a4c98f46939d8495a078567b3439b2ac50e9f9119d1a727a8df7edce28d3,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea diff --git a/results/combined/merges_tested/jexp/jpatterns.csv b/results/combined/merges_tested/jexp/jpatterns.csv index fcf0fe6eb6..a53bb5371d 100644 --- a/results/combined/merges_tested/jexp/jpatterns.csv +++ b/results/combined/merges_tested/jexp/jpatterns.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/3,ef9f7d0e000c5af9d0a9e6843eed56e7b3450bc9,5305b3ebd8d787b57bf599118826be47097c6d22,14bb2740fde84b37d6f4a48f839c7a1eef194e97,,True,True,Tests_passed,4e3aec4b6a31cb1b0e2ec76ae1d1b2f4b82c333038cde5c33cca2c30bc04cf28,True,63,66,8849,6,True,Tests_passed,85c4ea1f34217247aae5eb9cc08d0a6fa80c466982644fcde419bb884009fbee,True,104,True,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,e6e75c9d6151d5b1f07bb79ada7fe44d47b5d015923a654c31908852e0c1a6e2,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,269e2f25b31869e45f5f1e203706cc2cc9bbd64f4aff0914cb0e510feb4c77ac,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,267cb360bca7e4a1199bd16d545e55827b8782f13f85d11cbcfef04713ff1dde,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e diff --git a/results/combined/merges_tested/jexp/neo4j-rdbms-import.csv b/results/combined/merges_tested/jexp/neo4j-rdbms-import.csv index d35e27a365..d7812f4e22 100644 --- a/results/combined/merges_tested/jexp/neo4j-rdbms-import.csv +++ b/results/combined/merges_tested/jexp/neo4j-rdbms-import.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,True,True,Tests_passed,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,True,19,20,982,2,True,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,True,19,True,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f diff --git a/results/combined/merges_tested/jfaster/mango.csv b/results/combined/merges_tested/jfaster/mango.csv index 6ec376ac19..c3ddb87d27 100644 --- a/results/combined/merges_tested/jfaster/mango.csv +++ b/results/combined/merges_tested/jfaster/mango.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/26,6c28ffc629752987623e939e30b2ae66e1952a2f,ff1a792c607c318590ec447591691a91cedf8875,65c5d160cef1cd5ae01144d6bb809033aba61078,,True,True,True,138,471,5334,3,True,138,Tests_passed,33a81092f3a084163e7257a6b2bebbff7deaf9f8694b5879f16dfe4693069bef,True,Tests_passed,6491b1030229b60f98251a9878b6750e9b2eb812890d0c1b4122812e28f2a940,True,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,55a922a05927fb321ef0a8c689fac3465578f09e09b997d5d13fd42e368b5923,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,ecb245518a89ee6711c0d7daeb1d6307510a48e34745fbc8d7ad982eceb70a9d,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,ee25e02a03afcd6b5253748020548d4b135f2ed269f706c8089e82c81f6d866b,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058 diff --git a/results/combined/merges_tested/jfinal/jfinal.csv b/results/combined/merges_tested/jfinal/jfinal.csv index 6063323177..f244253baa 100644 --- a/results/combined/merges_tested/jfinal/jfinal.csv +++ b/results/combined/merges_tested/jfinal/jfinal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,83a31ff0cf39aec29ec35e86e1b393c1236b8fa9,4d36c61b9f4c1fdad6dcc82f096c039782727501,85558c161a136e15ddc3703357410dfd002603a5,,True,True,True,378,624,3911,2,True,378,Tests_passed,300506444a5ae03fc8a4f08443ea38ad132f6c7bb91848d7f70e4656399e193f,True,Tests_passed,ecb17683da7b9a8d14f71087584ec95e8a77d143765de0236cef7edb059668d2,True,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,dfdc3b1a741e7720ac51ae818ee6ba14008fc37bf8e347a1de0d06a9fe4cd732,Tests_failed,1dedd9ee413d013626d375e6c524e813d7998a215c371d9554f7585893119c13,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,dfdc3b1a741e7720ac51ae818ee6ba14008fc37bf8e347a1de0d06a9fe4cd732,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828 10,refs/heads/master,77040eaf33ff2f0c2d3c7ea6d7b3b6d0755999d7,04b26b9ed3141349f49fa3141bd2044acc42f6c4,236c8e70295599cc96e83c44f0db84368e49ea03,,True,True,True,2,3,31,2,True,2,Tests_passed,703226916b0840eb75742e6655c4d86da210c9b921064fb905f811f02cc0cd0b,True,Tests_passed,54a415310644e77be425619dc944a025753ac0214de49227ddd111e0cc2b79eb,True,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,47794c6f558f425491ff5b0b4ae8bea47739c3c289a9d3c0630c24764d01373c,Merge_failed,4853a9b6a5e457c1002311884e5584e2c19a425bf9bbae63e03048955ac575fb,Merge_failed,fe4bbbb9b5341e3bc8cf9455df0df0c79ba1e789328c0ca9f595705b303f0625,Merge_failed,43a56d2d41f5747ad0fb90fd6ce04c5cbe1f3b40c08c884b1eb7cda81f7e94bd,Merge_failed,4853a9b6a5e457c1002311884e5584e2c19a425bf9bbae63e03048955ac575fb,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,4224d95e52396c778550d8751b74874fae0790780a56ba6733e06ae8b47ce166,Merge_failed,fe4bbbb9b5341e3bc8cf9455df0df0c79ba1e789328c0ca9f595705b303f0625,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a 13,refs/heads/master,c5ab0b2b5895f3f708e0e8c4008d5f879ce0271f,1f8ad09c19e86235c7df11f8c1f6dcbf4844cf4b,9e426fcc572d52e5b15ce995c40a8dcb8c0c3439,,True,True,True,8,42,277,2,True,8,Tests_passed,cc7128736d084ac5fa7fbbf10c30b591f58fef1844c455d6b57736a5593a2cbe,True,Tests_passed,cb97ce9abe751c8664d01395549df38d6dd99cf223d75f036b61665c29d80b43,True,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,96b7e03b10fea3d2868b7acb1112f685ef1988d187846930c968b5ee7a3e296f,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,4c34123021fe45df7da7f9f9951aa6eec19bfd79cdd90454fb6802a53abc2a84,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,4857a2c9ba5fab44220823ffe7d3101bf27300676bb4c1ce4210bbab4a370edd,Merge_failed,88e90498147ac6259ce6227682d4406b8266c814d564168868075dc47c228c53,Tests_passed,b73dbe75a4348d6ae327253529c46096387db7ec7c1bd95baf1834a90961f284,Tests_failed,04910373b858b14e427c076e97d1baa6fd677c87bf1f2bec549c4e3a07c8f8b6,Merge_failed,88e90498147ac6259ce6227682d4406b8266c814d564168868075dc47c228c53,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,4c34123021fe45df7da7f9f9951aa6eec19bfd79cdd90454fb6802a53abc2a84,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,1c6af53e1a71b3cb242880fd2a77a5671d017c64fe6a84ff4e4be26f2700c368,Tests_passed,b73dbe75a4348d6ae327253529c46096387db7ec7c1bd95baf1834a90961f284,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,96b7e03b10fea3d2868b7acb1112f685ef1988d187846930c968b5ee7a3e296f,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504 diff --git a/results/combined/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv b/results/combined/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv index 0184b8b6bc..0754978cc9 100644 --- a/results/combined/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv +++ b/results/combined/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 47,refs/remotes/origin/pull/115,08f8573776df392bef2843094930ed26e1a39b54,527b02fa114cc6bf196e842ff2301208ce9335c2,5510a3f02afa1a68943069423d710049a50234cf,,True,True,True,61,358,1651,6,True,61,Tests_passed,4da1b8e223e67844e679b74f20c0123922c940e9d92c540bba32cb4671fa83e7,True,Tests_passed,0c72927c38c151d3160f04415aa9f504d5180c2a6e3fdd02e13283eef62bd0b9,True,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,9397b0c41f68b6d50f5c3b55d00052dc39744dc800968c126b72ac0d55994f48,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,6ee99094ae1b0358e8153656469736f477a5f4146b03ed34d0b16e66bd0d493d,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,592c15b122fd399969323dcb104357e1d3624078e0ba48bddfa2ac884570482c,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9 diff --git a/results/combined/merges_tested/jgralab/jgralab.csv b/results/combined/merges_tested/jgralab/jgralab.csv index 0d01f58ca9..85a9984a86 100644 --- a/results/combined/merges_tested/jgralab/jgralab.csv +++ b/results/combined/merges_tested/jgralab/jgralab.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,e847d12f4e86d32f0be14db3925955bfce0dfc3d,b6ce189e6c29da1ddaee21ca7a4c5e0dba98957d,f22b3f4f2e2dec2542a48b761e918303e72f4fc0,,True,True,True,30,201,2104.0,2,True,30,Tests_passed,2ebc6c09ab99014f4f0757f82c2b71471b5cecd4be00867de964b79864a8535f,True,Tests_passed,35279fafd7f681f686c2053a82aa1dc1a61000989b755e711de12fedca8bd720,True,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,dec613823078f91f4f8fde4a19bda1eebb7a3c179e2ac18cfba7a5ac7c7875bc,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,dec613823078f91f4f8fde4a19bda1eebb7a3c179e2ac18cfba7a5ac7c7875bc,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e 10,refs/heads/master,b6ce189e6c29da1ddaee21ca7a4c5e0dba98957d,a717e0713b57df721015995978be21a224674aa6,742302f626b96fe3dc3a4fa8cf87f54a7c23d7da,,True,True,True,24,236,1746.0,7,True,26,Tests_passed,be611bb4da79e637cbb329bd68427d19888d8167c1448731c672042b90b39463,True,Tests_passed,6ef7aa192da85d55cd421a91750b6646d7a3908048a2227bafef6ba1b74e3778,True,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,fd7f459c04e2655d71cab0ee06578f38de119fe0b68a6d30fd5618812f56b5e8,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,1a9f78049f1c8f037032d637f4bd7ce6438aa890999271b58cf32570341bec1e,Merge_failed,5bcd0a4871b967e0b4255a78b658184aa76390b77260722b3bd44f09b6c69582,Merge_failed,a92f610107c2a655a80ed0d5de9b57682b86334a225c609525bf6ca80cee1f9c,Merge_failed,6bf13cc259499fb9bccecd697ece5e43a39ae21aae71a30545490a1949beefdb,Merge_failed,5bcd0a4871b967e0b4255a78b658184aa76390b77260722b3bd44f09b6c69582,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,3a759457dd9dbd19bc597444e16d43c5942044665a3350d55a08266a9e670688,Merge_failed,a92f610107c2a655a80ed0d5de9b57682b86334a225c609525bf6ca80cee1f9c,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,fd7f459c04e2655d71cab0ee06578f38de119fe0b68a6d30fd5618812f56b5e8,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965 13,refs/heads/master,a53eb0f40278f7288940a688398918e89b29bc92,270b06443a57a8b93ad956302bc1f88e7ff08f78,3850ee7264a681e0ae00c1b5b54704c133390031,,True,True,True,1027,1091,7989.0,4,True,1027,Tests_passed,cdf0ec28fe68854449f63d1b618b702cdae7f9ecfbbb498f43ce44811d19167f,True,Tests_passed,4face33089bcd57747764c0efb9f2ea820007ab5b67bbb6b808f7edf9ee0d5c9,True,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,c0b744aa21a23f90660b88d349d0a41b566fd294a05793bd0435935f8439077a,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,c0b744aa21a23f90660b88d349d0a41b566fd294a05793bd0435935f8439077a,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5 diff --git a/results/combined/merges_tested/jgrapht/jgrapht.csv b/results/combined/merges_tested/jgrapht/jgrapht.csv index b32345de36..ddb43d9aa1 100644 --- a/results/combined/merges_tested/jgrapht/jgrapht.csv +++ b/results/combined/merges_tested/jgrapht/jgrapht.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/master,1d1ee81e47c5d22b559dadc871138d181fd665d7,bc0fd56d8575f07736b952fcd7e61b6316661df3,5a2ad0369cbe2294354895b1c59ed5abeeaeea9a,,True,True,Tests_passed,b8dadaa1ac86d32e1774d6d7037c3d4f058a8f56223ed2bb53058f55dc0beb46,True,107,457,11094.0,3,True,Tests_passed,4553b4acd53f8293eb8ae620a3881ba5e5c442bbb7315655f8494aefa1d78bb5,True,107,True,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,2d10193ea44df825366507c689841ac961d18334ba644a2ffca950a6162961ec,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,824b5bbe3e74325ef271c77ff3abf9555e36570e363e1904a29b4e4c3c85531e,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,d76207ac41f52e73e3d534506fec3f02e3278e0ec37282672e59fc9eff15735d,Merge_failed,de388972e53a9767cab1d7d8dd93773f8fd495b593c7173103b6a60be64cee96,Merge_failed,32ce98f8c7229165b96d9db796dcaad4335684a00e5c6ba17b6c7343495ed473,Tests_passed,d4fd6ba7cdfb3552a467d0563401a39a07c3915a6b09cb4eaf6effef545aa846,Tests_failed,589fc80248124847da3c46571bac4f3a27afbbbebb7ecdd3fffc199862507fe8,Merge_failed,32ce98f8c7229165b96d9db796dcaad4335684a00e5c6ba17b6c7343495ed473,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,824b5bbe3e74325ef271c77ff3abf9555e36570e363e1904a29b4e4c3c85531e,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,d76207ac41f52e73e3d534506fec3f02e3278e0ec37282672e59fc9eff15735d,Merge_failed,4b1e8b5dbc2ab1e611207b7be5dbeaa1a6ef76a9535fd38dcb81286b2c0e1ecf,Tests_passed,d4fd6ba7cdfb3552a467d0563401a39a07c3915a6b09cb4eaf6effef545aa846,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,2d10193ea44df825366507c689841ac961d18334ba644a2ffca950a6162961ec,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6 31,refs/heads/master,10cd805a572acf38bdf1669fee54617ec6493c9c,8ad64df03556720ffd3b7c2fedcd8dab81605f47,5a2ad0369cbe2294354895b1c59ed5abeeaeea9a,,True,True,Tests_passed,a781d1de8531ed0edd4c514ec386791d43cff1059d0c9ce1e0413c5585c0848e,True,5,46,256.0,2,True,Tests_passed,4553b4acd53f8293eb8ae620a3881ba5e5c442bbb7315655f8494aefa1d78bb5,True,5,True,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,14fbb1c3302ffd39796182cfacd5e13292beb600b6a73363830b86f1d1129bd6,Merge_failed,85f541a1beea307561a8edc44555b9c59c6ab475d80c86723ae6997fd0690748,Tests_failed,64d6f5dc461f1023b514ee683c07369f117065c84393812d4c8cac5219528c63,Merge_failed,0e83a40fda49221920e5c6f1e9f26106c995f0d38a3e5094f43ea363c4ae1da3,Merge_failed,85f541a1beea307561a8edc44555b9c59c6ab475d80c86723ae6997fd0690748,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,1d26557e69a0eee7e7ea363610f564a095ab44c48b8e64a7d67c9e4f19668a01,Tests_failed,64d6f5dc461f1023b514ee683c07369f117065c84393812d4c8cac5219528c63,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05 59,refs/heads/master,2d71b99ba5e1de41856a1d1a4f6bbbf3409a907d,55c9864dc572af10068a11efd9768b06bbee3105,801fb0815d22cf9986ff4335095dc0716f9c61da,,True,True,Tests_passed,d3e1f23c374a9e5fb57e38c1bff0ad25f88ab249933a92d555dd1b2db862060d,True,110,338,4875.0,3,True,Tests_passed,eac2fd0c94898b27556ec1eeb62c7ee9b127cf8a5ae24cd9bbfc84eb7c3bda78,True,110,True,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,1e12efa8e9ca953466021ff6600899b64ee46ca40009b0ac8ba3c48a65dc06ce,Merge_failed,11fabdda3390765d48c91039ee14b95a959c90615373821e01556e2bc63f9e24,Tests_passed,4071a7c026ac794b075a6c3335c9bc29cd160d66689a3a35ec0d747cc3ce6c10,Tests_failed,b868299cc59f130fd04e1e607a2bc8a2c580756325312740c6ee81f0ad095996,Merge_failed,11fabdda3390765d48c91039ee14b95a959c90615373821e01556e2bc63f9e24,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,f05ec260f4ab0054cd2626d6a9a927379eea5a966f583c1024d2fc3b36f3c86e,Tests_passed,4071a7c026ac794b075a6c3335c9bc29cd160d66689a3a35ec0d747cc3ce6c10,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365 diff --git a/results/combined/merges_tested/jhalterman/concurrentunit.csv b/results/combined/merges_tested/jhalterman/concurrentunit.csv index 06fa3df9e0..b474e601b1 100644 --- a/results/combined/merges_tested/jhalterman/concurrentunit.csv +++ b/results/combined/merges_tested/jhalterman/concurrentunit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,ff9794f7485bb6455f5360b989c22f3173b679a6,e0a180ded55fff37fc7e0801d416b02b3019f194,21cab232bc4e99b4b9d9250d84c833f4e01ad894,,True,True,Tests_passed,a45de44d2cc427bcd14e936631f7ad73f6e6ec99868dca53b4394fda7935ce7b,True,8,7,1331,6,True,Tests_passed,ab7027ce12ea65b1337952fd4befdbfb9be95fa1ad03f22288cce803d094f0ac,True,8,True,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,dfbb7b6173b9d1783584f440052e21480980778ef3a6457138b23f691b991bf7,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,93e9a53a5918d72cbf316a3bc461c5e51a0ad82333b97688fc63f51b8660dbb1,Merge_failed,4cd63c695ec8e7bea17dbaf0119414a2c2dd7aadf4a3048c9b1c170145523365,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,fc1143e296bbe86d86453d574830166171703e422e258f8009c216740e92fb59,Merge_failed,f2a5bea1cbf9dfb2bb29a5dd8c2bfb71cf4ef0ca047d460154e053a2a06b7cc8,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784 diff --git a/results/combined/merges_tested/jhalterman/expiringmap.csv b/results/combined/merges_tested/jhalterman/expiringmap.csv index 5f6de4add7..5b16af54d8 100644 --- a/results/combined/merges_tested/jhalterman/expiringmap.csv +++ b/results/combined/merges_tested/jhalterman/expiringmap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/remotes/origin/pull/62,a0c2e3e6a0995582ef1199db7c250f9883b075ea,6cb40a4752c7391c5a4d308d5737639e26dc1815,b6a544d640196f96fc91e21c8227735781a1a0f2,,True,True,True,9,23,212,2,True,9,Tests_passed,7a9c35ea159f49c724359e863eb1ab029d2a0dd2d4db7f4712bd8f1e51c503d9,True,Tests_passed,f0233b79d474b97e985835d8a8942615107ba2fb96eae333d6021525f364c73e,True,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,328f7ff681f29f55824e86fbeb1c3ab468da0dcff7829b65eafd4165b56a8d54,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_timedout,,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,e032053eb977f90401b5ec7e60d8995eea63cbdda93e2a15543f8ac201aba718,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432 diff --git a/results/combined/merges_tested/jhalterman/failsafe.csv b/results/combined/merges_tested/jhalterman/failsafe.csv index 6857e2b17e..be80570d58 100644 --- a/results/combined/merges_tested/jhalterman/failsafe.csv +++ b/results/combined/merges_tested/jhalterman/failsafe.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,True,True,True,7,11,109,3,True,7,Tests_passed,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,True,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,True,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_failed,f067ae368a63233b8eb581e0f942b4838873d286cd6aee6bb965514fc4774bf1,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab diff --git a/results/combined/merges_tested/jiaqi/jmxterm.csv b/results/combined/merges_tested/jiaqi/jmxterm.csv index 28c2de717f..6749bf91e5 100644 --- a/results/combined/merges_tested/jiaqi/jmxterm.csv +++ b/results/combined/merges_tested/jiaqi/jmxterm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,c6a0ae5c6c5b3141e5c0207f44d4757919f94696,63863a7c3d18c62275713889ff5cd6d9299fe3f4,07635f95d926c7b117841327bb8aaa5c2a013800,,True,True,True,105,552,2939,4,True,105,Tests_passed,9a716c57ead2531de7aa5ff5d949f6aafb8f17ea42616112fc2e13e962bf7728,True,Tests_passed,933b12be2152a654eaca6a878e417893ae5c06fd47842a14c11c31c227980936,True,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,e8d27a42899702b45ea019d0d883a9f57a531082429605ad3808cf2a9ed9343d,Merge_failed,09ba8ae9a3ba6d9b48a3bcced68b742ce23d9dd38a3ae359c56f1c7f2b4dd333,Tests_failed,f1b4e90729012bb11b7d36efcde7f5e888d6f65238bb097793fc9238de2857c4,Tests_failed,eacfeae60044ec1c549ad5292305f963727e2656f662d6f1e6e1e40bd2801fc8,Merge_failed,09ba8ae9a3ba6d9b48a3bcced68b742ce23d9dd38a3ae359c56f1c7f2b4dd333,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,01d813cc71d68414d5b9c358ca49484c59b19701f77b30279a12410165474433,Tests_failed,f1b4e90729012bb11b7d36efcde7f5e888d6f65238bb097793fc9238de2857c4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949 5,refs/heads/main,eb38f4012dacafe4b4e876004ccf09080bde4e8a,32cf434df4d70cd02503e60d3be65b9156e2f7d7,211a81796b512118b338f16231de0cf748e0b673,,True,True,True,3,6,12,18,True,18,Tests_passed,25afcf9a4d83300c0e1502b5a7ce34f163f7c7e1e011553961a716e2ec4ac222,True,Tests_passed,feaf8dc103ef91d74e3d22fd1ad24e6ee3db2d94ee248f23c517c912bda1ca88,True,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,794ddcf62288d3dbea5548ae8d5986cf49fd68044fe635ddb14d5648c92185d4,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,7f5102f3fa6b5e01de6f09416320e56de99e81e838dd74ec4dfc7881cd7f2a10,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,3e785dc8807cebed30c8132f36ca82d654e3f18db04c01d7a7d5ed6cb44fa052,Merge_failed,cd623b37f7f424845aebfcd943b46a241b71b44ec62101f9ee3da5b84313bcab,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25 diff --git a/results/combined/merges_tested/jinahya/bit-io.csv b/results/combined/merges_tested/jinahya/bit-io.csv index c02eb8861d..fd81a88066 100644 --- a/results/combined/merges_tested/jinahya/bit-io.csv +++ b/results/combined/merges_tested/jinahya/bit-io.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/develop,52e4b4dd02963b79a432deed359f275db0363c4f,eb907000fa0b4909b674e1ca9fbdf36627f70995,7dc2f1a267d6262fe7861cb7fceaf6ab858fe824,,True,True,True,73,151,1552,12,True,74,Tests_passed,8b5d7b682e26761a73c6d53958a7e8dbc9dde48bb2ef3953227827be949aebf7,True,Tests_passed,d4cd24cdff90b112168a31ee04bf6c04ebec0fb28616668040d7da3b4116eadf,True,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,eea88dfa9d0ddc701f0c9f814b24aae928338a7ad43245069060977d5e55c533,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,9901e09fc303dbf565aaaa78af1b5f65cfb438880b68fe4b4640bcee5a386011,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,e332b3cafb95990d7233ee3925686111278e94b370bc06cfd96544e4d9504423,Merge_failed,586f5a8fed6056e6d71f63a5071a019b3c9046a4547f73b55793a7be549f6f19,Tests_failed,3608e3c07571acbcb9ee9b60b8cc087344d1c98ed787d0dc175bbdc220a536a3,Merge_failed,bb91229ad9f23114309727f2a1471c741a2ce74ac3a67f067c127a7bf9af46d6,Merge_failed,586f5a8fed6056e6d71f63a5071a019b3c9046a4547f73b55793a7be549f6f19,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,9901e09fc303dbf565aaaa78af1b5f65cfb438880b68fe4b4640bcee5a386011,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,7a298683e567d0b1a1738da6030c915b5a0a167e3002672e349496c151e59b88,Tests_failed,3608e3c07571acbcb9ee9b60b8cc087344d1c98ed787d0dc175bbdc220a536a3,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,eea88dfa9d0ddc701f0c9f814b24aae928338a7ad43245069060977d5e55c533,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c 36,refs/heads/develop,a3ad5c4ce8fe0b5633b4aa90cccc0e73d774247d,b1642eefdabeb4b1b09e329f82882eed1909acc1,292af81fc26154d3707be9e83cbf8b3b8a526474,,True,True,True,11,46,256,18,True,26,Tests_passed,0455c6c56a5c273fb4ed01800d7e226b42695080bb7aa78da7260ce7f4fe0266,True,Tests_passed,7afb2a8aa488f16b0c53927630708680535b8d831d7b509ce47439bb0cd653e4,True,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,724214221e0e4ce23bdc5c8575d34c4c68762b0c40f463ae21e04bd46b2cb90a,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,6b7dd207b91aa8e61e519f944c297c8d8dd71e895edf7ce1d2655bde97e26878,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,e3a9399c4a42109d43024977d1aafaabe8041bb4562b5ec081c3f7a754d7d7ac,Merge_failed,5efbdc50ff2f6f04eb3b91e7001ef7ffb89cd68ffa0d36679c9859620155f9f5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5 40,refs/heads/develop,ea3f256b27642633a0d92dad57050c2218539135,1c9e183e95e4fee17e668899fe6680f435e5a950,5ca82c4b60609b621f599aa740aad59de23a8050,,True,True,True,40,92,870,15,True,48,Tests_passed,162bc1ecf8f09316137f2a458ee8be5a394fb5eac702f179bfd2992082dabf44,True,Tests_passed,599a2d5008653fa3075a064a00a4caab1404beba27cf9a93eeed66fbe174f642,True,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,0517507c0a59422952620a8d9565e6a5b329252cba3d14d08594bdb2eed85e29,Merge_failed,de94d87f3b863977e37b703b4777ed958f13c847a1c58768c8e0483511f64f2b,Merge_failed,644f8024004c39ae46803da496674c3226c8455b16fcedac1695cecceaabbd4c,Merge_failed,30e036eba0f5511ce8459e58ad90970f492aeee3bff70ff58d98b23aaa03bd92,Merge_failed,de94d87f3b863977e37b703b4777ed958f13c847a1c58768c8e0483511f64f2b,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,d3142190996c8ce72619750c6cdea5cd206ec99b8e776106a0e3296766e969eb,Merge_failed,d2158ab994151466c2316d92548aefb87adc352b0d3031c2e0d7c013c169a99b,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f diff --git a/results/combined/merges_tested/jingwei/krati.csv b/results/combined/merges_tested/jingwei/krati.csv index 898884b05f..4e07e9433e 100644 --- a/results/combined/merges_tested/jingwei/krati.csv +++ b/results/combined/merges_tested/jingwei/krati.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,1781566efcd25979a849227f0d90ecc108e25342,d65fdedc86f39b553f6f5b717177fa4130dea9bd,c0d6e5e6baf21463785bdfec285c5178734753ce,,True,True,True,19,70,389,2,True,19,Tests_passed,be3c3ca22673b3593cdecd577ae8c8b3066c2fc8049c4f42840c4911d53c4596,True,Tests_passed,70ba88d87f91a874aefe681846e6aec86ee936fd396d25cbab90dfae78fc5680,True,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,6284918bb801520170ef7cbf3b857932dbe0c41066d4c06070548164ea5e7492,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Tests_failed,b0334dbf1fda9a5098ad4fcc266b6acb8999a037444f663114500cb175737132,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,11ff2c87e5e5a6d3a0fee607445596ee12a708947cf384342a84adb29ca62e28,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1 diff --git a/results/combined/merges_tested/jitsi/dnssecjava.csv b/results/combined/merges_tested/jitsi/dnssecjava.csv index f49a391872..5f3c4927cd 100644 --- a/results/combined/merges_tested/jitsi/dnssecjava.csv +++ b/results/combined/merges_tested/jitsi/dnssecjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,05cb5d378fe90768618ce158335fbcb564274790,c3843fa5766a7e1f7f02362e7e413282dc3e061e,72b617fe945d40563b1d0577d42258b4b7eb1cf4,,True,True,Tests_passed,61b329bd8c8fba5a72e08ce2c04532c9a66b1dbb11af4c270c1e69a5ad40d0c9,True,152,348,2197,6,True,Tests_passed,86dd535427e6efdb5b7012875f6222ebb1ecd07e19b97f91707b596ee9c1fc5d,True,152,True,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_failed,efcdf43a5de380b6597e6195df7470430b7fa42c170774ac0b827260e15f974d,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844 diff --git a/results/combined/merges_tested/jkotlinski/lsdpatch.csv b/results/combined/merges_tested/jkotlinski/lsdpatch.csv index 49ca8153f5..b9d2acaf1f 100644 --- a/results/combined/merges_tested/jkotlinski/lsdpatch.csv +++ b/results/combined/merges_tested/jkotlinski/lsdpatch.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/remotes/origin/pull/83,6a4e1c82830d6579ddf349bea58a67acbdb29320,7d2dabf069cf7a85bdd91465673b185621237e57,ce522dbe7c021ffbfdc790e0c984df28e144932b,,True,False,Tests_passed,eda8b13df9368694b3691f5595464a07bb8638c278c9fdc1cd4d2d9fd6c021c0,True,2,13,33,2,True,Tests_passed,1ebdf987b44770a653955c7f07921fce00dde2fde938785d4a4e044dfa45ca45,True,2,True,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,ad3540ff4728bd1f0a550eafc6207dfd49a1d3577188b61bdf9d0b9fe475a679,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,Tests_failed,948fd9fe7b1411e079926f23fb395683d4670bf52fbbd6432bc91e3f5c56a98f,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,e415296baa559cfcb907a73c6998c3e68bace96f44f559f07ad169f6c0376797,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022 26,refs/remotes/origin/pull/84,323e7ca477d826f187835aeb7ec5004acd21f8cd,a17b507fcdb4efc9419e4becec335398e30ffcac,93d8f524d86c28be9c4911797660df9108d425c3,,True,False,Tests_passed,4484bdb29128bd3930fce359e05f9b29dc5faef97d51cb643279ebe6eae57a37,True,3,2,8,2,True,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,True,3,True,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61 29,refs/remotes/origin/pull/89,739c6593d8e03cf19f345d56a96db2886f48adbf,261c4d961f314d0594bf23ae1a3756f9a2682ff6,40f690da7664cdb632a57117ccd651d99215dd5b,,True,False,Tests_passed,5f96251313acfd7ef2b7f66a11f56ff0c1c7e287d75e4e9645e8ee295f9f06b9,True,3,8,23,5,True,Tests_passed,d0b5583b3ce6f76ac60d9c371d80d11ba26fefeb3508d3a716f859d07f78340e,True,5,True,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,b6d640b3e92e7651c86ff15710bd10461524294620058d323281b408abf3bd2c,Merge_failed,911502d876f5d077de29e11ae0c20da98bf8577d141375b467e6a00f4a2d1d59,Merge_failed,557d6e92d3e75a09ae9401a17cfa18dac2578f93cd3e14c0d630424c374bcb8c,Merge_failed,557d6e92d3e75a09ae9401a17cfa18dac2578f93cd3e14c0d630424c374bcb8c,Merge_failed,911502d876f5d077de29e11ae0c20da98bf8577d141375b467e6a00f4a2d1d59,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,7f1b5df21291b97c392fb7f554439b89029e877046a08082596a3078c92fd8aa,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46 diff --git a/results/combined/merges_tested/jline/jline2.csv b/results/combined/merges_tested/jline/jline2.csv index 8792408604..4fceb86434 100644 --- a/results/combined/merges_tested/jline/jline2.csv +++ b/results/combined/merges_tested/jline/jline2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,89539d94808bd1b79e1e37c099111ba33365812d,ae3a537dcfa86bd9a0588732b7f344b3f3ee7462,4bd5ac04c8303b2225e4bbf4d11a10f50cddd2a3,,True,True,True,16,65,307,3,True,16,Tests_passed,bc94147925eda7622aa08984f41eeeb6b245c558bbbd21f8f8a9be7fcd43058f,True,Tests_passed,1009e9d4366b1fe1aeddf2d15b04cc9dba85c073a7365f863bbb052715018492,True,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_failed,464fea628ff0cf35f81750b4263ecd94e1a3145941c65c005e6f3271fba5babd,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77 19,refs/heads/master,f81985746156870b23c7a3c7e1c704d0d3d09e92,80d3ffb5aafa90992385c17e8338c2cc5def3cec,294b9ed4d82598415e23d9a19241463ded9a2b68,,True,True,True,14,58,277,3,True,14,Tests_passed,ceb6172edfcf074c385b79c3df34f1b6514f3eb48de6597317a05f527a362ba2,True,Tests_passed,75ae93171a033c01078219df7265c8a4add6187ab744eb5c9d84c446aacf71a6,True,Tests_timedout,d4dedb147b2820658edae301bf44e5b46f692dd6f675e13e27df9fb6533fa1ef,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 22,refs/heads/master,348cb9dadabbe9a315ffcf37b9221cf098e3cfeb,fcdf825312f57a0cc8fa9996c91afcdd976dc6d2,28f10d7755bdb063ff459d84f4922e67e5afc445,,True,True,True,26,142,1352,3,True,26,Tests_passed,c9b12da0f4a413d78c79e0f10b5ee181d0861e11ad93dc57c1175ded68b0f67d,True,Tests_passed,1cf709835046758f603b3c410c049dddab1d4574f65b22ef69d6b130831c415e,True,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,4236dc89dca62fdb2bc8748260c2ce188bef5f76baadaddc3821e410d95bf976,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,67642cec9961568f9db050204dc49cfb7de08e350c6565bf96cbaef36e3ce637,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,46c15b031b33d9798897c37e62deaa753ecd0324737728c858f4d6dd40d0e9c3,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,67642cec9961568f9db050204dc49cfb7de08e350c6565bf96cbaef36e3ce637,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,46c15b031b33d9798897c37e62deaa753ecd0324737728c858f4d6dd40d0e9c3,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,4236dc89dca62fdb2bc8748260c2ce188bef5f76baadaddc3821e410d95bf976,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e diff --git a/results/combined/merges_tested/jlinn/quartz-redis-jobstore.csv b/results/combined/merges_tested/jlinn/quartz-redis-jobstore.csv index 72af3be36e..043307311b 100644 --- a/results/combined/merges_tested/jlinn/quartz-redis-jobstore.csv +++ b/results/combined/merges_tested/jlinn/quartz-redis-jobstore.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,767ebce5e516b009457191f3de3b6ad3427febff,f1f4414055b5e362c08d2638c64dc77f8be5c239,386291881db9730d2f985e6d0714112da5599f18,,True,True,Tests_passed,58063eb4a5d51cca9a0bdabffebdc38d56e2f28e17f9b63ada564c5575e4f1fc,True,16,85,421,2,True,Tests_passed,053753e0c13535d7387611944ed0dc720f900470a678083356c4757c9f349e7d,True,16,True,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,aa570eecf8027df46d75d6bebd94ebdaa13925e90de71e40ff6d8b72cc1f0ab9,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,aa570eecf8027df46d75d6bebd94ebdaa13925e90de71e40ff6d8b72cc1f0ab9,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f 18,refs/remotes/origin/pull/67,8b87e2b2c3427b604f42bb48d3c06843b6ed77d0,8319caab3c74065fcd1e0cf10c206f829aa6b650,a4693da53065f64bf9164e41c4db2f137cb0654a,,True,True,Tests_passed,5bce0b2309a52ff1040ebbd5f73cb49698a2a7428dca680892af250f38919ab1,True,10,21,258,2,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,True,10,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_failed,0e4bf847551a36ddfa8e378b24c4c6086f5b6ebdc824e0bed3b3b9cb43519c7c,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83 diff --git a/results/combined/merges_tested/jmacglashan/burlap.csv b/results/combined/merges_tested/jmacglashan/burlap.csv index 2bc447d8f7..e2b7b547f6 100644 --- a/results/combined/merges_tested/jmacglashan/burlap.csv +++ b/results/combined/merges_tested/jmacglashan/burlap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,4e8800b6680f46064862f5b9c28ca5499203ddbd,3b1917000b96d9fe9cba84db6ae8cbd3143dad2f,f4bc6379d047c30d86fc62227c55e5a7b09b5a35,,True,True,True,46,65,175.0,4,True,46,Tests_passed,23fa978adb1b61e4ffa7be83aa8f83aa8d39a796ed4e9ce5d4b43ddbd90be278,True,Tests_passed,43a9728a1d77cac8cfe3fd1c5c3bc70274727ae2a60193bc0d0ea0311a39bd11,True,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257 27,refs/heads/master,5284c2d1ece3f22e5182183618daa7253c11edc5,386676cb8520cb1a921c32bf3dfcbdcf533fa911,999d52337d741ab6fff7903cad648a1b561add27,,True,True,True,100,158,1247.0,4,True,100,Tests_passed,1934b38a4cd27a94fa3fd6fa68dba806996474b1b2ce9b6f14b91616d50078af,True,Tests_passed,c745abf2107e5d42651568d75ebb311b8e395d083d123813124d0623db38d5c2,True,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,f8057a1ef69fd963534ccbfd387c77f77ed1e80ed7b8106c9f1798e7c7579df7,Merge_failed,97d6163ca45ed0d7741b98ef730d2550ef526b4c6bb59939551d4418e79476c3,Tests_passed,c85e12b9149237818540d6de1ba1dcc62f0534a44cf12a5bfd8928cc3a786562,Merge_failed,b1033591d96039edabc3d0211d9bc86b8c5f4e55c0475db561271574b9843660,Merge_failed,97d6163ca45ed0d7741b98ef730d2550ef526b4c6bb59939551d4418e79476c3,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,346db451b50b4203183b1167da5621cbfa7c005bc7e1e1a4872a38553be6fe80,Tests_passed,c85e12b9149237818540d6de1ba1dcc62f0534a44cf12a5bfd8928cc3a786562,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d 29,refs/heads/master,3a9a57f130852a9da62c5fcb5d1e1f185040c836,8a17ad37ec4b2bca49119b417225470ecba2b7b9,bf60804b2c75e256644f15d5ae96b85962b728dc,,True,True,True,89,143,1157.0,11,True,89,Tests_passed,c687d1a9f49287997b93ba7d2df1f5a682c385fb6489482547fb84481f548f90,True,Tests_passed,b298927f908ba8c42e53f1c4f6f22beba2f2288ebe4a674d2b8d9311643aa205,True,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,f4ebea8be246fff9757f05d28784ef150131c9a22cb1d31a8b77a6acf4697a3f,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,f4ebea8be246fff9757f05d28784ef150131c9a22cb1d31a8b77a6acf4697a3f,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0 diff --git a/results/combined/merges_tested/jmetal/jmetal.csv b/results/combined/merges_tested/jmetal/jmetal.csv index ab67e0cb95..2515ae7255 100644 --- a/results/combined/merges_tested/jmetal/jmetal.csv +++ b/results/combined/merges_tested/jmetal/jmetal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,603a9332cec32fcec56db88c2c486c419723d77c,2574d157bf553894c1601312d0cfba9db4d36550,723030123b7596c5ab922390bcdad3ceba1f0a22,,True,True,True,19,27,248.0,2,True,19,Tests_passed,46447f1ea6236597df1fee86c245979d844ecd3c30ddb6953c49e9ec84391283,True,Tests_passed,ad48873b6dd833eea252a795a53733bb592e3ee2fd02944749d3517771f86db6,True,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,a5d68f887fafd25459086beba35e5b2726e341e413194e27bf10392dfd5eefca,Merge_failed,ef3b4546cf2816458850ac8e0604fc40b893d9f223e1c0e3fb364d198478cd0d,Merge_failed,2052faa8c2e7c8e3bdb55483417dcdb7aeaf71c82e32b756060b934035f12b73,Tests_failed,acdb863d550101d9b47277e5c519b8c9a6c29863e79247c6fe566836bb7cf4d6,Merge_failed,ef3b4546cf2816458850ac8e0604fc40b893d9f223e1c0e3fb364d198478cd0d,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,770dfbc57f791501a860db2ef005bfa22a887f8e7ed63b6f74fbaf2387f27679,Merge_failed,2052faa8c2e7c8e3bdb55483417dcdb7aeaf71c82e32b756060b934035f12b73,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a 11,refs/heads/main,f2a7247f193d01427b1baa9b7cfd2ce31c083cdc,2e1e597f77c10873b27f20c6cce676a89f04fe17,d1bd3548e043056ee3a663ae067edd4f230f04fe,,True,True,True,151,391,4709.0,2,True,151,Tests_passed,45b563e4ffe3f7e17c0277b2dabc9b44244bc210f76eeb3d3f11a20b5cfa1fa7,True,Tests_passed,a4764a3fe2d29ae08240009333e8f40138690e1608c685df4b3ceb208a20eda3,True,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,ffd2cb79da2312e42e1916926c3fb0b70ea6e1000bc249d8a78ef6b37bc43eb3,Merge_failed,a1e3aaaf83892f122a1070e1e7211e4230b4f18cbb1aabcfd76491f06f4f7559,Tests_passed,bc354ab607764da7ae23c9aeb93cc99643a951822fe597f4c5590af6b9bef2b8,Merge_failed,daf5fa3e38bd713d2e7f2e8fb8bd9a357244ff45b415e4967ed71a129b74d8ee,Merge_failed,a1e3aaaf83892f122a1070e1e7211e4230b4f18cbb1aabcfd76491f06f4f7559,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,dc66fb97a218bf2f1154c130deddfcf9ae372b02833b276b753f25b7285ecafe,Tests_passed,bc354ab607764da7ae23c9aeb93cc99643a951822fe597f4c5590af6b9bef2b8,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657 22,refs/heads/main,9f01645975705fab61f50c52d69cbe8291613a12,5aa34d2b78b9ade8f2bec96edfb849df0bc7f883,5ea9b8321e55bcf4f56372166c70d85de7db99c6,,True,True,True,34,67,1288.0,2,True,34,Tests_passed,6e210a593609a97a3289ddf4e85351e14a1fab5c1cb41e8cd6d0e39e0f00709f,True,Tests_passed,4180fa7d0ab0a9320134d441667fd2921cc937dd43cca15cd93c020a94138d49,True,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,98a72f44b35f0964480a39d376e6e58926d67feddd930ea66caf2f5456fec4df,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,98a72f44b35f0964480a39d376e6e58926d67feddd930ea66caf2f5456fec4df,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8 diff --git a/results/combined/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv b/results/combined/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv index 0d002f9b4e..1e6189f5b5 100644 --- a/results/combined/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv +++ b/results/combined/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/main,1cac1475971c1f6615a006becfd86736f7fcd317,b2a7d8b6593b5363b7c2fc340fafe7fab638fc11,8066d58741ad12e0b9197347c18c618aa1bca08e,,True,True,Tests_passed,9c7bca091647681b1ebef15f7798173037a80e12d3de76d8ed0f149ff471ed6a,True,10,39,236,2,True,Tests_passed,00adf9db9239ca88fda7b597e43e4131f217bcb22f195c8d711408283df1a9df,True,10,True,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,ae2ff855b60ab1d11f29f814124b322d6bc0ce1c4ddac7c0a9a2c6797d814639,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,ae2ff855b60ab1d11f29f814124b322d6bc0ce1c4ddac7c0a9a2c6797d814639,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57 18,refs/heads/main,efc1712ae3cf864ff9e552c855f79ec5617dba34,bf8b0b908c2115a4e6a89172df35ba44e9e78703,8d2d280c9edccd06633c5a08af53a5a02b3695b2,,True,True,Tests_passed,852319d1cc6497dabf78b628d68ee3987d280c672c12647b717fe17c3cf02766,True,17,73,618,3,True,Tests_passed,2e75242bb607218708415c75eee0ecefb0af740899a29fdead2c8287d6939e75,True,17,True,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,2a6e321d3c114486298d32d628595c7b8ccd46a6c55cb3318711cd941bdb1d98,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Tests_failed,ee55120005b5d0e1fecd11fab09fe6d819c41fa4a7a308f825182ce752a7cfbf,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,aa5976bfc2f47289ac65580d0e4a4adc318ee14284c56b713ec83994710d685e,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f 42,refs/remotes/origin/pull/118,bed2c2faa7de3029450d0a675b490907d0176e93,9b6e927eb0d991b98d56ca991285b40d49ceadac,b992be333cb3f9198a9833daf704dc84a85d49f2,,True,True,Tests_passed,532c4440b1388c2ef59b3ae6f323dc11ec1c08feaa8e02d5bf32eebf63a367cd,True,2,6,32,2,True,Tests_passed,a7e240d9313b61ea532afc990afcc26271c6ccce337a0be600812e82de0323c4,True,2,True,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,7cdf18a8c5d6363e1803cdd384e80dd1d87b2aa02a82466b8cf2b44ea371499b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,7cdf18a8c5d6363e1803cdd384e80dd1d87b2aa02a82466b8cf2b44ea371499b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3 diff --git a/results/combined/merges_tested/jmrozanec/cron-utils.csv b/results/combined/merges_tested/jmrozanec/cron-utils.csv index bd64e7e747..22fdedc8da 100644 --- a/results/combined/merges_tested/jmrozanec/cron-utils.csv +++ b/results/combined/merges_tested/jmrozanec/cron-utils.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 47,refs/heads/master,56a9faab1c79a0118677324ad31878e8bba372f9,be40542c2c55cd1d0a4c59374e508955200714ae,55f277f1ee25ce954d82c79af23f0633ef55b361,,True,True,True,8,21,315.0,2,True,8,Tests_passed,83826e842e905a6dcaf76f7cd95eb254f19b4c9100edcd2a203135a9d2df0162,True,Tests_passed,c78ba8d1e823d5f0eca39d0a0de135c8c471425422247d4d76582538ab924e4f,True,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,bcf1ba49553e2cf8576d28854a3bf70b373807525662c3da37a92d2c8d482f24,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa 155,refs/heads/master,68a51b5bbe7dd8c6ee4396dd86714bc08e26850a,0ce29f674b4fd880b7f8433c6f1cf74e74f6bda6,ddbbc3da9e9cf10b8641ee847535e0b2e52058fa,,True,True,True,3,16,87.0,2,True,3,Tests_passed,608f50e91b305af3fb1b50a1249271fa42ac2ff18e0ecd3d0bde18e452bd84d0,True,Tests_passed,e0915690e73292de37932604b65bc2102e9ee2d793c61931e614777bab21e942,True,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,fd8043af78685af2598e610980184c1b2681c1736b8b1186ddb7de2730905835,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,9c015056b101cf6be9fa3cfc8097fdc88a615058bb97eb6b00d1683bdcf5c184,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c5feb7c6257bea04105c4e13ea3c01069595a673ba6eaa70dd0e6ffd3af477d3,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,9c015056b101cf6be9fa3cfc8097fdc88a615058bb97eb6b00d1683bdcf5c184,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c5feb7c6257bea04105c4e13ea3c01069595a673ba6eaa70dd0e6ffd3af477d3,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,fd8043af78685af2598e610980184c1b2681c1736b8b1186ddb7de2730905835,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686 189,refs/heads/master,b788888f07da30b9247e17f4167aafc516dba869,bce38083d5cb200193732ef7f47e9c9f47f452b8,4a2ffd2cdd138cf0b122c96cec0157e6e881d674,,True,True,True,74,978,5142.0,4,True,74,Tests_passed,b1f9af9d7a8fbedd5e3d3487269bfbd6a09d892dc603969310d45921529d3aa5,True,Tests_passed,231909e0b9f5678e6d5f8a4b0855618b0f96b07a189ebd40bdc5dc0fc39b816e,True,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9f5de942186ac3283a21c2e4420ed1b1af1025969963c1885229d20e7e8b43ef,Merge_failed,e5dde0a215f02b5e0114f1e81413f7047703586225b2e01755223b20675f813d,Merge_failed,331d1e4195f41091aaea91650cc4f37da1fa858f5a1ab5764fae1aefe7867438,Merge_failed,2c436d39571c06f6fd949fc18bf01b0cc2cb0317b47ea9abe1e76afbd2652a01,Merge_failed,e5dde0a215f02b5e0114f1e81413f7047703586225b2e01755223b20675f813d,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,03f6d3a4a782e25f3b5e6055178ad8d8c241da75f9760cc28c2b38c07f012016,Merge_failed,b7dee64bdd2ae73982c63e688fda809f85a9eef93840802cdc41819e1fdc59a9,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c diff --git a/results/combined/merges_tested/jmurty/java-xmlbuilder.csv b/results/combined/merges_tested/jmurty/java-xmlbuilder.csv index 4c081e0be2..55071d8324 100644 --- a/results/combined/merges_tested/jmurty/java-xmlbuilder.csv +++ b/results/combined/merges_tested/jmurty/java-xmlbuilder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,4ee5f60778e25cc1f762eb5c6f6747ea15354931,de0c78aa839dda06bdfc92fa0eb7aa8af3d8104c,6483a913a5ee3561e8ebe0b23e5716f96eb447fb,,True,False,True,7,55,204,2,True,7,Tests_passed,d04f0ec5d99017403ed35fd42761441d2abbcabd333a4b8f80afdd7e1a34154d,True,Tests_passed,cce0483f078c4fe02f23db8cab1e9b0e2fef8f7fb90d8585dad4b2aba264366f,True,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887 diff --git a/results/combined/merges_tested/jmxtrans/embedded-jmxtrans.csv b/results/combined/merges_tested/jmxtrans/embedded-jmxtrans.csv index 6842e85897..f063932876 100644 --- a/results/combined/merges_tested/jmxtrans/embedded-jmxtrans.csv +++ b/results/combined/merges_tested/jmxtrans/embedded-jmxtrans.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,2266cfcadd9491cea8c5eea1d7c08116ce35471d,4148ed2bc9f8fe8ea4b1595b905669d39b4dfa40,524b8648461b933e02d7e2a8e7f3cd91f9cc0da5,,True,True,True,5,29,210,2,True,5,Tests_passed,fcaa257aca4e29b23958701e9570b2078ebdafa2a4d44423a64642742a312257,True,Tests_passed,c8c9734bdea9c1796f2906014144d0e6d76f6fd044b8aec1515b9e8c42d04e05,True,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_failed,807f0e99c840638f9687e0fba1f5f56fdb97a6a4992165137f3aa50ba6d015a4,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0 diff --git a/results/combined/merges_tested/jmxtrans/jmxtrans-agent.csv b/results/combined/merges_tested/jmxtrans/jmxtrans-agent.csv index 24b6e2d2d4..a1282d47c8 100644 --- a/results/combined/merges_tested/jmxtrans/jmxtrans-agent.csv +++ b/results/combined/merges_tested/jmxtrans/jmxtrans-agent.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,caef360a1fe53b81626bd62aa858b8541272f71c,a32d7743b15af3d88b1f8ec84c161c18b1c038ea,efa75a3bee4c285e8d4f44f974131d653bfeb8b8,,True,True,True,27,75,472,5,True,27,Tests_passed,8f91e9f7907a566717b1f7a91f92e0e5b81e59bc97fc81593fff3931c4c942b8,True,Tests_passed,f21f9756ff5e9556fec1aa4e6c69f1dfe94d7b6dd8782a8dc643c45a454f60d3,True,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,04fdb085d46366b70ae96ab54f39ce9c9585a01d922fb134a9e763af2ceab284,Tests_failed,226c67bfbcff30acb482b15be1033f376b91966a0a674c35749ba9475da764b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,04fdb085d46366b70ae96ab54f39ce9c9585a01d922fb134a9e763af2ceab284,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5 31,refs/heads/master,60e40f2ad4d067e75c9433b56c139e15ba4642f5,50eaacd59890332041d69ac0ede573d96329ed95,59e060ee6566654261084e583b34b0dc1194a6ec,,True,True,True,31,119,1957,4,True,33,Tests_passed,9788efbefcfb3a717e7e765c416dbf05e672d61c3c763e01cda3422676025e6b,True,Tests_passed,fe6fb2c3b34875510b4f9e5057dea4e97995649ec570b5bf00acf0d12e4c0fa6,True,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,5f4f21b4eb3f7d47129a4695ff631f7f17002741b7062b8d48df1016aa747b67,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,808984bd76f665bd17544d1eaca764b2362ea730ef354b05d042b20ad8f58fd6,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,ddc8626547c8dbe75bc49b1b4231f85a2ee75cb930597d67746fc7e2d0726e81,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c 33,refs/heads/master,79a0294ac330946788b98858f0c58692004b33ea,6e208f78f01b06b0a725b3e44379c4314c579a0f,da5878fda7b3033f7a3a246bbc4e11d12bb56acf,,True,True,True,18,74,982,2,True,18,Tests_passed,a09a75e7181a398792921bf25d33e514d0cd45118be8c2dc670ecfc8590e9e6a,True,Tests_passed,ee526316138a00d14466aa6dbc24677d655e98d8ac5e0ac183ed21964dee91b5,True,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,f7971d0f281e03d0e77205058436adf50d705aae615b22ab50219490f4756789,Tests_passed,118a8036e62ce214ef8d17c62a59b6b402148682cf961b5db2026af12e072aba,Tests_passed,4487003c7f42bf6df28d98e0afd6bda8a202fbd0bfdb18c1c71e2407113685c3,Merge_failed,efa987981735d55f3fec64e5bb91adca78bcdfd33f64beaa485634e1a844c18d,Tests_passed,118a8036e62ce214ef8d17c62a59b6b402148682cf961b5db2026af12e072aba,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,4851d22a9c2496cce4530dbe447f0f58c18232886873eb5acf51cf28a74eb27b,Tests_passed,4487003c7f42bf6df28d98e0afd6bda8a202fbd0bfdb18c1c71e2407113685c3,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42 diff --git a/results/combined/merges_tested/jnasmartcardio/jnasmartcardio.csv b/results/combined/merges_tested/jnasmartcardio/jnasmartcardio.csv index b4b7e752b3..129d968df0 100644 --- a/results/combined/merges_tested/jnasmartcardio/jnasmartcardio.csv +++ b/results/combined/merges_tested/jnasmartcardio/jnasmartcardio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/2,d2203a3c4b2373e013348cd1f2c167a8343ee344,2eb297e73a9bfb689da7571f0d5d0dd5fdb0f079,ca033c9d60c34680cf208f7c6eb4cdc59d62eea4,,True,True,Tests_passed,fe86e67eefc50de41a818b5c41ed4bc5cbc7b4317b56d242c678fa24d7c379a2,True,6,50,623,2,True,Tests_passed,24db2423433b76a5166a57598ed69cd1e94d5f6cf314afbee317035000dff892,True,6,True,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,17658ca5ec7d843c7863e5f4c92fc64378540f5b81039c9bcd65abb29e591eb7,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Tests_failed,fea9b7034322e784a7c5263f8086101613ceb89a6c133e5a89adaafd3ea4ade3,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,be4b31cc3dfc9c151d5ada07ad8ccb6571b195f1251a0e1fb3ab491c49b25d6f,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a diff --git a/results/combined/merges_tested/jnr/jnr-enxio.csv b/results/combined/merges_tested/jnr/jnr-enxio.csv index 9e2a44e29b..39d9674618 100644 --- a/results/combined/merges_tested/jnr/jnr-enxio.csv +++ b/results/combined/merges_tested/jnr/jnr-enxio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,06504df5c5e789b3ae946cb938e00c2aa2e78072,c23148ed63fe76f01f16e74720adecc69981f803,7a3a45805cd2b44414df118fd8d21a9606fad2d9,,True,True,True,2,11,61,2,True,2,Tests_passed,a78e5a501c75c5b9a06f5562475d74e5c40a5bb8df8c85e333c4a86352952fb5,True,Tests_passed,e3768f8888ccce91518edf8ea78139163681ff2d99fda57841fe82a1b02fb442,True,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753 diff --git a/results/combined/merges_tested/jnr/jnr-unixsocket.csv b/results/combined/merges_tested/jnr/jnr-unixsocket.csv index 0ad0b7e967..646b36ea3f 100644 --- a/results/combined/merges_tested/jnr/jnr-unixsocket.csv +++ b/results/combined/merges_tested/jnr/jnr-unixsocket.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,7a88525e30a858f886045abf598c4d0580dc204b,bab24354b9d4cbb5583102661f687b737d42b562,56ab72a460fbf41fbd37f460eccd0f890b511903,,True,True,True,23,77,1085,2,True,23,Tests_passed,1d08b86e0f608e27da288fec9aebe0df0f5a2418c39b8854e8a05f68d2e1529c,True,Tests_passed,3695ca94d268f5ab74d3d94f002e11c0efa7621e12eac5980735f6dace017ccc,True,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,5b1d1a95a4c2af507fbb8d776a13b7fe9ed691d3e97fa90c4fa71a5fcc252bc3,Tests_failed,e1109b16f0cf62c17913dce7515ba54c71ceeaca1a2a3cc8436757fc8e4a5ea9,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,5b1d1a95a4c2af507fbb8d776a13b7fe9ed691d3e97fa90c4fa71a5fcc252bc3,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95 25,refs/heads/master,1a75fb81ead63de73cb637dca45353706395fb2f,b13d7e769dc494756ae27c9763530590636ec630,47c0a2aa49646012285b43f87e2ddb02dbe26947,,True,True,True,16,47,1947,3,True,16,Tests_passed,f6a48e08cfbdffaac34c12958f297e5a01309138adbc1b14d1b90b4e1cccf988,True,Tests_passed,e5e9a8041c228a125ed2a30755ab53485bf9f840508695866b5a4182b12e97be,True,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,fee0305723caed464b14ce9a1e6729cdd9500d63df0e3da068e9242782d559dd,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,a53c3f8d3d3352b2215263c988e77250139f75875def88ebb142f5071d7c8b35,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,29585878e74243d3a6f8e4a74753246bdc8d8c71c269e0c582f19614a1fe33fc,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216 35,refs/heads/master,7d8d10cc2c47723df19342af5f929782978081a7,33814339736805543ff5bd4be863c6489622283e,7635fdee121cfc2e8b3f0d6757401b919873a88a,,True,True,True,11,22,311,2,True,11,Tests_passed,8af7bb523009ccbd31696ea7598330cefb4cd7621c7361930e890e5fc7923c1f,True,Tests_passed,13ed23ad95724e079d8fb6bc6e4c83baf9ae7d9a338fcdb4fe70969e1acc93d4,True,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,04268779eac6a4f83b7c45291b26ff18f158e8041b487b7ddc438d85fc64fda8,Tests_failed,56881a0cbe34a12b6242b5d4b7824b3b4967ac3af4790eb1e625fdd12c4e71f7,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,04268779eac6a4f83b7c45291b26ff18f158e8041b487b7ddc438d85fc64fda8,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650 diff --git a/results/combined/merges_tested/joaoarthurbm/designwizard.csv b/results/combined/merges_tested/joaoarthurbm/designwizard.csv index da4ff5e952..2b94ef6d92 100644 --- a/results/combined/merges_tested/joaoarthurbm/designwizard.csv +++ b/results/combined/merges_tested/joaoarthurbm/designwizard.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,662a073a370b6ceeac9ccc052db9ee6d9a64ec1c,3b4bffa8d3eac2c7b5e712ff8037f534ecce3a3c,70c5e4cd47195d5679af62471cb41a2e5ab7771e,,True,True,True,32,668,2110.0,5,True,32,Tests_passed,283db25eb4d71fe9e18f3dcaf247e99f6ff22e421706abae2f0f23005161df06,True,Tests_passed,a277fd1b18f0097962ecc4df68f8b86d4b6b45a6152df4d65117073674f61e0d,True,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,ef545175bcb92557f9245458e62668631a525b54cf7c1ef25b4feb631d010dbe,Merge_failed,890343139736cbc49e71f968ad330032035b5ef5be732d399a720a6d02a59295,Merge_failed,b13ef5a38ad9ec64083aab9e6281ab318f24bf1da690b4875b8e5ea3316ddbae,Tests_failed,76b498d825e5b4dd0e810eab1fa22e33953153e5545a66c06e59e609e5f4f9f8,Merge_failed,890343139736cbc49e71f968ad330032035b5ef5be732d399a720a6d02a59295,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,2f35b494746113e6d4c5b5901371d8f056c61b44b053a8c4928beb6379674afe,Merge_failed,b13ef5a38ad9ec64083aab9e6281ab318f24bf1da690b4875b8e5ea3316ddbae,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8 8,refs/heads/master,58fcd555cc6909bb7ca3df27d277600d8c871a81,dc838e11ebd5703f3b6f9506291d6f8f7f2e1f48,1cad83c5ea89ea295fcd6b3019bf095f05dea38c,,True,True,True,32,682,2444.0,6,True,33,Tests_passed,2cc66e406f85207dfb76a2b85fff5474fe37b2330c35f99b0b479e28b9866701,True,Tests_passed,b64c099bef0bed2dd66aea9472ad9a462f4e580cd526cbae3b31fe9543d3c781,True,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,238b73373d281b1a2b1328af800a414dfbad7d08419b0863178608d02f9a9a2b,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,21679d53d2ef46adf438acb79fc7b47162ede579b05778f1253a20c0ccf40eee,Merge_failed,b8d84e4711cbab02bca054b3d3c5f6f896da49ea1a8a4a9386bafc6e0d0d9cf2,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,625488361164c108b584102b6e9fb9f70c26fded33286b7eda63c25fd28e03ae,Merge_failed,818b36bb19a588e61e0301801dfdf668c5f22cc0048c0b091663350aa24f29d5,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667 11,refs/heads/master,779483e0076fe0337b9e974f12c06390cd794323,b120a990b621a7be7c3f43bd7f612c53339b834a,6f988643c62dd01a7ee80939f07d5e70487a347c,,True,True,True,16,24,246.0,2,True,16,Tests_passed,2c7e7592103b9e165bea346007af502a3f6df2f2a08fa33f91da409ad244195e,True,Tests_passed,1c339ab2a63c933de60674a6b4dcb01769d6c560f9f65bffd058ad30ad515ba6,True,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,5e030893366aea4035c982d8c69e369e12bbcb530b76607b2372b2846c05b9d2,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,5e030893366aea4035c982d8c69e369e12bbcb530b76607b2372b2846c05b9d2,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15 diff --git a/results/combined/merges_tested/jodaorg/joda-beans.csv b/results/combined/merges_tested/jodaorg/joda-beans.csv index 5541872e16..4c4100f0c4 100644 --- a/results/combined/merges_tested/jodaorg/joda-beans.csv +++ b/results/combined/merges_tested/jodaorg/joda-beans.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/main,25ca6227b8dc848d9b4c9a6911aafc28c79a3f56,54413184168acc35ad5b923d9769c3bd568eff72,9a397f74453bf131a7248126212bf104d2c40183,,True,True,Tests_passed,753ad96de921c9dcd311363f4f8d930bb4eae56fb672045ef4b2bf0b337093a5,True,41,80,1576,8,True,Tests_passed,0804514d7c459a0c9254d9737d0b51461854153c617a82dc9a7a1e37a9492d32,True,41,True,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,c8db1aa4b114ec6c48c6884cfa1367996ebd6cebd46d2dac7d23cd9425ca1ca9,Merge_failed,8ea10175958dbb2b0f0f39380865714a5381d69af16d3b9dfb876a3ac1bce550,Merge_failed,2b00f2536881c789e5cf82e70074cd9cc677457295b4a845037fb4198ebae5e1,Merge_failed,6b2272542f65a5b41368b450ea0902e2f5bbc37fe6aa118e2d2d9c2b4bafe3bb,Merge_failed,8ea10175958dbb2b0f0f39380865714a5381d69af16d3b9dfb876a3ac1bce550,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,4d205fd4a73c8a83263ea7b87624a60f247555271b957a4efd61aa381cf9e0eb,Merge_failed,7ad3e326db71fdc7e7aef20ab17e8fa2e237c79f31a1672f799f2f1fe4c80eb6,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501 14,refs/remotes/origin/pull/212,dec9b88627fa8e7ff0b7804a22cb5cf594dbe7df,dc23f43d5e28cfe4ea9acd7e45e2bdb85556d4c4,5f44ff767131606cda6135a13f25c4816623a558,,True,True,Tests_passed,364df857cee01a24477a12059a69b1f0ba58b4d25dc681b790083baf82decf67,True,51,124,3308,5,True,Tests_passed,270a8129d623eb08b47281cded7e46d7b9751d44418092bb6802da065b2603a0,True,51,True,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_failed,044b6a17158f239f9fa88cf6fa2a81c3c14ff677b7ad0d55eabd345a6b73cf2e,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995 diff --git a/results/combined/merges_tested/jodastephen/property-alliance.csv b/results/combined/merges_tested/jodastephen/property-alliance.csv index 7d752139cd..01243b3337 100644 --- a/results/combined/merges_tested/jodastephen/property-alliance.csv +++ b/results/combined/merges_tested/jodastephen/property-alliance.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,13848ab05df1997879b886e6488fba6265cc8233,5d2861df97016960d3c2ec09bbde50a30cc2e0c0,7d9b6dd776dd981d0d7dcba883e40358b860b85c,,True,True,True,11,21,1025,3,True,11,Tests_passed,c3df6d211dddacb99be8f62152b6adcc5e1d76d73a9207a2fdc958da99129880,True,Tests_passed,a70f0d0b3c55fda89f2d14f11dd80ff1732c8e957fd7be4ce92abf056509920c,True,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,548004e55d23183642065b03309a94c8e7c00dbdf0e130440b27b6d58f284da2,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37 diff --git a/results/combined/merges_tested/joel-costigliola/assertj-assertions-generator.csv b/results/combined/merges_tested/joel-costigliola/assertj-assertions-generator.csv index 5aa2b16680..02c339f895 100644 --- a/results/combined/merges_tested/joel-costigliola/assertj-assertions-generator.csv +++ b/results/combined/merges_tested/joel-costigliola/assertj-assertions-generator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,e9c59be58d0f5f8598375f4031f5f06ac0f1cdcc,110502e40c6e85333a4c6e5161f35f0757e8c493,535559c9286c16ac8f356676bcecf8a3392f9022,,True,True,Tests_passed,c2206d168feee7de6ad83adfe0ed8d09893fa9d9f3c4d2fac4b6f6c6c47c4f0a,True,45,217,1683,9,True,Tests_passed,64d33d228f278c8174aaf4b491d897899d579952a0c1fe5b95bc96c52630bd64,True,45,True,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,7fb5dd686136165029f9a0e90ebe613e176283615077cf03b245ca3038ee364f,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,70aac63c47daf47648143432243c279abc30e2d8d8bcd576385b55e17aae0534,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,137a949ec8361fca3c6eab637e16c540ef09f7d978bde9eb1490321b2b58e3f1,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9 diff --git a/results/combined/merges_tested/joel-costigliola/assertj-core.csv b/results/combined/merges_tested/joel-costigliola/assertj-core.csv index fe03b0d881..67068ebdde 100644 --- a/results/combined/merges_tested/joel-costigliola/assertj-core.csv +++ b/results/combined/merges_tested/joel-costigliola/assertj-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/main,30d3049359fc8a4cbd2932bebc3b238a7338b8ca,f63c0c1b2ce21951697b1a9b47f214f4e1a8b5ff,a2d13c4a3f88f58e95ac894e113c2192263df150,,True,True,Tests_passed,695a224e70dd817606cbcf6526082028c94a3ab69bfb8344060bc2909ad10371,True,40,182,1400,19,True,Tests_passed,b94fe176594da209508a183b461c4dfde742ee12ed8e3c78554353db8c07ef2c,True,52,True,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,322a4bc0257bc589519d9444284fcc5156b070725f1629fca476685bf04ce1a6,Merge_failed,ebd2fc878276d825514210b5bfbb41b0ef1ca09ca4e506b3ae706edc1c1c2d70,Tests_passed,48e8424a7645fc2c250a17f5fd3d106687bbeba5804b5927722baffb210b8c5b,Tests_failed,9c12411d7d2811c55e814524d10504430f4d6ffc78f618f9667804300eae38eb,Merge_failed,ebd2fc878276d825514210b5bfbb41b0ef1ca09ca4e506b3ae706edc1c1c2d70,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,ac550c6e0210ebdf35ce20976a0a285b133a526e1d95bfc4cec5b3bd8d29c718,Tests_passed,48e8424a7645fc2c250a17f5fd3d106687bbeba5804b5927722baffb210b8c5b,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771 12,refs/heads/main,6e98947d7295414f753f05fd251878ba7277bdb1,f863672644cba48fcc3f6eeec3d3011436087754,0bd42599f5aab6ed0a0b4f3e86a4ae3a48554d00,,True,True,Tests_passed,143cb1ba4ea0a27cbd6b525a3b76d1928a1b26c90782584bea350634d06c844a,True,739,2895,51401,34,True,Tests_passed,89c631f43249551601e9a602219ce75012988ce134605bc7ef4efed53a4df6dc,True,748,True,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,7fa6b64fdd6e3c87b9f69c9cd16ad90ae5cd476e40c585c71e01a60ca9e37db0,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,9b2d8d77dede638b3d7686e79999e20bc9858d4470bdac9bd3ddfba714249883,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,303059e918fc1ecbea3b94ef19959d5e9cca4f7a69c84767eabb55b0eeb28178,Merge_failed,0928ca8e30d02e5684539f76821a5795edc12907c703cb78cddeed2530b7d202,Merge_failed,b461bd516b24cd76d0ce7a6d70fc2d6a89a1cad44b59248e9ecd1306e85fdbce,Merge_failed,f74d01d8b0a5122b3225b314e775b6f10013390545920a4f079071dbeb3c1390,Merge_failed,ae2a18da30e322265359428b773f6281a7c8a47615bd087a151599236be0f874,Merge_failed,12c8dc469698796e46a369592b0ee9f261ce9093874c17819d1f3e208db68f74,Merge_failed,f74d01d8b0a5122b3225b314e775b6f10013390545920a4f079071dbeb3c1390,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,9b2d8d77dede638b3d7686e79999e20bc9858d4470bdac9bd3ddfba714249883,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,303059e918fc1ecbea3b94ef19959d5e9cca4f7a69c84767eabb55b0eeb28178,Merge_failed,0928ca8e30d02e5684539f76821a5795edc12907c703cb78cddeed2530b7d202,Merge_failed,d640b9e60c9e21a91a105f4f6aa0ab811de041007ed4fb6864767bb53bbb913c,Merge_failed,ae2a18da30e322265359428b773f6281a7c8a47615bd087a151599236be0f874,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,7fa6b64fdd6e3c87b9f69c9cd16ad90ae5cd476e40c585c71e01a60ca9e37db0,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294 16,refs/heads/main,15cbb306b6a162438dead6e432ff75f52ec03c22,ce5a93c1161b9fa95a44ab1175556d12238a0e61,9621390b0251b4a1b64984b5db1fb423d84626fc,,True,True,Tests_passed,c6912d051f85e9c8c232f712eab096db21cf56fa466e0cea5243b2369edde600,True,472,1307,37873,7,True,Tests_passed,dbb382761b6dea2c455abf0ceb5bd2c8f1977ad3d807cb63ddeda1e3bee4b020,True,474,True,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,c479f62b4a18f9c42b2ec7317b06b422aa04a73718cd3623894d06a651bffba5,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,7ededf60a84bd98168e3e3c3dc17ee36a24a21ea6d6f3bafdaac6059daee213b,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,8cd2ab75776b99a2d0b65081706228adc7b7090aed99c1516f4929e8254da420,Merge_failed,29c22f8d45a41e72863a5f860921482e2f073e9eacdf02e5041c3c70314ecfc0,Merge_failed,669c9f29f68fe35925598e38baa6453a43596c54e898628882c368758b5f3d04,Tests_failed,81109c0f5efddfea10f30879335133ef3295f94e8079058976f8b6f9da95f54b,Merge_failed,29c22f8d45a41e72863a5f860921482e2f073e9eacdf02e5041c3c70314ecfc0,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,7ededf60a84bd98168e3e3c3dc17ee36a24a21ea6d6f3bafdaac6059daee213b,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,66eb48fb96adc9825b4bd2a9f2aeb93f7490157505dfa598c773d9d99555f6f3,Merge_failed,669c9f29f68fe35925598e38baa6453a43596c54e898628882c368758b5f3d04,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,c479f62b4a18f9c42b2ec7317b06b422aa04a73718cd3623894d06a651bffba5,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e diff --git a/results/combined/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv b/results/combined/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv index 90fc150c25..61ef540661 100644 --- a/results/combined/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv +++ b/results/combined/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,e407eb6955fe9325b7b0c2ce4069e7d640c1cf81,f451b3a5c0d067c8341ca9d73d9c38c45a457cf9,d596ee43d3f18a8b46fa38218a9d2592e606c265,,True,True,True,20,58,1402,4,True,20,Tests_passed,d358cb0059aab155c1bb2cf22761b4f139c0434b4a44d61a541024f259994a06,True,Tests_passed,9babcde81773aa2f18c88f90dca876bb0816b1fb74e3d55d1018b39e0b4d4bdd,True,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,0e17d920d4ba2e00fa22b61f44dab5b0f3f79155b18969f5bdae927e08828ce8,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,478477a436f10235c2726ad7129569b6c2658644824786b712f3a2351bc6b364,Merge_failed,3b5d398417141e86619ab7b8f2e1a136c9f7598460b9411c9a942014b9f89bf6,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,fe3981f9b3044013f2c7a6db2a30136857dfe8b5ae64f474fe665c840d944914,Merge_failed,c3d9e9552e39f01471eee66043c11af46cfc6f508af5b4fed147f891c238a31d,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84 diff --git a/results/combined/merges_tested/johncarl81/parceler.csv b/results/combined/merges_tested/johncarl81/parceler.csv index 62feb3d83b..58e06f4f40 100644 --- a/results/combined/merges_tested/johncarl81/parceler.csv +++ b/results/combined/merges_tested/johncarl81/parceler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,True,13,54,251,3,True,14,Tests_passed,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,True,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4 diff --git a/results/combined/merges_tested/johnnei/javatorrent.csv b/results/combined/merges_tested/johnnei/javatorrent.csv index f94e7006cc..c7c4285551 100644 --- a/results/combined/merges_tested/johnnei/javatorrent.csv +++ b/results/combined/merges_tested/johnnei/javatorrent.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/develop,3e2e076b0d94417e7a92f6e1f861ab06696dbaba,2fbad48779e19f1ce23c2d60097cdb2fed19ac89,effadbf711ec7d523c87d62deca64528d61c0fc8,,True,True,True,95,181,8627,2,True,95,Tests_passed,3e2e08cebda51e66bb9f926d48ba36fbf4e02cabf33b513bc07fa050393f495e,True,Tests_passed,ef0432d0e74301e6e414e666645e9bd449e9bbbd8285c883ee16eba53c4bc7c5,True,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_failed,d94eebf7d1ceca05b3c930321c6286b01ffbc1623cda7537ac8e00e0ddcff48f,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38 diff --git a/results/combined/merges_tested/jooq/jooq.csv b/results/combined/merges_tested/jooq/jooq.csv index 6197a53fb4..0b74f7e75c 100644 --- a/results/combined/merges_tested/jooq/jooq.csv +++ b/results/combined/merges_tested/jooq/jooq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,True,116,417,3453,3,True,116,Tests_passed,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,True,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e 48,refs/heads/main,db1d75b28875324a15635b91642f52cdb4f6c538,b393fdd738250b2823675610637f5de6d6c266a2,fbdc70e0a0a9a22365f06bbe303c44be9e8c3375,,True,True,True,5,9,21,2,True,5,Tests_passed,5664306aded0070b41ae0370b035351de5668a264e3efa101d62b9068a4ce64d,True,Tests_passed,227c6cca669c72ad5c7fe86bec51cd538ea5a1b466d1b10bf52d3f7bc6bdef80,True,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,1612631646382eb341a14ec19c705600d98b74e26273542cea7bcae5a2206fbf,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,1612631646382eb341a14ec19c705600d98b74e26273542cea7bcae5a2206fbf,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690 60,refs/heads/main,df390cf9197813feb048902e9dedde61fb01931b,f5004522d6823885103365b39788ccc25c603314,8767b8014d1beaee87f4e90ed5ce3f4ce10c8525,,True,True,True,41,219,2416,2,True,42,Tests_passed,8fb7378fb29f3257782c278bc1b25eaf1d45a8821dec4a838824b9d8f9fe7f74,True,Tests_passed,e003554a9b0de037e8016b28297cd8aeb0144752ff536868f90dce0911a1b5ca,True,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,2c9bc315fb7b7e6fef008fe42274345317da0f86b1169ca9bb7c313d939c9bdc,Merge_timedout,,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,2c9bc315fb7b7e6fef008fe42274345317da0f86b1169ca9bb7c313d939c9bdc,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156 diff --git a/results/combined/merges_tested/joschi/dropwizard-elasticsearch.csv b/results/combined/merges_tested/joschi/dropwizard-elasticsearch.csv index 85b7fc1e57..9b62f6bd06 100644 --- a/results/combined/merges_tested/joschi/dropwizard-elasticsearch.csv +++ b/results/combined/merges_tested/joschi/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,True,13,58,227,5,True,13,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,8729ab01b1e90354062f83345c81759c7f3964f739d46f873bc093fc3c310041,Merge_failed,b5bec5ff58eaf8910fef70949a53df1a55bb44112fa4f0ac6a6f83700add1cda,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08 diff --git a/results/combined/merges_tested/joschi/dropwizard-flyway.csv b/results/combined/merges_tested/joschi/dropwizard-flyway.csv index 2785e0c319..3d05d11648 100644 --- a/results/combined/merges_tested/joschi/dropwizard-flyway.csv +++ b/results/combined/merges_tested/joschi/dropwizard-flyway.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,True,8,90,644,2,True,8,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,dc4bb85afa09aeafe1c3af45d21d3a270f4a97526f6440c05ee2444355c4e8aa,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4 diff --git a/results/combined/merges_tested/joshlong/spring-birt.csv b/results/combined/merges_tested/joshlong/spring-birt.csv index 289cdd716b..5d690062e3 100644 --- a/results/combined/merges_tested/joshlong/spring-birt.csv +++ b/results/combined/merges_tested/joshlong/spring-birt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f38e819c4a81bcc9f55b6496c7c9a8728d550694,e674445485360c05639371647a788352f3eaa9bc,dfe261e1b7b69475d706f5e0a6a56a50dc8856b8,,True,True,Tests_passed,7d079ce21ab7fae3260104e45fcd5daf8b0e974d9a22dd26ff5331319f9dfdf2,True,19,228,1143,2,True,Tests_passed,2bf2e5ac6c9cd6c29d2ae9d1e8d3d76a3b9c3631e40d2739bc6f4ff3fd7a4e0b,True,19,True,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,a2ee21b8abdbcd112f92e9324654b06d78ae5581f26f35162f7bcf71e6e9c49f,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,69fdb942705e10523af4b0415a584d6cb8f0139d0e916f6ef460b5474f1dbfb4,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,3a36802c3206a1cb1d2ba0c8c45a124afffda2ae8755771b2ced5ab6bb23876a,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197 diff --git a/results/combined/merges_tested/joyent/java-manta.csv b/results/combined/merges_tested/joyent/java-manta.csv index f5897dda1e..c27b33702a 100644 --- a/results/combined/merges_tested/joyent/java-manta.csv +++ b/results/combined/merges_tested/joyent/java-manta.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,19cdd7a14f9d79769b5668da7e1f052cd24d65c9,53019b8795b9a8616360b961a1f45f631e9ce84f,56387371e05cf163ec433d22943ad7804365aa59,,True,False,True,13.0,37,100.0,2,True,13,Tests_passed,fef02496655e86d2da6e9df26239f0d2470ce2c038e9795a121d2fd5b7e3d231,True,Tests_passed,fc032044c7fcebd09a3e5947f3fa39610a24b59a87a6f7f658d86ba25412829c,True,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,a15fc40672d9eb39b6fde67e5698af38d861e92b762adcf4f9a65cac11581338,Tests_failed,5dd3fb6d47804e59c8885cb1d3772bd485235069db651d7505857bdadc136135,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,a15fc40672d9eb39b6fde67e5698af38d861e92b762adcf4f9a65cac11581338,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7 32,refs/heads/master,a8acac994ab4323915b73e6d5f7ca37e1d61b948,c8becf4a150e972bc461c6edb25ed69487a51fdc,cc475c6604c41d615d0410e7c89fd6ba1d12fb6f,,True,True,True,8.0,30,188.0,2,True,8,Tests_passed,ef4e0310f7cc3078bf14b4e5d0798610781ef003be7153998dac3bffba17e04a,True,Tests_passed,ad2df02d367881e340e60965e96a273af826f342316381c6803fe2e932072f64,True,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_failed,acebc4a080b5b41565d792b422927f49902034f44917fedae7cb4bc77bfe0262,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_failed,acebc4a080b5b41565d792b422927f49902034f44917fedae7cb4bc77bfe0262,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc 52,refs/heads/master,6d4df92818e5f613a2c1e6c088c6d6323cb93a69,46e9907f82f8f5bd0356772fe05b54fe5e9d0c45,15ce2f464ce54cdd871802651d6a82d3fde8c0a6,,True,True,True,3.0,9,57.0,2,True,3,Tests_passed,a17405945d5701bb9479fb573af102665675ffac7d8057dccd8e08278d4d056c,True,Tests_passed,cda8d0a41174bdb6522e3f651d0f1f9bf32f8b77649972880ba73701f0aeb19f,True,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_failed,eab220a3f557cc872e03485bb0cde2cb701b77278832c924944cebfb57b2c3c6,Tests_failed,efbdff6664b1d4aa98188beaea962a90534ca6321d01a0f2eb5971452bd25bf9,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_failed,eab220a3f557cc872e03485bb0cde2cb701b77278832c924944cebfb57b2c3c6,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770 diff --git a/results/combined/merges_tested/jparsec/jparsec.csv b/results/combined/merges_tested/jparsec/jparsec.csv index afdf6ad526..665dad3478 100644 --- a/results/combined/merges_tested/jparsec/jparsec.csv +++ b/results/combined/merges_tested/jparsec/jparsec.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,a1fac0af65c9c4a5735633c8df920f23df7b4130,c750ed52ba684e9f29eb3412cb6e5a08e45d673b,352ad7c2a3b94783a4d778b4246b381fc36f94a8,,True,True,True,18,41,352,2,True,18,Tests_passed,63bf67eeeda462ffca0a1735bc41a4aba09dcd702d7545fb34e1ca78e2166574,True,Tests_passed,0b984ce5636bcb6920a64463b90546a3a6fb171ba9f8381e86f5123e6d391b36,True,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,edbe0f3984986c2ff21a57cf26bc127295d4b532d7cb3065225bd66833ed9e65,Tests_failed,d4f233ca84302fac26f674fb5106939df56dc42f8a0fa870eafed6936dee2aa2,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,edbe0f3984986c2ff21a57cf26bc127295d4b532d7cb3065225bd66833ed9e65,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f 39,refs/remotes/origin/5-locatable,ef02642abd641e654abd504ed36a5eb1571ec40c,9b2be3d78619d74c8a1fd38c4b28b8fc775fcef5,b534848cf79d4a1341deb27d25fc3ce48670c806,,True,True,True,8,7,361,2,True,8,Tests_passed,051cb138152af5d962dd02d6ecc3ed55b4e8d41868f57c000bf9154ae716a9d2,True,Tests_passed,7d65e9fd34405cb14c1788039c0b3075397de4e484096d9a1f801878d34c8025,True,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,d25febc0f0d9f4e8ac50f7f84d312a3d97a0086622c9c91be37f4d24a1a9d589,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,93591f74d0167cdf2b24adedb6cd85b23084eb3178dcb3096ca253ae9ae90524,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,8f246a1130d75852297bf4695b7e03f852ab0ad6af8747dcbb3f0da4035d9d08,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0 diff --git a/results/combined/merges_tested/jpmml/openscoring.csv b/results/combined/merges_tested/jpmml/openscoring.csv index ce4734ddb1..c359ca33a4 100644 --- a/results/combined/merges_tested/jpmml/openscoring.csv +++ b/results/combined/merges_tested/jpmml/openscoring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9aca0c7a8409f3888295b16cc03a74d8def3ed21,f48b5593a16f6a011c30dbf61f9c083482ffe87e,6342ffd5c7e700aa10844e929e6a3c09f4f38a52,,True,True,True,57,379,3131,8,True,57,Tests_passed,637eed99e1949b6725d40fa7360000b465447614bebdf565dbb6a509560e1e45,True,Tests_passed,3d2386a845e132073aa35bbc589bc23f557f62b4a3f753c8ab3746cdc8325ed0,True,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,07c7b44947fe22b137a6090a70c4510439cfb6da1dd0965ec8abb25675224b75,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,21b45635b8f292576b725e53ea4b7ea7d856bb5508ce09ca56810d981aaeb962,Merge_timedout,,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,b319f9fc46ae7554ba667350227b2a00e864affb278eaa3c3ecc523969f12b2a,Merge_failed,2d5cee7f0bd78d1d054121f48489834f873329eed903e650e70edf1e542f9499,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba diff --git a/results/combined/merges_tested/jprante/elasticsearch-csv.csv b/results/combined/merges_tested/jprante/elasticsearch-csv.csv index a7755e91db..fd26f5ec40 100644 --- a/results/combined/merges_tested/jprante/elasticsearch-csv.csv +++ b/results/combined/merges_tested/jprante/elasticsearch-csv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,a9ee7a06511f64b14b8c6dee08fe5f5849907926,f3ac07cb6f993e56be141dee1ee46036b7413b1e,e3eda9922e5f1698c37829530ca39e151c98f76c,,True,False,Tests_passed,4467b8d3d7eb88bce8a1391a53d70e1fb90d9e258eb03605d7762a7532ded7eb,True,5,7,11,3,True,Tests_passed,2315f7074a9a080560e77d53988006bb2f4ee1755762ab80e883725dff41725d,True,5,True,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,243ccd4aa5a664da7b80424fe45c0414097e06098e6f18dda0a9c595c711de67,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Tests_failed,0cd9aa627b1e691826f26d76de5f034861bf05785b427d1642a08b15b20565e9,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,e6f73d65451368d2b91af83b4e8c36dbbaf9c524190863d37b493c00d318731b,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36 diff --git a/results/combined/merges_tested/jqm4gwt/jqm4gwt.csv b/results/combined/merges_tested/jqm4gwt/jqm4gwt.csv index 00592a916a..9912892c9e 100644 --- a/results/combined/merges_tested/jqm4gwt/jqm4gwt.csv +++ b/results/combined/merges_tested/jqm4gwt/jqm4gwt.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5d69eb0c67f1964835f082cfaffec4da5ca60067,b3da51013cf0016af78a7cb0128e54dbdba5234b,f21545ac9a2db611ba3f4f401de2188cd1503f8d,,True,True,True,61,175,500,54,True,61,Tests_passed,443238e8112b152b3c4029aeac3c64fcdc169bd7a24dcc0c18e76b78171a374d,True,Tests_passed,aa6cb3053ef7d33876ff547a44fe48daa24ba586a8b024ed2a2bc612bd8ddb99,True,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,b05af6f44192fb656de1ba546dc84bea315cb6a4748f98e27084391d022314c5,Merge_failed,d4ea408ae8ecc311330cf3dd7b2843a4eae9b45f90dadd2f593f5dbc35f2cb5e,Merge_failed,1e39e6f9d3d98cebe3e05e56ac4223246db44704dafaf3412c43ae7c99abebc5,Merge_timedout,,Merge_failed,d4ea408ae8ecc311330cf3dd7b2843a4eae9b45f90dadd2f593f5dbc35f2cb5e,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,09f1f03a888e30458d7e138b6dc21b7236fd16da60b134b6443b925a2471fad9,Merge_failed,1e39e6f9d3d98cebe3e05e56ac4223246db44704dafaf3412c43ae7c99abebc5,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6 14,refs/heads/master,284907eaffb2061f44cdc7ec3be5cb05209850c9,1b17ddfa476505081e744f1cb1f78cda70c9ceeb,2a44c1c8135d26511a30a1dab51c8c3d3d60a02d,,True,True,True,61,147,8302,2,True,61,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,True,Tests_passed,db043c9457a77ff6b119ec2cd8fc9c489df94721c82d8d0744fe28c460914676,True,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,d41468b842f272e98d531c973579f559f4e609f03f101eee874e398fb32750af,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_timedout,,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,661d83f1316957b4afed90c460475a9e4a012c483bfb9724823f2920ee90c83c,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382 diff --git a/results/combined/merges_tested/jqno/equalsverifier.csv b/results/combined/merges_tested/jqno/equalsverifier.csv index 73f143930d..45fb60ff46 100644 --- a/results/combined/merges_tested/jqno/equalsverifier.csv +++ b/results/combined/merges_tested/jqno/equalsverifier.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 173,refs/heads/main,df016c4c5b205bf4bf04d73a41a0e51adeff84b3,164ae921af8c96fb85642317a081b4c6552e0e75,6d6383193921b3deda63c5c8430b59dcdc6a5f54,,True,True,True,21,43,101,2,True,21,Tests_passed,71c6914be3e3140555433ca2d0acf85270cdb46fe6a7f41df206d87c8ecee5b8,True,Tests_passed,99921378ea305b2a22258bc89d12a83a2c2984224acc545ec253da48ee250312,True,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,77a46c3a55f273abc1a78abc5a4ff00149026987565e7b55bba8e5d7e72a03a5,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Tests_failed,e2869bcc2d62dd9a2840f62982c7ff5fe5f02a974c6fefb6a1757dfdab4a242e,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,3a717ec242511e46c27618c68d02dd37872c328e1e05ca69a00b0f3d2b38abf1,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794 diff --git a/results/combined/merges_tested/jreijn/spring-comparing-template-engines.csv b/results/combined/merges_tested/jreijn/spring-comparing-template-engines.csv index 32e7ed48d1..03bdf50558 100644 --- a/results/combined/merges_tested/jreijn/spring-comparing-template-engines.csv +++ b/results/combined/merges_tested/jreijn/spring-comparing-template-engines.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 111,refs/remotes/origin/pull/64,89bd8bbc91c308af280811d25d63e2bfed0d2532,06eb1edc6811e45008478a8e30067f6e81621117,19ddeaa2c9d11e77d34ec03a255d8c3ae5c8697f,,True,True,True,17,51,368,9,True,19,Tests_passed,795512627562890affefee1d5722c1225b1dbe335e8787f4b328e1e61abe56a4,True,Tests_passed,cef906cd3b5033d6a8e803861d5d6282e3aaa188d35b66b5a3d6cb3de15b9c47,True,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,71aa85f2bb4bf235192ebd84e02448092005e519fb1396cf2fe03b120d2bb52f,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,c7c0c985c420e2d01590fcac07b00379fee2d05b51cb9b38b69b49593b2a4566,Merge_failed,4d64ef7697294fec60e297873d3ba98d92498e99a63f6eb04ed94b051b015066,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,e59f12226223423f0a09de72ab65bc1bf488f983979b4829664254d768809d82,Merge_failed,6831fd12a89ebbf97fcb963b845f0a713d0a12094d366bc86396644b4880e22b,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9 diff --git a/results/combined/merges_tested/jri/deepamehta.csv b/results/combined/merges_tested/jri/deepamehta.csv index 40efa57c58..b6e9bf08c1 100644 --- a/results/combined/merges_tested/jri/deepamehta.csv +++ b/results/combined/merges_tested/jri/deepamehta.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,c5130b2c869d299a7e7c81baf5d0abf292dc93a1,a15b9099b354d8d074290215378f8bb9377a17bf,ed3687fa9fe9bf68aaffcb7a1c4262e709183323,,True,True,True,28,150,714,4,True,28,Tests_passed,6774172c367b09125757cb1bc264136f30b152d55dc9acf8388a9376921c1ac6,True,Tests_passed,bf6c2f47c931f623d865d2caa99650716f332e64d1f35faa2653bc5f7ef0aa50,True,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,af3998228bf4705f436f501c6d95359c34b64d3d69308f39bcf4dbabc4b86978,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,af3998228bf4705f436f501c6d95359c34b64d3d69308f39bcf4dbabc4b86978,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615 18,refs/heads/master,f2d36924c5aac051ecee774f1d90cf9beb885fa7,af08ad3cdf0bfb8e281abc557c9acb495fb39847,1e6a45d4aefd5db0a8fd51eb164bf0c113a2ef48,,True,True,True,42,188,1027,4,True,43,Tests_passed,af277ecaa094572086413ef9d2cd9c7277dea3262b12ce35dabfad6d75ff52b3,True,Tests_passed,19cada8a18d97ff2b210c63268e1eb07159e8ccf5f2c9d2af36bc74248f3632d,True,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,42b73962693f3f3189b09b13a3eda8142c4a009eaa4f2a77527ba25c300770b2,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,42b73962693f3f3189b09b13a3eda8142c4a009eaa4f2a77527ba25c300770b2,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934 22,refs/heads/master,6227095b02e7a8eecccfd9811e4ff4af180649f9,21c1c51ff14d1ec94e08827fcb5adbacbf420c10,b71616cb7ea32fbbe68009c2bf9c0cda430768f2,,True,True,True,12,40,151,2,True,12,Tests_passed,b1b39465f7a433c77fe9a61f3109cde6aecd2d9540d5a900fa4fb5d253d25e06,True,Tests_passed,626c4dc1d13e9f0f8925a7dcd242096f72776b65dbd3e44c34a4effa5ea9c7df,True,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,356f4fdd35b3166c04d187c13b08d63a65cd65ab8ca04e80c455830c611adcfa,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,356f4fdd35b3166c04d187c13b08d63a65cd65ab8ca04e80c455830c611adcfa,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3 diff --git a/results/combined/merges_tested/jruby/bytelist.csv b/results/combined/merges_tested/jruby/bytelist.csv index 24377a0f05..c5a5ecaaa8 100644 --- a/results/combined/merges_tested/jruby/bytelist.csv +++ b/results/combined/merges_tested/jruby/bytelist.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,989a36efd082324597ae190e1be02e9c837967e3,df4f174f506935be80d1bc15c984ab09d011e6cd,eaf546b696f5fb1a31584305e7da2e9a9b683bf4,,True,False,Tests_passed,a1fd5a0ff5ccbf1339ab26a2440bec50e0e8fd8aeaf96159f9af84ac9198b135,True,3,12,106,3,True,Tests_passed,402174b94029655e07ba85f2ddd4c625384a6025571a187bb2482b128b02ab0d,True,3,True,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d diff --git a/results/combined/merges_tested/jruby/jruby-parser.csv b/results/combined/merges_tested/jruby/jruby-parser.csv index 3a92359068..3b21bdc7cd 100644 --- a/results/combined/merges_tested/jruby/jruby-parser.csv +++ b/results/combined/merges_tested/jruby/jruby-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,e6dae92cd4c87841431cbdfeffa34a4e05f3a2d9,d4c91601649b26088348218596017088bd8f2c5e,9a27caa9a5e5d5075b0559e2b91a138dfcd941f9,,True,True,True,21.0,1295,20385.0,4,True,21,Tests_passed,846f17401eeb20b1d6f452673bf0951d791de9a16c7202ba3162259b93bb2b54,True,Tests_passed,eefd921b5a64084a7e2d5a003b87067fc7a1f9824536e01ff83ae4b6e487ee4d,True,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,9ecf08fc82252653f585599969c047199e75f0c030eb839c9b6633b80ef6d474,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,d658300fc7b58bdf1d633c5cdedaf15f02cd1bf830d2de170ef9ee3dd59a8c05,Merge_failed,91c0dbecd0ed90cec97b9dc113b377145e48dba8998df2d88a69e7fb245aadaf,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,52937b12238179b6b859e16db2810a3c5269d748373c3a8282011fc56869892d,Merge_failed,93e92c5d1dc136c8495be5464d26c3da89b0128dea619a1d8df5b316fac0b9bf,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5 16,refs/heads/master,662c27a79ce26f2c0e481d00bf82a090659f4b36,230ba611c4fd9f2a6f8ab848b97154a5d05ccf3b,6e384fd19b1a5f8e96f2e0199a7d45b16714da13,,True,True,True,81.0,293,1737.0,2,True,81,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,True,Tests_passed,7120810de21dc378e363135e34d326e27fbb6241557663400dbc442bd16499de,True,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d8d8c0e3ab37c26d7b6f7fc889e6ee94068aef96e5425a3eae9fd2d4cc8cbee2,Tests_passed,01ba9fef43a4f66d2ac87a84e7336da5a22817216201b3da470b9786c1b192bb,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d8d8c0e3ab37c26d7b6f7fc889e6ee94068aef96e5425a3eae9fd2d4cc8cbee2,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e 17,refs/heads/master,230ba611c4fd9f2a6f8ab848b97154a5d05ccf3b,7bd2b19e51b47c26e141ae961ae4968d3ad90ff1,d64fb6da3df0ba3210bc60fce8e127eab3cda92e,,True,True,True,88.0,134,2975.0,2,True,88,Tests_passed,57ecd223ea29f920fbf83364df1898b26ff14652dae48803f2b12e988b05325d,True,Tests_passed,380ddf59dd90c2e4ab5255b6de55e7b125aadedb00f617ab24c28163dcc4e8c5,True,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,2b31cced99682dd99573b294ec36709e221cc13c90bec2f1187650131ca3d8b7,Tests_passed,f29e1ddf1a8975df1722480f9ed657bba1f30955cad512096c011047b0748dc8,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,2b31cced99682dd99573b294ec36709e221cc13c90bec2f1187650131ca3d8b7,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c diff --git a/results/combined/merges_tested/jsamoocha/linksalienceclassification.csv b/results/combined/merges_tested/jsamoocha/linksalienceclassification.csv index f99764c8ba..1c8373f420 100644 --- a/results/combined/merges_tested/jsamoocha/linksalienceclassification.csv +++ b/results/combined/merges_tested/jsamoocha/linksalienceclassification.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7aff5753c70fc8c52cdc949c2a2712dd90bdc30c,c57810b5c2d6e64a483f71582aa75ebbdc808ee7,a30776ffccfaeae3ea3e92cd1e85b030304a4b89,,True,True,Tests_passed,65eeae439dd016b1e096416d37fef772dd9363c89b646b61dfc70ecf31a6f429,True,9,42,789,6,True,Tests_passed,0e646ce98ce0f8d059d21cb0609a0324e76acf1cfc0cf1fe5538d6dd47849ab9,True,9,True,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,71f500592d2b0a929b651e826f89c8af3080cd4a54052ef183d232eab1fa45d1,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Tests_failed,c9075f80d2b6cee4662a56b4b321a8b122466e94d15c0ba577d6e652d1cad57a,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,292e03c09ae1f197b391dcd221859758bae1bbd0080d9804c0699af7b5076f4d,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc diff --git a/results/combined/merges_tested/jsevellec/cassandra-unit.csv b/results/combined/merges_tested/jsevellec/cassandra-unit.csv index 61430f1557..c5943b4a06 100644 --- a/results/combined/merges_tested/jsevellec/cassandra-unit.csv +++ b/results/combined/merges_tested/jsevellec/cassandra-unit.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,13b72270f1a5d2b26092a43ca8cfac15e5f0f200,4c5850090ea4533355b21fc3dd0337eb287659c7,0bb00c5f8e320eab7000a96b84fe56cee45f92d4,,True,True,True,8,19,46,3,True,8,Tests_passed,87193deb80bac84e9b59dd72176b66316c898b6e30a135afa9069fbc681eb3a3,True,Tests_passed,8c200f6379a7205b18e9d99b26ec6658365119f33c74c9a437b58bd0a38f3167,True,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_failed,ef2dcc6ade58072559bade12adf18f69d39c1a3c5ca22dda05b717ddf3d25d13,Tests_failed,b70efa2ac74d6a3b968e860d0ad785489cd07903f9e19e68c346817cad2ea30b,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_failed,ef2dcc6ade58072559bade12adf18f69d39c1a3c5ca22dda05b717ddf3d25d13,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c 24,refs/heads/master,4e87b46fe206e0acf5cdbd1e8c396be97410a5e4,21dc8a443a78021e0f1afebd4712cfed6ed3fce0,5ffd14659e8a2eee622f785997e0d00f7d7e318f,,True,True,True,16,36,204,5,True,18,Tests_passed,cbf4ccd08becc192d1154c54b7cb6f4e2e21b3afa66d6516f70dd17608f8c506,True,Tests_passed,60609d824ecb7c1930d6b261a2aff92dddd323a9c89ea03134b55fec87066322,True,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,517120c2e25693075c1e82c3826d85bf9d7951eac716b14b683ac7a54f9c39d3,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Tests_failed,31287108455bc5efe8dc3deed33f513b16f1186d18f9d117be7063516bdc9af0,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,b2291e333cd972e3a4ce68941df782b352d66dfe0b4c5f89b97976f579fde846,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62 diff --git a/results/combined/merges_tested/jsimone/webapp-runner.csv b/results/combined/merges_tested/jsimone/webapp-runner.csv index 8422770b4a..2e7e9dfb11 100644 --- a/results/combined/merges_tested/jsimone/webapp-runner.csv +++ b/results/combined/merges_tested/jsimone/webapp-runner.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 108,refs/remotes/origin/pull/188,f978fdcbea259b490d0e03b5881419b3aeda8152,b50903298c5f759c7fa91d90516c899f4d6f0ac0,ba88f4cc74dcacf2fdf74db6eb4a0a7cbd2206ec,,True,False,True,4,4,16,2,True,4,Tests_passed,01a0648602c3ddda319097f4a54e6bfe88f36e5cc2f79907405e38dd9264da26,True,Tests_passed,47de062241455f81806f4e5e0cc1f0ed27306bf66dd80041814379496b10ffb6,True,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,eb8dfbb356ba13d1878743465287143c5f6ecf57cf10897f03c6b8f6573c3e34,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,eb8dfbb356ba13d1878743465287143c5f6ecf57cf10897f03c6b8f6573c3e34,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115 120,refs/remotes/origin/pull/231,42bbf1f732331ba7731f6916a307666cef6855b6,0d080041b57c0e9bcf13c4b62291f32390fcf3e1,d9b047d5fb94f24dbefaebb8e79f5deb50fbf87c,,True,True,True,11,17,45,2,True,11,Tests_passed,932d81d4482640dffe55460c32a434e9013a6d06dac447c426d575a40651e895,True,Tests_passed,0bcc2ec94937f427a6e88bdd758610d739c7a97898281593e3fd25d940c7b668,True,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62 diff --git a/results/combined/merges_tested/jsprit/jsprit.csv b/results/combined/merges_tested/jsprit/jsprit.csv index 509bfb349f..072dd0e90b 100644 --- a/results/combined/merges_tested/jsprit/jsprit.csv +++ b/results/combined/merges_tested/jsprit/jsprit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,d1858550787f7cf488e0ca135c40b5352580fedd,4527818601ad344e11dadff16115677ba338c406,a0b3012cd5c8f7c07d41ec4d7cec9273d307f2ee,,True,True,True,39,120,450,2,True,39,Tests_passed,c8ab2c2e313d0dbda38a8b284adbe2bd92993e37e9abfbd564e72daf3a9165c5,True,Tests_passed,d1347fd175fb1d2f1fcd8883ce9219a561052484e16b1792186be0401e6a7277,True,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,f8c060a1dea04e9542d270b56ba4887f592a0709a67a6a5d08150754bb983481,Tests_failed,6b9a45d43ddb293cc5d589ab42e12de5ebe71b713909e881aa623abb4cb4d7d9,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,f8c060a1dea04e9542d270b56ba4887f592a0709a67a6a5d08150754bb983481,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452 23,refs/heads/master,b68879303e350646ff6111c9152d6b0f0decde17,dde8b01e1c3acbfed464318163c70d338ec70cc1,5c2c815540b471969e7b183c6ed454a769a3e2e0,,True,True,True,31,128,1607,2,True,31,Tests_passed,3d8c1bbf2db6e324f47bb72c67d2a1eb57a079173c29e4181af3d1c737106ff6,True,Tests_passed,6291f9049a719651e3a43c58ed0e860fa817f3e5e2433e6b7dba2156e77caea2,True,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,81e394509c4e4526e4a0b1f1b2f1a75ce144cd2f336fa10c7c1d567a0fc5ac80,Tests_passed,41c1ba3254d8dbbca18fb8eb422a90243c6b14963fe3e10f9b849969c099acd6,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,81e394509c4e4526e4a0b1f1b2f1a75ce144cd2f336fa10c7c1d567a0fc5ac80,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db 28,refs/heads/master,4c2df190640d3a29f804b8ecfe1c5ff2184d5d5b,d0ebc2d60b80bb5b1416c6be206035f0592bc1c1,a0009918ccd0e0c44319c39ae33b42f655e61a1a,,True,True,True,6,16,61,10,True,11,Tests_passed,f3738532edb41f106f849f34fe3ba774838faabdd8d6318baa423b66c429fcc6,True,Tests_passed,0d0afafff83c0f5bec622e8e4aa5cd9f08a77f8a9a6eff1267b0972e20a6529c,True,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,a2e9c3cf9701da6ef7e99556a73d29bad175e17566fc37ec6715e8ac6c506133,Merge_failed,d3b60a278b6555e49ffca9594ebff59b958d01ac21c214c30ef7d7f69a6b1774,Merge_failed,a44d27102ca97c8a94fdfc35ab476f2f39d87eb726545cc1e63390e4bd0c3cdc,Tests_failed,fb14ef7ebebc674611e480cae8128b985c4c996fa20f6297a98da4501be30e41,Merge_failed,d3b60a278b6555e49ffca9594ebff59b958d01ac21c214c30ef7d7f69a6b1774,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,6c13949519ebc1a3501d9c2353e0152ed51c61e6f45f7b2e5bec15c53aa05de6,Merge_failed,a44d27102ca97c8a94fdfc35ab476f2f39d87eb726545cc1e63390e4bd0c3cdc,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b diff --git a/results/combined/merges_tested/jtablesaw/tablesaw.csv b/results/combined/merges_tested/jtablesaw/tablesaw.csv index 67b57ce033..02335a2b09 100644 --- a/results/combined/merges_tested/jtablesaw/tablesaw.csv +++ b/results/combined/merges_tested/jtablesaw/tablesaw.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,9a8d74b1e71927ad96aa3252b792349a2133ea9d7be46479383901610470d286,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,994ba1d592b833cab4ff219b3d1b9073dcfe2162f48c9a414ee984319d96f02b,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246 3,refs/heads/master,064b075c3a675302f3d372d0ce308a12dcca0ba4,a13a334c97c01a7284a80f171615f159d03b7975,2a7efb82d77980077ded7cee995c9c051fb1545e,,True,True,Tests_passed,8e253e7f54906664c5588ed04337ab0ebc000e46d65ad0c4260c8b5793b5459f,True,49,105,1735.0,7,True,Tests_passed,d9750fcfd6013df5ece52ac889dc4e82e0000e94661b33a5001b1fa9aee44e49,True,49,True,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_failed,a6641ae2f6190b5e571da73c4da12d540565a6b91954f68fc5696fe0aa8802a9,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4 4,refs/heads/master,59cc8402011b2280fed364f85cd4431e776b6d4a,70e7c73943e42c1f05c644c1f5f587eb3bdeed98,01abf193ef3d93319ee0452b480f16bbc942ac6a,,True,True,Tests_passed,e670dd370c7784a57914c458397a21fcf74116a297e5f1635764016ea2968479,True,3,13,86.0,2,True,Tests_passed,c6d94a04c96397514352daa08c455249d9bf0a3163c248624bdf05519358dc2e,True,3,True,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,8a4c2a45c677445479def8dabe439a6232a9019506dd807919ea4c895ce0f9ac,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,8a4c2a45c677445479def8dabe439a6232a9019506dd807919ea4c895ce0f9ac,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5 diff --git a/results/combined/merges_tested/julianhyde/linq4j.csv b/results/combined/merges_tested/julianhyde/linq4j.csv index b20c121c89..1d04626b0c 100644 --- a/results/combined/merges_tested/julianhyde/linq4j.csv +++ b/results/combined/merges_tested/julianhyde/linq4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c0f3b4a7443737373430ec0a9b0b98d8baa2211d,52a1e6b48807a19c36c4ea8c0aee754d98c8e20b,f3f5c360dc087607a8c03b688dcc4756afea6d10,,True,False,Tests_passed,2e768541d087f358f7593cee6ec32f6a8ea74213ca41ce5e8849a149f86351cc,True,8,20,44,3,True,Tests_passed,c705f125a810fe1079fa4406877d385957dc319d15bcc3651b6cbacdb4ad35dd,True,9,True,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,561558ca4cffab12ab8cb0c6b46ac4e08ada7607fc36262872d344893fcd27d8,Tests_failed,9161bcdce4a7a8c5f431f784fd3d97e1d90ea312b1a454454885b811d2ba0f40,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,561558ca4cffab12ab8cb0c6b46ac4e08ada7607fc36262872d344893fcd27d8,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658 13,refs/remotes/origin/pull/26,1f0e4d05f133cbc901e299ae795a86ed47f2425e,a73878006c809f7313e7767d24de9c6cc5ad3102,bd8899bc2485e6fb666ec9bf23c892898e523e2d,,True,False,Tests_passed,0b0419eceb563e5df39abfbdfb2c43c7855b8079fb926f52359bea37803eb7cd,True,3,3,44,2,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,True,3,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_failed,6ee28f8c010b3b77f16cf166c190281cfaca1659bcf29682dae865340366b6e7,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456 diff --git a/results/combined/merges_tested/julietkilo/canbabel.csv b/results/combined/merges_tested/julietkilo/canbabel.csv index e6612792d7..20990e9290 100644 --- a/results/combined/merges_tested/julietkilo/canbabel.csv +++ b/results/combined/merges_tested/julietkilo/canbabel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,a2e8646cdce41a58d12879911e6ea6a836dfe7dd,c83fd7d51d708756fcad1c9f80b1cc9546d89a9d,e18507fe9f70894cfd25ee4a4f71fbd6b94a3e4e,,True,True,True,2,32,88,2,True,2,Tests_passed,cd40bf207daab30f267b0725bb715567c796ae040fdee3260ad0c97f9e719f12,True,Tests_passed,c0e502b69441fc741592da3227fbeafebfdb0f0b67a064ff4104aa7bb2ec2b64,True,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,15ff0358b749231b7c077c1cfb879a8dcee9dffa6219b9f09edf6b73e9180e56,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,ea991f55ba8102f24fa1b50be19ee86e1be259510bbd5d9c5a7b552e6828b4b3,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,a0eb64c72254a063765ee60191d7e0032a57b972664cd3d19988bbc700d13a88,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87 3,refs/heads/master,ea550c2876ef63fc2cd3980af7c9900c8e4b668b,47df45694d26dadd949d95d7f5481e1ec2a3de4e,b9f6f3dbf1bf55edbe685e7b379efeb10ac9a6d7,,True,False,True,3,8,29,2,True,3,Tests_passed,d7b63d80f12fe78917eb41841d1b23ca5d94f436bcc2b43f916546ae234a5ced,True,Tests_passed,9bb1e1f8b15d68fa776e7cc7ef2be20cfd0dbb395d0e5ddec166c86dd98e7c40,True,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Merge_failed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,10f68374f243d005aa88ae88f54e58330b936a0e32a2ba9bcb18fa8dc3107fd8,Tests_passed,6adb9f01507ae2a9139dc70ffb396f5677a78638a1a835054ec2a908003f359d,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Merge_failed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,10f68374f243d005aa88ae88f54e58330b936a0e32a2ba9bcb18fa8dc3107fd8,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365 5,refs/heads/master,41057a06b792ee5007209eff19affa91a6c3dce6,ba0f5163598959011d96333c47ca448747ef18f5,bc35f417799807f6f7a834d65ed04f73ba7659af,,True,True,True,7,109,1298,2,True,7,Tests_passed,239d5e90eed36033235bd25629f79ddd4da9daf4d1b8cba7a0e981419aaab2c7,True,Tests_passed,7987ba3e45a0c4adf39cfe40aea621fcb966f0b744cc51c25900efc6fc29f814,True,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,39aa09a35d96e0a4d2209ac673bfa3f93f06318cf63adc04c16b1884e94c326d,Merge_failed,0e2185148f467f69217be5cf2b24d7a82ca6b2a19f2291df4007b8ba6c9448ee,Merge_failed,12ea140a94b242210c717f955523c885a6e8db80a56928e8133e8ab26f6ab610,Merge_failed,879fb8bc131a27942e57a2fed2d347e3f4b7def4914fc7d4d370547d4e6da96b,Merge_failed,0e2185148f467f69217be5cf2b24d7a82ca6b2a19f2291df4007b8ba6c9448ee,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,c1e1890fb77399ac9c12d37385df38607b5db9d7eb578da4fc60b23c349ba09b,Merge_failed,12ea140a94b242210c717f955523c885a6e8db80a56928e8133e8ab26f6ab610,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5 diff --git a/results/combined/merges_tested/juniper/netconf-java.csv b/results/combined/merges_tested/juniper/netconf-java.csv index d92ad3ad0b..fe86c044f1 100644 --- a/results/combined/merges_tested/juniper/netconf-java.csv +++ b/results/combined/merges_tested/juniper/netconf-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5720d527507c33e5fede2e542dc3d892eb780b5d,0e040c0dd0dde2bc26652a774d965e515f83ff08,ce3d27ffc4c1ad65dae9805d471e1af785361e6a,,True,True,Tests_passed,2357e7e485918b27fd314cf0c1b36bffbb75b2c7a987a2c8e11a6ae0d59d1409,True,23,133,2132,7,True,Tests_passed,44ddf35bea8f92693dd7c85b73685001755c0815a964b89dd7faa7a1bb424291,True,24,True,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,a4fc21cf1377b6a54c1fc9d7f2ba7fc8e0518eba9772ec10d8c10e67db3439b1,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,9e03107636458ee4f883af10d169404b3da58853a5102231da0bcf9ad01fb294,Merge_failed,24340c82ffb0826329c89e1d9b9d1cfdcdddb51e1f847d5c92f57a930fd79e00,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,ae56b065f2dcb5d4e63cc02cf1f98e0f405605b88623fba7a6e7d9df2a738ec1,Merge_failed,c89731a101e850349cec848f2d4bd8b3707ead477052478a94ee9a37f6b34cb5,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff diff --git a/results/combined/merges_tested/junit-team/junit.csv b/results/combined/merges_tested/junit-team/junit.csv index 323e86a52d..9a385f895e 100644 --- a/results/combined/merges_tested/junit-team/junit.csv +++ b/results/combined/merges_tested/junit-team/junit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/main,ab7c961572adab958edf4c5cf1f5371b72117300,3681aa3796084b41d67a25b31c6595dbc180167a,343599800301b8f0886921cfc605dc85899f8f7e,,True,True,True,305.0,1133,12392.0,35,True,320,Tests_passed,c0a7dbc9bfcdb1ba4df41619164c4b4d2cc0d488daf2d8a5266b79dbfa66e519,True,Tests_passed,ecb36102132e62af6d728da6d2a70e664afee3fd9d2f068b845897d25de312d2,True,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cdbfc3804e10b962c2cb78c9604fe80ff4969ff64e1d15a28e3be8de03d5c4c2,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,ae9acd7cd49e63faf73a0855440b414b45a40eca3f2b1f0865bef6322f4b2e51,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,d744da66a666c97cbaa0a9d4b76234306e8b965add7fd57f565458ce38bffcf5,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,ae9acd7cd49e63faf73a0855440b414b45a40eca3f2b1f0865bef6322f4b2e51,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,a2da201587bfb48b66e3dac0c9f68d9c0e973554c01ddaeb889e79404e2d64d0,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cdbfc3804e10b962c2cb78c9604fe80ff4969ff64e1d15a28e3be8de03d5c4c2,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb 10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,True,True,True,161.0,760,7530.0,2,True,161,Tests_passed,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,True,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,True,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec 26,refs/heads/main,28a3a3b1bd84e4b438bea6fccc913f419003f879,f56556f1f6fa3390efd7dcbc22123321c9a596ff,37a8aaba8a817b4bebbeebcd645d304601a0c8f0,,True,True,True,23.0,99,409.0,2,True,23,Tests_passed,62cbe78d69e793794cb21c1fed1d1dd6e552b06d00dc5984a98ef1cca5101d54,True,Tests_passed,06135118f54f96a79444e7c8060d104e8480e30aa273be887b11dd77afb0998f,True,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,d58191d306568d3af0233e998ac76a19c69c2744660d557e29cfc4403477025c,Tests_failed,3fcd6203d640738896222f236d03726bbe3f93c841fb035d539e9c02e72eca2c,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,d58191d306568d3af0233e998ac76a19c69c2744660d557e29cfc4403477025c,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947 diff --git a/results/combined/merges_tested/junit-team/junit4.csv b/results/combined/merges_tested/junit-team/junit4.csv index ba8cd815ab..d0168544e0 100644 --- a/results/combined/merges_tested/junit-team/junit4.csv +++ b/results/combined/merges_tested/junit-team/junit4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/main,ab7c961572adab958edf4c5cf1f5371b72117300,3681aa3796084b41d67a25b31c6595dbc180167a,343599800301b8f0886921cfc605dc85899f8f7e,,True,True,Tests_passed,c0a7dbc9bfcdb1ba4df41619164c4b4d2cc0d488daf2d8a5266b79dbfa66e519,True,305,1133,12392.0,35,True,Tests_passed,ecb36102132e62af6d728da6d2a70e664afee3fd9d2f068b845897d25de312d2,True,320,True,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,955d3da16561f7a65b5b7f029814fdf417eb5d59718757be0eba344133e4c1f0,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,982b679cd1b3ff89add7c44aced7b315bbb0749788a7ac1fe3dbf9e64aebd371,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,d744da66a666c97cbaa0a9d4b76234306e8b965add7fd57f565458ce38bffcf5,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,982b679cd1b3ff89add7c44aced7b315bbb0749788a7ac1fe3dbf9e64aebd371,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,cb1aa140296c36616ab996663d533208296e6c00b4f2520a47dac2c7e624e8c7,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,955d3da16561f7a65b5b7f029814fdf417eb5d59718757be0eba344133e4c1f0,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae 10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,True,True,Tests_passed,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,True,161,760,7530.0,2,True,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,True,161,True,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec 38,refs/heads/main,d712ef951802074695c79740f9bb6954b12ee4ce,3867a7360533cb0fd90a50adb5864bab14ecb425,07cf3c7fa446da330776502fb7cdc7329bfa2265,,True,True,Tests_passed,70472ddb60d006c89a2af0f88d9a532f600d0390f50b0a02389e2d060c6526dc,True,53,212,2319.0,2,True,Tests_passed,39796539e0cb248b07df818564f653fe00a358853b365c475880d91f223ae4b3,True,53,True,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c48936f7624bc428b4141ab46483d48077ef75f7abf6b0967609a9fc4f263904,Tests_failed,1036db12029e8b21fc29205ef9487c1a26f58ca13ad57637d1bc16e5e4b81a9f,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c48936f7624bc428b4141ab46483d48077ef75f7abf6b0967609a9fc4f263904,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1 diff --git a/results/combined/merges_tested/jutzig/github-release-plugin.csv b/results/combined/merges_tested/jutzig/github-release-plugin.csv index d7a04309ae..8fd9a77042 100644 --- a/results/combined/merges_tested/jutzig/github-release-plugin.csv +++ b/results/combined/merges_tested/jutzig/github-release-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,e68bccd8f307a6abd453e6de7be20c006516a3f4,8293177f3f8591785bf72e75cd78cfe38c84b8e4,b1a086f4016d3c53737122237c5def5c8982d518,,True,True,Tests_passed,b689f7ad5a0f965a97609704c06c2f1c7fe3e819716ddac4adc7f190041a3e86,True,14,66,371,2,True,Tests_passed,5a68158ee371555777cb33529794e2d724df9113d1584bd5b13540daea9160e7,True,14,True,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0 3,refs/heads/master,d86f8d63a233331d6543a8f022ac3ffb9f92ea8e,681657434033e6252c24cdbe967fd86b33c0bbc9,3cd07c562b6df0bea3261808669ad121bf99b9f6,,True,True,Tests_passed,09d0474cde36a8eb5ca205bf9a1a50425f766645b8ee84755949cee2f62c10f9,True,3,53,148,2,True,Tests_passed,cafbece6951c487675954175bd64999f34481aaa328db68d829a0b851dede3b8,True,3,True,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,d1ae51fbe59ebe25a97364ee08229ee4df9d00b8aeb4e6d4f29f9a81f6680de9,Tests_failed,85f8de2c107db2a26acf7cbf06183c4d3e443810a422221deab37941a97b2668,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,d1ae51fbe59ebe25a97364ee08229ee4df9d00b8aeb4e6d4f29f9a81f6680de9,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d 13,refs/heads/master,00ea032304dba5f66b524a6828b2b604b0375076,31b8202c5b62cae22472a84b0fb1b395d4710a8c,86153965278a11f895863864300f3047ca91494b,,True,True,Tests_passed,c0a0deca5325a786373e694672b1cc4d74b40874b5dc41379e2effd630866611,True,3,11,141,2,True,Tests_passed,623927726828e66f7f99bdfca546f2a7b55f7481994462ea0c5bfd1c5c4d28c5,True,3,True,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,169c60f9f8d20b6601f666c1f4c88836f4d33996e017daa280878caba3099c4f,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,fc8e4836612edeb788ad62fb24df69b67e9b00f8607030ba57f3e9a6ddc3bfd0,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,8dd2faa9e565675a01b95907e4ef5b84036809655193d0f133f54ed68d04740a,Tests_failed,cdc8e2f6b688caa65447af682eee5e452bf9456fe9d30516033a5de2148be67b,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,fc8e4836612edeb788ad62fb24df69b67e9b00f8607030ba57f3e9a6ddc3bfd0,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,8dd2faa9e565675a01b95907e4ef5b84036809655193d0f133f54ed68d04740a,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,169c60f9f8d20b6601f666c1f4c88836f4d33996e017daa280878caba3099c4f,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8 diff --git a/results/combined/merges_tested/jvirtanen/nassau.csv b/results/combined/merges_tested/jvirtanen/nassau.csv index 9a53cb1cbe..5ab048df12 100644 --- a/results/combined/merges_tested/jvirtanen/nassau.csv +++ b/results/combined/merges_tested/jvirtanen/nassau.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 97,refs/heads/main,77574c064155c1f9245f5dda74c0531bedc81c9e,622becedb08bc5254885f3738ca1914afee77fb6,741fae1ea49f571984a43ba789d66ba24995834d,,True,False,True,8,38,153,2,True,8,Tests_passed,d53abedc98a5c4cb6acea97901c01ede9ec78765668036290e705297b0d98326,True,Tests_passed,c8a5f4251ebbf76c089fd51678952e14f8df02fb5045e980e3738b14cc8557fa,True,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13 diff --git a/results/combined/merges_tested/jvirtanen/parity.csv b/results/combined/merges_tested/jvirtanen/parity.csv index dbc2725c11..c9cbae7359 100644 --- a/results/combined/merges_tested/jvirtanen/parity.csv +++ b/results/combined/merges_tested/jvirtanen/parity.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,a3aaadfbec54010fd2916804a872f09579f7b0fb,672528d11cccbec6b2a28efb6c8c8d14a1dd0c4f,07a94a059dc097c54a3b78bbfc97fba33c3aeda9,,True,True,True,7,8,20,2,True,7,Tests_passed,4520e13fefbf1431ffa2f3d753542e19277f1c1b216b07636f947cb76f1f24c2,True,Tests_passed,fb40cce2a40a80875af2797b4d65399d10b4410faa8bc89a49513f83b67af023,True,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d 21,refs/heads/master,87ff7e6a5f763036ed10ac0213c8c6dd1e298eba,8ea86699d233a1f88524e10dbad6a11a0b9af53a,901659312ce0292bea551ac34d363470ba2c2cf6,,True,True,True,36,195,550,2,True,36,Tests_passed,3ee35a5bd252711b0a81717d89bf28045c3207f3973b5f54ded4316f83268cc6,True,Tests_passed,77c99d0c6af964f2b2b1bf701802f17171d3aa8b198270d811d269410a21181c,True,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ffa2299e9c1ee7f94003e6cf4d4046003f248577ae272591309c88256bbaf7c,Tests_failed,027b65bd9feb250b72dadad7938e0f88e7e517e381b8d524d4d11acea1aa2038,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ffa2299e9c1ee7f94003e6cf4d4046003f248577ae272591309c88256bbaf7c,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a 69,refs/heads/master,7647cddebc814f7511790414b2cddff8767936a5,9a4219b684109f79897ee9dce0c46035cccb7bc2,ab080b8f2935a55bf2d4b45ef35718dc8cfab626,,True,True,True,11,50,240,2,True,11,Tests_passed,c369608adc31c0523817d49d48d3342c53d2e4eac49405e6ed5c530608b00024,True,Tests_passed,49d5d93cb5686dd8ef0d357e97e2b83b0186494ca66887c22b9dcda4168bbe44,True,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,bb2a3bafbdcf344a10d4c47a9016be0eac3d9848909e50d9d47cc9337b15fb5c,Tests_failed,924e50ba9138f4b7e4f6ff1aa7d22da6804ccd9e1fdfd1469249797b75d5e48c,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,bb2a3bafbdcf344a10d4c47a9016be0eac3d9848909e50d9d47cc9337b15fb5c,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e diff --git a/results/combined/merges_tested/jvm-profiling-tools/async-profiler.csv b/results/combined/merges_tested/jvm-profiling-tools/async-profiler.csv index 4f19fa1656..db0c01d1fb 100644 --- a/results/combined/merges_tested/jvm-profiling-tools/async-profiler.csv +++ b/results/combined/merges_tested/jvm-profiling-tools/async-profiler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 49,refs/remotes/origin/malloc,f3857d8dcf97af86770d36267c7ce7d02bc6eae7,52d29dd07345a0d4f7c4058c902b96f642aa24ae,0fcc4d9bac6c87b06b60bb75aba82d96bac6b68f,,True,True,True,35,203,1591,8,True,35,Tests_passed,a890ca7b802542e18fc8a354f88cc3727b872e064f7b50398c0d38ed93df703b,True,Tests_passed,9d6afd8cc2619dbea88282e6f3e0636064257baf6e2ed0ecdb07149647240369,True,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a0fc7185b2957e62fc7a304854d60f779643e69641b1e4f9d89c8677f9b1c1bb,Merge_failed,e444375800651ba7d38fbe2df65320865bb47ada3742a074638e99a4019ba191,Merge_failed,7147361844e36e0178564dfd6ebd2741bb83b0bc5d161396b482d26fa5891e56,Tests_passed,2df27d5d891e902069270c2a8986080078d97b1338c53ebcfcf796e5c877f881,Merge_failed,e444375800651ba7d38fbe2df65320865bb47ada3742a074638e99a4019ba191,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,5b021d593af019a8e09b48c5f7c49551ee9a50255e921f2c80f44fa99fb17495,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967 69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,True,49,237,1437,3,True,49,Tests_passed,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,True,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,True,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,8ddbcc49be31a669686a507c73d8af1cbf9185f76e2798a8941c1f98fd97df01,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Tests_passed,bb5b17759acc5b57443340fcefa6fab2840a0f0c560772f245f2b2053d1c2a5a,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,772b8aab8c53f5cb9fce9e9dc14ee210e72bcd20fbab81789b9280a4b3b24474,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223 75,refs/remotes/origin/pull/530,6a261d7422c4c63902245a640696215453e83978,feb57f74519955034442d6768c0ef202d5ada871,d7a2a4fc8ba5aecd9b6d4bb4b5f1609d37ab4a8c,,True,True,True,55,283,2688,3,True,55,Tests_passed,1db95830de44a19ac65f279748347a4ee3d86d46f0a91d267c0023a6de61c3b1,True,Tests_passed,6564bda60802f91f87ba9f4a6dd3f5945289e51f786bb29f7ffcc3040b58352d,True,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,aefcfaa1a84e78982a37d89a226ec4aeabc27aef682bc815e383ace09993e4d5,Merge_failed,959926dbd8845c947f81ca5ab374b01b89cbfa1cf0bb622d29097b6c01b8ef45,Merge_failed,2069f5ee6d538339ffd3d683b5f8ac7072f09902afcf1f71faa37b9c42f15427,Merge_failed,2069f5ee6d538339ffd3d683b5f8ac7072f09902afcf1f71faa37b9c42f15427,Merge_failed,959926dbd8845c947f81ca5ab374b01b89cbfa1cf0bb622d29097b6c01b8ef45,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,d9348296c27cd88cfa50411bc1cba92399d4076d485327b3d9534e8d20df0d05,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736 diff --git a/results/combined/merges_tested/jwcarman/wicketopia.csv b/results/combined/merges_tested/jwcarman/wicketopia.csv index 01365d9d0c..18a329ad8b 100644 --- a/results/combined/merges_tested/jwcarman/wicketopia.csv +++ b/results/combined/merges_tested/jwcarman/wicketopia.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,65dc57a69735d064d0c1c05fa67493b94c05b159,e32b5746cff9606ca0d26560dc48dddbadcf797f,e03bd261c14b567655c0408f25e9849ba93d7126,,True,True,True,101,223,2678,10,True,101,Tests_passed,c6a9890728b360c23a505bcede16723ffefb09dc4b37f50d64d1aa03387ec971,True,Tests_passed,49252840affa51ac739ae2f9abaf66f7e1c8aaf9e8e1737d7d102ac4c3ed8dc7,True,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,a50b36544c14718be3a34fa83ed28eccc09b3baf298153f90ee6f03db453c4ea,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Tests_failed,8d49a54e1c831f1338344ec1982aee661b6d5b60dd2f5261a374bc488e097918,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ede69e17cbe41cbe98a308e59b9a1bd6630e2ddefb99a7458b43d2977eb0579d,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb diff --git a/results/combined/merges_tested/jwtk/jjwt.csv b/results/combined/merges_tested/jwtk/jjwt.csv index 8251c9746f..770e41056b 100644 --- a/results/combined/merges_tested/jwtk/jjwt.csv +++ b/results/combined/merges_tested/jwtk/jjwt.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,fd52e0ffc2de0989879fd6f6b63e19416db6627c,9bf487f0b7686bec97ac368f592b7cddfa99546f,17c3dcefd0b297ae387c45d1c99a820b5c714bd3,,True,True,Tests_passed,19944222845d04de2ffe76d9b7520edfc4d305d0341bf621ad4fbdb4562ddf90,True,23,61,697,4,True,Tests_passed,c518474119e1faa6f7d7573f4ad97a45782b94c841365d609b431fa617ef225f,True,23,True,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,607c7b1f7c70845db252f560e9a4d1a40130b143a25dbbad233d7c3f5e265cc5,Tests_failed,c91db1392dec5f6197df16d52eb9948a1f3d6073c1cb752f588789cf91eb13a7,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,607c7b1f7c70845db252f560e9a4d1a40130b143a25dbbad233d7c3f5e265cc5,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b 57,refs/heads/master,ff932e9838a9961f4084a51323092559e1a1ad25,af01cca9224371012f9240c756a6a8ecbf606074,3fb794ee9131b9e6d6f0c24e408b05e53025aa79,,True,True,Tests_passed,40f183e144f7675839baeff496a088ec2399355e151996b5b0b5ffb9c3417d58,True,11,35,236,3,True,Tests_passed,489bd2e017dd2dcca02c17f59763f59df40a9f890ba1010d71bf3ee76c0132c7,True,11,True,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,543faa2f8087a2825272faafb9dbb8825726a3f9b52d22ac58b89b76f5a59d22,Tests_failed,7308313919df361e3450c149e9d0e7dda29b369f956a03d7f1f4f3b3fc3eb7a0,Tests_failed,4863d6870831f62ee955f6a0e88cd67ccb2693a8ad19b2737c9e0f2a87b22ebb,Tests_failed,4d839b947d654417fd75e8d033c7b5dd609ae70507b9c6ed4b9814d8d430429f,Tests_failed,7308313919df361e3450c149e9d0e7dda29b369f956a03d7f1f4f3b3fc3eb7a0,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,c7ecaa24922341ada2fdf56ec922aba76f9b555694b1178665be8145da3e3a49,Tests_failed,4863d6870831f62ee955f6a0e88cd67ccb2693a8ad19b2737c9e0f2a87b22ebb,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019 66,refs/heads/master,e55ea34e951f8bbc8be50a49b166949a4d1e4873,8e6e165c1db7a69c9a0d34387892f2bc2409a301,707f7bc046b363ac6262f43bdc0885ff04f35f1c,,True,True,Tests_passed,5f8eb8867805b411684f48bdc39e2252ade78d9c946269a029192c08f218c654,True,35,97,1467,2,True,Tests_passed,dbffa571c22047f577768182edd2e7934092a67e1b38ecef5389f2f1bf3489fe,True,35,True,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_failed,55ae3c777e57d84dd242547ddc745a33c190aeac4e49c0830bff52907466a545,Tests_failed,baa1a856ba105d676eb4dd66d725c5847f4fb3e7024e008ad934ff165d150624,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_failed,55ae3c777e57d84dd242547ddc745a33c190aeac4e49c0830bff52907466a545,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe diff --git a/results/combined/merges_tested/k3po/k3po.csv b/results/combined/merges_tested/k3po/k3po.csv index 572dc6149d..a8d311cd08 100644 --- a/results/combined/merges_tested/k3po/k3po.csv +++ b/results/combined/merges_tested/k3po/k3po.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_failed,1baf6d325a4544b5a24b63fb8590486dccfe7913fdd0d1d645d627b8905526bf,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268 329,refs/heads/develop,1b2a7eaed60d376ab87a8130c29b2ec957bca767,6f84f238da4c58feb35ea3fcfb882ed406d76180,cc79950f0d40b73fdb30dfe097e5337aa57fd4d9,,True,True,True,277,401,4540.0,3,True,285,Tests_passed,04ee2ace54bb3a086f6e04b05ed4108f4d350bfb74f0d6c7e0aed7bc74df5c14,True,Tests_passed,e7deadb731b20ea48f0af4f41ce58eada58ecdcf14b9062d5cde969cb44ad098,True,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,f7c26c4698b24c3a1e2e206d08230b53633407c234a181fc0879a4dd8559c82b,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,4b0081537cc273bb96ccb8673d15eeeb58aea5a543e542bf89f319eb31432499,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,8c0c7abf0261ce7320ff9b910f8bdc2c18f2b124bc8bf70cc36e85b1bc79a3dc,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a 380,refs/heads/develop,6f55ad6692307e9c8179c82d80b456c866468fb8,4624fce1a1d40d2266096adb5f489dd47327bc27,3befe53d068077af9ad41154da1e7b643c68752e,,True,True,True,2207,4142,44855.0,11,True,2207,Tests_passed,d27e072d1bda030093985d56af6b16f05576ab7476ca4a216ebdca6b440a90a1,True,Tests_passed,66e01a21920ac4f7f82f61059e150bf8490bf651e886fea1c62d8f5f3d72a7e5,True,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,547827178979ac42ae70c7b52755d9670a48ec355981927396ece77ea32e31be,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,d281879d0d7f4d071f626cbfb479546a702596e432eef84d2941f3a599e2b97c,Merge_failed,1649a83dd87d7f06bafd55757a01094343f915a6e88fe2b0d5260e9e0fb5e5ab,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,f11fb23c983874c0fc14534e3f6c7bd39bb8b333b4f17ff27e898878106eed33,Merge_failed,32de30109ce86f1fd0d88292bf98b6fbdd4be7fa928f5ff287baa4416f3a4990,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef diff --git a/results/combined/merges_tested/kaazing/k3po.csv b/results/combined/merges_tested/kaazing/k3po.csv index 6d59f31f88..c737139850 100644 --- a/results/combined/merges_tested/kaazing/k3po.csv +++ b/results/combined/merges_tested/kaazing/k3po.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268 329,refs/heads/develop,1b2a7eaed60d376ab87a8130c29b2ec957bca767,6f84f238da4c58feb35ea3fcfb882ed406d76180,cc79950f0d40b73fdb30dfe097e5337aa57fd4d9,,True,True,True,277,401,4540.0,3,True,285,Tests_passed,04ee2ace54bb3a086f6e04b05ed4108f4d350bfb74f0d6c7e0aed7bc74df5c14,True,Tests_passed,e7deadb731b20ea48f0af4f41ce58eada58ecdcf14b9062d5cde969cb44ad098,True,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,f7c26c4698b24c3a1e2e206d08230b53633407c234a181fc0879a4dd8559c82b,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Tests_failed,01088096240cffc5ef0d09500b73db6746f083ace630f7ef24b0ec478b0cadab,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,c855a83084cc3e5faf695bbaf76ff92c3fccaf0a16fc253bab06c72a4237b726,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a 380,refs/heads/develop,6f55ad6692307e9c8179c82d80b456c866468fb8,4624fce1a1d40d2266096adb5f489dd47327bc27,3befe53d068077af9ad41154da1e7b643c68752e,,True,True,True,2207,4142,44855.0,11,True,2207,Tests_passed,d27e072d1bda030093985d56af6b16f05576ab7476ca4a216ebdca6b440a90a1,True,Tests_passed,66e01a21920ac4f7f82f61059e150bf8490bf651e886fea1c62d8f5f3d72a7e5,True,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,547827178979ac42ae70c7b52755d9670a48ec355981927396ece77ea32e31be,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,d281879d0d7f4d071f626cbfb479546a702596e432eef84d2941f3a599e2b97c,Merge_failed,1649a83dd87d7f06bafd55757a01094343f915a6e88fe2b0d5260e9e0fb5e5ab,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,e7e7fea986fdaf17a305151e49df3dfdf4834a06e47a78be9113c4722282448c,Merge_failed,32de30109ce86f1fd0d88292bf98b6fbdd4be7fa928f5ff287baa4416f3a4990,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef diff --git a/results/combined/merges_tested/kaazing/robot.csv b/results/combined/merges_tested/kaazing/robot.csv index 5b744024d5..a42bc37f3d 100644 --- a/results/combined/merges_tested/kaazing/robot.csv +++ b/results/combined/merges_tested/kaazing/robot.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268 329,refs/heads/develop,1b2a7eaed60d376ab87a8130c29b2ec957bca767,6f84f238da4c58feb35ea3fcfb882ed406d76180,cc79950f0d40b73fdb30dfe097e5337aa57fd4d9,,True,True,True,277,401,4540.0,3,True,285,Tests_passed,04ee2ace54bb3a086f6e04b05ed4108f4d350bfb74f0d6c7e0aed7bc74df5c14,True,Tests_passed,e7deadb731b20ea48f0af4f41ce58eada58ecdcf14b9062d5cde969cb44ad098,True,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,f7c26c4698b24c3a1e2e206d08230b53633407c234a181fc0879a4dd8559c82b,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,4b0081537cc273bb96ccb8673d15eeeb58aea5a543e542bf89f319eb31432499,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,9690fb9c9ec7e49d0d9afb5cf18f9b724575efe395114e0f25958d519a918432,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a 380,refs/heads/develop,6f55ad6692307e9c8179c82d80b456c866468fb8,4624fce1a1d40d2266096adb5f489dd47327bc27,3befe53d068077af9ad41154da1e7b643c68752e,,True,True,True,2207,4142,44855.0,11,True,2207,Tests_passed,d27e072d1bda030093985d56af6b16f05576ab7476ca4a216ebdca6b440a90a1,True,Tests_passed,66e01a21920ac4f7f82f61059e150bf8490bf651e886fea1c62d8f5f3d72a7e5,True,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,547827178979ac42ae70c7b52755d9670a48ec355981927396ece77ea32e31be,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,d281879d0d7f4d071f626cbfb479546a702596e432eef84d2941f3a599e2b97c,Merge_failed,1649a83dd87d7f06bafd55757a01094343f915a6e88fe2b0d5260e9e0fb5e5ab,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,9c39b23b077308454949efe0783c7d26316c6a332095bc4d2c60f1178df8e834,Merge_failed,32de30109ce86f1fd0d88292bf98b6fbdd4be7fa928f5ff287baa4416f3a4990,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef diff --git a/results/combined/merges_tested/kamranzafar/jtar.csv b/results/combined/merges_tested/kamranzafar/jtar.csv index 9f27d4e69e..af4604e5db 100644 --- a/results/combined/merges_tested/kamranzafar/jtar.csv +++ b/results/combined/merges_tested/kamranzafar/jtar.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,aace0a3c8a6478fd1bac95865c27535e658afb73,8f25838636b85d3c504ec732e04258c61682b3cd,52872a151bbf6c9448f5b05b033db56ed9fa1fe6,,True,True,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,True,11,33,183,3,True,Tests_passed,d3db4984d1d11186836c08cfbf9fef75ca719a5c3140a891c1f4cebd33aa73fb,True,11,True,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,337f649756999c751751d5264c4af65575bbc1576ff5c7845a38d096af5bc4a7,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,337f649756999c751751d5264c4af65575bbc1576ff5c7845a38d096af5bc4a7,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15 3,refs/heads/master,8f25838636b85d3c504ec732e04258c61682b3cd,59e3f7a525ada0fc1e62e05de795e57762bcf5fb,46a20204bcb3c16a94371f21f919c2717274cc61,,True,True,Tests_passed,a841de0c6da0effa57a921b792091f28f9e794e2e69bf3d2b078269544f9dacd,True,8,15,145,2,True,Tests_passed,90c835d4115c583e0e1ddd6615c5f7adb16378073f8a5272fbbbbee1fd0017bf,True,8,True,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_failed,4971d188b11a7f8b78810fef00298f252bf844006055565f1c50c661f1c480cd,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e diff --git a/results/combined/merges_tested/kantega/pdf-converter.csv b/results/combined/merges_tested/kantega/pdf-converter.csv index 2f38c771ff..a390297103 100644 --- a/results/combined/merges_tested/kantega/pdf-converter.csv +++ b/results/combined/merges_tested/kantega/pdf-converter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,True,36,44,655,2,True,36,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f diff --git a/results/combined/merges_tested/kawasima/websocket-classloader.csv b/results/combined/merges_tested/kawasima/websocket-classloader.csv index 7aaf2bf7b4..2686503067 100644 --- a/results/combined/merges_tested/kawasima/websocket-classloader.csv +++ b/results/combined/merges_tested/kawasima/websocket-classloader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,88366037a581c46cd8de7463b50d29713e2e5c5b,f482eb2bfc2a6a85243adf7e4eaa77d918493868,685399d19d8c960926a6518f0fa8f76091034add,,True,True,True,23,92,1005,2,True,23,Tests_passed,a8a898766af5f842af256558889e192aeee5b0c52bb571507bd3ba056d1df960,True,Tests_passed,f277f6168d47d1e1f8565f5be25621c158b26d37927dbda02d25ce03e84b74f1,True,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55 diff --git a/results/combined/merges_tested/kbnlresearch/europeananp-ner.csv b/results/combined/merges_tested/kbnlresearch/europeananp-ner.csv index 268c64fa49..b5a46af697 100644 --- a/results/combined/merges_tested/kbnlresearch/europeananp-ner.csv +++ b/results/combined/merges_tested/kbnlresearch/europeananp-ner.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,f78e47209b90dc4b322b93e85efb5ea7628f383b,fb636780098aae681c337985206b47e15ac54e7c,e7bab88b1b829e0ba68234b00d71aba8300a62e3,,True,False,Tests_passed,51be7d333dce1777c70f841953f7b9e1519cd94b1a667c6f554aba800b73d4d4,True,4,18,181,2,True,Tests_passed,dab5dd6395b9270fb8a2c256f32ddb16f0caba3b0faef122dbce0dff3b464e49,True,4,True,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,b06fa1d16c7db16ed23dd0cf6b157424f485fc62401e92b2121b01e288a79cd6,Tests_passed,9c33304bf951d3bbfa925f1dafe2e6a71fa43ce99ef6a6a8ce0f454e9a78b3d6,Merge_failed,b573a6f20189aa9559b5aa26c3c13ed5e169279bbfb351482d897ba06833cb14,Tests_failed,ede796d75a72f6f0bed5352ec0baffb9f882891979443ab745e6f4f9115d3f5d,Tests_passed,9c33304bf951d3bbfa925f1dafe2e6a71fa43ce99ef6a6a8ce0f454e9a78b3d6,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,0cf91739e58e1e616f1f5649d6b43c3fb0b5b346f9274b6866512bb0bb0d0d5d,Merge_failed,b573a6f20189aa9559b5aa26c3c13ed5e169279bbfb351482d897ba06833cb14,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa 6,refs/heads/master,62d7c2a50fc75040d093e8f6ecc592fce3988da8,43a2d582de17af1c2e128a66ef40cb346e70ce9d,bab2b3182532ccf3cc63df5a00b6bdf47a72b630,,True,True,Tests_passed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,True,27,52,1060,2,True,Tests_passed,43bd862d980231f4c820a811ee7bc2ad999cb13a1a3fbe6555255bc0dbc58975,True,27,True,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959 8,refs/heads/master,02058bce7bad895e7b27640e4b1b3a4d68ca1cb2,92926c7587a95ca44dc3c2f775d0b389f60471a2,570ac140dea81fd34fe574bd0f2d58079f957ef3,,True,True,Tests_passed,6dd993b111288675161ef890ca4c38886ad949b7743e5f6a2906c088c20452c8,True,7,22,379,2,True,Tests_passed,c09ba695ebf587b21dc486a7f70e52a6a21e33335627c208e7760cd3817c33b2,True,7,True,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,44b7a393f5bf7e5b6afcece93cae6e32a344239e0ae67eef9479fa93fcf0dd28,Merge_failed,0f1bd0b98c36b6b35fb450127d2309fe2d5ca439fe10e9395502e8bbe175d982,Tests_passed,d710e65cb0384be06f51f167684ac8029a22bd08376ecd53fac55ce0a57ed4f4,Tests_failed,3e86356cc40b3f76d08b43a50b1f4282140082e0240ee22e4cf1d11e94facb4c,Merge_failed,0f1bd0b98c36b6b35fb450127d2309fe2d5ca439fe10e9395502e8bbe175d982,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,d6a83dcf13d06d8bbf06b92584f3064dfeda67e4a17854b98b35d6b1fb028421,Tests_passed,d710e65cb0384be06f51f167684ac8029a22bd08376ecd53fac55ce0a57ed4f4,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3 diff --git a/results/combined/merges_tested/keedio/flume-ftp-source.csv b/results/combined/merges_tested/keedio/flume-ftp-source.csv index 6ca876b0d7..0881322b3b 100644 --- a/results/combined/merges_tested/keedio/flume-ftp-source.csv +++ b/results/combined/merges_tested/keedio/flume-ftp-source.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,c42d3461244d422f2622e4ab91f6af09ac6c03a71711a25f488113e365d06619,Merge_failed,f4a5f74be4c1c3d51605f780b6600b6a31eb91a0cd2e8c30b08b92b7f5d13275,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23 6,refs/heads/master,f4c145bec4acce94ef00f97b814a511049b3b372,be8c09ffe539f24fe37dde84fc5d30309f02bb1a,59018c3f32045ac899032250a530bb095c7bd293,,True,True,True,14,94,1210,5,True,14,Tests_passed,43d54d6281107c850db541f4330d08b93727e70127cb4371c98b4905107f6cdf,True,Tests_passed,baf075cd3a4fed05e94de824ec4a705cf535a0800dc9dc6fa64a4796e8f5ccbe,True,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,27f31ed6ff95607bf4887eaa974e1572d48daaf91f812305a50b22a0be6604ef,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Merge_failed,26947d38abd21a6664dbf2be8d8c6bc3622fb30b678997e91acf6fccd63ed4c1,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,87467990e15eb4a38af3b00f73d1488219b2147899f1a64f2d6e92478f9dc24f,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63 38,refs/heads/master,65d75536ef5225314352bb18e8b03abcddab265e,75720564551f39cf872c10a181c33f9130f4ec10,30517761affcb1eb3d17c01bb0823c4a75ff4d24,,True,True,True,3,32,208,2,True,3,Tests_passed,e191dbe5bc09e81f8738d8a5acdab215bfecfb89e1fd807c14a5a4389a403e21,True,Tests_passed,916e14eb556256fc2bcbe595ef4c6a0fd3fd14119f60894fc4a2efb598d9cb4e,True,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,917b6a3deaf762bc517d4db1c8b6418bcaf2ef30abead834f03dcd418065e36f,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Tests_failed,9a2a06bb0b3a5c671264f34d29c714416390b53edbfccaf2697bbe76d7c79575,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,40b46a4090098265be7e029b4f177b8144630e34f82422785a977bd9fa50a20e,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab diff --git a/results/combined/merges_tested/keedio/flume-ng-sql-source.csv b/results/combined/merges_tested/keedio/flume-ng-sql-source.csv index 567b417001..efccf567c8 100644 --- a/results/combined/merges_tested/keedio/flume-ng-sql-source.csv +++ b/results/combined/merges_tested/keedio/flume-ng-sql-source.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/develop,c4b62bbb5c0c6836fa4eb17bafe43393d7c39707,fe0bca190476aa075751b7399c7dc197ca623948,a461f70bd99e74891b42d3df4304c79182e970bc,,True,True,True,9,33,189,3,True,9,Tests_passed,c1919dfc38af49491ab16a6358ea72a2c358a5e45adf164dea1289ebe06f0f47,True,Tests_passed,0a5659bcf8442e668398a7957a6c71b736f06c00eb41d5ddc517a688b8f80a47,True,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356 53,refs/remotes/origin/master,2ce9f4bbde8a973ec095ac8a1d3a99dd37e0f58a,8e2e2fb3e09fc90c302c592550aca122d3b9ee90,c0d4caab50a88ef5b0f47b67a4034eca9e7bc3a9,,True,True,True,17,57,1734,3,True,17,Tests_passed,0980a9957ce3a31af9c761620dbbffbf34aadfeb87d459f70738753b14ab8a3b,True,Tests_passed,00ee085c342a24f217d2e13c8316e5a9563132fdb20f9798021d007255d65728,True,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,e64a155e66bc3e874be3056c17db68b17454621149b404e0ba04f605f664d237,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,ae364a7f8d6efe795b8c26a1f2f48fbd5a79d25700daccf3e35e2a7621dcaa1f,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0 diff --git a/results/combined/merges_tested/kevin-wayne/algs4.csv b/results/combined/merges_tested/kevin-wayne/algs4.csv index 409f0dc1ce..5615b41e81 100644 --- a/results/combined/merges_tested/kevin-wayne/algs4.csv +++ b/results/combined/merges_tested/kevin-wayne/algs4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,False,True,4,4,13,2,True,4,Tests_passed,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,True,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,True,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f6a22db34ee0065c3a466ea39ecfed63d6499a9d6d1728d44ea3f7f3cfda6492,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f880f0dbc6b9491ecc3acc784ec8d91673ea0015065fc60e786c885e7e4c8061,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e 18,refs/remotes/origin/pull/13,f747b209db1cca23c5be2220f0d677f26b98696f,1d8be9146e5178b5b6a345c2ef3beabd53df2254,fbc8db7ca0a2a8e5277ff7fdfbb674c1e6cc2a6b,,True,True,True,195,519,1291,192,True,195,Tests_passed,b50f35f29eee61f6174d91da6af138077fc3fe433c768173f6814084e137f519,True,Tests_passed,5a20f297b1f7db7962c2e61a0655b04f18e1a79105af06c2dac95fc3e0347770,True,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,34b46faa1806132833d60712d5dca714e14e2cb9bc189e01a2570766a975bcc8,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,0ee7d7cf9352f30ee60e245849ab89d6d3a988432a704af81139c83a125844e4,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,5f20165c8dd41abe45f8d7b8166b9fc320a8bd620de81819c61b22923297f854,Merge_failed,0896a2c28037ea21dc3efa72756d40950066eecdad8fafe5c0342828f4e0e588,Merge_failed,7b8453a5e8be945455ed9c7e88441ca380af4667888bf942ea7b934bf70d407c,Merge_failed,608a506075727959fc648d21fe2f85300c85ff8c1e66534d1e85432b90cb24a5,Merge_failed,4629c3617cc41d6e8ec68d459c74fe4c75012dac705d3f221721cdc5a614ece5,Merge_failed,7b8453a5e8be945455ed9c7e88441ca380af4667888bf942ea7b934bf70d407c,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,0ee7d7cf9352f30ee60e245849ab89d6d3a988432a704af81139c83a125844e4,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,5f20165c8dd41abe45f8d7b8166b9fc320a8bd620de81819c61b22923297f854,Merge_failed,430f2dcf3722c5e66803b504514c3054fc36570ba686a3a39c467f77c5214ff7,Merge_failed,424acc5007f1f64ddb786e0dd989958700775677b0ec0a8bb172a85d4f34a205,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,34b46faa1806132833d60712d5dca714e14e2cb9bc189e01a2570766a975bcc8,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e 19,refs/remotes/origin/pull/31,e71576186d7f206ba7957efbde9e87ced4313f10,55cbefb6a924cc05999914a03e0ead401ecde308,3d06ba348d4cb9473c6ed9397919b4fa861ad5ba,,True,True,True,44,261,881,2,True,44,Tests_passed,3eaaf4bbda457e33a6b52a720295f5e69c0c77897ec98e276e11839f9a52754d,True,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,True,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,17ca4641743c5ee1621a8702d2b27ada7db78f9cc2ead0193d5b00eb8825f602,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,17ca4641743c5ee1621a8702d2b27ada7db78f9cc2ead0193d5b00eb8825f602,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae diff --git a/results/combined/merges_tested/kevinbayes/vest.csv b/results/combined/merges_tested/kevinbayes/vest.csv index 49710aa0aa..63e5ac8e68 100644 --- a/results/combined/merges_tested/kevinbayes/vest.csv +++ b/results/combined/merges_tested/kevinbayes/vest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/18,3209c8480f0f7a364ff86db4fa1c5762026347a9,0e314832855cbd12a9989ae2d01d27ea825b4c6f,c2c2bbd61ea75d1802b45fa0aba03c8dabfcac5f,,True,True,Tests_passed,71aed7b4c882099618f2b1d575069985ea520c9dbb6f3dc7e7a7e91aaea1cccd,True,6,14,284,3,True,Tests_passed,73cf9cf91b2db95a30166e86a88c21aa43526465e238963bce11362932a31e2e,True,6,True,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd diff --git a/results/combined/merges_tested/khmarbaise/iterator-maven-plugin.csv b/results/combined/merges_tested/khmarbaise/iterator-maven-plugin.csv index e01b752d33..c18450af70 100644 --- a/results/combined/merges_tested/khmarbaise/iterator-maven-plugin.csv +++ b/results/combined/merges_tested/khmarbaise/iterator-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,99d1681276cd909ef4061373c1584c047d898356,380156fe641eb5b936b5becd9e031c268a12db17,5e50ad9cdac0106e3b43f3172c3b8f97da1dcb9d,,True,True,True,4,18,115,2,True,4,Tests_passed,6cc03b238709c2c719e13e7d2f1aa91ad30e8d8a44ba9be58733c7ffa0031515,True,Tests_passed,15c9b37931bca59af69ce54b24423e71651be937d5863e0717fac9c7875e36e1,True,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_failed,f0b8e6eddd1f7d8ffdcb17983e8de50ea5efd01fdf37304133cd8271c4d68ec1,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea diff --git a/results/combined/merges_tested/khmarbaise/maven-license-verifier-plugin.csv b/results/combined/merges_tested/khmarbaise/maven-license-verifier-plugin.csv index 16d23fae4a..2f71f8e4de 100644 --- a/results/combined/merges_tested/khmarbaise/maven-license-verifier-plugin.csv +++ b/results/combined/merges_tested/khmarbaise/maven-license-verifier-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,0329bcf4b7d1b8077d22fe8580d37ea103328e79,ce8439dc6634eb06f4cd61edfbff3428375b2bf5,74d5f5be15757b3a648c9ce5242e2e65268f3aa1,,True,True,True,16,58,693,4,True,16,Tests_passed,23d664a3f5daa87048857f20e1128b8c2efe3fc5db64fb2e149e4978e04eece1,True,Tests_passed,b2ee79543a5df69c698faeb7b18aff30ce87a04ef953bd01c3702312c3ba61c1,True,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,fa27f025d59f74c522bdb23880b526ceaf45cdb0df3e878868e5476fae509f8a,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_timedout,,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,d0c2a0df3aeb58cc0de4d0d61805ed8763110d1a96ba8de7b725e85cc3c21c2e,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d diff --git a/results/combined/merges_tested/khuxtable/wagon-gitsite.csv b/results/combined/merges_tested/khuxtable/wagon-gitsite.csv index 575ae408e8..1fcdc2d0bf 100644 --- a/results/combined/merges_tested/khuxtable/wagon-gitsite.csv +++ b/results/combined/merges_tested/khuxtable/wagon-gitsite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/18,c94bcd0245b4844ab11ed21275f886cbbf21c9e4,d5aa326489bb43f65303736331247706d7dba123,c24ca067a932b0342131923e2eaa7680368233cc,,True,True,Tests_passed,b00bf9e8e4dda305f8491325ee402aa038e852ac6b620b96127fa932548916a4,True,3,37,137,3,True,Tests_passed,8202568122501c76010d3a16a78213fce4e5351878d736f1e27fe6f54f4926c9,True,3,True,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_failed,2fd4f317ccf3a02add05336d33872cba3d2b21307a02716635481e1136a41ef8,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258 diff --git a/results/combined/merges_tested/kifj/jboss-syslog.csv b/results/combined/merges_tested/kifj/jboss-syslog.csv index 9c83494748..e8c4bdc4d0 100644 --- a/results/combined/merges_tested/kifj/jboss-syslog.csv +++ b/results/combined/merges_tested/kifj/jboss-syslog.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c7b3272555db107615303e60fb0a158a763deafa,84b9ad6265e15bc9766e909625dd7557f7cfe7a9,07f3c2f3c3d8f4558bf34a77f38ff01d8fec69c7,,True,True,True,2,2,2,7,True,7,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,True,Tests_passed,4fcbc0daad0a898a5dfb7f7252d1a5eac83342e63123b30e2d087c8e93c3fa99,True,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,3f90756fef11e1699c9c2ef5fab1d87032c5d47bbdbd6d5f907ae2b7fd901d37,Merge_failed,53a61ede1d7a01bfc887a827d956709d746c7004791182c84169025b67e1a7c2,Tests_passed,967163b4f0ebf9524bf307c7fa998a6e36e2d82e75ee9e4f98fbf17aa693b25f,Tests_failed,eab6c468e6ac3183c1c924824d889706f69e0856f068123178928c15b30a313e,Merge_failed,53a61ede1d7a01bfc887a827d956709d746c7004791182c84169025b67e1a7c2,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,cbff75db35213bb1a8772ade59c3fa04acd524ec4cd4db291d1a6ae5467531a5,Tests_passed,967163b4f0ebf9524bf307c7fa998a6e36e2d82e75ee9e4f98fbf17aa693b25f,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620 15,refs/heads/master,b0a5f59bc365dda96b4051495d15fbc46f36cd27,ebedeeed422121087bc3be855ec363c8c0213601,bb26bd84f7ec09f94959c87d4a4fd43af6b3994a,,True,True,True,2,3,10,4,True,4,Tests_passed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,True,Tests_passed,521cec31d4f89b12dc48e058eca3cfcc81f6bf21d96a916dc3810218ccc1c868,True,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,3e40f5541299ccf0385e14249ce8b7c0ea9aeaa508530e2cf99a092fe1127c2e,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9 diff --git a/results/combined/merges_tested/killbilling/recurly-java-library.csv b/results/combined/merges_tested/killbilling/recurly-java-library.csv index 51ef197777..79c595e7c6 100644 --- a/results/combined/merges_tested/killbilling/recurly-java-library.csv +++ b/results/combined/merges_tested/killbilling/recurly-java-library.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,082db8c4c022ec85d57f31bd143cdf9af44d611f,776bb456c86504d3e862ea81fd2e47f193c36a4d,9aff7d4d3d1d7567909fb0c8e391d139c22a7af0,,True,True,Tests_passed,0d11680f4399a583cafbcafb12abb5576d546d3464ab772cdab699c91a3bcdb9,True,13,35,534,2,True,Tests_passed,0b3dcc13e64da6d7ee9b87eff212b954557f8393d3e3c55d40db6e761b54d142,True,13,True,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,51b0170faad2186d963b5ffa40794dbdfa3063912471594d88a869b81fe88546,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,51b0170faad2186d963b5ffa40794dbdfa3063912471594d88a869b81fe88546,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f 36,refs/heads/master,eca37e42a2b9072eebf09e4c400b0331189abb5b,bd157312d98336f263b3073a7d6342ddbf8e6ee8,6e8fe82d485b8b0563be7aa88e2bf0c5fb16b2bf,,True,True,Tests_passed,08d1059f244f0cf690e6f73808808e8efd5ccaceb12426ef6970d5e2e8645c4d,True,31,133,1233,2,True,Tests_passed,be50a72bedfdf43ea94965e20f947613e5188a81c18c4d4e27fab4947333e99f,True,31,True,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,4591e990b30c086c4424dc2eb95607ec21ef0e4398eb4cc909e0c42a1bd1557b,Tests_failed,caea13386d24b4e36eba5419fb22a1e56bc3ab7c8e5dc1d3045c65baf8e494c3,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,4591e990b30c086c4424dc2eb95607ec21ef0e4398eb4cc909e0c42a1bd1557b,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4 52,refs/heads/master,ac45b727dad1b6d1c67333d133603ab2c389d4b1,a1993dcef73a6e4ee2d988438b02718973995f5f,f1b70177494b2008d82d67b78f5877c641f10b78,,True,False,Tests_passed,1047748447c14ecf61ec4ac4fc3b3179a7d093862d023ee7f47f93fb6cd68b3d,True,6,12,106,2,True,Tests_passed,4eda689e52cb856873cf0d56ca8ad2bd0c19fbb72a485a6c4e111f65f0e4b617,True,6,True,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,d0148b172a2058bc327ea9cea0970e5f1b809d941fc54402adc6cd5c29869f8e,Tests_failed,f7f676b2f4c71b06ab4e25d8257a602fb3a0b52279ad5979753b2d43b558f3e4,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,d0148b172a2058bc327ea9cea0970e5f1b809d941fc54402adc6cd5c29869f8e,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817 diff --git a/results/combined/merges_tested/killme2008/aviator.csv b/results/combined/merges_tested/killme2008/aviator.csv index f4893c185f..ea04680d4f 100644 --- a/results/combined/merges_tested/killme2008/aviator.csv +++ b/results/combined/merges_tested/killme2008/aviator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,d4415b36930d0d13221d1b74083d8152292138dd,fc563acf7b7a2f3859f7fecba88b44a28b9879b2,7ddd4fabb2f4ffd82ad61df6e3ec1132d20f9b35,,True,True,True,54,271,1166,4,True,54,Tests_passed,75e722134b9da983206e6087fbbde66ecb4d38690bc96cb9bb549a01ec485b4b,True,Tests_passed,c6ce8b3b2b99c41b4fcd43a4e32d5efbd503159adce296030c1b081ee1d39c63,True,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,e930128edce51c8757b29c934116fe3c42019f3657b05fb4ac322d91b259a579,Tests_failed,f26bf0444bd620e257d131981bdf0985d1e669a0537355349d0a092d472da8b5,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,e930128edce51c8757b29c934116fe3c42019f3657b05fb4ac322d91b259a579,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7 19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,True,72,169,1913,2,True,72,Tests_passed,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,True,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049 64,refs/heads/master,8b16f5427c044e74265c127110b814b4d25b2e9e,2b1dbc1ffbafd8f0e93b63f3609f5b3aa0338800,fbeb07d91da5e6cd3d88a1ce1bc4a1bf510fddf6,,True,True,True,25,38,978,14,True,33,Tests_passed,37cbae6b3251539139d033a9b270485f60166a49e13a5f20b043846dcf967d3f,True,Tests_passed,94b886ddc4ff521fc20c3f50a6625c4671f4378695a270f65ceb505b69c06f64,True,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,10d468adbac921a875569a4a9bc0838cb85293bdce32a5b454105d04fa9bdb75,Merge_failed,276f4d5b6c208e01bbc5d18b8588bcc57881362a6baa58ab2638b35a04630a49,Merge_failed,6e53560aa729164c37c3fbbbd7e96d68bbf00f41d6a447005b575101916c50fc,Merge_failed,7024167c17386b9022c1326b92ff78c896e3a254e9646b75a6b355a888c3f6ec,Merge_failed,276f4d5b6c208e01bbc5d18b8588bcc57881362a6baa58ab2638b35a04630a49,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,1222a24579c243d0522693fc87a6fd06baaff7b0f49e046fe992711754fe5645,Merge_failed,6e53560aa729164c37c3fbbbd7e96d68bbf00f41d6a447005b575101916c50fc,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7 diff --git a/results/combined/merges_tested/killme2008/xmemcached.csv b/results/combined/merges_tested/killme2008/xmemcached.csv index 4f2d5a0de8..b3a4a0732c 100644 --- a/results/combined/merges_tested/killme2008/xmemcached.csv +++ b/results/combined/merges_tested/killme2008/xmemcached.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,b9e0c0c8b216855a15478361d5528b62688b9f4b,9f108c974c8bcc1f17ed0b202df0ea0a669ec65e,eef7bcbe4341da1a9bad3e5b30781bf1e381ec90,,True,True,True,22,69,1208.0,2,True,22,Tests_passed,78f5fd833ef4083e296242256078379e4ce043dd2e5f6f2f9e0f07ec5c937e8d,True,Tests_passed,911ed6fe66d5c9ff285ab292254578c250115a8fe9eca28f75942eaec65fb2e4,True,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24 diff --git a/results/combined/merges_tested/kimshen/sissi.csv b/results/combined/merges_tested/kimshen/sissi.csv index f5655dd1e7..75f001c0a5 100644 --- a/results/combined/merges_tested/kimshen/sissi.csv +++ b/results/combined/merges_tested/kimshen/sissi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c00c2e6554f121dc4bbb4fb2549738e1b1ec639f,73d171b086455c3d56fb7554ef823f875663b4e0,eb55eb9b6f00bc2435d9d65b521ca592f9138e01,,True,True,True,14,48,242,15,True,23,Tests_passed,290830813490792a7cf33b82a6df8bdecc6d7cd87d92cf87918f9b5e8e19221c,True,Tests_passed,3225e85c3d0c3c718f84e1ebb2469ce0deed53e245e01c8161c47842796f0eaf,True,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,53d123afb24f47d961ea8942afd8fc2c33be2e18cfc47ae8edda13882fc9769f,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,f759f8150b16fff45b8fad620444707010efb021440b02254f025e2fe2539cca,Merge_failed,e19034a478da432bfa81f19fbd63a2e00b0453c1a74fe2aa72f4ff079518914a,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,b861bb35c904e4e253b1285732a05f8926c834fdb9ea56be18898bb813159f86,Merge_failed,be6f8d1ddb5d0cb5299502a6267c2f943ef235cf228a9c9cf962c0a076a9f14e,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679 diff --git a/results/combined/merges_tested/kinow/testlink-java-api.csv b/results/combined/merges_tested/kinow/testlink-java-api.csv index 1969be93de..c94edd5c0e 100644 --- a/results/combined/merges_tested/kinow/testlink-java-api.csv +++ b/results/combined/merges_tested/kinow/testlink-java-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,85223b0a9f6798169dcfe409ac99ad5d8a8cd227,417b80f0dfbf97fc2091de960968a9b7cb3edb7b,48efcfda475a4f8e55ab4e48f0ba3a643e0ac205,,True,True,Tests_passed,b343d4b8369f83f9363afdcec89b0eb23fb45a8c119f9e8ff0e627610de43c45,True,96,976,7373,4,True,Tests_passed,e05e5b57495e5196ddd011e1011cd7ac8d9d3303e14c121e08259316bbd9ed78,True,96,True,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,6b431f38a48f544fc09b12dcedfa8165c1eeb791c2a04d16ffca3e6b4d8afc2a,Merge_failed,a05ed91d98f9f8c5a9d06fc0814a002b542fd54eeb0c956d2d95e3dacbc0fda6,Tests_passed,3798bcda3c549eff74b07b8bfb6e029f7af7f4d519afd7a79326a8a47199d239,Merge_timedout,,Merge_failed,a05ed91d98f9f8c5a9d06fc0814a002b542fd54eeb0c956d2d95e3dacbc0fda6,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,733e24b85d1beebb1496f6992795fbacf64493a78284de440db7e55b8bbf9c9f,Tests_passed,3798bcda3c549eff74b07b8bfb6e029f7af7f4d519afd7a79326a8a47199d239,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd 31,refs/heads/master,c8219ee401dd1f5feac814af4f6294e7d57abe2b,eb9ac19efb822f141aa71fbe3495f428a889ae55,8aeca53cc5da2e39fcd102387343c5d6b40f0213,,True,True,Tests_passed,c75efdd969445a5e814073b74bb4b2806bf1d2c9c3c29451bbe5c17babc5d863,True,18,114,635,2,True,Tests_passed,bc57d9d0286bb6c4014169bc7bc51d76cafa243431b1ea2ec64543bf9c1693c0,True,18,True,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd 35,refs/heads/master,192242bb6b260af7a870650706e6f2459a446cc6,97c67d946f8871efd235dd1e3c132481138d0600,f57400754b92515f8d61d19c009d0a0f65487ed6,,True,True,Tests_passed,c2e88347666258e03b34d8253d8ba9ec4f86d27e43aaba0224f0db269934dac7,True,14,46,358,4,True,Tests_passed,1bad92bccc6b8cceea3745b0ccf459a6f80144a85e61fbfb0cf6779ec649c2b7,True,14,True,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,b49e0fb44c22799b47b3ab1a04df6c5769cca046ba6dc9fe093f98a37a640d1d,Merge_failed,6301e22f027bf64d243b5971fef1c5e4f223f7bbe51b57023220205ffd52d5ca,Merge_failed,d5e7bfc14d031d2a7d4673ea882315231df794b948fceaca339055b8f7b9db6f,Tests_failed,3629dee54a532f874692bdc5b4bb7d2b7c7032f063a5d014bd420dba82c86a65,Merge_failed,6301e22f027bf64d243b5971fef1c5e4f223f7bbe51b57023220205ffd52d5ca,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,91470d97a6047455938e9961fa9e205564d226f64b7b3e434c91e2800321de06,Merge_failed,d5e7bfc14d031d2a7d4673ea882315231df794b948fceaca339055b8f7b9db6f,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf diff --git a/results/combined/merges_tested/kohsuke/access-modifier.csv b/results/combined/merges_tested/kohsuke/access-modifier.csv index 6f891307ea..e5ed17cf0a 100644 --- a/results/combined/merges_tested/kohsuke/access-modifier.csv +++ b/results/combined/merges_tested/kohsuke/access-modifier.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/remotes/origin/pull/52,38876ed95a6d2e7c44d433fd0cc347ba6131907a,dc8ec3bf1c16e3ffeb9909f74fc56a124a76ee82,0d849fdb7804e5fdbe23c73fdfedab89c9ca4aa0,,True,True,True,32,124,574,4,True,32,Tests_passed,1bf7715248dbf26db4ce507496002d27d4a403eb73736847e082cf4a386ee068,True,Tests_passed,57eadde338c7c5b167b02b0571cb005cb8f935462f4fe09edba18d179487510f,True,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,b0a5a231cc11a944ac3b4c50bbf2bbb685398bf4600f99bf6c0578443cf24547,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,f28cccb04b6c10bded8dc449c399f994256fbcd102360c7385394d58075a1476,Merge_failed,6c365e1a7378ebb22328ff93bb668b421b6567e7c8f6fc20d2469bf7a04a6c73,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,6df49e0a9f6d1e61fe7de9ea6d5541e4c889dc5fae444e5ce89c8a4be796d4fc,Merge_failed,f5595b23d881ec0b72d84e581a2098f1e821f520e0bd44f749b59ac471b6bfbb,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340 diff --git a/results/combined/merges_tested/kohsuke/file-leak-detector.csv b/results/combined/merges_tested/kohsuke/file-leak-detector.csv index 0cbd5757bd..abb9d0d2d4 100644 --- a/results/combined/merges_tested/kohsuke/file-leak-detector.csv +++ b/results/combined/merges_tested/kohsuke/file-leak-detector.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,d76ad63466cf23012237a78f23d30f6885072c4e,d2c1e07c9626c495fea7c7c9aaee7aa30c2e96d2,24f774257f6c21a70b3ed0d0cb28970370149aa9,,True,True,Tests_passed,a653ee396855d20affe93ff72068e8c5f3cf09fbf855a7721888ffd492913a3d,True,15,56,446,4,True,Tests_passed,d13c3ebc8f84e90a432b0d7aa35f6159adc45a29efbe3e510b7529055b51ae36,True,15,True,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,24e0f2653fe1fdbcdc7f63d5f736d942c0185eb9d549a878c5eed7b03ea73587,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,16a206466ea98bd84d957ccec31a41f40b07a9b70bcc9785c329873ba4a68525,Merge_failed,d815cc8544166c5f21d97e070672de3439a71a3c2b0eeb3097dae3922acbf427,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,12422377752b721c04ed3126d1cca66899b77251bea2ac40596bf58e56060117,Merge_failed,9dfb719b3cc8a3dbda3f1e5fc5928fe6b5390ff6e7d81fa8584a4a046445d584,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96 7,refs/heads/master,768944360be1d5e82dccfe677341b8ca38057f49,dbf2f24f4c67a4ca26d6c25dce2d3dde74a4f262,a23c562281b1317a68a9743b0120635b8204aca3,,True,True,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,True,10,36,357,5,True,Tests_passed,c556b6d9afbb674ab09fd6ae415a979b1305663eb28783006aa4eeefa9801ed1,True,10,True,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,93e8457636dcf284fcd77b84fccaf3ec1fdb28e055b677f0624ea7f9e6e0a531,Merge_failed,9b3dca4c990a787e4eb8a304f0d7102c9f9486523baab4cade215526c060f411,Tests_passed,9a93062bad8759e7c919c74cfac2bd30e7bda3cb36877c5db867bed4388a2264,Merge_failed,701a044cb558c31306472ed93684e7e7150f2b25b22de9ff8979b00c63fd40a4,Merge_failed,9b3dca4c990a787e4eb8a304f0d7102c9f9486523baab4cade215526c060f411,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,9de11b9bac1b2eeaafd405344ba625b7b2f5af99309d8845943570be68b18efd,Tests_passed,9a93062bad8759e7c919c74cfac2bd30e7bda3cb36877c5db867bed4388a2264,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935 8,refs/heads/master,dbf2f24f4c67a4ca26d6c25dce2d3dde74a4f262,b5c34d09d30621295ca0c63bfdb9ffa62e46d739,639c672f9e50e842150a4a77c781222179886ac6,,True,True,Tests_passed,7b678fe51160865383457e23a22d75b5bca397e69c32c17daff5f0d43a0fd6ee,True,8,20,173,2,True,Tests_passed,de2a49311e08ff64af7e426cd24bb567ca391e201208e040409af0f04a919c70,True,8,True,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,ed98a507469f4be13f22a2f688bf2612aae66b20570b60bbd883ea6d451ab5f0,Tests_failed,8f444a7c85edfc136ece2d5c0ec17f0b4536599c54e0a4c965539225083140f1,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,ed98a507469f4be13f22a2f688bf2612aae66b20570b60bbd883ea6d451ab5f0,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a diff --git a/results/combined/merges_tested/kohsuke/github-api.csv b/results/combined/merges_tested/kohsuke/github-api.csv index 126922c3fe..e6e9f36a78 100644 --- a/results/combined/merges_tested/kohsuke/github-api.csv +++ b/results/combined/merges_tested/kohsuke/github-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/main,ea17ade038c1d67b617afe3943ebf62f22bc08fb,dc0a8fa788f6858f2b04eaf5659ae9124e59ef27,38baf5df845a1397522e1e953b84a80fb57a8799,,True,True,True,150.0,181,11496.0,4,True,151,Tests_passed,467cf4caf9ae4d4d49ebf23339d479dc2e92116fa2a92aeddd501361bc0af8ef,True,Tests_passed,3a597c16e497798b3f9729c32f4a3a693476bef980ae96e9b9ca9d0f89264f3a,True,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2 72,refs/heads/main,b898bdb20cd3d7dac96f527c008c14753895279d,c4b946455964e13ffacce009c866630216fbd431,1dcedba6a1fa7aac2425dfe116cb9026f3591e49,,True,True,True,42.0,53,1988.0,3,True,42,Tests_passed,a9b7e66836005745c9578399a1874122364e159cbbbee60f0cbf495598b544df,True,Tests_passed,a0feff9044378b354df7b404f2171159a4ac11560bc1e921e915583504a29195,True,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1 143,refs/heads/main,3865f6056a22fb5cfcff4f32777a059e856ba60b,b52ee84d3015fbf4441f768b6e7eadceab055ad9,54902e845b691d425e27df9a624f8b1013f960f2,,True,True,True,36.0,70,2475.0,2,True,36,Tests_passed,1f1c4e260964bb3ae52c5985b141c1e2672f224319bec9306b547e903b633da5,True,Tests_passed,450ac4fe7a9d98a210b639e6e0fe5c48fe2505e65f5d479c7bfa24cea12c1c85,True,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_failed,f7d86c08e4a9e06de9c3c1e531ba36a857521c1ab58da409f39a22f374af5c47,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a diff --git a/results/combined/merges_tested/kohsuke/groovy-sandbox.csv b/results/combined/merges_tested/kohsuke/groovy-sandbox.csv index ce60591d7f..de736da8c7 100644 --- a/results/combined/merges_tested/kohsuke/groovy-sandbox.csv +++ b/results/combined/merges_tested/kohsuke/groovy-sandbox.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,6c8ab911380474724b7b1649c644e02ac55bf599,017bd009294c4fcb56474260f6c0358bbad252e7,b84b9562056b0feec65db9a5201403ea3a4da459,,True,True,Tests_passed,0ae83806fa3cad134491cb38880b788ae90d1f11d5db56f676ec4dd447257d5e,True,4,17,138,2,True,Tests_passed,06a143fef81af841cb8430dcce5bd698373848e343d104c8578a0158f6f78cd2,True,4,True,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,cb31b0652a5429e41ec8866b05c346bb8b81635b1d71891ec60c5f52755f5691,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,1bdb73d44389acc51c5b13cd87d75f0412e10c1d2c6133832477dd1d5b498c67,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,d0a150beb1e77731fad4cc17a9a5681b62ca8e64c02ee9c18ef47e14e52b2ec9,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815 13,refs/heads/master,190dd89723ff482833d785bc8513097d6441f83f,a143ec39aae8985dd51c9cec954620de032a6dd2,67c7335dc15e5d5fdce2fb7db103a1cc77eccce1,,True,True,Tests_passed,786638ac1b60e0cc934355482ccf29dfe4e6e33b246aa1b869551edbf7ca6a48,True,9,57,689,3,True,Tests_passed,9cf2267b06fb40cf7fcc475a1b2ea4f75315f3c73116e85ff61eaa855c3b080e,True,10,True,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,7c6012b529b661d5ab37e598844881fe99c96f2b1e187d39060c8894ec3b2808,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,7c6012b529b661d5ab37e598844881fe99c96f2b1e187d39060c8894ec3b2808,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8 39,refs/remotes/origin/pull/60,630268ac307493a3511ad78b5ba9494fcedbe2fc,1f5ec534e80c50bdfeb7b992b8c3d773d72fde70,6cdba35c25e1ab57acc009609758295b5c517798,,True,True,Tests_passed,4f873a34bf1991bfce8054d850745e44a0ee06269989b9ba463333b4ea90dc86,True,28,116,3122,2,True,Tests_passed,16064627f72c8da1e9ef594b6071f1cfc491686d997530f54f056b428e3f36af,True,28,True,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,13b48909c3d2de4fd3801dfe7bb1b68a83801ff8c079ba76a0599721c37653c3,Merge_failed,490d9ac20e4d9d572d9ab863c3917818a810845da2e0825a444e22c12bd4806f,Tests_failed,14092b09a2c00ea85702bc69b1fc5de7ae9942de481ed02423f988307b6714f4,Merge_failed,f87a8f595cf1638891ff88117237cc1f263403d63e89eab1f27ed0c344e39acc,Merge_failed,490d9ac20e4d9d572d9ab863c3917818a810845da2e0825a444e22c12bd4806f,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,345e6358c9558b9b62ecccff8df551ae70112fca03d6f497d34214d0a752a516,Tests_failed,14092b09a2c00ea85702bc69b1fc5de7ae9942de481ed02423f988307b6714f4,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d diff --git a/results/combined/merges_tested/kohsuke/libpam4j.csv b/results/combined/merges_tested/kohsuke/libpam4j.csv index 61314abb8b..92c66c1b42 100644 --- a/results/combined/merges_tested/kohsuke/libpam4j.csv +++ b/results/combined/merges_tested/kohsuke/libpam4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,43d35c217451951500d0cb1246602c42494f7a28,02ffdff218283629ba4a902e7fe2fd44646abc21,ef7b1229da5f41c7119e50dcef04befac3e7104f,,True,True,Tests_passed,81c7b7e54b68fb0dc7b5cad970618eda54cbfb1d543f16a4b509ac894fec1729,True,10,23,114,3,True,Tests_passed,de6b809ef9ff0c032039c7920ef1579b17afd63e0cc2bb58cb1590b2df7b53e9,True,10,True,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,097475a253454f650502dcae3858f4f94003d9c493589516a53c27c26c6045eb,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,4227177f380a169dd0a2e1b54131f2838fdaa13bd90b2f1b4bb5e19ab9f4882e,Merge_failed,663cb42656fcca760ed7ffd19d5d029a2a80ede6ab0bf66facfa2262a3eee5ca,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,43dba62ad666d92c85366a9c380af58c5874a33fec3163b4fa7ffffd6562227b,Merge_failed,9ebe843b9c76911d1d343a8b4cd30a5e666a2f0df0a270fb80b36a5a3a39661e,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc diff --git a/results/combined/merges_tested/kohsuke/winp.csv b/results/combined/merges_tested/kohsuke/winp.csv index 96f5f3cecd..7954e1b590 100644 --- a/results/combined/merges_tested/kohsuke/winp.csv +++ b/results/combined/merges_tested/kohsuke/winp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,a9e44d3094143e4bf8e892f3d5e4fa5a12dc6016,a95c8dba746547b90c2a273de5d0355624db521e,7a3043b5436d2208b75c64757085397834da92b3,,True,True,Tests_passed,72aaa5f2cc0212835074c0d5d2f25bd9cf6354040970a5d06884d3535fd4777a,True,9.0,23,102.0,4,True,Tests_passed,e3ef25d1eae44c12f5ce1f0591a95dc739af299d75340f1deaa30982d1054fdd,True,9,True,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_failed,12aceac0f491bd0a6d513aa051b4a51197c10197d4adc57f66352e9cee634edc,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852 diff --git a/results/combined/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv b/results/combined/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv index a94dfba4e7..d890acdb6c 100644 --- a/results/combined/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv +++ b/results/combined/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,743d56eac95a68af7ffe11e395d5aba05f09aac6,1ab406e437b5c46cfce99a86e521f65301896cff,30ede8b5ffe4977ac8bcd52eafdeeb6bf6632d4c,,True,True,True,7,18,45,13,True,16,Tests_passed,5690527142024ea24807b8a4bc25eec15c0c689e38f43b702a1c8c6c379f553a,True,Tests_passed,9ae83591b36e9dde6623128728e585c19eb0b7e275e70073d0cc5b8ae2a567b7,True,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,ff4595d6aa0f7228c3da9407d10bd20306f9efa5eba8760e41db77c57a779da9,Merge_failed,87accbac992662e32385d4bdee433aeedd60eebf4278a81e94cdb14eb6fedaaf,Merge_failed,90a54ff704f38759c9436be3bddf9c31caba79ba732d999299f53749af3bcbb1,Merge_failed,88feed0bebd4b0af0a8e65aa132cae15acbc30c35cd3d6b1f6ba2f973878a9fc,Merge_failed,87accbac992662e32385d4bdee433aeedd60eebf4278a81e94cdb14eb6fedaaf,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,ea9ae0acd76b9d085d4561667cd7dd587f34b23637c28982246ee535fce83a57,Merge_failed,90a54ff704f38759c9436be3bddf9c31caba79ba732d999299f53749af3bcbb1,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004 18,refs/heads/master,78c6fba5414281cddde8139a83318aeb0a6dc9ec,d806f03e7a360c67e709c49706911c7dfca7ab98,60c85b75e09af9ef6ba466f20117cb88755bc234,,True,True,True,16,36,346,6,True,16,Tests_passed,7311fcb93550e1e073ea621985d3777de76dc658ad5d91abfd3d0ec5e23bdb0f,True,Tests_passed,7a4fd0a7abc0e491bb865f0686176b40d2b9f9079fd08e4b0f787e3ee4660503,True,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,30dfdd0e4dd032b1b2b0d5e1c8b3c806f58e9b6aee223f7206c1153f82313721,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,8f9fc3c1cc81a45b91cde1057a3ad68622f5f78c283bf3c318af772d4c3081ea,Merge_failed,351c29d4f4053c3e0ede98aeca5d64a87b28d83dc2962a734447ae00912afb2d,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,488386b42e4a1e675e3b3724aa046a8c51bd7a4e2cb359dade66b35a8d009225,Merge_failed,d69c3044418460c9aec3dd9cabcd9382a8444d3a9622e807e8b8b4ea7f37f368,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3 diff --git a/results/combined/merges_tested/komamitsu/jackson-dataformat-msgpack.csv b/results/combined/merges_tested/komamitsu/jackson-dataformat-msgpack.csv index f0eae801a2..fb6d39100b 100644 --- a/results/combined/merges_tested/komamitsu/jackson-dataformat-msgpack.csv +++ b/results/combined/merges_tested/komamitsu/jackson-dataformat-msgpack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b536174c01bb4f98681e9cc8940e0be97436b00a,7d4d9b6378fe436d8a68540cd75c811bc3220392,5a222d4b2483d5ed946d6cc34db5f8aedf15ebc7,,True,True,True,7,26,140,2,True,7,Tests_passed,ce7ddf26a009ac69110f813c2ca8911a1c19a9a26c58a7d0525bf66660e47e46,True,Tests_passed,ffe71aec2cc0ebd6fa9539eb48341e6480545d1880180937f0276d7aae6068ea,True,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_failed,24988907656df9b7f4a959dd00ac4fe7da5084d46c704edcbb01f3f133b73fce,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd diff --git a/results/combined/merges_tested/komoot/photon.csv b/results/combined/merges_tested/komoot/photon.csv index 54532df549..b37d43a3ae 100644 --- a/results/combined/merges_tested/komoot/photon.csv +++ b/results/combined/merges_tested/komoot/photon.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,5a62f4ededc96a9d8ca67a4ebbf4d7f537e8ad42,3a0c2e7c4a633597ff1c9fe5ac8f768f298b9d0a,06157909242b5db314c9e9caabd0abcad75e7348,,True,True,Tests_passed,629f212f89c64c8a65bad61a09ce9b12d0b6f93303ee14210cdb83d9404ec6f1,True,11,19,389,2,True,Tests_passed,f38f4f9336f6241c11faa338ec12e01956434d05e6dbefb3e0bff1d818a360b6,True,11,True,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,837a98dfef9c8fc5f17bf2681ef39e8448807563c7f116fd98cebee44cee30d3,Tests_failed,8b8f6c03ced3c8504318aa89a9f913c1bf0640d66ae955d607be4127adca602f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,837a98dfef9c8fc5f17bf2681ef39e8448807563c7f116fd98cebee44cee30d3,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f 57,refs/heads/master,e278ace2cb84789adb9af30d186f0f123170901b,e4a024eee0e4f0e9c610a786258a2ad45c1773ec,4c417c57120553f5ec0e0ef18440e80fac0f1d79,,True,True,Tests_passed,ccae829e89e397eec0f774bc8ad65456d564cf6fd326ad5f71eb0b1988a27d7e,True,6,19,128,2,True,Tests_passed,137899cd882d0ae5aa68dc9449e0e49328abbc8a6c0875413c2d4a81a0b9a74e,True,6,True,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_failed,60eb5227ccc1a4555f7839a838eb086096af40f35780e1ed0f269551b9ae3583,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e 89,refs/heads/master,5b9b1e0873593ef232725640b6c4c78b27d5873a,28791b150e51b595be7e04c8b6a0b012d4b889ff,e8ab9448978fe313a97746197941fa43e3441fbd,,True,False,Tests_passed,96bf0a4462676e0dbe27c833d3ad09892e735b51178c6f22dd3b9c51509d0ed6,True,8,26,101,3,True,Tests_passed,2a9ab92e2f2a836c4ccc35906a4083a35d7da3ac93de8884fbbc3c96c22a66d3,True,8,True,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,f37cc76ce0f21e6caf02114a6af9242656e039db40cee0688bc550376c2537c2,Tests_failed,958c97349b62c92c4440be2c4c9a1ccf28d9e59683a316461b27f9b455ef35a4,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,f37cc76ce0f21e6caf02114a6af9242656e039db40cee0688bc550376c2537c2,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b diff --git a/results/combined/merges_tested/kong/unirest-java.csv b/results/combined/merges_tested/kong/unirest-java.csv index c14a9e4a19..00e0d4ec01 100644 --- a/results/combined/merges_tested/kong/unirest-java.csv +++ b/results/combined/merges_tested/kong/unirest-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,dd532cf17f17fba254562c029848558c8c04b79c,a68309c79589e8d1ffd2694f55a412c6ea670306,b8ab11e459e8ea2594905b9139223f09ff27c2ec,,True,True,True,310,981,13465.0,84,True,385,Tests_passed,de12c2b1920e73f1875ae860f81b2386b37652b57aea2b905fb7b2424127e042,True,Tests_passed,31095d7ee5b0003a9018cb2758f2b25a0f7425af605dde8fe9d4b108a831c970,True,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,60f49a051737a6160cbf1f4e743ecf85b34dbb45e464d6d3cfb43ddd1b4ff5da,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,67c8113bdbf91986e4ed1e5f16069c6fbf2773d65a72909ed6c6c177d93ec790,Merge_failed,ea6cb2b8eb34a89252286c82924d3c1206373dceedd1dd910a24851d2b11df85,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,633c12e7a6dc153d4614656592179e594d7c7a10c3da63e559c5f7e7271693a9,Merge_failed,a72330762fd3fccb03f946af5e187e32cb92aece6801c9e31242dbe43c0538f3,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db 61,refs/heads/main,be953b5e242762aa1dbf4f7f4b9380b551334999,f37caf93ad32a898a539faf05459aafe0e15b717,966dd6a8b9d040fb62e163363701467f0cb0d093,,True,True,True,9,19,312.0,2,True,9,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,True,Tests_passed,48d21add9fcf55e597592186e1e64eaf4cec1435168717a232eb6fafe56f8854,True,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,212f80ca595da4bf5b135908dec035618deb4d7cf5630f2c5900994e8d969b1b,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Tests_failed,338c28437f306554d0911408baebf8101bc023b7593a5f7a6c8a429afb241445,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,cee1794cef935c016cb2e951e8cbe72fe4f4dd393d13f28d434bcf140e49ecb7,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2 62,refs/heads/main,f37caf93ad32a898a539faf05459aafe0e15b717,6ae79056194d04b1ee0b5d7eea1e247d40e8dc79,7eeea8a17544883566f337fec6f81eaa115e9f0e,,True,True,True,9,16,301.0,2,True,9,Tests_passed,149d054859a6f6ee975a9c449d6322ca0eb7807509cd7542c4195bdb1720a7dc,True,Tests_passed,712d87f7971381a3857b696ee657b9b9c912af837c02cbaea01d25bc4ae932b5,True,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f diff --git a/results/combined/merges_tested/kongchen/swagger-maven-plugin.csv b/results/combined/merges_tested/kongchen/swagger-maven-plugin.csv index b6d9edbdba..c9cd84a8a3 100644 --- a/results/combined/merges_tested/kongchen/swagger-maven-plugin.csv +++ b/results/combined/merges_tested/kongchen/swagger-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,1e61731653f4f020bdf90d277c6ecffeb51e2b0b,6a1618ba07a66309f2b5287e4c812dc10d1970b0,de9dfa0105083b4d606eb9485be68b005be5af0d,,True,True,True,21,60,544,2,True,21,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,True,Tests_passed,34b5c80655e7e441710f45e4a266cf58cfdff0c77f0d16760cd8a81c123c62c9,True,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,819636c3622d6bb858c1470a352ff4f379da66f904abe4b17949cb8f748a7954,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,819636c3622d6bb858c1470a352ff4f379da66f904abe4b17949cb8f748a7954,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681 8,refs/heads/master,6a1618ba07a66309f2b5287e4c812dc10d1970b0,c6c1fb810d36710abd531cf56a9e0bee5a689df0,4dd5f332c20d1eec11d6174d7e60d120ffe5af82,,True,True,True,19,53,476,3,True,19,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,True,Tests_passed,5342f14f16d3b575044176a7523a1aa0a69d35e131e7628af4ec96533952b82c,True,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,7c6a4ed1834ba19e78eb1afb46604420e9746f95511cc030f231bb45815965b1,Tests_failed,0fb94006133ee6a4fe55af04fec464a352fbe1ba858c42bc14c235843f934874,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,7c6a4ed1834ba19e78eb1afb46604420e9746f95511cc030f231bb45815965b1,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c 9,refs/heads/master,c6c1fb810d36710abd531cf56a9e0bee5a689df0,4a41e8336d50543d3a6d9d8a269c7890cd571465,c929469dcc4917fd900093564e8f8fe1728fdaa6,,True,True,True,11,18,252,2,True,11,Tests_passed,7cfff0e36e063155bd937c4d86f90d04ca7c4500acf79bac1240196dd69046db,True,Tests_passed,ffb464c8e7652106e6bd69fed7a9791161b848fab069394f12726712062dd508,True,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,cb107a618518a13d91a615ddf23990cdad857c27b6fdc034e5556c2abda2bb54,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,cb107a618518a13d91a615ddf23990cdad857c27b6fdc034e5556c2abda2bb54,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839 diff --git a/results/combined/merges_tested/konloch/bytecode-viewer.csv b/results/combined/merges_tested/konloch/bytecode-viewer.csv index 8d832352f3..91f1603e6d 100644 --- a/results/combined/merges_tested/konloch/bytecode-viewer.csv +++ b/results/combined/merges_tested/konloch/bytecode-viewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,True,22,89,828,2,True,22,Tests_passed,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,True,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb diff --git a/results/combined/merges_tested/koraktor/mavanagaiata.csv b/results/combined/merges_tested/koraktor/mavanagaiata.csv index 09ae69bd5e..ba2c197e11 100644 --- a/results/combined/merges_tested/koraktor/mavanagaiata.csv +++ b/results/combined/merges_tested/koraktor/mavanagaiata.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 302,refs/heads/master,3db986aced967917053dd5fad68a469976a6b27a,f563642bf7a24d3986336b775b25f974f2feb668,f40e69b670f030e802a393d7b4fe433bef727048,,True,True,True,11,45,215,4,True,11,Tests_passed,9c44ab4b04d70ae7b0b220c250f3ec3ac8bb2200b7a18d149ec99996b1a48bbf,True,Tests_passed,90bdfb521679d1c76f68d7af3154fb6ae3a44deb8ba3bb2bb2d8c8eabf44018f,True,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,a9fb09ca234ec6bcd8ba2ad5471ec78f1961302d5182307ab650d50943ab066f,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,43f782019eb2d119ae7055076acefdda0f09965be69a43826bf1d4b5129224b9,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,03b74519a9caa74a08df6fd1bf2fd5c5f21c1244f5b25f7749044172705cd934,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4 diff --git a/results/combined/merges_tested/koraktor/steam-condenser-java.csv b/results/combined/merges_tested/koraktor/steam-condenser-java.csv index d37ada7c8b..a7bdd9b5e7 100644 --- a/results/combined/merges_tested/koraktor/steam-condenser-java.csv +++ b/results/combined/merges_tested/koraktor/steam-condenser-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,38c728a429397a5e8c647045144da9fd12930c65,4383d0a9b289ec581a4b4c4ce73f3c84096bf055,a609a0f0d1da1c5d90e506ab2310d21df934bb8c,,True,True,Tests_passed,840a4127132d6907b5fe9c5478a8226bc9e4598b20b0d1ea17018d4b72379a62,True,131,389,1644,4,True,Tests_passed,d69ba255a1d43501ea8df49e9babe2df70c573801644074a3f08c75c79bff469,True,136,True,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,bff99a12638e942317df238145b39e84c1d97f7a24a7afc4f3ae7d120f584d37,Merge_failed,e6cdee596fb86c07285d1e7cefda220253a36c076817bee57ee70005fa4d8696,Merge_failed,547662fc290e7bb64661656df0a00a8d8acc86f1f54cfcb15e0d86ff54df5cb1,Merge_failed,d3ed3087651af4d732b02f1f8603235f935905085cc85c745176df57694d427b,Merge_failed,e6cdee596fb86c07285d1e7cefda220253a36c076817bee57ee70005fa4d8696,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,9a7d95169cf7abd32793b7e45f2516ca585403c9e2180beec99cb239386a32dd,Merge_failed,547662fc290e7bb64661656df0a00a8d8acc86f1f54cfcb15e0d86ff54df5cb1,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e 14,refs/heads/master,7845353108a43162e5ead8a94fdebc8c21cfa0d4,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,8b8e64b32595b92b41e81ebd8cdbb7ea27e62744,,True,True,Tests_passed,62971e708638bb2214a743cc3d10735353583d37c43950d42d2a0a6f2bd2c809,True,26,89,1344,3,True,Tests_passed,080569ab758b6e35afe3b1a657f05814af2837487a611712681ed03e44c77b47,True,26,True,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,ab95fe99158922fc148375eba73e706b4ecdd4846ccab19a596367e758106e39,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Tests_failed,a57d83c35ec2218c81bcbeb33bd3d1aae8acbef309da4f528d68ed7e105fa8d9,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,b24ae9bbf5105d1edbd6e143289062d873e8a7e7a7286598b6fc6b5b6ef5e323,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164 15,refs/heads/master,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,518c36141cb8a41fd9f4d66531129337940636ce,e1fe25a28d3a6b6ea5c3d832b794b68c81aeb211,,True,True,Tests_passed,f3e7240f443388c57de40ae164ab4f6da3f931ef41169bc912a03a7ae6e4c437,True,26,92,844,4,True,Tests_passed,b12f18a131d320b51a6e5dde2601065b88e8f1330d99ff067b14d9729c28f45c,True,26,True,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,480c1e410845d74f0ef1cefacf7d64eac8e607d57d47873b72c2fd9f487f0ee7,Merge_failed,d07387579765e7e60aa0c122ba6c8d600c70871b6a4eaa2f7c884ff3ecb0e871,Merge_failed,f7cc2416527fa013321a159aa8dc35929f56041ea5870ebd76449a5e6cd0e2f5,Tests_failed,b994f4f48b6fdd24e21328d622c7c30c760d608f9a50905f4bcf0f01b858e00c,Merge_failed,d07387579765e7e60aa0c122ba6c8d600c70871b6a4eaa2f7c884ff3ecb0e871,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,8c274d32d772ac64bc5d642554cb581922854fb36b3143738021fd0b83db7b3c,Merge_failed,f7cc2416527fa013321a159aa8dc35929f56041ea5870ebd76449a5e6cd0e2f5,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d diff --git a/results/combined/merges_tested/kpelykh/docker-java.csv b/results/combined/merges_tested/kpelykh/docker-java.csv index 05d47866cf..408b961d2f 100644 --- a/results/combined/merges_tested/kpelykh/docker-java.csv +++ b/results/combined/merges_tested/kpelykh/docker-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,81789ea773094b18340502d457e8d349a76a2350,44aa4b057604562f10220734507928a05a315526,431306b785010b84eb7961ab7b92d9126b8efe5f,,True,True,Tests_passed,2db79bba3d310417a195ed89b59f34d39228ef08b6e37b63c94b924f6715a22c,True,28.0,80,596.0,3,True,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,True,28,True,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,bb93df24be5d1ae18bdbc7fed24e5156e9360e957ec87a5b0859dafaa904766b,Tests_failed,37968ac8c38c9c55c41d9429eff4dc21c9f306fb422fb5077883b73ff1834741,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,bb93df24be5d1ae18bdbc7fed24e5156e9360e957ec87a5b0859dafaa904766b,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510 8,refs/heads/master,44aa4b057604562f10220734507928a05a315526,00ff6ec25af073b30377cb1a860d45f228de3a2e,9cf0799d1aa8c5de44aa7fe8b5336f5b494a9e64,,True,True,Tests_passed,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,True,12.0,49,346.0,2,True,Tests_passed,43966615d8feb6d07e6d7f9d119fa1ff45ff0669a9c91f1565d1fb10557c2fa6,True,12,True,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,5ae1006a8900bec815c112e6beeaa94c4478d75dec6dd5872cecce159e6daeb4,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,2470e1b524fa4909cc0e5341dde9fa5123fed31e699ae1c5eaf225257072d9d2,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,d0d0b857f94066b725be9bb88168a02c414d8eca09de3294bbfed3696bc6ae7e,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7 9,refs/heads/master,8c0f496582aff251a796457d41961f540dbf2c5c,a976811e70c26f03e061837a526329907657f0f6,98b265515b152822fc9a28e598ceb150bf6a892a,,True,True,Tests_passed,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,True,25.0,46,391.0,2,True,Tests_passed,05e4a84cc4bde3143aea0a0b01322e5f7ee66675060581e5213311f4a8d9c629,True,25,True,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,f6da6e1540c2ed15f3f131fb8599d864101fb0df8368c2811060d491b8ddbf6e,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,f6da6e1540c2ed15f3f131fb8599d864101fb0df8368c2811060d491b8ddbf6e,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac diff --git a/results/combined/merges_tested/krilivye/jocco.csv b/results/combined/merges_tested/krilivye/jocco.csv index 339b485b4b..cf993b2b8e 100644 --- a/results/combined/merges_tested/krilivye/jocco.csv +++ b/results/combined/merges_tested/krilivye/jocco.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5994a8ffa7adc1fbe2157b96436ba57f24aa2fa6,60ffba89d1314e432830b72f4e2317437e026a53,a4f324fc56908cce4b83fe50c3c9a873c65f6ea8,,True,True,Tests_passed,a07bf68c4d038e584872ca8801d93f18d01537ef3223e04bdaccd669ed7b2f02,True,5,24,71,3,True,Tests_passed,48b5eb51e22d9f48cc08f24cee8f8c64813bd909cee17d02615a147878c7ad46,True,6,True,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b7318799ca878001b3b293d664c33b7acdb2bc846f770dbbd5a4f195edefec66,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,3c6fcb0da2ce2f7a305ce892c27df90994aea950a4f27803e66c77637ee51c3f,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,787ea05d67913386d7b5bc9cea079b1b8b1081d675ded34b792523da8dbe7822,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93 diff --git a/results/combined/merges_tested/kroimon/bukkit-alphachest.csv b/results/combined/merges_tested/kroimon/bukkit-alphachest.csv index 7bbc047c9d..476cef4455 100644 --- a/results/combined/merges_tested/kroimon/bukkit-alphachest.csv +++ b/results/combined/merges_tested/kroimon/bukkit-alphachest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,1c06bbbbf3fc168448554fcc274249946e51fd94,efc79103f615ba17590bf69792d62db71cf80945,81fe6cc2b3eecbe7b7bc7fb684f3c24deac0ed5d,,True,False,True,2,1,2,10,True,10,Tests_passed,b3cab0f3dab361400360bfbb00798655603527825cd80f920b7ab13fa0767b02,True,Tests_passed,0a5facf58326e07d308b75cbb24c1b42b5ef8ff54b7df8b177e94af9d52b47a2,True,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,f0cd2f6f73fb9713e884714accf96c7d669cccb2754cf4d9189fafdfeb721868,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Tests_failed,e7586ac7542ea1cae017075d16e9a0d722792480ec5165be6a0f8ed573a4a71d,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,42477ef138c7015069eb347704427bc8f5e478b39dc622337e372e6339996022,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad diff --git a/results/combined/merges_tested/kshchepanovskyi/zkcopy.csv b/results/combined/merges_tested/kshchepanovskyi/zkcopy.csv index fbff87e8f6..5d7784e222 100644 --- a/results/combined/merges_tested/kshchepanovskyi/zkcopy.csv +++ b/results/combined/merges_tested/kshchepanovskyi/zkcopy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,31218157e3efd720cd9fc792af1027a6e129dabb,55fa8bff2a05f6bdc8f7d555c566af41d8f7f1e7,c6ec352c54ca0c92a31a0a82805f3feb6e9d8633,,True,True,Tests_passed,19892ad83d2c86e6fc7caaab7e509cf0279c7ef34cebf16957714717d24922d0,True,13,54,784,2,True,Tests_passed,f95b97f48a36e71c1bb228030ae14a73f07e75d82fc2e94acc247d4cd73b9625,True,13,True,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,d62424b6fabf4ff0d08c441860c72564129add062d159f25738d345149a9e927,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,3dba44ca9ac461b520a81b19b24ca339b1db1b56d33bbf96786648650f57314b,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,741fd3e1cac2190aa03a653098633e528958d560e4c0ea7febc7a6bd9cd97d81,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711 diff --git a/results/combined/merges_tested/kstyrc/embedded-redis.csv b/results/combined/merges_tested/kstyrc/embedded-redis.csv index 7e2462787c..7ffddf08b1 100644 --- a/results/combined/merges_tested/kstyrc/embedded-redis.csv +++ b/results/combined/merges_tested/kstyrc/embedded-redis.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,5e6a9b73824ca48a3cd95771397af7dc45a13dfc,378e7f02666fb1f92c9dd6c75945cec047d22e71,4c9ff88c45e12344ed6b009e1213aa752b758d89,,True,True,True,4,20,98,2,True,4,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,True,Tests_passed,4f1626c92ecb699e62a62a789d445d7363c0fc5acbfbc8290fd671dac46143e2,True,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c5110624ceee731507770ff72247c1a917f539fb498db4e9930153bd02d70e1,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c3d49d611acfe32c74934275d8f2bdedced976e434dcd13567833ad9d0996c0,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,7a941596925a5d2a49be1a1d418c277dd26f2ba3d251af2d0253b541272cc5e2,Tests_failed,b28bbd63184e65908f08563191c8db7bdffff1594df08f128fe82241c9bcf841,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c3d49d611acfe32c74934275d8f2bdedced976e434dcd13567833ad9d0996c0,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,7a941596925a5d2a49be1a1d418c277dd26f2ba3d251af2d0253b541272cc5e2,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c5110624ceee731507770ff72247c1a917f539fb498db4e9930153bd02d70e1,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a 26,refs/heads/master,378e7f02666fb1f92c9dd6c75945cec047d22e71,25ab5d2c2c9bf9a8c9986da2418c0a250278facd,84fc8f866cc3231f2f470c7b692f420ff2e8b2a9,,True,False,True,4,5,29,2,True,4,Tests_passed,ff1d5ad2a84fdac8e1cde6917b859eee9f2f0293f27da445c630733854631e63,True,Tests_passed,b813737b3a3e4451e7a3a14f01079878f40c36beaae1748ebb6b22a8bbefe450,True,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803 diff --git a/results/combined/merges_tested/kungfoo/geohash-java.csv b/results/combined/merges_tested/kungfoo/geohash-java.csv index 28ef678883..47eca18df8 100644 --- a/results/combined/merges_tested/kungfoo/geohash-java.csv +++ b/results/combined/merges_tested/kungfoo/geohash-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,1e0aa77a02c168f39dc3c26f64257af4baffac6f,b221044db5545db202e6acf5d9737fcc297bf66e,376f5edb443465ff6cc2bac0bbd69d62967b0c27,,True,True,True,23,120,990,3,True,23,Tests_passed,ed25fb81551ec7086ef92173d47919943b45d4d94e0093a750d0db21584495d2,True,Tests_passed,57888744d538abcc5d8ac24a51693d8ecd1aefe11f400e937c74bcf92f1b33cd,True,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,3e8b2eda38f439ef1782ab8ad3a9b56218213219aa2fa1f2f91bbdeb46d56848,Merge_failed,87fd63a594e21e085d597357f8b893aaf05d544dbacb2f324fb72d5c63f2e497,Tests_passed,260f93c11a01735000172bae7f45a2661681ff5444cc0ce75bf334d9ec830c6c,Merge_failed,1661fcfa1bb8581fd04bb0504d695d6f53ef7c8d143581b2a2566bc97806be10,Merge_failed,87fd63a594e21e085d597357f8b893aaf05d544dbacb2f324fb72d5c63f2e497,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,c7bdb8e98d54f4ce8c6c98e166d0e167e6f276c7f565db7a88f887c8c316523f,Tests_passed,260f93c11a01735000172bae7f45a2661681ff5444cc0ce75bf334d9ec830c6c,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801 12,refs/heads/master,029fd4411871b99cef71407c432752c570fcfaa2,21ff41630c9dbd40e4674604d8e502b3c58937f1,90a2570b49e559dbe5f96308ae166bca5b3bf78c,,True,True,True,5,19,77,3,True,5,Tests_passed,f650c796a626ec4620a628f8c6ed258b5b390b36e12ade5ee7ea9572119486ab,True,Tests_passed,c007ff42eb0485334cb1d01ab28248e5973757159bd28d8b33f2513cdaca0f83,True,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,f9de71c4340538eccf9726aef84b126d7688fcaa1d79efe649fe00e6d75aa219,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Tests_failed,c3d3fa98a454a374a6288d6e326c7cbefcbf5421d68b8be21cc0a5660a8af9fc,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,b821e3536c92fb7927c1b5a490e912a7f80e62adcadf6b6c5d7e64be38cdaa6e,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c 17,refs/heads/master,8c29b236e5fe758d3268e885504051f98d6c8ef1,282e749d637fa3a1d335dbe53a52e99d183d93f1,41a5c57da4d66464566b1a8068e83b54d8b5c0de,,True,True,True,15,53,2537,3,True,15,Tests_passed,4a04d94af3eb334be27d0c21cd70a1578165d14a3889d7cb722c2313f402ea0d,True,Tests_passed,cedd137c8ceaa9f8134981dd11e96fe74d6c7001799bfe4f13092640d733fd43,True,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,333914f7402ef0770b682541a806c2a322474e086497803919d2cd9e31d9e8af,Merge_failed,1e9e2f5306066e0898d7f01954ab0b9d2941f7f471398bbbdd53f2fd3e55d752,Merge_failed,62337d4c9f2d19d18059391196cf0dd59a6edf486884b98e8bb1df1f1ff5c1c6,Tests_passed,8183a267d232069fc48f3a1877becd46f77381d3069f273044db84e7ccb2f2e9,Merge_failed,99d52d7ec62d12b884934e2d6684210f2deb32044a6a3ac3f2ce3adc3f01f974,Merge_failed,62337d4c9f2d19d18059391196cf0dd59a6edf486884b98e8bb1df1f1ff5c1c6,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,333914f7402ef0770b682541a806c2a322474e086497803919d2cd9e31d9e8af,Merge_failed,fcd773b7e301bfb089a9c138b8f38df630fb46c297f3fe4ce32ea9394f683c6f,Tests_passed,8183a267d232069fc48f3a1877becd46f77381d3069f273044db84e7ccb2f2e9,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3 diff --git a/results/combined/merges_tested/kurbatov/firmata4j.csv b/results/combined/merges_tested/kurbatov/firmata4j.csv index 43e61861f6..42e10a5332 100644 --- a/results/combined/merges_tested/kurbatov/firmata4j.csv +++ b/results/combined/merges_tested/kurbatov/firmata4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,54c58603b9db933cd35e182e74139402f124308b,9722516afce5dc1ea008fb69943435452f0d9711,32d1a900f8985d662ff81a2a8308b626b290ef89,,True,True,True,5,14,78,3,True,5,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,True,Tests_passed,8e959ffbdd060b5a88f27b1017cc1a19597877c9e35fa0775fdb8ae20d8df160,True,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,3a4d9c8a1d7bedbe53a7e62c2cfe37ef2f4ed36b57ded63484e6e6ebc9bea867,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,3a4d9c8a1d7bedbe53a7e62c2cfe37ef2f4ed36b57ded63484e6e6ebc9bea867,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396 24,refs/heads/master,9722516afce5dc1ea008fb69943435452f0d9711,6dca46a44bcb5e68cd4ed5bdbc7c038a945f8090,8347b46f3a7e5f193fb8204f132edcec14c08759,,True,True,True,5,12,71,2,True,5,Tests_passed,719c27ce57dcf4ec985bc8ee5d7cb8cc24c1096f7e65e547d4f9639941bcf0f6,True,Tests_passed,0ca0c3883e02c1d044e2b8751c87d26971af452f4c5c97765a04bfcec6a91a31,True,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883 diff --git a/results/combined/merges_tested/kvladislav/ticketmanager.csv b/results/combined/merges_tested/kvladislav/ticketmanager.csv index b0116875ec..5584164b78 100644 --- a/results/combined/merges_tested/kvladislav/ticketmanager.csv +++ b/results/combined/merges_tested/kvladislav/ticketmanager.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e0c7be166c9e6cd69ac0f2a88a583cfe7df0b353,8a259cc43530ca8b92eea1ef31020dac200f5cf4,00a517756b969118fd34f6cb3e629623ea58355a,,True,True,True,27,117,397,2,True,27,Tests_passed,53553a4047487af5cee9969dcf16dce322074c8f429f64b620bf805825abfc43,True,Tests_passed,293a2dc4b39236630fa6174a63d31980c5413d7b89db19cbd1deb780c4dfac6b,True,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,aefc5c6bc5d8d2cdac9b79d77f7b2d22218845ca24d609641d244acd0f916768,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,aefc5c6bc5d8d2cdac9b79d77f7b2d22218845ca24d609641d244acd0f916768,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d 12,refs/heads/master,0ffb612f18bf32b1151d82c321219aa31f901d08,75222d1bfa744f59f417a16bd670579a413b68fd,cc5170a2a39c7439223a358ea30fd1c0136006e6,,True,True,True,82,3355,35182,2,True,82,Tests_passed,f81997b3a344059a697dc172bcf17edb0405b61aa82cf6076895d88325df6d68,True,Tests_passed,fc2a4e15996e4f0fb8f610209a90c23c51225563c2a2dee8c5b80b3a731a9933,True,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_failed,ab4714c2dcea43bdc3dca6e38893c469faba838cf3b23a8e7c646ae896ae096f,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e 19,refs/heads/master,b24deca3fd3d5ab03d96c7cbbf3daa1ab4fe8309,7bf5cc0d73ebd483e07ffa6e7cf15e465fa9708e,2f3b65cd728d75b4d771f00d2515780846063cc1,,True,True,True,22,176,1574,4,True,22,Tests_passed,4e950aa9f92fc81cd54ec75ffbc7951153b1f353d45d3ae9dc572469ae02b820,True,Tests_passed,0d8caf6b06b99d5198ac66699065ebd5e4951780e9143349a085d75a77bee1a7,True,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,c7f94d868a968fa62908408de2b09ba97d4c82adfa2b3666d1ebcdf0e8c116c9,Merge_failed,62dee43bf33d83623727b27fe1387c676be75bef2d6b0e9015001881c0d846b0,Merge_failed,755639680a412eb6e1bfb8538f5e7c1cc740f7083b61e2ed51d3f35238f83939,Merge_failed,57216a09250663174edc8683c0a7a17f9a52d021637b9c33d3b1734451a5296c,Merge_failed,62dee43bf33d83623727b27fe1387c676be75bef2d6b0e9015001881c0d846b0,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,1aff3202002e656f89604f8e6610be77c3bebd9b11ee796a4d0fdcb7f8edb5ba,Merge_failed,f3d682a5992fdbaccb79937d090f89ccf8622ddd9215d1ebe4db598924bb80e0,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7 diff --git a/results/combined/merges_tested/laforge49/jactor.csv b/results/combined/merges_tested/laforge49/jactor.csv index d72b437314..692bcd456d 100644 --- a/results/combined/merges_tested/laforge49/jactor.csv +++ b/results/combined/merges_tested/laforge49/jactor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7d728819f4ae8ab3ba288ae10ee8ad69f01cdaa1,075f7d10416824c72519888c61a3488aa5be63b4,c032bd44475cfff2133dbb0ffea73d3ac7dda205,,True,True,Tests_passed,82c4064bcf7988ff7dcadf04b037899afa99121bf0a1bd201e2d52588b4208ae,True,8,25,234,2,True,Tests_passed,245bf5ad7dfefbcd1b67487c1a6e5ad4caf53e55f1d56a253aafd58d19df63b3,True,8,True,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41 diff --git a/results/combined/merges_tested/laforge49/jactor2.csv b/results/combined/merges_tested/laforge49/jactor2.csv index 0db00ccfe0..6fbd414085 100644 --- a/results/combined/merges_tested/laforge49/jactor2.csv +++ b/results/combined/merges_tested/laforge49/jactor2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,191ab09f7d4f34ab1b208159b40ccc2b06557f6a,d8f99520af880dbd3257f95e88e66225cc06c423,891c93393b912fb6e0056ecc127c4d06685a8e73,,True,True,True,2,28,142,2,True,2,Tests_passed,f225df2e907b663719dd2e1f3a8aee06364bd2de6fc38fce1e49ef58a0312da3,True,Tests_passed,2086d0f297ce22d1dc6e760d4233150b3a04c199dccbe4b0711178663010c26f,True,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,ce100baba316c12f1b00c6dbd4e10d7d58c1d91cee009874807d7e16adc5fd2a,Merge_failed,77a6672433275549ae2a634e0a8536a2ac4d85432974c4ba307d76ddec75df38,Merge_failed,d4162caa1e8fe3cdfb12edc4189188b0695c3d1026aeb7fd8d9d43acdfcc33de,Tests_failed,fead0511789522f50b8ac79b444af7661b24ba15d4bf68739415b5db3920b351,Merge_failed,77a6672433275549ae2a634e0a8536a2ac4d85432974c4ba307d76ddec75df38,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,6695d971517eb11b2d551b9ad77d49a8523dcb6031e463cd353969745a7f8d76,Merge_failed,d4162caa1e8fe3cdfb12edc4189188b0695c3d1026aeb7fd8d9d43acdfcc33de,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0 9,refs/heads/master,3b4eebb16635f02dd3048051e26438d9071c7b92,fec3b93dd0e680380bc11bb029d868e1e2fefde9,9792bcf3370f0b667a09ab6b9bd84e82219738c0,,True,True,True,11,29,314,3,True,11,Tests_passed,6901f8f781ab4dc57d6b2f7f5d29ba23bbc2605c8169c6dc50b72014ae3fbcdc,True,Tests_passed,869af00b45054df1121746fcf16412c02c214cbcb51eac2729a1d862e78771f4,True,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,79a5a46da309f0c2302bb4307ad4667339bb35aacd9fa645ba0a011dcb9e591a,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_timedout,,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,d29ecaadfcced3a8ecc0d5eeb6f8694308a907c12164593eaf986716ae51b8c5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe 10,refs/heads/master,2ace56826c6da34c2cbb41dc8e4d30d80d5eefea,97d63bc1cafba87e2b8d6645dec5de1aaaa9482b,0ceff1faf17a840ca915563517df0d205e91a524,,True,True,True,15,52,228,4,True,16,Tests_passed,0829332e533dfa86c66d764ae8092d171335598e2761e0707ef03648f24023d9,True,Tests_passed,edfa4b2c279c0b46228e34143c67f0d24e0b13ccfc694483b6e91ce15b9d9966,True,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Merge_failed,eea52aa15a0ffc53b140ba1ec36a96f79ceb377702c7ea58d618e8f6fe9152c9,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,3f9e51690778799050962d15738416f4b813de657ac77bc80f14cfb634ad9391,Merge_timedout,,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Merge_failed,eea52aa15a0ffc53b140ba1ec36a96f79ceb377702c7ea58d618e8f6fe9152c9,Tests_passed,3f9e51690778799050962d15738416f4b813de657ac77bc80f14cfb634ad9391,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a diff --git a/results/combined/merges_tested/larsga/duke.csv b/results/combined/merges_tested/larsga/duke.csv index 403a1e497d..9aa2a52c76 100644 --- a/results/combined/merges_tested/larsga/duke.csv +++ b/results/combined/merges_tested/larsga/duke.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,5a6056799ba321ebad9ff55c6fa8cbda5fdf1be5,2ebd8a35288bf9e5edff394ad45431d40a26c8e3,9fe5a3dd92c50ed1bb7c0bf2c4a5969655a8d0d6,,True,True,Tests_passed,50d6febafc10d4d291bae49b4989d9f8fee81d1864feeb1bbd72d7e4fb520a82,True,2,1,1,2,True,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,True,2,True,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,a43ad5c94bfcf6364cb4339c6453dd633c894ed282de11ecae8a89272b1fa3cf,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,a43ad5c94bfcf6364cb4339c6453dd633c894ed282de11ecae8a89272b1fa3cf,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906 13,refs/heads/master,b5def8195d1e36fabcf3159c29a05b8998c2edf2,99eddc63255db9ad74aaff0a0a08174a950c9175,1ba93c26741ec856fc2304c722f8fc6c3c949040,,True,True,Tests_passed,aaad12b3d4ff0c0c7a8c7ac3032557079ae70a00b62321e0308e1d975d96d09d,True,16,55,299,2,True,Tests_passed,8b20d1c6e073cbad254f36d0b963b48faf273070ed6bae38c61442013dcc3f94,True,16,True,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf 16,refs/heads/master,6767497ccc440c9a64ec7526a7feab97a9cce367,5697882659b187d87f460bcd01ef0bf105d274aa,7fb9b5e58c583211067adeced2bdb0c4c59e830c,,True,True,Tests_passed,a63ff9dc60339622bb3cda774e1dc52c96cc739b3271406c282af81d59202761,True,30,270,1028,6,True,Tests_passed,6f9aa46b373f5f8b3a5266d38aa718d4451dfafba3591fd73f08e1f4378b0af5,True,30,True,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,ab10df5b928f114363d07588447394dfd31cd0f20684080bc8c627abe928238e,Merge_failed,4265ab06c3e9e9d0426391874b5c3eb465a2184328f9de772f3afcab85365913,Tests_passed,aaa4208340fd4d886d6fd87a640764a536bc5299e4da76a0660ce18eb2e6a3a8,Tests_failed,320f4dddcbb9d6e26a29b2181e6e888ee5e51fb7ae1ccbed58d63c6109b7ba11,Merge_failed,4265ab06c3e9e9d0426391874b5c3eb465a2184328f9de772f3afcab85365913,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,c7ff6a2b3d8d0956c0176303d4ef336ef77121d545a45bcb66d4699f9e4e2a03,Tests_passed,aaa4208340fd4d886d6fd87a640764a536bc5299e4da76a0660ce18eb2e6a3a8,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e diff --git a/results/combined/merges_tested/lazaromedina/flume-ftp-source.csv b/results/combined/merges_tested/lazaromedina/flume-ftp-source.csv index cf281d7df2..1fe7fc05b7 100644 --- a/results/combined/merges_tested/lazaromedina/flume-ftp-source.csv +++ b/results/combined/merges_tested/lazaromedina/flume-ftp-source.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,73eed9e18c29076acc150004b0c6a97762c8101939281a5f801de0c80f1e715c,Merge_failed,f4a5f74be4c1c3d51605f780b6600b6a31eb91a0cd2e8c30b08b92b7f5d13275,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23 6,refs/heads/master,f4c145bec4acce94ef00f97b814a511049b3b372,be8c09ffe539f24fe37dde84fc5d30309f02bb1a,59018c3f32045ac899032250a530bb095c7bd293,,True,True,True,14,94,1210,5,True,14,Tests_passed,43d54d6281107c850db541f4330d08b93727e70127cb4371c98b4905107f6cdf,True,Tests_passed,baf075cd3a4fed05e94de824ec4a705cf535a0800dc9dc6fa64a4796e8f5ccbe,True,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,27f31ed6ff95607bf4887eaa974e1572d48daaf91f812305a50b22a0be6604ef,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Tests_failed,c8a54765fe7f8118c5d9fc3ad2e54c585ae15d0fe412711f713723e76d3ce942,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,f28926aa0e148ab6ba1ba74778adc8804c4c55330dd6724c0f2acb427d380c67,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63 38,refs/heads/master,65d75536ef5225314352bb18e8b03abcddab265e,75720564551f39cf872c10a181c33f9130f4ec10,30517761affcb1eb3d17c01bb0823c4a75ff4d24,,True,True,True,3,32,208,2,True,3,Tests_passed,e191dbe5bc09e81f8738d8a5acdab215bfecfb89e1fd807c14a5a4389a403e21,True,Tests_passed,916e14eb556256fc2bcbe595ef4c6a0fd3fd14119f60894fc4a2efb598d9cb4e,True,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,917b6a3deaf762bc517d4db1c8b6418bcaf2ef30abead834f03dcd418065e36f,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Tests_failed,9a2a06bb0b3a5c671264f34d29c714416390b53edbfccaf2697bbe76d7c79575,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,6eb90689da936ba2a198a1fbd939437b1f6b0b64b5d22d9e59fbd249801f8093,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab diff --git a/results/combined/merges_tested/lbehnke/hierarchical-clustering-java.csv b/results/combined/merges_tested/lbehnke/hierarchical-clustering-java.csv index 5d49931d9f..01df7f6e3b 100644 --- a/results/combined/merges_tested/lbehnke/hierarchical-clustering-java.csv +++ b/results/combined/merges_tested/lbehnke/hierarchical-clustering-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,147fc13e7c56047ffba691a9f7cb157c3b37e835,fff2a86e05b3bff17289ca2980394033d15f3afd,79b889c0a0e43e47e79f4dcc7468a479d9b5b209,,True,True,True,17,58,290,3,True,17,Tests_passed,568ee0ffea1a6ae7efab3ca3968e0b991bf811e1ed61d97147c2ee614962544e,True,Tests_passed,652309c7bf4d663792082ff894d0b047a9261769f56ec7478d637a095fd6832a,True,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,4fb5341de5a0ce773736d5841f3ff20c88c8fbe5ee27461fffe6826f486cc9ed,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Tests_failed,0bbd1f7406a01938032409a1688c8d30c3e72bc3d7089d001a97c06fa26e5432,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,a11ba454b9e92815268c98b3e132ec1d786ba1e4c232330889dd8759a168ee58,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685 diff --git a/results/combined/merges_tested/lbroudoux/es-amazon-s3-river.csv b/results/combined/merges_tested/lbroudoux/es-amazon-s3-river.csv index 67be4d94c5..5ed57cf7d7 100644 --- a/results/combined/merges_tested/lbroudoux/es-amazon-s3-river.csv +++ b/results/combined/merges_tested/lbroudoux/es-amazon-s3-river.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2aa45336dcc877155d7df5063071f37a86368271,41e6ad6850eeab69700979c1b972f8bd771aba67,b36560bc1985367325345e5244383c223b948a38,,True,True,True,11,79,525,3,True,11,Tests_passed,70a4b2be6ec8bcade189d2322ab21a7703c0f32c82c0797d5e41eb656809a15f,True,Tests_passed,48af516ec7212a877ccf2a5ee2d6216d03fd3342a7d8f7d18693276ac9487431,True,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e916a1a1f66febc4c200c730083c9c9fb53d468f8ac0d61c23d2e8c919f14ae5,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,adea0ce69921bf6c5f6a3f41b8515eea1b1cbb9bf07f54ed8aa127c9b53cfa10,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,bac4c5a3e88eeb5b33c1ecd3ba60b7e321472c8d160008b4c5ed6e0c922a4f6a,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b diff --git a/results/combined/merges_tested/learning-layers/socialsemanticserver.csv b/results/combined/merges_tested/learning-layers/socialsemanticserver.csv index 674899a548..899ae829b2 100644 --- a/results/combined/merges_tested/learning-layers/socialsemanticserver.csv +++ b/results/combined/merges_tested/learning-layers/socialsemanticserver.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,6a7dca76f4993e256c13ab95b0e38d9b40847fe1,e157f975436908a1549d415cd3c0737252a6a3ca,6fd7ecaee5436da1772a43577ddf209a559c638b,,True,True,True,160,550,7743.0,2,True,160,Tests_passed,0fdc2b5d64148e7e627ce70acdfdf13af73f96400765e5de21553aead1bf5d22,True,Tests_passed,a88d0f618915901dcf0fd5eacaf320a2f63319ecda72842120da3730ed9e6d3b,True,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,c95f77a7c28b27adcc4def2562aeb16c5efefa325b4883a89be21b4512744efc,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,c6948269d794d25fa289b9538f7e6542859ef77cc9a195f70af0f1a7f92fba55,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,aff13ee4d360b93ce8cdd0a5e2d36b0dce14b65d487cd7eb7a5c3625b672ad05,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69 10,refs/heads/master,4ada3cddc3a15f7b2c63f40f83bdc48342e842eb,ccfc22be0135c5695909b3a97b8aa2cff840b9c1,263ee1a3a7b0baf8e0d66d04b78979ff9f71060d,,True,True,True,42,197,6322.0,3,True,42,Tests_passed,049b63b323479aacedbc142ec59658e5815c38321b3bfeae2f2f52c38e497190,True,Tests_passed,b321a24cd20b704fc079f72935e5cbb17e61fcb3272e50ce6faab2ec5cbb4b6f,True,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,ae9c6299320c70d5972e6035f59fa3e24778ac52381e27cf30ea287f1927a073,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,0d204a65d97ce299154f3317d3048f6c21ab3c08895e0358b1a93fe647101b39,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,b386ce603a73164d08a24ee83fa49635c3b72919120e73bd7d4670014ce0d53e,Merge_failed,963d55a0edfcd8ce255588ea1e3d9366795afe5d06d71088e05ce2d83ac5262e,Merge_failed,ecd8a11eb4ac84b1318151a087a7f9d2c28cb227de57442cdb7c4456bdd2d38d,Tests_passed,8269b6096fed2d1ae4ad43a136c2c1bf358f7f8183663f85af3b916208e84bb2,Merge_failed,420f246a8fc3479ce3dc7fe8388eb02689171764ab2ecf89ab4216f9b9d6add6,Merge_failed,ecd8a11eb4ac84b1318151a087a7f9d2c28cb227de57442cdb7c4456bdd2d38d,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,0d204a65d97ce299154f3317d3048f6c21ab3c08895e0358b1a93fe647101b39,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,b386ce603a73164d08a24ee83fa49635c3b72919120e73bd7d4670014ce0d53e,Merge_failed,7329311ef81ef6e4b9b82005e639b9e857c641efecdd58885f8bfa7f58ee6e38,Tests_passed,8269b6096fed2d1ae4ad43a136c2c1bf358f7f8183663f85af3b916208e84bb2,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,ae9c6299320c70d5972e6035f59fa3e24778ac52381e27cf30ea287f1927a073,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb 25,refs/heads/master,085587be1338bb740008afa05913af155f816290,7e31babab038cf1943c5f812cf9d7abc05bcd28e,4ab2cf21c6c053ce08d08012b134454f8354114f,,True,True,True,300,1676,8239.0,9,True,301,Tests_passed,85dcd0fb4c60bbf5fb5ad9cecacc6a2e06ebcafe7af50e3dacb025b418406866,True,Tests_passed,7eebb4de84de2175e9df942d8239503321bd07136f7869e8eff880a466402e06,True,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,2b86a5aa1cb1d21a3cea8920bb75b02c515bd893be507f1200c2073673172b65,Merge_failed,5c1005082685561a51daf3425ac2201bdedf7fad6331e347668324e97daf6dbc,Tests_passed,6e692bd8c17c879a5030e2dec606b18b75c81c855dc3b781f64cf23cf5082963,Tests_failed,b1ea3e18a82ebc9a8f5537b301ea82b9061bac2c952a775e369c1c1cdf4d2c59,Merge_failed,5c1005082685561a51daf3425ac2201bdedf7fad6331e347668324e97daf6dbc,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,4439ec4bfb619bc1fd1fd7dd222dda8dbba6a7c05f4a32533b7c9604882962cd,Tests_passed,6e692bd8c17c879a5030e2dec606b18b75c81c855dc3b781f64cf23cf5082963,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3 diff --git a/results/combined/merges_tested/learnlib/learnlib.csv b/results/combined/merges_tested/learnlib/learnlib.csv index 85033748ba..6e1079d967 100644 --- a/results/combined/merges_tested/learnlib/learnlib.csv +++ b/results/combined/merges_tested/learnlib/learnlib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/develop,cd89d29fb60db46bc9908025a3bac8a4f253646c,d930e2c5a91eabccee450f80485b4c3c1c842b96,162dc4f957254055b04003d39af4a20dee5de8e3,,True,True,True,53,70,166,2,True,53,Tests_passed,9a85af09753d9a59b787eb63d093f7c121e4d67ae2751f95b33445f9b394cfb4,True,Tests_passed,9ae2202e3577e34c5824e90d9490186d713606d17d761778c2144ff5ffb6c6fe,True,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_failed,4d5bec1bdb37ff0d93fdd03cee480eac051ac262e7b8df59e8924af5563dd7aa,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2 diff --git a/results/combined/merges_tested/leeadkins/elasticsearch-redis-river.csv b/results/combined/merges_tested/leeadkins/elasticsearch-redis-river.csv index ce420334bb..a73563be5a 100644 --- a/results/combined/merges_tested/leeadkins/elasticsearch-redis-river.csv +++ b/results/combined/merges_tested/leeadkins/elasticsearch-redis-river.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0fe21428a65e166b0f69d4c533427043a443ead3,989b186f8f1eb0f34a44e9531131055a7956b253,2bf2964b787ca526f0271c387286bbc59d806fd6,,True,True,Tests_passed,c80191169baa07a1484204f4390111c23128862ad134644336cc5aac07910a2f,True,5,33,64,2,True,Tests_passed,56c598b4bafaeed4da68944dd3eddf97ac676f67e5afaebd999f804708743b5f,True,5,True,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_failed,86c99fd9f3ee3830ffc2a80c9e205f8a48b204ae67237c9f5f395f773df83ec0,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c diff --git a/results/combined/merges_tested/lemire/externalsortinginjava.csv b/results/combined/merges_tested/lemire/externalsortinginjava.csv index 5bdb3a0a23..711d557f67 100644 --- a/results/combined/merges_tested/lemire/externalsortinginjava.csv +++ b/results/combined/merges_tested/lemire/externalsortinginjava.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,5d3676023c04d823a56b85ca77a8b5fc90f24a5c,5cecda2aa3ec9be4978b948e6df3b25bbe9b085a,80a3557df8f0e0b7bb3a621d27f6c04867757b87,,True,True,Tests_passed,ac1d60e5022f1696e3de5e50c852a1bf4393756277aa86dfd26720feaf57250b,True,8,53,314,4,True,Tests_passed,fe9457430a0decbee0c7c0d31247607813c17bc138563af76b07fa785c939bd9,True,8,True,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,8f476c9d389e3b6154e23e5c561ee4281a92ea125b1822eb565e4fa64c85e7f4,Merge_failed,891e0d1f2489ce98f2584d843e7fd8f56e2e18228fec8524055e76e277be6424,Merge_failed,d203d4e2a15f8b207d841abff5360fecd50fbf90bb2d2a3570440591aae1d7c3,Merge_failed,21aeeccbe508bc010b18a39c67c009b59c2c6470887819b1ad1c859e31636010,Merge_failed,891e0d1f2489ce98f2584d843e7fd8f56e2e18228fec8524055e76e277be6424,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,4a2dd250b2e34f0daf1a73e4146f534591fc33ffe7b9ce5ba4f353cbffce0902,Merge_failed,b60c898209cfce2f879fbfe1ead2026a9021a92b2ab870fafcf3b8960f4b6df3,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52 23,refs/heads/master,f6d54664fa3728e2303749b4e09fbca4d362b339,689d56f5f24b0a6a00f3fbdab2c96424f4c25c15,90587af600670f741c1a38134dee2ea7f6598743,,True,False,Tests_passed,08e4d523f5eb4a03a50a26328af879917d4146b903676db7376d61c590c3aebc,True,5,53,313,2,True,Tests_passed,0c6e9b82836630a7c2e3bb545824d65f828770f1d0f49e34739a40e3d36398fa,True,5,True,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,fdcfda25c94e8c9e3fd8f447611a2946612a428774c11493ca1b21b42c65141e,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,527ab42c4e8e805b425643bef30b5308e021483c3d8cd6981a96b86a39302a48,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,d963b45b548ddfa273d092e60c29854d6d88a79a967e3eb9dbc21e6e715feb41,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35 diff --git a/results/combined/merges_tested/lemire/javaewah.csv b/results/combined/merges_tested/lemire/javaewah.csv index f6517a3bf3..a95555aaed 100644 --- a/results/combined/merges_tested/lemire/javaewah.csv +++ b/results/combined/merges_tested/lemire/javaewah.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,7d5284a6c3955aed35a30b13c533a38edc6014dd,9886242dd6d38830ef0b75c39c08ee3e8bde658c,49d67c067729a1c78ad6015b266a71f76d6603d3,,True,True,Tests_passed,5a9010744bb8133abb96249b342117f8aec15825624503ef8478234a700d4f70,True,16,110,1204,2,True,Tests_passed,30bee11bdce6d16b5bfbfd3010d003007a0e5052bd4376b6b94401bb9a22990f,True,16,True,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,cd02cd73422854c3c1855024aaacca6fb8fa72f0b3f89204ddcd0256018ac00f,Tests_failed,2f4e3a131a33bbb4828e728631b124bb75cd9f83c6a229b82fc8a5cb8a498c2a,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,cd02cd73422854c3c1855024aaacca6fb8fa72f0b3f89204ddcd0256018ac00f,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2 30,refs/heads/master,0bfa66bebf50c2028a2f0a8bd32e6eb211a87509,ad74ab44c2df6fa512c73deeab17f75e18d21ea1,b9b27b484707cf53ce3df6b459472a37fde588d5,,True,True,Tests_passed,76940b28d8504dd98c293301c63c17c207eff090a0178aab0265440b11bee804,True,11,21,536,5,True,Tests_passed,88e6634de432a4ca667fbd207fa392c14c2cc9719d4f68bab1acd46c7684f93e,True,11,True,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,99c9280becf6d0cc8a1059fc8b4213905fe8727a732e1e3a5654bbfd271fe076,Merge_failed,c92b54f52410bb5d0aebd2d0598a5f8bbc0e0bab7892087dd7edcd5479758b50,Tests_passed,847212352d5d0daff8aa5188e94d3dd1aa346ff90c0dc3b6303187b997d27988,Merge_failed,7ff34ec5116da0a650859327946490d37dfd32ec522b64f1f9407f61cb21ab36,Merge_failed,c92b54f52410bb5d0aebd2d0598a5f8bbc0e0bab7892087dd7edcd5479758b50,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,3f3501a19867a787efad3e418d4c35b8103487cfae652b8c3e22c2cb5eb553e8,Tests_passed,847212352d5d0daff8aa5188e94d3dd1aa346ff90c0dc3b6303187b997d27988,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d 39,refs/heads/master,600bff483f9da0042699aa4bd9712ce788cc248c,b0952760c0ba180e8f63a8dedf2f16b0e966af03,441dbeb1d706f33eb7ab5c0e7a6112a6145f588c,,True,True,Tests_passed,8a5bf3585adb732d594cccaf66751cdaa44faf5de96b7c651017697158c2dd56,True,11,17,320,3,True,Tests_passed,fc08f6838a7ba7f29ffe915b48993b8525c5e33ff621a6a5f765af067af2eca7,True,11,True,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,3c511efadfbfa67914bccdaf42646cea61cd0aea607ad00e5a5c2f07ac8b60f7,Tests_failed,7616f56a60ed311ded1f756c4291f9276ba2aeca665b7c15d72950eaec7f3f92,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,3c511efadfbfa67914bccdaf42646cea61cd0aea607ad00e5a5c2f07ac8b60f7,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc diff --git a/results/combined/merges_tested/leonlee/flume-ng-mongodb-sink.csv b/results/combined/merges_tested/leonlee/flume-ng-mongodb-sink.csv index f90e0a1447..67d0284b21 100644 --- a/results/combined/merges_tested/leonlee/flume-ng-mongodb-sink.csv +++ b/results/combined/merges_tested/leonlee/flume-ng-mongodb-sink.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,6e95fc2cbcb962d885349d74fdc5a51bab767964,c7bbbbc61771590b83a5fd19fec74a6f917404ab,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,,True,False,Tests_passed,19990caf97b5a366543e127703f1c1358d8c24d85dc6b3636ac49ea570fe0ffd,True,3,26,68,2,True,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,True,3,True,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,657082fb3e14a125d948a56f4ddf0da5cda5a98d1aa3ef0f849409b1067e494d,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,2b3464f870314f0c389773a4f4a1d37adf87ab26f51631a6751a76770c57e354,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,d9c3c8da799b13c7551bea82bb4c4e8b9e49522a42a1a1e4d5d96e37ae525976,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78 6,refs/heads/master,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,d49f51bd83fd89f815e32fd1ca7f0ba7159f212e,46b1f3364efff6a8c68326b02ee26d1bed70746d,,True,False,Tests_passed,842ab749a493754054a421818905b5ce93dffa92a64e5ee09074dd5b0edc4b26,True,3,19,54,2,True,Tests_passed,f22a5268aaca519d234d2b4cc033ff6f25753fab7e91e0dbe1caccc7bf7d608f,True,3,True,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,44a52493a86ca34659de3c4f5c397b714c31a6e1ff416913ead398ef80c8db27,Tests_failed,3eac86ba385f5d50ee5510417d8dd45cf3e7d0b54acf2f001a4e3036283800a2,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,44a52493a86ca34659de3c4f5c397b714c31a6e1ff416913ead398ef80c8db27,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3 8,refs/heads/master,8ad0b50fa6aa1a155eaaa8524a422f9170b3e67e,3b7cf7176bcf497c8f0180c8c55a95456f586ba6,33e0e691b2953b652e68897b198c9ec5f031ba67,,True,True,Tests_passed,94d96a60b040b01a65a6485ee1e6a954cd2d719607f5129300f171bd187e261d,True,3,12,144,2,True,Tests_passed,6fb0072f64b2163dd1069fcf46b730ea08be2b0c8e3bd10cb487de0b9197c2c6,True,3,True,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,06ed06c318b75de4a645315308d0d0af897d3feb8b360c73a6cc2e2f2429d31d,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,06ed06c318b75de4a645315308d0d0af897d3feb8b360c73a6cc2e2f2429d31d,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c diff --git a/results/combined/merges_tested/lettuce-io/lettuce-core.csv b/results/combined/merges_tested/lettuce-io/lettuce-core.csv index 14c915f808..e6354d7678 100644 --- a/results/combined/merges_tested/lettuce-io/lettuce-core.csv +++ b/results/combined/merges_tested/lettuce-io/lettuce-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,7cbdf4542f2e7b781d7212b26bd8349eff93ef98,194eff148f7acd23ac1bc289f51b28d68c48e0b8,6220a63b6ef9c543ca724611d9a1693dd243f3fc,,True,True,True,448,474,1009,15,True,451,Tests_passed,daa8d2aef3c88f98e4e97c80d617955cde68a0293dd0eb3200c28d11d8b9115a,True,Tests_passed,f190e04e6bea2e5990432dbcca5f97562bf5cf7387f0c01f6b2f51d971095153,True,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,dc8dd0e7b2a59265c330e2fcccc42f4f991427a169b62bc839e6ba3f43e8e6ab,Merge_failed,f19434f8b70b82b575a5b14b02dcb29922b61cf0cad66e9bb327d6f234aa0190,Merge_failed,3aaec7d9af822d443cac9d1d1b4c0a07e23627c704d8baa2ee7fd5b9c4fc4d8e,Merge_failed,72ea975c5cee3ef0a1ab88d1f6f8f16ada3bc228378af2bf049c6709f51c7081,Merge_failed,f19434f8b70b82b575a5b14b02dcb29922b61cf0cad66e9bb327d6f234aa0190,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,b3f2af479f6df79d3f24a3a5851282d5409715d3d24e1d9826874e76d0db9f38,Merge_failed,3aaec7d9af822d443cac9d1d1b4c0a07e23627c704d8baa2ee7fd5b9c4fc4d8e,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9 2,refs/heads/main,dea8f66f846bf37494c18d1ca6036edd4a2f7898,9b47dc89b072adf3b3c05f3b9731b54b909df322,215dbee246b3556bff7f9b45daf07030c87e1bce,,True,True,True,456,2280,43926,207,True,552,Tests_passed,ad555d505a17d6a2d0c11bcb7d4968b2b0d05c40241a56e1acf08fcc9e5a28d5,True,Tests_passed,9dcd1bee4e0981b74dc6499c5c1b4fdc8d034f150f06ba66edc52e2e08ec5960,True,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,8f9cfb320799893f04364d7a6390762e891a9a07e0346d943709836262659af3,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,09c81aa80e3264d763b871b82be3ef725102f5f78bc976f563ea64281ec9f36c,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,ff3927232cd823ff22b81617f53286fed75dd7164265f761b17a24bc34a82045,Merge_failed,f1af423ab1690198cce778becc4aeeb0e15653ce9e0dc6472a7004eb3f76326b,Merge_failed,87816efc2fb08b850fe667bca449b8ad0e2799a25dbed7cb0ae8f210dda64843,Merge_failed,4b54e787831197771f4ef2b7eeb53807044a46f570323573808b30663daa98f6,Merge_failed,bdeaff269fc50b52be899b1ac752a6d4453a3436b1c86a837d65a0bf611b0c90,Merge_failed,87816efc2fb08b850fe667bca449b8ad0e2799a25dbed7cb0ae8f210dda64843,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,09c81aa80e3264d763b871b82be3ef725102f5f78bc976f563ea64281ec9f36c,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,ff3927232cd823ff22b81617f53286fed75dd7164265f761b17a24bc34a82045,Merge_failed,485348a90d72fbca52cb938ee679ab17530dfb77386bbd022f3ebbf6eee3a57c,Merge_failed,c442b6b61530665ee8b370033f7f77bce3939c287c5b36374872b07e2d640fb0,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,8f9cfb320799893f04364d7a6390762e891a9a07e0346d943709836262659af3,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1 8,refs/heads/main,e144da09a5e5045ae5b45c13a379796d9be9ab3f,5f4e1044530033d93297aab286fb683db0bb99bb,0daa66b1d2558b8108d7e74aceb90a7b4eb6734b,,True,True,True,41,160,1432,4,True,41,Tests_passed,c747c4d2ea06b7603c0489f6a3adbe0e96c726ccf42f5488f07e1e3357143645,True,Tests_passed,cbc7f25b2065e98f57394bcece37cc07afd6d0d5f4eaa86494e4142ea1feb8cf,True,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,ee2d3010cc3451e9e50cf49a15e64880708bb9b5c9fe0a0f44763f40a4c1fce0,Merge_failed,8c279cf4f981da0974b60799eaf769292767f9d8ef11eb88fc8f1c0822095726,Merge_failed,f0bbd7ca3c8fdbf4fe6c50367539e8a6b348db512c58c6fe1838f461dcc3e268,Merge_failed,1f298b12f4387e11cdb398b9df55c76d003b5c27aef479b51ee02c15f24f4f3c,Merge_failed,8c279cf4f981da0974b60799eaf769292767f9d8ef11eb88fc8f1c0822095726,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,051523d5c4cd1c9682360149cd20316100a8f06aceb8e01d04f1367656169178,Merge_failed,97d8d6b6f6c2bc6b867cf7aa7b353d4045fb52911e8ebf66fc3af719b7516593,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3 diff --git a/results/combined/merges_tested/leveluplunch/levelup-java-examples.csv b/results/combined/merges_tested/leveluplunch/levelup-java-examples.csv index 6895e4b1bb..2ea7697dd0 100644 --- a/results/combined/merges_tested/leveluplunch/levelup-java-examples.csv +++ b/results/combined/merges_tested/leveluplunch/levelup-java-examples.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,db0acd81d124fd8af863c20728e0afcf3adbbb0e,cd0b409006035fcb9e48bb075b58aac1cf6d4192,d6723a2397460e5ba08e2d9ee45bb78a816100ae,,True,True,True,9,10,631,65,True,72,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,True,Tests_passed,f2491f5f279546d648cbdffe352a5249c60d8d923f52b0a3a31c79ade7207d5a,True,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,c62ea37ac6c9e2743cb490b52b1850626cb7d0b181e29c538dd548ede7a8e2ff,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,f3803935988be5db69ca9e3a96bb4f11796d95e61290b2ca345bb0c3420681c4,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,caa4326dae64dffadc952180558d17fb7550ae1fd9b4e377eed762970ced741c,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4 diff --git a/results/combined/merges_tested/librato/metrics-librato.csv b/results/combined/merges_tested/librato/metrics-librato.csv index 0884c9e366..2f1e5c91ae 100644 --- a/results/combined/merges_tested/librato/metrics-librato.csv +++ b/results/combined/merges_tested/librato/metrics-librato.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,0720f6dce4f8da338bbfcfa9e2c0009de7772709,a0891f0785d08d8abaaf3dc84009bd8769d4ca8a,5afe7a103adde58eab777f26fcc616f06601207d,,True,True,Tests_passed,8bfc3fd9e58392e008801f2a7ecac6df5095545d1b829d0d16b0c289206194a4,True,6,32,159,2,True,Tests_passed,8e27d6b8f17a98c1b5d2dc4ea8e66e06e99ffd05081dcd909ca669c52d342b37,True,6,True,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622 30,refs/heads/master,140caf9da468df3c5bedacf427b06903b0933a9e,0fe7e8d986428c910b046bec995e793e44aed48f,f5efb2b25af84d04977b3ceca7712dabe4a4da61,,True,True,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,True,13,88,430,5,True,Tests_passed,6d5abf7af2bc92f56a604fa6e2903a2a481460e39d60c344014aaa3f77022fbb,True,13,True,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,0a4e0843e91352ed1326b39e8ec6746bc71e850e14e7e4e052cee72ab6587e55,Merge_failed,95a2f54cf4d1cefa45063c7dde9ba8435721ceddc19545e52c5dffc3399837be,Merge_failed,e7e3f638e88aa1912e7291616b8810399c1bd22fd6c5f652ed4e8ce303f09a51,Merge_failed,f51086d015c4620fe62406f3d2cedc293cc14c9f500f17989cfbdc413fbf7593,Merge_failed,95a2f54cf4d1cefa45063c7dde9ba8435721ceddc19545e52c5dffc3399837be,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,8dbdf3a3362754bc0d3156f7ba7ded5188c21d36e6a25f7a008ba6bc9a938cb7,Merge_failed,e7e3f638e88aa1912e7291616b8810399c1bd22fd6c5f652ed4e8ce303f09a51,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31 31,refs/heads/master,0fe7e8d986428c910b046bec995e793e44aed48f,f20cd00614275ef975d77648e1ff541e04832b51,34d97f335710c209bc71bb0e839c23b279b65d48,,True,True,Tests_passed,e37c8a3a9ebb7fa3f3994ae6a55abbe971ce145454a3eee055201081cd2dce72,True,12,71,294,2,True,Tests_passed,29112055e54e5b5c67434eeb00541c2a22e40d5df90b3df73d6589b40c3e1dac,True,12,True,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,6060bf18859f2988287d124216d39e2730df0e286116bdf713d6e100e3999104,Tests_failed,d691d837d76cf7944cf688d342794d7414a1e3bc212deee8403855da27ad5beb,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,6060bf18859f2988287d124216d39e2730df0e286116bdf713d6e100e3999104,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd diff --git a/results/combined/merges_tested/linkedin/camus.csv b/results/combined/merges_tested/linkedin/camus.csv index 9ccf99edd4..c2cc7555f4 100644 --- a/results/combined/merges_tested/linkedin/camus.csv +++ b/results/combined/merges_tested/linkedin/camus.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,05c0ceebfa45c20f5e1b584888fa5a9a5ae8c6d2,3f3ab0a3888ab9bbde8670a15f81404b5094ad91,e5694615ec635a2a10b6b8e52045b461ed9838b6,,True,False,True,5,6,34,2,True,5,Tests_passed,b87be47c4b81bebdaeb7e1e19e0d1a498723b7cd3a05e3e73d0a19f3aed47b28,True,Tests_passed,67e6913684581a54b4e6d211718756324deaff08231c368e10ae9db988045c02,True,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_failed,1d627577bc898fe14d16939dff010cfc65fe62fb1bb8dd11833b0bc440624ee4,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157 10,refs/heads/master,9587d9ba868624a8e5ee934456f82a2a952019b5,ee7449a3b1ea92dbdeaee37494b9b4e19c59ffe8,103efcc907b903290134fb49588452d40fca555a,,True,False,True,6,6,50,2,True,6,Tests_passed,273fbf1121486c9264f39490e55d53aafa1eca32519ed4331bf49136a5dfdcdc,True,Tests_passed,a5baaca2f612b14596514fea7c9ac680fda8a3c0aa7d50e08c55d746e56c9b88,True,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,e94d91030468a2b02722e81bcd075df1a386e61e757eb790faae031fa0c6d1e8,Tests_failed,ef0e4799e09170af73766bdb3b36a6c5984c631af238e683c71f8f129c63a5cb,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,e94d91030468a2b02722e81bcd075df1a386e61e757eb790faae031fa0c6d1e8,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c 16,refs/heads/master,5cdebd87dba765dab516fbbb74e840bf460c925f,3745615d07abf2a0ea464e97cc9940ad7e9e476d,20b334666539fe9f86645fb0f7799e923bfc2504,,True,True,True,38,215,2363,2,True,38,Tests_passed,e7e0c2cb08a4219bac23401f752476801aa64fe8765c5f6b4b5ae9e53c894d2e,True,Tests_passed,188899e8a8a5fa6dd768c94fe59ed4b4586825a26e24d62fecf2aa6212bca37a,True,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,e7e0c2cb08a4219bac23401f752476801aa64fe8765c5f6b4b5ae9e53c894d2e,Merge_failed,aa7e82aa7c858d074399d58c4b16726cfcd590b7dc1892adbbf6d23d4bd4dd15,Merge_failed,2e105478cc759445557f7ee27fffdce49a40da0cf87b6a2a6feb6109c4b6044c,Merge_failed,a12fb8a90e5e9eaf4d3d1980b2e573c0aa3158e6380b807668389fbcb201ec0d,Merge_failed,aa7e82aa7c858d074399d58c4b16726cfcd590b7dc1892adbbf6d23d4bd4dd15,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,e7e0c2cb08a4219bac23401f752476801aa64fe8765c5f6b4b5ae9e53c894d2e,Merge_failed,2e105478cc759445557f7ee27fffdce49a40da0cf87b6a2a6feb6109c4b6044c,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74 diff --git a/results/combined/merges_tested/linlinjava/litemall.csv b/results/combined/merges_tested/linlinjava/litemall.csv index d3c174bff5..c6870cd136 100644 --- a/results/combined/merges_tested/linlinjava/litemall.csv +++ b/results/combined/merges_tested/linlinjava/litemall.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,c13ccea867fc0c2d3844140521b2b875c6f5875b,97338d20928527485650def8e7681816cc7e19f4,46d2a4e0801b79b43b35af2f3eccd4617da20cf3,,True,True,True,115,1911,8698,2,True,115,Tests_passed,37ed5d0784c0a3162b42b5a35802afbeeadffa629c806beed0d4e59cec67f719,True,Tests_passed,fee7466d2857a405ad6f874a1df422f94e320a4f88b18f6f1a1cef4c79b9a106,True,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,27de70cb0609544dd98898f00091bf4ce7336b851d20b8b9f830fc45a51dfefa,Tests_failed,bab536a2c9bf120bcf225955a1b42cc407ffb0c5caada6f1b4fe9ddabea3fdbf,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,27de70cb0609544dd98898f00091bf4ce7336b851d20b8b9f830fc45a51dfefa,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34 54,refs/heads/master,f16b2f35fc8aa4e77ceb428cabc946c330c7c05e,25dd96d4fb6f68596d70f97c59f1929eb07223ba,e95948bfa3aeba1fb46ed5d6aeefa970225bec84,,True,True,True,46,151,1536,2,True,46,Tests_passed,d6994d087c08a016a1fbc76f2d0471dabf118a3c8f8662a05d82e0d7f663c072,True,Tests_passed,ee776af9fa774cd557e8cc05e474f3d66f0368d21fb76e356ce476e494b8ec17,True,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,85509ea1e9eb01c2395b201ef2dc9040201a65d14882ae8b4c40b3457103d3fa,Merge_failed,a7a546a80c6bd8ac14b796e4d6989082d34fd1ec1bc804eb7970cae0077ca58a,Merge_failed,0d8d2f895f0cc4b0fba1d11dbf0b2747f6b45a49ba8ebaefc1c75cdf91d68154,Merge_failed,cf71bf4e02e491a35da36a0c72c46702087e07b1c27c537e914183ceac94ba00,Merge_failed,a7a546a80c6bd8ac14b796e4d6989082d34fd1ec1bc804eb7970cae0077ca58a,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,d3d3d53557d8780ea6ef4f77d9215dbc2f94c6f1d5563cc90375ed3891a26e38,Merge_failed,0d8d2f895f0cc4b0fba1d11dbf0b2747f6b45a49ba8ebaefc1c75cdf91d68154,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0 69,refs/heads/master,4431c5f9abad40dfae481b6028f41cf7d9c24584,7d73c59bd5d86d9dbc92d91e412efbee76020b58,41d2f24509eca48200b5959fd28de4c61353503e,,True,True,True,369,1293,32946,2,True,369,Tests_passed,6046ee74ace0a839d25388a75448a977341a3a3ce4e35bc9a33b4bf2c746d9b6,True,Tests_passed,7955f0c74dd28dd975dd2ef0fd69eb8d24dead843b3bd4f96b5533b50a218ad4,True,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,c9216f8b47cc3072af7ef8fdb9cdb203c20f43c2fef15441b561abdb12312562,Tests_failed,8db3d40757f5cc3785314127a5afaf42c13a0d48914b0201a77c9c43dc71744b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,c9216f8b47cc3072af7ef8fdb9cdb203c20f43c2fef15441b561abdb12312562,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d diff --git a/results/combined/merges_tested/linsolas/casperjs-runner-maven-plugin.csv b/results/combined/merges_tested/linsolas/casperjs-runner-maven-plugin.csv index d405ec818d..9c79accfaa 100644 --- a/results/combined/merges_tested/linsolas/casperjs-runner-maven-plugin.csv +++ b/results/combined/merges_tested/linsolas/casperjs-runner-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,bac08fafd6c851811c8c7e2fd8b393d20d82bbb7,0de7643b2ccdb5de6f57e82e93028c383291319f,51b8b9d308d6592ff7d339b802c09da69df3d355,,True,True,True,24,88,581,3,True,26,Tests_passed,69199b4507b5ac16c9ea05b2caade8671b71721f4d607f35ec7a6e0dc5871391,True,Tests_passed,5c41ff374ae3a89aa1db1b4e810106d147c4c8af13d94416579430f69dea6a6b,True,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9d8effd0685a4793ea57dfc97db635028ef35a031b6a7b5a20c44992951c6cc4,Merge_failed,bfb884f0ddedb0d4155f11d499d79d5de7d2dc815452e0f5baed97f116c61c82,Merge_failed,73d656539f34ba930dc32ff726d4187135e885a43008a8baaf61b1bf81f4aee1,Merge_failed,f97d52fb5ef04eb491f956750379793e72fbcb4324d42200e17f7866bdf1d657,Merge_failed,bfb884f0ddedb0d4155f11d499d79d5de7d2dc815452e0f5baed97f116c61c82,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,5d917c678f8198da930cd7b8f711b79d5eeedb09ed3cd8ed64e801bea7789977,Merge_failed,6688a8d6c0456649b2b017d1d30c96585327d0774f17b296e1ae8d5f5ed5288a,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2 3,refs/heads/master,98fccc0f940917225388733e66237404f374cdfc,bc49d4bec72a513a71898b54a82f7b58fd31bd75,3596606660beafd4e9f86deefb33adc264146b1c,,True,True,True,13,35,151,2,True,15,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,True,Tests_passed,97cbd5b06e0dde7adff256e50dbd2bc99fb11308c11727d7e7ddb8f7a32ae6f1,True,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_failed,9a7c3dd7c8697f8b2aad685923434c8b7d0dc4db2fb4a750fdcd7a2ba9b13d9e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80 4,refs/heads/master,bc49d4bec72a513a71898b54a82f7b58fd31bd75,f48926ede0185f3c29ce57154266545c30a6acbc,bbb86d274b099feb232c9e2a80a54d1ec94be0ef,,True,True,True,9,20,152,2,True,9,Tests_passed,20061750328d118fce02f6f860f7219e397e9493ca601ecf52cadc98ead91a1f,True,Tests_passed,50d2eb593def4562cbb2f9290ebd0975a8f603746281ca0f45d3818829eb6a4d,True,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,685ae4c28704ca0e7e322c901f31b5d33df30b168e235d56fbd63d1479a964de,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,685ae4c28704ca0e7e322c901f31b5d33df30b168e235d56fbd63d1479a964de,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2 diff --git a/results/combined/merges_tested/lintool/clueweb.csv b/results/combined/merges_tested/lintool/clueweb.csv index 391a5df3cd..4808b3027c 100644 --- a/results/combined/merges_tested/lintool/clueweb.csv +++ b/results/combined/merges_tested/lintool/clueweb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/pull/2,f9181ca9b2aaa753c6ad6682c104ff86b3ad61ca,aa26f1b3650bb1f473ce4f7da5ead01e6a3b7a6e,9903285c0c486d0cb92e662a16fb338061c32cd7,,True,True,Tests_passed,36b130f3322f6322729db4e99b129b597027e4a340248c309d581a485da296e4,True,58,130,14456,10,True,Tests_passed,dfe00cde5ee8a26404891cf942f4796a75fe1098c4c6921a5078bb128a39bdac,True,62,True,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,097874d253ae2b46505cd6f042772daede1177c0e71ae2bc5949293daef62a6f,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,11b4a6ab6c9ae9f3d6b25238f22a45ea88a6f0a5ba88eaddb60b3298959eaa0f,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,18341545050199f835edbab9762059e94498543564c2cacde95bbdc24824bc8f,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c 11,refs/remotes/origin/pull/2,850bda6ab8a72c664b915023c522133b365447d9,fca438bbf340f6ae666fc877f37f5bdc2830dabc,ae407960f13e0b597aefa167abd4971c1976b2e9,,True,True,Tests_passed,2f15fa0a41f0527772a788437f8dad2f46755df374c475ee810ca1a66830c371,True,59,155,125507,10,True,Tests_passed,7fc551da026c59417acb6086b1b9cb2286401122329721360331b2d3b1e2f89b,True,59,True,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,5b9048dfee96d707d445bc3b3317b116b4a133156d7cd3e797bb6eccff57e1db,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,8070878d366c576c02799fd7c109b177ffc4fe7963444e37bba15473b26ff883,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,ff39d6d2807a19ad8df6f4c4eefc55cfd91a0a95b92a06c3621f40df40c2325f,Merge_failed,31637ed5abbd5de2d5641f0dce2496f6c4dfc8c26f49f05cba0fca587a071980,Merge_failed,cf4a0bf6ceda2d0076ed96ed92f7844856abfeee60ef30d8e19d3849f13f87b0,Merge_failed,8a15b9d02872ab811e42e3f745c36aa82e25c863b4696a90d0e7e40a5cdf1ec1,Merge_failed,e974cbc73939a47447ce3db6f2f1a5aa67d9b0d739a9314f1d34031e3351ec38,Merge_failed,cf4a0bf6ceda2d0076ed96ed92f7844856abfeee60ef30d8e19d3849f13f87b0,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,8070878d366c576c02799fd7c109b177ffc4fe7963444e37bba15473b26ff883,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,ff39d6d2807a19ad8df6f4c4eefc55cfd91a0a95b92a06c3621f40df40c2325f,Merge_failed,72fdb382618b6ae5b86975e783a8f5a4fe1f9fd470adccb547d3e608d155d237,Merge_failed,8a15b9d02872ab811e42e3f745c36aa82e25c863b4696a90d0e7e40a5cdf1ec1,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,5b9048dfee96d707d445bc3b3317b116b4a133156d7cd3e797bb6eccff57e1db,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347 12,refs/remotes/origin/pull/2,93c50a471fbebf6d54a57594fadc09e2a228f02a,d7c0b0376bd72f2efafa754970898a2b9d90258f,e2a31a23c35f62fabacb53693d8b1c4742fc603a,,True,True,Tests_passed,785267581b92ce16db0ad2a78d5b5cc296e44ec958ec1e91acbb648cb110d137,True,32,127,54142,3,True,Tests_passed,2df20b27c45edb85709eb6a63e014d88bc725f5854879bad311adc5fe59383e2,True,33,True,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,cd976fd6096a966bc28a509fc0f55ef0f30627cf2b72bcfeb3d52fff02fc3e3b,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,48e8407bc1fc5c9b9bc422d36559b86175f9332e5cb700653c67f310ff9f93b3,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,1072450cfd4c8e04b7f494276d763b56a77d107785b4e8d29e93dd77a7a1bf9c,Merge_failed,86f9dcdc9232ecf432135b7bdf35da5e30278c3d54229032884ac9bff2ae67b2,Merge_failed,80bbe10807fc0244ecc14d0384d0ffd1d30b4b99296c676c126f6bfe661231e1,Merge_failed,b5b63a64a346cb54aa69d1eebf3cfa03aadd6e34c810311d1d7ec26afb072574,Merge_failed,10013fe52d46ebda522e6daaf98dc1a61392e9823379da3674af60cf268aa3e7,Merge_failed,80bbe10807fc0244ecc14d0384d0ffd1d30b4b99296c676c126f6bfe661231e1,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,48e8407bc1fc5c9b9bc422d36559b86175f9332e5cb700653c67f310ff9f93b3,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,1072450cfd4c8e04b7f494276d763b56a77d107785b4e8d29e93dd77a7a1bf9c,Merge_failed,c1405285be712a8aaaad887f6012004d6af05bcb0e0fc8813886b83719880a39,Merge_failed,a9c3868c92c77ca45a7c38d3d0ab0d88e247a3ab02437952c0828e425d56647a,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,cd976fd6096a966bc28a509fc0f55ef0f30627cf2b72bcfeb3d52fff02fc3e3b,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd diff --git a/results/combined/merges_tested/lionsoul2014/jcseg.csv b/results/combined/merges_tested/lionsoul2014/jcseg.csv index 49048bd793..efb5e11d3a 100644 --- a/results/combined/merges_tested/lionsoul2014/jcseg.csv +++ b/results/combined/merges_tested/lionsoul2014/jcseg.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,3d7efe1902724e0b822dfdb103fb59b181703320,92532809c229b49aed282633f842022dca2df554,277326353ed2bd7fd13a5f1d6a248f77c6733a31,,True,True,True,8,13,65,4,True,9,Tests_passed,d1ac5ab5bbcdf3c62ddfb65bd4846f214f6e7e701ee6e28e7154b81852227b72,True,Tests_passed,c20344b7f8ef81594b144f903dfcda8ed712a02636159ce2e2d40317e08130b8,True,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,baeaba8a838815fd397412fb2f9dd86fd926c051f9cdc6dd79ce111d360cb8bd,Merge_failed,4a81a49160a7f6651ca1734d3cf4cd758a89dad5c67a9cc04498be8aa89c0385,Merge_failed,859d761dd8c64189b6407b1513dc018261a604e2e8d3596861899b857e062cae,Merge_failed,3cce02f6f1c61a33bacbe8a61771cc55b6e30055db601ee1a880fab68790c0e6,Merge_failed,4a81a49160a7f6651ca1734d3cf4cd758a89dad5c67a9cc04498be8aa89c0385,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,e8ce79abb3ce5d52a1840814ce0420712a72498cc64fdf9b37590fd8fdf25b83,Merge_failed,be2c42899c63f399a668d0135774da0370fc2c99e549447f5a34d73c8233dcf9,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc 27,refs/heads/master,a86200ceb8b239ff7c3dfbceb5bcd4df8ea0cf96,0e7ba00efa11c9a060b19f9951bdc6daadd6049c,1dec9143e14c98f774d64cb71c7f63938d420d28,,True,True,True,28,156,577,4,True,28,Tests_passed,f6188fd8729fb13be98adf439de0fcc58537c479e00fd3a37cf05c8c2358e5fe,True,Tests_passed,a906d0492828079b957e3a285c5b3799cf2c4043f56784c9af9f85d7f8852f4b,True,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f 34,refs/heads/master,3220cb12322c30c6b9f3b20eb5ff1a5cb9e61f1e,3b3492ee5474231643708da8957f515b4766c707,fda7635173f46dafdb61d3f6fbfc365fd17696e3,,True,True,True,11,39,375,2,True,11,Tests_passed,a35df7532b429bdd712f92eccc8532fca829ab770f38670f32d76ebcf3ea9b1a,True,Tests_passed,0f872ec04212542e6eda1c6a5c05ae15913b1d599b9de7f7fd844d801d8d0047,True,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,d5fb3bc3e14165cfa23fa4ccaf0a2cb4689994fade73fcb72b088b143d8e9340,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,d5fb3bc3e14165cfa23fa4ccaf0a2cb4689994fade73fcb72b088b143d8e9340,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a diff --git a/results/combined/merges_tested/liyiorg/weixin-popular.csv b/results/combined/merges_tested/liyiorg/weixin-popular.csv index d21f3b0daa..283e95231a 100644 --- a/results/combined/merges_tested/liyiorg/weixin-popular.csv +++ b/results/combined/merges_tested/liyiorg/weixin-popular.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,True,34,89,3176,2,True,34,Tests_passed,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,True,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,True,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,b02773877527717f1e1d5e7e89860278c7e9f623d3bb3a7ab758c2f5febec25e,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Tests_failed,b2518a1af05242bb1e273519d62bb0e8c7dcd4f59821c7d42dc68f66e7156692,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,3ec29058271afd3a63e24cea7057fdc83ea347a1f09f47610bd5f9d942ddc065,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e diff --git a/results/combined/merges_tested/logstash/log4j-jsonevent-layout.csv b/results/combined/merges_tested/logstash/log4j-jsonevent-layout.csv index 198e8e6207..669bde6441 100644 --- a/results/combined/merges_tested/logstash/log4j-jsonevent-layout.csv +++ b/results/combined/merges_tested/logstash/log4j-jsonevent-layout.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,bbd02e8c15164ad61886290cbe577c6ead479d4e,1a515d43cd5bc5babc30c3b021dfc525bfdf4b6d,9bf1eb60ba1924819524aaf30a5642d02b660445,,True,False,True,3,5,14,2,True,3,Tests_passed,a68be4ffa78f1170337645102239c9de02e5225861b55951b4c43b62f651e7f0,True,Tests_passed,fc4b2f6b59e551f36b295a1d39809910b7bc1708e64947ed586c5406db0fd47d,True,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,25576f72c2dc1ae36a2d912dbb0582c2e8d5052495dd8c1deac9f4e20a529781,Tests_passed,5123343668d263baa4cbe3d08802856d66163a9a8fb84234bfe4de7fd77201e4,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,25576f72c2dc1ae36a2d912dbb0582c2e8d5052495dd8c1deac9f4e20a529781,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74 12,refs/remotes/origin/fasterxml,ee90110799a7b6f905dbda921690e43cdb8b7b08,dd57077b747f5e849172d48e96a48fe6fc538e0a,f84aca0ec9e49f60c64d7fde80f8d8b1acc3847a,,True,True,True,6,55,210,4,True,6,Tests_passed,cb3f99299108e0a3a01edeef8f27e66587f470dd039275ecfe0f386d2ae464c7,True,Tests_passed,4060031dbf743f20d701089480376adcdfcf4c437d24e0b0f34ad46f165e6e0d,True,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,637e5ac5dbba75574bf5f9e33434d92ac8fa499178f41c695d3df3c858e0ede8,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,c9ab9521ec5af787988c4b30b5b3658798fa043742fec6c1b12e7ff816dbb4de,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,01da2a68ed6fd0a77a71cf69496cff5f627411b81b231c75c506084a7f921f5a,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108 diff --git a/results/combined/merges_tested/logstash/logstash-logback-encoder.csv b/results/combined/merges_tested/logstash/logstash-logback-encoder.csv index 01a5b901e2..e207d418ad 100644 --- a/results/combined/merges_tested/logstash/logstash-logback-encoder.csv +++ b/results/combined/merges_tested/logstash/logstash-logback-encoder.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 39,refs/heads/main,d0ca2ff424176b80125c1c3a83e5ed9c04798724,7b128141ff2fbb49342a004d1a2ad7d2811b975b,93d5731b36e5f5a488c6b2b1dcd5c72a5d4c70c9,,True,True,True,98,973,4217,5,True,98,Tests_passed,01c643e503a92f6d87dad98ac70813747d25f4a83fc5cd543adf58e6f303e786,True,Tests_passed,961aa9dd40e8a3e1d3b7cbff51111fe7d4d5ad26e22d054468aba98536c54375,True,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,82c41ae0721f5658efd9e040388d47da7ae7f5a8709248b3414f670b7a932e03,Merge_failed,1331521554272e69796e5322c45eff551d90d25ec49444a7f3c08c2966d25020,Merge_failed,c512592d6277c0aaca670d49f6259cbe259ebe7dc1a4f7da342b4fba7b4e4af1,Merge_failed,89e515c68cd2cdd4e3102c17e83747f78d63321c28f41f229b8d73f04a814019,Tests_failed,073be0f117442e8a7df6f45db6b7ea0e5f6924f913ab747c9e367d4dfd439fef,Merge_failed,c512592d6277c0aaca670d49f6259cbe259ebe7dc1a4f7da342b4fba7b4e4af1,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,82c41ae0721f5658efd9e040388d47da7ae7f5a8709248b3414f670b7a932e03,Merge_failed,bf6456cd90214103160c2114ca3d9b7526592e44f2eaa8f740552e01b5c61693,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5 76,refs/heads/main,561db6d638f02f740f186f9b45db5e228dfca7a5,18ccb42102f689fa9ce7190d3a130c70fa0c5981,34b4d2869f4591b6666d6f67760e344cc7e46e23,,True,True,True,13,124,1010,4,True,13,Tests_passed,26298fb24cbcdc75d8cc64fd29f7a0d65efca7155d7b5105bf6591119846fccf,True,Tests_passed,b7a4a706290ecdbf96ea29d674d521a5e440c75078bc01d83f1ad0adf8d70448,True,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,3a10fc9c6f7516484118f0d78506eee00ad655f264162f5b8c32c813fee1edef,Merge_failed,5375a7ce9620ac4ac1fcabc7c65b31cd433d00d977176f384a7ee7138616b9f9,Merge_failed,cdda0affd9f1084ed47d3e557400d34358f16c3e2653320e9df04221c9ee4bff,Merge_failed,cdda0affd9f1084ed47d3e557400d34358f16c3e2653320e9df04221c9ee4bff,Merge_failed,5375a7ce9620ac4ac1fcabc7c65b31cd433d00d977176f384a7ee7138616b9f9,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,03329d5603f897f1c1009917bcb13f2c2941e94bde36b7e9fbdb9aef87f09853,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd 82,refs/heads/main,614d4a54d87a4206da47e0e49f54e757a08c6133,49e69f2f93100d08b0bf660d7b4a83b5ed21c04c,a3980403a9269b5fdcfd0381d96034bb154fa850,,True,True,True,67,448,1682,4,True,67,Tests_passed,6ebc18076ac5d1ddd7413d28927039d41028d7e67dcb20ad6154b28e6eb031cf,True,Tests_passed,e2b045c2dddd363edb69c657eac211143b67ba4e50b1bedd041bed80bf5baa2e,True,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,3934b3837e51284165350e0fa1749c379d7718136a4efee04563ee1f551d9f58,Merge_failed,93ed5ed4fee96add0199202b8072cab4f2e5063be588bc11f29728ac17e266b4,Merge_failed,76b8e4dba5fbf736dc49db924ce92f616f5020ba998da0c096d279b2c28735a8,Merge_failed,76b8e4dba5fbf736dc49db924ce92f616f5020ba998da0c096d279b2c28735a8,Merge_failed,93ed5ed4fee96add0199202b8072cab4f2e5063be588bc11f29728ac17e266b4,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,11976e0c9bc9e57257ea9ed1cea1398670a165541e9b0c8395205c2a903c988d,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c diff --git a/results/combined/merges_tested/lookfirst/sardine.csv b/results/combined/merges_tested/lookfirst/sardine.csv index 3d417c69b4..a1bfa762d3 100644 --- a/results/combined/merges_tested/lookfirst/sardine.csv +++ b/results/combined/merges_tested/lookfirst/sardine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,d8abcbba75a4c96f3cca249d3c06d9818030318c,8d256c63babee5c3117fe1535d39035d0eafc68b,243b88556f5fb3aa45cc5ea6d00e2dce6e61c862,,True,True,True,2,7,15,2,True,2,Tests_passed,60ed52e2b39693e5369478b5f540c0d9f31814727d200b4703625bc8225ebc80,True,Tests_passed,10dafbeb5a38be85664c5aa6fc08a7cb5699e7c0e78c896a83a5a265545ad133,True,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_failed,effb3a4b39cfa0d232b78403259ba14ceab13a7820652585ae920263367f6c59,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352 diff --git a/results/combined/merges_tested/lukas-krecan/json2xml.csv b/results/combined/merges_tested/lukas-krecan/json2xml.csv index 095173e42c..bf359fabbc 100644 --- a/results/combined/merges_tested/lukas-krecan/json2xml.csv +++ b/results/combined/merges_tested/lukas-krecan/json2xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,3716f42238f1a1f0754f1ec2755b4a88cbdecb4b,dbe1af5e3aa815d9ffb8a0154ae5da21703c102d,c0dd9688d2e602d50ef4183e6d7a55f71cada211,,True,True,True,11,19,254,3,True,11,Tests_passed,5802cfbdbe4e38451e00a5db2afd2d1291deaf773e1b6270b1c6fb6cf15ac9ba,True,Tests_passed,a031b8e7f38d59255e43ba27c63f546cea243ac055be580b7289b80988b06338,True,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_failed,2f35ea7dac667abd88db40dc058659210799ef2ad08dcc408bb4a4ed79730de9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb diff --git a/results/combined/merges_tested/lukas-krecan/jsonunit.csv b/results/combined/merges_tested/lukas-krecan/jsonunit.csv index bc02d86932..d214f32313 100644 --- a/results/combined/merges_tested/lukas-krecan/jsonunit.csv +++ b/results/combined/merges_tested/lukas-krecan/jsonunit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 290,refs/heads/master,e49e44cede0a6ebc598974399c875a8d6179cb8f,fba4c65341510764258fcf0e62dee75b7f66d40d,0468ee93be40af89ef37f0ca153d716b79909238,,True,False,True,4,30,152,2,True,4,Tests_passed,a9a0bca9648d80217a189e26cf1168c3d8e82e36bb298d09f2e354b22b87bae3,True,Tests_passed,36c12aaae6d16bcfd149b412c5923cc57ced3dee4cbe1bdf9f906b2559004b06,True,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_failed,251a34c218e470fa405103c46cc0718834d9440c80af0941610f66697ab5083d,Tests_passed,a9677fabee4623d75d52c62f3693f9bd6c21e75fd5bad5b37ae323c1863622fb,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_failed,251a34c218e470fa405103c46cc0718834d9440c80af0941610f66697ab5083d,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f 306,refs/heads/master,2c3532649a05e9f89a14b58e336bbd6b7b86f190,42145c76a7343cd4724845b07b1d52849e3687c2,b8cf441e94e53bcea4a0045455451734c501912d,,True,True,True,28,128,1138,2,True,28,Tests_passed,42029b9c73b4f4d972600650db8511ebe2516a2a542352f6e7597232719224c2,True,Tests_passed,182b73689dd0aec91c2c3b90b119534482f7e25480d18bbb601605ffb8b181c2,True,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_failed,ee5c526365da08d5dfcc005908f2fdc816d2f42e75ebfb500d8606d5fa0c5e6c,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_failed,ee5c526365da08d5dfcc005908f2fdc816d2f42e75ebfb500d8606d5fa0c5e6c,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f 309,refs/heads/master,3cb3260c4b9d6f45b33057991ecbd07523fc67d0,fc0d9c8bb879475caaa3dd5c5cf6db56514abf4a,345ab00fa4ce50acb679175e78365ec739e5ef6d,,True,True,True,26,99,988,5,True,26,Tests_passed,f4cb13de8d02e4a69c2749cf7e824f91f6e208ba903c6a546cc25c380ac20fc5,True,Tests_passed,8b4c4bba4f6c9646e7c2257b14896f5e8fd69a4833f94cdb11b17a857ae0d5c5,True,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,c7c8c089e0a27826d472b749658af40f40c81b23c6da3522e956c0b52eb91826,Merge_failed,6928a05070a302db2d942b0aa2a9d94fd0849fa50c92b71ae0cfe7a1a06fed85,Merge_failed,0ff49861977a882e465e01828f1bc1d8543757d1017bbaab2f355b16f4903d5f,Tests_failed,caec439b43b070ed530bbfffb50fb25a329afdb3f6e591bc3d65dfb25c77f884,Merge_failed,6928a05070a302db2d942b0aa2a9d94fd0849fa50c92b71ae0cfe7a1a06fed85,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,ea916014c998d5a47caecb7b7af343c0eea4553d203be9dc7f4c3ec3b1a84adc,Merge_failed,0ff49861977a882e465e01828f1bc1d8543757d1017bbaab2f355b16f4903d5f,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650 diff --git a/results/combined/merges_tested/lukaszlenart/launch4j-maven-plugin.csv b/results/combined/merges_tested/lukaszlenart/launch4j-maven-plugin.csv index 5f1ee0135b..ce585ddaf9 100644 --- a/results/combined/merges_tested/lukaszlenart/launch4j-maven-plugin.csv +++ b/results/combined/merges_tested/lukaszlenart/launch4j-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 48,refs/heads/master,a9c285647e87efe1b79f807945bddb313ec48dff,66147fee70536c1f3b85c8842345e6558a3e6013,9ddf13a742aac251f4ad6357ca06155db7e54d14,,True,True,True,5,24,94.0,3,True,5,Tests_passed,84ebe7b9d66b61849e42e9170a4108b55a340be9c488e34e70a2f0872f03f67a,True,Tests_passed,90e5a10938146e86bdd3f55e737668ff046d0bfacaa707156b1fdf9201d4daaa,True,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3 diff --git a/results/combined/merges_tested/lukegb/gitdescribe-maven-plugin.csv b/results/combined/merges_tested/lukegb/gitdescribe-maven-plugin.csv index e2824b88c4..68a76835ad 100644 --- a/results/combined/merges_tested/lukegb/gitdescribe-maven-plugin.csv +++ b/results/combined/merges_tested/lukegb/gitdescribe-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ef23ebbbc45456d85db155436a821f99e9bc24f2,a63836f1ad674d2eb8fd26a90cf2fc3a81ee94fd,4c460bf43af27827b37e5565876bb1f29ac0aa33,,True,True,Tests_passed,795564bf1ffa064d1132a2b2a981c6d2c02b2c811c5bb9e1bdc5e723c9cf8b41,True,3,12,56,3,True,Tests_passed,e5351029b7ccbe392c3bd965d6a2d3b09bb66aa4ebd5c15b5b4c152717ae019a,True,3,True,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,2ccc21aff832b7069aa664fe7adea956cc447cf45a62468fdb06fa8ce025206c,Merge_failed,c793f414a32556b06b277ea3d0a6bad1d1308efd5ea10959e11f3e884a0b5ef6,Merge_failed,b6be4f1aa183af8a1b1950ad28474b2237525cf27aee4a3d3ffe28170c38874d,Merge_failed,f15eb58acd439d2efd6080c123508f2336d7f2fb9ff45d116adac677ea58a35a,Merge_failed,c793f414a32556b06b277ea3d0a6bad1d1308efd5ea10959e11f3e884a0b5ef6,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,08481e37e2780b0136394ffe97e6d55abca68a51d967ebec2866d7523aa602b0,Merge_failed,b6be4f1aa183af8a1b1950ad28474b2237525cf27aee4a3d3ffe28170c38874d,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a 5,refs/heads/master,8537d4687a51ced12400731b2a25204cfaa349ab,e4f609de937186203eb1d108ac03d1c39f7b99da,77325e31358997b2687f8cdc8e2e2c5f56907315,,True,True,Tests_passed,f7f179000ead4f09c3205ceaf768a90bc0b37ebf229afbea63a1568ac476f0a9,True,4,21,144,2,True,Tests_passed,be2ac16673efd736957fc0a4881271162f1918837aa44e03c7d56348bc1ff04c,True,4,True,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,d46f38fcad435aea72f776ab4f1ba9a6ac7af29f8035dcab21fa75c489691f23,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,c7b9fc1e03c65f37aed369876617b7243275c214b3eef7c281bdd9c932bc1f39,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,00aa5eb71b5f177721b5823537c72e7fdbd808ab03880e2053023468db4e17f5,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6 diff --git a/results/combined/merges_tested/lusito/gamedevweek.csv b/results/combined/merges_tested/lusito/gamedevweek.csv index e8e7f1ee8f..996dae833f 100644 --- a/results/combined/merges_tested/lusito/gamedevweek.csv +++ b/results/combined/merges_tested/lusito/gamedevweek.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 292,refs/heads/master,0834d16ed9d41814192d2af84d06a4a4a760a591,c98f377e7274e797be2596f0381030b246da4850,aa0191a210f9f43017d8067738cb70dab793c9ee,,True,True,True,8,14,554.0,5,True,10,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,True,Tests_passed,061358c705fc2c544a8a4c740160f08e6fccefa510a4c4ae96bdac1ceebaedac,True,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,8cc743b6bf41a10473168aeaaf5922ea109dd4ff31680fc71230995ed7f9ee18,Merge_failed,c31d7275a668148836156935d65f20121ea31462cea1bd5d1c3f36d7e1f6666b,Tests_passed,615a9dc20be85474c20b294b01812c6027e4c6fa4129500d2c3abc221681dcb0,Tests_passed,6cf5d70100a03d57438a2ac9b6c4d07ec76ca36516f63d18b54b916ffd85463b,Merge_failed,c31d7275a668148836156935d65f20121ea31462cea1bd5d1c3f36d7e1f6666b,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,36f47176d4793f6befee916269e4bc10d07e0339a47bd203252324ed6cfbed52,Tests_passed,615a9dc20be85474c20b294b01812c6027e4c6fa4129500d2c3abc221681dcb0,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f 319,refs/heads/master,d194efef95938a45962bf38ca75ddf7dcb178936,3bcb77d359c736451d3207f740399295e54ac455,574dd6ce91294fd578ce46e029a4f15d7377a81b,,True,True,True,15,14,1356.0,217,True,227,Tests_passed,5ad15fdeabc0f3805769bbb58f940b596a6a67e3490d908b2391d4606c47d234,True,Tests_passed,455f92e935a416b040a2c0587b87b038317e335b430eba11f97f2b610d7e971c,True,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,63b12371165d6421e19a7e4f4fb2cf3b80185897d2d9d73f2f9106c44fdbfac9,Merge_failed,5abd4d005c54f8c88e7caa8f5489123881eb15a90936828859b3a908e41e6a46,Merge_failed,a1a847f107b90564a24264a2010988411582c49fb9c06815edb119101e742bfd,Merge_timedout,,Merge_failed,5abd4d005c54f8c88e7caa8f5489123881eb15a90936828859b3a908e41e6a46,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79852f6c4d99bc24f5020012f8bd3ddb6b86ee1bf2db8cc1cc0877595e9499d7,Merge_failed,bba1123a81e7e2a089b705c7a3b1d49f4a80adae27cba480edc1c598af802857,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f 455,refs/heads/master,23c03d5bcac19f2414bc9f7fef55b8ebbddbf467,a42a2c5f2fe254944eb28b3fe044c487ff50cc1f,a4502b085f3d52a544312223e3b6fd25a873b8a2,,True,True,True,33,32,2272.0,2,True,33,Tests_passed,578d1e98144350dcdc2d400eeb77c5a50443f6e51b6b44a3fa1c440248d79ee6,True,Tests_passed,de054c89773e1e3aa9b0cc6683e035b46f6bc12beedf35482c6c89c040ba2049,True,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,70eb77a3a24b370532bb9d33a0d782e9eb87deb3bb0cf6455c98bb8146131669,Merge_failed,d09eb85ab8954aab601e539f1fde386150aaa2a3ae360c90313bdcbe7b8c64f5,Tests_passed,be83377dcbc79038047dca1eee48929d593ea21ee2ae170259c60b9048f3ec54,Tests_passed,b68f701811e09f2bce4c3e460408369c6633aa501e1a47253d3bd0fad0cec7fb,Merge_failed,d09eb85ab8954aab601e539f1fde386150aaa2a3ae360c90313bdcbe7b8c64f5,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,3f2c262bd77bec76f29c445a6d4462167b28948971bea2aa7d8ffe16a36e141c,Tests_passed,be83377dcbc79038047dca1eee48929d593ea21ee2ae170259c60b9048f3ec54,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a diff --git a/results/combined/merges_tested/lwhite1/tablesaw.csv b/results/combined/merges_tested/lwhite1/tablesaw.csv index acbe99b69e..13c8ef7a7d 100644 --- a/results/combined/merges_tested/lwhite1/tablesaw.csv +++ b/results/combined/merges_tested/lwhite1/tablesaw.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,7fc754b5f625d3078e0bd8b165686f94da41c781623cdd925c22fe66901b791a,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246 3,refs/heads/master,064b075c3a675302f3d372d0ce308a12dcca0ba4,a13a334c97c01a7284a80f171615f159d03b7975,2a7efb82d77980077ded7cee995c9c051fb1545e,,True,True,Tests_passed,8e253e7f54906664c5588ed04337ab0ebc000e46d65ad0c4260c8b5793b5459f,True,49,105,1735.0,7,True,Tests_passed,d9750fcfd6013df5ece52ac889dc4e82e0000e94661b33a5001b1fa9aee44e49,True,49,True,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_failed,a6641ae2f6190b5e571da73c4da12d540565a6b91954f68fc5696fe0aa8802a9,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4 8,refs/heads/master,13178c81a1ba18fc39b7280dc40919f4208650fa,25d12ee6c6f5bb70501541813caffa5265c0b9c8,92d27fbeb840ea070dfc5064ab3a67f223c56441,,True,True,Tests_passed,3af57b5a02ba264d51a67d6dc4c1a362302ed8f09cb98a0dcd08abceebeecd7a,True,24,84,245.0,2,True,Tests_passed,26fc25b1b168263e7dc12b303fdc31708348e8feab58e387de85d5a18a5fa6c4,True,24,True,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a diff --git a/results/combined/merges_tested/lyncode/xoai.csv b/results/combined/merges_tested/lyncode/xoai.csv index 75fd737400..64e2a6c107 100644 --- a/results/combined/merges_tested/lyncode/xoai.csv +++ b/results/combined/merges_tested/lyncode/xoai.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/3.x,5679c2e9385c07c78a5b50d34c0ddab31a0e1745,37472820e6a9725ac72f2c0df6fd161f16729f8a,2c79b4b8d3f8975b7a222d0205c681425cda22ad,,True,True,True,39,102,801,3,True,39,Tests_passed,5bb6e28c6bc1669d13a397a4a88a9f68b2fee28ca6264c70503d926199e77f6f,True,Tests_passed,d398acea29e7643af903b975a94bcfc3af663d939072ac52b0945b61d02bc56e,True,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37 18,refs/heads/3.x,fe6c4bc520749bad20a6d65db9949a933e5fa34e,30623f08db90a8dd561d58574fda5ca383fd8a15,a2b135df622b83ade5f22349361c47b9827f50c1,,True,True,True,224,872,13121,3,True,224,Tests_passed,e272fd5136c780c7184a3fcb847ad313467a378e4f1c8c979cc253764133c2d8,True,Tests_passed,cae5c04e8fb4650d2852d9ff5d189f74e4d6b850fb1a33948b400a1b6860cc0d,True,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,2ba74ff41d01506667ae6595fcc28be8edf7fc7940977886e6f26d36f82aa804,Merge_failed,9ef58a0ce5fe6ebd39f6bea8fe0771649489db4f4d70e7d9d40bb4aa7b524418,Merge_failed,eab5e2af794c684cf72b2baefe87243bbc581d1de9320a2a4df1ea0e1d50c0d7,Merge_failed,eab5e2af794c684cf72b2baefe87243bbc581d1de9320a2a4df1ea0e1d50c0d7,Merge_failed,9ef58a0ce5fe6ebd39f6bea8fe0771649489db4f4d70e7d9d40bb4aa7b524418,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,574315fc862b2381f2c41c89a42a06a10f044b0667a401bb6df7bf4dc4865f04,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5 23,refs/remotes/origin/main,0c5204ce00e306bfc23f644626853a2dc4e74373,dc7a68da97d4750ea248d5895d60b434bec82bcd,739c491e4b4c14ad2698d0ee1185b828a3c710fc,,True,True,True,24,86,369,2,True,24,Tests_passed,d8f1e8a795fa92846c234dfc4d0c10a42313f9881b2d76f1d12f0d497901917f,True,Tests_passed,f87b749bb440b967d6ffde2c60bf9793c1836881a77a9d99f3db3d9abd87ce6f,True,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d diff --git a/results/combined/merges_tested/lyogavin/pistachio.csv b/results/combined/merges_tested/lyogavin/pistachio.csv index 1defaabb25..c6fb2fbca4 100644 --- a/results/combined/merges_tested/lyogavin/pistachio.csv +++ b/results/combined/merges_tested/lyogavin/pistachio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ff601b3619a0dbfb8867aba4b4c27227bef5bbf9,f4e73ff847ae74d7b17e0968adf729b348fce8e7,a5d70922b6c8a43679c3212b3d77ceaccb96a919,,True,True,Tests_passed,5ae694e25384883aaf6d256385e99ee2082d2a0e1698a921d2e48199fa45e110,True,7,29,200,2,True,Tests_passed,dc468c3da8474229fb8662de79441d1437e60bfe1eb6b8aa57908f3d54eb7d68,True,7,True,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859 diff --git a/results/combined/merges_tested/maciejwalkowiak/java-plist-serializer.csv b/results/combined/merges_tested/maciejwalkowiak/java-plist-serializer.csv index c9913078e1..a8eb11453b 100644 --- a/results/combined/merges_tested/maciejwalkowiak/java-plist-serializer.csv +++ b/results/combined/merges_tested/maciejwalkowiak/java-plist-serializer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3,fbfede3054cf04fc2c68df1c62bdab45d7139a35,29577ff717de7ddd32a8b667cdd9631d82bdf0f3,,True,True,True,8,17,89,2,True,10,Tests_passed,1220db2ce7dc885dce822850a05ddac790457ae1430ad6ebda964631a889145b,True,Tests_passed,9a970b129d3266cf25c0b67681d0e5b188b40e4701ac7f461047e7470587ee15,True,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,f0af379c54456d89cbcf1d5e44f545ddc905761a9a5a0b58525353c484d6302e,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,90a5ec1048759e6537807a01fe4793b678c1a56b7348e1d82f96f34fec7ac575,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,da712a63044eda832c8ab1240f86f193d5431e8428c90da994a57b6b2bf32b62,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7 diff --git a/results/combined/merges_tested/maciejzaleski/jmeter-websocketsampler.csv b/results/combined/merges_tested/maciejzaleski/jmeter-websocketsampler.csv index 07db02d734..960cbbccb8 100644 --- a/results/combined/merges_tested/maciejzaleski/jmeter-websocketsampler.csv +++ b/results/combined/merges_tested/maciejzaleski/jmeter-websocketsampler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,bb5c4358ae5fc9c767cc7fe32e99969126f1e5df,928fbabd7c7292ea41610b9df0b96bb56eff82a6,5039fb9c869e1e2eb7aee718d786ab54763e44bd,,True,True,True,6,40,179,3,True,6,Tests_passed,5d078a1abb2dc38b5eac03cd51e092eb0f497b7364c198e22f8ff0eef4c1a703,True,Tests_passed,e159b749eb7574aee691b271ab55ff23196d4677dc2beeaf6f7da32eb649bb89,True,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_failed,e242ecd152695d791b1abaaf59271d973e89c12e095616a6f757e0d6f680acdd,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0 diff --git a/results/combined/merges_tested/magro/kryo-serializers.csv b/results/combined/merges_tested/magro/kryo-serializers.csv index 2697508c79..6ba40ab060 100644 --- a/results/combined/merges_tested/magro/kryo-serializers.csv +++ b/results/combined/merges_tested/magro/kryo-serializers.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,a2d16aa4330cc067402178119dfb967842efc17a,c29d105ef21670d59450c0709d3f8e190dc4c5c8,eeb8393425b557c013719052fad3b842db850835,,True,True,True,5,29,199,2,True,5,Tests_passed,c1bd50dced53135fb544c76a2bfd574a7137495513da023867db3a1afc3c9a5b,True,Tests_passed,72034e238a12007f7d4e8e32a2140d41345f3f5322c1409491980d255f4523ec,True,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5 diff --git a/results/combined/merges_tested/mahoney/slf4j-test.csv b/results/combined/merges_tested/mahoney/slf4j-test.csv index 5dead62580..858215b108 100644 --- a/results/combined/merges_tested/mahoney/slf4j-test.csv +++ b/results/combined/merges_tested/mahoney/slf4j-test.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/1.0-RELEASE-jdk1.6,896b4a6a0d490aae9515e449244d1012bfb3d87b,f2858da07e04c8bbcad4183c7e003c192ce9f625,29d7e6d843162d4c522e532cfd6b9cc68906d17c,,True,True,Tests_passed,77681d7b3da4e5404bfded7729664f2e6d32174b3a8d49edb5deaa76c5bc8bc0,True,15,54,140,6,True,Tests_passed,e4f1320f6625ac0e6284253164dd55970eb397b857b1cc6ad9c616e558d30f95,True,15,True,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,a7c39fe3968efb7db6a971303cccae58e940d785f4b055781c545638908473ca,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,697eb084212e80dddcbb61dddeb2e8423f3a044bfe4ed01d22ca993a0d448d30,Merge_failed,99eb509fe3f066a575cef7183da71aa2aec19728483b8ab0ed75e735c20592ec,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,586aef7b6d92c4e143c01f7992384aca4b3f3016464451211d4746b12cbacee5,Merge_failed,fe4c5a226dbd7f904cf1260d6e8f27b2677d379d34d947bd5c6215959b785e8b,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590 diff --git a/results/combined/merges_tested/mambu-gmbh/mambu-apis-java.csv b/results/combined/merges_tested/mambu-gmbh/mambu-apis-java.csv index 786e110b09..e1b21e5d7c 100644 --- a/results/combined/merges_tested/mambu-gmbh/mambu-apis-java.csv +++ b/results/combined/merges_tested/mambu-gmbh/mambu-apis-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,1da0e26ad55b2f4a1738ef3e7f57ac5ca6ca0ae7,a14a20e30055f71086d497513af21f5f5d6f6f2d,c6afe3ed0a26ebb6bab9a5ccd81a9990902c894e,,True,True,True,9,61,240.0,2,True,9,Tests_passed,a4edd5760c2b7ead9d4c555095d228c14e51c5ca2c6893690bd98a29ff9bba27,True,Tests_passed,4b8e90f869382c8db30e32d7a928d36d6d8c29c46607f723f951d7ba1688448b,True,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,da4ef095da5cb6a90fb300009d8e80593fabfc75182cfaac04691cb31df34149,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Tests_failed,e0b0f548d1f3094dff7b9ee253a94b42bc9f38915a649a0fe19dcf2aed11b955,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,b1dc1b14da9f47f0c9509d31d7069243dbb049bfb2ee207bf5ce170915f63ce6,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565 105,refs/heads/master,0cfcfe0d8535a7f495a58fc48fe19f492eb7a7cb,28dcfe6023219dfd4fd94ee084a4cfeee32fd35e,935dccd8ae3196c8f7317c80b179ec9ced167b5d,,True,True,True,19,62,548.0,4,True,20,Tests_passed,0bdff3c5e4e2580ab3ede53932f25d4768cb27365fc4b0012d64ba4a57f74a65,True,Tests_passed,40118ef007e9e4e1fb9d30a4275f2fda60d99577b3ccb67321b830a9ee9feeaf,True,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,4a7bf505bf76b197a587d14d4c05379fc059f6d0bf59409852b6879cab709b0d,Merge_failed,6f2f576500fce3f40bab8a91763b60902ea8cfd15baee543d95486956ff3ba1a,Merge_failed,66766bb7617d7d59f3aaa8bd208645db8446d5e65703ff0866ed6e6963d3227b,Merge_failed,5808044260bab65e6b60d69720b6f15fce2ff51be013de0806ad88dae367a098,Merge_failed,6f2f576500fce3f40bab8a91763b60902ea8cfd15baee543d95486956ff3ba1a,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d96d2a1e758921932684e988d6f8209305e31f6dd8934a90ab601ffb41e43a02,Merge_failed,4962e5dae2cba343d358fd8f9ebcf32678864096d44a98c252888db35b45365c,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1 119,refs/heads/master,211bf655430157a7afaf515b303177353fc3402b,5a5efdc4eb08181c053cb2d648cb7345f9e55b99,9975c4d9e53ea71de245915eb7fee631e521000a,,True,False,True,4,14,24.0,6,True,6,Tests_passed,f1866ac74d3d584ac07ba1aea90debb9453bd79d2b966cdc5b7007c60eb8d47d,True,Tests_passed,4a9254ff978d3091ec022da655f3b29b8dd9ce34408e44dc9bc5fa35d13e83d6,True,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,e1e4f9421867b394bc35193eec2260791129339e5121c1052adb45ea5b7f26e7,Merge_failed,c29088df1e507bc5a876af33566e32a1d7c3cd3cab4162c3a4fe3801874778e0,Merge_failed,0d70313ed7a17724fc0e9edf3585b67ba400ad5cc1bee1c941a3e07d84641f32,Merge_failed,651cf3c37fb78cc6f5f778c5911b91523fa09c2ff406f84dc7a60337de2074a3,Merge_failed,c29088df1e507bc5a876af33566e32a1d7c3cd3cab4162c3a4fe3801874778e0,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,8c6eee0ef0c4e3a88cee60da0ccdbe34c5ddcb01218e55be07c4c9f1b0e87e90,Merge_failed,0d70313ed7a17724fc0e9edf3585b67ba400ad5cc1bee1c941a3e07d84641f32,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d diff --git a/results/combined/merges_tested/mangstadt/ez-vcard.csv b/results/combined/merges_tested/mangstadt/ez-vcard.csv index 49d980320c..95ddec9765 100644 --- a/results/combined/merges_tested/mangstadt/ez-vcard.csv +++ b/results/combined/merges_tested/mangstadt/ez-vcard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,True,342,2526,16131,10,True,342,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,35753c04e2f61a849e386fbd4572bb82a26a3f151f3c20ca1be138e938ac502d,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0 diff --git a/results/combined/merges_tested/maoo/maven-tiles.csv b/results/combined/merges_tested/maoo/maven-tiles.csv index 75c0bf8ddf..c63879ed87 100644 --- a/results/combined/merges_tested/maoo/maven-tiles.csv +++ b/results/combined/merges_tested/maoo/maven-tiles.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,515cbbb77720e2ad118b4ab9017a3e99e8fcb885,01ee12244e800c1980b5811f1abdabc19496c256,680ba8647d6b9c9a604064543b5d3aeff2bcabda,,True,True,True,27,48,1000,2,True,27,Tests_passed,f4f39390b1c4f6a4bf7c7e30bcae46481f75f7e0b1232f6212edfb64fefd60a7,True,Tests_passed,2d4c0f3a7a5f305a980070e31838f46fb1e0f2d33b32a7fe20506071d217407d,True,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4 diff --git a/results/combined/merges_tested/marginallyclever/makelangelo.csv b/results/combined/merges_tested/marginallyclever/makelangelo.csv index 51711b8d2e..760fa16121 100644 --- a/results/combined/merges_tested/marginallyclever/makelangelo.csv +++ b/results/combined/merges_tested/marginallyclever/makelangelo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,f96ea74ffaf63c820dae4ed5e33941dfd9230a7c,8c91c249baee9d3a72e876c42f3dc387953e9bff,f8be12ef2f4810fbebac0340bd28cf2443980e6b,,True,True,True,51.0,270,2034.0,4,True,52,Tests_passed,fe6f454312255f2c40449c6c91317b1d27d621779beb3f250545457e00e3b85f,True,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,True,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,d219c0315a713ec6178cda2b7e6e0a5dabd9aef83234afadb299b8b8ddcc311e,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,00e0c7897ac8d2811a214705f791c1d58ca76b527532302274eab29511f25d45,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3 7,refs/heads/master,3a475307e2c539d696adb258b4cbc01e7cdd1d81,d2fd172a4cc635e891b597b639ae60525050a900,cfb67a76cbf1f9e647b4ba67100f522a89ac8feb,,True,False,True,3.0,5,89.0,7,True,7,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,True,Tests_passed,cdb2cf39860eab26ad76fefcdd772a1056f07c3df9fcaeaa38c2b9c38504b5b5,True,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,cc9fe32a8eacbf772d838f3bc5ca27b7e4fa0bcec2b82cd52c0ae35c3e85a4ee,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,3fbb434e192cce25c2673dcc9abd5537d2cbe20f4770a3738db8243f596b79f2,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,0c92e0f9bfc0af7dee2bb65f87802c5c3e86647c9aa0eddb21f33453e02bf751,Merge_failed,e0a2fe4ca3e6496d613316c65c88fe09057e3e176a106cf5cc0b996b2459dfc9,Merge_failed,dd04e02645fe9e0eacf91d37e477a86b6b3b97f09b351c89e4b70fbb9f1e56a8,Merge_failed,dd04e02645fe9e0eacf91d37e477a86b6b3b97f09b351c89e4b70fbb9f1e56a8,Merge_failed,e0a2fe4ca3e6496d613316c65c88fe09057e3e176a106cf5cc0b996b2459dfc9,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,3fbb434e192cce25c2673dcc9abd5537d2cbe20f4770a3738db8243f596b79f2,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,3082dbe284aebb5ac2c85cf983267a160da56d6cd72e1ee9201aebc938c0d736,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,cc9fe32a8eacbf772d838f3bc5ca27b7e4fa0bcec2b82cd52c0ae35c3e85a4ee,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865 8,refs/heads/master,d2fd172a4cc635e891b597b639ae60525050a900,28443125abf6ee10f7e33f7dbb94b938935dbf57,b1f68f5ad8dbb8fa7eb82bf231b7c127bb114c90,,True,True,True,7.0,17,58.0,14,True,19,Tests_passed,3b9b6be4cdc51703aa4d88c94c069f6a43b5f4ff1f16afe8c25c7ada5bc6c478,True,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,True,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991 diff --git a/results/combined/merges_tested/marloncarvalho/aliendroid-activerecord.csv b/results/combined/merges_tested/marloncarvalho/aliendroid-activerecord.csv index ae0ffc0c5b..dad8ccfda7 100644 --- a/results/combined/merges_tested/marloncarvalho/aliendroid-activerecord.csv +++ b/results/combined/merges_tested/marloncarvalho/aliendroid-activerecord.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f03a2f645f41c63ce485586bed36884f105a1f1f,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,a8abd360e64f2d6f967d060c7a2304fef7fdc5d5,,True,False,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,True,2,13,69.0,2,True,Tests_passed,fb6472451d5fc52d7f0b0b2c2ac69e0fd7223c5d07299662d06aaacceb478334,True,2,True,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,a1b6722416e349cc717ef142dccf0c35e7a1196b43bba138043f7f1f60d465ca,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,a1b6722416e349cc717ef142dccf0c35e7a1196b43bba138043f7f1f60d465ca,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d 4,refs/heads/master,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,66fd6488824b7aa0f15b7172466d4f9f465db644,13915de94d70a4d8e53cba4c0056c5b4af2cdfde,,True,False,Tests_passed,d714b13ae10bb963007331bf6b5e6c553b23d5a883702289c777437cb4bcdbd1,True,3,20,55.0,2,True,Tests_passed,4c40dc2ebac3ed9ef5cdd75797c83c666a75c998b4597e3ef6892bced615acc0,True,3,True,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_failed,5f5699f5e99a94fb6d0618adbc252e8dedb8fff836b21955dedf4684e4389d7f,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4 diff --git a/results/combined/merges_tested/marschall/memoryfilesystem.csv b/results/combined/merges_tested/marschall/memoryfilesystem.csv index 886881732d..6b3e59b517 100644 --- a/results/combined/merges_tested/marschall/memoryfilesystem.csv +++ b/results/combined/merges_tested/marschall/memoryfilesystem.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,fda60ab1b9a42f2e4ab6249852b3d2f0a40c9b56,f63459184f11f1681a38d7f0dccc30426ded34ae,0f2c367a1172610941024e8fcc319242db890219,,True,True,True,8,15,363,3,True,8,Tests_passed,96271c10f4d01634504f284e3581f37a0917ed3cb463d6d9113db50c18b4490a,True,Tests_passed,470dabe5eb8b75e6601bc8d346ad3ccd4bd539c44059938f18837837ba0a19e0,True,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_failed,72dec9b6f0d3e184419295013d8c7a6cbf9108abe22d638bf869da682d574a41,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1 diff --git a/results/combined/merges_tested/martinpaljak/globalplatformpro.csv b/results/combined/merges_tested/martinpaljak/globalplatformpro.csv index dd0a46c3ba..3d829a17d4 100644 --- a/results/combined/merges_tested/martinpaljak/globalplatformpro.csv +++ b/results/combined/merges_tested/martinpaljak/globalplatformpro.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/161,0ec29e20e8acc5897fbaf108ef01b1096609bef4,0a2254613a08297950caa29b6e39b04b3cafcdc6,1551b306a495b28fa1fd6c6fee78bdb646589f29,,True,True,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,True,2,5,38,2,True,Tests_passed,61dd10bfbb0fd84c635d0e04821f73fc861b1360f1192b3cba7b0836c463cad9,True,2,True,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,3a7d873fa5590cf67a445da3a18c4ea2428fb420c6855dca5f40a032e9162de9,Tests_failed,16f634849b8a2ad776e5ebf7073699fbc72541f1ede3fdfa253a3493c6247445,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,3a7d873fa5590cf67a445da3a18c4ea2428fb420c6855dca5f40a032e9162de9,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69 16,refs/remotes/origin/pull/264,6a5d74685625e3deb07447a3b4bf29d01ef17d6f,678b25980013b7708e9ccf155939016ee027c00e,a0096642ac72a49d487e9a4b69169d95b2b0c87b,,True,True,Tests_passed,02ce8c12a7b4e2a5efc2cca4994a8d81e04fe6785fab859a47b5364638ebc046,True,21,90,390,3,True,Tests_passed,f68f35521db577d4ab64fe41097904360b45d4feb76b687d179521b01060fd5c,True,21,True,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,11c2dd09feb0e4df6e22e74a3da9c36598ef1842cdcf8667218c50ac5d200faf,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Tests_failed,790e32dce17baa1c71a568689ccd34a20ecb938f7c2b4cabcf17171d7a235ebe,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,d1922fe5a9d0f3477d89426ae9bd0860c2408588561687716f1fe4a00250e058,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016 diff --git a/results/combined/merges_tested/martylamb/nailgun.csv b/results/combined/merges_tested/martylamb/nailgun.csv index ea1620674e..0ad882b635 100644 --- a/results/combined/merges_tested/martylamb/nailgun.csv +++ b/results/combined/merges_tested/martylamb/nailgun.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/main,b2c42be05bc20c96048c7cd10ad855750c2b6c51,c5eed04dc3918ce8961c8019572cae8e1936ca2b,ab6fba00de2031b7fa04a076fa809a1995ffa9a4,,True,True,True,13,65,400,2,True,13,Tests_passed,663984baf2db1b5b190c19320055f503fb3c78381a68a65f4e38b5c0826bd669,True,Tests_passed,79abf90df641ed9a3ccce98f3683c6501d2d05aae1c13fd0e66be1c10be47524,True,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,d3fefdf04b81894fc5a912cb4bb32010b4e93de474d6b2ff689139f3761c9264,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,d3fefdf04b81894fc5a912cb4bb32010b4e93de474d6b2ff689139f3761c9264,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54 60,refs/heads/main,7f1e1bc712bec6ad375f7d0e6cdc46323126b448,6f39efa91e60c1e0aa9ae11477c27e3b5f90c5a0,e20aaa3618f88209f1c343233c0fcf5c15ecef70,,True,False,True,3,17,202,2,True,3,Tests_passed,14ca52e6a17a9dc27808e6ad7f46e234a43897759abae64b71a546e10f74d67f,True,Tests_passed,40a35cfa263bfbf52b96fe83ad80c91531b344aa526dd13c41ada070cfb3c8ba,True,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,a87e3c24dd2ee949dbafbf7ae79fe0d81a495bef068ded21fefa97096ed8ce4b,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a 81,refs/remotes/origin/pull/49,543039be31b291caf41b11356f906971753f74ac,5e76e0f83375eeb8b169a2ac9b5493f2ce35188c,dc7e6c9649499196493b0d4780783b77ff459441,,True,False,True,5,29,279,2,True,5,Tests_passed,2929661a850739160f59956d39d348279d855342a785a686177e1e005dee0d26,True,Tests_passed,cbec3b8509b1db5a56871e1006797f12a0c8f70be8e9a622a989d8bcd1b5bde6,True,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,99c53f994f643da2a53815e5ecae2be23eef9030b872619420c1ca28e22d7502,Merge_failed,128c649ea1b25d265f448c6867e7400c5968a70dba0ae420bfb9cc847c83c32b,Merge_failed,8d69182610137c55a67aa79693b9882d800801373be9bcff777d58e2e7b95f9e,Merge_failed,6cfb273014cdf651081a47d0ba465c17f83a85b74f14bd1df5d3b6e00830c9ea,Merge_failed,128c649ea1b25d265f448c6867e7400c5968a70dba0ae420bfb9cc847c83c32b,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,cbcd2797062bfc9a1832a2238f1101e6b72ab0f5ce1f71483a343c68617b34a1,Merge_failed,8d69182610137c55a67aa79693b9882d800801373be9bcff777d58e2e7b95f9e,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb diff --git a/results/combined/merges_tested/mashape/unirest-java.csv b/results/combined/merges_tested/mashape/unirest-java.csv index c950a0bfcc..0db466d69b 100644 --- a/results/combined/merges_tested/mashape/unirest-java.csv +++ b/results/combined/merges_tested/mashape/unirest-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,dd532cf17f17fba254562c029848558c8c04b79c,a68309c79589e8d1ffd2694f55a412c6ea670306,b8ab11e459e8ea2594905b9139223f09ff27c2ec,,True,True,True,310,981,13465.0,84,True,385,Tests_passed,de12c2b1920e73f1875ae860f81b2386b37652b57aea2b905fb7b2424127e042,True,Tests_passed,31095d7ee5b0003a9018cb2758f2b25a0f7425af605dde8fe9d4b108a831c970,True,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,60f49a051737a6160cbf1f4e743ecf85b34dbb45e464d6d3cfb43ddd1b4ff5da,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,67c8113bdbf91986e4ed1e5f16069c6fbf2773d65a72909ed6c6c177d93ec790,Merge_failed,ea6cb2b8eb34a89252286c82924d3c1206373dceedd1dd910a24851d2b11df85,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,1ab6c833d382dabb90903cfe5ba31f0811154eadbfd014e638367e28248e5535,Merge_failed,a72330762fd3fccb03f946af5e187e32cb92aece6801c9e31242dbe43c0538f3,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db 61,refs/heads/main,be953b5e242762aa1dbf4f7f4b9380b551334999,f37caf93ad32a898a539faf05459aafe0e15b717,966dd6a8b9d040fb62e163363701467f0cb0d093,,True,True,True,9,19,312.0,2,True,9,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,True,Tests_passed,48d21add9fcf55e597592186e1e64eaf4cec1435168717a232eb6fafe56f8854,True,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,212f80ca595da4bf5b135908dec035618deb4d7cf5630f2c5900994e8d969b1b,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Tests_failed,338c28437f306554d0911408baebf8101bc023b7593a5f7a6c8a429afb241445,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,63b7ae474521a6a1e5173abbf12d71101eb3e17849f4873b871c36d8645b4b25,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2 62,refs/heads/main,f37caf93ad32a898a539faf05459aafe0e15b717,6ae79056194d04b1ee0b5d7eea1e247d40e8dc79,7eeea8a17544883566f337fec6f81eaa115e9f0e,,True,True,True,9,16,301.0,2,True,9,Tests_passed,149d054859a6f6ee975a9c449d6322ca0eb7807509cd7542c4195bdb1720a7dc,True,Tests_passed,712d87f7971381a3857b696ee657b9b9c912af837c02cbaea01d25bc4ae932b5,True,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_failed,dc8ea74b95b534fecf41d3f84f95fff73a11d1a4ce0519d2d1373e8d459946e8,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f diff --git a/results/combined/merges_tested/masterthought/cucumber-reporting.csv b/results/combined/merges_tested/masterthought/cucumber-reporting.csv index 1109c8bc12..8911999404 100644 --- a/results/combined/merges_tested/masterthought/cucumber-reporting.csv +++ b/results/combined/merges_tested/masterthought/cucumber-reporting.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 87,refs/heads/master,c802cd0adbaa29205317b5c2ee784fc4d4370eee,a84fba80c5118fe61c391a8a1c54443384c9c41e,c0cb60d570e3ca1f07fbf85c7c24ec78be48c3af,,True,True,Tests_passed,8e1d308464d6073c7af06f0a916c3c166651d129ace0778805ef75f32bd71223,True,65,212,3842,3,True,Tests_passed,4d372614fccdfb19ae68845434319419fa14d443d9e4fc4e05f52ba8182214a1,True,65,True,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4 106,refs/heads/master,65efc48712b4a98a89696c53bea379a25be30ad8,0e60e92eeb1708b8c012f8913606790256f063ce,fe0c6a45632cfc2417047784acee7ff5c4a142d0,,True,True,Tests_passed,dcde49efbf34138e76f9f2b512dfb2f7c2532c7837dfd628dbf69bac7809487c,True,15,43,292,3,True,Tests_passed,f6f022f46b015152a2d9e3470e1157a05b5ad7ed69106dcea77d86b1293734f3,True,15,True,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,5fbfdea730c6602f274242761835b1d34df96ab7599a62472e58adf8a29ea2c2,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,5fbfdea730c6602f274242761835b1d34df96ab7599a62472e58adf8a29ea2c2,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c 253,refs/heads/master,9fa019efbb3e9219643a69303c549bdb7b6515a2,c836e4e2131027467ef668ef029092f7f100e39f,02cbc6ec041475c9ca930456cd543eb3c43146c6,,True,True,Tests_passed,e26ffbc51282c6476e5fccf9dcb06fdee2d8684d980de51d7a56eea098467a5c,True,17,46,133,6,True,Tests_passed,383dff57d77c719a8bd961e01e86c9b16b97dda85da9182753d20da25531a131,True,18,True,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,fc2ee1d461fe3ff406fa36fdd30e21d1e55be31b41839005e54343c10a16ee50,Merge_failed,716c0f1fd48f534c833c777a716ea581954dfe9ca677371350773d2f2a67c4a9,Merge_failed,79e1adb7fa816249fbf9b798ca934ca920d152421027e91eb5e5b5c4a43e624c,Merge_failed,0a46d062b733e471b4d69cecf4867798a3be3fa95f437df180c4066f3d1e1baf,Merge_failed,716c0f1fd48f534c833c777a716ea581954dfe9ca677371350773d2f2a67c4a9,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,f8a063b1f48d316f56a0718083606854a840a0e5f224ca109c659b5b93e8c830,Merge_failed,f5106a923cd7b9c4709e829bc53e630c2679039e8e181a86e8421ffa6f01c317,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed diff --git a/results/combined/merges_tested/matthias247/jawampa.csv b/results/combined/merges_tested/matthias247/jawampa.csv index efdd59c0c3..98222131d0 100644 --- a/results/combined/merges_tested/matthias247/jawampa.csv +++ b/results/combined/merges_tested/matthias247/jawampa.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,46006ffa74d27f272d0fdb2e99d4ceafea0c32e1,822a8c6fd897c68f22758ed0cbca62824f9aa3de,a863dd6f099ae099aec9861138f286cc8d6fa9de,,True,True,Tests_passed,7f3946c9ad8d38b76777b4f584f4927302938bdf243f04ed5bd0189f8612c10b,True,9,36,320,2,True,Tests_passed,c4e243d698c5ff0a342099bd30c15e1c5b277f19761f041d34a3f42aebf67565,True,9,True,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,f89ad21895e1f0c17f3f65fa8ef6699cb7afbe723cbf83e89499850ec9c6bc59,Tests_failed,f36dc3ca83a4a8ff45f6eb86c6e7fe74c567a8cc19e13b7a2fd75fa130529b4e,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,f89ad21895e1f0c17f3f65fa8ef6699cb7afbe723cbf83e89499850ec9c6bc59,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb 25,refs/heads/master,f956e0584ab3323680744ef58438b1b09f11846a,cdb22b91593b13b98b53ca21965c6cbfd58a3954,90ac8af923bd105c3defbcdd74aa0e9679f06447,,True,True,Tests_passed,98a6f144331eebf5bd1ce2b27e90201da3ef8bbaf9c7fc14fe552d713fc56cfb,True,8,65,255,3,True,Tests_passed,7d5a8debb7a164133a61ce384ec695eea2888e55479f2b55b0da11acff07a70e,True,8,True,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86d51c9a1077cfba5defabd94c5193d87e9bccd633d18a8e8d40c6aa468381b0,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Tests_failed,1f4bc73f672108eb4eae934ec7afc657d2722d7ff121065258c7564f06e9e95c,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86feca9d3296419489a720afbfe47dea4cba2c16ba43cf6ce8789b00f1712e5a,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a 28,refs/heads/master,d67461c964fd703f4a0d5f773db396460e83f8cb,c6a418416049ce849d029fc292362f28fb2b9e7c,db0e2822cb408f0de613f40415c9abdb7020ded0,,True,True,Tests_passed,7dc5c16480c6e47e5de9e13e5d41c92f3b115cf9e6203ad0fe01cf6c7ec97cf3,True,12,46,222,2,True,Tests_passed,bc1cb1b3fcecc724befd675757f6b8f231c65bada2857b468287fea5e2e1aedb,True,12,True,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,e094b4c122d3475d149f999a2f68d33909c58e0e22c9418e88445bee6db80687,Tests_failed,0c8de92b7bd20f64b6fe843efcc9581b6553d42b07d8625f4ae29a64ded4c7ca,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,e094b4c122d3475d149f999a2f68d33909c58e0e22c9418e88445bee6db80687,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3 diff --git a/results/combined/merges_tested/mattinsler/com.lowereast.guiceymongo.csv b/results/combined/merges_tested/mattinsler/com.lowereast.guiceymongo.csv index 0084e98f4e..ed4c6a393e 100644 --- a/results/combined/merges_tested/mattinsler/com.lowereast.guiceymongo.csv +++ b/results/combined/merges_tested/mattinsler/com.lowereast.guiceymongo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,60813c8d71e04f2555a87814ad47ad8cdb621195,a3fa868fcd9f197799f27e01b7bda7b1cb22f768,0bb0300e17dbc35c25316126bbc9daeabf9dbbe3,,True,True,Tests_passed,b6de22d76c34c6ce1a6c4b73b0728effc45b957d9716d1b719d5f9d4ee7da92d,True,48,45,9471,5,True,Tests_passed,37e6b8386d7e743eae1f995f53cc0c233200fdaf6c6478d9aac8190d2b93fe20,True,50,True,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,ac23b23f6a27ae5625e3cca17ac4aab4c25bb6a82d5cf075edf767100a067156,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,7391bfddf057d54b7031ada9942cb7a08d239a8b5be68d9910ee496f556ee87c,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,7d2002faef4e44b16a38573adae70d850a86f796020e037135a6acd098240f18,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2 diff --git a/results/combined/merges_tested/maven-nar/cpptasks-parallel.csv b/results/combined/merges_tested/maven-nar/cpptasks-parallel.csv index cb90d4a433..0e92a4bd81 100644 --- a/results/combined/merges_tested/maven-nar/cpptasks-parallel.csv +++ b/results/combined/merges_tested/maven-nar/cpptasks-parallel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,9cd3413080406cb66aa9a23998081e9ef757fe0a,8fafc6ee5cc901b301baee9760c6744be3816d29,4b91fee5ea7faa7a6cf5a6bc64ebc052f41018b8,,True,True,True,5,8,43.0,2,True,5,Tests_passed,4334654c4fec4cf5cd0edda031569c8528e4d2f931b919cf1bc9c30ce1d75d5b,True,Tests_passed,bd5b75a8905214677a2a4813b9f5e78279ff68057a41f767a3764fdebebb178e,True,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_failed,c063188a85c38ea577cd0f6312b861f1aecb1f0849fc7506b5fbad60266d5aad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f diff --git a/results/combined/merges_tested/maven-nar/nar-maven-plugin.csv b/results/combined/merges_tested/maven-nar/nar-maven-plugin.csv index 52d11a24c4..e29665816d 100644 --- a/results/combined/merges_tested/maven-nar/nar-maven-plugin.csv +++ b/results/combined/merges_tested/maven-nar/nar-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,40aa7bb76590d0d32ac1029e9054d37d6f26fdfa,615542e05da885afe07c39474cd4fc02d3dd1199,cd23bdea336fef4ee347b713cbef09ec75f5ae49,,True,True,True,14,27,395.0,2,True,14,Tests_passed,039f42ec3166b1bc22d3adc959ecd0e83af41af06af760c8600573b42df5e08e,True,Tests_passed,7c70ac6e3a7bd04e65f7ca0551737d1f3fd288f284541d0ea98781020825b0a8,True,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd 36,refs/heads/master,d00a2a2bcf5e073240eae899be9a0b65476b3be6,f094671078becaaf84107cb3859f4a41a66be2af,ace846dda0d26855c6c201bb947e6eec57744589,,True,True,True,34,66,1112.0,2,True,35,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,True,Tests_passed,22f43c28ef1a5c444e0a5e62156b1a8803e36d4be2ecd628ea91ac6e068fe075,True,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_failed,7ec93bdfd955a82f357d1db857bc2e229a504eba1230903f4884ba397d3f3ca8,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941 37,refs/heads/master,f094671078becaaf84107cb3859f4a41a66be2af,c2ceada3b236d6ca319100ffc3da55358700b766,a810132923203cf47f78ea70866af8b30c9b48a8,,True,True,True,69,246,4012.0,6,True,69,Tests_passed,69e998f086dc08b897303b2468f192c681f6419e7c404ec22fa1fc76e7bd02ab,True,Tests_passed,519cb7909a022d29c35745a682337d9d1e90ca54c4415d51c9339acf324771d1,True,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7 diff --git a/results/combined/merges_tested/mavocz/smscsim.csv b/results/combined/merges_tested/mavocz/smscsim.csv index 613319e2ea..fcb86c4d24 100644 --- a/results/combined/merges_tested/mavocz/smscsim.csv +++ b/results/combined/merges_tested/mavocz/smscsim.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/pull/5,8bfb11d2761aacc461674c06d3df511961252c0b,9b60d4b015a6db7f9d9f2bf9eb6083fcf3dad959,c299c6bf1fdfb1a8fe954b93ed2682bdbb0150f5,,True,True,True,4,14,146,5,True,6,Tests_passed,4530709389bff72c74c2dd79ec52aad8e75d9c5c1902a32b8be9b4ee30cd2b86,True,Tests_passed,a11239d4bdeaab1c33f9aced952bd4cc56c271013765b6dd80b65b33d3860382,True,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,d9235f7714e96af4e1063fc2fdcdec40de03f5ad1a6ade10252dc6f8325c9f29,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Tests_failed,509d46f6232d2468f194b7bc60032bdebb3c17e75440f32db3fc87ad2a9ffa10,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,725f49994c6e1b0d716c3e3d2c5ef5d65fa668a07c558874459ab722e6f6ccf6,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef diff --git a/results/combined/merges_tested/maxmind/geoip-api-java.csv b/results/combined/merges_tested/maxmind/geoip-api-java.csv index 80d323d5cd..005bd7bb3f 100644 --- a/results/combined/merges_tested/maxmind/geoip-api-java.csv +++ b/results/combined/merges_tested/maxmind/geoip-api-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/main,3c90dc1bd7530ddffb1460695963a5f3ee2fae5e,6891272a3d8ee689774bc41e44b3c5331a0d81bc,48beecc7ae1e5393325f315fc5a723466cfe956c,,True,True,True,3,8,18,2,True,3,Tests_passed,9f87f63bd85ec9fa88d5b994fbba82cfd801aa6ccd09c59b9435efcae47e9c5a,True,Tests_passed,01e2e1c667170aa917e1a60b85d9667a2aa731458fd67266bd18abee20cf3551,True,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,77ad2474ebdc41f1145f77335cad3836161f90990edc6d194b8625dd19262e3c,Tests_failed,c71f8775b86c8e4ceb2376656dfd8ab53bd27d61d2f36a5628a3f7ab40eadf29,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,77ad2474ebdc41f1145f77335cad3836161f90990edc6d194b8625dd19262e3c,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d 53,refs/heads/main,49ecb07cc82f13aa1a25857de424be43c88368c1,41ccd2de77d3495a43edcef222564924cbb53740,5eef24504c348cb6880642ae3eb6443f40e3b8a7,,True,False,True,2,2,4,2,True,2,Tests_passed,486fb2319bf0044a951c20cf592d5aa2ab6f0f7e8e106fd734201741b56a1745,True,Tests_passed,17920ca2ec398d8c5120df1721bd16938a965ded154e41d9cd83bb00f03b52fd,True,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f98110b8e0f539e457cde5f88c30a70f6d52351ac1a8a7ea776420022b2fe6b1,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Tests_failed,2a949e2920a7cffbe0923489a566ee082c9c7e424db870257cf86a98183412ff,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,d37b3fefc04e10bc370de5ffef19c4292671b92ede2808100bd2305f745e6149,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98 diff --git a/results/combined/merges_tested/mbaechler/proxy-servlet.csv b/results/combined/merges_tested/mbaechler/proxy-servlet.csv index 9952327608..6f32fa62d2 100644 --- a/results/combined/merges_tested/mbaechler/proxy-servlet.csv +++ b/results/combined/merges_tested/mbaechler/proxy-servlet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/6,456846e2b56eb09964f65677180bd70ee107d33e,db267681433444c8f171d2cc31286f5b9da437bf,a03279659c46dda30accad5f0b06b8eda491ccc4,,True,True,True,5,18,69,6,True,8,Tests_passed,29056de4ed7e265465fdc8ca4787a81ff7d451d69d853241b2b7f2696b47a1f8,True,Tests_passed,df6c2a427c019fb49bbe937666286a792eb7afa7fca0ddc3e7fbffe823036358,True,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,f3744895bb7a1a087f19c59148a13267726168aa4cb94dfe01d47490689158c8,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Tests_failed,b4101b8d6aca4685409f6aafa0be8f1e94d2925a7c3b5e56bb2fd9925154b486,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,5eeaa984e8e1ec11aebd21a11db5e49c50acfb81ac8a060284b64eb4cae3ce19,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf diff --git a/results/combined/merges_tested/mbknor/dropwizard-activemq-bundle.csv b/results/combined/merges_tested/mbknor/dropwizard-activemq-bundle.csv index 30b24af873..eef389d7bd 100644 --- a/results/combined/merges_tested/mbknor/dropwizard-activemq-bundle.csv +++ b/results/combined/merges_tested/mbknor/dropwizard-activemq-bundle.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,12e472f3dd612c31bfc713248ffd0389e0dd2e8b,1d1aad7523ab4c4304e5766700e0038f75ac7dba,5a53776d9e4be3785c6643ff650370633c2b78e1,,True,True,Tests_passed,f4f04dc211305042b26b920328fe40bd4af73cd38a6df25f9f1c59d34c12ae58,True,13,47,448,3,True,Tests_passed,6c46c80017aa1a8afd66b39eb24808ac6f96a6b4f016b5beb68ac21ff4147939,True,13,True,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,81b2b38eac8749b184050871883bbaffff505fefee4490c1b15cf607813f112f,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Tests_failed,13838d3a26e2a7b9af7cbf0c1f7c6e745e66505cc534f02a5a2ea8427bda352b,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,c5b2a07bb75b0120d2076bc69a95ffbfe0c8afe207fedb77b40f742b4b66823c,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f diff --git a/results/combined/merges_tested/mblanchette/maven-java-formatter-plugin.csv b/results/combined/merges_tested/mblanchette/maven-java-formatter-plugin.csv index 115bea44a0..de3fdfdf42 100644 --- a/results/combined/merges_tested/mblanchette/maven-java-formatter-plugin.csv +++ b/results/combined/merges_tested/mblanchette/maven-java-formatter-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 369,refs/remotes/origin/pull/733,2249c09bd7b1684c81588494daf9353f94323bbe,e1789bf6546cfd122d84c6aff3c6a10f00a2e427,c3607a1d7f7422a7860f1a31e60484c743ef3f6b,,True,True,True,11,50,98,10,True,17,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,True,Tests_passed,feb8259999683cbc1455ed285c446393c984c315ea0ab011aa96565eea2a90f7,True,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_failed,0b1d6961207999bb7fea918755920a1a2b61ae9e997f5a9d675fca445adae92f,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57 diff --git a/results/combined/merges_tested/mbosecke/pebble.csv b/results/combined/merges_tested/mbosecke/pebble.csv index 094b57c4a9..7160edc39d 100644 --- a/results/combined/merges_tested/mbosecke/pebble.csv +++ b/results/combined/merges_tested/mbosecke/pebble.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b7abf1ae5b1b372ea97bcf520d4f16417f8fdeb8,11dd4783d44afbeb269c9d98cf9579aad0e53394,1fc456ea34a4fe92d28f87f8e780c9cd9be3ea1a,,True,,True,683,903,,3,True,683,Tests_passed,63550e8a7972ee1cd3bfe39883075f3aa1ec4d121e41e20006d32d9c88c6104d,True,Tests_passed,9be692f984d55caaac5f271beeee9b7075467a3f7f94cea1f22aaa4efb45b598,True,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,9180713319839965cdc0680e0754fc1526d6607b04d8652eac7d416b999e3332,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,9180713319839965cdc0680e0754fc1526d6607b04d8652eac7d416b999e3332,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082 4,refs/heads/master,aa932204dedbe24bdefeb75593385eb0c091e7f7,105894ed258589b9c8bc1860053bc57812a0a112,09a8defc69eafc886cde649fcd33f326f4580e71,,True,True,True,195,1143,6479.0,3,True,195,Tests_passed,ed4d457a5e400185ccd1199dea0d596dbe05032c22a8c8a04f2dcdd7c6645671,True,Tests_passed,47cadb7e2f88c87e07ac201347e014841ffe382da2431f41f1e8fbb58e46e806,True,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,7d4eff56c50483a35bcf78c24fb999e032bf34a7c17318be91d588764a0a1756,Merge_failed,04f9ae9cdc13bd954a971a689979048b3af3c7e3d812da7a6917bc5902eab3e5,Merge_failed,8e718635cc994cdedf4b3b937d3f15484527a6df55e156a6381cd58e218e34c8,Merge_failed,8e718635cc994cdedf4b3b937d3f15484527a6df55e156a6381cd58e218e34c8,Merge_failed,04f9ae9cdc13bd954a971a689979048b3af3c7e3d812da7a6917bc5902eab3e5,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,6bad8bb568086a942772d0190cd3f2726bae25541baf3e08b7251f5e9a516503,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd 6,refs/heads/master,1d6c48cea436f9c099a0ca56ba3cbad12c5d8db5,2d9225a0cef8db7239eb19d432cd0920abe3f30b,1ba4eaff5a22851bb476f6643f78569677ddc806,,True,True,True,161,889,5374.0,4,True,161,Tests_passed,0af7e3426c8ab14683b798db810be641ab30de6fbd407ba5d3cef4e0e2a1a7c6,True,Tests_passed,0b302a4e9cc564c4da3b3212f6280ba61652766d735c346d236d0b814820629b,True,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,54e7a1d607051d74e036282db3b6a1967c97f8e192045e3361ca8cd77845626c,Tests_failed,9eabcd9dde1eb1bf32295a6bdf5d143afd9f6e0327fa18d6b1c9f01a782e50f9,Merge_failed,178fd61fd392a94257a91d37a6ee45960faee031296eec2bdbf3a2efe138452e,Merge_failed,178fd61fd392a94257a91d37a6ee45960faee031296eec2bdbf3a2efe138452e,Tests_failed,9eabcd9dde1eb1bf32295a6bdf5d143afd9f6e0327fa18d6b1c9f01a782e50f9,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,b81fbf93896f310021b544bee9eb937d47454c5b562c44e4befc834fba07ebd4,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d diff --git a/results/combined/merges_tested/mboudreau/alternator.csv b/results/combined/merges_tested/mboudreau/alternator.csv index 32e172120f..595b0abad1 100644 --- a/results/combined/merges_tested/mboudreau/alternator.csv +++ b/results/combined/merges_tested/mboudreau/alternator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,135bc244a273a6a62f6b33fb869f93fe2b59bb1c,9cc84b46e390b64287a1553ae5fe098cc3db2d92,532ed01f2d71ad569fa578b030b742aabd326635,,True,True,True,4,28,565,2,True,4,Tests_passed,05b7b8f088a101bc2091e58e4ef502e2a0f636115c04a2ce4bcb43bc0216e34e,True,Tests_passed,321a5bbcb25f56767b6bfa68e141ace28cdc388745561bdc1089c22c38f76416,True,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,d34b0a3b88b40f9f8c86836faac667f9d7d889060e3d22f9c46473eefb1d4c08,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b8db7c16d69ad581b3f4f901d1842decc8df65e3d4c1677d9b149f52c1150da,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b4ddfa620d1e0527f70c08d03cf411e35f345796136371ba3edd57cb27d21d1,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b8db7c16d69ad581b3f4f901d1842decc8df65e3d4c1677d9b149f52c1150da,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b4ddfa620d1e0527f70c08d03cf411e35f345796136371ba3edd57cb27d21d1,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,d34b0a3b88b40f9f8c86836faac667f9d7d889060e3d22f9c46473eefb1d4c08,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd 31,refs/heads/master,e98877f87081708e446b278c812eb504565ff5f9,e5ccfab1da7432b380d0af5e0f86b83894b4eab2,91954b46b0bb37bca9388c3812763f3d24a8aaaa,,True,True,True,19,136,1158,9,True,20,Tests_passed,32297fe2fb78354de541330818f8cf10feff1841ed8c9ac9b71167b79caf693b,True,Tests_passed,dfd7622acf5850de28d3b231d046bc9d0e2bef5a4d6c56d1fe8f610d7340459f,True,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,cd152448e5cd1e5c7a1dc2ef3e4882769124cd3572c972faa0bc7e152d0ccd54,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,3a3ae5be878854cd15fbd0e086ea31cdf82dc0c294b1d0da5e9cb8c4f0dc3629,Merge_timedout,,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,66df26661f5ee0e2ebf43b1be3ef16525e53ddc47e5b3981e544128bed90fe7e,Merge_failed,45b61ee2a588fea033a62052056d88200e9c797dedf143cc0384af76d63520b7,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee 34,refs/heads/master,b57359e276976821428edeef1b981f5420989f88,19fa3891de01764327d03c8fd1a0f7b6468f537d,d926020f54c1df150deaed519e8cabe92c71c1a8,,True,True,True,13,108,631,5,True,13,Tests_passed,3c938a4452fb6da9e8e733cfa277f43c38f4797b95db24f6afe8bff88deae1ef,True,Tests_passed,a95a995ab4e04dcba4cc23cebe06776b6d00b8c54857eb55b886fcde4deca368,True,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,b8aa2cc79e11c0c862ce67c996817aa19ab6b7be0062e070a0a50de090da81a5,Merge_failed,63936e0acf035bad3255eec998a6e82e90ce45b365f38e13c8f110bce1cd3318,Tests_failed,9a442a6a94730c2815145c7beeb82ee19a71d8ffe4b1561ffea81f4d0477d3c1,Merge_timedout,,Merge_failed,63936e0acf035bad3255eec998a6e82e90ce45b365f38e13c8f110bce1cd3318,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,b5e2a51bbbf08749f9fdc3d76a56a468ead94ce10f6310eaf675addd3e09ae51,Tests_failed,9a442a6a94730c2815145c7beeb82ee19a71d8ffe4b1561ffea81f4d0477d3c1,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507 diff --git a/results/combined/merges_tested/mcmmo-dev/mcmmo.csv b/results/combined/merges_tested/mcmmo-dev/mcmmo.csv index 81988eb3e8..df450c320f 100644 --- a/results/combined/merges_tested/mcmmo-dev/mcmmo.csv +++ b/results/combined/merges_tested/mcmmo-dev/mcmmo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,81ac48904ce1c187c6177ad5282575a7c2d28907,ed8c8107f990a68111cce560f0a020c7401902c4,2594dc1bca27548e560cf514aa9285e925d1a612,,True,True,True,143,712,5593.0,6,True,143,Tests_passed,8e77e05911abcabe3a0626b50847bf5f50a46a62b2d06fa98224315eebf65aed,True,Tests_passed,ccf00edc4bbb59f98bad23de096117c3446b8db7d39b6d375760f98fb0fcc349,True,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,faa840119d3406991f8b1ebc639702db6686edaadb7b6e5b71b9dc1cb37abe29,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,b00d02b6a8ab595917b37ee1c6a4125e8cfb628c8311193419d30367e9dad44b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35 132,refs/heads/master,fbe26af2d7dbb841e19f30c63eb87ce1907c1511,0a1559511a4f20169246e98a6565d388a0c8adac,aee60f2c098238858b0f40b6d06bc4219a6b42d4,,True,True,True,31,220,1535.0,2,True,31,Tests_passed,7fc9e95bd9f26efdade15e753da505c74d812864e669f7033cbe360c57f8a379,True,Tests_passed,bd65722126a52437df2a40e5f6607c8fd508e009c3226bf638690e1968d6229a,True,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_failed,9229c0dff018e24c24a3555954896b1ce3ae463c6219f08d815637ccb168f5b0,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654 133,refs/heads/master,cbff8482ce5fd4a2659429172a9e992b47bea4a1,3d515aab2338a6700620220a708d12b02732a0bd,0035762a71563781014fc27ff60d90ac6e0e85e0,,True,True,True,23,41,281.0,2,True,23,Tests_passed,a314073b1bc28c90846a04e8836aa5ea526eb561fc25da83bbc1bcdb3bb1edcd,True,Tests_passed,f0674127d020f47635177101f48fe86178abc01d394dae9f8ae1bd47f361bae7,True,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,6767c532854b80eec156b8b39f237d0a79400fb0653d26fe0fac119448c1e409,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,6767c532854b80eec156b8b39f237d0a79400fb0653d26fe0fac119448c1e409,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379 diff --git a/results/combined/merges_tested/mcupak/beacon-of-beacons.csv b/results/combined/merges_tested/mcupak/beacon-of-beacons.csv index 404209acba..cdd575bbc2 100644 --- a/results/combined/merges_tested/mcupak/beacon-of-beacons.csv +++ b/results/combined/merges_tested/mcupak/beacon-of-beacons.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/develop,f140a4d0179b6b4bc06291146f03962a071da5d9,1d50c2dfb1e611d6ff5a42b3b16837995249ba5f,53dd291e5bbbf9cf32694de42c7486dd62206ddd,,True,True,True,45,181,2344,2,True,45,Tests_passed,c5e2fab278ea5f52d8c071d548726b6229a301d873447c77665aaf2b0fff324b,True,Tests_passed,b30d5f2d070ac6773c9391c3d1052d4abc4b67706ddcc1d6c03a23b8cb1ec7b6,True,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580 7,refs/heads/develop,3723d0f4d5cf51fd3b5bf5c15529463550918e1f,49e4e1cdb8643f276703f5f7761f0cb6c3d836c7,9dd448552f4610d7c651eddacd82fddf7ad48aa1,,True,True,True,159,521,9036,27,True,162,Tests_passed,d532a309964d4290c1776c1951480911b52c979f60f9844efedf86be7d7fe1be,True,Tests_passed,7b484fadc10b7e9c97f9059129e501f30c9b3af803c18127bcc4ec81c51da9a5,True,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,d9da87ceab2710b63992ea86f5e94dad2ce869ee33f40a77ba53c9b90f5b0ce5,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,2aa5152032f8c9c631b74110e02b097431625928af615feb7f6130355262d7ff,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,778bc56db82b30622c2b97843f53aafcf911939b68803ef92681509b9f1a9f38,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b diff --git a/results/combined/merges_tested/mdeanda/lorem.csv b/results/combined/merges_tested/mdeanda/lorem.csv index 3d848106de..e341ddb331 100644 --- a/results/combined/merges_tested/mdeanda/lorem.csv +++ b/results/combined/merges_tested/mdeanda/lorem.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,b340dfb840716f7eb60f9febd104087913f2beae,066a95129ded0423403c5d7f48d90aebef73d278,96c00aa7b9415de0effec3d78dafbf3b722c168f,,True,True,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,True,4,10,29,2,True,Tests_passed,75b49c8a194bd79d752d4a07f3988a840d91eda770ec5931715322f4cfd524b8,True,4,True,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665 diff --git a/results/combined/merges_tested/mdeinum/spring-batch-excel.csv b/results/combined/merges_tested/mdeinum/spring-batch-excel.csv index 388cf07786..0a61d0a923 100644 --- a/results/combined/merges_tested/mdeinum/spring-batch-excel.csv +++ b/results/combined/merges_tested/mdeinum/spring-batch-excel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f1109bad1d0f6b5178b84a59be3e59e18442d127,e7fcf225aef0ccdd6d9c972a07104d4fbe87043a,e732239774881d118a937a636bbd7942bcfa6966,,True,True,Tests_passed,92b6ff26ab94cad5fa3c278f77751bbe5abea735e14350df36a9b31125a0d65d,True,9,17,434,45,True,Tests_passed,b9a87b24f91328d70b6bd43ad3c6b8bad8a595e9ca31ac5a51f0140171520108,True,49,True,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a diff --git a/results/combined/merges_tested/medcl/elasticsearch-analysis-ik.csv b/results/combined/merges_tested/medcl/elasticsearch-analysis-ik.csv index 165349c834..f4adb77738 100644 --- a/results/combined/merges_tested/medcl/elasticsearch-analysis-ik.csv +++ b/results/combined/merges_tested/medcl/elasticsearch-analysis-ik.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,True,7,32,229,2,True,7,Tests_passed,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,True,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8 11,refs/heads/master,ca2bfe57320fbf2bbef20c9ca69b9d78f4912710,3bd1490225b3454e89a9b114df909cf03cc2216e,5ec0bd5bd6b20980f56fa2345681961f4525dd33,,True,True,True,14,159,798,5,True,14,Tests_passed,c52d67480c76e2d737d7345887df82526f21e7ae981e2e106c2f66993bb0104e,True,Tests_passed,b6151cdd4c5ffe876ee84dfdfb617c30740302efe59dc6e1a6f15f8568099924,True,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,5c425aae87325bffa34fee004e7b683976b437ca776245c6f02dd8c9e4830fd2,Merge_failed,af0068a5cfde48012ba9a4f1f02c7e565775685a17cd9449a39a658362270ab3,Merge_failed,759733f0ddd5bedbd51f1bcefc876d1f283e0a4af4b046f47b463cabbd7f36aa,Tests_passed,c94ac84284809e8c6a48b0e0cdee2ea0182958387f04d2546042c437a4f15afe,Merge_failed,4cc99734a518e871ce071a665d05d112fdc838910e074502cfa2549c54a15724,Merge_failed,759733f0ddd5bedbd51f1bcefc876d1f283e0a4af4b046f47b463cabbd7f36aa,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,5c425aae87325bffa34fee004e7b683976b437ca776245c6f02dd8c9e4830fd2,Merge_failed,63835c447ac754d5ea6418e8a80ca53b37e221ccbbd3064ea7ac39a8daf80da9,Tests_passed,c94ac84284809e8c6a48b0e0cdee2ea0182958387f04d2546042c437a4f15afe,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312 13,refs/heads/master,e673eca316b224568093cae7c728a9640a6d7e24,c8f4d59f13a403fa5de137076478731e18f403b9,3d8fa5bee0acd1385e5ee8a796c56b9b0a7e775b,,True,True,True,13,42,215,2,True,13,Tests_passed,6ec3827247b7960ed502e8f7c5095560bf7e4f1eef12eafbdaa15dd96d2a860f,True,Tests_passed,9c93a3afb7e0ca0161a7d019feae9d1fd9fb2df92523886dbd02d2b5e1ae1a5c,True,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,8b958d5b83601f37c7ef8b837cf3a19dcb0628deb25778a6f33fb065defde92e,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,8b958d5b83601f37c7ef8b837cf3a19dcb0628deb25778a6f33fb065defde92e,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4 diff --git a/results/combined/merges_tested/medcl/elasticsearch-analysis-pinyin.csv b/results/combined/merges_tested/medcl/elasticsearch-analysis-pinyin.csv index 848a4d0cac..1044da88a7 100644 --- a/results/combined/merges_tested/medcl/elasticsearch-analysis-pinyin.csv +++ b/results/combined/merges_tested/medcl/elasticsearch-analysis-pinyin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,acdd6eff2a1baba3de2c336880655c5f4c0729ef,21b2b8e1e46bd70c7d1f7fa8f60ec08321ee3378,1e3bb4f99192270b46d7139b2a892026689d8940,,True,True,True,7,107,592,3,True,7,Tests_passed,4b2fdd68dd1e1248f01b041c83589c44d76c37edcd3a1176c5c8308d20139379,True,Tests_passed,3374c45042e3675825ec4ad1c47e2ba00b5ff70ed013f7b2a007c4829379abc6,True,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,80a72e2d28e828e20e996a4adbf4b38f54a89af650773cb6280ab7e767579287,Tests_failed,b08c8c46f0bde42ae73515ed8d9aa81b97e735fb1debfe5598185d3ea1808e1c,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,80a72e2d28e828e20e996a4adbf4b38f54a89af650773cb6280ab7e767579287,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6 12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,True,17,77,537,2,True,17,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,True,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,True,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,8fa34c129004d802cb04c57d5947e7f850d11698b13811c5a68d5bd438811c51,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Tests_failed,4f01496661bfa41d51f6e10349cecad4e67b4aea18f2270639e461b1143ab8c0,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,a4033a649f8decfa9c69affabb84ead4bd9f19ec8cf83dbf18eb2d6e4bb446e0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9 16,refs/remotes/origin/6.x,4a5981413d5c6aced9b81e136f44c22ad56f37e0,51f55f9548bf94231f139fcaf282ea20c1b8d109,2f34d08eb2dc4056f7e958cfead0508ca9acea35,,True,True,True,7,51,405,2,True,7,Tests_passed,11022ada16fee7ba5de311affa791fc612886d20626d77eb80c0be06f8ce345d,True,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,True,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,c18b04e33be8461d8bc49c40f04138aff9e59bd016192c600e83896dbe23c08b,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,c18b04e33be8461d8bc49c40f04138aff9e59bd016192c600e83896dbe23c08b,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465 diff --git a/results/combined/merges_tested/medcl/elasticsearch-analysis-stconvert.csv b/results/combined/merges_tested/medcl/elasticsearch-analysis-stconvert.csv index a4cc233328..b21e24ca72 100644 --- a/results/combined/merges_tested/medcl/elasticsearch-analysis-stconvert.csv +++ b/results/combined/merges_tested/medcl/elasticsearch-analysis-stconvert.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,6d996a9efa2dc4d57f947b31bf8c64d15f257fa6,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,9bbe6c3fed26b3237b868c295a7dca37489ce197,,True,True,True,13,75,193,4,True,13,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,True,Tests_passed,dbcc038e094bbc530afcbabdb7704fc1110e9629ec00717f1445f87870ec2252,True,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,d05bf1f0e9fa2a00087d562e8b12bdff998051700abfac6f00412d30484542f4,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,d05bf1f0e9fa2a00087d562e8b12bdff998051700abfac6f00412d30484542f4,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5 9,refs/heads/master,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,a3748c08e9c5c50e0f8e439ccb9b9017606e4c65,,True,True,True,12,71,184,2,True,12,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,True,Tests_passed,77cceb256ad43eb8042b0f3d10d3ebeee1a6f96d1569b16369e7ab63c10bf440,True,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_failed,ba42aa5791225c644e9fa65283e12210f68a603bfb4b59a57ec2c0d865d171c2,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e 10,refs/heads/master,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,ea402a1f299b72645b72a43501e89bfce2a5a786,79dd7851c0a485891df84ccc9a35beb1540750ee,,True,True,True,11,38,97,2,True,11,Tests_passed,4e3f17701bbea0e4f332c36abd67552d169b57bcf896ce517c3463d0f8e64c9c,True,Tests_passed,b252d2aa54e210e77e9f6bfb5371c66b3afdf438bfc5b6397907acb4ee10f573,True,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,a18e58ad087e1f13a6b4f12f3d11a719e04df981a77889b9690a01d18b21867e,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,a18e58ad087e1f13a6b4f12f3d11a719e04df981a77889b9690a01d18b21867e,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350 diff --git a/results/combined/merges_tested/medcl/elasticsearch-partialupdate.csv b/results/combined/merges_tested/medcl/elasticsearch-partialupdate.csv index 28c7b75414..61800e730a 100644 --- a/results/combined/merges_tested/medcl/elasticsearch-partialupdate.csv +++ b/results/combined/merges_tested/medcl/elasticsearch-partialupdate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2cffb48e7b98f31e05feb82b21bb15e46b28493b,29be22f2982ec1d94929b4222e10d9a11bfa67c7,bfface3561126d5db1d340a8298e862bc3a8dd49,,True,True,Tests_passed,76241a787d3f93343b49562e74f00c70514451cd102aae740d65d00a7b558f9d,True,8,50,1239,4,True,Tests_passed,015633cb1c997465cdfdf7eed82105b59841252fe67eba77f3b5b8d3a2d238d0,True,8,True,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,fa5517c168d95feeabb2077254466d1b7f487964fd512f1b0dc1cb141ad082cd,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,7d39a9b8996cba2d0a74b19136b46e4c23a81bb78a66729964d4a33f8b8e0ab8,Merge_failed,b135f7cbfe42a8158a7f96630afbda5b3aee67ef875b978fa129b7dc7652e012,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,14314e8deff41b96d67744457bfe6accc20eee3f74e667b0deefbebec83c7728,Merge_failed,6945d95e8a8d9e5bc3609ca5754c9581e2c8785cde399d479e468804c8f56d8a,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb diff --git a/results/combined/merges_tested/mercadopago/sdk-java.csv b/results/combined/merges_tested/mercadopago/sdk-java.csv index ace1fe5bda..f906b190c4 100644 --- a/results/combined/merges_tested/mercadopago/sdk-java.csv +++ b/results/combined/merges_tested/mercadopago/sdk-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,f60681aae04e2986541668b836247750833f4147,31885f3c5c4908aec7e7c1249dc024d64a623418,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,6,11,673,3,True,6,Tests_passed,f210e064229ce2f0391424a2c8ea155f49f4e6a83bc73544d0128bacf1b35af9,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,969d1c19cf4fccc8e137ff299f2a630189159b4cf48e1972db1df7494d9668cc,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Tests_failed,43b27133e46c1b5b0559aadfe5e78648b255e59edac201f885a589574f2b50a9,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,7e19be33a57271c9194387b0cd6e98dcbf1af77c2a6751f7e4ffac127dd48852,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb 51,refs/heads/master,2e09a545c1084699687e70b7d426cfce51f7cf7a,3c1e03c0192ea4cad0d0c2ee5071953b74d308dd,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,5,9,720,3,True,6,Tests_passed,59fe4f57ad7a6b8deda4f7ab810e80eed7a413c0587914aa5706df36d18b02ec,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,83f3d5caa611612e6b08a76144d03c6cea31d007543e9c65ff55b8c808b88954,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,83f3d5caa611612e6b08a76144d03c6cea31d007543e9c65ff55b8c808b88954,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554 52,refs/heads/master,9a60e0b0670692444cef0a578af8477fde083789,7342ee129b23b6b243b4933a69649ad90f3b453a,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,6,11,523,3,True,6,Tests_passed,17ca5a4cbeacd7cdc02c5c581f9610741375a5371e97a24dcb99868f8f98a39d,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,186cc57f1b43fcc48e832dbec5510e184ad4272747d3cbe10612ddceea0abd7e,Merge_failed,59b93cfb7580a51c394963aa433830189030abdd9ef5ff07a5e36ca3a201e899,Tests_passed,d34eda486d231659d26e90c04ba59d7afaafbcef454ada3d6de7ff944e19818e,Tests_failed,c655958ef29b339bccb70cb6ca3a737a1235d3f0bdf0b57efd37cc0b5dc98c0a,Merge_failed,59b93cfb7580a51c394963aa433830189030abdd9ef5ff07a5e36ca3a201e899,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,188c4ad064654a780cdb8c5639c97779f96432ce7e986305440eaec72ae36e50,Tests_passed,d34eda486d231659d26e90c04ba59d7afaafbcef454ada3d6de7ff944e19818e,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9 diff --git a/results/combined/merges_tested/metamx/extendedset.csv b/results/combined/merges_tested/metamx/extendedset.csv index b679459687..1983248737 100644 --- a/results/combined/merges_tested/metamx/extendedset.csv +++ b/results/combined/merges_tested/metamx/extendedset.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,7531f1e53c2080be0e20f1eabbbbd4e2ed3fd6fb,5521a5634e996bce73b45152db87141fb4d01c5f,523b72d6b645a4d92dfb6547332976daadfe23bd,,True,True,Tests_passed,a43c93fecc32649e98815a7234eadc7a814ed68a7b32ade72a2aa82bb9482197,True,3,12,51,2,True,Tests_passed,7910215742467bade0b9141025859e1c8c58120301fdd645ce7c096686cd3663,True,3,True,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_failed,af71a47697954474bb70b9e7f00e35fdc35a7f08caac3618889e735eb3b4b7bc,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b diff --git a/results/combined/merges_tested/meyerjp3/psychometrics.csv b/results/combined/merges_tested/meyerjp3/psychometrics.csv index de63adcee4..2b84580f46 100644 --- a/results/combined/merges_tested/meyerjp3/psychometrics.csv +++ b/results/combined/merges_tested/meyerjp3/psychometrics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f90c2bd3c3407128d60612613daa8b5e6c509fc7,0a883ddd4ebcc56a9028663e1273b0d50fab85db,06a7ae98fadbd19b1f49de3b6b209e4b556ce4ec,,True,True,Tests_passed,85d40de620f73882f0bbbdee3fd7ac87e2a188c4dab59b2386ee2b30a0b239e4,True,16,35,339,2,True,Tests_passed,64c27e5d6d67399c27f40815856fe49be9054640815f0b5995c8b8c45a23d0e0,True,16,True,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_failed,9abba648278b024d95629a69612fddf4c9f8bd572b454af3b5fadd5536a34838,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626 diff --git a/results/combined/merges_tested/mh4j/metaheuristics4java.csv b/results/combined/merges_tested/mh4j/metaheuristics4java.csv index 8bebac5869..cbcc8d3a0e 100644 --- a/results/combined/merges_tested/mh4j/metaheuristics4java.csv +++ b/results/combined/merges_tested/mh4j/metaheuristics4java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/develop,78b481eb40f47dee1a6999abd42abf74ce1bba9e,ff1db58980b33481f6e04b8b9dcaeca2acf9e264,0d540432feceb6995da964618a4a4d016a753608,,True,True,True,50,68,2151,3,True,50,Tests_passed,67fd92182d5b04492c24c62c766ae39a1139ea86d33472123430b7e25ea71f6f,True,Tests_passed,a5d727838d8c45ebda211b42d1227cf322a76a39b303160f95ad3d040d16f74f,True,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,92b845cefd5171f8dc139ad9ebf5c78538adf463d9a6fd9d8df3248be76355bf,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_timedout,,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,c9123521e1265766c6960cb962f076cb19adcad47512664dc3995d57652df3bb,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e diff --git a/results/combined/merges_tested/michaelwittig/java-q.csv b/results/combined/merges_tested/michaelwittig/java-q.csv index 4debd4b53b..8d8c450a87 100644 --- a/results/combined/merges_tested/michaelwittig/java-q.csv +++ b/results/combined/merges_tested/michaelwittig/java-q.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,f40f420b416029849a73c6af3de3644db2011af5,b8a193e57a80d4a35b734d7a1500cd4387cc5c6c,0498df2c05d977eb0f376bf12f6b95d93efd1d53,,True,True,True,119,345,770,2,True,119,Tests_passed,2d2a612628096e5db1f58f5060eaecb56bd0f02c1f54d8ba5389dfd7b46ba1f9,True,Tests_passed,a6436b451d43e9d1e64cd89a22e4217b8a0466ccaa78c0fd2a45636d618ed5a4,True,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7 diff --git a/results/combined/merges_tested/micromata/javaapiforkml.csv b/results/combined/merges_tested/micromata/javaapiforkml.csv index 09ceeb9010..db7d943c1b 100644 --- a/results/combined/merges_tested/micromata/javaapiforkml.csv +++ b/results/combined/merges_tested/micromata/javaapiforkml.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/30,c3c171b056ff1302482dddba02d6b49df4a15c3c,563e35bb09ee5df5119788ac6b1073879d103076,8c86cb6d3332b7112ae3f8277bebec199294e211,,True,True,True,163,4488,12023,6,True,163,Tests_passed,e22db7c67148c51e38dbb4c18a5cf7650ff5ff80d59dd71cde43da66ae2bc23c,True,Tests_passed,62a6dbcd928a1efcf016883451c5a98f44097807f4df61855acc5993bb3ca6e8,True,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,734bfb17bc05d63eb0195f72099dfd84c6d4363cb0fed7cde82c48def58dffdf,Merge_failed,413f4404971900f1d68788c8683f949a3a93a22f6fd013a1199d08fd594deec2,Merge_failed,e98d3f0979804860877ec004c1a795573f0bcc3eede4364e8021ac7b0bc56045,Merge_failed,88c1867fb3983ff0219a58d05137b519eae427fb3deb4553248abdbcfaf0a30b,Merge_failed,413f4404971900f1d68788c8683f949a3a93a22f6fd013a1199d08fd594deec2,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,85ebdd4d169bc81a162027ee48b2af155ae0e136f88b29a9dc75417acb933262,Merge_failed,45dae2ec7a0bde5fa568f3a49ddfb79f6e1139f65b53d37764dcf69a806fb547,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7 9,refs/remotes/origin/pull/37,524dc619303f36bb3d0d04d8b4ea0bf72ad81cee,f31e4d3136564156e62a7adf65198fe1cb678237,aab2ba2cac18ef91bb8b3ddb1caed32339ef927c,,True,True,True,134,4063,10473,3,True,134,Tests_passed,799345aba19456eef37aa4a28d93dac4046a2b3b1e5fddf970f1b0d0c6b8299f,True,Tests_passed,c51fb7814584d0ec77c4666e8b3ea5df58d88432b987da64c88d20593ce53ad0,True,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f20e3708f15fabafa3cf02e6e2bf45b200057caee616a729caaae0ab14909dbd,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,22b5a83225ee024cc0529509022950ff97511baf54ef58dec35afe2f5c6afce1,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,c2cba1e383912c391d8923c0b2cdac70bfeb658f38412e23a816e980134ba048,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a diff --git a/results/combined/merges_tested/mikaelhg/openblocks.csv b/results/combined/merges_tested/mikaelhg/openblocks.csv index b85866087c..e6187b111e 100644 --- a/results/combined/merges_tested/mikaelhg/openblocks.csv +++ b/results/combined/merges_tested/mikaelhg/openblocks.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/remotes/origin/pull/15,35f56250677614f525c62aed43c386e9bce16384,762dfeeab5f471e8cfb38faec23e60bab63e478f,4246e102c544b2cbdf4f505f9b6062d47f14cc09,,True,True,True,4,8,39,2,True,4,Tests_passed,bf475db3f470c6bed4ac85e38fa5a84dee08dcad82339d915bf3dd6d42973685,True,Tests_passed,e534be948a8101823c23621fc41ccd41522e2f1e32793366c9a9409f2a5403e4,True,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,c4d86d74265ed515f8a25748c84e90f2cb3a4b5201f37ee374683b1186f05cdd,Tests_failed,1f5aacfbdd2b3fe3cf4685b60d42ce24105a8be22f8a33bcf918294e87f9ff92,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,c4d86d74265ed515f8a25748c84e90f2cb3a4b5201f37ee374683b1186f05cdd,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b 15,refs/remotes/origin/pull/16,fed14c0074c778058c5c6407c0d3851a48745643,3d42bdb33d25151c7eb51be29b54cd79f18cbea6,76f96715817507d662dba476143d4a55649d8eae,,True,True,True,66,512,1962,20,True,66,Tests_passed,f8e6b84c9aaa9bc92ea713cbb039114bff61a8586664a092462e9fd04cbd63b5,True,Tests_passed,278b9ba2cf765408c336b00d7fd29b42564ebfc9a2d2fb55023a0122cebb3bd3,True,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Tests_failed,61b1d0e5f7ce0b98342c75f7b0369a23127f0778f16f09e3943333f648804074,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d diff --git a/results/combined/merges_tested/mikera/vectorz.csv b/results/combined/merges_tested/mikera/vectorz.csv index 66e0f829b8..2a4aba2151 100644 --- a/results/combined/merges_tested/mikera/vectorz.csv +++ b/results/combined/merges_tested/mikera/vectorz.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,a05c69d88c29478f38bf084ae736e64414221a33,e8c98f5bfa72adae5666e283fcfde46234972b84,9c688f13e9dc3c6d78263c3522593ab8d4bd9fb0,,True,True,Tests_passed,00d95835fc307de35f6c61680399dbd69a45cf19a4c09eb726a514ab7a4bf2ee,True,263,2289,17369,2,True,Tests_passed,374b7af21ad024236a57134fbfd8eb82abca9e136779afa286f1bb4594c2c617,True,263,True,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,b9172feedc1e80402fceb94887fed47c69356677288db0354924f0d867cc1af4,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,b9172feedc1e80402fceb94887fed47c69356677288db0354924f0d867cc1af4,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3 8,refs/heads/develop,e1fd48e86462089ff00266aa866ee93a84b46c34,c070074e969780a9f77e6889fe0cacfaca1c3407,a223ab64a79d0a5edd3146732965fb2def1bc2a6,,True,True,Tests_passed,645a5623f957a0f328a4761bb2ee3fc83850d3159783640f05f7287bd20cf9c6,True,240,1907,12981,4,True,Tests_passed,42793e8a3d0ae9459a053f3b019e3db90dfe10072c7e5ad8ba73e307e49e868f,True,240,True,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,5cc6802ca823ac4d5f5ab0dcd6b9df8c4c0b7e4db6bda422f99e31dfa8be3930,Tests_passed,919e1b55d7e431189abbea072c129365ca2e4b1676a15478024ce047867f88c4,Tests_passed,503dbe11f88b7c35f25ca5966810354d2c43ec71bd81c93eea8911d79f189022,Merge_failed,d7e308c0323717d7acf7e1247800cee55089a3b19a3e2ad4054eb542513e9486,Tests_passed,919e1b55d7e431189abbea072c129365ca2e4b1676a15478024ce047867f88c4,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,6ec65373a7308334aabb36f241202506384c8e56f1dafc57930d7150211ac56a,Tests_passed,503dbe11f88b7c35f25ca5966810354d2c43ec71bd81c93eea8911d79f189022,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52 20,refs/heads/develop,d93ef1b341f6359c6e15cb8b4a6582eb85c473bf,507607c7c2abe9bc17dcdcd8ca33559706942a3a,a5dd418e61e334deaea564260dea70a3e4498ddb,,True,True,Tests_passed,a1f76e19369ea701b92ec2728a7b9db63bfd778c6ef36bab0d18ece3c0773421,True,20,34,117,2,True,Tests_passed,cd658510ce4731918d6b5d772c89bf2fc6e40eeac447742330cca0f16282af36,True,20,True,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,dfe4f9c587d488907367f99e62b71de98c2cfeb0196a44cd01dc2aa02a886623,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,dfe4f9c587d488907367f99e62b71de98c2cfeb0196a44cd01dc2aa02a886623,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c diff --git a/results/combined/merges_tested/mikvor/money-conversion.csv b/results/combined/merges_tested/mikvor/money-conversion.csv index 103519e4b9..85c99d70e7 100644 --- a/results/combined/merges_tested/mikvor/money-conversion.csv +++ b/results/combined/merges_tested/mikvor/money-conversion.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,6d3819f26610029fefcce1ffc167aaee1bb7bc1e,31be65589b3b2748955f250f04612f35a84e5d0b,9cba67b86200dd371c86dc904e510ebb208a3e07,,True,True,Tests_passed,b63256923a405fa6a5325080070fa61c4c59ea40eb949933bd675b3023b6fc9f,True,5,6,61,2,True,Tests_passed,521bb34aaca81e71bf6594ff8c8dac549874030ca9a9a57f0fe0593f2feb2111,True,5,True,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,024c7f213ce66e734684e3758c4b18b2b22ae175fa685964df2b0e21733efaf5,Tests_failed,50fcb8ce451edfe772fbe5b1f19e9430058e97b9889a7559156776e76c030223,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,024c7f213ce66e734684e3758c4b18b2b22ae175fa685964df2b0e21733efaf5,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711 5,refs/remotes/origin/pull/18,7fd58e662fac159f87c3d1f8980001c7570e615d,f4b08d593619144bcf293727980ac768eef70459,9e6bdb77d6178f61a8e12141628076ff289c5f6a,,True,False,Tests_passed,0506d34bfb48f879bfe0438a51539ff0345f9ad7bf8bc7061fe1a47acbf66908,True,6,7,97,3,True,Tests_passed,9a88b5c690992e2343df2bb870cf213ea8beb199e3805c8c03a38ff37e50f203,True,6,True,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,99e456e0c5c4c36f64a184a7e0834585836fc191dddf6e2824ac92994c96c2f4,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,be003950ff9086d7218f1e0679ab5347e3e13f6091af1e2265f1c8b78c681e32,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,491c1677bc4f3d05c70de902eecd405caa58c158f64e7c17c61eafe3205e135e,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e diff --git a/results/combined/merges_tested/milkbowl/vaultapi.csv b/results/combined/merges_tested/milkbowl/vaultapi.csv index 17c1eb0d56..03e6846554 100644 --- a/results/combined/merges_tested/milkbowl/vaultapi.csv +++ b/results/combined/merges_tested/milkbowl/vaultapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/152,513fa83f0bb1da4b5a94904ddf3b65fa2dff631e,9520d8847e2b31f4a9d2cb5f7831c38877cd0ce9,7c7d0abcc2a89011a5bd44f67088d6446c7cd676,,True,True,True,12,23,2253,2,True,12,Tests_passed,a2c14020634374718d5b0c0f7d5da4fa70eea8d3dba2fbb9971d4642c39c94a3,True,Tests_passed,86e383c6710dd7bfc11604d004af9dce50edf16bcc0325d8a0a4cc354835216d,True,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095 diff --git a/results/combined/merges_tested/mimno/mallet.csv b/results/combined/merges_tested/mimno/mallet.csv index 2652ef6fae..26c53513f8 100644 --- a/results/combined/merges_tested/mimno/mallet.csv +++ b/results/combined/merges_tested/mimno/mallet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 88,refs/remotes/origin/pull/174,a1f4c0a32d1da92d486d022bd1b860cac1285580,808668f25eab6bbd1282e1cff5c0594c8673b070,12487de1aa6433bdcf5af0ee0a17b368e64c7acf,,True,True,Tests_passed,e7509a93067c48b052332a33a4def32a041597470d2282c4f84a53b52158fabe,True,129,1280,4680,4,True,Tests_passed,f4b5a13b324f0d007132c101e5ca95e9bde8a5db2ba00edc1bc6810990ec4cd4,True,129,True,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,8a4509d7fe7397f9dde0f0ad3679d6779e7037af6538e0d011eb60ef97bbb613,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,0bfa52ac424b4f8da70eba90a2850c59aef193e5fdd9576b2fdf2d35b649811b,Merge_failed,3c31a28e159f073ee34822b81f9298650fed7bfa4ef3df42b0734860508c9d73,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,c8485b163beb8f521e935d4e8855e758e6ecb5a77fdcdacd7d491822f2aad190,Merge_failed,fe4f37ff30d613cf4916498122d991938ecf2c30fdb56bc0df33fb69ee152a01,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb diff --git a/results/combined/merges_tested/minecrafter/bungeejson.csv b/results/combined/merges_tested/minecrafter/bungeejson.csv index 077801e55f..2a5938455d 100644 --- a/results/combined/merges_tested/minecrafter/bungeejson.csv +++ b/results/combined/merges_tested/minecrafter/bungeejson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/restful-api,0b724f363a57d505cd080c459b42edd48cf57891,9a86a05971b5552c08194dfedaa054d5eac16d8b,80ff9723e4368f5bf84b14dce399d7912d6abce0,,True,True,Tests_passed,4e43cfb1aa9cec3de65d3a1d1dd9389e296fef1299599c7ef39367fa616d2594,True,19,38,171,2,True,Tests_passed,2fb281682c5cd6c7a0ff5628c1b18a580c7658b6c73edaaf1d7934d1eb91eac2,True,19,True,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d diff --git a/results/combined/merges_tested/mitre/http-proxy-servlet.csv b/results/combined/merges_tested/mitre/http-proxy-servlet.csv index 2cd3f64f70..4698a5d647 100644 --- a/results/combined/merges_tested/mitre/http-proxy-servlet.csv +++ b/results/combined/merges_tested/mitre/http-proxy-servlet.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,82c69770ef0ebe40519b75f68067fc29d158734a,d9b90d18cc2d1c19ab312c92d30eb5be363cdbd3,5d6e362230b46d07881bfa679d821ddc2cb3e225,,True,True,True,3,7,89,2,True,3,Tests_passed,611078f2ae6c97d37ee7ae39230533953c9aab874bf35284d981ccdfd4d526ec,True,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,True,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,d55b913a9e8866fc42232a44ca60f5f9494657a65572b93993c52d87101e0951,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,d55b913a9e8866fc42232a44ca60f5f9494657a65572b93993c52d87101e0951,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21 11,refs/heads/master,73da1ecb003abb248aae7b00fa554801baff1418,89f7168fa870d7f726185136517c5d52467d73d3,41a79b08bc07511f7f68b193054b19360fd48838,,True,True,True,6,37,204,2,True,6,Tests_passed,0c3a39385c0cc620f4f2fb45aa41bc487862513285efbcfee1272d528fd79bbc,True,Tests_passed,25eb1363d17ad1f68bb841db44f81929ae6cd281015ba990ea9f87329a762b8c,True,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e 18,refs/heads/master,fab3d1b12692277cfcad496a669c21660c1a3b05,a31f484c0a565fbdcd22fa1b1002de0f3e46dadc,a16b59f2de279178364122d9e8ae3dc5164f7d0e,,True,False,True,2,3,13,2,True,2,Tests_passed,70a03524094caab99a403d609dfd37954044e92a7a279d39a84dbb9ec0475d1d,True,Tests_passed,bd2ff7cf2fdbc08665e011e6dfecefb2b27655d5100f364a39ec4ff287c805ac,True,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,08f1573a2072f35c1ef0da54cadcdda4ff8a521b3c4becc546b771d2f9961762,Tests_failed,0768bb654df787e0d42c518fd2e9a8bdb1d4fb2942d526ad256a38c2d4b86301,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,08f1573a2072f35c1ef0da54cadcdda4ff8a521b3c4becc546b771d2f9961762,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f diff --git a/results/combined/merges_tested/mixpanel/mixpanel-java.csv b/results/combined/merges_tested/mixpanel/mixpanel-java.csv index 385f33b5cc..32247fc0d1 100644 --- a/results/combined/merges_tested/mixpanel/mixpanel-java.csv +++ b/results/combined/merges_tested/mixpanel/mixpanel-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,bcdd1ed28f9b69aa8baa6d7d44e292f4d8e8a236,7cc869766660614944e59e0f153f3fac91e654af,dcd372da803eba5bf6ec38189647f005634b922a,,True,True,True,7,24,77,2,True,7,Tests_passed,8c5a9a45a6651722aff61e1c8d82077152d3103ee3f03856178a7c1ff4a23777,True,Tests_passed,e70b6084c60ad9db77a6c5d49ffce05898631fbfde7f7918f1a827665883e10d,True,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,2779da433461a80abd106d1cca374ba1b1c45c822fbf59660cb1fb0f95b6dd1d,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Tests_failed,582ac54c96f77e8814ab0eabc18295fc08fc84ded7d2a2d305873343eebd879d,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,42607504ec4a0ebe1ca3dc2f057c4365ec54944b04a9b657d32926868d677364,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4 9,refs/heads/master,7cc869766660614944e59e0f153f3fac91e654af,9e386f7f089bb0f9b342cacf5844ca78e36d37c4,8dab459335da444a242b4d895a790d0cb6385365,,True,True,True,8,27,79,2,True,8,Tests_passed,8648bfdd0699e78e2a24e613d7f72a5514d15c0acca5c22a7db99a62bc3e279e,True,Tests_passed,4163d9a50282b0f6ebc6629653e5b9b6857cae19d7b30541ef2963ee147ebb22,True,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,fd37112a7bf0e55221405841b0020bde7cb199f821a638cb2f6c2fd7c8596439,Merge_failed,99a9aa1d48bef4a77f9fdf05a6d9c8a1d7b92b0857f62a4897b88dbf0c47db03,Tests_passed,8b19d46a41e8c6be76e000543fd8c994b78dc0b5ec06d924d43f8d5866a58f26,Tests_failed,23ad341152147a9b2d698edde1c9859e9062d1ad68bd6d3df53dff0846a06a81,Merge_failed,99a9aa1d48bef4a77f9fdf05a6d9c8a1d7b92b0857f62a4897b88dbf0c47db03,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,5ed5a8449dbb9b3584abfddd551833bd87d5954a754db4fc763719d787fea434,Tests_passed,8b19d46a41e8c6be76e000543fd8c994b78dc0b5ec06d924d43f8d5866a58f26,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8 10,refs/heads/master,a318fdd72fad23f101a76f483e9ec1bbdd57ab9d,1f53754583fb2ccfc3759f6c5611bd31faf1b925,8dab459335da444a242b4d895a790d0cb6385365,,True,True,True,3,4,7,2,True,3,Tests_passed,6693b78cac89f0ffc0f150b2630afc2017296fb8e621e9149b96080f0d807943,True,Tests_passed,4163d9a50282b0f6ebc6629653e5b9b6857cae19d7b30541ef2963ee147ebb22,True,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,fba7ac42d5d80b842884f7029c641cc99c987bc3ade252cc5f9550e404c7d426,Tests_passed,cff27ec973d56f0ae8368e37327069e8fb962d03431d7fc3110a5d3c05866558,Tests_passed,9bf2389e4bd03d198c38961285c072131a0c746cf72618e275339b751aae09e7,Tests_failed,51dfd2499fe62575e9523f0f4cce64d90672928b5043d9f42f78f194edb17842,Tests_passed,cff27ec973d56f0ae8368e37327069e8fb962d03431d7fc3110a5d3c05866558,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,9dd91c4160df5f1f91076a50fad53d477c036f9573dbf4a8ef4e0f2bd81ff969,Tests_passed,9bf2389e4bd03d198c38961285c072131a0c746cf72618e275339b751aae09e7,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9 diff --git a/results/combined/merges_tested/mjsalerno/unobot.csv b/results/combined/merges_tested/mjsalerno/unobot.csv index 280e38a334..a04aa819ae 100644 --- a/results/combined/merges_tested/mjsalerno/unobot.csv +++ b/results/combined/merges_tested/mjsalerno/unobot.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/27,716a704d8b270ce23f86584b7a611866482c252a,dea483d77ff8b1c3832247266a697ea556cb31ee,2de6af42d0fae77854b7fa9da25403f143fb59a0,,True,True,True,11,20,44,2,True,11,Tests_passed,d2d472f4e79a835f1bcbad93747f0d2494477227307f3c3b0a823c37cb70724a,True,Tests_passed,bf996ca6da45a143600aa7d689bd45e0444d1f0b21f91a1cc5c0f55071fbfe28,True,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,d0989375d7573c2967d7f1e52fce4f03c34500fffb642b577a19a09fb1513be3,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,d0989375d7573c2967d7f1e52fce4f03c34500fffb642b577a19a09fb1513be3,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58 32,refs/remotes/origin/pull/42,5c68b52897a24a9aa71f0ee807a37f04c1f997f3,7c9a626e059d1f481130d6de69cdeb79243d8ffc,50f00c42a551b152e5945adda21c0a9580734ca8,,True,False,True,3,26,53,2,True,3,Tests_passed,da5d9cb924c723c919a0805ef1b79ce0b170172cc44217e4b40a9c6de8211a3a,True,Tests_passed,07125af5f670ab7ae858ddcfc5fa6ec59148472bc595e74a13c501ba831efaa5,True,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,f140daa966c14fb71a3217da340aae01f338f821681ddebd34a036d0eab9739a,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Tests_failed,1983e3d49975e2204e5df53a46173847589452e350a92b295adcc240fb50cb61,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,7ddd313659c7647087532aed2268414baa83ca52c1c49ba1f4f95026ed97833f,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf diff --git a/results/combined/merges_tested/mjsax/aeolus.csv b/results/combined/merges_tested/mjsax/aeolus.csv index 63fc16d153..bf8150fc9b 100644 --- a/results/combined/merges_tested/mjsax/aeolus.csv +++ b/results/combined/merges_tested/mjsax/aeolus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,85127f4c5b94cc63493a78baf3bcb0f703a4bca5,9863d87774e76990b823efb0c6dbef3132084438,71bbc8afc3cd487cf847377e54251c8416cc1e49,,True,True,True,52,160,1472,92,True,115,Tests_passed,a5049851dccb1faab38ce136e46912bfad21b98691e4d74f903a71f5985a9e33,True,Tests_passed,4aa0e05f3da13b5a1f192fbccec0b9d0f53fc6b7d359ef49feea494f51bb7689,True,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,50e627507ef4e7321302b898913e7674875934dd3412fd99a40efc515837c97e,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,02a2bdcb26285c666c17f15947dac5b4dc202113b542b348442014380fa8904b,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,cea2095df91dadf8506402663ee6557f8ee46b9638b637020029f31c25952337,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7 diff --git a/results/combined/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv b/results/combined/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv index dfaead0d84..392579d164 100644 --- a/results/combined/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv +++ b/results/combined/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,009ccb41c98fa7b0e3882eda5bc247b80715a169,0a55df3366207b1d38e81e468181949e1d53881c,43689ec1ae3954706b5deae283af80b70fc83ed3,,True,True,True,2,11,151.0,2,True,2,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,True,Tests_passed,794f32ccffa1331220a581afeb6905ba65726bfc01a1bca1894a38fa86f3bd60,True,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,9f40a95cc7ea48a105fe1d0931d4beeb8a7c892904203cd6f28536fe6e2a718e,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,9f40a95cc7ea48a105fe1d0931d4beeb8a7c892904203cd6f28536fe6e2a718e,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f 8,refs/heads/master,0a55df3366207b1d38e81e468181949e1d53881c,e1a4d4058ac0a67fe00970ba020d205f7bb068d9,dd7ada0dbd4efe4681fb530d9ab1273cd5ef5910,,True,True,True,2,15,167.0,2,True,2,Tests_passed,a931f70215bee43c3256dbeb50fdebc91f64a34bd7c010172141d8a677f1f5f3,True,Tests_passed,547099c7078cf1dbcb3272f1cb561a14c534e50dd7c437d61fdd7a71fdfe60b2,True,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619 21,refs/heads/master,9b9fd9587c7bfe1930c693b902fb1ae8e65ed360,4a6b11b38192da9a5a27882d09c7fdec2dfb04d2,5020fe446eb279ec1fa9be3c0ad3f0dd45714521,,True,True,True,15,138,680.0,3,True,15,Tests_passed,27f404d6a88ddd183d6fa996bb3a3a1b040b001fa7a1ea28c7a609e1e250b62b,True,Tests_passed,3c342992f3c1e10734e1e20af0a5e643bcb4db338f410eb6a9c616ed66454f97,True,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,bbfcf9ad74d6d6a9c5a91cc357225e5572717b83d64908e7883e503badf4e1a5,Tests_passed,f2b35215752fe07f3ad6c49b26d4198abf7503cbc9658335c5f943358e95ffaf,Tests_passed,cd7e238b54e03327003293e7b08da910671915fd32601b3dbb914313e97f85b5,Tests_failed,86018c05aa67973a8bee7d2a372e794886a5109f44aa3e4a68d41283e5765f90,Tests_passed,f2b35215752fe07f3ad6c49b26d4198abf7503cbc9658335c5f943358e95ffaf,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,2313cea4c2d934caa562a35697539614a7d2234f69b8d6330febec152eebd410,Tests_passed,cd7e238b54e03327003293e7b08da910671915fd32601b3dbb914313e97f85b5,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3 diff --git a/results/combined/merges_tested/mlaccetti/javapns.csv b/results/combined/merges_tested/mlaccetti/javapns.csv index d6958ea18f..254d2380a0 100644 --- a/results/combined/merges_tested/mlaccetti/javapns.csv +++ b/results/combined/merges_tested/mlaccetti/javapns.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/develop,51f78090f2a79f6de2fd0fa8df011a93793be24f,e8ddea5897afe6ecc5450265070dbeb226ba2588,1a3b869b27f4a5e48b9e6dd1c36739916e380393,,True,True,Tests_passed,1204b5b49bb4b8347abcae32a25cecd4a020894fe5aa8f23f7f6cd3f7fe57486,True,23,128,417.0,6,True,Tests_passed,f37a42d341dea310a51a21c8f9e79d488d84eb2a7022f1efef33e1b868d4b69d,True,23,True,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,15999d552ca3d4c92a5ecabfbc0792137c5a0fa58e3a212c89f39575be198fcc,Tests_failed,22726cfa2df2baffa938d8b149051fe60edfa2458207c677f67e16b1d3543265,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,15999d552ca3d4c92a5ecabfbc0792137c5a0fa58e3a212c89f39575be198fcc,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e 3,refs/heads/develop,413b36b2eb8345ba9226bb29894aa908b78e1f23,2d5ef5447267fb2b50ebf753103505f84605ea6c,f7ebeb852ee61b50638d120d44b4e10507ae553e,,True,True,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,True,22,116,350.0,11,True,Tests_passed,910b3f21713eafbd9023948b36bf28d21ff51d6c062b4fd0060d67acf576392c,True,22,True,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_failed,43d99a960e82c4fb71338ac1bc4287f59e1163d22a690bc8c4f3a80e42f959d7,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54 4,refs/heads/develop,2d5ef5447267fb2b50ebf753103505f84605ea6c,5fe9fc977cc702b4b6bb69a1da1ded1e7901d12f,af02cc10af5004480c393559b146a4220a3b8101,,True,True,Tests_passed,ad11ccff0624ea013a898f9ecf4f71d29e4cb24a3d47f0259416de6004e14448,True,20,88,267.0,4,True,Tests_passed,dbc42c1b8f004eec1075fa7dedf97ac06b5be3c088c84474b06903baa0a03a41,True,20,True,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,9f123fac11231a58f09b14f357d62238597bfb2c0b05c39fdd2180cfc58c83b2,Tests_failed,9e587e0bef096dac120097ae7480201453b83d04a5f968c051c1ea915f09487e,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,9f123fac11231a58f09b14f357d62238597bfb2c0b05c39fdd2180cfc58c83b2,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00 diff --git a/results/combined/merges_tested/mmastrac/nanojson.csv b/results/combined/merges_tested/mmastrac/nanojson.csv index c534fbd57f..01a8459881 100644 --- a/results/combined/merges_tested/mmastrac/nanojson.csv +++ b/results/combined/merges_tested/mmastrac/nanojson.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,73d6edc6752e3fe1296b145b5608b854aa69728b,4349800958493e77baacd9af44be62a898a0af97,3f211d814aa3b3c9339697353c7e171ede6b36a2,,True,True,True,9,27,59,2,True,9,Tests_passed,a92e85438ffdba4d151db15d991a1676dc888b29b9b9e25023167164f213c662,True,Tests_passed,769c66137a18e0047f812ba92d08ec42b3098f8f8b69ccbdbc651f116b656e11,True,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_failed,b21e02853994211a5f19bde64ac39769557b9f86f8e8e4b560d918e0cbaa7b2b,Tests_failed,7203deb84800cbcb4acacee7ca85ba13a5c1c458efa18edabefcffd2276b828e,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_failed,b21e02853994211a5f19bde64ac39769557b9f86f8e8e4b560d918e0cbaa7b2b,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0 23,refs/heads/master,82385874bb4125a795bc67c7094df60367c096e9,9b02f0ed8d95b7aac915f3fa01632feb862c4751,c9523fac6ebac74f194ccae4aa151736d5c1385d,,True,True,True,21,29,190,3,True,21,Tests_passed,87de4b28745d7d06b89476de36e3a00891cf749a6af641094d0a0b42060dd23d,True,Tests_passed,dff4712663b33cd2a973726ca9a50144a76e05b16790b328c9448c3067a5a0ff,True,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_failed,796ea8d7be73534da3ae8ea253e24cf3f60033dd1c72ec9239992ad7fc7c0aac,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9 diff --git a/results/combined/merges_tested/mmazi/rescu.csv b/results/combined/merges_tested/mmazi/rescu.csv index 2c5765922d..55d96651e1 100644 --- a/results/combined/merges_tested/mmazi/rescu.csv +++ b/results/combined/merges_tested/mmazi/rescu.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/develop,aa57149a68d9810ab14bab6f46d0add4f3fdf1d5,4150dc3394dafa37bb2d1c3c1e7251bec88ba0a3,43fc334d373f4491c6307faa51015550957e4b82,,True,False,Tests_passed,e13e55b385618bf4553a38d5d51e55c809132ecc8f51dd471128c6a998ee837f,True,2,6,53,2,True,Tests_passed,389daddeceebbf1ac201d7fa8bca5544e1cfffedffe8fded2befe761d868efeb,True,2,True,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,817e1bec4c0ae650f9ff7cffbadef972e7edc235f0d8962dac37ebcd74ea84a6,Merge_failed,3cd8a9ec17125a19f3b10d769088959cd4512fa49793711eca70558ce1a7531f,Tests_passed,4c1790a3b570234774ba239a743a75b131f4ea4d49d65372e8130305fe6e36f0,Tests_failed,8a7ed1029ee1401cbd5fd7b58ad9b2ebefd0a8e96d5ab34d16cff9790daf7933,Merge_failed,3cd8a9ec17125a19f3b10d769088959cd4512fa49793711eca70558ce1a7531f,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,df63e84bc721e57deae694355ed472de5226c19a3e1b11199cee7e4282cc7394,Tests_passed,4c1790a3b570234774ba239a743a75b131f4ea4d49d65372e8130305fe6e36f0,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d 35,refs/remotes/origin/pull/100,efdd938e7a692b6e6f5cc759202a445f8c1d58e6,74f37e6c3fdaf31c8ffcb7562dea81b6cf48ef66,5b9ff524c314835010d92e74200a4f2f66377d3f,,True,True,Tests_passed,c82ab7e00366a2f9d675099d7d0af778474a762c96e95ac74c3b75684f8f38b8,True,11,41,176,3,True,Tests_passed,0fcfb9942c9e8f8509892a7db28250ad676b82fbf2727bda4785cb1f7ef402a8,True,11,True,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda diff --git a/results/combined/merges_tested/mmlab/rmlprocessor.csv b/results/combined/merges_tested/mmlab/rmlprocessor.csv index c431db8d5f..264f09bb4b 100644 --- a/results/combined/merges_tested/mmlab/rmlprocessor.csv +++ b/results/combined/merges_tested/mmlab/rmlprocessor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,707510e3a9c3a799e38a2933cd54e4688c0ad7aa,e011318d42cff62d34c224ad889163c38254cb5b,7fc95258a1ce664d978c90ea375c9ee0d76546ca,,True,True,Tests_passed,ff38e94a8726322f71be194cc8a46873dcedb18403a1a57a57cf1c70704a8712,True,43,245,942,5,True,Tests_passed,cef6c32a7d620ba45c9847b3b61719e9fc33db4993de3802e44f9678f4a705c2,True,43,True,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,a400a60516a7ee15ff9dc020de6f16ec79f219bbb9e0c72fc690e3c2faf137fc,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,6956031f2ef21c6cdef5265bcefd7d0f91f75ee96d1718dbad4da46574594a22,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,add68a5c71131c004e4c51921e931f11ef2f0696ce526d8cbc77588a05fc3e32,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1 5,refs/heads/master,af76241328ee4072ccb1c5c9d4f7be49877f1a9c,a1a65245725da56b16e3b55c2b71a78c15240698,2344e0e8205041fe662fc55b400b3cc71fd650ca,,True,True,Tests_passed,857f2e2c39c141c9a99d5498c132fb9cba2dbe021055ca7ba515c7975d067bf0,True,50,292,1952,9,True,Tests_passed,74b491341ff77b1f122061bb65b64129a375cdddab471a8c10a313b4922a146a,True,50,True,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,01764b8f2ba6a40ce863ab1d44c95707eea4ffd539af62d656602291c36975d0,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,9d7d433dc62a57daae3b8884bf73c243ace354619753d974934bfb9fd12ae5c7,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,78af17c4616a88544a5504531b06fb73ee54bff73da385f1832d79c96abb197d,Merge_failed,bdc56a9baee4e02d280ec71de730a53f1c1b6b0b7d05c18832a6da8b445b82cf,Merge_failed,e0d07332109d3905f51f3f64e9c0f9f9e5c7baf93aa8d739116f1d0465044751,Merge_failed,4ec3c4575962059b45e95d3d0b6e6f9b3109f62ecf6be1ba54b2655777ea7af8,Merge_failed,bdc56a9baee4e02d280ec71de730a53f1c1b6b0b7d05c18832a6da8b445b82cf,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,9d7d433dc62a57daae3b8884bf73c243ace354619753d974934bfb9fd12ae5c7,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,1fda46d2008388613d17401c4baca0808ab0d264954676956ac2e30f452c138c,Merge_failed,bb25e9c4c627787a735a617bf3e239c7be2634d46e867c5fcef79b38274197ec,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,01764b8f2ba6a40ce863ab1d44c95707eea4ffd539af62d656602291c36975d0,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569 6,refs/heads/master,d46b8c445cac62835aeffc0b74b41f69283fd31d,fbd8fae079642e775e53ddec4a82d5669401f1d3,23cb6fa36dea674d20821fb799ce3399a98ddef9,,True,True,Tests_passed,ed8f7de4f53e0885e695f08c66e8994955cb3889e3e513aa2e8e09bded5bf7f3,True,6,18,41,2,True,Tests_passed,05d0a4900b0b69fd57049d0b5bad200e4058549b7f9ae06b82becff981a17e95,True,6,True,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,a8dacc5380c01c82c3474a2ed06ac6d13a146c73881dc97cd2d4744e5a8f5e64,Merge_failed,da04b31ee9f6b0394738638490c81f0f0e983eab2ba95c4b13b93656590af990,Merge_failed,a4ef96788f2627d52a2cd69aadeb8a164f4c7a2dc2165ce8aa4c5f01037787d6,Tests_failed,b593cbc8f48e247031487f709dd27128a5715a6db94118098e71182672439b6a,Merge_failed,da04b31ee9f6b0394738638490c81f0f0e983eab2ba95c4b13b93656590af990,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,fa40786ce7bd6d81431e9274a1afdd63a20163e7aa76b388415f33a339cf4e1e,Merge_failed,a4ef96788f2627d52a2cd69aadeb8a164f4c7a2dc2165ce8aa4c5f01037787d6,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b diff --git a/results/combined/merges_tested/mojohaus/exec-maven-plugin.csv b/results/combined/merges_tested/mojohaus/exec-maven-plugin.csv index cc0d3ddc95..cab9c7cf3a 100644 --- a/results/combined/merges_tested/mojohaus/exec-maven-plugin.csv +++ b/results/combined/merges_tested/mojohaus/exec-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,93c93f387c6fdc03ecbd14b7e00f3e1903d435f6,60df0802b5c8b1e4ac6569ac23200e734c9a60c4,2a5ac5bae5da83c3e6b2fdf1ee70f8f517b58122,,True,True,True,114,108,934,2,True,114,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,True,Tests_passed,ac673ee00deb49674e16af53598dbf9fea9654111866e7134e05c438db87d53e,True,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,59585c32835f7b146158726a4aea2fcaea3d3716b80c0a2537e8e78335fe10a6,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,59585c32835f7b146158726a4aea2fcaea3d3716b80c0a2537e8e78335fe10a6,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829 18,refs/heads/master,60df0802b5c8b1e4ac6569ac23200e734c9a60c4,dd95d38b7a25ff819701ee61321f7d23e3e8229a,70cf02273f93aded10a1aa5def60491de6eea5f6,,True,True,True,113,106,924,2,True,113,Tests_passed,0f15eec956fcade4710cb2081a1521cd23cd6ecd3569e8af9ed9d3fec38a217e,True,Tests_passed,f1e8597ca2e475d439aef6cdd8d5697224360134ce25f768fde26f0369b6d188,True,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,91c7cebeddb20d8000c9599da935bcf55e13bb600f19a0b7871e8e6d48051414,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,91c7cebeddb20d8000c9599da935bcf55e13bb600f19a0b7871e8e6d48051414,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2 20,refs/heads/master,9c99ac931af4f406f8733cdebbc7932c0d28c54c,f717d716adbf032ba04df98f12103b045019ac29,df343858e21b3ff4bbd0855f858f0005f55b9a1e,,True,True,True,10,14,132,2,True,10,Tests_passed,0ca2637dee6e51cf844bf5313513177896c08f18e26b1a5f091bdc136795289f,True,Tests_passed,cd64809f31b8a9393612e90a3284142c976e6d6026c381d6f211b589c6fa9eee,True,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,2e2fd2c810b1da22e9f41d899106b6488011e8c98173a0c41eb00cbdeb7c3362,Tests_failed,d10b5f3b926ec2823765dc001dd857f229d77606981c2573ad700c3bea0757ce,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,2e2fd2c810b1da22e9f41d899106b6488011e8c98173a0c41eb00cbdeb7c3362,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539 diff --git a/results/combined/merges_tested/mongobee/mongobee.csv b/results/combined/merges_tested/mongobee/mongobee.csv index 3f76068a8a..3e34de295a 100644 --- a/results/combined/merges_tested/mongobee/mongobee.csv +++ b/results/combined/merges_tested/mongobee/mongobee.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ce9bd0364a434871c144294349f0c01130d1aef6,483e00c905bb7f7a561dfb3c026f12f786a63a97,e11a07181c998c4ec675516f2e768bd666768526,,True,True,True,16,103,325,2,True,16,Tests_passed,27c8e0c5c0a7d3968e527431b1609967e007a66eea9af7b99d15d32c6c972044,True,Tests_passed,9f602d2e38ddde7d92acd64ebbf15edb0ee2f5708039319ed3fa6577f9ffe322,True,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,8f91a370d6af0ef9d05db106383b85033e2685348bf4fb5dbe098de02a84f3f2,Tests_failed,5a517be295a3fe8b9593c91e82df9e2875e755df85dd774c8a61220ceb6f6e69,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,8f91a370d6af0ef9d05db106383b85033e2685348bf4fb5dbe098de02a84f3f2,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222 8,refs/heads/master,abf507930c55a2a4d918d70d5c3ff852fb5cbf5e,81176bcbef3ba6fa4bfb006ba4571a33c71bdbc2,f73e3dc7807a7a4daafde4fa720b6f4246670978,,True,True,True,11,64,592,3,True,11,Tests_passed,2c1a5f276ab626eba7700c2ad8e3724e568a77586b80c21a1614d9bde703dbf1,True,Tests_passed,9e00b2d19b8f69e948b4291cba5261ea6dcad756e554a824442f59e591e24e48,True,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,73db6dce3f4fe4840a549ed22ff1354966d58a311716ff5c4be5ea84c5b8aaad,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Tests_failed,7ca05e650490dddc4d2fae05c41677fedfc29748fbf0837522051458a1d4fb9d,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,6c97950040f402d72271451644d91316f743d6196867e6095434321ae23b7077,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9 18,refs/remotes/origin/pull/111,4215e59573dd36b437eca014fa3811a846dd89e6,87ca4d3fd25054c76ab8beb27f2f6be882c6339a,44f05a37beb8dc18f77ca57da9b5cf0edf114413,,True,True,True,15,77,1284,3,True,15,Tests_passed,c43189be123d91b7fc17148d26ad66b26d2b79219f231c4f252d22603a9941d4,True,Tests_passed,07bc0885af749dbc81237f2af798c60c8d54082945d2581ff70dafb768d8ae16,True,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,1cf913851a596f3e5e78bac2a2179cab4dcad53e4e7b95512b67b1efe8c1a340,Merge_failed,43b3890f79059e3ff73f8ae65e7972c98f914575fff3d35b4aabca846b65d9cd,Tests_passed,149d2c6b0a195103011848695e8f0deb33e7565ce1f770da6332d5211ca35502,Tests_failed,fe986adb3cb490d4ffea5d5c5ac8856b414f867cc1943c7c831800650f27f28a,Merge_failed,43b3890f79059e3ff73f8ae65e7972c98f914575fff3d35b4aabca846b65d9cd,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,7a27c3f1d9ffc0193168a1b42760a824278c7c2b6adad173c8c8a452af35d8a3,Tests_passed,149d2c6b0a195103011848695e8f0deb33e7565ce1f770da6332d5211ca35502,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799 diff --git a/results/combined/merges_tested/monitorjbl/excel-streaming-reader.csv b/results/combined/merges_tested/monitorjbl/excel-streaming-reader.csv index 14fbe02bd5..c34e4e579a 100644 --- a/results/combined/merges_tested/monitorjbl/excel-streaming-reader.csv +++ b/results/combined/merges_tested/monitorjbl/excel-streaming-reader.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,af775bab85e873e839c0e36f71c9dfcb830b54b2,1e3af68f6dba9fbee1ca7a6cbb94f1fd375d21b9,eea3b3aec39ca8bd74ec3e7cd39154695de5b82d,,True,True,Tests_passed,4ebfd4a6b9d197813cec1be2eb0bbe5e72a2cbaee141b9bf85ac5cb568d406d5,True,19,95,1378,2,True,Tests_passed,4c8de25debb4b003f8c30b5056c3920892454198f660e6013951b2cafe0764c9,True,19,True,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,226e5495c76d0b8bbb493a692e23fe104fc2c023c624678e1d070d7b4559bed4,Tests_failed,6c20123a713b83013123b26aae397d227d6189fec30feee2d8c703babf76f0cd,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,226e5495c76d0b8bbb493a692e23fe104fc2c023c624678e1d070d7b4559bed4,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5 7,refs/heads/master,7d81ae0fed55b297e0c7ad370ce073981a6fd102,ff42c34125920ba41c669acae3569f49d1d7b7e4,d835174011fb87873fc64fb0cc5ef06a9465b325,,True,True,Tests_passed,5f0de8c57b82e882ca593015ed7615ca8571a04bc4c0e91a65589c86f4fd3b85,True,10,46,274,4,True,Tests_passed,66b04d2fb59c5839488b7a8d63a0808ba716cc954de2f2dee459f603767efd49,True,10,True,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,1a2239ea5255c7854ee0a3ef2199e91c637bec8aed632210104f34c046b6df4d,Merge_failed,c7defa69fe8ee874cfed56a6bf6140e79ac4716d7b4da8bd9299889c96fb6c26,Tests_failed,0021d7b6d330c9b1a7796cfdfbbf0c8ccf876b9355999b22c86a957b40e8c36d,Tests_failed,df7202daf6d79cc18ec1eaae54372c97846ebb7e870cd32a9f3e4b8a8454a91e,Merge_failed,c7defa69fe8ee874cfed56a6bf6140e79ac4716d7b4da8bd9299889c96fb6c26,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,1c6897f83bee23e91a57b2cebc8e75439dce54799ad6ebcb8e5c1f73374594f5,Tests_failed,0021d7b6d330c9b1a7796cfdfbbf0c8ccf876b9355999b22c86a957b40e8c36d,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b 12,refs/heads/master,04ab309541f3cce3ae00d512edf23eea0077b34a,c0fa34745464fe5f603964b16e3bf80da2fdc3e9,3609c86c15c9f1d8e2cff662cf380dd19f905bfe,,True,True,Tests_passed,9183d0523fd14704310ea519381ea03020aeebea355801d31b78d2e2e3b3e187,True,16,62,717,2,True,Tests_passed,c106ed25826f7b62e437bb941afef3c172d72f27d2a7895aad8608c953d7ac5b,True,16,True,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,d26abaa700fa620f00bda4590b02bf5d218e47243b796a397126cc35a53489b5,Merge_failed,36ac7479c8bf56479a97d22de42b46f8e73ba2778687455097e53a2a4d30b3f2,Tests_passed,61229d6d77204bcefe72d6465efb35b70a71c97a5db99eca655d6f82a74cbf33,Tests_failed,fbd7e1d627621a5c2382df31cceb9185ee10e886fab32d123266ac478d883532,Merge_failed,36ac7479c8bf56479a97d22de42b46f8e73ba2778687455097e53a2a4d30b3f2,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,3752a02673415703585eff5f3f6429626e7a5167246b04042b9a14c7e5b7aadf,Tests_passed,61229d6d77204bcefe72d6465efb35b70a71c97a5db99eca655d6f82a74cbf33,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24 diff --git a/results/combined/merges_tested/monterail/elasticsearch-analysis-morfologik.csv b/results/combined/merges_tested/monterail/elasticsearch-analysis-morfologik.csv index c5adb1685f..bc14e66148 100644 --- a/results/combined/merges_tested/monterail/elasticsearch-analysis-morfologik.csv +++ b/results/combined/merges_tested/monterail/elasticsearch-analysis-morfologik.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,6024cb183c93a9bcde34205c97b4a1dfb3694ac5,6c0272594c958b201b17fd354e8b06b3f8008cef,e6694bb0f8433e24d3bed2c2a2c10e16b6b53eb4,,True,False,Tests_passed,0bad627e56221cdf7b5054b87bab687cd870efe747d1b9fc07527c8b64bf2e74,True,4,8,58,7,True,Tests_passed,c48d3da379b47b59f3ce0583e029d3557b679af0c333d74137f31bbaa524be71,True,8,True,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_failed,a1502ef1788d13bfeab8ddc7c01115025d96cf49468f9b6996910bc7e38868eb,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85 diff --git a/results/combined/merges_tested/mooso/azure-tables-hadoop.csv b/results/combined/merges_tested/mooso/azure-tables-hadoop.csv index 9d90f376e7..68feae5edc 100644 --- a/results/combined/merges_tested/mooso/azure-tables-hadoop.csv +++ b/results/combined/merges_tested/mooso/azure-tables-hadoop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f5ae55a8d5024fba05bd9a188ae18116b624a69d,8dfebe85856c3c8b151ef6c125269f017e4ff3c8,2d39177520998c04d9ae22cfe33364183a368d84,,True,True,Tests_passed,9e4249278bd982e5cf0c0fd85a3f35ec70961e9d195585c572a71834917564fd,True,15,52,251,20,True,Tests_passed,61bae1ae8066aca05420353b193b18f6b6a44366dbd625f0f341c69d1b411ea7,True,24,True,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,f1006de1c2c8ec5ac47f3e180e3985bf486bb53e2c869baf6e5752f15321e7a0,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_timedout,,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,2dd963750de0fa32ace1a65f5254f3f69547bf5da69647aa14e57621bcddc279,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9 diff --git a/results/combined/merges_tested/moquette-io/moquette.csv b/results/combined/merges_tested/moquette-io/moquette.csv index 722c9419fa..becc2ed147 100644 --- a/results/combined/merges_tested/moquette-io/moquette.csv +++ b/results/combined/merges_tested/moquette-io/moquette.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,True,20,45,219,2,True,20,Tests_passed,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,True,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,True,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63 diff --git a/results/combined/merges_tested/morfologik/morfologik-stemming.csv b/results/combined/merges_tested/morfologik/morfologik-stemming.csv index 25b231d4a3..4d9bbea9a7 100644 --- a/results/combined/merges_tested/morfologik/morfologik-stemming.csv +++ b/results/combined/merges_tested/morfologik/morfologik-stemming.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8d67ef792f7feebcc45f1c251f8fdd177d980371,abbb816a635b1471a19c50dc5b296b237981c0c8,b23517a11b4c6af7825b1abdaa8d6c0c68e13928,,True,False,True,2,4,27,2,True,2,Tests_passed,4cc6cb448444ef6d232bb7b3b45d6afc49c66bf17a21072d8cba6e9fe46b36a3,True,Tests_passed,6d3fcb57f9aa4a870da1c1e7fac47fe842f800a7181329872827205b4c6b999c,True,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,08a3740077158c38ab042e0793292a3e357979304abe4c9a85f355490ec0fea8,Tests_failed,d623e732333b5dd9b59cffc847492d28c65b812036856655d0cd2ec1f4f833b1,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,08a3740077158c38ab042e0793292a3e357979304abe4c9a85f355490ec0fea8,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e 23,refs/heads/master,ff3dde628c969e0d31cd9c0f3d845320e626545d,1a27128d9e6104f726032168c4b31e39d0d8556b,8c46349590627e869e00b42681c9c1ff5e79c4f1,,True,True,True,3,35,260,2,True,3,Tests_passed,9e6d8183cb58a04ac6efef887389378960a7eeb4a0165ad934bb84252f09dc36,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2 26,refs/heads/master,d9d8d5cfda86d4c83440209a82adb39b00303597,7e6734a2cdf26e0496b95ade5cbf7bb5acf5949c,3a82eead575349bced4b69ebbe6fde969dd9ef13,,True,True,True,12,83,2921,2,True,12,Tests_passed,2a987601f77576902f5af8f562fd44dceaea5d85bfa493a9edff3fa079bdf730,True,Tests_passed,11e94272be9aff1f14d56424ac303e06dc9120081acd19f8647484053299f1b2,True,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,9ee9c0e392a893b054bd0cd302d0fab4dcd71df30e1537471170811f67c2a9bc,Tests_failed,3b436f9dac3e061b5cc683888ed65970c11361a9dbb7814ff6c22f0d2b5ee5cc,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,9ee9c0e392a893b054bd0cd302d0fab4dcd71df30e1537471170811f67c2a9bc,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6 diff --git a/results/combined/merges_tested/moritanosuke/glacieruploader.csv b/results/combined/merges_tested/moritanosuke/glacieruploader.csv index ba046d19f3..25dc29d236 100644 --- a/results/combined/merges_tested/moritanosuke/glacieruploader.csv +++ b/results/combined/merges_tested/moritanosuke/glacieruploader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,cfeacbf6ce259d925301898491500214446bfa79,c1decd8574b90ca049cc3c1cdf35f71d9fbc270b,daa8e1c90e68ae8d880c1cd587e5536bf18d1dfa,,True,True,Tests_passed,ffe1246fbc2c46d1e69a57d15ea6d56e371ad45c6054b2e8777088e59d8b01e5,True,7,20,78.0,3,True,Tests_passed,8cb2c6858c9c1d7e891945e10645769cfa0c3d96f14877bdea2396720ffc63df,True,7,True,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,50726c021ef6f531a32297a28e443f3ea503f5e438438358031914093cdb69e8,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Tests_failed,e5bff27185dd5b53d61637e7cf77b071c6d291a7cfb9096a17fc9f871e81b39f,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,7b06c6aaccb5728d5e242cbc2a73b27832316c9b5a2b6fa6ca4cd3a84af9e732,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9 diff --git a/results/combined/merges_tested/motown-io/motown.csv b/results/combined/merges_tested/motown-io/motown.csv index 7b0ed90e41..7a494cf95b 100644 --- a/results/combined/merges_tested/motown-io/motown.csv +++ b/results/combined/merges_tested/motown-io/motown.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/develop,0208735508218488254ec01471e5025b1c2f97cc,f48ce44e8435ebb642994c7795002d01d4ea87c5,789dded2d8f15fbdd4d2955d662359327b773e59,,True,True,True,59,192,731,2,True,59,Tests_passed,23f1f47f71cb0373d0e0af67412dac4bace21b6f5b0d8f30b0e9a8af04324fdb,True,Tests_passed,464511e1c2853954081c786c2e930137c1b6bd0db74b2b1d25f445640358f892,True,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_failed,7ab40fbf4129d3e0f7f33e25592f37a7da439fde04fefef9c49f7bcefc3c1f3a,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127 6,refs/heads/develop,c2ad8d6d0cec1d5f43f3e7c9cb46afd45783ab0f,e50859054dca7a828dc5ce859438bf363f65c9a2,d33e1c9bb6a5e5e0ad7711a6f47075477893aa6a,,True,False,True,37,37,76,4,True,38,Tests_passed,3f7b1a149d9e218dc43654e92eea26a971404b178a64e0a2f5898d2cbc5ebc68,True,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,True,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,f7fc6e85ca1d7aa020d9f035228f3c02b822ae824d6778e1f930d906c25572a4,Tests_failed,e7dcd16481816358f5d1e87451f5c4b3fb84b21cee0215abdf72152b6b685a50,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,f7fc6e85ca1d7aa020d9f035228f3c02b822ae824d6778e1f930d906c25572a4,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05 21,refs/heads/develop,7466c1938e308fa4cbaf43d76dc50d12dbbd9430,e07dc68d00c93a4d0a05160723a76793db8f0ce0,efc0c648e3c64428193fafec3e5af8cdce93095b,,True,True,True,198,582,12599,21,True,198,Tests_passed,f7ef041b2f41d595a58fcc7a005eac48219d1f3e0e2f1d729f1e1c66a1f8f304,True,Tests_passed,14fd454b1d4d41be9943bd1bc1d9b921a728d37048cd234dd3614e3c97cf2c28,True,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Merge_failed,126594f5ea017f783fe657c9f9463454461635e0fdfcc279362800e39e4f201c,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Merge_failed,126594f5ea017f783fe657c9f9463454461635e0fdfcc279362800e39e4f201c,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141 diff --git a/results/combined/merges_tested/movsim/movsim.csv b/results/combined/merges_tested/movsim/movsim.csv index 313505c592..081425d192 100644 --- a/results/combined/merges_tested/movsim/movsim.csv +++ b/results/combined/merges_tested/movsim/movsim.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/develop,aba5102173958664af92232b0a401a4b7614a667,266480659a4cb29b060d84c28996577c6a5bc0e5,b2247f76c2085082f185f84d5e47d9f3d2ceaac3,,True,True,True,273,1324,12980,21,True,273,Tests_passed,27248b5434b91c79011f0c575dd579a81b44ca5467e81b66dd878e267a4b12cd,True,Tests_passed,4a45026dde1836226ebf625faed4de3e05d79abd31a1ce278ea7e53b091ed111,True,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,56874649a17103a1fcd9a81569a0fb1d649129e3dd07f514154d6b3248b5508f,Merge_failed,386faf560dc7947468cbfcdcb02b61c84e51edcf2e4bd0eae36a845003d3c533,Merge_failed,924e862d56a000e02a3cc6ea4dc009845f8aed8eb3bd20c788d0a78685a8377b,Merge_failed,7730dc9fcf56f3df83224ab27db6db84804e4ed1740718e6736406f39cf8dfe4,Merge_failed,89e8c661142694b32957c8924c69e265a32241259952710807dd0d0194bf8766,Merge_failed,924e862d56a000e02a3cc6ea4dc009845f8aed8eb3bd20c788d0a78685a8377b,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,56874649a17103a1fcd9a81569a0fb1d649129e3dd07f514154d6b3248b5508f,Merge_failed,4309c5a7cb9096aa7d0ee8fb3f000374aaab064226697681c80672465cf932e7,Merge_failed,7730dc9fcf56f3df83224ab27db6db84804e4ed1740718e6736406f39cf8dfe4,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a 41,refs/heads/develop,a06535791e7eea9149a5dd279652391bd0cf4b5c,51e5bb8b29c0520339d82143530d50c59145fb3f,3fdcb6bdd99b2a6f27cf52209e113705e4144091,,True,True,True,135,575,5235,13,True,135,Tests_passed,ea8e761e0105311cd89651cb5487f4c52748f17396d82f926744162612cea1e0,True,Tests_passed,ae6c6e32020a5565cb2ad36e942af33004420d31164e0cb9be6607959e49b97c,True,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,a49b73dc11f3c79cdc947629acd4245a3da633d0bb9c1f4f8efeb25332d85050,Merge_failed,f54908d1cf4667fb0e9fbf795c333e8fae7d687cfd5b2bb59016b81d6b23412f,Merge_failed,de26aea8f7f53f495811b9db3f429e83b57daa3f71f9032f993b2487066827d4,Merge_failed,ed0639e8c8a732efa71e307abeb6e762218fe19bca467d590c83b1184de2708d,Merge_failed,f54908d1cf4667fb0e9fbf795c333e8fae7d687cfd5b2bb59016b81d6b23412f,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,9ba91641cb046fce90de29364a6be1ea95ea99e56ddd4b917f1bf27eeb144b22,Merge_failed,7f6039f9c0f1212888cc8b1687992e5a470c9144fab6b9b44c1baac5938c0272,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3 42,refs/heads/develop,51e5bb8b29c0520339d82143530d50c59145fb3f,36e886fac1939df3a8380e13bf3441399a172e5d,8752db9023e17442dc8889dff010f6859bd651cf,,True,True,True,103,600,5253,8,True,104,Tests_passed,2d79009533df7a2b73da0ee270cb70b070e2cb0fc1185fc2d3b6d569f84f3887,True,Tests_passed,cd606817be518cdae18d31873ed25e5da615ff8b95c5021488fad64dd70ecabf,True,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,82b8c7850dd7600f1258298b7ed69f2c4f454033e1d568d1a83edf921f65bcc7,Merge_failed,a406a05c2cb14bc31375d539207551dfd5f074571ab8b8972216b663634f7546,Merge_failed,b99f3b19c1c9d4f2ee9d23aea2a565c3871c7cfc80a56a5ebcc57cd94e389c7a,Merge_failed,8c8ec5bc47447627fc32c5ae5b2babb85fcd95f1303796391c81b5bae8ae7875,Merge_failed,a406a05c2cb14bc31375d539207551dfd5f074571ab8b8972216b663634f7546,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,3219f01d4c1cd14bca1b63c984e9713b69bd13ed6edefda1b5f5cf119f82d3bd,Merge_failed,b99f3b19c1c9d4f2ee9d23aea2a565c3871c7cfc80a56a5ebcc57cd94e389c7a,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc diff --git a/results/combined/merges_tested/mpatric/mp3agic.csv b/results/combined/merges_tested/mpatric/mp3agic.csv index 6a25393966..3a7c46f780 100644 --- a/results/combined/merges_tested/mpatric/mp3agic.csv +++ b/results/combined/merges_tested/mpatric/mp3agic.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,242381f1e929b2c6feda45c6d5ed142257e160a6,8a866a889070bb23420aeb0315d327c659fe60c7,59e11d2bc119538b17b4400a35224be68b095c4a,,True,True,Tests_passed,6eb1ea6b089cf35d2a0b436a1294a8103b722b6bcf1a8c2086a43de85589c38c,True,9,35,149,4,True,Tests_passed,3e722599b73015a81d1ca4773f849079b21a5e9159523da320891a220ed64c26,True,9,True,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Merge_failed,cfaa9eadbc75d803d80a7d91fe22802610d586b23fe8d88685f9ac705197aa69,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Merge_failed,cfaa9eadbc75d803d80a7d91fe22802610d586b23fe8d88685f9ac705197aa69,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279 20,refs/heads/master,446353b8eebf05bb653a17e1d326a2f0d2ba82a4,b8f18ab448b131ef01eb7a23e9d078ef594218ae,ff596131531ae8cebadbf1c827a1bd4f449888ce,,True,True,Tests_passed,b3024ec13bedc96ae0b33c4ecd79a18151e09c50687fae1f0d26b43e0fc60448,True,8,85,437,2,True,Tests_passed,8b46d1842e4d7a58a7c53b1dcefb183cd7d50b9dc4e1bda69d385d78bb29522e,True,8,True,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3 28,refs/heads/master,02a6d6c97f6b9f53c7f8f775c4fcfa0c4d16d31d,e9ea8d3abd372864277262af41c9afdfd9e59deb,f7145f5a8aab67a63250357c200ce755f01636d8,,True,True,Tests_passed,bd7d7bd7b42993265091d5235435c4f4fae8166816ceb4c818ccdc48fdd731e5,True,36,48,1986,2,True,Tests_passed,bb6e6bb701380d236f90ba1b8cbb42f8d5b3fcdd13a821c1a35180ba801225cf,True,36,True,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,f7f5c46f551b8213f1bd0e02dd7c7422d5b63933d16b7bd9e998c75dd93f3e62,Tests_failed,84e45f05f900cf510f2951edb1f880051f834f8b8a5156b6e69cce04e183dfeb,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,f7f5c46f551b8213f1bd0e02dd7c7422d5b63933d16b7bd9e998c75dd93f3e62,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0 diff --git a/results/combined/merges_tested/mpusher/mpush.csv b/results/combined/merges_tested/mpusher/mpush.csv index c2385284fd..f90b5b5e56 100644 --- a/results/combined/merges_tested/mpusher/mpush.csv +++ b/results/combined/merges_tested/mpusher/mpush.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,91f53706e07a00c446651504e159dc2e57e41529,023070f34e19c0dd95b8a51d6031890fa3b228a1,d0eb910c134b78ba10234787e4e1f25f7848f618,,True,True,True,157,526,6059.0,6,True,157,Tests_passed,7af88af7ea4ad29b4cb5224bb1af86ea2bbdc6e72029dc1a891a45daf27cc4f2,True,Tests_passed,6709f5887369438a26917b6a41c20673598c3b97e2f70708f32437f38762fe68,True,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,05697a882f0dfe1c982eaff2eb9f98bbf4d3e42dafbac44251e76d2374e372a6,Merge_failed,a37a85627970f56dd52814689526fc4f0226bb2ef3e92e9d5132db0c3b92ddbc,Tests_passed,b411682e460252d0820da3b8780dab440dc514107b2dc26214d241095f2f8b64,Tests_failed,9e08a03c79f7f3caced9ed8f367e3e596d67a8c3a3d822c92c7195bbb144ef0e,Merge_failed,a37a85627970f56dd52814689526fc4f0226bb2ef3e92e9d5132db0c3b92ddbc,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,62c164324093238fedb376be8b5b0937f2c95ad1d1b95b4b1be74e784185b62d,Tests_passed,b411682e460252d0820da3b8780dab440dc514107b2dc26214d241095f2f8b64,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227 4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,True,155,580,6042.0,14,True,158,Tests_passed,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,True,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,True,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,368a9aca43a4d3394a97290dc99d9c9849ff8ee326ade7aa49d897ff7175d56a,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,f546853e6867d5c80c380fa86e49f3154eaf9379de386ecf352fcb41e6fadb34,Merge_failed,973d7cd413cd19c967ffb6e3dd6d4469893b6450eb78bbc84e27d81c8f46660d,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5 5,refs/heads/master,07fd8670acc7a57964abb915d5ca5f7ac52fc274,e84d313a85ea601c12c561de042d82d18e161d14,d3cb4cbec18cf668c3b708b99f5bcb9b5dd8e330,,True,True,True,96,274,3165.0,7,True,98,Tests_passed,84c6c06ccb5aa201bb5a8d34e1bf271e707bff2ded7e2cb57b9c0c1d176ac955,True,Tests_passed,cb1a73359b041300f02fbed05a04fe8bb2e5a864d106eb8cb0593133a7bea844,True,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,c9b98b1c5eb29a249fcd9d4e3f6193b80c2d0b2a383beaff120c4b48fb24409f,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,b672bab8fdfcf33a8ff1d916b23eb2cdc40eeafecd73b2d6b3dd3b5daeb5a297,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,a3afe049d26f0fba1c7a419aebce316e4a0452550e437405a2f3f0830d5c0782,Merge_failed,ab5b853ee0dc6e6cbcee656a0472496c38815c82d452ad54465a4cfd3da30548,Merge_failed,b24d9c55e0e1345d4db212df958bf9c7d604ddbd0c25080b703800eacfbe064e,Merge_failed,4c646bd1bf2b4945cdeb66cfcd5d286f58b72ac65a23fe7b9b551c589928b922,Merge_failed,ab5b853ee0dc6e6cbcee656a0472496c38815c82d452ad54465a4cfd3da30548,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,b672bab8fdfcf33a8ff1d916b23eb2cdc40eeafecd73b2d6b3dd3b5daeb5a297,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9b0549f930d78bb1db1d7660353b207cf8a76d45a9bc12f4b461631ca72bc988,Merge_failed,b24d9c55e0e1345d4db212df958bf9c7d604ddbd0c25080b703800eacfbe064e,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,c9b98b1c5eb29a249fcd9d4e3f6193b80c2d0b2a383beaff120c4b48fb24409f,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68 diff --git a/results/combined/merges_tested/mrcookieslime/slimefun-3.0.csv b/results/combined/merges_tested/mrcookieslime/slimefun-3.0.csv index d6278dfcbb..f7d20aa925 100644 --- a/results/combined/merges_tested/mrcookieslime/slimefun-3.0.csv +++ b/results/combined/merges_tested/mrcookieslime/slimefun-3.0.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,6a34470b47dc32ca17866b68a4cdc67fe4875e91,361c83fd73553341c18c9875cb0e204070aee4a7,68edac523e1a5963d824b7b827800345baf61b45,,True,True,Tests_passed,d8fe4555513359844171ab93850a6b5bb18b3ee5ec8876fcec9e6710b0814875,True,182,728,4166,2,True,Tests_passed,37dd72d0d71efcaf80b3d12b3677cf50a5666999a5227d4324048036c327b6f9,True,182,True,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,04ad673d02524c0730475fe7fd95280426deff10e545bcff6da0d09afbbf7c16,Merge_failed,2e05991620a701d6a1681d149a0446bdb58421f8994e11ec279b8d7cd2bcecef,Tests_failed,e013dc84bc78b6aa2aeb28087854addfa6e3f738e1d67cd44c885fb62cd9f7df,Merge_failed,6af6f2da397fccf78226b651cc3dbfd42e5d62ec601ead9603c3ddbe70a7fa30,Merge_failed,2e05991620a701d6a1681d149a0446bdb58421f8994e11ec279b8d7cd2bcecef,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,fc637b066de2ef197218a0eae845325f734a78ebd11425e02d33f316c9f01150,Tests_failed,e013dc84bc78b6aa2aeb28087854addfa6e3f738e1d67cd44c885fb62cd9f7df,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421 17,refs/heads/master,f2fb911ec2a276c022ef7805dd882597b880f0e6,6bbf46b1d91f217c08aeaf6f954c5b970e4eef31,1f407b7a8638d44342b06c54b509577ec110c4a7,,True,True,Tests_passed,56c849e539e06c16e32c61b7530901baeafd8e51614e4ac9f537eeef4d609c6c,True,210,767,4889,2,True,Tests_passed,527fcb0259f1dd91b70aef557fff2c874b31207db467825955e7142fa0980b6b,True,210,True,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,c002946b67c41b9f5c3f092cfa3905c55211aa86f583ef2520975e64b5f827ed,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,c002946b67c41b9f5c3f092cfa3905c55211aa86f583ef2520975e64b5f827ed,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3 47,refs/heads/master,a761ab919462147969afc249dbdc7b02524e51a1,5c81577e4d788bf69c39276fcf41023d303d464c,91156fa0d7fb9c2c23f986c39dee3b6be6692975,,True,True,Tests_passed,b3b77b853b3683d25816e9c87f8b31d0e469ba5d84f0c8127047fe40dcb311a7,True,90,241,1671,2,True,Tests_passed,27109359d7b8b211985de1136064f7645f5c66034421cd99b015e50751f88c35,True,90,True,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fe5f5051db4b28c63d9bbd33e5bd93f27d118cd35de856d7681f2c5469a06549,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fe5f5051db4b28c63d9bbd33e5bd93f27d118cd35de856d7681f2c5469a06549,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1 diff --git a/results/combined/merges_tested/mrice/license-check.csv b/results/combined/merges_tested/mrice/license-check.csv index 635ee04d5f..d847aa28e6 100644 --- a/results/combined/merges_tested/mrice/license-check.csv +++ b/results/combined/merges_tested/mrice/license-check.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/28,df4be32c0a82130293069c4cb3c69fa9f176241d,6f1e7823726ea7d7b3113f534fa01982984ccc16,373dd8516ce2531960cd609ee036b038c16d6daa,,True,True,True,9,61,1247,5,True,9,Tests_passed,7d8a2df5668fdd55bb7f28f3e1471ce43c384034864632c694995ddfea24dac0,True,Tests_passed,42aaa63971641451dfc7fa4cb319e2ae3d76bd21be83b5d7b3650d53750e9f3d,True,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,e9ebdb3e3b7750d9a8ccf4e7ac566f3f673633a662dc86abbcb800bb95c86651,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,74d7bfcf570b980f4dac61b819ee9913b80d467906982b0406929aae58b9c055,Merge_failed,9abbf9542a2dc59f0c384dda028bd06b2ea651e4b1e7e5c528492a59d2c134a0,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,a5e435b61f1a4a6583a29d5e94223e89db33279fd5ed730f84a684ccfbc2f1a0,Merge_failed,d40d99548df6d3983bb807922e572dde5fac64a4ed15d975363fccfb4b08e992,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd 9,refs/remotes/origin/pull/28,3f339e29eda87a55f1565e326f866b185982f394,87cf4deeadb0c0503eee6324867469f430d9873e,3f5ce440b26e7ddd9ac9eeec518f43571bf298be,,True,True,True,2,16,67,2,True,2,Tests_passed,34c22d57c2c785198e87af66dd02eed687f4c6ba85a4d407cebc7b4586cea810,True,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,True,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,4e42eb6e346c8560053684ebd7146df928b7c7d13f83abf21a6f97223edfd413,Merge_failed,7e0803aacfa9ca1294f65e873bacf1bbc477e70ed851bfb503111006c37f8092,Tests_passed,90c787d7f8d9b24171ca26903eee57d6bb897233ac1cbef2f8a0334065ae9791,Tests_failed,b3b7c7f9043d260e261266999441b1d5af83e41fb9786bf42d1a082818a14a96,Merge_failed,7e0803aacfa9ca1294f65e873bacf1bbc477e70ed851bfb503111006c37f8092,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,4a46a06fef9ad6b1b1772c6ed556c76c57f05b5e462c083b8c0b4cb723330770,Tests_passed,90c787d7f8d9b24171ca26903eee57d6bb897233ac1cbef2f8a0334065ae9791,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc 10,refs/remotes/origin/pull/28,3f5ce440b26e7ddd9ac9eeec518f43571bf298be,5119f171ad14b56d6215a5ac2b1c3a2bc348c1e7,fc726f5e6df929401618abbce28bb25f66539dfa,,True,True,True,4,16,57,2,True,4,Tests_passed,b981042e47cffb04ea81a3f2be2c5668dd4ea1af4aa018bd43bfccaa414b85ec,True,Tests_passed,9bedcc14ece21f56db8c070475f7232cc8be185a150bea10846a6bdb1df8d6bd,True,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,4bad1f7d0e547d7c3d9888b6b483c4094bff4d6e6de93177f47b4be68c79da10,Tests_failed,87cef6d7dd4d524645842bce2dffa07ce20c9a1e454fd891a10d10d4caeaedae,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,4bad1f7d0e547d7c3d9888b6b483c4094bff4d6e6de93177f47b4be68c79da10,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee diff --git a/results/combined/merges_tested/mrpdaemon/encfs-java.csv b/results/combined/merges_tested/mrpdaemon/encfs-java.csv index 07d5383a03..c5beed7493 100644 --- a/results/combined/merges_tested/mrpdaemon/encfs-java.csv +++ b/results/combined/merges_tested/mrpdaemon/encfs-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,bdee7ef4faeae5943a8d25ed9eb48be4d97f7cae,31a551c0db99c6797ccbc368f8a81ae7b63d61c9,bf71a245940d69cf408659e03d9ec701ac0d686e,,True,,True,13,48,,9,True,17,Tests_passed,d74264bc6dc3c1f7c4552000544703d378a029b2bbf5bc4946126886445d47a3,True,Tests_passed,f020afa7d60ba22abce5393485170f63c7145c8a7df5165648498db762cf012c,True,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,612e6bed8c44147eacee0a89ec1517bda81bce9cbe74c22c2069adaf4ed3bee8,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,ce51a5946f02c5f94bd533c1999f568c7715e878feb349fb46a0ff8124d68d29,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,7bdacfb14847a54a0d6e6c503f2cf7748f4bbb005875b692c3ea65fa90ca2997,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e diff --git a/results/combined/merges_tested/msopentech/azure-activedirectory-library-for-java.csv b/results/combined/merges_tested/msopentech/azure-activedirectory-library-for-java.csv index 06a36d8a2c..5cd82cdbbc 100644 --- a/results/combined/merges_tested/msopentech/azure-activedirectory-library-for-java.csv +++ b/results/combined/merges_tested/msopentech/azure-activedirectory-library-for-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/dev,53c23385021a85d70a01bd4d40636e461df286bc,6bd171718cf75f2390762116b23a1d6f6a6f995f,28c39226a7eca10fcdc86f0bc64ec861a1f6b826,,True,True,Tests_passed,12f7960f476cc152ddc8772c3ea21b5fbd0d3afc24da9d5adfe1ff5e9467f3f8,True,10,36,233,46,True,Tests_passed,0fe66af89384be180bb941a98daf91c0310ed3533e39ab208e6a088f12ba96f4,True,48,True,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,095e726cf7f9d91b4ee52c3387671b49ff1e0b97f1f6c9c182467335b95e37ab,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,0cf2c575756ffd23261ae20997f10bdd6e8ace260755b1f47f20ea02fed6b708,Merge_failed,a8c77def2f77f785b8c8709cca359d2a4533ae9fb46e0bccf3cb20c89caf5f8a,Merge_failed,94daff9e61eb3603cbc9c1a4054e2a45f625ee2bdec5d2a3e599f2479b15faa0,Merge_failed,713aff00b575d40b89bbc3e5dd4fbd6e93c5282eb1fbfb3723c9f4feaf7dbb96,Merge_failed,a8c77def2f77f785b8c8709cca359d2a4533ae9fb46e0bccf3cb20c89caf5f8a,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,095e726cf7f9d91b4ee52c3387671b49ff1e0b97f1f6c9c182467335b95e37ab,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,0c100f96180c929d1c29fd1d3a8d2bb307bfe005f2a5c1bc2208d2feb459e71d,Merge_failed,fd637f972f6105b521aebecc38923646817567f9d049e0fca4219e0dc77c88d6,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d 28,refs/heads/dev,48bdc8500618d5452013a4823bc8ba7a85515986,c8286c6389c70d2033e8ec7a35fa7ccf786cb1b7,663b8bd7b8b90d8af9e04b363d4f98d080f20f4f,,True,True,Tests_passed,c96e970d3253b313b108b25d2e7ca3fda79bf6266f00605777b75ff0de8d54d5,True,46,188,2646,4,True,Tests_passed,f5e9a243ca812af2f41770b5962f4b02ba899b5602a9d25f390b402a18cb3cb7,True,47,True,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,59aaff5477cab1f197121b5d6608279c57ed6d869ab502ba79d5c16843f7c06e,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,4952e1cebedfff4c8947471801f592badc7a37e7a34b2f0bf8b0b14a547c5ded,Merge_timedout,,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,e256c02bc7a86b5338835e8245c9bb737cbb92edf03c3af6fb15271f861d0f9c,Merge_failed,402ae7d4e0228f680882ebbc286287b619375e595bdc9ed8d408a8a64f5711d7,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b 29,refs/heads/dev,ee1814c0ac36dfd7d0ebce404b446f5e02b76a5d,14c567ed46797dce0f8b6ca902a48718df869951,f6d775d5f5f0214f92878f5fccce6a99706fe5cd,,True,False,Tests_passed,cd13117767f6c627eb3b7559fdd1cbee26fbd22c1590445a110fd708e7c8c0c7,True,4,7,18,22,True,Tests_passed,2206f21f589e63424fe2dc371dcaff3e1ba36af280aef40c759a126dc2b3e453,True,23,True,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,44b1b3d8c034b107032ecfb1ddfeb793958531dd30ef2251910acbecd1716438,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,569884d3a1600c7f11c9734e5891059b3b4a00307c24c8299a8c51a8d0ace3b3,Merge_failed,22efdcec4e7afa2912d25eba54ff4f3a7a88c41e9c31f1ea3cd6f3e3e4a81ad2,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,6725026a9e75251485e8470f332d70a9d11ff4affdabe4b31eb3c1a2875e06c4,Merge_failed,b61e169e101a29838ee9e73aed8a56a3be88e03190f253b884be80ec1c24fb0f,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529 diff --git a/results/combined/merges_tested/msukmanowsky/omnituredatafileinputformat.csv b/results/combined/merges_tested/msukmanowsky/omnituredatafileinputformat.csv index 3460faaed4..3c7b839735 100644 --- a/results/combined/merges_tested/msukmanowsky/omnituredatafileinputformat.csv +++ b/results/combined/merges_tested/msukmanowsky/omnituredatafileinputformat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,44aa839e687eccffddf79772f186de581646b9f5,ba3fb170040f29dc002f5b7e4f393b106358c404,dd40c2076fbf3a7fd6f3d732ba864b09b58b1b46,,True,True,True,7,20,39,2,True,7,Tests_passed,68ebeae518531d431c7f3ce6d9a22bce14196b040e0785c32ed7d0a1cac9f134,True,Tests_passed,7a098a87b1757f98ae3d2774e65a801f5f365b303836841954ce1cd66166748d,True,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_failed,67fc18cc829410a28a6f21774e7ad77c7ed4e8de61c35d07034f7f5d04eae926,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546 diff --git a/results/combined/merges_tested/mtedone/podam.csv b/results/combined/merges_tested/mtedone/podam.csv index d42b48081b..410a0345ea 100644 --- a/results/combined/merges_tested/mtedone/podam.csv +++ b/results/combined/merges_tested/mtedone/podam.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,cf0ef51c1bbfd1e3620533aa091a4b933a025977,5b15d635e3a8cc791b16f7664c0147bbb20ea54e,2b0c431a5817a9381690e50d13203aa5f3c3fa89,,True,True,True,7,17,72,2,True,7,Tests_passed,196d1dc551efa3603b916b1ff946b200b379acba1b49378e95f536656ac3059e,True,Tests_passed,1dd25c85b1f5b06dd5c6c73ed861b968fbaa7e2fb38bf2dec141a1547d327cfa,True,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,e83aec8be6901291fdbedd70f823f103c39165efdaebc94506963b0f56627d0b,Tests_failed,d074c70b3094a8fde55a3ab10c572c4079ffc5271380e3dd1d52442d4f908a8f,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,e83aec8be6901291fdbedd70f823f103c39165efdaebc94506963b0f56627d0b,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe 22,refs/heads/develop,fb3c88ce41b3e3886c1d26647da2b911afb4d9c7,9b2eec284f16188aff36bcf1a67bc2f90c457cd1,9e32dad461de38d8c01db6874fa3e4f8878b557d,,True,True,True,11,133,702,2,True,11,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,True,Tests_passed,18d2814ff2da9ed23a940f43a09e465cf0251e594add0935a726e4ad6805b41b,True,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8 23,refs/heads/develop,9b2eec284f16188aff36bcf1a67bc2f90c457cd1,284048cfbda97497b55bcbdab9a8823f6ac2ed59,c92fa88d1d1ae5aa2986472c27743ea3f6d90562,,True,True,True,11,137,709,2,True,11,Tests_passed,f2aac968b8f3d2864e7fe27bacc8012c63e847bc6528da944ab73b7250cd9cbc,True,Tests_passed,18d2814ff2da9ed23a940f43a09e465cf0251e594add0935a726e4ad6805b41b,True,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_failed,f3ce53f58d022bfdfc35daae1f80d6bafef52c05c5ba07f936ad36986f38c43a,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8 diff --git a/results/combined/merges_tested/mttkay/signpost.csv b/results/combined/merges_tested/mttkay/signpost.csv index 409560d396..1d1a97e799 100644 --- a/results/combined/merges_tested/mttkay/signpost.csv +++ b/results/combined/merges_tested/mttkay/signpost.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,3db54f4931b3d3afcf7b7400426614c40e58ec4c,0e81fbde2863d3aeab9a2cfb3bad75f48a1686f5,f6f8b4904baf3f335abd3428216c364999ea82cf,,True,True,True,17,51,381,6,True,17,Tests_passed,f9f3a4d35b2d77cbf9b186932e0f8bf47f07b8c8fa31e457efbe77ae2a28bcd8,True,Tests_passed,27746c62cf63d432a3c57d0cade969e5d1c64f6b6bfb99838f215020afe28bdc,True,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c83358a5470cce98cabbfb8217fcbb0e24613e9b42fe2813054fa971eb2517be,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c176630f4289e6d1d18cd519b933b7e2da3380a264b724f40da5e4c551f0dbfc,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,0aff3abebbd22bcb515ea093475300437f564fcf01051b174965cb06b2c651a7,Merge_failed,6c18aab44777f615a41cb75d5bcf18261f6d69d75308597b56b4373dc7974bf1,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49 diff --git a/results/combined/merges_tested/mwanji/toml4j.csv b/results/combined/merges_tested/mwanji/toml4j.csv index ce6085bd6f..0c8b593125 100644 --- a/results/combined/merges_tested/mwanji/toml4j.csv +++ b/results/combined/merges_tested/mwanji/toml4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,16915c8edb83ecaa709c267c05e2272c24a8fdd4,dbbd2f5e0e34be9a47328c8cc6b9dc2b889bb5bc,568a77b1bf7f01333399f8a6bc21780ae741f21f,,True,True,True,6,20,135,3,True,6,Tests_passed,80e81e1f51fbcbf5761105ba5d0f61c828ddbbc3e95a5703161dd9ce3c1c53af,True,Tests_passed,afc613d5006d797d74ba2031a25cb6a535de99a0bd551d05fa7eaf891d9a5968,True,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,22374f407dd827362d1912467193407b369d60806536e54f6c32025145996e8b,Merge_failed,41645d46ded5b14361c63cccd725e1292c364b41f0b671209affbc0f99cd8c27,Merge_failed,6febd2a6c01df16d70bf7d54ead291d1f0eaad20a1955874a9b41877f9fa99d3,Merge_failed,6b8bdefdfa076b5d15b007b5540ebae01579e92008519e640f2987379811d3d4,Merge_failed,41645d46ded5b14361c63cccd725e1292c364b41f0b671209affbc0f99cd8c27,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,0a94ba4eb34ced27c7e23a76403c4735106e63f22c11008b7e4f6dcdc5a36835,Merge_failed,6febd2a6c01df16d70bf7d54ead291d1f0eaad20a1955874a9b41877f9fa99d3,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc 10,refs/heads/master,f8f55a6f16602fb21f3d44c45744e719ec808e2f,e7d7de7ae5d5a0b7e6d59e095d4ee9bae829ad68,8571d258cafb004ddb73ea22ae9d620b7310f20b,,True,True,True,27,59,1234,3,True,27,Tests_passed,53009c36ff12b528f2d397f15d0c3e574d09557685bc4131ae3f74b16b0c2d9a,True,Tests_passed,993b37a673e4fa19f2752d54fcc7c2ea74cdbca098b2c80b5eb7d4e1a26f7424,True,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,2c017bcc7eb08fd78fec779fcd957f1eb7465812698d1f78c2bdafee0a8b11f8,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,2b56c54259855b4ccbb5dddb5eeb92d1e688447dd7d1bf75e7309fac444ea4e5,Merge_failed,6bcba85ea79a8eb5fc9d5c67a294f1f219ea4b96994cf305daaaebeb8ec57a92,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,4267ae59207d42c3a6ca2e5eaa7cc03677135068fd2a02a4768317244d0e37a0,Merge_failed,a0a01c2d95e6f5803686f28b3c8b539e0f94a60d222cad153c102d551bf0d1c4,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc 14,refs/heads/master,a3edb55e9c0c40f0620c3b8c4480864a2f07f46c,4e22176f1e4472fc6f3b9dae134eed26300b20a3,9093fec59bb777c4795ac89b292e465aa25d70e8,,True,True,True,37,193,2307,2,True,37,Tests_passed,69192e456c702d2b22131f73ef40f9ffba4f0baf04a30b73ea6d811e6153f22b,True,Tests_passed,148bf70b2ed696110d4ea99427754414b08350cebcd99d78aa0c379db409a625,True,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,eef84978b40c9c4f67afa92616144b8a093042f07b58bd2f034c35c18f96fda2,Merge_failed,61674ccac6c854039e13cb8067a65c8d4cf238db633e38e63499ab63688352e1,Merge_failed,d7475c6833eeb135342ace3882c8d5444277fa85af191f0e2a21cb3cbf992787,Tests_failed,411e136e87132ec26b2e9eb6da438bcb19f65e92a6cc911fa0d9c0a9d8a3ed24,Merge_failed,61674ccac6c854039e13cb8067a65c8d4cf238db633e38e63499ab63688352e1,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,9ac423617dc0f35ec1f7c340120c47239f2367f2c837c9b552cfd7ba3cb035bb,Merge_failed,d7475c6833eeb135342ace3882c8d5444277fa85af191f0e2a21cb3cbf992787,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3 diff --git a/results/combined/merges_tested/mybatis/jpetstore-6.csv b/results/combined/merges_tested/mybatis/jpetstore-6.csv index 5687c5b213..19d9dcaf24 100644 --- a/results/combined/merges_tested/mybatis/jpetstore-6.csv +++ b/results/combined/merges_tested/mybatis/jpetstore-6.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 545,refs/remotes/origin/pull/637,33dc73ae76460d3a00823c2f4089ee1f5f07a4cb,5fab2433fbf9bc2dc9146d6b5f1c93934c31533a,a86cdece772d44deffac693e66cd45bfd2a8fe38,,True,True,True,14,35,291,3,True,14,Tests_passed,4a4f5b7070c8d1bfb108df09e34bbd5a7c191bcfde2cf2ede9e50ecccb6f5c85,True,Tests_passed,f5eeb9d8dc75c866593936e4dc56970fbc36b7a2750278c4fabb098f7efe56c7,True,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6 548,refs/remotes/origin/pull/637,b26b0c87017c0f2ec431ee0a1425910b9a9fff00,3c5d4b04254c9c898b2831b458a02b6f8c277def,f3362fe251b6fb468e0159bad8c36f1fd5798a3b,,True,True,True,16,42,323,3,True,16,Tests_passed,e2df62e1bcac35ae7304c1745b17150b6ac2d9c1be03ff5bf22873ec52943079,True,Tests_passed,136cac0b81ce395b9a3937d4ee18a60e4a8928044a6c8cb32d4b44508fd3b882,True,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,09e940465b2e40279da13647c02056a37d2aa82c65200b4fc4805e9f69250102,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,58df953bc4f7dd167ec48054a4ab145202415f6e369492dace40e9c16cfb10fe,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30 diff --git a/results/combined/merges_tested/mybatis/mybatis-3.csv b/results/combined/merges_tested/mybatis/mybatis-3.csv index 4fa35eeffb..b5c703cfde 100644 --- a/results/combined/merges_tested/mybatis/mybatis-3.csv +++ b/results/combined/merges_tested/mybatis/mybatis-3.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 172,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,True,1979.0,7357,48734.0,2,True,1977,Tests_passed,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,True,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c 188,refs/heads/master,9ed919bb1372856fb7cd69969d13731f91fbec16,0c9f887141cbf9a0e6723b4901fc2a8915af6f6f,41b9b839229580cd091ae747b205f207b56157d4,,True,True,True,1864.0,4215,11575.0,3,True,1864,Tests_passed,0b1958033e3122de17471f190f051caeb0fac293139089a7b0bb99ebd5fd3720,True,Tests_passed,53ea0749350579cc69d70173b37854236da7e6be59b762995f28363fd92f9867,True,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_failed,b6b25427c8c980192fb06bab7a4e0b57c246890445fc24d5f15dabd962a1f658,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80 355,refs/heads/master,5a5a6b9abd06e663ca8fe71d5b2dfec037d227bf,dad8c13771a7b98d3814bf9c50bba8d8d36128e4,5e89813d10e903dde4f744942bde3149293b3bc6,,True,True,True,1266.0,1428,5970.0,8,True,1266,Tests_passed,8b00dffd7db15d8556517599794a45d07053b61eb0114e2ed18dae8b249435ec,True,Tests_passed,c6e6c9d84e00d19c059a1515d96f7c2d7341de44ec886b8d9d1275ed6e9fb04f,True,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,2ecea51872cb5c11e07feff204e1703c1668187553a6d220a5e11f39eac674ea,Tests_timedout,e127bcadf0a86a934f0c72728acdf2cc5d46e1e5875cb1bde4641a343c89e55d,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/combined/merges_tested/mybatis/spring.csv b/results/combined/merges_tested/mybatis/spring.csv index 444568e7fb..53b1e805d0 100644 --- a/results/combined/merges_tested/mybatis/spring.csv +++ b/results/combined/merges_tested/mybatis/spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,True,248.0,448,16217.0,3,True,248,Tests_passed,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,True,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946 diff --git a/results/combined/merges_tested/mycila/license-maven-plugin.csv b/results/combined/merges_tested/mycila/license-maven-plugin.csv index 386a95fa72..0b1e251585 100644 --- a/results/combined/merges_tested/mycila/license-maven-plugin.csv +++ b/results/combined/merges_tested/mycila/license-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,d3bf529757d51d950abf9e7cf025b708e8266d14,431ddb6c0ec33f909058593bf978ae4bcf997628,2e610308fce8c02bc9b9040fe7d99fbf7ce688a7,,True,True,True,22,58,154,2,True,22,Tests_passed,5029bc4117ce38746c3c8a30743c1f49446b0b3ecd66e8bb2ae8847b92036acb,True,Tests_passed,ac49b448b45c113a4e71a707c8c381e599bc9801c210f292b7cb9016d44085ed,True,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_failed,c006a261fe0ea46b683a3661cd4176079e393e99d4636e9791e71094e82b856a,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d 23,refs/heads/master,eddb550d9bce71a18f5c2397a372f28645716073,ef5db465e0d061c04b88eee3c43aea105f8b4080,6fcb6925bb42fc567849cdf0d5658a1809c80d99,,True,True,True,8,13,32,2,True,8,Tests_passed,a1e007b93819146fe8e88d4660c218aa2a602c82b0b32d84051effc18ecdab1d,True,Tests_passed,31a6af58d06547eab6675fd7cc633f7844d74dbd593364bb7860a6dac51dbc0e,True,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_failed,2666f0d00d0bf7046dce59478efa7c78dad9da426a110564ef489746005fccd1,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d 26,refs/heads/master,0cbbf006623cd8c927cc333dc187badaad014601,ce4906330740447184a65201e8ed12f65a3ec756,f79cd3a69c326e6dc6c32f6643cfdbd11da915de,,True,True,True,15,37,84,2,True,15,Tests_passed,19d03c4dc15b77a2db1767b05aa2d138ea3b019983c02825a2b934d64975990d,True,Tests_passed,4fd6d9b6334622550c216364b47a29e8ca141203509bdff33fdc224099a5ab19,True,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39 diff --git a/results/combined/merges_tested/mygrid/rightfield.csv b/results/combined/merges_tested/mygrid/rightfield.csv index 74ce26d371..fff208887c 100644 --- a/results/combined/merges_tested/mygrid/rightfield.csv +++ b/results/combined/merges_tested/mygrid/rightfield.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/main,b496bc27f180d72be091fec0b9d8fdc134065499,892ba960313c17cd2313317c5cfe3338f3ed04fa,6e6e30d7a5a01a179e7858c94873daffcc2c1a45,,True,True,True,147,173,3527,10,True,147,Tests_passed,f8331c143be04499685f2ad062a8937dc4e7b517ded7a387eb90946d9fe5db05,True,Tests_passed,8a6515a4251681593a146f7ecbc8296b6c5c4beaab12a16a1221a9f9fc490942,True,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Merge_failed,e565e977eabbb10bca3e1da32519056cbd3aefd0e5bf06018e0049679f60bcc7,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Merge_failed,e565e977eabbb10bca3e1da32519056cbd3aefd0e5bf06018e0049679f60bcc7,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5 44,refs/heads/main,d34df55c7357f0aa5556d42703f3cbcc6c3d0389,6b372f7d40a40ff21d06aadc40e92cbaef78b958,e75a3a2b73de9706282f7e991088d0f82f831b85,,True,True,True,13,23,130,17,True,28,Tests_passed,99760028def508e4b875110f567997b11d507752e40f53e56ffed27a73a978c6,True,Tests_passed,6380bf6a0caca244fa2ec924181696460a9e9260d18a4f9ac5008255e3918fdf,True,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_failed,3882a4b1a86e85648d98296a313e68dd565998438d9361a54a6abb555a6cc5d7,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294 diff --git a/results/combined/merges_tested/mypurecloud/elasticsearch-lambda.csv b/results/combined/merges_tested/mypurecloud/elasticsearch-lambda.csv index 30096b8d37..3a3275f35c 100644 --- a/results/combined/merges_tested/mypurecloud/elasticsearch-lambda.csv +++ b/results/combined/merges_tested/mypurecloud/elasticsearch-lambda.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/remotes/origin/5.1.1-dev,b929d2658531c72608f85151ef3b27a265c5214b,aaa9d5bcddb1f0952d9d2b1a01e78269813584c0,ed4d387a4da8018e29e8cba0cad1c06deffec484,,True,True,True,15,95,904,3,True,15,Tests_passed,f2b2fa2ddb9720336018c77fac329e4820e187c396ab5cc2e5a605fde7ad178b,True,Tests_passed,6851cd87583df5f35f5a7e4c7bb5ce82d321a1718b82edded9f3ad80203e34ef,True,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,b19bd36ec31e10d96df68140ff3f0e49df7d5b865b3889c4ea0fe1508cbf1515,Merge_failed,ec9599c1c693f6699f3942fbe096bffbe35ee49149a1863fb88405e07708e533,Merge_failed,83b158befb58ee93d6c8f04ba3f75fa9f88963acf05533765e9084feb64129d4,Merge_failed,9edb9b4fe5ff5372500cb324d0bef233a96999ad213f2273463fe7b6305e4a23,Merge_failed,ec9599c1c693f6699f3942fbe096bffbe35ee49149a1863fb88405e07708e533,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,a86dc3f3eeb88f92adb3472d7194020aba636bc9a4fa6b257e0bdb735d86eec9,Merge_failed,2761b130065c6ae1f12f1739a9e3b1c87e2afecf2e6f35fdf64349caac65399f,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65 32,refs/remotes/origin/5.1.1-dev,9ad6ef3cc4463ad5e7c71ae057264ad3ba7b2f86,4d58e53b86ac42a8ed6d8a66f14a09f356ce119f,a591b944acfe10d8889b1554d1cb335853268272,,True,True,True,29,135,1610,7,True,29,Tests_passed,8d90decbf47edf1cf55e9af45b19204deecf1c7e9cc5b7cc04b85000c603c1b1,True,Tests_passed,10b35739e282c49fbacc1766c18807c0bc5b69268e86a1578c5a16d89a6f2636,True,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,9ffa7b6c4a4f032635e9d9d9e2e7e6eb6a841d8aef1015aae095ba9f0f2e1e8c,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,11b2253cd118bf5a8693bb0d6f706771dfeaeb67146fed260fcadc93ae748ae4,Merge_failed,656490d1eff78b7d1909b4071b506c2153562fd7c7cd7c22491d2ae8b8bacf74,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,a9b2ce8aa62b61efce8b1ce3404b8730bc5c8baa1444e4f1884f66c9121acd74,Merge_failed,ed2d666a47fdd4314407f2f121641eca034e0e29e6ca78db5eaf4ff0f67cbbc6,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0 diff --git a/results/combined/merges_tested/n0rad/jstest-maven-plugin.csv b/results/combined/merges_tested/n0rad/jstest-maven-plugin.csv index 7b12cd44ba..dc5ddb8f86 100644 --- a/results/combined/merges_tested/n0rad/jstest-maven-plugin.csv +++ b/results/combined/merges_tested/n0rad/jstest-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,1842e580665903b7192e06575679fb39870601b5,ff683a4d4ac09672f45d47252cf5d366f17c3a61,6c30f8927d85bfedc3bdca89dcf753a0074f0f4a,,True,False,True,4,6,17,2,True,4,Tests_passed,e8c6e9255ca001e7c13d41b00bd947d30fd4ea8618dd6684611662d37e2113dd,True,Tests_passed,2296fda8c17bed3d5a9cc407311a097fea5f7d6b215d6610f31eb9b52940cc38,True,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785 diff --git a/results/combined/merges_tested/nabedge/mixer2.csv b/results/combined/merges_tested/nabedge/mixer2.csv index 2476ff6683..437773790f 100644 --- a/results/combined/merges_tested/nabedge/mixer2.csv +++ b/results/combined/merges_tested/nabedge/mixer2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,e8a1930e8dc2367176464e888888ac1645bb9eee,b7f31d46bb5fe9ceb54490c49483081ca0bd854d,82a9bb4a4bd8b2a4c705a47a1b8325e2a492f950,,True,True,True,148,173,533732,2,True,148,Tests_passed,ce14e4e4da5260130f5d137d049257acf929e6c886b0243264e5e0e5f2835805,True,Tests_passed,92886eaeaa78cbd79977557e7e6832e4c6ade83201fd4f6596f54f15cb64efaa,True,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,86156d1ad2d3f050bd1118f67f70482b80616ccf14a4cc914fd7505128eacf94,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Tests_failed,20e0a272527a12f4b8f842187158c2729ee88facc95145a6700bbaae8cd68aff,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,c680efc91218e0496fd384cb964b83d8c2b61d0ab6fd942e66cec6be47bfcd20,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283 diff --git a/results/combined/merges_tested/nabeelmukhtar/github-java-sdk.csv b/results/combined/merges_tested/nabeelmukhtar/github-java-sdk.csv index 55b8ecf138..1c83ccd467 100644 --- a/results/combined/merges_tested/nabeelmukhtar/github-java-sdk.csv +++ b/results/combined/merges_tested/nabeelmukhtar/github-java-sdk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,539b0183d88f09003733316cbe25ccb3c952d024,e30d4dba438a58d625b740c0cf388bb8efacf02f,6434435f5c4da9f3c8b9b4112f34237bdcef10e3,,True,True,Tests_passed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,True,4,91,930,11,True,Tests_passed,82589bba1cc439b911c77fa5792386700d6de74a4a0a1a3ddca9d41611dfc89a,True,11,True,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,89b9d92d10d9d8a53d83d25cbf2a8c1f9c43a8d3936e7bb4ed10e52c0d23f9fb,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f diff --git a/results/combined/merges_tested/named-data/jndn.csv b/results/combined/merges_tested/named-data/jndn.csv index 82035e6249..02155e125c 100644 --- a/results/combined/merges_tested/named-data/jndn.csv +++ b/results/combined/merges_tested/named-data/jndn.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/master,3076a255b5a703e01e07b3f15116e5b9035b540e,82f4922742e1670374b378d5138bc4da23c894cd,07e767dfdd2d13c210dd71c3ce7acaffcef6f67c,,True,True,Tests_passed,a3b48849e3ee2b8a82c490f256e3899cd304c8ca582343c991e608c02714484b,True,53,155,3530,5,True,Tests_passed,6e7bccf60f9d569a8dcc1a379d92d421ef36547b90f5316e0c35fe539502fc52,True,53,True,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_failed,5cb623ac80f44b59a789a1a852062be718acbe2e4dabec38acdc98e5af758d63,Tests_failed,020798fb88d1f7d5b1b967d593dbfad92dfc883914f25715070be2d67b495ea7,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_failed,5cb623ac80f44b59a789a1a852062be718acbe2e4dabec38acdc98e5af758d63,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836 58,refs/heads/master,3d4740219275bed6dbb48e2aa7ad8bae7973193b,f5d5b1de972d014333bfe7c8d445f4c02084afde,a2da147b6011ede6028ab2c034039c596c8b9892,,True,False,Tests_passed,ea42a944c5dc0d24063b04303ecb1d5f875a0129e5a7a5cdfdad61ab1334c074,True,7,18,85,2,True,Tests_passed,1cc28b2b95dd9857bf06772e3d9761e484b59475a096bab0c08de0efe2469ca0,True,7,True,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_passed,cf86d6838cd094cc5aac3ec5e861d22e605d167ed7ccf6a66a9e9285967dd6c7,Tests_failed,7047889c6d4b247cee0e02bb3dea22f739e5926bf8569bc4c86812a436d4c501,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_passed,cf86d6838cd094cc5aac3ec5e861d22e605d167ed7ccf6a66a9e9285967dd6c7,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55 64,refs/heads/master,63a0f4bbb8ca58eb54d3c1439168ae87c912673e,85658d3cca6162e7f46a38fa8d13e03e0ff0a3e4,bb6f538abba8ae65bf0d6aa5a66a27b57cc14683,,True,True,Tests_passed,bb30d1a8c70debefa0e2dbea6ee10ceb9fec65e481902d57f7b0dc5531d50529,True,14,33,84,2,True,Tests_passed,a7c96cc3b411f375dbf908a4303673c563d1ea90e0df90f22c66c41cea5df11b,True,14,True,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,51be7920cecb8075b75471bb364b821152ee85cf05d873a881103d039d28461f,Tests_failed,0d377b885353b05a2e0bda3c0e4ed830ef73655f0f2b443136a99ccc3336c167,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,51be7920cecb8075b75471bb364b821152ee85cf05d873a881103d039d28461f,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8 diff --git a/results/combined/merges_tested/nanohttpd/nanohttpd.csv b/results/combined/merges_tested/nanohttpd/nanohttpd.csv index ee363a021d..159228724e 100644 --- a/results/combined/merges_tested/nanohttpd/nanohttpd.csv +++ b/results/combined/merges_tested/nanohttpd/nanohttpd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,e175fd08e041cd741016bb1f1a944d2caec8f3e6,63815b9a19c35d965465fa25028cd0a9a5fbcb40,9cd340f18884c71807da5ed687bc51450b7811d0,,True,True,Tests_passed,064eabb579823852af71b85087c929d27b87659a6b202f5c144a8b23a4ffe714,True,4,19,47,3,True,Tests_passed,d9184fa03ddd372bb9e50d2b80b64f6bfc77099e248476a61a62757e6b96f5c1,True,4,True,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_failed,43c61fd85717e89966d5f7639121d2be34be15b9bb6187ef0a967a6b0f59e56a,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17 13,refs/heads/master,d2af06753b654b248c5315ca54e816b9c14ae8d9,b49e60862dd61dd5878f751782908c20b85926c4,060d6d2292442e36aa0967b6eacfac9019a1a59c,,True,True,Tests_passed,7d7d92a4fb4c328f27fba210a6bcf58b13b0cf226966991afea8df66d24dfa7b,True,12,55,266,3,True,Tests_passed,585b811673e80e13df2a6b643925231bfa397c3163130c02fc615cda7d038ddf,True,12,True,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,78462d2009996010c677d723fe15dae53bfcb763479418d7d4e84b857f34ae30,Tests_failed,f5cddd6aacb370cba1f226a772683f4fd0cc7620e7a2839008a0d34ac0780fb3,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,78462d2009996010c677d723fe15dae53bfcb763479418d7d4e84b857f34ae30,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0 42,refs/heads/master,59d874466f5bebf2d92b148cfe47eb7482df6a23,ca1cf4bcadfa26eb593f547474227f940c58e681,681f9d425a1f24a04e69c5451e6bb93a7859b774,,True,True,Tests_passed,762af45ccc244284a69a195d5a4bee6166c4979e694c986c2df381f13fd7241c,True,15,38,884,2,True,Tests_passed,3e4527f47c1d372e59d7b606aad6b246922e880dff5ae64dfb81914807019b69,True,15,True,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,e405c11077e2e97c18c37c119d7f9d09f2087dd03b098b424c75c547517c75f7,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,c4f0725a943ed572b5a259d2f18d3c1d0f93ad40e41358780aebf5d69c3d2ca3,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,c3e4a19a1c83b30387eb5b7af3b2cb6746f428aac9706086a1924294f37669c3,Tests_failed,de35795f8c4a0ef49d46b90f31fe4193a262bd105c7f5ada4b3ae50eb1f8fa93,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,c4f0725a943ed572b5a259d2f18d3c1d0f93ad40e41358780aebf5d69c3d2ca3,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,c3e4a19a1c83b30387eb5b7af3b2cb6746f428aac9706086a1924294f37669c3,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,e405c11077e2e97c18c37c119d7f9d09f2087dd03b098b424c75c547517c75f7,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921 diff --git a/results/combined/merges_tested/nastel/tnt4j.csv b/results/combined/merges_tested/nastel/tnt4j.csv index c1a4c2f70d..9dc7fb0f2d 100644 --- a/results/combined/merges_tested/nastel/tnt4j.csv +++ b/results/combined/merges_tested/nastel/tnt4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,b522f15d294173f3325363b1853a57105be1b32c,e501c9b1eb2fd4eefe6ff379e99288363818b39d,edc5367d6b31f6631dac5ba10ec21c07e908c25b,,True,True,True,15,60,338,29,True,31,Tests_passed,90cfdb0592890517c267371b30b8aae7600ddd8555d6bc611d67c091f1278192,True,Tests_passed,cdde78349d278c84f2a17e18827a141e6536efac4cd68c373b7c28ceeafbc8e3,True,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,a08e2c0c22c167139b03d89e6e655642fbef18633b56ac75d228f4e42505406e,Merge_failed,164f5d0b6e63e9e281465c6f751dd40136cc18d926357a3fc5b1cb57f18bf1a0,Merge_failed,c776299b9ea4001ed60e582a272666d197fd7b81ab7718fa7ddc4a71eedc41be,Merge_failed,971579fb3ef878ac62b4cf53807435318479c2edc76b1cd10a5e27e492dbdfbc,Merge_failed,164f5d0b6e63e9e281465c6f751dd40136cc18d926357a3fc5b1cb57f18bf1a0,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00779a2f6b27f2bea7f1e607966f5341db6f96f383e687eac15f1ecbded38ca0,Merge_failed,9a36f83be09a6d5ad8cd626aaac33068bdf1eadaf8ccb15079f1243f1a8a0d94,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5 13,refs/heads/master,627930d2b4765450617ae73f3c5d4a7af62b97c2,90ce78c0eba903759538d042760362497ca10b56,2d191958a7ab53e2ba0d37d112f2386a24e63c8e,,True,True,True,13,52,307,14,True,19,Tests_passed,8b99c52e2c24a34537e4d34808dee8da1482de5cf9c4872d16dc3e7d8cb2cf0a,True,Tests_passed,1e13ff31c149b138b0d4fd8d49ac48b9d9ca85c81d8982e744f92bad97e8c466,True,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,a057bc5a8236b65ac225532c1b44e440d7908b85d2f962fa9c133461d0750b38,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,2fd262f62748d7a3caa76f5b459226d185b43949fd8d2b9eeedd72f6d1dd7f66,Merge_failed,b7954486a5556b5fe146d1e5031c084b1f051ac053f6373e0d59fa6995f0b446,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,7ff24a67548e83e2646e57451fa6d0b9d24d9e36330190590c68715c43447428,Merge_failed,82bb44884475530383e7d853bfa5a725b9672feaf3809e81af9a267ac7475825,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09 68,refs/heads/master,9f6f3a3bd4ffb7da44189450809772f3bc0da917,efb637d9076cef0d9445e90a848903f2b00d4719,9d15a924f1fbc941bd60fcaa612160496897dc9d,,True,False,True,2,1,16,2,True,2,Tests_passed,fb637e0e5bfeb7705ac380cd1a9c60914be519ef78732be1aea98be27d13a751,True,Tests_passed,d62976622dbdbee8ee68f9a427b50daeee53eab4ccca911eb4c5a970476601eb,True,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,5dd7cbcb7b7a7f3e7aa928519840fd1405ab11b1030a9a57dc9cd0f0a489da8d,Tests_passed,de361ecd4db546a909744b6a649b2b81b7a1360deaa6b2515a94985170d4175a,Merge_failed,7e870f3bd457132cfaed463f86e7fb5b274f0b0cbff301d2544a86c74750d4cf,Merge_failed,85b0d67f41e45bdbc437406fa51172034f2829b584ef05131a2ab12fff4f4946,Tests_passed,de361ecd4db546a909744b6a649b2b81b7a1360deaa6b2515a94985170d4175a,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,99a89199da7a94c44c810926c24a8bf31d403beddb80a4f65814bf51517c6fe4,Merge_failed,7e870f3bd457132cfaed463f86e7fb5b274f0b0cbff301d2544a86c74750d4cf,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b diff --git a/results/combined/merges_tested/nea/vertx-mod-cassandra-persistor.csv b/results/combined/merges_tested/nea/vertx-mod-cassandra-persistor.csv index 3233ca0e81..82149595ad 100644 --- a/results/combined/merges_tested/nea/vertx-mod-cassandra-persistor.csv +++ b/results/combined/merges_tested/nea/vertx-mod-cassandra-persistor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,5f849c44ac7fa15876145c056ba40871f94afeb1,fa8733a59151272f42eb183d907ca866dda4fc02,274f625caff7e956fde0784982f279a69328a99c,,True,True,True,8,32,530,4,True,8,Tests_passed,3a97a7e1d982df6a8806a0c5c6ba7af25065a0e7b5f723df724b5410678f539b,True,Tests_passed,53ff524ad4faf8e4bb54b559a74b17b8b21c604f12cdd931ab4efbd18d94e743,True,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,34f3e25d7a1721860a0be42da4fc9d0ee86e9693a479d161aac08dc03a9e479c,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,a0cc89969823093ad786f8941ab57c6f0cacc0425aad40300a578b63362e2476,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9 diff --git a/results/combined/merges_tested/needle4j/needle4j.csv b/results/combined/merges_tested/needle4j/needle4j.csv index 79cabb1bb2..b867540205 100644 --- a/results/combined/merges_tested/needle4j/needle4j.csv +++ b/results/combined/merges_tested/needle4j/needle4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,34d705ef5705df4014ecbfbeec2da14694e900ed,6805db04258461dd4b131b4522872b3990814df5,aa9d371e20371c7a750a04e4a33f26854e064a2e,,True,True,Tests_passed,7e71beb48dd4587877dcf02d55c3060a83aa745abc63a6b34136881becdd0996,True,28,118,804,2,True,Tests_passed,f275a6189d549a54a2f0176b401748bf9ed9c1b4d8fc8f5ebd1805b6328667ad,True,28,True,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,23781af2fbdf00d905bbeaea360688c4ddbcac055fe0baa5116fb089bf57bc5a,Tests_passed,62eea28b71ebe105ab034a9661d0974363d7179711dba16bfaba197729c2da4d,Tests_passed,607f89e4b69164e72a7b2c5aac91b02412185bc249d45c3d36b80ab9222ea6eb,Tests_failed,b74a7f9239b54709f625e044eb0e191e9227e9bffdb93ca56bd61c31c844a4e3,Tests_passed,62eea28b71ebe105ab034a9661d0974363d7179711dba16bfaba197729c2da4d,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,0fa76b5985aff0d0243297f619ece774e4541d6c94fc4cb89f5e98d71c541be0,Tests_passed,607f89e4b69164e72a7b2c5aac91b02412185bc249d45c3d36b80ab9222ea6eb,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be 7,refs/heads/master,93f886c3493bba1e2bc216c583c83bee71c6c747,d247514a07b785bd923d201ce11bf88d3972afd5,81ca0c3cf142efb24091bc993a6ed13d091835b6,,True,True,Tests_passed,be9360c550c3cf09e7f0027ff9299d4d405aa4927b2e8385f33623c6eaa898f2,True,31,116,1541,4,True,Tests_passed,cc4a937c431587dfc2e0f013bb0804cb50e608dc3da1f756441d1fcdbb0448c3,True,31,True,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,a91581ef4185b031f9b86e27d68bdea3076fe43885545702f83412ec86f1f96c,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Tests_failed,1bf712f64938ccb4e00e2342c7557e74e5a4d81ba0a8e6034cc23c419510e935,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,51867c73e25fdd0d57c3c15e3bac0304a48fa7f450e333443b05e565fb13f994,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65 diff --git a/results/combined/merges_tested/nepxion/discovery.csv b/results/combined/merges_tested/nepxion/discovery.csv index ece74ff0b1..c0e9cba999 100644 --- a/results/combined/merges_tested/nepxion/discovery.csv +++ b/results/combined/merges_tested/nepxion/discovery.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,True,9,64,377.0,3,True,9,Tests_passed,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,True,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,True,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9f12e440b5fef3fb34930f9ee4f9a94d8cdfe5b03b91e127d8ea5348a29cadd9,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Tests_failed,cd4a0ddb5320b575bf6d983d5ee5b1e69e24655376fee5113ba549cfe931ea5a,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9bf14e494e151ca06d135e78d7ea0fd58ea9b06ca628180fbae6160feaa92f89,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a diff --git a/results/combined/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv b/results/combined/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv index 575a47145f..82eccb7369 100644 --- a/results/combined/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv +++ b/results/combined/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,3322436f3e6f3286b568b7f8a2cc22844406b99d,5f1fa9cb9933a59ece0bea597c142c9bd2c88843,281f8d180f70e11ca389995f2020ab815a34872e,,True,False,True,5,13,28,38,True,38,Tests_passed,b9a58708f9e775a2cc006647930b6e87959f6061f3483401ef250b58a5892914,True,Tests_passed,7b8341bf821ed94867294ee9645abf7c36c90603b9ebd65fbd7cfe148cd18ef9,True,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,324a15e82d017c3bccdf451f32db0aa35d44cab5bb86ab99b80390e35b8174db,Merge_failed,302bea1686a5c5cc4d888c41e792b431a82eaa0e412daaa7e6d270158ed37d18,Merge_failed,c881a109592adaba4b8ee923784f1026d2ce9405222fd59b699df0e7db5612d7,Merge_failed,6da91078bbce3f6e6ec62d4cc959a5b9cc2c03cb3694e9bedbc5e57e746d4e2c,Merge_failed,302bea1686a5c5cc4d888c41e792b431a82eaa0e412daaa7e6d270158ed37d18,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,f0b0be71ef929710c1238573affb7d369358d9cd7cf6ac7348ebfa00a7c8852e,Merge_failed,2bc3ab5695fe6f583baaa8efdbf85570dd331bd5f73b67381674fe970982522d,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413 16,refs/heads/master,8860ab3c4ed4b40a174411ac0b97af4d2ffcd4cf,48490bd6058369d762091369ef73d5144f194f05,e9b8f2006b0f21d93d0a3818ea5105919123a493,,True,False,True,6,17,112,2,True,6,Tests_passed,508df40e55546af80f2a1412bcd69eed9fc49242fedd7d2e67693fb8898f7e52,True,Tests_passed,709947285e823acfe6fc6d38da2b50be4cb9595e24cf66b20946ed5c14f93fa8,True,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_failed,7f69e2a6264006f131dd865893142c1c319cd86e443b48250de89769e5d9588a,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd diff --git a/results/combined/merges_tested/netflix/rxjava.csv b/results/combined/merges_tested/netflix/rxjava.csv index 532defc44b..0ee7ec6e0c 100644 --- a/results/combined/merges_tested/netflix/rxjava.csv +++ b/results/combined/merges_tested/netflix/rxjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1661,refs/remotes/origin/pull/7148,8ac9df9b2e145914d91007ebe3fc7ba0606c6751,ec96e6a73c7b55f8f41654ff97dd7ef189a43560,54850d0d344434022070fb034cdb7bda59b17b2b,,True,True,True,15,158,516,9,True,18,Tests_passed,efed346b5213b3f7d41c04dbf3b3d6aae051762dee43954d9c5ea31a2e1e6b5c,True,Tests_passed,57d2334564d46196bf26d6048d852522d8af994c9f1ff9d11304c8b63862e2dc,True,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,451cc1e312fde5ead95caa2d55612fd1146ef9cd9f5ed8dbad9c131062d66bb8,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,5eb30b2fb50cd965513a8b57adfa956b15f9cd33012540bb3d7a7feea0910235,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe diff --git a/results/combined/merges_tested/newbee-ltd/newbee-mall.csv b/results/combined/merges_tested/newbee-ltd/newbee-mall.csv index 7fccd9ce75..4201ab91c4 100644 --- a/results/combined/merges_tested/newbee-ltd/newbee-mall.csv +++ b/results/combined/merges_tested/newbee-ltd/newbee-mall.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,True,495,413,314313,5,True,495,Tests_passed,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,True,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,True,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,70b40ecd186f3475b61f24bbd55e10f6393e3bc8d19c9f0729100a3229ffb72c,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,d966c397a573179589fcc759fb5e1112fc8a1c5f0d8b8b6a5d93263893ffc5ac,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2 diff --git a/results/combined/merges_tested/nhl/link-etl.csv b/results/combined/merges_tested/nhl/link-etl.csv index 7cc913b65f..e108ecc349 100644 --- a/results/combined/merges_tested/nhl/link-etl.csv +++ b/results/combined/merges_tested/nhl/link-etl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5809ccc76269b6a862d5670835367f18ad2061ae,33baf16591242cead99d984a2d1f4c0d747989e4,0593efe9ae3fb77d9ac067420e2ca07b0600ccc9,,True,True,True,113,566,4607,4,True,113,Tests_passed,a3d3b344798a3390d4c5ad3aaefc15420eeb7ab2cb150b5aed609cedc5b651b5,True,Tests_passed,5b8354b4a36983f6480e12595ab97547febf13bd57ebf86976e39523db126b3d,True,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,d9c98d63d668556f054d9b94bf35f0950d86d371eae63f58374c7212d71fc0f5,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,41c3cf69e96f05b06c3e7e41a8f5b6b290e607f2401c4f1d8ac3bafa833b3474,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,da9dca15fe65ffefeb5ccb48b03eeabac493f775497cc6bdfa56021fe7777eb2,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb diff --git a/results/combined/merges_tested/nicoulaj/checksum-maven-plugin.csv b/results/combined/merges_tested/nicoulaj/checksum-maven-plugin.csv index 822da3e88d..0bdcda1cba 100644 --- a/results/combined/merges_tested/nicoulaj/checksum-maven-plugin.csv +++ b/results/combined/merges_tested/nicoulaj/checksum-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,2b189287252966d78359d4fcc9eb67e27fc44596,8a6b8fdb7b6cf93c85d542500fa2fd59403bafe3,1f9f27bd2730b65aff11c44fc71e65c9c65dc024,,True,True,True,39,94,325,2,True,39,Tests_passed,108a412ec48c29ad873821d3479c1892804c7a046943f73c606c76500fd007c9,True,Tests_passed,6e6d2406591c65d26a6ecd941c9b63e8e335ab94961c5d8771f94456aff65193,True,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,745caba5674756ae13b9938e82142eb4080c17fcf639d1c26e0f8e49add2489d,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,745caba5674756ae13b9938e82142eb4080c17fcf639d1c26e0f8e49add2489d,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869 42,refs/heads/master,837c34617a6123ead3cc374d0a1afef4f0232ffa,cec0366866143849da17a6a0e2917736c53cba07,084cbfda8cf2ecb83cf81e8bb6802db18a6e8aa1,,True,True,True,15,67,518,3,True,15,Tests_passed,0ec14b7cff841a219998c9a4df9660a906d6e1ba9255fa9c3906e0689cd77595,True,Tests_passed,7f92c9e1d16c78b0634ba1a08ec8e9caa1acf9368077f7dca8a39e37054b4bf1,True,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9 diff --git a/results/combined/merges_tested/ning/compress.csv b/results/combined/merges_tested/ning/compress.csv index b071eae926..d9d72c929a 100644 --- a/results/combined/merges_tested/ning/compress.csv +++ b/results/combined/merges_tested/ning/compress.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,aa9cf28d6f6a6c4aa88c4ab77bfb5b9a1a43b16f,6752dba1ae0535d0c279326d247e6a10d4f51608,01ea96f50f6e82de9a0436e403afd975be90920c,,True,True,Tests_passed,ea6b050c5a70e5bef4d20e3665d3465e7050a2244744fea0ebdd577c09e6b169,True,25,122,807,3,True,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,True,25,True,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,b8463a6e5f0d2feab7f831b99a1c19c7765a19b0a50a269de1cd61269a581703,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Tests_failed,afa44658f1c8df749150363300e6869e52f756f62c54048cbd3a0322521b1e35,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,23b9eff166e3cf820f5180bf2a249b6cd592c9625ae37be6a2e6ba88471cc7e0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f diff --git a/results/combined/merges_tested/ninjaframework/ninja.csv b/results/combined/merges_tested/ninjaframework/ninja.csv index af2f150e4f..1ad7382b40 100644 --- a/results/combined/merges_tested/ninjaframework/ninja.csv +++ b/results/combined/merges_tested/ninjaframework/ninja.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 78,refs/heads/develop,32ae342ef827c23bb4e4997d84a02663abba1964,aeba7be4fd406af50015af33827ad5f705e62880,d8358ef10479ecf0f79c2fe8546032575a39db5f,,True,True,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,True,477,620,1890,13,True,Tests_passed,b3e9bdbeda7503b8ceb59d4ff01367042ca3d39958a16b9fc097f6e93e649323,True,477,True,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,7952821dd131b2afc617f4776df007d0a499a1422aa393c9030347d3f1cc6d47,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,b7822c929cbe4ef2b39758ce827d32b9ebcbc5332f3798a0dda2972d7ebf969e,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Merge_timedout,,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,b7822c929cbe4ef2b39758ce827d32b9ebcbc5332f3798a0dda2972d7ebf969e,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,7952821dd131b2afc617f4776df007d0a499a1422aa393c9030347d3f1cc6d47,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18 79,refs/heads/develop,aeba7be4fd406af50015af33827ad5f705e62880,660f74b9d6a77fc1e39514ff41e512590ec78105,8f95c8237b3021f50607b99fc7408df2e2fb42eb,,True,True,Tests_passed,88169f089876d1b9a35d20f6f260ae20413e66cf441886200a41b441dd1343dd,True,476,478,992,2,True,Tests_passed,bfec4730f644d6e2636a24802dc32efeeb1fbee128ea00a80adb39a39c37132b,True,476,True,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Merge_timedout,,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15 82,refs/heads/develop,8f95c8237b3021f50607b99fc7408df2e2fb42eb,0af3a18710848892e1ef05f6ee9ecb29de3f09b7,bafaa6e26e2465cab4fb04dbed31ec9ef550ab11,,True,True,Tests_passed,cb4ad95b69b388e89f1ee603b40a22fffcd1bb6574e2a7a7e592e46ed0ad72ce,True,47,129,287,3,True,Tests_passed,129b38cf27f859830e5705fb0d45893653cb728049ce55d2b3579b1c0daae173,True,47,True,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,e7558373f8645aee47eae7ffebe38cbf1d3f93a020daed57321fcc075c9a9fd2,Merge_failed,191e237ae57a051558138581b11c2759176dca335db70e9c666a1dee7aef4c06,Merge_failed,6efd2a910e8360226bf30baa0ac05fb9ff0948c549f38b1ab0327decda941c49,Merge_failed,6efd2a910e8360226bf30baa0ac05fb9ff0948c549f38b1ab0327decda941c49,Merge_failed,191e237ae57a051558138581b11c2759176dca335db70e9c666a1dee7aef4c06,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,5112147cc3185f62038130ef7f3d1dc317e0485b1aac9a2e6a051a755bfcb7b6,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a diff --git a/results/combined/merges_tested/ninjudd/drip.csv b/results/combined/merges_tested/ninjudd/drip.csv index 90ee92faa0..a83cf9c122 100644 --- a/results/combined/merges_tested/ninjudd/drip.csv +++ b/results/combined/merges_tested/ninjudd/drip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,True,True,Tests_passed,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,True,8,11,216,2,True,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,True,8,True,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868 diff --git a/results/combined/merges_tested/nitnelave/creeperheal.csv b/results/combined/merges_tested/nitnelave/creeperheal.csv index aab94f6f0c..0805f9562a 100644 --- a/results/combined/merges_tested/nitnelave/creeperheal.csv +++ b/results/combined/merges_tested/nitnelave/creeperheal.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/remotes/origin/pull/60,bec4cb33c4fdb28d6ec8d49ce51adfa1fa094b50,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,2fad9a0a73c98f68e02cd074264edaad9639ddf2,,True,True,True,61,286,2241,2,True,61,Tests_passed,566c57fa6a879449e4b662390d8bd4a7078499d9a37950a0377df5c0c5017bbd,True,Tests_passed,24128777e3840be06f8e8b43a16c5b30bba7894222537a218d67adb4d12caf7a,True,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,b2c408821384f07b91e413ed4dd8bd690423163a8252ba7adb2d4beba036bcde,Merge_failed,a31a8e8a937d669dfe4c197d35c2a0e28d4288a9fddf442e0a83c2a7e0e36299,Tests_passed,b02693eac6a95bc27ae5cafab69212738b8a960b5966d9321691b3ad02e924d7,Tests_failed,dae2af0d0aec9f99053769820bd7267a0a886b3e56ce8ae7db6700e65e79b6da,Merge_failed,a31a8e8a937d669dfe4c197d35c2a0e28d4288a9fddf442e0a83c2a7e0e36299,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,8a324ce0c73c31600eecf5536312ae6ec5a0a67f4441cd20ab276bd879995e96,Tests_passed,b02693eac6a95bc27ae5cafab69212738b8a960b5966d9321691b3ad02e924d7,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998 23,refs/remotes/origin/pull/60,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,f3b468bd793ea17c8393ccde13effe27c8dfc544,4efd54689557c48ab4dc71c35cefe358127914bf,,True,True,True,62,285,2122,26,True,68,Tests_passed,4d9b55d86bc14154db3ec7c0006899830e401cdb41f3ed6f3467f4f58a2c1f89,True,Tests_passed,6d0a1b20623d5fd7fc273379f9bc436315679b245b715efe9ba0c02c3e8a0766,True,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,0034daea793d632a8d5d1d5215c02f1561c9672279d452edb542c0cf6f9b7df8,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,3e21a0439d58be5d9688befbbdfcaf2463befc233eec2b0197f83fad33ed6244,Merge_failed,f42a9f16171c8b4c8424de409ddb29590fa0b284c69c9d5f98b57d177b39aae1,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,8a166cf0a32e4321d815a52320a253c916c8940a6f4747c097e1931a56892fcb,Merge_failed,3516549bee188cd178adf8f613e2f20ca0194202644bb2614399f9c8e92369df,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07 diff --git a/results/combined/merges_tested/nlpchina/nlp-lang.csv b/results/combined/merges_tested/nlpchina/nlp-lang.csv index a6805064ec..16a69c069d 100644 --- a/results/combined/merges_tested/nlpchina/nlp-lang.csv +++ b/results/combined/merges_tested/nlpchina/nlp-lang.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,cec0dd677bf90156ba3adaea1ffd6c69f64df9a1,08aa1059f93618cc7c59624d5df0157ae691cef1,20cc939c8bce1777f8e750c83154a0e1fb373406,,True,True,True,11,25,298,3,True,11,Tests_passed,70df7518916170212cab9406318f082d665458bc3df72963690c84581bd56a2f,True,Tests_passed,688f7a4088aefbf02ccb2cb5f5c7840365e6ecc4d6b6244d2149694b727507ad,True,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,f8718862436cf450d7ff2c0b871e492c19997344ad47498a4a3b9b19e279f452,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,28de242da21c4e2eeedebe22db487124df36f1eb557cd288dd5614177e220aaa,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,bc74266f9d2e866781c1fc8e7a4f6a93a161a7cf4e0cf9f3f9dfb232a6681009,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387 diff --git a/results/combined/merges_tested/nmdp-bioinformatics/ngs.csv b/results/combined/merges_tested/nmdp-bioinformatics/ngs.csv index 8b096a0858..6f3b7edb2b 100644 --- a/results/combined/merges_tested/nmdp-bioinformatics/ngs.csv +++ b/results/combined/merges_tested/nmdp-bioinformatics/ngs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 44,refs/heads/master,af40ea2b0c4c6fee1eebbddbb7e303b1c5ad4d3a,577983a2343f16c0cad588cce6e8b3f886870427,ab8cd79fb64b51e3ff6d447b1affcf094262cf1b,,True,False,True,240,247,557,5,True,240,Tests_passed,9248ff315b79a4c3a86bcbc4bf764d53002714d0a08ec76cd596b6961ae3a370,True,Tests_passed,d6df38719a10d9ef10ae8ee06f1e98237360ab31fcfa051eecc01536aed2af59,True,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,b3a8fd7bbd61a95e5efa1fc66a07e36c9860b7b7298140e04a3010a0ca0ad670,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,b3a8fd7bbd61a95e5efa1fc66a07e36c9860b7b7298140e04a3010a0ca0ad670,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343 52,refs/heads/master,4b26663ea1d58a3deaad68a2da6b674b055b291a,43943849a35b943ec203c0d39583a9c5fcec4675,5101b8a038c57c34faa31f05a3a1da4a50cd091f,,True,True,True,6,10,292,2,True,6,Tests_passed,abd2fadb2826104a244981a79c491d2f7deb794cb335766e36276e16a06de96e,True,Tests_passed,76d2806e6c21bbfc46c261ee7b68e6e82116316827ee84dd22ef3a51ee2773f0,True,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,710cdeddfaa1c2a234689cd475cde53229627fb2beaf5bc5064d3c1b580af5fd,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,3f10c3355fc9a0653f2c4ab0f8c2ea391ee574cc52741fa15487e7fadbcd0374,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c1f7c2f785eb4ba0b6dd09c73186bbe4970da4a619e83ea6c87e53ad32e920d1,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6 71,refs/heads/master,eea085987884d72311ac1707a37e9554e5f32dcf,7fa1b1e3b8edff936a25f96f3b1a005eaa0612a4,fb85d10eb856c5d37a48cef4097085e06fb58908,,True,True,True,62,150,1243,2,True,62,Tests_passed,a86ea45ad76f8772f17d85f6af02be72e85821bc2043ac9375fe843528cf677b,True,Tests_passed,ae06bcded5cf94e702f0f821a627934f0850d64c1b69d98c3d0f2a60e193513c,True,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,0c8053292bedf7bbe0aec40d13489db914487a07dea21b33168516e59ebc27f2,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,0c8053292bedf7bbe0aec40d13489db914487a07dea21b33168516e59ebc27f2,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f diff --git a/results/combined/merges_tested/northconcepts/event-bus.csv b/results/combined/merges_tested/northconcepts/event-bus.csv index ee8e17b009..21db3136bb 100644 --- a/results/combined/merges_tested/northconcepts/event-bus.csv +++ b/results/combined/merges_tested/northconcepts/event-bus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,c878f8d9161df6ab27628108df79d54bf354cc60,d188a72f4990b2d3b0931c43028727ca22cf1895,19adeecc8b4edb32f39fc8308321459ca481046b,,True,True,Tests_passed,0673cf54a98166adfb7fcdf423843d0ab105bba55e00e228dfa89378a6eb428c,True,30,29,2638,25,True,Tests_passed,efa9ff4d8416969bdc52ffc16b4eb3a2484109770f1a533cad2b993b47ef0a75,True,30,True,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,41b4ffd7f4f9c95ce10ebd2304e24aa595687c02d3df284652ea840166a16f00,Merge_failed,645e5ade7499f8bd5d0c09698d18237b36206cd34651cf048b84fd6e028687cc,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,28030c4fd07f6720c4327b8cabdc937631909a2e08013c80d6a7547e78bf1e33,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad diff --git a/results/combined/merges_tested/northlander/a.csv b/results/combined/merges_tested/northlander/a.csv index c44b8b778c..4553cd8c34 100644 --- a/results/combined/merges_tested/northlander/a.csv +++ b/results/combined/merges_tested/northlander/a.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 63,refs/heads/master,23b77a81c1525c74e8d879353bef54c439a326e6,6837868203c91001bc52badcbba944ed5e009e3a,804f1bd50ac499bd45d906b5060c0e5fd6b6e457,,True,True,True,4,11,47,2,True,4,Tests_passed,41221932b608bdc2e8ffec596ed7d8434a8c4bbf6e9267f636e81ce0e33206c8,True,Tests_passed,d0f513915656e6a26ae084d7a4d73c1d56679093e512ed044b3151f358ffcdb2,True,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,eba55df61e3efd85286da4c07bbfa912182d13a9d3fbf5060f944ad31c141ba7,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,eba55df61e3efd85286da4c07bbfa912182d13a9d3fbf5060f944ad31c141ba7,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9 68,refs/heads/master,3497235f96c45ea39d2be68ded078b07a4d1a17c,eb5566450e3912f14b2ac5bb5848f9c6c585d10f,9f94bd9bee386305f046787bbdfb507c9616eb82,,True,False,True,8,37,127,2,True,8,Tests_passed,4482a10f20e79bfdc93bab61f0b9f3faa0aa23c8bc8b9b2dcec74b363eb94ba9,True,Tests_passed,edc6e9998423a77284e60ca64ccc20ed5ba09ce964236f045bdd8efec148e91d,True,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_failed,f252b767bfde817a78d2fb0061d030cc8c9c4f493372bd849764913ba247e66d,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157 85,refs/heads/master,60eadef67420a9c64f6f2d129dddce3d93803681,ec2c937426d2bffefe23ba70d485acf342992e34,dcfd0a6d8d0c96b89325eacb74e6b0d84bc17685,,True,True,True,5,24,234,3,True,5,Tests_passed,f00b9f4f39dfa3a1ace6af22b7c2f224ecaa15fb679b50ff02d41949c51eb6c4,True,Tests_passed,43ce609cf1f758612f96d93ebd760b94e67afb6e3c9cd5b6df7109383c90efc2,True,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,2125ec7e33b6d69aadce451f834c5318e18f1bf902a47625061bd7b32a2b715b,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,2125ec7e33b6d69aadce451f834c5318e18f1bf902a47625061bd7b32a2b715b,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1 diff --git a/results/combined/merges_tested/nuodb/migration-tools.csv b/results/combined/merges_tested/nuodb/migration-tools.csv index 84bb1c1ffc..1eade808b3 100644 --- a/results/combined/merges_tested/nuodb/migration-tools.csv +++ b/results/combined/merges_tested/nuodb/migration-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/heads/master,2e1f6973c44144fa9b61715b1a4f0b9491d71572,65659386ae60f9c71c6a89e597e767666a523ad1,55d9255f2ba08e2abc92de5754a08c6f5a0cd1e7,,True,True,True,62,200,905.0,2,True,62,Tests_passed,158571a9755868f3fe875257efe38e9f3e1d83b5b6a6fd4fa909d8cff69dac96,True,Tests_passed,dbbdbf3b4f9a7b799f469a25fc52ce5ee7af35ec94ec9fcb8ce438a5a61b194a,True,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,85b988e0a208a56d489aa8679412167c1f5da8a1d4ee761924620c992ddc904b,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Tests_failed,abea25f98fa16f6e0efa7e75cd5c7e9a82b792d2c342d7ca08e48c952dae9bc9,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,90c24808c98230039a93bc99ca051f2d503ebfbdfc4d2e1bd48765c58a15942d,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726 diff --git a/results/combined/merges_tested/nurkiewicz/async-retry.csv b/results/combined/merges_tested/nurkiewicz/async-retry.csv index f8960051a7..01850b277a 100644 --- a/results/combined/merges_tested/nurkiewicz/async-retry.csv +++ b/results/combined/merges_tested/nurkiewicz/async-retry.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/java7,d8144af35c9072f3aab544a52b73bfbd6982aadb,27316bb87f8ad572d714cb0907a04ed67cc92d7f,65be530e6f819396409b5f245845ffbd4f8783aa,,True,True,Tests_passed,a1631ec0f3962d20a075eefacbc9db5cb3e392b7c7c925cda4bdd5d2cd776fa7,True,57,270,2409,7,True,Tests_passed,5756d389f54e9e8bac5a8c8c1b43c59378697c2778d954d17bea0015c31a7661,True,76,True,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,84e31bd32cf1da54b11a84557685acd7046aae6eb0c1d9f3a6238649b6423c90,Merge_failed,5d522be9e000a9a9bf22f6230a3c2587d3a0461ec56131c18f3db2f957b3d952,Merge_failed,73976f60c7b3b9fb47b0efa8a5457ff735b9db4bbf093116f582b8c47e90d441,Merge_failed,691ca5efaad2941e2d6d1d0dbbb5256566afca1f025a30df3f9c01b413b6780a,Merge_failed,5d522be9e000a9a9bf22f6230a3c2587d3a0461ec56131c18f3db2f957b3d952,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,84e31bd32cf1da54b11a84557685acd7046aae6eb0c1d9f3a6238649b6423c90,Merge_failed,73976f60c7b3b9fb47b0efa8a5457ff735b9db4bbf093116f582b8c47e90d441,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed 4,refs/remotes/origin/java7,27316bb87f8ad572d714cb0907a04ed67cc92d7f,3b3d7b88f079004c1861d67951d154179c545a6c,f573ece398890ae0f53eb29e35ebd3af1e9f70ee,,True,True,Tests_passed,9b669603feb41bf23ee55817d437ae34fa148d5f751dfe2df0f06ec55e1a9700,True,31,182,1051,3,True,Tests_passed,a1c52b0e89e2bca25f8f9c39d50cc88f401fa64464bac6851e060efc693a8394,True,31,True,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,8a17901df483804459d318ec045e6b11402ae49a76b49ff35d7333ff83f78a76,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Tests_failed,c25e1281413859123cc4268dc26e8e5a885283b3de749af7329d140b3dcbcb2b,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,5feb07254bf4f56301491946ede5c077ac5b0049b9d9502309ec972e2d5663c0,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad diff --git a/results/combined/merges_tested/nurkiewicz/java8-workshop.csv b/results/combined/merges_tested/nurkiewicz/java8-workshop.csv index 1d046cb2bb..a4bb778088 100644 --- a/results/combined/merges_tested/nurkiewicz/java8-workshop.csv +++ b/results/combined/merges_tested/nurkiewicz/java8-workshop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/5,f5918aa79c6e08def4de82ff69f94733e71f7fcd,22ce75de37ea170342618aaacf1bfd7ca9bf31d2,15d67e90921769a92e3e1b597e056f6aa29020b7,,True,True,True,52,259,1045,2,True,52,Tests_passed,3b30774e8709a9b0326a72e21d6a72e7c565014cbbe9454bc380283698277226,True,Tests_passed,7e432992c0e01c3b4cbadfff20a0df4f022d2c33094c967f37a3a05b63f25e31,True,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9 diff --git a/results/combined/merges_tested/nutzam/nutzwx.csv b/results/combined/merges_tested/nutzam/nutzwx.csv index de8e7eb967..d5d7e782ce 100644 --- a/results/combined/merges_tested/nutzam/nutzwx.csv +++ b/results/combined/merges_tested/nutzam/nutzwx.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,11d3b3744cfea0ce332aa28aa480735956a0a73b,0c3d36f52d279671ad0055ef7565432001af4aeb,fec5c5fa38c02162bb262432e6a8b72c281cbfff,,True,True,True,8,28,125,2,True,8,Tests_passed,b6861679550682cb9aabe988964dc08a8f557ac02ca83217cbe76332a60d5f30,True,Tests_passed,6b8e7979813391e03388cb96d2bc51ad98a1efc8712920adc247f639c7994569,True,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,556c0c621f547d3ea50084f48bc19c7e68fbcc1927bbc8b6a8a24b733edd7405,Tests_passed,ee229c299e8ab8074d9a5c7eea8f04008b84213228237cbe400099ab3b9f4cb6,Tests_passed,0361b4153c734c43a3c679948d8d48eda8c8871dea170b9ce5f01b086a5a0132,Tests_failed,8a983953656b692f3862381276862fa089c27b0c0b2221667e49519902c3bea1,Tests_passed,ee229c299e8ab8074d9a5c7eea8f04008b84213228237cbe400099ab3b9f4cb6,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,ef83ae67d9cc744b4f3ea583d68c12076eb3de31440801f49c40c5ce4d097c65,Tests_passed,0361b4153c734c43a3c679948d8d48eda8c8871dea170b9ce5f01b086a5a0132,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a 20,refs/heads/master,fec5c5fa38c02162bb262432e6a8b72c281cbfff,845ebabe3c5df9bc20043dd1d1f4c36cd96e92ba,ebecc6c4425f4affd450866dc0e68fa0b6ba2e5b,,True,True,True,8,34,257,3,True,8,Tests_passed,14ac71be239824d618fd35a278df1aa95ba7449d077584f4b6fe2ab6dd2826b1,True,Tests_passed,b8a1f772d567a34e48c799fe531d7688511a26f39b3b8c4aa8ba000d651fe29a,True,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,8250332f29c286f124766cb6d6191e144325b2a92ee9e49370dd9f7d8e498c1a,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d5c347bc8090ad22d63e7da5b88f6deb089b91c2c8c6a87a102b83509e79dfa0,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,96b6aa66bcfb530cbfadfcfaef4fb091013a3955e46d050931ed5ff121bba03b,Merge_failed,f1b306e92a12434720ffe3f5e1fc783490e0701247ac3c8e4b985ad0f88854cc,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f 28,refs/heads/master,33faa161154bb74801bf70c3935b04d8b54ee073,e2167429ea83a8d8f56b432eba0e2a9407337a6f,f694ff34f5812ca40e85221b95b4ca0e0af57aec,,True,True,True,3,23,43,2,True,3,Tests_passed,6b7fb280fa9d9a131162274fb5632f60df0da7cade4e504c489ba91b6cb73808,True,Tests_passed,b9449886748a6aad18c584226a05022d1ddae8f9ec625df5b181cca6aa3c8b11,True,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,5aec0580e126ebb05a16786b38f1986530d3243dc619908efe2cb1261940017d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,5aec0580e126ebb05a16786b38f1986530d3243dc619908efe2cb1261940017d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d diff --git a/results/combined/merges_tested/nysenate/openlegislation.csv b/results/combined/merges_tested/nysenate/openlegislation.csv index 65821e2b1a..0ec74e60c9 100644 --- a/results/combined/merges_tested/nysenate/openlegislation.csv +++ b/results/combined/merges_tested/nysenate/openlegislation.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 127,refs/heads/dev,6c571d514aa843b5c115542ec91e31c366255aec,3667de0c4823e492f024b347cd404c64ae38fefb,779a73d6c383df3e7bd24ed92f86d5f13a5c9e9d,,True,,True,353,23182,,4,True,353,Tests_passed,567663deafab52b2539530cff7601de6021680387844ef085e9debe19a14e9a7,True,Tests_passed,bb0324fd522ce7f8abf82d24905a7afa702f7fb1b50ef45251922d61d38d44b0,True,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,67f68238b9ffbfb10482836b799124b99aa6f760e8c33508bc213454952d5a3c,Tests_failed,46f9e09e09dcb3b16d5fe117c3b8dd4f906fe586b7d06122e672e6016194d90f,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,67f68238b9ffbfb10482836b799124b99aa6f760e8c33508bc213454952d5a3c,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902 128,refs/heads/dev,ed229ed5c1e4cda4a868763111ab9c99c01816ca,a2da6ad801721db759d00e7f28a939b09d785bef,8a5ccf4a564d30890a7af3f1f5f329a811163b49,,True,,True,146,567,,11,True,146,Tests_passed,62550a954049fb4c05173f28c65d2ce5401bcb0c39cb11e06256a06f4d5a4c18,True,Tests_passed,52b38a177dbb277bb2d12a257b6e2a21e16135bdfffa8deb599a5f4b0a611195,True,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,2d6ae794c06e27fef8aeae909e7803f7493bffe111cf6e72b7823e67f5ba0d22,Merge_failed,9e3f6591df617b9de1ad3027f9b40ecefdf43980ef46246ac9af73c11e5e8ef1,Merge_failed,b6af2218c32a1033d07a567ae86ac23a8f1a2b9c1a04fd5de944944a754f7cbe,Merge_failed,6db598db1f135d581d60c5ed35dc4caa842a9fc974809393aaf1459e920b7288,Merge_failed,9e3f6591df617b9de1ad3027f9b40ecefdf43980ef46246ac9af73c11e5e8ef1,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,7a3ca5136c984fcc95613f4661a4cd00377cdbc7e95e137f5ccddcb7ffc1be20,Merge_failed,a0b0335af4034673b6175f689b5577e2c6e2b3aba6db1a341fd9e02f974d204e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e 132,refs/heads/dev,ea4b5cbd002c440ba2f7308b526b6b7f4366a9e4,002161a68b5e50ed736962063e5e3a792e14ff7d,485a532a6b2aee592c9fde01f0628fa333748aeb,,True,,True,353,23118,,6,True,356,Tests_passed,d94dc9536ed4f55f9c36c75d12ac94ebedb74169fa093164612749bbc3bb3897,True,Tests_passed,17b3122c901446b78905fc11a6356eb118098f8075f5dab6f5066d301c1b9dd1,True,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,f2953403e5fd491fdc16937c3ad2fd758f262bcc76644afd84706d6a65da5f30,Merge_failed,8132c6d158a50b3cbe6c92db93278711d885b4434fed5208707b2cfacb1e0e05,Merge_failed,1667ac7094dc3166e593c32b07e2d72c9546de8c7051250645a220b54918b378,Merge_failed,7e88a1778e1d92046707684289ba85e1340487a20f74d19fb4901887963c03e3,Merge_failed,8132c6d158a50b3cbe6c92db93278711d885b4434fed5208707b2cfacb1e0e05,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,9d1e9c9acf3282a1e7e77703f58a835f5d234213824050120c6fcbb5209dd3c9,Merge_failed,7cd6b8df9b29bb20efa166e35665093836dc29c918d23d3149dda2e46d264e92,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611 diff --git a/results/combined/merges_tested/oaqa/baseqa.csv b/results/combined/merges_tested/oaqa/baseqa.csv index 61a5c69b9e..bb385783f6 100644 --- a/results/combined/merges_tested/oaqa/baseqa.csv +++ b/results/combined/merges_tested/oaqa/baseqa.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/rankqa_multisource_search,1e0462637505b3a15f7975cf771777118990ce06,8d4a0f584520ba18644bacf34b2726a069664e0c,2ffc27e45b778c9570d9d701f625259945ee05f0,,True,True,Tests_passed,bd56363e9a95d4c288404ae8e3014c437323d061f27ddaaf78aec3bbcc2e3680,True,86,229,1433,2,True,Tests_passed,3d2f4a5b99ffa2582a8310240a50713ded64cffa2604eb1c7900a8f6106b74b9,True,86,True,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Merge_timedout,,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c diff --git a/results/combined/merges_tested/oauth-apis/apis.csv b/results/combined/merges_tested/oauth-apis/apis.csv index 19c0068ee0..805d01499e 100644 --- a/results/combined/merges_tested/oauth-apis/apis.csv +++ b/results/combined/merges_tested/oauth-apis/apis.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b7324372f050116584267f8d3b14da65d67e74e9,4d29337d5e240051ca530e49b7c85c425ef490ec,0a7301608cc377bc36922ae25f352ad7aab2cc05,,True,True,Tests_passed,1471a3157ec98d83fe69633e621bd309761d39e4ad7ed94e6bd4801e15e51f48,True,40,116,1688,4,True,Tests_passed,32b5269124bbbb956ad0dad71826e168a13abfe1b8fae3c74d0f3c0def5aee8a,True,40,True,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Merge_timedout,,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb diff --git a/results/combined/merges_tested/obourgain/elasticsearch-http.csv b/results/combined/merges_tested/obourgain/elasticsearch-http.csv index 91b6515c80..3de1508d44 100644 --- a/results/combined/merges_tested/obourgain/elasticsearch-http.csv +++ b/results/combined/merges_tested/obourgain/elasticsearch-http.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,37df8773d873cc3155de5231165beff1a7564b99,59f9745528d2834c08fc9eaac05be5ead6698bfb,12b0ce30efc69082dca4af70d660cbbefb1522b1,,True,True,True,9,20,53,2,True,9,Tests_passed,4a2bc4687b7476b7e88ff3b6bf2a0a915aa739de07a35f35294eaf5ba8ceb8b3,True,Tests_passed,434259f3dd81d9b54f8b3a8af0ed2285ab29672a735f4de7f2cd73b12dfc2447,True,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,a7b36daab93353f94813e49672053cea75710eb85b971877d82010064be6d3f2,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Tests_failed,1352dcaf5a2bb6be2e8025e58e1e0a690043efa420b99a633ea1eb08cc25a132,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,67aad3a2ee90592205af84e05144349a9b26aedcb902fbe0eb7f7a873aad4dca,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37 diff --git a/results/combined/merges_tested/octo-technology/sonar-objective-c.csv b/results/combined/merges_tested/octo-technology/sonar-objective-c.csv index bc11eaaa7d..74b08cd670 100644 --- a/results/combined/merges_tested/octo-technology/sonar-objective-c.csv +++ b/results/combined/merges_tested/octo-technology/sonar-objective-c.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,a1e94950696d8ca2430d435be2221196a7089ec0,47764f8ea60a7196c883c694b906b22a9a114dd1,99788e6a37091e542f7233fa10ba465474743207,,True,True,True,46,112,2378,6,True,49,Tests_passed,70b499f5406ca2c861615227320658533ab419d41a7112e2daea1baf085d647f,True,Tests_passed,8a2afde9b13c914c3e517266afc00cb6f92e7f518cfc1be2636b734337c8db93,True,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,b23bf291ad89b470aa0b63fa39bce1edb60ff4accd3072514c7fb15603a7832c,Merge_failed,6a32722a6ddfaececa73bc3c9cad31b82281551bec545fb2c791f38b8f2eeaba,Merge_failed,3e8e949763aeda9820fe9c799b9d0b0993c4f3a5185a8f2802ef311b1a8a5ea7,Merge_failed,645a52de444e39ff125d6ca64ce9652338f1bb436f0c8e86c4250066cf03b029,Merge_failed,6a32722a6ddfaececa73bc3c9cad31b82281551bec545fb2c791f38b8f2eeaba,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,b5a2c2144caae575280107c7d51172f7b5c013480641a00744176c0bf74286e9,Merge_failed,137f139337767fa12056dbbc28c46a3bf6caf1a8d5aeb31af0e935bb94759f81,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7 27,refs/remotes/origin/pull/104,b836820b107cd3bc5b7501fbccec5233804e39fb,96d4fdd2284122f3b9019d0d02b81ae3793d0d55,e8b0e178bcb565ef6356f732f33c1c9ea5991c3b,,True,False,True,6,8,15,2,True,6,Tests_passed,a36f03aef9a42aa4327b69c98c1cee4d0cc5341f763bad51cb8f3517057d75db,True,Tests_passed,b13a644ba693a782e0d8983d7f8abfd00d4d8d9fcc42118c9186b837425cc3f3,True,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,d873e576732256913858e84ee1c3f8737ec71d85e125ba6a38d12ac1f19de53a,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Tests_failed,fb2dcb2fa7933ea808916c04cd904356ea33c2e848c350bd77b1487c24cfefd9,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,13674a7f66adff1191c1504e45f6ca2b26b8e10b6b40f0b12e08b9b9c94b6a3f,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e 37,refs/remotes/origin/pull/104,6be95c55b7b58fe59a8c78260c08f8857285e0be,387a96e68627cfb548dadb842aafe80fe93b2411,fe098d3fd8ea2ad839f2a4b6763cf0d4854b2a51,,True,True,True,20,78,826,4,True,20,Tests_passed,bf5e652ece07c31097efcf50aacdba467b4f80d43a0324d0b71e5bc31a6fcbb9,True,Tests_passed,1dc16be563c1da4f8f32c0ce78631366ab76b5ed92f6b1cd1629663dd537502c,True,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,234dc460247c9b723890757f359e59115d0570487714c4c96a26cae2ee43bc76,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,8350ed1bad097f891e02db1ff74ea7045cb7f68ce7a7764d708798f6be05450e,Tests_passed,9cd8813e733cb555013e7e19a90d40b83615a38ec6ddd4885c4317d2d6538106,Merge_failed,d7bd5375cb53edfc0d4ab92816407150d3391be39f4dfd043f01f137cf334667,Merge_failed,f64d4d528beb3ddcab7e2ddb863c9fa8baf6f3811078bdd2d7f8d3bae14363c2,Tests_passed,9cd8813e733cb555013e7e19a90d40b83615a38ec6ddd4885c4317d2d6538106,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,fdde8304fdc2a974d11ab987f413d73ffea2cc4b6bb75562c57aeb6f0793ea49,Merge_failed,540a44370312414f4a22c56c81b8438f1f13c4f3578760437ff15c3a8be62478,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,234dc460247c9b723890757f359e59115d0570487714c4c96a26cae2ee43bc76,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c diff --git a/results/combined/merges_tested/okjsp/okmakeover.csv b/results/combined/merges_tested/okjsp/okmakeover.csv index 9be3509436..b03b2ef31e 100644 --- a/results/combined/merges_tested/okjsp/okmakeover.csv +++ b/results/combined/merges_tested/okjsp/okmakeover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,db184c42795a9a70b512cda17c9aef80783a12e3,24eb1f27424244ea4f537876612bc369fcca500d,14679576b6f0c1f47bad5b7f82cc7d34933dfe43,,True,True,True,13,23,375.0,8,True,17,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,True,Tests_passed,4709a0746e4093f15459ef6186bf9ba67141041c827cecd0ec2782421794791f,True,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_failed,ccd80a69a80ccd3bc1c2ef46e6ceb433a4f22f704a8cbcf42149171149a2a1bb,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3 diff --git a/results/combined/merges_tested/okleine/ncoap.csv b/results/combined/merges_tested/okleine/ncoap.csv index cd587672fc..2ade4e61c9 100644 --- a/results/combined/merges_tested/okleine/ncoap.csv +++ b/results/combined/merges_tested/okleine/ncoap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,0fe28d174e89355a76eb698dd4f13327180400a3,5401cd4daf32fd37e513f354ce05088d6513e8b1,c63bdc8c5f9e4234ae7493bc82fd6478332511e3,,True,True,Tests_passed,4382d7db0abc6f775d4cee8342f3e8365d119a47b5777ba84d764b57fa5759ef,True,39,264,4701,10,True,Tests_passed,76bc4925bde781429ad29061b49a315e6555ee9e3dd021c3527b7eadee2753a5,True,39,True,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,6b022c6e4e8659132b0790a12fc31a9edcb79b43f51b3f69014454ca111af193,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,917c58dfd7882d26b5aa67fa2ce06bd0d14b4b3c9078cc7ee0afa7b5cc9d74b8,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,878032083eba73e979d830ecad24a5b28a8ff0b6e241052ae495dc410fef0ecc,Merge_failed,d2ba5c143323b81d9fb8d214ac08a4f2ba0bd83294d3a46b1e6ec82b579d52c6,Merge_failed,d5f0b3af8db4a3be63ebeccc7c1c0459b3b6d48b8d877277c1beaa32d866983d,Merge_failed,05fd2e2b045d8fbea12c9346fc1970ad93a23a2b9aaf6fcd0eb060bbcb35d16a,Merge_failed,49b9ee5d9738aad814cfc385c046d469260972a7deabd665883f85b69504ee44,Merge_failed,d5f0b3af8db4a3be63ebeccc7c1c0459b3b6d48b8d877277c1beaa32d866983d,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,917c58dfd7882d26b5aa67fa2ce06bd0d14b4b3c9078cc7ee0afa7b5cc9d74b8,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,878032083eba73e979d830ecad24a5b28a8ff0b6e241052ae495dc410fef0ecc,Merge_failed,386e17c679f4ec3e7b59920c3ea5d269eceeba09ca24666f362681f22fd70fb0,Merge_failed,05fd2e2b045d8fbea12c9346fc1970ad93a23a2b9aaf6fcd0eb060bbcb35d16a,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,6b022c6e4e8659132b0790a12fc31a9edcb79b43f51b3f69014454ca111af193,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17 16,refs/heads/master,3df696d062b432a0dcddf572837cb5fc2577b9b8,6e8d616eba7a4151c05521cc5d1e7682feed1a2d,d17e0c0c869162d214b6e47c299ca607ea4e1303,,True,True,Tests_passed,a69c6cc86007187010aea642b0db0dedbe8e1584fa5e04b3ac015a0713433af0,True,47,180,3518,2,True,Tests_passed,d4331d677056f482e68539e46d7392373fb3d8b20e267ceca54ee449b7a2e252,True,47,True,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,de6124e3e784cb5ce21b23db4e01b4202435267212234bcf324aa82f43b8d6f2,Merge_failed,616f323c0c2b72a3a1a65f9e24a600798f647fdab6259fcf4446232cb3ef9e55,Tests_passed,f9f9dd7bf60affe302e1ddc77b6a5e9d0a690416584a629e696d07766b340d03,Merge_failed,a7e0a08e56f55100d81b89127c11f9bc208fdf50de9ba266ea150863c7c1beae,Merge_failed,616f323c0c2b72a3a1a65f9e24a600798f647fdab6259fcf4446232cb3ef9e55,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,b093b1c1207a6f0ea84fc703284b7b51675ea7c14f18c200b72e7f4861329d51,Tests_passed,f9f9dd7bf60affe302e1ddc77b6a5e9d0a690416584a629e696d07766b340d03,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935 19,refs/heads/master,38e0ea624008eb1ed648ef47d3bdd04c4c2eabe5,a67343584ae3a459c097f81423f07901f817ca27,6d29c26b4acb4624f2fba2361f07981043628e0d,,True,True,Tests_passed,6acf500c364c41bc7d266c17a09d8e61f5308a87ba89e527b71eeaf0ac27a604,True,33,126,2180,3,True,Tests_passed,2f0f2777a201f6f5337bd18f391852e565ffbd402a426382faaefc8e0b628f6e,True,33,True,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,3202c53dd7346e0adf1a479fec1b1ff433694b6d4040104617004a56dc02b140,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,3c2b6a98395c644f8b381f0490f489bc87d70fd126903541eb1fb838e246d119,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,3202c53dd7346e0adf1a479fec1b1ff433694b6d4040104617004a56dc02b140,Merge_failed,3c2b6a98395c644f8b381f0490f489bc87d70fd126903541eb1fb838e246d119,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6 diff --git a/results/combined/merges_tested/oldhu/suunto2nike.csv b/results/combined/merges_tested/oldhu/suunto2nike.csv index e52c80d28a..89cae1b8fe 100644 --- a/results/combined/merges_tested/oldhu/suunto2nike.csv +++ b/results/combined/merges_tested/oldhu/suunto2nike.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,171bc13151de4b6d205f809d0be56662b49a4920,c2f7c5f4361999291a95718ad44880dff02b2e8a,14135273289c531d1aba5d9299f21daa9fbc89ea,,True,True,True,25,24,4021,3,True,25,Tests_passed,2731ff566036bd25b66b4ec890c2fca70b35f2a7636bc13537c1e1ee5ddb689d,True,Tests_passed,ade76afd7b1e3017c23d1cc8b44dbbfda4b8156fe4a9a3f5dd0d65779e2c7361,True,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,ce6e9ca927262fc8f21cd845a3b0f87356b6f9c8ca4a1de4e8b959055bd45ff6,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,6461fcfdbe7ef8c12b960a147dfd07deeb801948984a3f4836b8d6f5635160e6,Merge_timedout,,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,9e3fd792c94c23e4663b311ba7f1af2f7182855576cc1fcf7055c84102066ba4,Merge_failed,375dc12d936de6306c22b765cd5bf575abb5aab8d6b2f600ce5b6e33c43bd69b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b diff --git a/results/combined/merges_tested/oldmanpushcart/greys-anatomy.csv b/results/combined/merges_tested/oldmanpushcart/greys-anatomy.csv index 16209c5230..805937201e 100644 --- a/results/combined/merges_tested/oldmanpushcart/greys-anatomy.csv +++ b/results/combined/merges_tested/oldmanpushcart/greys-anatomy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/master,3d5d857cabac36862f8a8e90c524908762eb8469,8c2f20402460ae3f414d0820b8d2e7b7d44e9aeb,dcc47f11ebf5eb68d090362b475ff32fb7546ec8,,True,True,True,29,127,317.0,3,True,29,Tests_passed,5e10dd945192f0ca5345d4a1c3e068a92204f4ba83d98967fdf407aa4054199c,True,Tests_passed,f8a63df2cf5b5bde16e67166e6baf4d35f8516a80dd14321f063f28f13207159,True,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_failed,a429edc0284021282afd3a8f73cc332a61f4222d8a659aafd871352cefb827bc,Tests_failed,b2aca72a6898b909612a530197e83548d461893a8a6b7f345309bf280cd2e2d5,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_failed,a429edc0284021282afd3a8f73cc332a61f4222d8a659aafd871352cefb827bc,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05 78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,,True,41,259,,67,True,69,Tests_passed,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,True,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,True,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,7d51c2d40d30035684c07dea82694954ae38646f72823094b67f10e60e9b5168,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,085365cbeadfd7c0b17d4d2b4215948c7971b32b0cb80062fb2400d5b5af9892,Merge_failed,a057e93029d1bba19ea80b4c8f3347b310a7ff8de85f97dba4a033e6ac8ede38,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637 diff --git a/results/combined/merges_tested/olibye/guvna.csv b/results/combined/merges_tested/olibye/guvna.csv index 66c34735c5..dc96f525d7 100644 --- a/results/combined/merges_tested/olibye/guvna.csv +++ b/results/combined/merges_tested/olibye/guvna.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,34cd63519389f9e2fc0f1a8ec79f770a764e5e69,02579881c322e91d755fb2583d8da6d89c863f70,f8f105277f09d628ecd30871532eb411c2d90103,,True,True,True,8,39,368,12,True,14,Tests_passed,11168fe7094d8567e21bed0a2a82b3fd62ab741d8466b1c2cd0fa13dd70a6fba,True,Tests_passed,e8a4f3bdc315ef90ef73b6eb2f8626f9e8e60e37309aeda5de0d7a0d6a028bb5,True,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,255e318c777ea96ccc4672fdc4bba304df0e12e97f7587fb7bd37e2854cc650b,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,228a289486df7d87857c83a942405c7209f19da2e3800c8c61912c52af89c88c,Merge_failed,f49199fc88d2740574e4b9b685a773940c513c63fa19f5d14d5128c498db63bf,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,39bc3acf0fe33f11b9c8e81c3aae0a3cd777ee180cf41abe3868fb7ffcb8076f,Merge_failed,fdfb23c25efc4771dad31621283bf4d48a0e1d5de834957905777ff367891b0b,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e diff --git a/results/combined/merges_tested/oltpbenchmark/oltpbench.csv b/results/combined/merges_tested/oltpbenchmark/oltpbench.csv index a3eaf3de73..2021c69091 100644 --- a/results/combined/merges_tested/oltpbenchmark/oltpbench.csv +++ b/results/combined/merges_tested/oltpbenchmark/oltpbench.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 151,refs/remotes/origin/oltpbench_tim,6bfaefb73d18a9614ec50797966446392b1cd22f,da1a4f66871510925af47869e5e3248a1f901213,bf63f51d491c4e1008973a73ec1dbea743b19df1,,True,True,True,11,32,146.0,2,True,11,Tests_passed,dc5e8ad07c4a0c15e7073bad46eddbdc940093f0145735963c9837d654f87f73,True,Tests_passed,08207e3cdd1fe2c4a7dd33327a764ad808cfb3f2e3641e277f50160cce320aa4,True,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,872fc2615a4b5ed035b12befbba7071f192483f9ad0466cda513fe29114d7ee8,Tests_failed,958e604e5fd3c9300ace7e6f48e84241ddcafd543fa053a35d7bc30cebaada0f,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,872fc2615a4b5ed035b12befbba7071f192483f9ad0466cda513fe29114d7ee8,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a 160,refs/remotes/origin/oltpbench_tim,61fcfc2877ed46a1d8b36faae932fbb557081511,b61f29da1c16ed829c0dbeee66498adb07692a3c,0af97771b02e48284db1130f2c0aafbd822ccd30,,True,,True,1308,3597,,139,True,1367,Tests_passed,2ca09b4a834d6b2256898efbd077928fad232d0d28c9a673c9b2e34d449b4c15,True,Tests_passed,bb9717489bce87787580043b3d2a32e58bda0b359858f18614879c3c8c726c8e,True,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,8187fa98e68a15e2044b13115cd3f5c2d74045d5e3051be7b2a03869ec44143b,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,cefedd83547fc4fda65ae3f9a8e2fe3b021975b21988414e7f75fe2ad0f889b8,Merge_failed,954eb93b00a610e853b51763593e918549f56be730e2c57a51671880aa8aed47,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,2e1f24fff9d52ec4e2abca34a96fd2d1b2b298567541b5a89a0d746a8106cbf5,Merge_failed,042e97e12d816f90e916182635fda912628a8a0ccedfeb8e29b1df661684f1ee,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227 218,refs/remotes/origin/oltpbench_tim,3c6f9eb68e6945dde630a5e8e4ec554114921e67,84f656c4999d251e336f98c05506fff1cb123fa1,8c359b3d410c9eb195ea796f205143d6749da903,,True,True,True,48,136,480.0,3,True,48,Tests_passed,2298980a876c2566da3eeac08389b03a7f7b8b613c6bc455f7886be44475df82,True,Tests_passed,cd86a4b1c63c64442d28380225f9c69d73bfc310ec8794a4679bd01ba6e78204,True,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,fd35ee579e936cb20188a80d324bcced9b6c743a80f3c41ffc74df045b5a9972,Merge_failed,bbb9133c15669a9c0d291c18289daf494a7f45924f388f1a2b02ebe9afe7b551,Merge_failed,33db164b6d43387582e38e2ce40363deae0ac3f352dc5224546d8eed7b68bc76,Merge_failed,a6af79933f367f88deb521c257f31cecaf5483b8bf66e8e408947179f68b6727,Merge_failed,bbb9133c15669a9c0d291c18289daf494a7f45924f388f1a2b02ebe9afe7b551,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,387a8b879543fe4e219e8c29bea935a4cdc9035c6390bb99f8450f99c0080a3b,Merge_failed,33db164b6d43387582e38e2ce40363deae0ac3f352dc5224546d8eed7b68bc76,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762 diff --git a/results/combined/merges_tested/omnifaces/omnifaces.csv b/results/combined/merges_tested/omnifaces/omnifaces.csv index 5db6b4f62b..8bfe957d35 100644 --- a/results/combined/merges_tested/omnifaces/omnifaces.csv +++ b/results/combined/merges_tested/omnifaces/omnifaces.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 240,refs/heads/4.x,05abae8be2b4e35b6c7a849b68ad6af6b07d4310,cf7b11b43e4e846ba0b49fada1a592e604c73bb1,4a9ec6a7a0b412f53534747272e7ee7d5655338c,,True,True,Tests_passed,1a39dee973eb060173c97b7d441d78c520ed8aad7cc4334df9883bdb08f068ad,True,472,3161,27465,2,True,Tests_passed,dcea7c6c928b81a7be0aa8c6e887691491d3b7a2508b63e27962cc9ede1cba7e,True,472,True,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,9211870c7360349cd0443141b8ed862ea30354a343eb9ac43ef0f8e87f36a5cb,Merge_failed,31ea7489d25eee27d5f1d95655c495e47caba8f9063bf8668f4e3013a039206c,Tests_passed,9131232da917790da14e252252e19cc1c191735edc02b4fc45591c17ddfbb57d,Tests_failed,428db9c247427c60b77f80afecd7d22a10940be57821049b12c24cbc0bb75048,Merge_failed,31ea7489d25eee27d5f1d95655c495e47caba8f9063bf8668f4e3013a039206c,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,b4d6fc41e39598e29c357aa39cf1179e384a64923b60acfd4f131b0f5291a33f,Tests_passed,9131232da917790da14e252252e19cc1c191735edc02b4fc45591c17ddfbb57d,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce 241,refs/heads/4.x,c17533a8f6a494ae15a97632aa3d536507930ca7,87ee27014bd3b46deadb1b55c5f36565af27f6dc,cf7b11b43e4e846ba0b49fada1a592e604c73bb1,,True,True,Tests_passed,b018a22d5126f356f5f3a42f7205646ba618e91b70359254f59c7534dd217a7f,True,355,1279,7416,2,True,Tests_passed,1a39dee973eb060173c97b7d441d78c520ed8aad7cc4334df9883bdb08f068ad,True,355,True,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,be516de2959930b08c965132da378f93e926cfba31e1f635c95bee4dc62a618e,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,be516de2959930b08c965132da378f93e926cfba31e1f635c95bee4dc62a618e,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553 458,refs/heads/4.x,7420b2d63f5105066f9de581c90fe5bdafb88208,414f8ce7bbd379788149dbb3e5b68f60a1710625,ee42b2dc9c9858c197e89d2f188fa69faa3cbcaf,,True,True,Tests_passed,753de711e97eb3049cd97830717442c9a5703513fb951daa85586f4b361ee816,True,7,54,309,2,True,Tests_passed,e82497232ad6d1bb55933d21230b2c84a8a33e6c77cef151b2dae135af44fc2e,True,7,True,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,ece4d5bb12fd25908b921c611842b0eca4e282d76e8c8945776c6b4dfcc22bda,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,ece4d5bb12fd25908b921c611842b0eca4e282d76e8c8945776c6b4dfcc22bda,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958 diff --git a/results/combined/merges_tested/onebusaway/onebusaway-application-modules.csv b/results/combined/merges_tested/onebusaway/onebusaway-application-modules.csv index a01e2abdb9..d8531f8d21 100644 --- a/results/combined/merges_tested/onebusaway/onebusaway-application-modules.csv +++ b/results/combined/merges_tested/onebusaway/onebusaway-application-modules.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/heads/master,e779e9fce1879efbf6a4241c6a704aec6c2faacf,f66fe0132c2d695835e1cbb85425e1eaad1b6836,6541bbbe23fe4e5be1da37c3f3711ac822f51530,,True,True,True,57,91,494.0,2,True,57,Tests_passed,e9fd9fc53bcd45c1e69d5c96aa8f8ce328e3e15ed4325633eb85eba2295e0cb7,True,Tests_passed,0b0cdf552093fcffe9a0076a9c7726926f85b46547898bdb01f9971c08cb5478,True,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,2deed109cb5bc55960dc540f861c7b5c70694ca8e976bec20c6e86ac54255d32,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,6ab758b4530459059e98840a75214c98dd4f7ff7a82193e617436360a2d329d8,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,8b38276c95e251138a7bc9f5ad1abb755441dd5110ff95bd4e2c074289d8f157,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2 66,refs/heads/master,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,True,True,True,71,111,964.0,2,True,71,Tests_passed,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,True,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,True,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3 diff --git a/results/combined/merges_tested/onebusaway/onebusaway-gtfs-modules.csv b/results/combined/merges_tested/onebusaway/onebusaway-gtfs-modules.csv index 770be9dc4f..92ee1db9ca 100644 --- a/results/combined/merges_tested/onebusaway/onebusaway-gtfs-modules.csv +++ b/results/combined/merges_tested/onebusaway/onebusaway-gtfs-modules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,8cce63143574581cb7d40815845c285d6026ccc7,bb64bf127eaed25b3c0107744275450ba6a1e8e4,113c88d60bb4cb89ddee80e562659be1b2eccc7f,,True,True,True,24,78,614,2,True,24,Tests_passed,dab14918c729705616648bda58ec7477f46e0c1605e8dda89bebbb54d18fe3c3,True,Tests_passed,13610a4a1e2545e6c693b60643bfeb7eadc634265ade660160dd0708bddc347d,True,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,411086ef0b407c7fcfe0697694580ef35123a833c7d014cc145a35b5d50d1ae8,Tests_failed,d38fb88e824c032f94f2ee88629e7833f8d7f31ee038fe16aa1c45daccbd4acb,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,411086ef0b407c7fcfe0697694580ef35123a833c7d014cc145a35b5d50d1ae8,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6 23,refs/heads/master,0dfc36d5c8bb5baea8656f9c4ea68983a8e0070d,5e20b0ca0ea45255157403cb84b356ea248a5b69,cee1328fa50808ec510d4c1dbc1f8be3ef59beea,,True,True,True,171,723,10984,16,True,172,Tests_passed,2cb3bd75e78404454c91415f3cf4782822aa59c55e49be2f795acc0c8b3c891c,True,Tests_passed,1dd80eb012f77a6d8275b7830b8f13f052764dadb032f8e2beef6b4c84f7bb96,True,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,298132f484081963456b2d3e967641a4f3483faf59957fb4a91e0807fe131156,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a07261ef575584a18c6d29496642063286f995865a9887c06e2f642e9f3613d5,Merge_failed,1ff28b5cbda4f305f6dfcc74be04317ed6561dae49be6904ef90f1124fe90004,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,5270cbb4ce3b85349fdef7cf7ccb6d9610f453c355ab86c2fb5dc86a8cbdc469,Merge_failed,10256d2e29c89a4146e74abe67ce1deca631c28276355375e517be0ef9c2a8c1,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131 31,refs/heads/master,334e85e1e3b574094e565a750b4ab2a197cf3553,20c567a27dd6c875acfee8c6378e24a02b777950,c3abff49a88a31b1ff1229481bab9b531ed8b08e,,True,True,True,16,20,487,2,True,16,Tests_passed,eb5277fa0ff33245679dd4faa8a8f1ba484c286629f4a76d71bfd20d4ddfd514,True,Tests_passed,05a20e04ee4a422f1e45d9305b650a6a80d4c87c51d3a04b42ae7e2ca52878d5,True,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,4f563744edb01397101fd4c2a56d049f3d89c336518fc0955bf90d351453b39f,Tests_failed,4add29a5c474e8cf5a76ef141370d68002c6e76d8dc6971eefe7a2681a44e24f,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,4f563744edb01397101fd4c2a56d049f3d89c336518fc0955bf90d351453b39f,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c diff --git a/results/combined/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv b/results/combined/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv index 310245af69..108a5b7454 100644 --- a/results/combined/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv +++ b/results/combined/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,2c511739c7f1597917511dc3484d38de128c51c3,e357f81ca88d9252b2a5e1aa8c671c6d5901082f,428e499bec03c4a9fa1a753dbb29be86e813da9b,,True,True,Tests_passed,dbdfaaeae976d533bd84abe43e2ff00b5f977415f78bf5e448bc00b2c3f30371,True,13,1728,13256,3,True,Tests_passed,69a1162b55e19b247c0cdc2f59d94b9705ccd6a85d2bc84479fdbf4deb644c42,True,13,True,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,d74e83d879335d550ec6308c50292848d9c336f7931346e34c753c35d2cbb487,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,8d32100d28177ce62b6df1b79ac13662e5562e3ee20b6b59c488085112143649,Merge_failed,033aabf8fe47343f53d4844e1370bee4cf658c30a4b32754eecccb0cb338cde1,Merge_failed,1c1415454090713f6ebe06d094187b56ff7a7ffa622442e7e7142a5009a685d4,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,1c9288482bdba660c6caabd055871dc920db0f9b7d164ba5b49fc9f55ca220ab,Merge_failed,a2fee9f90ad0c01191d16fac32b027e0548e036ab6382176e3dd026344e5bca5,Merge_failed,4a8bc8aff3798b25feef8a6380cb75b58eb5076a86524a6407c1610bebae2daa,Merge_failed,c2d6e6ac756e58236d90bf17ae8b2f2451cc7b3ad4c6125a0d1ef03142a9ffa1,Merge_failed,a2fee9f90ad0c01191d16fac32b027e0548e036ab6382176e3dd026344e5bca5,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,8d32100d28177ce62b6df1b79ac13662e5562e3ee20b6b59c488085112143649,Merge_failed,033aabf8fe47343f53d4844e1370bee4cf658c30a4b32754eecccb0cb338cde1,Merge_failed,1c1415454090713f6ebe06d094187b56ff7a7ffa622442e7e7142a5009a685d4,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,92c3e42838190cec89da397073ea8849c5d2575560a90991f344e51b38a308aa,Merge_failed,4a8bc8aff3798b25feef8a6380cb75b58eb5076a86524a6407c1610bebae2daa,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,d74e83d879335d550ec6308c50292848d9c336f7931346e34c753c35d2cbb487,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9 7,refs/heads/master,96a36bebafe864cf710f1c7d4fb59d6b0f6be102,30c97f6c6318d2c2b21af4b037379a4fc4066005,9cef141e244263ee6b29f6de503c0047573d5933,,True,True,Tests_passed,1303a1d689098aaaef350c57cea697928222435bcd0f7f0306f552b840685cb5,True,7,263,6254,2,True,Tests_passed,910e326a92598a4aab534d07b2f80bf0d4cd63b3a4ad319ade3b7807a6813e66,True,7,True,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,04875702851856d6b96dd33324f25fac2cbce0743668234dac27a73a10f3d70e,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Tests_failed,63055549bfb530abd2fe7148475ef8d0cbb4605abc0e36072a74266295073cd8,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,ad6e693b568ad23006ef922b03938b5855ec2f403dc170a6403110461e1ccde6,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea diff --git a/results/combined/merges_tested/onyxbits/raccoon.csv b/results/combined/merges_tested/onyxbits/raccoon.csv index 3e84dd59eb..ac9099cc05 100644 --- a/results/combined/merges_tested/onyxbits/raccoon.csv +++ b/results/combined/merges_tested/onyxbits/raccoon.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ad6961824ce68e2e909617b87fe3f852e6e915d8,c13a337e9a4a5c6d15792aac976e63152d45d5bd,c320cc3c531bcbeed8f44f9a5c813a887ec446b0,,True,True,True,14,38,205,3,True,14,Tests_passed,f4318104d3b8f195dbde99f2fcd9ce71fc5c6ab524d97c5b31b3000a7ca75703,True,Tests_passed,8cc67a04927bf73fca5bbbce428980fd10191e2f8937a88a0ce9dc9f3c9be809,True,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,0c9ed5d3ca8f5e017da36a484a22b12710ccf3fffc0f81f7a03b23d9eadcf870,Merge_failed,70331f53a66d92741d4621e7308de130fd8052b707e7807f857f245e4b529f29,Merge_failed,67e8614b224af1ab62d4798545d3254bbe2a2038ba63c215b2ff0abc1821c0c8,Tests_failed,41dab5fc5d11707e5ae0a00f7f053e348cadb81784d9289d2fe15fb9079f61c0,Merge_failed,70331f53a66d92741d4621e7308de130fd8052b707e7807f857f245e4b529f29,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,d55aa7ab1aff3d8fba0d78150f8fdc8ec1a855ce93fb59b7660247a9a09ea377,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de 7,refs/heads/master,242b60f26dd4783edf092061d17369b2dbad9ac5,1e372cfd6d21de6e607b6354c38788a9619ffecd,73ed5dcb5cfdb1caa59abaa09bd729b68eaec141,,True,True,True,11,56,1512,2,True,11,Tests_passed,cfe23c22c36420f01626e8c847674c9c0297dc31ad6ecaf03b458107087cee0b,True,Tests_passed,a27f8624e3cdfe7167828887807bcf3fa3c4b5462deefebe16646cee2b73496e,True,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_failed,d336ce1ed1c7c0db7f88f57e1a73a472a1995c5e3f1746f75f56b53ff85e5d45,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464 diff --git a/results/combined/merges_tested/openapitools/openapi-generator.csv b/results/combined/merges_tested/openapitools/openapi-generator.csv index d6c0d837e7..9432595234 100644 --- a/results/combined/merges_tested/openapitools/openapi-generator.csv +++ b/results/combined/merges_tested/openapitools/openapi-generator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 114,refs/heads/master,e00d102c471a4150da186b30d36c468d2bd72b60,8408b97771f519253c2ecc9f26349d2a958564b3,e104803781270b91c964a2cc17dbaeb1e11e35ea,,True,True,True,132.0,520,6237.0,2,True,132,Tests_passed,303d1ff9a7aa2322b787cd2857769b550800fd4076d3ec2ccf0777038f3f12fe,True,Tests_passed,08c6109b0f2a509e68299ca15d2d567e00a98e236bd3cfd78033c6e534e53c7c,True,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_failed,d6f5f0221b3493ac88df9a2ea40a18cc6401d37f19996f681086dd7a106fcbc7,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09 183,refs/heads/master,3ef7694b9f6803d8df84f5a76d1c7bc830b38fdb,59801d51672c7a33b6f5c2796992fdb428a02467,c14da15b3ef451a2ed50fdbec88656ed758dc982,,True,True,True,1181.0,7376,93352.0,7,True,1181,Tests_passed,a887acbdcd03ab860bad472c56fa6e62b1032214e1e93607732630562292e770,True,Tests_passed,e7cebe6bba51ca43304dd86e74b7a133272d4b6d703472222549adf229d9cb13,True,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,db37db0e7198fc0f1ae0f98b86b2c37b9e9e167c1ad96db5729fee8e9100bed8,Tests_passed,62db64d5125f78d4a714512591dbaa289f81c05790bb51c39496ddde4a3d1476,Tests_passed,f58ef1b64f87c8034b2e49786939f8ad1294f333d6f65e0ab9811687b55498d0,Merge_failed,ae89a78175ddf90dc608e6ed715d154b768701f212a2afbf629576db30930e01,Tests_passed,62db64d5125f78d4a714512591dbaa289f81c05790bb51c39496ddde4a3d1476,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,f1346983c6ec5f975a16cb3d0da9ed92d3127eba3fd0e72911c6d752c15b10f9,Tests_passed,f58ef1b64f87c8034b2e49786939f8ad1294f333d6f65e0ab9811687b55498d0,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d 213,refs/heads/master,c35fdc3bdaf9cef413104f9c7d34d76ec9fd0299,8dbdc31ba7a59ba8907fbe2a92cb7b8ea0d1b8ea,19d5e74dbd2ed6d643561cfdf5f4f1969b5b6591,,True,True,True,967.0,6032,72978.0,2,True,967,Tests_passed,2c4af04aa6e6c18669a920e7d5fb2142e5927aed7da7e328da2d9f64c33ca247,True,Tests_passed,6449e58cd8da2828978b57d58af015ac7f06aa1727fd44fd9c4f9e6bcbff19a5,True,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,456507cb0fd8a12b3d3af56ce5e6f8017fdb4d144d0d64054e34ff83ccd6ecb2,Tests_failed,f04f5687ca3a46a7d0444f5d2449d6cbb61b94d9079d7199c9dc004ba0381529,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,456507cb0fd8a12b3d3af56ce5e6f8017fdb4d144d0d64054e34ff83ccd6ecb2,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a diff --git a/results/combined/merges_tested/opendatalab-de/geojson-jackson.csv b/results/combined/merges_tested/opendatalab-de/geojson-jackson.csv index db69702aa5..bd6bf4fa7a 100644 --- a/results/combined/merges_tested/opendatalab-de/geojson-jackson.csv +++ b/results/combined/merges_tested/opendatalab-de/geojson-jackson.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,894661ba0d4f40c02ea56ed56abab760fb13444b,8c4446a91079a1170b5bffd0f3fe9ada035c2b42,8d47769f37e6b4aa01ef3bb9d52aff0da27fb228,,True,True,True,18,58,270,3,True,18,Tests_passed,e6588ca086257abfc5e05b878405eb5ea21b65cf09e92c6caae473f2b37ffae5,True,Tests_passed,1f4ddf696ac6a2b785eb936ee298d703aab992316a367d0e68761de9b2e87d91,True,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,665da34ddaf56f970b89d5baf38b6afcbf4e45f8f3364fc3b7754a702b002d12,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Tests_failed,3060d3d1793b8fa8a4f8fd4669abf07166f5823c99e659224039da94e74a2419,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,d89c5c88d106ab93a562a171c3acee7d993f70dba6aa91fdc181e2b157470285,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b 20,refs/heads/master,622bc5ffc17df85d7f2cbf587ee6d353862ea626,1d4b2e1c08892b185ca0100b67d971a7eb643d43,b2d344508afb0585ba49af27c758fc18a5f0a305,,True,True,True,21,37,420,15,True,21,Tests_passed,c19a4ba4da5e02bbef7d4ec7a1310b00f89a00a9b43c235658ce8318bd6be4b2,True,Tests_passed,115927d8f702672fe1a8956aeec63acd392e4e165a3c069de395c07631056865,True,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,b1f6d1744abd15660aaaba141824ae60be64d0a9333d8e41712d57a687be20c8,Merge_failed,e7a64282ab44d13d97faa233822248b7753429f932bbdc49e10b9bc608d72ad0,Merge_failed,4e67e4f6eab672839a0572894422d2355f8120779fc5cb364bafbdc037f4b996,Merge_failed,a377e0859efbd8caeaeeeb93c2655a5ace7ecb5f1e73ba88c80e84f9b17ce0d9,Merge_failed,e7a64282ab44d13d97faa233822248b7753429f932bbdc49e10b9bc608d72ad0,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,24b23f67c8da9417819761ea6d67d16675fe16e12223e210629f5e2267d86ea9,Merge_failed,4e67e4f6eab672839a0572894422d2355f8120779fc5cb364bafbdc037f4b996,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1 21,refs/heads/master,1890a5b8c56bcd2b7ca81142840d0619acdd0f9a,9aa6565a6c8412266da20fed4bb9f2ec9587cc1b,bd0009e7399268f86f28aaa2e6eb28e64ccdb303,,True,True,True,20,32,400,6,True,20,Tests_passed,33cc16c656700c7ab46b3fbbdf55adbb919c0ab5845a8eda0ed63e1aab8da361,True,Tests_passed,98a97f4679baa288a31a7d2b2129e246755f42404e0c499c317c793cfbdb86e5,True,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,0322de51bb41a536db43181865c3c958dbe326ca0842e8c6e23b240364006759,Merge_failed,be5d186f4b677d1a6649b617e2663da37bc9a3d60233cea2a619e4f9a15a50aa,Tests_passed,e88312c46534ef418ce57ab659f8dc91c3931d1159076877916e99080d9f7504,Tests_failed,6328ae00782156aeb06e867ec8079535473aa5191fc84b91f52433fdc1f6422f,Merge_failed,be5d186f4b677d1a6649b617e2663da37bc9a3d60233cea2a619e4f9a15a50aa,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,28a665069147435933bc65ca148f1da28a63a230cd480407de4de39d69ee71c1,Tests_passed,e88312c46534ef418ce57ab659f8dc91c3931d1159076877916e99080d9f7504,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8 diff --git a/results/combined/merges_tested/openhab/jmdns.csv b/results/combined/merges_tested/openhab/jmdns.csv index 9fcd5bc592..ac7bdf0d85 100644 --- a/results/combined/merges_tested/openhab/jmdns.csv +++ b/results/combined/merges_tested/openhab/jmdns.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/remotes/origin/pull/142,2c7d1a7405d9d43873f3a78f5373648ef759207e,27329d1d263060bbd6ef18bde3b7620e5edb572f,96a96e12ed57c536cdd105e508188f95fe68fc59,,True,True,True,24,105,684,80,True,90,Tests_passed,c2d276adbb95455f5b89f9e1147069ae8daef8f069d3b37f77ff1479553bc028,True,Tests_passed,e9b352a0d6f4d105e720e51c3ad42894d85df86bc0507e66a73787cad30c0af0,True,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,21b12506ca022a09c217c02d9f1824db5c12c37b09754426a64b257686ebe173,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,8153d64eb2429b26bdcd3e71f025c0d5487938c2a5c67355d23e6f74cb9879b0,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,764c29d1094e0fc8af2f3a755d99a3913840dac450d847e9025ddc620e757a75,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514 28,refs/remotes/origin/pull/172,5e925d672a496843fe245893a8d89162b5e26bbf,7d411597e93b2d64a4c4bbfe33cc466a5af67c57,fa9bb884b6eedd5692ff4afc3818de033180a26a,,True,True,True,15,62,352,2,True,15,Tests_passed,a4bbfe984345d20b1de09f0ce225f73bb0e0ce643fa6e9e3687850f643be45fc,True,Tests_passed,4bd679e3e88239f414a335a56c0adcfa7f60d587928ae72e95026b457511f258,True,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,68173618f3adcdc394a1725acaada8ece8ef69c173eba1586411c70aab48ce65,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,68173618f3adcdc394a1725acaada8ece8ef69c173eba1586411c70aab48ce65,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484 31,refs/remotes/origin/pull/206,1ea70c3c7b12342a04644c9261369d4a416f3ea1,c66c503121ee6b15948d3ea4f7e58a9ce6265003,3c4502247c73eafd19ab9e1f21dfb1168606c9d5,,True,True,True,15,62,795,2,True,15,Tests_passed,769ac0b2018934f5d449d641467e3423bcc115d7c1b118dffd1bc9542fa6e58e,True,Tests_passed,92020b944978b69aba367dcdaa6b743b79b82e7aca5be968a67b33794a0ada5d,True,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,ab3d5efff1b78344a07068ab32ce054861929f30beef6411983c91691984c09c,Tests_failed,da680de10fd9774653fa68b51fd41d7586585b7334d42e9467271e2dc7bc831b,Merge_failed,7ea0577ba8da84344522879834fc8b44104b33e48327244cc934a8bd771f5955,Merge_failed,ebd24a43e697373bce9b1f0c1991f6f84cb7ab777511504f3d834ec40839f901,Tests_failed,da680de10fd9774653fa68b51fd41d7586585b7334d42e9467271e2dc7bc831b,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,5951cd915058c81192835ff059a6a51a2973dddc4a00699b3b06de203a7ec465,Merge_failed,7ea0577ba8da84344522879834fc8b44104b33e48327244cc934a8bd771f5955,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274 diff --git a/results/combined/merges_tested/openhft/chronicle-bytes.csv b/results/combined/merges_tested/openhft/chronicle-bytes.csv index 12e9a225fa..e4508cd20c 100644 --- a/results/combined/merges_tested/openhft/chronicle-bytes.csv +++ b/results/combined/merges_tested/openhft/chronicle-bytes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,True,67,250,5935,3,True,67,Tests_passed,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,True,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_failed,4e5636abe784f3bcf0eaa39b13272c1519117a0115a2c9e24680606e23e712c3,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba 40,refs/heads/ea,e3ac571d253f5fcf85f24e64833bb488092d58d9,2caddfea71d4a3291923e5932bf994076318b9cb,4d42f73c641704d7902aa284121ab19e3c082243,,True,True,True,6,17,98,2,True,6,Tests_passed,84cc90e53681ca3be51813ccd0fa6573ecfbb2a76a204b32822d33bfe371e839,True,Tests_passed,6f35fce28168ab0482ac3702347930cba2f1ae10e297ec926ccfaa2640fbffa6,True,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,cc4df2eb325a395d97c52de059b07c4cc153fb1ecae86af69a494031ae39660d,Merge_failed,97e8829c4ccc4e632b02f3c721993aad8935741eaad61b2dc60b1374c05643b1,Tests_passed,b422e8d651ec939af5d4cba19f1cbb4a5d56bd0b9f0893f467bf9a39ca0a2731,Merge_failed,022708a8eae12696937384aa613a4c172d517cbf70b26da11a604faf03ec550d,Merge_failed,97e8829c4ccc4e632b02f3c721993aad8935741eaad61b2dc60b1374c05643b1,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,6bcca2924f5c3cb4d8430de18fa429c8365890601dd4e44003a1a59812b7b815,Tests_passed,b422e8d651ec939af5d4cba19f1cbb4a5d56bd0b9f0893f467bf9a39ca0a2731,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a 50,refs/heads/ea,5bad7e86eaeaf961867ab32657bf3d9c5f4a55af,420ea2a65d88fc2661a898a5bd25ff7b4efb1a27,b92648cfac1e07a32364e98ae1214fae8ec44e56,,True,True,True,25,77,562,2,True,25,Tests_passed,13f16a5d7750798b50b36cdcb3dccf80f54be2b171e306ea170267eb35982dcf,True,Tests_passed,e580028e81c720573643b18b671b25df9c1403f37853e8779af7b034a3f3cd9f,True,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,d8a4b9e85d89abab6949ac9da5e88efcabebe884f9cdd6709966ee6cd1c38ef5,Tests_failed,504c3d00f3e56beb9011c620609672a383c6c63fe6c239b755cf809f18cd69ba,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,d8a4b9e85d89abab6949ac9da5e88efcabebe884f9cdd6709966ee6cd1c38ef5,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc diff --git a/results/combined/merges_tested/openhft/chronicle-network.csv b/results/combined/merges_tested/openhft/chronicle-network.csv index 90b4b2352c..0da2ee8dfc 100644 --- a/results/combined/merges_tested/openhft/chronicle-network.csv +++ b/results/combined/merges_tested/openhft/chronicle-network.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/ea,297f43b8f8860335c79d857e7bdddc0ac9f8f0da,705e1e7a01074bdaf1668d53d6974ee1288692d3,17b56d9342ca579875930b1652336638a0f00ab1,,True,True,True,56,315,1682,3,True,56,Tests_passed,fa9b1521ed0d9c14b01f3e38a9976c0d31e5ddc91ba5add96afe1c399be683d2,True,Tests_passed,805787c1835f0a9a943d0d5db2d089205b40ffcc43d5636fbf02231155f6af53,True,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d 24,refs/heads/ea,37adb9cd8c603aaceb5f1fe6fc6a03cb30efcf3b,9443bbbb3c88cf311c4733b2d01d40fac2195106,2797452b9a3b6b5da491a7806943222fccfad5b2,,True,True,True,32,176,1911,2,True,32,Tests_passed,183e55f682e96030becf9d4a07495939806a62ed9d838b85c45b7efd5250f31d,True,Tests_passed,cae6e1165cbcf29ad007f1bc54c1de20baf96145383b9650a59e12519500dcb9,True,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,98810963ba699f6c8dd1aee6a482e35f440fa4985ac31b0afd8dfb1221f11683,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,98810963ba699f6c8dd1aee6a482e35f440fa4985ac31b0afd8dfb1221f11683,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50 58,refs/heads/ea,fb39c8ca3b23986ce690c7a1b35dc96657630b0d,b4649399bfd0050dbdaf5e6329ddf5f22652b592,d2fe96b2af99b24704121e921e8614a46e3628c9,,True,True,True,5,28,64,2,True,5,Tests_passed,d26f525187593ff5236073cf619782e4a5dfd283a4083e09a20c6e257cda370d,True,Tests_passed,39c54ef003b7f353851c4dc3aa75cf8a93de6ced3b57b666a804cb8be466f649,True,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,6d5b4225df2a7e91708a192d409b983816c73af90cf3a8aba48454d458845c11,Merge_failed,0fbfe0bcbe8908e5303adc90833357358ffb55427e31d1896a200e61ca67a67b,Merge_failed,009c4c1e40be192e3d112dbd7bf0f5a9cc1b18ccb1b6e466232baf8413883992,Tests_failed,ab7769c8e4ff22cf3c3a922e5288e1c87368cc5d3adadb8aa740883d0d8d03be,Merge_failed,0fbfe0bcbe8908e5303adc90833357358ffb55427e31d1896a200e61ca67a67b,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,f529785b46cadb030cc3285799c125d90ac6c4d4701457651f08ac473eca5cdf,Merge_failed,009c4c1e40be192e3d112dbd7bf0f5a9cc1b18ccb1b6e466232baf8413883992,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6 diff --git a/results/combined/merges_tested/openhft/chronicle-threads.csv b/results/combined/merges_tested/openhft/chronicle-threads.csv index 597b67d7d2..a4fecf6b31 100644 --- a/results/combined/merges_tested/openhft/chronicle-threads.csv +++ b/results/combined/merges_tested/openhft/chronicle-threads.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/ea,c79efe704817535cbb84891bb2048cea21e926a0,a354c888e4c0174d631ffb8934299161055c5b3e,58ac76a7fe6dc52a74258985f9d2bca00c80aa73,,True,True,True,34,57,268,2,True,34,Tests_passed,3bbeb351de56d4020efba79d9b680025a67964cdad15106e90e77683a4d1857a,True,Tests_passed,1891de40f58767f5a6e308e86d17ef85ce3542f293a4c2b8f138d368e3a61416,True,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_failed,0338368d37856f33107abd24d0deec3384e0f2146075d1b9d38ae453f752b8ed,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c 31,refs/heads/ea,0eea0fef995baf05cab5bbb01c1e5afbb443c039,4ebaa15919d0aeee3cb1c33c53cedd2a66bbb2a3,3d2874922c1970d9f7de17921419d820533a384e,,True,True,True,27,91,316,2,True,27,Tests_passed,a6b18a8317b666105345bba726b987d81cc4ebe1b7441375303c7c6eec964143,True,Tests_passed,563901ef0dac99fe2abfb28639f6a20a712d25f5c705a812ea09cc36aa39fccd,True,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,a4e8646f98ce8cbf7bb91a13db16cecd979b5de32b96de2a721e721aff00dc5d,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,a4e8646f98ce8cbf7bb91a13db16cecd979b5de32b96de2a721e721aff00dc5d,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c 36,refs/heads/ea,651fafcf0cdc3bbb18890955b02061bfc5f85c64,9ab050a11428838af56ad7479904209a7040b29b,b7d01c6ec8e5bdf57ecd47ed93b19624b5ba6c77,,True,False,True,2,Error,0,2,True,2,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,True,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,True,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Merge_failed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,eed80cf2eb766308de18d2f9ae8e85339f69b7262b7bdf9a5e423071ae0b395e,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Merge_failed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900 diff --git a/results/combined/merges_tested/openhft/zero-allocation-hashing.csv b/results/combined/merges_tested/openhft/zero-allocation-hashing.csv index 849da8470f..2c995d7fa1 100644 --- a/results/combined/merges_tested/openhft/zero-allocation-hashing.csv +++ b/results/combined/merges_tested/openhft/zero-allocation-hashing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/remotes/origin/pull/32,0d095dacc71fdff39d82d11674d410941d909e6a,a84b73119da25af70fa05889ff5d2298568ed57b,6daf738c303d538031d65815eebf24ad649c6abb,,True,True,True,6,23,140,6,True,9,Tests_passed,b2014e8890eacfbad9e7b8a2cf09add99c2da49ad21a20a79c40d6a821f79358,True,Tests_passed,e47a0ead91c88744a4375b6b069bf958dd4d89dca67ecf6e4a62a6cbd9646851,True,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,d1617d29d5df73973e2536488f8be522fc5cc459e41829b2c92f3414a375b489,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,deadb20374b4a01dd7109d120e966a87369800c65c4472f77d1b24b1f404ecff,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,5bd88cc6ac276d5e35a2de68486bb3aa617fb45fbd77a0ead470853f2ac65a68,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85 diff --git a/results/combined/merges_tested/openmicroscopy/bioformats.csv b/results/combined/merges_tested/openmicroscopy/bioformats.csv index e37e0e1810..4153fcf141 100644 --- a/results/combined/merges_tested/openmicroscopy/bioformats.csv +++ b/results/combined/merges_tested/openmicroscopy/bioformats.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 834,refs/heads/develop,6b73e46baf0dbd4692d41b00f2ff78078d5ed29e,9b5be44eaf4afe94938e103fd6d77bb47e3ef9ec,304290bcf9d8edf906793d9e7074d8db47b71b3a,,True,True,True,104,423,4073.0,7,True,104,Tests_passed,92fb63f9232d3ab3882f5793059fa2fc345a0feb4e5393fed25df3f663eb9f49,True,Tests_passed,747e7b9edecae6f17974e87a87b01c23cab51974cf7fe73a5e35880572a4ee21,True,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,29d4118961af043143752d4ed753e31a0d74a1e71636df03ff31e397bba5317c,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,1489a1597b15823e1fb313c5af4d58f149336198ce1b1273adc0b7954814f2fd,Merge_failed,f386d83c83981f71920ed0ffb3b4715ab0f050316fe59aa3b8358be58573c4ec,Merge_failed,f386d83c83981f71920ed0ffb3b4715ab0f050316fe59aa3b8358be58573c4ec,Merge_failed,54012f7afa5a8d6ce6204fccc233364b9c4d531ae753037e88be29d52c8377ce,Merge_failed,3425fc796c2c2caaf113d0d932aa2bd03559c15b2cd47ba8f188d19c9bb19ff5,Merge_failed,8d95205e8c46e30c7dc25ad391c385326287f4749c4df05cf073e81c8ea496c9,Merge_failed,c0e448f964b3002f7bea6d87db837437334b1355d79734f6933152a62f499011,Tests_failed,5a08b83670b2f3be8392733f677964cc587a9d0f57e6058c9f1ae6e43944f6bb,Merge_failed,8d95205e8c46e30c7dc25ad391c385326287f4749c4df05cf073e81c8ea496c9,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,1489a1597b15823e1fb313c5af4d58f149336198ce1b1273adc0b7954814f2fd,Merge_failed,f386d83c83981f71920ed0ffb3b4715ab0f050316fe59aa3b8358be58573c4ec,Merge_failed,f386d83c83981f71920ed0ffb3b4715ab0f050316fe59aa3b8358be58573c4ec,Merge_failed,54012f7afa5a8d6ce6204fccc233364b9c4d531ae753037e88be29d52c8377ce,Merge_failed,052dd1a01dd12f79c7b71794ab78b6256118fa3b0a78b5692fa14a96c1b3a05d,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,29d4118961af043143752d4ed753e31a0d74a1e71636df03ff31e397bba5317c,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07,Merge_failed,13b33d4039404a86ef3548e86b7087807e75c745afb5e31e619c3b57030a1e07 862,refs/heads/develop,3b5acd4b86d5c05cd68295c8a063c7237548734b,3013affb7980facf85178a1318e3ef7b02b5b972,02333f8ce2756991e8d35e6fdda185549852a6bf,,True,True,True,8,19,86.0,2,True,8,Tests_passed,774c2d42e09e185bb2c83e537280222f2e0a2a2eb12d3fd8010f14c1622d2d6e,True,Tests_passed,7beb1e5ea0a008264a2d59fb352b4cff14a16f9527a6e53267aae372b4d55f85,True,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,87544793c2ba1e3b850997d061d0a0614a31a6d666c32e040133f7be40d34712,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,87544793c2ba1e3b850997d061d0a0614a31a6d666c32e040133f7be40d34712,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_failed,0034129df54b0b9c807c58edc2b8a29704605f12811c8c2089988eb071621c16,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,87544793c2ba1e3b850997d061d0a0614a31a6d666c32e040133f7be40d34712,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,87544793c2ba1e3b850997d061d0a0614a31a6d666c32e040133f7be40d34712,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120,Tests_passed,4461fae7e8cbba848944c6ef0dd3ab50ac229f2ccaaa22174f0d7a6475c5f120 1027,refs/heads/develop,7568ff40d769cbbc8d7e452b99c6e70788808750,10bc13a35812e4c821c6ca89723b3eee7f73a805,2c2137338a8d08fd07b6e1d0314bf9bc93cb9d42,,True,True,True,41,104,5245.0,2,True,41,Tests_passed,779410eed3b3e2cd1d03de05bea36d5d8f38104a4c2949a3f591208eac419653,True,Tests_passed,18f982556b58cd7d79dcacc94051297d33504688a1afe11808ad3934eef24d5e,True,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_failed,ab27f2a16864624303d42444003126f28fdf658ddc7b00865d8826273c015cc9,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8,Tests_passed,204f37c082642906c27dd5ca3deae6668084612a7c6458b3548ffd858cf424e8 diff --git a/results/combined/merges_tested/openpnp/openpnp.csv b/results/combined/merges_tested/openpnp/openpnp.csv index cfd4879797..13b5e076a4 100644 --- a/results/combined/merges_tested/openpnp/openpnp.csv +++ b/results/combined/merges_tested/openpnp/openpnp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/develop,af43024e03f6d9e98c738cff8fb1424be52c487b,adee9594a676ec7a47c34de8056a713149e6e33c,084177cacd8343ff532457004e5bf6c164727263,,True,True,Tests_passed,c3afdca741bce5866a79690ce4d8914201d34b0625f0c2d22f5eed42e538183f,True,215,1710,28083.0,2,True,Tests_passed,f385dd719617c34362f988f8e5f88805f531700ddc01816d4f8e20d9ccd8dac2,True,215,True,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180 122,refs/heads/develop,96da33ece857ce8c9c2b8ff013e4781c0f03069b,8b23322749545b793ae1365f54d28ecff18ed5e6,9a14b2d053a22939b3cb66c73ff18ac6dd5344b3,,True,True,Tests_passed,ee355dfb007c1068ab1d2b8ce161e057a74e999a694798ffe7b3ae1c038c9826,True,16,162,1256.0,2,True,Tests_passed,8671d5dac4bb3ba4c6c6727f6bb0d0de4c0ae5577b66c3603048da0414e679b3,True,16,True,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936 132,refs/heads/develop,fe999d4f63e21efa1eb2d4537ec9ed1ae0c1105a,fc5da2e2215cf837bc8aaaacff852fe9b07fcd6c,478c53786e60e90cdc91f14b92bbed36b6e6598b,,True,True,Tests_passed,2c2adefb2c8a8a1352db4e878208590188fd18c195fe3dd2b2d66029fca4b83d,True,118,710,16968.0,2,True,Tests_passed,d473ee0568b6762e359a6fc396ffd62a0e1756d787985a99ba946969490a74fc,True,118,True,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_failed,8c687ac680ea4428295bae9838618a7f6e6069649304bfc31233c2e57660b6ad,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890 diff --git a/results/combined/merges_tested/openrefine/openrefine.csv b/results/combined/merges_tested/openrefine/openrefine.csv index a0dc55602b..e742a50830 100644 --- a/results/combined/merges_tested/openrefine/openrefine.csv +++ b/results/combined/merges_tested/openrefine/openrefine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,True,78.0,219,871.0,2,True,78,Tests_passed,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,True,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d diff --git a/results/combined/merges_tested/openskynetwork/java-adsb.csv b/results/combined/merges_tested/openskynetwork/java-adsb.csv index af2d4de63d..b590c9a3ba 100644 --- a/results/combined/merges_tested/openskynetwork/java-adsb.csv +++ b/results/combined/merges_tested/openskynetwork/java-adsb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,8bdd94b1653f06e87c6a9b018030d8abf5074d15,439be26d10a24cbc594e9fe07b6814b64e06c8fc,a907f893c15773ff3c6768aee25d56f2cdb3f9f1,,True,True,Tests_passed,0c567cc29355a1c43b9cd93955d8b00540525a7a86ddecfb24330fbf54929b70,True,36,98,808,8,True,Tests_passed,88b5f8e79ecbb7cb647580db4031d5282f62cb45a74bbcbe3596e57e417f9aa4,True,36,True,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,2596a6ebe3a8cebfef2a70db73690500a448b17501aed9c3b8844e4495a54306,Tests_failed,6e6c24b907053dbdec6f3fd16a432f3768d0f90a08440cc8bc057881825e5bd6,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,2596a6ebe3a8cebfef2a70db73690500a448b17501aed9c3b8844e4495a54306,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2 16,refs/heads/master,14f216cddfb325156ee31a3fdebdeadf3e6944fb,85a0255b0de8eb3eaecf8058c285313af1886256,7c4f90789ede736fdbd1161f70f46cdc273a7c89,,True,True,Tests_passed,5b84b99a1e9525efb6e40415bccafa20284cf7a1fe4598af00333746305f9577,True,11,43,355,2,True,Tests_passed,dbdfe4bf301423794f02465c1e7385409e31266d796b0d961234afd94721643d,True,12,True,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_failed,44f063fb6bca23734a967888a5c4a45d823bac13b138f8f2da529ea3dcc33a69,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17 19,refs/heads/master,8edb263ab2c4a303d3101d328ad1722d44954f64,278f630827cb2bc85a09a46fa6fb138059b39433,cfceffb5a63862428fbc5e194426ee6278c92ebb,,True,True,Tests_passed,e1a74a77a9f648bc404072113e1dd329ade4b640b9b2077f7e10ccd456c95a29,True,8,20,88,2,True,Tests_passed,d305ceeb4afd075c2cfd9cb7cb4c77f200fed743a720d8472b129734c769224c,True,8,True,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,a6b7e0e2d601980d65f6c8acef0f92b55f76615d540bea1b09a6312ffb50f1a7,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,a6b7e0e2d601980d65f6c8acef0f92b55f76615d540bea1b09a6312ffb50f1a7,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb diff --git a/results/combined/merges_tested/opentosca/container.csv b/results/combined/merges_tested/opentosca/container.csv index 44b1b4b3a9..04cd3af59e 100644 --- a/results/combined/merges_tested/opentosca/container.csv +++ b/results/combined/merges_tested/opentosca/container.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 239,refs/remotes/origin/pull/244,30001f0c79a805508ece1e8b4deb3a9549dbd874,4c4e1574aacb70be6e5922a12fc02095ad5766b4,49141fabc37abd62d5f1b439a33bb75e9438f4d4,,True,True,Tests_passed,21f0355ae28b03492dddc447cd5881d288a62bc8adda897b8a8dedec655dec4f,True,32,254,784,2,True,Tests_passed,33e7068776c823b3971dd81fb0053a73fa2f7799aef3ac5f14d9d7b3784d59a1,True,32,True,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_failed,b4da6547aa2c9c76294f86f6d2cb98a174be920d5493842df60d89d120a873b2,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202 241,refs/remotes/origin/pull/244,6b594e8970fa00400d0566a726502e3a846316e5,e608f9d07a964a909b8e6b5a2faf1c30c9721ab3,1d39227de59bd722cd32225585c956f6d38b578e,,True,True,Tests_passed,535f707410389f1def5067ca037dce243dbf44c39729688869fc3958945c2971,True,116,603,6024,6,True,Tests_passed,fec642fa5972d4d71a57c31be3c6b7df2f8cac38714ddd6de021aa2302514f3e,True,116,True,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,2e6baf7684fe802a12668a91e612115ce3579c5555551598a0693dc8aa130f3e,Merge_failed,3efad1dd28d94bc3c45bd890ed5b989d469d37564d361d648da3f6a7c49cdcb4,Merge_failed,54b32bb647973025e918659b2279dd12d56a40d6c367f6802e2ff1a4cae7a7d9,Merge_failed,54b32bb647973025e918659b2279dd12d56a40d6c367f6802e2ff1a4cae7a7d9,Merge_failed,3efad1dd28d94bc3c45bd890ed5b989d469d37564d361d648da3f6a7c49cdcb4,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,42df359c1b39a9d6c67e101f061ffb084f9633f4d197fda9f8d367427510a107,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065 244,refs/remotes/origin/pull/244,72249e5742cba06d1bbc6d1b566f4e0ccc36d044,e6b148878e35eadef61af10b02da335311ecacfa,eeceb63e333e12fabe108a44c3e105d0a5121355,,True,True,Tests_passed,4a7deec2ed96fa9d955327f3bfb97ffab2f30f6749c32a01f208f06358409022,True,190,754,11367,12,True,Tests_passed,57a575ff7f091308d7a0718d18c4af631d749bfc972dbedbf4fd8c3b204b1bed,True,190,True,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,5da4f103dd992afca8faee516a7e69f6f89d7452f2b40e324c2e077564e83cda,Merge_failed,2ea2c39683c383b14e7995338599dbb2bac9924b4d156271c8e9f4396cfe5bc9,Merge_failed,3b6a0e8e8f8cbf6fc77bb2bce8e3af5de56cdea8574a2b570c460ff01f804e29,Merge_timedout,,Merge_failed,2ea2c39683c383b14e7995338599dbb2bac9924b4d156271c8e9f4396cfe5bc9,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,890d4264d758efc31f5c5d82db858820bf639fbed3110af36afc091b012c665d,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3 diff --git a/results/combined/merges_tested/openzipkin/zipkin.csv b/results/combined/merges_tested/openzipkin/zipkin.csv index cf18613e09..5433cd935e 100644 --- a/results/combined/merges_tested/openzipkin/zipkin.csv +++ b/results/combined/merges_tested/openzipkin/zipkin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,False,Tests_passed,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,True,2,2,3,3,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,True,3,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_failed,99f26f67a1cbcce83749566d43867139517c147b462c626fc2712986e43a2b35,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f diff --git a/results/combined/merges_tested/ops4j/org.ops4j.pax.swissbox.csv b/results/combined/merges_tested/ops4j/org.ops4j.pax.swissbox.csv index ed415697a7..6778304f97 100644 --- a/results/combined/merges_tested/ops4j/org.ops4j.pax.swissbox.csv +++ b/results/combined/merges_tested/ops4j/org.ops4j.pax.swissbox.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,22aec8b7af2d3e207cd3db06e71a7ed130c1ab49,a4a563b9b8227e617f88e56fd9219562caf81d70,916b285f03483c22cf58b7efaffac807259bfaf8,,True,False,True,2,2,4,2,True,2,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,True,Tests_passed,ba04c9d476f7f588f34a228312991b3c38ba4d1fb01fb50b5a9c6117bcc959ba,True,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,1ffbdd50a6bd0e42dc6937192d055a0b09fb70b2cfb1ad6cc52e7a69ae5eebaa,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,dd6ac8bdd3e3f7f959a372421c972a664fcf0072b03605799779d6f4cc345f17,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,24646093a47b9021c9974ebd29f8440855f8f21a913b87f18030c6050c7cde15,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02 diff --git a/results/combined/merges_tested/optimaize/language-detector.csv b/results/combined/merges_tested/optimaize/language-detector.csv index 87744ef8b2..feb6ff0760 100644 --- a/results/combined/merges_tested/optimaize/language-detector.csv +++ b/results/combined/merges_tested/optimaize/language-detector.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,3420609a2503b56ec82d0ef6fa3b3b642111b55f,a588b7fbac2d321697f16815c2dd4fc6f1d686e4,cbecb11909365f6e999af39554e7af855d2bd1db,,True,True,True,3,7,21,2,True,3,Tests_passed,ce93c25b2e4b3f8d75011a0bef34e185a07a33c3bd2e8db5b78d7d80db5eea1e,True,Tests_passed,184934be0ba8bc2c54ef413acece0a5ff82ba2413cb2ec7c4301a14d897f732b,True,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_failed,9e78fa51a76d364e5ddfe3ee0377575ebb3cd7681192aa7174c75ed7a3e085ac,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73 diff --git a/results/combined/merges_tested/orctom/was-maven-plugin.csv b/results/combined/merges_tested/orctom/was-maven-plugin.csv index e64fb57e79..fa94990656 100644 --- a/results/combined/merges_tested/orctom/was-maven-plugin.csv +++ b/results/combined/merges_tested/orctom/was-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,98acec132ed7b3670db4c82820dcf584e9f83354,b3267ad21ed199e657a05671480240e748357c36,81477d902b56176c611dadb875ce5da8c01fdad6,,True,True,True,6,10,46,3,True,7,Tests_passed,29ef75aca47fe40811cd701b950dbf21975fdf682988feed5df5e90df1da8ec9,True,Tests_passed,3c3fe5a0e154f90251e15a2ac8600ce8fa979ff2a18f54bd6a5f2e15d3a6b7e2,True,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_failed,3f7c5b3d05cc5d98abbaa1c5e1e35887b2114eea80f040f771dad6de7b342f66,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4 diff --git a/results/combined/merges_tested/orien/bean-matchers.csv b/results/combined/merges_tested/orien/bean-matchers.csv index b7d0fc3d89..caf48521f4 100644 --- a/results/combined/merges_tested/orien/bean-matchers.csv +++ b/results/combined/merges_tested/orien/bean-matchers.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/main,258563a1b3e3ecac55c4d8c38742eaa1c019b7db,2eb1107603f2ee1ed902aa2874df09d30758f908,4280131224e1d2701288f3ca59413a17731fe2b4,,True,True,Tests_passed,44c4c4811c450da3b46bcc1e8b8251da13e9f5ddb4c445f410023130bc1c5584,True,104,531,7572,2,True,Tests_passed,b074acc1c25939184f4f865ca7f56e59e25cefeda93d825ba58594e10fcc6867,True,104,True,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,82ade3854741c5793fe8855d75445b78b7e86663824889fa0a976033690a71a8,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Tests_failed,5a9d0ab01fb697985acb74aad9aef48106a294a310e1ac8e37b90c59aecaa1f5,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,a7901b74b8ce22beda8e51ce19c00978ddbde32fd4ef1dedac2bfdace48952a9,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a diff --git a/results/combined/merges_tested/orientechnologies/orientdb-etl.csv b/results/combined/merges_tested/orientechnologies/orientdb-etl.csv index f706d2c1dd..1255341171 100644 --- a/results/combined/merges_tested/orientechnologies/orientdb-etl.csv +++ b/results/combined/merges_tested/orientechnologies/orientdb-etl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,889e65b57d07559f507bcef0e966f6f0612ae9dd,976e3dfeee348acdffb27f3ff0f405aa4aa91891,9a1e630ba893b0fdbe95839bda9238cd89bd2183,,True,True,True,54,239,1446,6,True,54,Tests_passed,41176f373379e6bb5255cc76c94cc131f7189ac76923a9f81418c20c784c3554,True,Tests_passed,106bf5a5477aa831b6d33829c9d4386da75f4959f2b72ff88ac2dda1c8042091,True,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,84259afd6e1fcf518889a029081782fef076cc82dd3ef04413266db1dae47516,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,2d04a3d9f05acb902530173e5d110e1c1a4fcc5d8c38576d39d483b80f60a979,Merge_failed,7bf27dddb965a28a12db02a0d512c9c7ade248c8264cea9e7968c6564d40af93,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,bb7b9af8104df1f26d1a84433a71505eeca7148598f922e1838de9cc74c10f7a,Merge_failed,dee094f30cc43cdf7d91b03865d5ed6fd94a6bdc7dc936e579f03fe248f57fbd,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587 diff --git a/results/combined/merges_tested/oripa/oripa.csv b/results/combined/merges_tested/oripa/oripa.csv index f07e9ff3ee..1dc369e81d 100644 --- a/results/combined/merges_tested/oripa/oripa.csv +++ b/results/combined/merges_tested/oripa/oripa.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,25e1fea57c97de9aa64f142cda6b22ed297dbc41,930f2deaaafe7efcf267b3f7e852b6d5ac1bbf7f,82115e639094e2344560ce153a01db190704cc2e,,True,True,True,18,39,428,2,True,18,Tests_passed,c6e140ef4dd3f47fbc5c3996d529e906ab6026b45e597f582094faaf6af31e9b,True,Tests_passed,d4e91e2455f29039364addf890e824c193b4044c28826cef1a358adf584867cd,True,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_failed,56f0eab00643b7e552219250878f7b0e27f083619719c9d7c3aefee17e7a935c,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d 106,refs/heads/master,9a817debf28a9a80e30e13a98e48228677064a5f,5b02f77e77d24ed4c753eeeaafd90838ee260a4f,c4d4fc9fdbe7dc57863b2af09ca27777e088a7c3,,True,True,True,16,75,969,4,True,16,Tests_passed,ab489302d5a67770eeca17457571d6e81f70ec1aa93e5032909c8b30bc049a41,True,Tests_passed,bbb50f0450846e5816b631f2ddcb2cd7b0b014e820fdeddbc290b4f84fed9976,True,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,81685f35db34521e2d3cf532319d531af7192d03276f6b16b6501d9d84de2a86,Tests_failed,749f8c123a94af2366612a81abbe79717bb93fb673bd76f606ab29e558286046,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,81685f35db34521e2d3cf532319d531af7192d03276f6b16b6501d9d84de2a86,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030 109,refs/heads/master,e0268dcf2e78431e371462f859ec6accd83ec4c2,4b57dd073c53b3a3ed02207b7c8b5e23b4a70b61,9c7f552dca1ed46138830f139a2742541d190059,,True,True,True,5,20,84,2,True,5,Tests_passed,2a5b19bfc40098aab5d17482374bbe8b419ef779db7309ae0e0307fa254b25a0,True,Tests_passed,0d5852a535c001eea32f86ac06d144fd0c49cda2477b91947b9456791302ec15,True,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,4f4ecbf95788cf14bea7c919adb52635bd4033fd61c371de8c900309ce1738dc,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,4f4ecbf95788cf14bea7c919adb52635bd4033fd61c371de8c900309ce1738dc,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3 diff --git a/results/combined/merges_tested/oskopek/javaanpr.csv b/results/combined/merges_tested/oskopek/javaanpr.csv index 61bff431b8..b33232d30e 100644 --- a/results/combined/merges_tested/oskopek/javaanpr.csv +++ b/results/combined/merges_tested/oskopek/javaanpr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,d8e3efe215d03370603b5f74c2cde7761bda9eec,8738dcd19876a92ef2f84746471bd9df055ed0c8,6f1735d0c9d701c91cbf76ced9f2ebdd211ab8ed,,True,True,True,14,89,663,2,True,14,Tests_passed,2ebc928da4059bbb6123846d0c5a53eb9a351bcbe3a3c275da92b883bf88450b,True,Tests_passed,5d84845fc36fb3b254ef9317230a76e3260857a09fbd8f445e49ec9b5e3b40f1,True,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,de677c57f8faedfa60a9c8c5c1009a1b0cd7c65d0bc7bbf5f4977d77a31af2df,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,Tests_failed,77f501577b0edd36e02bbd6de7238883e7db3a3827eacc620903daa5ca71afe8,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,a93ead2adbd6e5d6fbde24cb9e0abbc8f70d1d0d0519afd2897e111a2938536f,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe diff --git a/results/combined/merges_tested/outbrain/ob1k.csv b/results/combined/merges_tested/outbrain/ob1k.csv index 8fc377b847..2c5b46c1c1 100644 --- a/results/combined/merges_tested/outbrain/ob1k.csv +++ b/results/combined/merges_tested/outbrain/ob1k.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 65,refs/heads/master,8b2c257efe1aa01d49cc595d4af6f8d386d9b535,95c48c0fde2cbf37c4f074a0f38201acd2c7eae2,59da0517716f701678301ecb4cdb88f7046c8d26,,True,True,True,78,128,1869,2,True,78,Tests_passed,f145b2ae80a7ea5341bcb8457cd401440a0ff2199a11922d2a1341dcb7cd270d,True,Tests_passed,a6a20fdb76c4dd47788113f767bd7d533858319364d44fda4211f89eca78d96d,True,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,460c06e1d80c310d8283982ab2e16bcdbe37306d56ab7682870a5938fad5d53b,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,4d69243853cd7bb4a39daa9eed68b1dec4c9b7e4e3dfc5541fe8ea0111c142d1,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,671f7d6437a497c032f83eb4ef323b572bd56c875af67d57659bfc9a22e8f74c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651 80,refs/heads/master,2f4556b9770ad12dbf1ed15974eca509fd9fa1a3,86f08edf79a3939db96b71b87913c340cb7ca581,29b4ce17dda3c7ce2722402d193e040292c323b3,,True,True,True,15,16,55,2,True,15,Tests_passed,7a4d8011a037cc69da5abbfcd51de68d7d5dd32398631057603bfbe3564f863a,True,Tests_passed,84be1e81989202e76e3f284b6f0c57e21626943a2c53e280740ea4918e52a7b4,True,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,b0b969f3d931457033cbb319c220f58ee0fcac4058901c0f5bee7589dc866e6a,Merge_failed,374b1e409556b2885a479706b38d8bdea9e85a99bf3bf5138e4eb39f94e2dd18,Tests_passed,9ef38735225c4b813fc8ab4c7caecc64540c6f58dd4272cdc21a774c0aa24fe2,Tests_failed,6b44b0920e6b9dd5eeebdf5e4e030ce41c3d172079f45e7e28561b32ff765d12,Merge_failed,374b1e409556b2885a479706b38d8bdea9e85a99bf3bf5138e4eb39f94e2dd18,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,afd686a4ee914ebcc92cc14fa9e9046354f327dcff190aa23521536c58e739d6,Tests_passed,9ef38735225c4b813fc8ab4c7caecc64540c6f58dd4272cdc21a774c0aa24fe2,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658 148,refs/remotes/origin/async-http-client,3f7bdcaadc669ba2d14a424104ee4e09433edf88,95b959c0c8278609a3df395ed2fabed9ee3fadd8,0b8d271b5b6a8f809c1ecf6283d9b4c431c645ce,,True,True,True,33,170,489,8,True,33,Tests_passed,d8b8c49fe3772e8c4ef43fc7469fa5b6e98ded243d2d10d462284d157af02229,True,Tests_passed,a594bad429bd8edb90b62993736c17e4c639d317bd57ac5076fe7fb561abaad1,True,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,37eda9f45b6715a56a7126f7de8e66f5bc95124134feae98260cef2385070a3b,Merge_failed,be94983a5c1f458f20a36af90362231c46c34d92082ecfbbf99eb70c7ebcb4df,Merge_failed,236b1617eeb64bde13182ba7bae0e3b0df320bddb5c7d4b5a2ca9616533460a6,Merge_failed,28a29bb408cf64d9a5c0c99bc5f1f466423999e72092fa08c86c2c01ad3c477b,Merge_failed,be94983a5c1f458f20a36af90362231c46c34d92082ecfbbf99eb70c7ebcb4df,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,853fb9877879f7771dd50f764d8e47df296f8a98bc3e4d47a5790edbd219c448,Merge_failed,4bf0ede311816d9393c37411afb734bfea59b86ff19cd6f5d92d64caaaf694a0,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3 diff --git a/results/combined/merges_tested/overturetool/overture.csv b/results/combined/merges_tested/overturetool/overture.csv index 628fa03ae8..6b370fddb4 100644 --- a/results/combined/merges_tested/overturetool/overture.csv +++ b/results/combined/merges_tested/overturetool/overture.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/development,183044a608970fa550c097fdd98216a182cc895d,e26838e2314cf90205c0a7ce585ff32e36e094c7,b74341db16ec8531f59a05cf585979e5fee8787f,,True,True,True,158,1228,4154.0,11,True,158,Tests_passed,d858bc6f5d2452adc0be0ae78cde16890176b452dd14798e88f6cb5f6c4de24f,True,Tests_passed,45a87b3dfd9994dafc029a2f3e20f0f9042725ff9f06e5d3b283fb6260ff2feb,True,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_failed,93de5cf77822d18faeaec1579494ef7bc9d4c588bd999f4fc2b9b6588b43d4af,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6 33,refs/heads/development,66b1773e9f54abbebf3eb68880b5ee56c1061754,abc402180c032650443c90d80aaf254d5f5ba77e,20a2fa19360ff2c8d62ec2cb2ce69202a1d15d91,,True,True,True,47,207,1874.0,2,True,47,Tests_passed,a34202484a69490673b695c9c77e50e417993e38eceff7c13ea55631bfb51845,True,Tests_passed,f8a9ccfa69543bb75027f7bd52a581b5f83189e5ae0f7359841489cf7f05534d,True,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_failed,14c06680c7885da24f06340cf927f3508f8d96ac0ffd609fc8429c45fe538f05,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a 93,refs/heads/development,bffba8bbaba72042e85c88e333720221b2d54250,0af3ceb006f531b6247af4f3ef1ae87bba9f3979,e52f643de4a711770abcfc5e2a06954680263436,,True,True,True,393,1006,7068.0,14,True,395,Tests_passed,d5b6c45f50a6b9124d921068742744da27f6f356be52bf5797a8bab35b88070e,True,Tests_passed,79fa8b31bd7aef01f934bb07e5522d6473a9b1e5eb7aec7cb34270b38c2cd596,True,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,8bc95d240abe5413abf04a5c3cc009bc87026643d37c3c853cbdcbac9a2ffbc6,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,85cacce307ea32ed99bf676a20aa13c36932f667961af2c92659fa6583e63e38,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,ec3b71df219ffa9af2ffbaa730e84b5c4b01c2168348cb66f7cdee7402437e0d,Merge_failed,20369e3eb28208372a9ce8d46d6b60b92c5d0116910a87273cf855090a91dc14,Merge_failed,af0f4b90ae29792aa7020150a3f7755e97b2a7b8570b524aa07aa99f1bfacede,Merge_failed,af0f4b90ae29792aa7020150a3f7755e97b2a7b8570b524aa07aa99f1bfacede,Merge_failed,20369e3eb28208372a9ce8d46d6b60b92c5d0116910a87273cf855090a91dc14,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,85cacce307ea32ed99bf676a20aa13c36932f667961af2c92659fa6583e63e38,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,dfe9a4d699722abeb2f08540a7e1f4f178fad7fdd6a4fd1abaddf11e75dc0357,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,8bc95d240abe5413abf04a5c3cc009bc87026643d37c3c853cbdcbac9a2ffbc6,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683 diff --git a/results/combined/merges_tested/oxo42/stateless4j.csv b/results/combined/merges_tested/oxo42/stateless4j.csv index 6086d01d40..9d39629f48 100644 --- a/results/combined/merges_tested/oxo42/stateless4j.csv +++ b/results/combined/merges_tested/oxo42/stateless4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c3e521ee3857f94babe0ffe5e8e18960dd2ac186,5d313e686e2da849af39f6b7f377ce06dc30458f,099b8361e58c1f07169332aef84b9f049bde2efe,,True,True,Tests_passed,25837c3c87b90a0ef03cec3d6d84282a62157f76ae1cd646fdf77a3789f3d421,True,31,123,1592,6,True,Tests_passed,dac8464e052058132ff9939d1004fa072b9baeb21af0de8c5c32fdfda9be9fde,True,31,True,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,44d95424ff8511050bc064ebacb2eb9ed4b7c09cea5373d3c70d3af98d83ec90,Merge_failed,867df1b0425255f5c6c88b37f2437b15bbfb27b6b8f69521354c90f639c2b076,Merge_failed,6a21a778905551af1a1fd5dc2b81bb896fceef1b8249e0184322967c530caf49,Merge_failed,b1d92d873f7e2193adab044ee447f40cd972199c2acd78cddf6ae043f47edcea,Merge_failed,867df1b0425255f5c6c88b37f2437b15bbfb27b6b8f69521354c90f639c2b076,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,f16e219c80fc258aca80f45223f69a98f1b685de891f17ad5fafc5dd6622bcfd,Merge_failed,b544af7f7a03ecc483bff457a6621e9d4f276aab479a46c91ce682cdc19baa8c,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd 2,refs/heads/master,7024c77da6e879210442dfc38327f1aac8d00916,57c2134c01d9d66e19410f0322c8ca9a9f362ca5,6b6dd4a788a4eb9d3e0542634cf1fc587d1fb58b,,True,True,Tests_passed,c892f00d53dd4912601be5883ccc7fe003935a44842ff932d18d3dc04e919c09,True,26,95,1316,3,True,Tests_passed,5f23ce7410ccecc5c86db3beee1764ef814b107abe899af96c8e446eb23d936f,True,26,True,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,f27ed3b1992c9fdcb18968c4516d883587373285982a64d1058e357b00ca6727,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,0808ce0f2744120173ffb2a40826bb334aa123c2fb6adc4f797a4ae3694d5d7f,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,4a728de94f2a14c774db4bb052385064201d6b58a5bdbc75a676d962c4d0e52f,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0 8,refs/heads/master,6440f4174babcdf18818382f948c6737881cca13,96f01f19ee01cd21c322c17521a95bc1e233e524,ec3b30f0990c51ba405736d8b794ed0567565422,,True,True,Tests_passed,b32e39f6b76dfd1e0e110bcc9e17fe64c4c3fbe91ee50fc39f18cca3cd55c205,True,10,17,186,2,True,Tests_passed,fe68224212a1c61d93a1c5f554fb9ec8cf9653017adc0797a37b08b17aae732c,True,10,True,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,f0559734e9755df0daecd06700b2200c5c1ead23e7f65a0368de88b95f55a3f9,Tests_failed,d07ef06967c970ce55631392e62bc656f8ddb1cacdde171a8947d70eaeb0a700,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,f0559734e9755df0daecd06700b2200c5c1ead23e7f65a0368de88b95f55a3f9,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178 diff --git a/results/combined/merges_tested/pablissimo/sonartsplugin.csv b/results/combined/merges_tested/pablissimo/sonartsplugin.csv index 2bad8b910b..5199fc2a00 100644 --- a/results/combined/merges_tested/pablissimo/sonartsplugin.csv +++ b/results/combined/merges_tested/pablissimo/sonartsplugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,589137037749f47e451530cb13d43f497726d399,1f09a139f502474a87dc41a432a8f2f8ebd1c53f,b577ad7ed8578f40bfc37ac8ee3b455f36ca8396,,True,True,True,11,41,185,2,True,11,Tests_passed,26b44d8548052cd3e2f56763bb7546c0c1dc3b413f270de1e0d40d6f00568db2,True,Tests_passed,aa635581aae1790110be6498ef088ae7f9bc22c62dd9c4afe13cfa3b5575c11f,True,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,bc42d2a462396a492d3cac8e9a0942658ff33ee05db8842516e5ce1c80a96088,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,bc42d2a462396a492d3cac8e9a0942658ff33ee05db8842516e5ce1c80a96088,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b 4,refs/heads/master,b577ad7ed8578f40bfc37ac8ee3b455f36ca8396,fa1111336e72cc146977c4d0e71ed67508ad7200,b9320bbc7f6a3c9855069a5bbda3ece3dfd1a743,,True,True,True,17,60,159,2,True,17,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,True,Tests_passed,e665918514edc4e102e73846dd16bbe0f0c6961fe6979b439ec9da508c94e694,True,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,ac93bc58c25ea075b0cef8088004bd6d0a1215946910482999d407b931d36d50,Tests_passed,aa635581aae1790110be6498ef088ae7f9bc22c62dd9c4afe13cfa3b5575c11f,Tests_passed,afc12b05eaf1d40ed9ca0a3676e2d2558ce649c578c0f42a4245a3209e3c1d07,Tests_failed,a38607009cb2f894da0e754244dcef1750049d5e4815a7c6f03fe8ba55a31c9c,Tests_passed,aa635581aae1790110be6498ef088ae7f9bc22c62dd9c4afe13cfa3b5575c11f,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,f336020b2687ddc0880cba6acd5829dcb9519464d0bc28e4046f0d039d4cd6f3,Tests_passed,afc12b05eaf1d40ed9ca0a3676e2d2558ce649c578c0f42a4245a3209e3c1d07,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d 5,refs/heads/master,fa1111336e72cc146977c4d0e71ed67508ad7200,cfdb8aa0dde21dc4c72930180df192c0b17e2da2,106f19aa80e07eadd00058408025097f9cf2a049,,True,True,True,3,59,136,2,True,3,Tests_passed,c782e674844ca741d8cd025164a296c7bef12f2e6a380f003bb91835797651d3,True,Tests_passed,df305d0531c633179d0982aac824add0a5a02bfcd880f79ff1eea29a324e3fab,True,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,fbd9dbea85908fc3aa1f62aec9d709d1a76afd72e650d40b9f06c120f272c4aa,Tests_failed,e94445a4efba3cba5b0553c0f541f83e7b65c5f1a5bc253fe8469d1aeef1e2f9,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,fbd9dbea85908fc3aa1f62aec9d709d1a76afd72e650d40b9f06c120f272c4aa,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2 diff --git a/results/combined/merges_tested/pagehelper/mybatis-pagehelper.csv b/results/combined/merges_tested/pagehelper/mybatis-pagehelper.csv index 55b7870a65..f01e5afe87 100644 --- a/results/combined/merges_tested/pagehelper/mybatis-pagehelper.csv +++ b/results/combined/merges_tested/pagehelper/mybatis-pagehelper.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,True,213,457,2960,2,True,213,Tests_passed,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,True,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,True,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a 6,refs/heads/master,d56061dc9389545c712be42fe881ff16dd58182e,2c879208d3c9979832663f38b79f3f5923ca9914,bf1b3b3f9ccf965b8a5dd5f38e63274dfef5378a,,True,True,True,222,617,4320,45,True,223,Tests_passed,c1da8ad826ecdad3aa614226e302352eb42c312cbe1ca7133c3adf3f8b9d1483,True,Tests_passed,ae7c43394d4b6580a9917e8834a7abae287bfca35b6f24e5dbf93e1b4b6e739c,True,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,1fede94c387a24b48ab886a55416f4004732a7783ba2df041ee68bdbc7f78da4,Merge_failed,799b9ef54fb0ad9cd35bfe663a547011939e06b53ec5854e8ca0138d66091962,Merge_failed,05cb197e55460070298640220cd10fbb051da354e925a5bbab14a4641671ebab,Merge_failed,a8a0aa43e8f152e4c20662239f51fddaee2b0bfc9e318bdf2d47c102ea5c2cf0,Merge_failed,799b9ef54fb0ad9cd35bfe663a547011939e06b53ec5854e8ca0138d66091962,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6fbe0c79f6c33bed30c6d75d2cd34934ac7534c700780b6fb43cccb198f63ab2,Merge_failed,30b29a7949c79e4b245f0ae8a3a48dca06790a9b81344116688afc5b9f84342e,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091 12,refs/heads/master,f33d2fd8fef2f9a6d24dab96126a42c4ed807d89,6e0d8beb6fe1b3242ab1904065d8bd29d7da2e00,8afe9865c6580b97dff3742736b72b2c3bb6b245,,True,True,True,13,32,212,2,True,13,Tests_passed,120b8ea5c423761a119bb6579f9b2980297833062af37b4671b4f5c2df4dc994,True,Tests_passed,e259f454141d75c23adeece04662ca20ccff84309575633fb5e8f636d9aec981,True,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,58224fd91a5ffc1dba7d7e061673f8fe5367e5b2de9bbbef30d46cc38bd53585,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,58224fd91a5ffc1dba7d7e061673f8fe5367e5b2de9bbbef30d46cc38bd53585,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30 diff --git a/results/combined/merges_tested/pandcorps/pandam.csv b/results/combined/merges_tested/pandcorps/pandam.csv index 02d22bd906..2e21409526 100644 --- a/results/combined/merges_tested/pandcorps/pandam.csv +++ b/results/combined/merges_tested/pandcorps/pandam.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/remotes/origin/pull/4,e736609b61dd04e3f96861471d01ae60cc1a2a17,30964f94cc1b51cbcce298f904db4b8ffe4e4b92,75dbac355e592d1e833162770e5a10dcd855a6f7,,True,True,True,32,101,751,2,True,32,Tests_passed,4163be707dba47263e222b36826e25c78ec7591130d0e139cc7b76c376f2b871,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451 diff --git a/results/combined/merges_tested/pauloricardomg/cassandra-list-subranges.csv b/results/combined/merges_tested/pauloricardomg/cassandra-list-subranges.csv index d9f42a7a71..35c5d2203a 100644 --- a/results/combined/merges_tested/pauloricardomg/cassandra-list-subranges.csv +++ b/results/combined/merges_tested/pauloricardomg/cassandra-list-subranges.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,3ce571f04ef9f3edd662c1de88ce5031fe700fd5,6d92e44549d058b29ab9d5364655d07ed522cbe1,0229efddf3f332210b4ca3f071e3d0d0160ba39a,,True,True,Tests_passed,28c8f53d23357fbb6114098f4789b14497f750ef57c8e179ffe9ff98c44e1961,True,2,9,26,2,True,Tests_passed,24b23da3ffa9aaca3c8f982daf70d7b1babe0d27de17607e60c692f678e2bd3f,True,2,True,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6 diff --git a/results/combined/merges_tested/paulosuzart/jtornado.csv b/results/combined/merges_tested/paulosuzart/jtornado.csv index 9228098a59..e56d4d23d2 100644 --- a/results/combined/merges_tested/paulosuzart/jtornado.csv +++ b/results/combined/merges_tested/paulosuzart/jtornado.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,867caafa1ae38b42514802a7708dc1ce43fe1872,7a94ea1e15324a7528bf8872f84f3a6e7dce0776,9422d8460228615b9a4e005a44ee70d022eab1e4,,True,True,Tests_passed,b358d1ce828d23f153456f813d803d8aa09623189a62048585aeb9672dc3a69e,True,7,30,141,2,True,Tests_passed,f130c0df32080aabebad40e26baf48744fae4a52a7b0977fe19d17802b4aae97,True,7,True,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,7684dbead1bd3c6451eb96ae5472941d42b12d7957199c697c8e90fea6252dbc,Merge_failed,925e3baa4002f72319322a128e5d81ad5ed64af50e1ce40910d84b77c9ac3ff8,Tests_passed,f70a854d836417b0e5d9cd6b34f1bd2d2e1da8b82efbbc8e57389f8925c92d62,Tests_failed,c3e0b40da26dde63330ab7b263e4c67d9ef49b3105eda038c847b9f56f0973d5,Merge_failed,925e3baa4002f72319322a128e5d81ad5ed64af50e1ce40910d84b77c9ac3ff8,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,090b5407104432be14f166f4f06f7116989dc2a577d1d1dfb7a485eb0a7900f7,Tests_passed,f70a854d836417b0e5d9cd6b34f1bd2d2e1da8b82efbbc8e57389f8925c92d62,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b 3,refs/heads/master,9422d8460228615b9a4e005a44ee70d022eab1e4,cf843699996539a0fc61bdaa6854ff4f65ffabff,e6790e95d502a20445aad19b2770ff36ea365932,,True,False,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,True,4,18,74,2,True,Tests_passed,5d294e257ae9233daf5b86ddcae1d21da2ff5f30a14d8e0ac82af6b70328c26d,True,4,True,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,152a1d15a19594fc1752345a6912ab253d866815521d8a04586581eb62a3c5ae,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Tests_failed,243ec1745f6f7b66095c5d4bb23ebc3bfef88f519d3aa5ded383291d2938a942,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,d52f9cf5e948fe68f2b69efdca9505249236f1a6b1f0a61b1b88d785470ca287,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c 4,refs/heads/master,cf843699996539a0fc61bdaa6854ff4f65ffabff,752fdf5c715aa6e96a6cc74d876e2a7b83a91c2d,ca1ded879979e823de084d1c94e5b1058b933a44,,True,True,Tests_passed,733cee865831f53c4e7cc436ea96e6ff88c9511ec2ad1223e82da473e373e96b,True,5,14,105,2,True,Tests_passed,80d56a07132a954667de36ca8e9879877f3823d8e8af0bfbe92986adc12114ec,True,5,True,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,5f66f556d7b8096b92b87828fa004d6750998fbbb0e1450a0bcd2734ffbccfdf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,5f66f556d7b8096b92b87828fa004d6750998fbbb0e1450a0bcd2734ffbccfdf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682 diff --git a/results/combined/merges_tested/pax95/camel-ironmq.csv b/results/combined/merges_tested/pax95/camel-ironmq.csv index b8f2243914..c4431230c2 100644 --- a/results/combined/merges_tested/pax95/camel-ironmq.csv +++ b/results/combined/merges_tested/pax95/camel-ironmq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7b8e755aa410ddd2841a5471f78bf5256a647b76,99829bacd2e267749b108a0f43d791aff9c73961,2f1b5ad99c6b72f8e20e336c7d3dd2dc1b65abf2,,True,True,Tests_passed,e4f3b91ad8e832a90f5c2b0148860f7e21b51b0706800fc2741d9a5baaecdd36,True,22,111,665,8,True,Tests_passed,98bcac037fb4c79e39fa1777ec31e445378cbff424321345108d18c5f41bd722,True,24,True,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,52b5479eb7acce0e533ee45008c2270ae29371f4e989d8348f7b6a6a61a3dbf5,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,e058ee915396897c34c409293d8be54f2f52936fd2925fc9fd348f30f3660bfd,Merge_failed,8e5c76fd46add4ac468e9323562bcb40462ba2485ffb92079649c0bdf1a30df1,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,ed5b500682aabf20c025abe3b9971ba489058ea9f2a8a3d476f842cc1aebf25d,Merge_failed,b0a1e42726088f33da5d8a94e97ea89f889a48ca3bd0851589f7c63ecfec8d4c,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a diff --git a/results/combined/merges_tested/pedrovgs/algorithms.csv b/results/combined/merges_tested/pedrovgs/algorithms.csv index c25e1aca10..507ac3eff5 100644 --- a/results/combined/merges_tested/pedrovgs/algorithms.csv +++ b/results/combined/merges_tested/pedrovgs/algorithms.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,False,True,2,20,219,3,True,3,Tests_passed,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,True,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,b6c0da70d24e30bdadd393948d91c3d07b50a2c1af43ab2d6ff67bd2f372f3cf,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,963798546c8c846f2ad839e3d786c30a7fd48465c315804dacd9649a102e63ce,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7 19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,True,3,10,78,4,True,4,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,0f989663818299a0c7aa64adc393891dae1962999465d1cf62fc88d3ba0b1cec,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4 diff --git a/results/combined/merges_tested/peterisp/morphology.csv b/results/combined/merges_tested/peterisp/morphology.csv index 921312fe6d..d24e0fb400 100644 --- a/results/combined/merges_tested/peterisp/morphology.csv +++ b/results/combined/merges_tested/peterisp/morphology.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,a6926c1c59e119a57a1b37a5a896bddb02cd5ef9,fc238776a6699ed0e57b7a2660b05020c80fb170,100aa04cee519d67271e308427467c03d852ad8c,,True,True,True,43,54928,556327,2,True,43,Tests_passed,86456b028f28be961d7e6ebeb547e6b33ffdf27b7d2f02f080b813d071368865,True,Tests_passed,11a7cb449fc3a5d86fc81f324fca40bef6f0fb929604e610fe2901494bd30dc8,True,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,916a4be8953444f0729c45dca965019d62680d6dbdc9352d3a1654092bc94c8d,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Tests_failed,294dcdd0ea20ee90f6227445b6b7f6127abbe02fcc3ca58106c7864b39b3387f,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,b5bb26ae93ba80cda112e7679e3da9000c8ad97a316596995b550be82dad685a,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f 8,refs/heads/master,65286cd06540300489c1685f18339d2cd5627777,478610a255cc949b1677f191c12a8d9d8a4f0652,03e66473a31d8dd0d76b1f9c738d63e8da82896c,,True,True,True,10,629,221909,2,True,10,Tests_passed,0b023c0dff680a9a1e496cf47ae4c0bb676d726935a9e9a5b9f1b2c5e4ba3d8c,True,Tests_passed,e443ec3df2327f5fbc803f99ddffeb41df631ba8759454f7b1fb1b87a1b4ae96,True,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Merge_failed,f2a88004bd0814c7022a34aec3676c5b38b1582cd6ccb4c5c1344bc78ebe60d9,Tests_failed,4f03c8fa5ac38119068cf8005e10ec7e033f1c44d71bf28d3d2512b92f22c7a4,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Merge_failed,f2a88004bd0814c7022a34aec3676c5b38b1582cd6ccb4c5c1344bc78ebe60d9,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50 13,refs/heads/master,7e42a617566d2cccfda07dce17d3d836196dbbf4,9131ae9f793e56c445dd8edb5695746b35498f19,efc39e6724353c0196af4ad1eb3bfbcfc1ef2f4b,,True,False,True,19,627,23005,5,True,20,Tests_passed,dbff3b928964cd359692856e9849e281e5483fa3975f4fa3546fc7597bd697cf,True,Tests_passed,a1fbe4c199ecb15cf1b76de1c14e40f9d49b1e07d14193f09c949d59cb9eb148,True,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,d73568106debf3a215092dbff3b3d605ba229bdb8515a04664db246c28cb60bc,Merge_failed,9b1fe11e51dc3b2de9c78e77308f58fb0a8ff8994f3bfc75c17b3578df657380,Tests_passed,9fa250d5929b36350cf2a34d1b0b88a8d46c88c3f32a1b6acb73b1ddb731599f,Merge_failed,1ec75fecfd46026a269e362f7aff8c90b43ad09b985e95ed74564947419dbbee,Merge_failed,9b1fe11e51dc3b2de9c78e77308f58fb0a8ff8994f3bfc75c17b3578df657380,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,6b32ce56b9a7bb9fa9d4c8099226ba24adf4c59e7875c81e99e552a303c30853,Tests_passed,9fa250d5929b36350cf2a34d1b0b88a8d46c88c3f32a1b6acb73b1ddb731599f,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6 diff --git a/results/combined/merges_tested/petitparser/java-petitparser.csv b/results/combined/merges_tested/petitparser/java-petitparser.csv index f2150722c6..31dc0f3f59 100644 --- a/results/combined/merges_tested/petitparser/java-petitparser.csv +++ b/results/combined/merges_tested/petitparser/java-petitparser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,5,13,32,3,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,5,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857 8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,18,89,800,5,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,19,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Tests_passed,6a90f4b7bc33e9f919ad85773990cabe2c91b61e9782786d2d7907fb2178e652,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7cb2ad7d0c4d0af9ef25a73048ab02b57b1fd70ae9f71c206f2d870e15bf7cf3,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504 diff --git a/results/combined/merges_tested/phaed420/simpleclans.csv b/results/combined/merges_tested/phaed420/simpleclans.csv index 7e11003364..c0284de9bb 100644 --- a/results/combined/merges_tested/phaed420/simpleclans.csv +++ b/results/combined/merges_tested/phaed420/simpleclans.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 93,refs/remotes/origin/1.8,2244703564dec7ffa4bb40114daae24341080275,ff5157feef2adfbd33e9bd8b866b4c318e8e3290,68065a3b7988e6f0d393dc816784a3621d086302,,True,True,True,31,140,540.0,15,True,31,Tests_passed,c7232dcd30b73df118a42d7c2e87de55b3fedf04dfe5f0e238168dee1c36be80,True,Tests_passed,1b12986f72df4efaeb8dd9f8bd208c1f789fcf09e4f45a37ecc51e64607533eb,True,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,96cdfc0db7ea9d8ffeb41912f90839fae875c77493579b74f4f3a36b4e53dd5e,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,ba88f4c586ae15b3db26934c448f6a8f64259327378116ac6dae7290cb6e6ad0,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,95a329450c89a6c7e4a4011f0b31e197e50a1133a1d7396884d8ed51710e91ec,Merge_failed,2cc4b045bc08e5eddb77fd9e97320115616440642ea83d822a8e2e97fa58a63e,Merge_failed,42d007fb6451261df76a1ddb5ce916128fa158bc4ca9be09c32cde799431dfb4,Merge_failed,7aafa6d7547b2f0216f042bfa68ce767dcb28205b84e2934a9cd7f96640f1324,Merge_failed,2cc4b045bc08e5eddb77fd9e97320115616440642ea83d822a8e2e97fa58a63e,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,ba88f4c586ae15b3db26934c448f6a8f64259327378116ac6dae7290cb6e6ad0,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,3cff889dc935729764fb64410b45643af5188dae0ce22e5dca3c57511c0d3e48,Merge_failed,03275d0c2ffc63dbab0ed5a8a62d1e8dca0d45cc81dcb8d6a4d4cd5d5056c076,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,96cdfc0db7ea9d8ffeb41912f90839fae875c77493579b74f4f3a36b4e53dd5e,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d 111,refs/remotes/origin/pull/578,a30dbb49985fd1da095e49ef9afe95b8857d0377,b331e2c236735dc0d9497d8214b16debd4fd1b14,baf71a449293a07b34179e49ee0de1bc9e7c7928,,True,True,True,47,111,5000.0,8,True,47,Tests_passed,762fe5002aa077cfcf3f7780ff3f95ed590c0badd0f944b35f16f72f73de587b,True,Tests_passed,8406011eca89cd6e530fdc63cbf413e753335818655784ac102c4c6b3f2ff0c1,True,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,3af903d5c239a61ee36f060ede655ae558e8d2ddbc41abcdd24c3270bb79a3e3,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,141949ab537fc49e25b64d8a57da96a142796467dfe693500c4ceb91886279bd,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,7870fe3eb1156afc583bb9e6c173f59563ef47ba8648b431b9045ad036eb7a14,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e diff --git a/results/combined/merges_tested/phantomydn/wicket-orientdb.csv b/results/combined/merges_tested/phantomydn/wicket-orientdb.csv index db3d87f2e1..724ed7bd41 100644 --- a/results/combined/merges_tested/phantomydn/wicket-orientdb.csv +++ b/results/combined/merges_tested/phantomydn/wicket-orientdb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,19e9f8c8ff01f4ef6b39006032470baa83079eff,b7ebfd2dd8fc973b786f7c9222ab16a02db04750,ffa22e555317de565ad621df69faad83764e6d45,,True,True,True,6,9,116,2,True,6,Tests_passed,b2122492e7f0bc3e18ed7ce1df53cd90bb523f70c9186a3cdadadd949ddd6799,True,Tests_passed,e08cff51a5db84e0837c335f6c5cb3e9dd96d2ad114d121f2cb2d56ba23c34ec,True,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,ccac1cf65d870a8b3eb46ac0209a83b7372bfc1bd45e52c477967123013b800e,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Tests_failed,3dd8c7c6eadbdb193c8556b5812fa50c109d8d5ffd905b499cff64040217b872,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,fb821cc8ae6f44cd37f178f69b8c0c67e1c762d17f03e9287b2259b09cbb54ff,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2 51,refs/remotes/origin/pull/43,464f977e4a730a3baf05339503fada6001ee2cf1,6ed823b09aac1ca2dbb4db0af7cd76e3d915561c,8ae1d5b93b5372172ea59a8765c3239aae64c42b,,True,True,True,2,5,11,2,True,2,Tests_passed,8f22e5217fb16f4ba3066f0d0444a0f5830cb036d4e104e79ab929e287dfa661,True,Tests_passed,284bb7510cf17bf06b796ddddb8c27af4d3ac57bfcfced0b6c0b628331bdcdb1,True,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,4918a4f1aa4e7cb6ab016e7dd5b8732d5d2b60378f81122caa88327a832fe154,Merge_failed,f315f88cfbdf5f9f81955516561748aa243bf995d2a4876d35c8b49048045f0a,Merge_failed,87b9dd321b234abef12995c3675a75529efc464edaeb0bddf35a49f34d24fe25,Tests_failed,d00431f473cd028ad792b446c93ad6fc2cf87a2e99a9aa498d919bfea3ffc880,Merge_failed,f315f88cfbdf5f9f81955516561748aa243bf995d2a4876d35c8b49048045f0a,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,47322e4a7d35168ef2eb05b4ffbd357b8fdb6b5505248ae782bc78d6335dcdb6,Merge_failed,87b9dd321b234abef12995c3675a75529efc464edaeb0bddf35a49f34d24fe25,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6 52,refs/remotes/origin/pull/67,9946b0eae418dee769912f05e90f9d9516da3e97,8af4e9654d9ba1c81bce99a28d69badef75e6d38,eec916d22fe0bdb373c29a2344e75960f4bfde90,,True,True,True,14,33,461,2,True,14,Tests_passed,d44048b7ed03748dd24f7764404058e4fa6107a1ca870b486765b0720bd72419,True,Tests_passed,657ba2e35da8d29b389d932f1337cbbf3fe40b11b3f0fd7417ad03524255ba7b,True,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,7a31d63f826c9a74360ad491d43229a754795e03a95bf384179ffcc305bfd6a0,Tests_failed,49c76be6d9367e9873df70a8b82d2f5b03719bccb36ecedcd6949fbda545a53f,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,7a31d63f826c9a74360ad491d43229a754795e03a95bf384179ffcc305bfd6a0,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b diff --git a/results/combined/merges_tested/phax/jcodemodel.csv b/results/combined/merges_tested/phax/jcodemodel.csv index cabb8f7e8d..6f08c2f754 100644 --- a/results/combined/merges_tested/phax/jcodemodel.csv +++ b/results/combined/merges_tested/phax/jcodemodel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,32486470c55c2a6b332600c7c693c47c9a91e7d5,3c1f47480aa985b1082bcc745d32f4651a507f00,b8d8fc639b766319a36039a4823d6d90767254ba,,True,True,True,199,203,1190,2,True,199,Tests_passed,f3ad7992197e97651fa975e95f4937615305d406301f7634661f014bb637f613,True,Tests_passed,eff388f4e1cd024d8b49700d9e4b226bce4d04e54da8d397de0b20af92f9ab79,True,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c 6,refs/heads/master,43ecb3931e9fe8fdb33d34de734c4e126285597e,010e0fc752e2cd642ca3976d1e87108f5a3a6257,ec12c7fbe391f0258b4cb12feff6379c75438534,,True,True,True,57,251,2036,3,True,57,Tests_passed,177dba7a951d0fe5a8fc46648e7fc5b2635826ab77b9d2a2d2ef1172f467f575,True,Tests_passed,03e10366eb5130c6c4dde61af6e240fcb02e8821f78615f0fc37526aa3937bab,True,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,6f80a787154779105664c24a596ba6da73f4fb1caee891b2bd80d08c86fb9550,Merge_failed,c6d3cb3afd91ece68f487c6a16aa98bf75f85749a21b6a2ac9310f74f56174a9,Merge_failed,c76d15edd9e9bef09580d0ca5ca4b429ccf153e5b7018fa0bbe7223f47997f07,Merge_failed,c76d15edd9e9bef09580d0ca5ca4b429ccf153e5b7018fa0bbe7223f47997f07,Merge_failed,c6d3cb3afd91ece68f487c6a16aa98bf75f85749a21b6a2ac9310f74f56174a9,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,2c6c0710468fd91e97af1a778d28b602a93ca3ec11b2fb3c7641c0cb24a44ab8,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632 25,refs/heads/master,49b6f3104227385851c1f69782c4ea481618392c,001bef9518ad20eda5fab7c789cb3b478cb6bf8f,a1cdd8fa802617380e59b8bdd307d681cf5e45fe,,True,True,True,13,16,3996,2,True,13,Tests_passed,eeb7d3c12e41e863e9f15c59bd373e61b92d4a8eae8732c9957d483bc324eb6b,True,Tests_passed,461ddc8d274b4dad9f86bbfec96654a340d2db0810846281bef332c313801cbe,True,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,a71341f9f68ecc53033b891dc6ad4dede839ef08334fb7fc4db87878ba70e9d5,Merge_failed,bad1486da2c8ccabaef1403d793847ff04dd07cf60a05ea12ab874c7fbe25748,Tests_passed,8524a248b54d9bafaa41ce086ac63b6a95326eb0c82b0f219df6860ba0a2a709,Merge_failed,54dbe43ad5f0b1da6359cee7c6cde0d2c476fd399f988cbd23c061fe08221ce8,Merge_failed,bad1486da2c8ccabaef1403d793847ff04dd07cf60a05ea12ab874c7fbe25748,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,6a296efc055cb5e4128fbeda0f3897c58166983cc6a86df37d85c7a1d50cb3d7,Tests_passed,8524a248b54d9bafaa41ce086ac63b6a95326eb0c82b0f219df6860ba0a2a709,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593 diff --git a/results/combined/merges_tested/pholser/jopt-simple.csv b/results/combined/merges_tested/pholser/jopt-simple.csv index 76c256416a..e5dbe43663 100644 --- a/results/combined/merges_tested/pholser/jopt-simple.csv +++ b/results/combined/merges_tested/pholser/jopt-simple.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,31ed6b5b2c903b5fdcadf5566bb1a652ca98fb9e,72943f9a609e2526a0de7486f83174ad8339b3ad,30588ec165991be5058ebde94917563d87b47460,,True,True,True,183,497,1749,4,True,183,Tests_passed,a79c08db02591270b89385f9b4acdddb9201a48a6fd7f3cb32f33e037f92037d,True,Tests_passed,bf17e7d14b35adbb3f33675619aad722bbe7f6e6a9145edfdea1d7201c703ba5,True,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,085e7a9becd7dbaf87c9f58db8fe96611e99db595f88d8cdfe70fded7ef408b5,Tests_failed,9ee1a768eaed5c762d37e4cbd9eec573d47cc93f0b2377652be61456cd7fa426,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,085e7a9becd7dbaf87c9f58db8fe96611e99db595f88d8cdfe70fded7ef408b5,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87 14,refs/heads/master,bdcb06831908b4976afc88a67289839a25e7b826,b6e7208e6f31aef4caf048d85a9ee3dd635a44fc,57d378a716c24651b9226e600031ada43fdc4b40,,True,True,True,177,474,1451,5,True,177,Tests_passed,f5efd32cc9e53141f7a40a8398d82906162e50c92af11371ffb0ff305c172886,True,Tests_passed,3b0c81509fa20ef47627200900cdab74556dd22b90b915fbddb3856e9524140e,True,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_failed,29d5f6eec216260a80d9d2ca55ed9e690d98faf7e96712bcc481a49dce43bfaf,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272 diff --git a/results/combined/merges_tested/pholser/junit-quickcheck.csv b/results/combined/merges_tested/pholser/junit-quickcheck.csv index 9b418d674f..3d518e00b6 100644 --- a/results/combined/merges_tested/pholser/junit-quickcheck.csv +++ b/results/combined/merges_tested/pholser/junit-quickcheck.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,82018eb390ce060d8e32a32961554f77973a92eb,d41d56b567fe3ddcb2da98f6a199d31c0fed5765,670a37e18b46b93c691cceea314f16ba719d2a47,,True,True,True,432,469,1217,5,True,432,Tests_passed,9788013b7efd4478965bbb84574c7b0274f51196e3c50306d5045739419d844e,True,Tests_passed,a7f5b56a9eb53f57e29671109c9cb74b400b5716c585d68f1d22f4b5cb58fe39,True,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 73,refs/heads/master,523b2280d5f3239b1f8674adce708f67250bbccc,ad2e9f9e1eb9461f1804cf01891149df87b770f5,4f4a92feda5173b522fe0fc152a1d9424eb7cb19,,True,True,True,397,400,1082,2,True,397,Tests_passed,482f83810c813214f6479a226c27fddf80621014490edc3d960cbfc6abc21fbc,True,Tests_passed,a3791a687589128fa4c6d224781e907ad0e0c402a827d7218453216892e34092,True,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,15ef05c0b74295a6577da65c89a44ef6394f95dad3bfaa88710994fc04d5751e,Tests_failed,92ed45ef12e1260938cfd2b87d58c76311cce776a99725d631ef6c8c74416b4c,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,15ef05c0b74295a6577da65c89a44ef6394f95dad3bfaa88710994fc04d5751e,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab 85,refs/heads/master,522688761ae36a55f4420e247aeb70ef6a7bec1b,5d077abd00975228364512dc8946bd3becf9ec33,36e11206f2401a42d11fec5f99a47989d8a13a39,,True,True,True,188,489,13245,6,True,191,Tests_passed,e978fe4da8ee3e062aaa0ca0659fea47c076f1dd8e6c3a9a1ca84092e029bcb0,True,Tests_passed,e480885050c51737a4c4066c2feb73737dbb530a2900f77ee2197d20d8b495f0,True,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,030d441bd2fd5fe5ddc2e1e48b317ddea34a779f6fe5e9694dc8041dabad49f2,Merge_failed,5fbf937e4e921eef26ca21b116049a271dc573e52cab7720204b52847f9382ae,Merge_failed,21f2d9439d9ac5860a67b41b0bb0dc7ddd05d3e490666d1aa175494524e99a5a,Merge_failed,1663832d183689a9a620c155828b4d25ea8b4d528410729f321832a628efdc5c,Merge_failed,5fbf937e4e921eef26ca21b116049a271dc573e52cab7720204b52847f9382ae,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,e640d10b29782eeb9aefecda8831e657cc4b3740f678ace6806bacbe9213531a,Merge_failed,ac48304637bc692887b185890d3018b7a0ad3ccf696be736b87d3d229e80c6ca,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471 diff --git a/results/combined/merges_tested/pires/obd-java-api.csv b/results/combined/merges_tested/pires/obd-java-api.csv index 4e75d8aec3..27523be4dc 100644 --- a/results/combined/merges_tested/pires/obd-java-api.csv +++ b/results/combined/merges_tested/pires/obd-java-api.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,c7a50bed5f74a5fef3eb31e4d84f7961a0a5179b,6f65fc8e18df0321892bb40bb777b777059ad29a,90ba201c98ae2de3e804dfb7d78c90d473899108,,True,True,True,71,353,882,3,True,71,Tests_passed,d08d717c41b4db8f05dac62b14bae02f3da7bad7c360dc23a71af0a117a19d8c,True,Tests_passed,6eff6345c38156ff6aed5e3d5c7fe3d49caf838f0e0173401137e19e41f23f72,True,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,8a828da2f43b5d1ba8591a30a9458f55c1a758e4b91a24e46e1a9c207c2973b2,Merge_failed,41f575b3b449d5f1a1cc1c7852276340c132cae2718bc874a7b28ed933e3b701,Tests_passed,13ba87793ce9bfe4f90b2ca043445f24d4faf00462bf687c73ca9127989bbeba,Tests_failed,e75db96ffa20f5fa7329c17a495b356424b2d73114e6682a7992f45c6012a0d9,Merge_failed,41f575b3b449d5f1a1cc1c7852276340c132cae2718bc874a7b28ed933e3b701,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,e9e777e526dff19b8d84138695f2c6f47395c4e63a16e5ab9823f29cf94f79ac,Tests_passed,13ba87793ce9bfe4f90b2ca043445f24d4faf00462bf687c73ca9127989bbeba,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a 51,refs/remotes/origin/pull/80,f755208227503c01478c10a0912fd469d0ec5d79,fb2058698022dc891446c1367a27a8be2356bb4b,8d61fd4c32fb3bf9d99c44b078fab8c8087b4b98,,True,True,True,10,25,259,4,True,10,Tests_passed,1e4e159a11ce06872aff10b6d1b59802a5e35c8d63b814d27778d3be6e0feb7d,True,Tests_passed,1c1ee8480eb4263a22ce92a609098eb0f6820b9a05a8291b1daf4401c368bbb8,True,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,f03dbfa05a0d36e7c029ea282f742bde703f929e510c466c916f5ecdd3ab69c2,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45 diff --git a/results/combined/merges_tested/plaid/plaid-java.csv b/results/combined/merges_tested/plaid/plaid-java.csv index 75a41df9e0..a2bb54c1b2 100644 --- a/results/combined/merges_tested/plaid/plaid-java.csv +++ b/results/combined/merges_tested/plaid/plaid-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 35,refs/heads/master,ee81fb7afb875ac137baad5b9a30d55d39e2f60e,5534569921b8157dc675f6e426aeced5a15b1b63,b5b7cd819c4158e15fdf0e3ed0d3e7984043f757,,True,True,True,622,1163,90048,26,True,625,Tests_passed,a382cbca5f9d88a546d42dc845c2f2f9a6584189ca0c257f8cbad7075660c2ad,True,Tests_passed,427f7de1f90b299e502123d844d2d2bbadec2221a38a6e61a6c12d605a1d6ba7,True,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,ce664782a7dddf13df239197719dd0d3b269fcb559b215636557ab42db2e851f,Merge_failed,14224afd86d59843267a68ab1f204040f20f35f559207f0170e2292473feedf0,Merge_failed,36e778cc3eed12c6320f147dad8bba82e57f51e5bdef3510a3a416d0507797a4,Merge_failed,b10caef8c750b281e0545eb42f9ec1b0e030638d115cc6af7a23aa8e10b1fdc6,Merge_failed,14224afd86d59843267a68ab1f204040f20f35f559207f0170e2292473feedf0,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,24e89590c6b266cd43332eed2d6b14dfb267838dc27ca0a039903f260c326e5f,Merge_failed,2caf64db32c9828ab4e80265de46e9e5041f0d790788ce79cfe7c9c3dadffe16,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9 72,refs/remotes/origin/pull/130,5f856fdd6d1f3b51ce203c9ad056bc91471d939f,0bd56626ceb3d18c9d876dc91c1f4ae758eef0a8,abbf5df9c62aaa286ca14bacd418d05a55e9f8b7,,True,True,True,19,42,728,2,True,19,Tests_passed,c2c0e699cba818ee07aea888e5712469387d269bf32360cf5868de182e867eb4,True,Tests_passed,7efcfaed7d06ec6cd6d37cb4255c6ac00cab370f6905c5252a5107c2284b0584,True,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d diff --git a/results/combined/merges_tested/plum-umd/rubah.csv b/results/combined/merges_tested/plum-umd/rubah.csv index 15c8647c9f..0dff28249f 100644 --- a/results/combined/merges_tested/plum-umd/rubah.csv +++ b/results/combined/merges_tested/plum-umd/rubah.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/pull/1,384485219562438c5abd5db59fdd0bc56061ae10,0d76b2beb5a7ea23a061221127be6e7b3ba30139,52adba8bdaf39255e685b0fee48887ccd1c4dd2f,,True,True,Tests_passed,78704f4ae6b8ef79870011f2a7bb2bf3c9a3db32d7453848720d0262ef2f55a3,True,40,268,1561,2,True,Tests_passed,b1a3a400daa2a5ffbe89e49c0fc9c886134027b526fa0ff42975a2b060af8de3,True,40,True,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_failed,4271582c4fe3884a7988fb1b2761e87f3c0b701f7afd89f46aba4c62bdeb3270,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81 diff --git a/results/combined/merges_tested/plutext/docx4j.csv b/results/combined/merges_tested/plutext/docx4j.csv index 9d7930a945..77f166d9cf 100644 --- a/results/combined/merges_tested/plutext/docx4j.csv +++ b/results/combined/merges_tested/plutext/docx4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 107,refs/remotes/origin/VERSION_8_2_0,a67ac33cda43af3061e084999466fb844bfa02b9,c5f43a09f2cbe8323354cdacf85dbef4f64abd10,157aac2f2ca28f5f33a7699432d65640b3bb73ff,,True,True,True,6,13,108,2,True,6,Tests_passed,e7be2dfa4d89cd8dc4e9d2eb24f8b41a32698c580136c25417fb9202bb0e84c4,True,Tests_passed,fd6ee9dcb03b68b2e1d553786610a2494ad18164ad0d74ef17d6a66328fafbff,True,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,52618d8185250b9c067a9a559e9aa219d913ce0595db7a01e10883c84bd22bf9,Tests_failed,2332b6790beefbc30efa89c297a2f6946be668ca79769ed5b63a1e50fc937a8b,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,52618d8185250b9c067a9a559e9aa219d913ce0595db7a01e10883c84bd22bf9,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611 129,refs/remotes/origin/pull/378,aa42a5b3f77c350916c1b790b26cb2633e9aa31c,80a43b991b62ac742367c51306a8aef824e5f415,6ee32d1afde00a15e72212e119322d81c4423deb,,True,True,True,58,146,6548,217,True,249,Tests_passed,2cdc23ee00a42fb287a38c24bc72aabd44e3daa5ee565c63e097c5337141c80e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Merge_timedout,,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e diff --git a/results/combined/merges_tested/pmd/pmd.csv b/results/combined/merges_tested/pmd/pmd.csv index 1af2bb2b28..f3793d43e1 100644 --- a/results/combined/merges_tested/pmd/pmd.csv +++ b/results/combined/merges_tested/pmd/pmd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,True,True,True,435,1197,8416.0,3,True,435,Tests_passed,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,True,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,True,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Merge_timedout,,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43 2820,refs/remotes/origin/all-contributors/add-dague1,88477e3f54563a3e932a6aeb4c9f0b3d66daa34b,74b6be069082e674f79480ca3062845852a825f4,b4c2a517811f12528fb1cd81a45c465aef81fd27,,True,True,True,171,414,6845.0,3,True,171,Tests_passed,af83668e9307a4d552417ec4598e612f97fa74e156db922da1c0e48804074416,True,Tests_passed,ad31b448d01d585f118d2838b82bd594d8b9f15d8f12f53cf0dff77a917b27b9,True,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,72613798f5cf8007e9d44bce34a4e0a7a54a22f5f36d170dc7ca86cf9eb39548,Tests_failed,0b7e2e9642314b7e18fa8108ddd554471563cd8cfcbd6f9e576c63b48f156b48,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,72613798f5cf8007e9d44bce34a4e0a7a54a22f5f36d170dc7ca86cf9eb39548,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b 3730,refs/remotes/origin/experimental-apex-parser,8528a8ed7d2400fccb0f15c366c9843ee706c329,93d3d73666280f669c59c9e6342a78fd51b29afe,89c7da82f49e09a31d14d65db7b74fa108519348,,True,,True,296,1445,,12,True,296,Tests_passed,eec146e7a2b6e1a86e0c39dbad61b152475bff4f25812ba2b73f468ed5057cae,True,Tests_passed,b633c8fa4794258d5162ad54c6d18cbab690020e8a87b69bf3f32d60391c451e,True,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,672595ce4351b412ba44976aa24f9f2e3036cae502a9efaa3343d96b8f9a0ddb,Merge_failed,f944a94cc6143645738ef6244e9df767b89167e06947caf61b06cfe1a255ad97,Merge_failed,8ef08088b426cd6f392043928cf333c05b4e824c0df116d1137e9d5a25628060,Merge_failed,8ef08088b426cd6f392043928cf333c05b4e824c0df116d1137e9d5a25628060,Merge_failed,f944a94cc6143645738ef6244e9df767b89167e06947caf61b06cfe1a255ad97,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,6069b1144f4395c1f4f2acf83edbb2a644aed7f5e648c34bc2e88a9754804df9,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991 diff --git a/results/combined/merges_tested/poetix/protonpack.csv b/results/combined/merges_tested/poetix/protonpack.csv index 2700769523..7d7bfab5c7 100644 --- a/results/combined/merges_tested/poetix/protonpack.csv +++ b/results/combined/merges_tested/poetix/protonpack.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,2ce321af894939d80fc347d8988b9243f4f717b6,7110d26a87678eebab7ce72e0681b1610032b7d0,63828239131b116168135220ad0182bbd09cee56,,True,True,Tests_passed,c9e69a046413afe9839ff30c10406b24d7be2b01d9f8fd812259bd6190681fe4,True,4,7,119,2,True,Tests_passed,44ea129e7a104bb904693e6b6785b5346c559663548150648ac0354c12c7b26f,True,4,True,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,f52a0564d1e55dd7eb6a4f09a4908bcc68e4d3181d67221db944ae8c8d33f78d,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,f52a0564d1e55dd7eb6a4f09a4908bcc68e4d3181d67221db944ae8c8d33f78d,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6 15,refs/heads/master,7f6e8773f8a428c8fbcee81aeaf42e04b45144c4,740db1ba99cc80ee8a2c54916e8e6975b629a276,65d9207fe1a022ef6151aaf0eff8a939c9083e12,,True,True,Tests_passed,fe1585c6430d0c6b8311be21f6957611b614db27f5337be349f76ad40d237de0,True,13,15,494,2,True,Tests_passed,8a4c04bec613b1a495bbb92ed4c4145aadce30e7553c6bbed6d91bbe8e409ced,True,13,True,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_failed,d2c7bd44758573b8c46dc302d5f9ecff2a7d72795b3503f9193c534c65b6934b,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3 diff --git a/results/combined/merges_tested/polopoly/jetty-maven-plugin.csv b/results/combined/merges_tested/polopoly/jetty-maven-plugin.csv index d03123deba..76ef69620d 100644 --- a/results/combined/merges_tested/polopoly/jetty-maven-plugin.csv +++ b/results/combined/merges_tested/polopoly/jetty-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,ede46d4a7b0140767b4fa80363d1272cd6513610,9ce0700e72e828ce5ff0fe68b4e5808f31186925,e4bd182147d263a680a86b52f80c3abba54d2e5a,,True,True,True,3,15,48,2,True,3,Tests_passed,ec599c4bbcec7f2cd45ac4293147081f92c93642431675667b70e483fbc5c180,True,Tests_passed,268a8a861c3e5f5d3b57bab9fc408bbf8d5406364f96db7b16cb293e86f788ce,True,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,0923eb9af392812ad6fdd9c891c7a7ab04045e99f012bcdd9e4436dd7123fa1f,Tests_failed,a7c9695f484e52a8fa07e03650c169d96ff2e82779dbd81820d34d6b27dc7ffa,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,0923eb9af392812ad6fdd9c891c7a7ab04045e99f012bcdd9e4436dd7123fa1f,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e 2,refs/heads/master,bfc17aa246a1ff1e7c301d5a90f4101f82f8ec12,57be9f5949522592799d85e9760e748bc472a098,429f5db8ddccfba6827b259b8131eb64cbca7db2,,True,True,True,3,12,37,2,True,3,Tests_passed,da2a3914d2a8517695f29bf304ba892035004dcf7e960e27337e5a6f8931174c,True,Tests_passed,261126bb0dffb3e5730b1a54f72cdeb0945419aed050c1252ba9638e331fd87a,True,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_failed,e5c8e73840dc48ab41cba881927ee7ca067dac7b35c513f803c373ff7d04aa9d,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929 diff --git a/results/combined/merges_tested/pragmatists/junitparams.csv b/results/combined/merges_tested/pragmatists/junitparams.csv index 083c9be00f..6a10a00f68 100644 --- a/results/combined/merges_tested/pragmatists/junitparams.csv +++ b/results/combined/merges_tested/pragmatists/junitparams.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,64099252b8751b407e9802857fcab3fdf97bc5e8,5de3e8753b3062eea40992e590e834f84d3f823d,e0b9c4d623c8765a6d5c89acee588814dfc9ae79,,True,True,True,9,22,166.0,2,True,9,Tests_passed,5994fdbfb8873554a1512119f27cef10da29fd9911663726d315c19706fcf673,True,Tests_passed,9853e926860b83c5488fc4cc3ca478035d0731d311d35de6fac8b943fad494bf,True,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,d9ae6eb2ac90362ad221ba40cd596a1badaaaa254a6a74504433a9d8c3db3776,Tests_passed,c285e7807774889cb1e3373d3ffa7976c3c76509876f3edf81f6ee0356a70118,Tests_passed,52e8414a862836b85534596950db66f169101e4a95f275f4343158a00940a0cb,Tests_failed,b1ecaed33af36dfb7f492c7e95eead565bd14fbe92469a05eb4a9e910149cdf2,Tests_passed,c285e7807774889cb1e3373d3ffa7976c3c76509876f3edf81f6ee0356a70118,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,245f71bce31840e3a7ea1026bc41e0ddb4357d931d107802aebf263a62a74d52,Tests_passed,52e8414a862836b85534596950db66f169101e4a95f275f4343158a00940a0cb,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857 24,refs/heads/master,7e9214c623fbaa05978f1301fdabb0aed1f35141,2d90f897cd3cf4067cb4787ff8f5ef198cda591e,c17929a91b3702117ee18d574518ee956a9f5105,,True,True,True,6,30,178.0,2,True,6,Tests_passed,619ee399a09040203abf2910dfbbaacd9c00b587b075fabc1ad1a1963dd18523,True,Tests_passed,e0eaefbea97f452204555ab069e02a779f1a416fd147254dc418d27649a7fc3b,True,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,34d7a00785734892d0de19e7453c8954855446d4a9493b0e1821c58ab30609a7,Merge_failed,39357db2edeaa06d2ea9fdc8fa3964f68afe5e4c11836cda0c67c05faf4e080a,Merge_failed,62f59386a2867013b682f72246b01ec96ac30cf0cf09b7de6e26318964d6a0b3,Tests_failed,fd3c18b6b2bb20790f33e0a8043bdd743fdca72b2bdf3ab6644a9e984e17fdaf,Merge_failed,39357db2edeaa06d2ea9fdc8fa3964f68afe5e4c11836cda0c67c05faf4e080a,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,94165da67944c013ab74e671b77f59e1e9384ee84802c230828ea86aaf36794c,Merge_failed,62f59386a2867013b682f72246b01ec96ac30cf0cf09b7de6e26318964d6a0b3,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641 43,refs/heads/master,ed8cc312d3721cd913ce91ef2de03c7c4fac830c,d476a77d9a0f2890ea2e926b33f19bbbc36097a2,70be250815fdf6514f6b7ab0dcb773df63714230,,True,True,True,30,153,1026.0,4,True,30,Tests_passed,6c41e4e8b94593d03adee479dd7cb7108c01b3fa4275176cc6a2d15d8b1457ff,True,Tests_passed,450b5fbeced68e22f42725b697f559ff2cbcb570baeb95d89a09d7be52fd4a40,True,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Tests_passed,c8a4fa7702ac6fec50ee12472914f40fefd54ba00a5ba9ec4035214740437391,Merge_failed,66173592fe729f4caa743c1de0051aae996312c25d22d8745107e918acf2e104,Merge_failed,41d0e80aead607a982f1d8eacb0d797025c93d5c40709e0c959baba9633fa8c0,Tests_failed,d6419176b255c90fa1d47f1c75ce4fbe9ef785b18b528b1f22a23045effd6a5e,Merge_failed,9fb0bb84cbf2c8d0ca1ce1bb20d7f813b7caa61a641eae3d0dfd89a3f0201708,Merge_failed,41d0e80aead607a982f1d8eacb0d797025c93d5c40709e0c959baba9633fa8c0,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Tests_passed,c8a4fa7702ac6fec50ee12472914f40fefd54ba00a5ba9ec4035214740437391,Merge_failed,d544ac08eea99f9c63a443baf6828c3c85d9513904213307f1258f9613fe1ca7,Tests_failed,d6419176b255c90fa1d47f1c75ce4fbe9ef785b18b528b1f22a23045effd6a5e,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b diff --git a/results/combined/merges_tested/premium-minds/billy.csv b/results/combined/merges_tested/premium-minds/billy.csv index 9b4ccadd56..1bfa7bf719 100644 --- a/results/combined/merges_tested/premium-minds/billy.csv +++ b/results/combined/merges_tested/premium-minds/billy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,b34f1fc12b6717091254cc8f8c6bc313bd2a3e38,4d7c765f34c6bd796695bded10da84ee2816d819,d113a54f81e5649a8137cb49e45313689ba7836d,,True,False,True,10,18,62.0,4,True,10,Tests_passed,7a11d2e79a1e3c09fa09674d26a46c79f386723ca13c68692d6a6534091cec08,True,Tests_passed,56561ebe92a2edad87948ea6cd1104ada423f36bfb6b22fbec7e5e6e3266325f,True,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8 70,refs/heads/master,bc9db3332320895636598425f8927fab20c59a09,1649bfd5cee009a189334f307829da10ed3db9cb,3428237224ef06b137ebefe6563d6ddd26b75303,,True,True,True,494,2173,6095.0,14,True,494,Tests_passed,f9f27ed5e9cc5b966df4cba64f5d32bb98861b2a06d300e28eaf22db2e93d8cc,True,Tests_passed,fe8f4107eb5638fef89a9c5710d2b9e6762885458dc6f655a9a592a5d94940ef,True,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,16cfabaf7737856929c316eda01d6e6bb2a3013d70c3e6e4e3de22ec150afc88,Merge_failed,b46713e0d2a7163ca10b7a4861617e217edf5232f72feac5d9ffe50c256ea4fd,Merge_failed,0bf73ca13f23ffa7e973140e8f52bd03dc9b0d9c7625db5378f1517110777814,Tests_failed,46979ae2fc1d2f0c39178953db828cdac825540edf02e36dc5bfa7dda5df0317,Tests_failed,5b1d09f23b5154f4e18c8a34faf84a467d4469b0d289f63311785a3e067e4bb2,Merge_failed,0bf73ca13f23ffa7e973140e8f52bd03dc9b0d9c7625db5378f1517110777814,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,16cfabaf7737856929c316eda01d6e6bb2a3013d70c3e6e4e3de22ec150afc88,Merge_failed,ca90d0fdc251cfabc15b3becd01caf6295bc792689d22effe787f24141572fb3,Tests_failed,46979ae2fc1d2f0c39178953db828cdac825540edf02e36dc5bfa7dda5df0317,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985 114,refs/heads/master,5cae873221b8d0f062cd2a11b8943b42a9f67b69,7fca19e500036c76cf1cd24a8172d434fb8e437b,c258698fea9383c9d2388165da24ac8d00e40a3a,,True,True,True,164,203,470.0,3,True,164,Tests_passed,34ff56084600916b34967c98d2b4527ef3941775536d86d92772bc2c8b9c1c7c,True,Tests_passed,83be1ec18fbb2b523f38a9947c39cc8ffc7bdce47c29a90c657c79f5c7859e4d,True,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,d8b1346b284567ef2ab16a75f26d765cd2022e5b2907b526da5307ba92b8dc75,Tests_failed,6151025cff6fd4509af8ad84e566d582705f8750940919705e7d0b6870beafde,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,d8b1346b284567ef2ab16a75f26d765cd2022e5b2907b526da5307ba92b8dc75,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f diff --git a/results/combined/merges_tested/premium-minds/pm-wicket-utils.csv b/results/combined/merges_tested/premium-minds/pm-wicket-utils.csv index 9a0d4a949b..d96e6975ec 100644 --- a/results/combined/merges_tested/premium-minds/pm-wicket-utils.csv +++ b/results/combined/merges_tested/premium-minds/pm-wicket-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 94,refs/heads/master,a73b5bf686d93a29daa3513d0e62422111b3f4b6,212b95bc3d85dfec1d2d2b27ac5d5b8a4aa06fc5,2d452fa3a767f08154527af54210a8ad5805df8f,,True,True,True,83,108,589,106,True,184,Tests_passed,fc764aa3f192b9fd407e04f01935db53dfd1f9717c171532598a11b078e9ee0f,True,Tests_passed,5908c5716fb0b2b2f61dd4c09596f8c033f8348170303b8f404464df31fdb921,True,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,75a1f68499badb8d65ecdcbd678870be39e444722ab6a390c41f27568616cb12,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,fdfbf64a53a31570235ac037f6f092b13a6c69b4ac6c9b4f6124735484de2d47,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,61be8359d0b5d1e6f294f2e43b54482a9f2086b054e839c27a390b00140beb62,Merge_failed,79973388288be6d2939b13a532cf1c5387b1743eb1a5f349fde600b0b9bd8d71,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d diff --git a/results/combined/merges_tested/prism/prism-bukkit.csv b/results/combined/merges_tested/prism/prism-bukkit.csv index 4311be9903..3bb9fd1952 100644 --- a/results/combined/merges_tested/prism/prism-bukkit.csv +++ b/results/combined/merges_tested/prism/prism-bukkit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,c9fd69aac937051cc93bbc7b62a22245e0ea33cd,4b5d8a5f750a9cbe1a58cf3f67be4d025cee8182,e99fcdd4ae5a93d7185c8b575d5f14e2d15e7a56,,True,True,True,29,173,876,5,True,29,Tests_passed,f1c99d40af6b068f88c0020020babe2d879bf3f0d172935054618aefbd5c57ee,True,Tests_passed,ac53fd399251fd9e5b9f928255372dbfc1d699060b1abef16bbe395986c83ddf,True,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,afe76c72e561928c929d4144aa319bc7cd8c88cf9d819d6d1467a8e812fbac66,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,62f288082642215af32434a6f7179ebe385d6fd9bde1d09f73ffeba8a476bee3,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,9c0b045e738ff6af1258d73e52463b6413f84242905b2185cabd8bead6940a0b,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa 166,refs/heads/master,6dfb9ef0cf2730eb09914af0afd8724a30f46efc,2973beaa568712042dd9330f6a181f84c8e3eb4d,9b3c5ba831844b6016733aaeb86106d9df13df25,,True,True,True,6,11,28,2,True,6,Tests_passed,35e3bf9191fe9352c782e593fc8c5502c5227e7c37a9070c5c456fb1541cdafd,True,Tests_passed,25dc46111a512af17be861328f358a73057bc2ab525c81fd97947791e194d109,True,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,e777709fa06ca8d3f1b449c7846d133eec579743257ecc966423954bae8101dd,Tests_failed,d7cd7a92cea19eb00ffd415ffb09d5ac356b823b1c5353c50b90e34bf0e8623a,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,e777709fa06ca8d3f1b449c7846d133eec579743257ecc966423954bae8101dd,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707 172,refs/heads/master,74927cacad04dc8d6037f2ccd53c2182e12312b7,e251f02f2edf3a865febc1087a06fffb2dec31ed,29424de7915c03b635c7c6148cc4adf4a7ecea62,,True,True,True,2,4,278,3,True,3,Tests_passed,3e2b30c543c1ee24c4bb085ed006fa8746aac3f3bde933818a2da873232bc2d5,True,Tests_passed,e1e400cfb9059eee5d34ce97ff890e719f7d8b2d97fbb0c30f8885a57f1ac6a3,True,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,1e3857a5e9c01ba1cfe4385463c3df60e58b244403b44e6cb5833bbdfb977e9c,Merge_failed,3612cec06f2ba9a8c25d44c194e3ad8cdad524be197eaccdeb43604d29ffc5bd,Merge_failed,061209405c97a25d4482a73390d534ca536a204917c97328eda0d070cc8dda59,Merge_failed,ab6032ba6b95097029481a8a9b882674752565a1e05a1bf3cc67d21369980144,Merge_failed,3612cec06f2ba9a8c25d44c194e3ad8cdad524be197eaccdeb43604d29ffc5bd,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,16334a40eac56032020930fe3596c51866d0543f12597304d27fc31649f49030,Merge_failed,061209405c97a25d4482a73390d534ca536a204917c97328eda0d070cc8dda59,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d diff --git a/results/combined/merges_tested/progether/jadventure.csv b/results/combined/merges_tested/progether/jadventure.csv index 707ff92696..d6c7c4ca5f 100644 --- a/results/combined/merges_tested/progether/jadventure.csv +++ b/results/combined/merges_tested/progether/jadventure.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,7deca2169f09a5cc2f3701736396132d5f36f2a2,1628bc864e5bd45e8d99a75484adf7d317dada07,22eddd9a0a61f8c44eb2f504762cd811b54344f2,,True,True,Tests_passed,44973629f349af797bf1793a4ae08e5d130889e9d95c6c11b1cc1953fcc243ea,True,3,2,3,2,True,Tests_passed,5a626ac617c5fe94755cb45b8431e707543b176c34e89e8f96f99f3c2c873938,True,3,True,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_failed,ee8138068cc7a5b7a3a682cc49350b2680830ff7dd55b05699b665af26972e09,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce 27,refs/heads/master,d4407d1e7708eea409d96d64ec87fba94603fa8e,3a51fdd09bbc04f54ae0840d4e9568852adf9ac8,7b192fb1990391c17c16f922a5c255b9277203f5,,True,True,Tests_passed,2b8c9e713ba827450c52d403e4eca6000b529ec5a102932209fc1a22a3a234b5,True,9,20,235,2,True,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,True,9,True,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,2b399604c5797adb8b13e8ffb66a6fb6a2c69322e40c6327115e52e76fa7ff74,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,2b399604c5797adb8b13e8ffb66a6fb6a2c69322e40c6327115e52e76fa7ff74,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77 29,refs/heads/master,4668178a9c920ebca8b3619cf105864c8b83c454,d56e9d6307e8991819bda92a7b52026093777f9b,731110f6270a7ec58da823bc9c16957d17680b36,,True,False,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,True,2,1,13,8,True,Tests_passed,7eef8b8b847772e7714698930563bb8356d0c6339cf5f64402a022b9b6bb193a,True,8,True,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1 diff --git a/results/combined/merges_tested/projectblueshift/blueshiftapi.csv b/results/combined/merges_tested/projectblueshift/blueshiftapi.csv index ae6b14fc16..a0f38ad70f 100644 --- a/results/combined/merges_tested/projectblueshift/blueshiftapi.csv +++ b/results/combined/merges_tested/projectblueshift/blueshiftapi.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,9e18a10c3a100f154a2bf48d76421427c571330e758be5341b831d1f92f4ca40,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf 10,refs/heads/revamp,004679e5bb6d1227b91f9e1aeaf79b72c317a397,d5844b55b3f6efe95d71450b49a3723a0b9acae5,ed227f8eaca49f6d1a65ccbcea8fad55b38d591c,,True,True,True,15,97,426,3,True,15,Tests_passed,06f41e3da5a99fa1855b1ab414f6b95d5c330ab6b27fe8841c590f052e994045,True,Tests_passed,cc3198654698c2e4774f971abbf38f0045361de1ec29fe479b44312c7a19fbd5,True,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,eb71efe653a3659ab58d88f1e5c027abcaf9f4a5df377614eeabf0ca13d2ef71,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,1f948cda894d56a5f839ca01f69b0b859e0d9b61fd8118120c23d464be2206d1,Merge_failed,d85a6c0d015c66fba987a8b10ec028de29365f2675f722e8c8a0df996a3a0374,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,40778399a44c4c6d6ef949d5a830dd702b0970eb1ec56db174b5a7ebbc2d930c,Merge_failed,6fe24757cfac9cd2e746ed7f489d9155ef2553808a13b8dedae4f2515ece975a,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1 11,refs/heads/revamp,b53a148ca59225dcbceb1fc65321f98a0c5c13f9,0328aebe181d4896b2205893c521c1015eb69ae4,6dcfd0c9bf20779e4b23a3aa05d29ee6cde7364b,,True,True,True,75,253,1483,13,True,77,Tests_passed,cbee04c3151cae68ef2e931fb88dbe19fd26676962d2194b8acdef0be7b956e4,True,Tests_passed,7793f3445f483bdfc586988358a2a5506cbc255cf216f4ebd32dbf102a61e56e,True,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,295f6f04adaf67ce6ca87627ac686c54139f54adf7424f03b2af435897508926,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Merge_failed,2a113f2cb96e0823ebc7f580d72e00b0b7ccd6972752e02a436356fbba34b9de,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,1951beed01d745813875c8e3d411858af96c4d3dfbeabd03f497df133d76dc8b,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e diff --git a/results/combined/merges_tested/projectdanube/xdi2.csv b/results/combined/merges_tested/projectdanube/xdi2.csv index db013df646..4f0ef40932 100644 --- a/results/combined/merges_tested/projectdanube/xdi2.csv +++ b/results/combined/merges_tested/projectdanube/xdi2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8b5a951af2ff940771d87e8c8062e66034d89d78,9021a1a0362290494eae3125db43191fb3932d7e,d28c88fc27ff6c761354c225f4766fbde1922bc1,,True,True,True,668,818,94784.0,3,True,668,Tests_passed,a94005a7bb82d3c9ec8d92909b074ec51fb6150323dadc373f7ea9813cb6f84f,True,Tests_passed,4772f32b6772ce9fdbee29e694879de594bdef4e3d655806be7decb4a5dfc9b6,True,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,a924859b9ee4cb2312183e449630fd45d075e3201363b14e7b7f20be6238ee5a,Merge_failed,45354e1211ad1f70e04264324fe41943de4afce6649ef886fac741d867aca5f3,Tests_passed,baf722427019578115e289859766958bfc40d6385561bfbdb1048b9c4902895a,Tests_failed,bb114105693213995b1744ce71fd9d68e886772bda15cfbdb80985655483e94f,Merge_failed,45354e1211ad1f70e04264324fe41943de4afce6649ef886fac741d867aca5f3,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,59bf4499f6a212f42ae35f0f4ae8b29f516e5ab43cafc2dce3f864a2b5695b03,Tests_passed,baf722427019578115e289859766958bfc40d6385561bfbdb1048b9c4902895a,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa 10,refs/heads/master,18402a3963837f0348650eea9f7c3801c5a4f313,89652f6f7057050c1fa79d9c3d45da96adcef512,7cd6815eb698eb29b06279faa1825503e3217824,,True,True,True,262,1397,9431.0,43,True,284,Tests_passed,7530f2b35e7308defcedad3278abef362062cf0da8e7058a999a8ded0f78e802,True,Tests_passed,692c164406c776d3371b886bfda1da26b9704a31764130e518af5eb7abb74828,True,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,f09365e6225552f6c21a991080e39225988d98806f80a11486f2f0b22d2037ca,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,372a26efa19965ba9a5aca9a64a4d705e18adeef1b69e07c1d3cf66ba477e5b4,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,c805e0de02ee53f647ee4d8dbcf806ae13c573206ebdfea25742da4c7138b3a9,Merge_failed,fdef79629edaad1d361662cd4a459bb82d91e13e1d512b59e52108e1191d297b,Merge_failed,313f2831ca1e1a7246baa26da3ebb7a509c8c62e2f8d8a3fc2bb0cf1b5edd341,Merge_failed,1f997a3eaa652a692a39ef137940c3f605f259aa29b1689f266178f6c3892e44,Merge_failed,fdef79629edaad1d361662cd4a459bb82d91e13e1d512b59e52108e1191d297b,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,372a26efa19965ba9a5aca9a64a4d705e18adeef1b69e07c1d3cf66ba477e5b4,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,a243f06460b80b58aadb6383ed3360f9d9343574db179cf608a8fabdf2a97be5,Merge_failed,13cadfb3a35e0fea9dcc2cb863d96d60c7c1a55c180061ffb89f2ae750b83e41,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,f09365e6225552f6c21a991080e39225988d98806f80a11486f2f0b22d2037ca,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba 22,refs/heads/master,1c1ae72b5b1c56bd825f97b7769967208035e99b,56a727901b6ec484561d08c491cefa06617fab02,9bec68dd0f764cd93aaa28f5493ba4b4ec560e75,,True,True,True,73,159,972.0,16,True,82,Tests_passed,bfa28a75d29e72e5eae3d08ab57c15450511267c2060ccf7b237b2919bfafd86,True,Tests_passed,35b44bd74869b7794ffee852a4d0c9be45a591e827e38541772a669da9cb3419,True,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,3228fe7ce8a883387f4187df81c3a77910e0e26f2f12499ce7030063a4047ae7,Merge_failed,07711ad34a12e4b099082c3a03b320b2d3fb41cd27f1cb3500e7a576b8c3a31b,Merge_failed,1c2536e290ffd5d09149cc59431a95e9c544d95edc1f1d22f02cf294def1a939,Merge_failed,91391e70772383f79fab7f9291d6a76e1c066ad4c66f5bcde5b758643b4c2219,Merge_failed,07711ad34a12e4b099082c3a03b320b2d3fb41cd27f1cb3500e7a576b8c3a31b,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,47ea343ababe3f2882d3658b0975c0254a057e34655569e83ccaaf0eb98884a1,Merge_failed,ee4ae6230431740027708a6886688361e2563ac17bf41bd293e155a02d728035,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e diff --git a/results/combined/merges_tested/projectkorra/projectkorra.csv b/results/combined/merges_tested/projectkorra/projectkorra.csv index b248a14bbe..722759754f 100644 --- a/results/combined/merges_tested/projectkorra/projectkorra.csv +++ b/results/combined/merges_tested/projectkorra/projectkorra.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 622,refs/remotes/origin/pull/665,f877fa16a0ae7077c564a42d9a0bc53a5f34666f,15d448d1ea349d4185bf857b94c4cb6dc6fa4457,6b656cc7117be8727b6fb8aec5d947b1ec14edb8,,True,True,True,8,47,196,13,True,16,Tests_passed,6aa7d9e4565f07285cb2fd036aa4956ad7146cb791dc8fa8f1a08f7b084698a7,True,Tests_passed,ae47c896fc6a730f642a04a2a54f0ba688fc233b9b02e56cd39061b6911ecf51,True,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,fbba7a87a932afd4f144fc65c361a9432d04b038908952e11168aeb10dfe41a2,Merge_failed,224a25d02b560fd0ac632eeb0b0491641879a5ba2f7abc8175b4f2b97ec643e4,Merge_failed,440f0b846ee711739b9c2f02d85c2101862cfe95f4884f421dde15e700e1195e,Merge_failed,bb2594e1f92deeb52db9a82b35c4081e8d8ae1ab6be68482bcdc88866994a243,Merge_failed,224a25d02b560fd0ac632eeb0b0491641879a5ba2f7abc8175b4f2b97ec643e4,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,bd6d992c32ded34e88f7dff8dbd1e090bb14f70d1d78bacd12225ce91c40a682,Merge_failed,440f0b846ee711739b9c2f02d85c2101862cfe95f4884f421dde15e700e1195e,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406 623,refs/remotes/origin/pull/666,a0f05df6f745d01f272a5be66ef778ed5ae193cd,49fbcb1134f7a1383cc805ff314383be358038be,9d15d8b1222ffe199dfaa6bb7c77758cd5954991,,True,True,True,11,177,647,4,True,12,Tests_passed,bae4ee643500818fb6536d38c2065abe7a8b9844cf03bad0da73b523eb67e205,True,Tests_passed,93d70aeac8af1abe2c35be14e9417fc76ec09089e100532f202f202a8d97ed29,True,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,4aee218bf130193cb1ce9ab6ab963f6975ebe50c281003b0795cbc12cec94a19,Merge_failed,b6289c8ea9d9467637c58e2fcaacefc590c6cb8219babb98604955aa69e64bde,Merge_failed,74382833afef677916f9272e338a922722f2d0848fadc44ce52a416be7ca3209,Merge_failed,f364e921235e7c68b3e2ce80629e432af706bad447b6214d5bbb83b770972fca,Merge_failed,b6289c8ea9d9467637c58e2fcaacefc590c6cb8219babb98604955aa69e64bde,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,014b4b06be5d84fc26c1781d13dd90f4dd9f29a329cb9cb3dc11669e8e2ead65,Merge_failed,74382833afef677916f9272e338a922722f2d0848fadc44ce52a416be7ca3209,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a 625,refs/remotes/origin/pull/676,35563df4e12844ede30f99ab645d89ff32696c7c,082176e98799dfcbb44ac2ce430ed1a5e5602c89,4ac9b8fb6e2e801ab765d44b480338ce71ca7476,,True,True,True,20,115,384,2,True,20,Tests_passed,1f24a4d760c6945120f787a801596332528289d5988e690c782d99373559e156,True,Tests_passed,10ee31fda41142b445da9538a8e7298f1d827b3554f8ea19410728716d8dbc76,True,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,cd8c8760acc098d9d5c0034d406770481a01553a3b6656c8a477f3d93a782b5e,Merge_failed,2f0c908006c91b77f6f41b2a23cd2f7c6576f89844b7ba982fe4727f60ea2c79,Merge_failed,551ebba5e70cc758d22ae4adc3d1a998aebad62f6111f1944265aa0a8982adf3,Tests_failed,959396bd533bef45be3be7a2d14dd894e62d64219165709423420af89062d455,Merge_failed,2f0c908006c91b77f6f41b2a23cd2f7c6576f89844b7ba982fe4727f60ea2c79,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,02e22a3eeec61a692b408f2fee30c4f25b406cc7ea20e69299ea060747ee52ea,Merge_failed,551ebba5e70cc758d22ae4adc3d1a998aebad62f6111f1944265aa0a8982adf3,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be diff --git a/results/combined/merges_tested/ptgoetz/storm-hdfs.csv b/results/combined/merges_tested/ptgoetz/storm-hdfs.csv index df49c72298..1947dc6b07 100644 --- a/results/combined/merges_tested/ptgoetz/storm-hdfs.csv +++ b/results/combined/merges_tested/ptgoetz/storm-hdfs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/14,563b4340f350a93c9efb6a6991b8028d16144345,8007c40b349f8cdedbf10f95bd480db1cdbc86a3,be5eae3bcc07cfbaf49c19c57da42dac1351a3e3,,True,True,True,9,48,315,4,True,9,Tests_passed,e65dcd2daa1f316f295653444319c789f75f86ef6d433bc6803de8e994e81f27,True,Tests_passed,23795b9ee2753e1d584e00ec6fba7972b95b74e61d5218279564f331688d9f85,True,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf diff --git a/results/combined/merges_tested/pydio/pydio-sdk-java.csv b/results/combined/merges_tested/pydio/pydio-sdk-java.csv index 7dd4f28e29..868216f505 100644 --- a/results/combined/merges_tested/pydio/pydio-sdk-java.csv +++ b/results/combined/merges_tested/pydio/pydio-sdk-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/develop,29da20204a34f94644314baa2da9f9c436c3597f,dc81ee556594723f2ee47b2d264bd74f2874d3f5,5f7420e9df2f3a9a6b9908f0cada5be9930a5f27,,True,False,Tests_passed,55187d38795f66b3594e2b1931f9e059bc7a8cd51948c799ba88fca72a959767,True,4,19,69,2,True,Tests_passed,3a040643ace61f3a5682c6def579f7805282f5645df08f17344d2da32a436a5a,True,4,True,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_failed,04794da4bd4c21a82943fcf932cec8048b89dbc3925d45d4c7604ebd2aa6e90b,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641 diff --git a/results/combined/merges_tested/pyknic/codegen.csv b/results/combined/merges_tested/pyknic/codegen.csv index 9b621a2839..03f86a44c6 100644 --- a/results/combined/merges_tested/pyknic/codegen.csv +++ b/results/combined/merges_tested/pyknic/codegen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,3e0d4067f68ebf4163e850c7031571271b4893e0,c0a3be22b99918411b41e1e075253e928079c2ea,cc625538048bd84c0763de49f8cceda5f40b9cc7,,True,True,Tests_passed,e5b84acceeb2830bb1ab1d622d07db01610bb2f3b652ac09dbfd2f729aefb7a0,True,146,1034,5810,25,True,Tests_passed,746c55dcd348adf7169a334ad98e005a4205ec95baa1657ddd17fdef75ba84f4,True,152,True,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,51c0153f0de5a337c6a1fb9546b38866dd97633fb2f59242f83cfa6a891fa731,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Tests_failed,3c4f902f354f00a3f8f3ca65277c63a22ddc50d4e35da6e2870a816b99ccec8a,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,37d4e06fcb388d3f0f4ee5b3b847d114c15cee1d68b3e6d8d7ba7a872bd4157e,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721 2,refs/heads/master,b718264121f2990b0cd2df982f93714ce9b2fe14,63f8adf177472d58100b2c816febc3ca66906893,d2fafacc6d78d1bd45847871f16dc48c5e7b1dae,,True,True,Tests_passed,cc9d9d3abeee51cb504f8f5c85461e7e82ef43605f9cb8f31a6baacf006c2243,True,17,46,240,5,True,Tests_passed,1b43989145121fb98c5bea85fb025080ee9c4f0dfc1adcc0f0291212973712a7,True,17,True,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,63dbe88e697ff81a0182945bc1e25957b022f92c24a9fb7296e0f056c4bcbdce,Merge_failed,6142889f00bfae78edb4642601540fb6773d36e121b8887d36f397efdc5666d6,Merge_failed,c8edbcd18bf231a6a0c584c2769b01b26c857bd029c15c284001ebcbd15c4aed,Merge_failed,ede796c1c65841c14a00d071766ad2a712875ef7262c31fcd0dc17f2950aea52,Merge_failed,6142889f00bfae78edb4642601540fb6773d36e121b8887d36f397efdc5666d6,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,30499e11f44ef4f7070676dd79723aa8772f1c968c0e42b5ca0e3043870e5740,Merge_failed,c8edbcd18bf231a6a0c584c2769b01b26c857bd029c15c284001ebcbd15c4aed,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5 3,refs/heads/master,e303235d2e0f90a3ce6a72974a8de27ec144599a,eb730eab8d6b2e0fc7cb8f6dbf42b1793c840114,9b8bccd742bc7457a13460777537688ce981b794,,True,True,Tests_passed,9a7d0c00c1a200e7e2f3f3431656e1373cfef554ec30fe4b3b612d4d92403b65,True,120,345,6358,14,True,Tests_passed,05b4d31b52f256ba11b18662c7da5e199929b6be4f915bb9485ffa6fea24b85c,True,122,True,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,a1e76482298533bca214b858624c0996013cd78744a14bb608eb52c19d482655,Merge_failed,3a815dfea826bc3b45a7aa36b381d129862032eb27cae084dd1fc230b35538bf,Tests_passed,67a5578c6f4bdb17a425ff8578d3c977398455340ad8542b9cc2ba4738f5e975,Merge_failed,229f80d5f57400ef58e16ea08488f3ff4a3f31d3b257fdc522cc5a25ce380898,Merge_failed,3a815dfea826bc3b45a7aa36b381d129862032eb27cae084dd1fc230b35538bf,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,a9cd086b0961d02e68270e548ba49301543c634fb3c0bbebdb7ebaddbe75cc44,Tests_passed,67a5578c6f4bdb17a425ff8578d3c977398455340ad8542b9cc2ba4738f5e975,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39 diff --git a/results/combined/merges_tested/qcadoo/mes.csv b/results/combined/merges_tested/qcadoo/mes.csv index 4da236ddb4..250ea8d835 100644 --- a/results/combined/merges_tested/qcadoo/mes.csv +++ b/results/combined/merges_tested/qcadoo/mes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1417,refs/heads/master,943d77dc366338874598db803fbe5b75b052e277,131afc90f937954345989c37a759c0b1e3cf5433,7ce5d8176ea9aab084d2c43add6fe65f2a4fed26,,True,True,True,23,74,708.0,2,True,23,Tests_passed,ff25425f4205de0f5405ab3c0f21f991cce75970883e6cac02a3cb24c3c73dbb,True,Tests_passed,23abe2f8ce32c6fd674f8967ee715af4b9e1404acdb5ca99d18f0bcf9e33c1b8,True,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,e7c7eee6c7cdf1b5da1a06d5f7e1ea00aa787eb9cc71cb699979d7c7692cb56c,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,e7c7eee6c7cdf1b5da1a06d5f7e1ea00aa787eb9cc71cb699979d7c7692cb56c,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f,Tests_passed,4445f161b55fba214641865d97268a073a84f2bb64429a3d56dff87d80d3ae1f 1544,refs/heads/master,5a3300ac9087e80293dbab93d59b7bf559fb509a,9cbec5446d2c3392b8157222c8647612cd334d10,8d80a80050e179194d2592eb31cb9b78050d0c08,,True,True,True,15,29,140.0,2,True,15,Tests_passed,089bb19bf37d52e1b2fe510387735908704f583bf5423373db1ce3fa0c265ad4,True,Tests_passed,6e695137456e4fc2b462063091281316b5b8edad35d1ac259012452092746a2a,True,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0 1576,refs/heads/master,f2bd4f55611e1699ec432c9a59deda4dea07d659,d3273d188522cb228ce93301cde2bc23cbe43e6b,53da3a209861abe5b7406292bcf4f3706f2bc965,,True,True,True,58,179,1301.0,150,True,191,Tests_passed,9878a16e2d26a812377dc75698e67653bf12cce80bfeb74415b4a8f2dc19af6a,True,Tests_passed,024d141d09db537e39c7090cfde229c50dad54936ff12852388b6ce69c532abf,True,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,199270b3acc800b111318a9d9c02f014b3998658fbfa7717f2a8e15f2f70c8ac,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,96d9030897dac41e624b42d87a1ef02fce797f5ce99bc011d4a30fb2ecc3efc9,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,8a29c17deb451b4f2c0f43d39aa302d99fc8b8a49882664720614a4fa1824fdb,Merge_failed,8dde83d3039ca9ea1b4a304ad16be42104d72fc7e24f671537d2f6ac196ffc8c,Merge_failed,8c61e5f7bc95a527ca4e96c231e9f797e00686a5f93d217dbb83776759e51295,Merge_failed,3d536745da0e16be2c9efb6ca99d05ff81b827b202728f57893b59657ae6a4f4,Merge_failed,8dde83d3039ca9ea1b4a304ad16be42104d72fc7e24f671537d2f6ac196ffc8c,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,96d9030897dac41e624b42d87a1ef02fce797f5ce99bc011d4a30fb2ecc3efc9,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,0eba30d9e20801ca250876dda4676bf6149160e3749c3db0aa82832d5de0110b,Merge_failed,04d16603b95fc4c8fb1f7201a026003bad9ec2c986833d6b9f97ddb6d708ee65,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,199270b3acc800b111318a9d9c02f014b3998658fbfa7717f2a8e15f2f70c8ac,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d,Merge_failed,f0ebdf11ef1471794a10f9f6cfe0713ddb8cdec72ca86bd6471b6cecc88b7b5d diff --git a/results/combined/merges_tested/qihoo360/xlearning.csv b/results/combined/merges_tested/qihoo360/xlearning.csv index d285dc7bdf..3414c8b776 100644 --- a/results/combined/merges_tested/qihoo360/xlearning.csv +++ b/results/combined/merges_tested/qihoo360/xlearning.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,True,9,14,67,2,True,9,Tests_passed,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,True,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,True,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_failed,f226a5740dab6f70aa0626b650fcfabf965aedc84240c2f158477199e61f2b48,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29 diff --git a/results/combined/merges_tested/qubole/presto-udfs.csv b/results/combined/merges_tested/qubole/presto-udfs.csv index 07190782e6..415ca27cbb 100644 --- a/results/combined/merges_tested/qubole/presto-udfs.csv +++ b/results/combined/merges_tested/qubole/presto-udfs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/6,4079746bcf5db1be249f4cab5cc8dfdd71961c4c,ea67e78dbcb8e5814bef147200ca386140286494,d178b8e62619906b2405b974facb07d565a0e26c,,True,True,True,2,11,111,5,True,5,Tests_passed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,True,Tests_passed,c09e3820fb0eaabc87977c3bce3c15bb23692857af2c578944fe8056b690745c,True,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,b1ce8b983657c6d6b72a193668b73355e15a20f3806ac7a1c6c82c34fd8aede0,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076 diff --git a/results/combined/merges_tested/querydsl/apt-maven-plugin.csv b/results/combined/merges_tested/querydsl/apt-maven-plugin.csv index 5c44ba5745..30bc806d35 100644 --- a/results/combined/merges_tested/querydsl/apt-maven-plugin.csv +++ b/results/combined/merges_tested/querydsl/apt-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,a665fd53a68969af9effa507810b58a4f3aa5f8b,dbb7382379247c709a4b6194e0789a7f9d4bbe39,ba0b58a11190f93a62992908bbdc2bb201ce57bd,,True,True,True,4,14,70,2,True,4,Tests_passed,e99cdecd632bb5bcab00d309f785e200449f0ce754412ae2d6e29a3dde0c0803,True,Tests_passed,1a926c173a71ba675eb682ecf9b40e8784211a5d8ec731343c50373a50a5a090,True,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_failed,0d9f5ba5dfbd45d823e3fe15ff56999c7db30cbf14db780837bd195d6da4bbf2,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8 diff --git a/results/combined/merges_tested/qunarcorp/qmq.csv b/results/combined/merges_tested/qunarcorp/qmq.csv index 8ac4f954b4..9ae7eb8b0e 100644 --- a/results/combined/merges_tested/qunarcorp/qmq.csv +++ b/results/combined/merges_tested/qunarcorp/qmq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,aceed9c800f1a9e554f5cb8d583ec5a570eba088,831b51e546cc850ed9b5208bf3aafeeacdde0b60,db66b9a79f4902f94122a350eeaf5f52c8069a63,,True,False,True,2,3,10.0,2,True,2,Tests_passed,2d46fe46e3e6f15c95eb775249b8e82ea22970ce3a434c09815ecb9c23c32027,True,Tests_passed,7bf10cb4d9847e99f5b02b13f7242d945416c560aae5378841911fe5620ff810,True,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,8e4ef38ac26317685e34b8330baa6d51f0be2deeb0cea73eaf55c898d2f72796,Tests_failed,9c503b4b09c9a47ec19e767f6acf3fb85404d28149cfce3fdb8d863941223d73,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,8e4ef38ac26317685e34b8330baa6d51f0be2deeb0cea73eaf55c898d2f72796,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf 60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,True,988,2973,40595.0,2,True,988,Tests_passed,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,True,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,True,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,6bf187bb1f9f17744328185f25a5af5102a0e5362f19eae8fcae9730e19962c0,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Tests_failed,97512a5ba23c77db07f95565e2a490c3f153cfc978a0f0b54d40679f37fe7bc7,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,1766fdb39419d15aee1ddb77cba52c567f8576a1767d2d8572670b2a0e3db964,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac 62,refs/remotes/origin/pull/148,1d1cd62265c0a297e321c29715f01d3db4bd73b4,c1a317ae7a826e49176c07b986e5fdfdc964082f,a285a88b9fe92f5d334aebdef80def300e4f286e,,True,True,True,21,22,48.0,10,True,27,Tests_passed,2df18cd269ffabd586723669ff56f27ad7f0aee4c49f4fbba632a8f79c6b969f,True,Tests_passed,ffbe95a18151449a4f0322e2ad3e283a6ac856e174cde55b6ecd224c389bde4b,True,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,7cfd9f80c9ffdfa676237d8f13741a214fb9e48a7f1ce11d71f582fc61dd7ee0,Merge_failed,edcd23115c34101aea5c56c5099012163148abb27bb5872410634910ef320ecc,Merge_failed,a547845523af312272ebc474f240b4551c81b036c86a28c3185769ef67d1b9e9,Merge_failed,44178baeff51376cb718a37aa8354ed635530e89d2da58cff80c2c13e42abe7f,Merge_failed,edcd23115c34101aea5c56c5099012163148abb27bb5872410634910ef320ecc,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,93cc32cb3fce43ffb7a841c7192a74536428d91a9de03bd3fc5684e176d3cfc2,Merge_failed,a547845523af312272ebc474f240b4551c81b036c86a28c3185769ef67d1b9e9,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c diff --git a/results/combined/merges_tested/quux00/simplecsv.csv b/results/combined/merges_tested/quux00/simplecsv.csv index e35b03aa08..794cc5bf54 100644 --- a/results/combined/merges_tested/quux00/simplecsv.csv +++ b/results/combined/merges_tested/quux00/simplecsv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e0ad6010aa7bdb86ac4b59bbf90337b6929108d9,7d4cfeea2f8674d55c5cd2227b0f4150460c4a60,b91e64b85fbd567d874906f36548c2a91328e864,,True,True,True,78,361,16653,4,True,78,Tests_passed,40551650259b743df2cedd556d58d694ee4e582fba58504a3b68e0a7ef471ea9,True,Tests_passed,b03ea54f5b4eba5d65b1b6aa57df08d733a189a99feeb63336de75039ceb8555,True,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,cf30a0b2be3d0cbe095ccdc27219ff655bd6623328493de6145062326de8c4fb,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,30004cf94dc5b6d5be669fac6c9b459f1dc5c14933b0ace2da57deea79657205,Merge_failed,0c5192b7b128a28c50366525934924ca41442e9ed06832e0315eefeab79a5af9,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,9ea656546c19b8a624997c0a5088247ac0133fa987ba504ba5069788014ccb4e,Merge_failed,d5935322e421a72db1b8291a714d69f2c053e0ef720b2be3af471eb1b3ad5445,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f diff --git a/results/combined/merges_tested/rackerlabs/blueflood.csv b/results/combined/merges_tested/rackerlabs/blueflood.csv index aa74529d2e..9af18ef6cb 100644 --- a/results/combined/merges_tested/rackerlabs/blueflood.csv +++ b/results/combined/merges_tested/rackerlabs/blueflood.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,d158fbfcd5bfcaeaff7b4d1b62984ea5fe3a4f4d,5e40635ee3b2b46bfa3cde9fa1e42f3a992b0e06,f37f1278aeda8c0b64b4b6ac1d6ee37aa6e0417e,,True,True,True,10,27,652.0,2,True,10,Tests_passed,eeb8c4c08eae5be36c3a965732fad9258e47e531af3423ae588857f63e5bd162,True,Tests_passed,5d19b3edb0cd138b14ce9be27b31dbf498969fe16fbdbb5fbabe6dda63741d77,True,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,2adc699e57ebfe848f160b0438f23e3c9eaf71d09c2b238c77aa95511ecc52bc,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,2adc699e57ebfe848f160b0438f23e3c9eaf71d09c2b238c77aa95511ecc52bc,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43 40,refs/heads/master,f83485d6abdaef72cf27abda4ee7f1a7951f6063,8133bf7948e95ae843ec029b268d7409bf2152ba,859a6a9ae5b584fc1969e84ce7e3c41f0f22678a,,True,True,True,10,38,582.0,2,True,10,Tests_passed,c0961f8c5ecae697c6650457c732ba77254effd5d1fa7624aaa036c8619847e9,True,Tests_passed,391766fae545cc73b60975f58b7abb6a4a63bd86ff12d8b9efbc213fdec4cd4e,True,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_failed,73e958f91145ad7dac8318f1f0a1b5a685af39cee84856ca1da2f43af7dd41c0,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9 826,refs/remotes/origin/pull/45,1200c7e78484eac21969bcbbe2acfbfb7e3e227c,db78f9f62d2daec8a705bf465e54c5824fdc8869,5614569fb09c7c77bcf6e602bd8b405de02798b3,,True,True,True,66,65,5374.0,2,True,66,Tests_passed,f15d2da453d89642d7df9956c3a1e089bf8307217384912a0b6685037a444f1a,True,Tests_passed,88a5f7cc226a5ad8333e97ced7f94f4ee846e4c6a3e6c544d48e864242695fec,True,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,a8fc8ba758358ddbf628d96cff524382e5bc2a4185aeca6329366c21e54c0008,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,a8fc8ba758358ddbf628d96cff524382e5bc2a4185aeca6329366c21e54c0008,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a diff --git a/results/combined/merges_tested/radkovo/cssbox.csv b/results/combined/merges_tested/radkovo/cssbox.csv index 4f8c38b8c8..0adc6f8548 100644 --- a/results/combined/merges_tested/radkovo/cssbox.csv +++ b/results/combined/merges_tested/radkovo/cssbox.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,a43ab1df773cd86623a45610d396e2d3048efb6a,fe025ed3eb78c1d09be279b1ff43a81269e6def2,71087dd6359c906ef07d42c80d7d0d76ae1d99ca,,True,True,True,14,77,585.0,6,True,14,Tests_passed,642adc7bd4d53f9a21c66f7ded2c0b4b342554fe7ffe665a10b777f0d64966dc,True,Tests_passed,d90d53cd2dbc93ec0047a45a7e442fb2b0d48c4bc7bf387ad381684e4e41e997,True,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,ae295d2f0d64ad31217b8011f807bfb1cff45e09a972b3689d924bab4205a046,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc diff --git a/results/combined/merges_tested/radkovo/jstyleparser.csv b/results/combined/merges_tested/radkovo/jstyleparser.csv index 45894cea43..dd92617042 100644 --- a/results/combined/merges_tested/radkovo/jstyleparser.csv +++ b/results/combined/merges_tested/radkovo/jstyleparser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,eb599195344fd6bd2a87d34ec0ffec826b7f47c4,0f8f1b537a7f47b411d9884f48d5fb69e642beae,4abff6cd8b28c3d8e48f1be9da868d59870724c7,,True,True,Tests_passed,c5425ff8c7433b0d39bafbd94ace99df4e1c3d447cf1c7b66a0dba6452862858,True,27,187,1739.0,2,True,Tests_passed,a2abf93da43c90abc6c8dda153a313bfd483deae4c8b64167ddced6076bd3533,True,27,True,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,7e1e965f2328c670919177d640645deef607bcd67423bad9ee6932b5034d18fc,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,aa755a69b7ae570fa6c8af08382ebc149abd95bdca35cf76bb0a21a06591788e,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e38d5568356d4e697875b3747f9b582affe44ec922cb9082257407630044f706,Tests_failed,4c96fcf7326f49868154734e77cb5702848417c70dde193777e58430e45db968,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,aa755a69b7ae570fa6c8af08382ebc149abd95bdca35cf76bb0a21a06591788e,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e38d5568356d4e697875b3747f9b582affe44ec922cb9082257407630044f706,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,7e1e965f2328c670919177d640645deef607bcd67423bad9ee6932b5034d18fc,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786 10,refs/heads/master,8f59a62d1400a52875e9d221cd43368a589a4249,c1e0f1ad746e881ffd87b73fea780f50b37071f3,c26312235c1fdd56a68dc5d240269bbd05862dda,,True,True,Tests_passed,e3f85d40a833ed92e01140759da7136c47808b873a531fc75cf86347b67e067e,True,9,32,106.0,2,True,Tests_passed,0b7e51de8e0874158fea7b7056320a1d9d802b22ef3ef394e61c1289322767ec,True,9,True,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b diff --git a/results/combined/merges_tested/radsz/jacop.csv b/results/combined/merges_tested/radsz/jacop.csv index c5ed1ad3fd..2eb4fc382d 100644 --- a/results/combined/merges_tested/radsz/jacop.csv +++ b/results/combined/merges_tested/radsz/jacop.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/develop,709370e5e7ca8887a55ae12f3357138d7f38684d,a4c3d5c2677fcfde5ebba400dff84db1ba1d202d,dea313a8840655eb7f180b4bb17e3842917592c8,,True,True,Tests_passed,0b426a9d9350a3d72d790f76974937ea169be6de6cf1778fc98f914d213a09be,True,1951,6948,4410953,3,True,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,True,1951,True,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4e1f35ecfb0e04dbc1c9fced6bd6a5162aa467fa2114cfb4a8d7c661d57b84ca,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,89f26487d0cc7eedd0b31c4fd54155a801d5795186efba5f82c010cf0f79ec61,Merge_timedout,,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4c4c9930542dc1dbc33cc57e28e93a236edd400b08eaaa5f04df628320d72f48,Merge_failed,9410eb3d41ebc27b957bc3f2373570a6abbbe6de963c24b509962d8685f1fe40,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d 12,refs/heads/develop,dea313a8840655eb7f180b4bb17e3842917592c8,f2d204e02ffb65e123ddcaccf7385ca1dfd75f28,4875674b2d848e72175e1a6cdc5fa1fbf0984944,,True,True,Tests_passed,918665ff3e05bf44c7afa09a4790041fbce60098ceac25f415c4be3eb495d957,True,5,35,498,2,True,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,True,5,True,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,097b74e44d2f57b65581fdbf1868f04840cd6b406d58f8a877776ddc517b443b,Merge_failed,6f6c2560962a3d743a849fa8d85b11467de9b082c21da5fc167b1da6dec49f81,Tests_passed,f438300257ba85ca196918fcdbbf189297d931a0108b010350635ca898808510,Tests_failed,e04a7a6f25ec3bae9305ea7c99fe620b0e7435677c84f9ce6d95685585161730,Merge_failed,6f6c2560962a3d743a849fa8d85b11467de9b082c21da5fc167b1da6dec49f81,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,82f8238993e74be800b5b9909c1a6f103dbef9f3c10566d7bfad7b7a6d5754f3,Tests_passed,f438300257ba85ca196918fcdbbf189297d931a0108b010350635ca898808510,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc 14,refs/heads/develop,71277a949925deb601d63cc793c5b2bf152ce120,356b911af972ec1f039dec4a3ec926e56d242a02,7f994f212a04cce6d0d871bddeadf8fbb82b088b,,True,True,Tests_passed,8b5373607437ced0daa5843eac7212e5fb0fb5779f97b38910ffc4d1322956ec,True,1357,1535,4381894,2,True,Tests_passed,842148d81455a7df777b65396be9ff02b745219858ec61174bf45e4917031ab9,True,1357,True,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,cb2afeafaf599833c91a89272c29826838b716e72f85d80568af6aedaf2c0f0c,Tests_failed,94db48dea33d16bc4291d3b4aaf606687ff87dafb91a39ab88fec02075b116c5,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,cb2afeafaf599833c91a89272c29826838b716e72f85d80568af6aedaf2c0f0c,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc diff --git a/results/combined/merges_tested/ralscha/embeddedtc.csv b/results/combined/merges_tested/ralscha/embeddedtc.csv index 0c2653f0b5..0a2e1d0235 100644 --- a/results/combined/merges_tested/ralscha/embeddedtc.csv +++ b/results/combined/merges_tested/ralscha/embeddedtc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,bfd16f6a9720ac0ff5fdcddf91a5ddd18d996ae2,d9908dceb43b0c27fa9699630dfc3714f224170d,9fec12b47ef5a0a668443caff176254d78117055,,True,False,True,2,1,2,2,True,2,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,True,Tests_passed,d793988448317818b80e57579942e79a08b6af00bac838b24f7c716c1ff20d52,True,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_failed,6fc1030734ed957f82c2e81bacd6b486859153f34199ea591b1a4d2677593e80,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574 diff --git a/results/combined/merges_tested/raml-org/raml-java-parser.csv b/results/combined/merges_tested/raml-org/raml-java-parser.csv index 80c6d37d9e..244a9052fb 100644 --- a/results/combined/merges_tested/raml-org/raml-java-parser.csv +++ b/results/combined/merges_tested/raml-org/raml-java-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/623,ae1104a8aa2b37f92b8aa6485cb38c285310a5e8,83a2384ffbfb2d7814dbc458b27dfcd09f589a3b,3cd23b57bf897436eaa3ecd5d45358494f9f7671,,True,True,Tests_passed,df4079e1916c26503d43aa89f37d730ad6f05b7a213506ec636df979c5ea58e6,True,23,81,1030,4,True,Tests_passed,042e065ce82ddbe36f3f92807b53f66c1380b3b59c9d1bc7f1f4fc0082db6dd1,True,23,True,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1 diff --git a/results/combined/merges_tested/rcarz/jira-client.csv b/results/combined/merges_tested/rcarz/jira-client.csv index db29f5b2d8..0efd0e55ef 100644 --- a/results/combined/merges_tested/rcarz/jira-client.csv +++ b/results/combined/merges_tested/rcarz/jira-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/heads/master,3bc59bcee2e94a0905d0325aa037ecf68133ca64,020046b7810822abfe7740fcd6f1a4db6802c598,83b0f75c090e1604c2fd93c00ea53907f4f5123c,,True,False,True,5,6,17,2,True,5,Tests_passed,edfd3f78755ba022452807139205e372f01f451d73a0d90caa7682a7663f9cfb,True,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,True,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,ce3d0078a812f82bead021c9a9057bf6231ce90225921ea35b5b295e7dc83e7a,Tests_failed,9d0d2f4c5296b8c88928a7a75671f64018105d2284f0117d4762d94deede0a2a,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,ce3d0078a812f82bead021c9a9057bf6231ce90225921ea35b5b295e7dc83e7a,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c 65,refs/heads/master,a2e6adecedc3d257c95533b45c83ad8be2da694d,999dd98d67f1a0a364ce721b2f77dc55f75d005c,1583879d639019e6e6c34782469bdb4ed3c8eaee,,True,True,True,33,44,191,2,True,33,Tests_passed,e9c9a8340bc7729542c85e8f0a379e865b0aad23b3b8295a5806a57cee5a7c3a,True,Tests_passed,4e50c91719837e2ea43a9c2e1e15d88b5bbf7a07bedb2c9483fb5db8196eda8a,True,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,0677b55f7b10034f48ac23f271a8a631373a3720f6e6e63455bc230ea0653b12,Tests_failed,22d9f3fba29202f345fa99fb8e544b7478e249dfd013ef03aed5282d133fa9ae,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,0677b55f7b10034f48ac23f271a8a631373a3720f6e6e63455bc230ea0653b12,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b 71,refs/heads/master,d7029e91216bdf42fb9638a846efbdd1550d2941,f51e5f0b18c1199f59f2dda994cf3ac8f8808306,ae6ced8aa637df02afad8605dceb8813bb57ff31,,True,True,True,23,29,1947,2,True,23,Tests_passed,59c9a9c6f5e09412b085f2222ea9125453fb7d85bd6d94dbf9409a7a44af3afd,True,Tests_passed,63bfc8fa482dabac02ad1d90ed10670dfb5a09bcc265c259f54cbb24fed6a29d,True,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,fc5ba40d6193fc892ee9a210fffc3c38f5366478cd1837a817b85b6ee236e0c6,Merge_failed,628aaef7c8d2dc784b0c7d4496f89ea2d954f26759933b49143c980029c1a34c,Tests_passed,581fb8efac1127a76444cacfb65030f6de056b377fd0532a022c0b8f3a970946,Tests_failed,ec6f202c81f905f1aaf2c426a38faac85f0b2e1e7b0fc50bddbad89cbfa584fe,Merge_failed,628aaef7c8d2dc784b0c7d4496f89ea2d954f26759933b49143c980029c1a34c,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,9eec17c71032233d42a4141e2f783cc5afa2aee3402d51d20a944c85ec638ea5,Tests_passed,581fb8efac1127a76444cacfb65030f6de056b377fd0532a022c0b8f3a970946,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77 diff --git a/results/combined/merges_tested/rcongiu/hive-json-serde.csv b/results/combined/merges_tested/rcongiu/hive-json-serde.csv index 322ef6c239..5728c7e931 100644 --- a/results/combined/merges_tested/rcongiu/hive-json-serde.csv +++ b/results/combined/merges_tested/rcongiu/hive-json-serde.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/develop,79f74539771c43c7d13ecb1f1ba86d01460c1e19,3d46bfb8f0eb65a2f0a9e2e9f925e2c4c1273c1a,27cf91b93257b75c3d107855f33e694e814009cd,,True,True,True,8,23,237,2,True,8,Tests_passed,d67210c651ddbba5b93b36428f8ffc0152acff776c43adf0cc8d6d52fd3e92aa,True,Tests_passed,8583d42255961ddd7854ff7f6010d4d210a0fb89d39ac1599c6acbb3e1f1618e,True,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,0840cf813f0e9eecc082b253e7795a1ab73b8ca53d79de6030144c6ff0d2eedc,Tests_failed,ab0f87eaa18c540d183b44379f713c5c057ffd33dcb162034932f01d7ea5f372,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,0840cf813f0e9eecc082b253e7795a1ab73b8ca53d79de6030144c6ff0d2eedc,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58 21,refs/heads/develop,86449da613900d3e02c87a2c45d6c6f731858130,1936f6dc438e040c207510141ba1e2f148c7aa6e,409c6184b8cadd945c3c44da9bde386e0646c115,,True,True,True,25,155,1097,2,True,25,Tests_passed,36144dd1f5094661f82f457985b9d51b8918a84501bb75e05bec926f40ea28b7,True,Tests_passed,259c726b8278cf3f98af08d42d9d491141c85149a1882474c8756f381493e85d,True,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_failed,e93437ddfbd7f7d846a402cbeb4434ee02a66835c51c46910c2321d74a276fd6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f 23,refs/heads/develop,7e380ab961fad641cc834600fbcd2557c3f5f998,06a73b96943ab1ceaef770d83156cf0e37d77d41,bcba8008dd383adc7e1569f37d7d8b21acbfc808,,True,True,True,56,259,1960,3,True,56,Tests_passed,78390f0298d79af5aa9ad6cbfc2dd456dd8a71586bbadc1d37c43cfcd076d1a4,True,Tests_passed,775fe36967f76c112fa1103dfe6ff915a1394df5b532f59e0567519b36ee11a7,True,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,c1da2e432d3b396a47fe17fa5a5e9ba606c87219d2da8c965aae4d8d47fff25b,Merge_failed,8e07e934387c0b60564dc93e350f4725094b938b606820c7b8f4e064f01041a4,Tests_failed,fb672dcc8244ab21d2800ef54a7d11576fd12c46bb45d3f0cc321688f5a5226e,Merge_failed,50c0c5b2461a43f4a69213a0c17519f044ca07c2130d7ac6f9a8ad01fa34d363,Merge_failed,8e07e934387c0b60564dc93e350f4725094b938b606820c7b8f4e064f01041a4,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,5de103ec9b543b9658bbe041fb690e3ba27213f870987c8053a840e30ce4a313,Tests_failed,fb672dcc8244ab21d2800ef54a7d11576fd12c46bb45d3f0cc321688f5a5226e,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6 diff --git a/results/combined/merges_tested/rcsb/colorbrewer.csv b/results/combined/merges_tested/rcsb/colorbrewer.csv index f13051a196..05ba273a20 100644 --- a/results/combined/merges_tested/rcsb/colorbrewer.csv +++ b/results/combined/merges_tested/rcsb/colorbrewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c551ca68b2e9bdc50824f990db085754ffa6dbdb,43693ef94faa798cf7f15dd0f3557c377e9a201c,ccfe414fa1d26237f8c9538fc5ab255ac8746a1f,,True,True,True,12,68,454,2,True,12,Tests_passed,238fb7ce6926ddc3255f3e34385b4fa728c7ebba038d895b3cce8ec92dbe3106,True,Tests_passed,ca9a9f5c61fca4d9d0e96bd8e8de449ad3ec3d2133315ec76c8f6a75293839d2,True,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,ffc51d80ac1a6f8571969d141ad8f7486d339a97ead4471540a5065d7d07303d,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Tests_failed,bf79b14d1da5d4824b2978599c8f48945889403ecca92a9fbf5ff6e3ac0e83d7,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,1d46a80d3d5252eb71298a5055e2d9efbaf756304b100dafe0b0d1402da52d95,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167 diff --git a/results/combined/merges_tested/rdfhdt/hdt-java.csv b/results/combined/merges_tested/rdfhdt/hdt-java.csv index dc90f9cf6e..e56abf4438 100644 --- a/results/combined/merges_tested/rdfhdt/hdt-java.csv +++ b/results/combined/merges_tested/rdfhdt/hdt-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,ff0bcdef7668eee10d3bc72f1ffb13b04450583d,febc5677793217866297d9012b67d28181c7974c,3b5908ffd3ca5abf83004849193a2ac76f43d571,,True,True,True,31,148,1808.0,2,True,31,Tests_passed,f01ebc57c76d0b59cb2aeb7f50e0a1aa25ba9f2a7898be502c4cc7be79d8883f,True,Tests_passed,f688bcac6fa3495683bb16c547baa7ec7b433da837236651f7bdeaca6beb9577,True,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,917f6dac0c900a625bf4bff57b8bd3d1ab2db432381b2b76c1a44bb4b5fa8b44,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,917f6dac0c900a625bf4bff57b8bd3d1ab2db432381b2b76c1a44bb4b5fa8b44,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425 9,refs/heads/master,d8d4b2a826b545a720460952a32d1ad2c92eae19,aa1ff09f537f595edd44ea1a52d37abc274b049b,eac943b6ef4ae65ab6e0711f6d115aafc0939cf6,,True,True,True,71,295,4698.0,4,True,71,Tests_passed,891391d210ed46682ca48cae948dd2f054044168932cfc91054c83cf45799d33,True,Tests_passed,0c52a0fc5c05f9ead21cf1c689dc72426418260e5676f0cc2ffc6d3696b15d45,True,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,9fbe0e8f423c379ec7ccfd3456efb8efed123a9882429a96ea89057566b0c55b,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,9fbe0e8f423c379ec7ccfd3456efb8efed123a9882429a96ea89057566b0c55b,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208 39,refs/heads/master,0ffcb4346092fc2daeb5685e0da41f91df64f589,594e5f6d7bf7bd35d010eb732f4f1bf48fac894d,fb33ab9bfe944f614db96d9926dccc991bcb592c,,True,True,True,22,101,2413.0,2,True,22,Tests_passed,77f3d37da75f025a067c20cefb982fe528f4ce79aefe29aad33451049bb6bd85,True,Tests_passed,bfefcdb31265e93a42c832c230c6dd9b1089fd3349eac70ef43e632b531660da,True,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,e892ca99c17b47fbc5850266ac32901a5c138baca6a5dd8585c528b81d4c3d40,Tests_failed,2502db17366a994bd68cfb6774ff6bdfe5093f5aee8f6066a4433e3fece579fb,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,e892ca99c17b47fbc5850266ac32901a5c138baca6a5dd8585c528b81d4c3d40,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e diff --git a/results/combined/merges_tested/reckart/shib-http-client.csv b/results/combined/merges_tested/reckart/shib-http-client.csv index 1fb179f1bf..ec09907c52 100644 --- a/results/combined/merges_tested/reckart/shib-http-client.csv +++ b/results/combined/merges_tested/reckart/shib-http-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,536fe936a3def7020da2c514f6b2c42fd39b4d11,da399ec67592ca7205a57c599e4058a69669ad3c,3918e16a51c68433085c57c3690a21e4219b74ba,,True,True,Tests_passed,d4c1c32de7c810aea99daef55638bb0f41153fe5af179c6c004ef0a7d7161d73,True,2,19,97,2,True,Tests_passed,96df33bc8056dea40d7ef25e1175ec08eadeaa5409565001c92fa916a7bf77a3,True,2,True,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628 12,refs/heads/master,8f3bd7175700bdc81d604f901cf80eb70c3d4abc,1525a43c562c5665bb6ebf53e57b6a711fb4f6ee,67ee9b698d6da6424a5c94e0b4f8938ed6d7cb1d,,True,False,Tests_passed,9506673b337f26f02ee304a54eeb85ed07df804f85934856c8530d9104c9af6d,True,3,6,22,2,True,Tests_passed,e5366f2d82476cab06a370d15a2cef0af4044855fee6d6af6a74fd6f8bd957d4,True,3,True,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,a2e2b2236758ece7648fb30f2c498a92836d77afc12e0e2c9e38ec61737152d1,Tests_failed,682c546e197633555cd12d7636ae2f5c5e606e2e5592697e8a5704f732e73ccd,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,a2e2b2236758ece7648fb30f2c498a92836d77afc12e0e2c9e38ec61737152d1,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6 14,refs/heads/master,a4b0d03cf989b0794cbd7d027fade64ae6159f30,742158590f0e4815d4b9747f16c2b6ef2b4ffb29,a76ce122e90f9351ff46a9a897dfef3e55d54989,,True,True,Tests_passed,3cbfa0904180bd502c1f2bf15133a11ac9f93fd8c396c2892dd00d1ca296bb68,True,6,11,37,2,True,Tests_passed,b0ef3726ed2496153bb45a1699060eb42d7d72b8aaeabd7e53dcce1833289a44,True,6,True,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,d01a2109d05d1ffe32ee46c3eabba073f7ee45c232e06c338c5a54b7214d1d07,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,d01a2109d05d1ffe32ee46c3eabba073f7ee45c232e06c338c5a54b7214d1d07,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3 diff --git a/results/combined/merges_tested/recommenders/rival.csv b/results/combined/merges_tested/recommenders/rival.csv index 6e11fcb29c..30ac48ecae 100644 --- a/results/combined/merges_tested/recommenders/rival.csv +++ b/results/combined/merges_tested/recommenders/rival.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,a8d64144a645278ab58db673a56ef5ff43417d0f,35e15a2d817fa78d5673187304b7b0db0f67b79a,ddfa73bea6cc8ac327d313fa229cbe1b56cef22c,,True,True,True,9,17,327,2,True,9,Tests_passed,60571ade857332c578d2f66add29262b732f18fe63ed4a42082b31a84978db51,True,Tests_passed,f77ff9dbf10b7cb1035c46ae951426ba231b54ccb56527d58e4237441342d5e0,True,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_failed,7f55a721b59540e9bdbf3320cb0b705c6961485cf4d9d34a55d3c03d2cefb562,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc 7,refs/heads/master,939b78c783eb43056a302013d8ccf9672b1799dc,de8a07bc53bc6e654bf7140d8d9fb86f75afe6d2,ef6912c26f47636a5a827cdff3aa49e610edf56a,,True,True,True,10,10,659,2,True,10,Tests_passed,1a3daa84f0db9abbdde1c733f2fb321041f2d2dcef424cdb980164450054f592,True,Tests_passed,9c1efef58c6619d35f5692bb34262a461eaf044e40ecaf0a751f9f5f3337f688,True,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Merge_failed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_failed,e8e62e9c752c69048f058d58f0b580f28cf0eb44d3652179213011f9f2ea8e32,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Merge_failed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14 11,refs/heads/master,aefae91d1ce70013519cfa0bc0132c5279c0fb2c,f476737befb920041b0af4c15861dd9c521c3cd9,6f095c52065a77f7df58a96d8d4516c11ed3eac6,,True,True,True,71,424,2768,4,True,71,Tests_passed,8b458080673eb645b9b9e8c29b0caad3c3baa31d6606ac3a57347b61cec23516,True,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,True,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d diff --git a/results/combined/merges_tested/recruit-tech/redpen.csv b/results/combined/merges_tested/recruit-tech/redpen.csv index 7be0a36859..3eca7daa0d 100644 --- a/results/combined/merges_tested/recruit-tech/redpen.csv +++ b/results/combined/merges_tested/recruit-tech/redpen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,fa710f48dd8ca04e42fa079491a65d17763dbfc8,647b2646daa95dd8dcb77bf6c8a5b5f653acf0f6,64ca201ccd7fcfc3fbcc45f2d8c934bed01e56e7,,True,False,True,14,52,178,2,True,14,Tests_passed,68f4424f3594a8b6d46124a8aff1f6d931b7fff47fd626d27489e03070c06989,True,Tests_passed,08b7d4b08ef90917fae5c9f7c661b7f52f4be87f11cf225079798a695b65a57d,True,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_failed,999c1b539ab0edd8ca40cc12da23eabc61607b98f94134f03f459727fcec4fad,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209 109,refs/heads/master,1d8f10467a2bd622b0bb19ef22a2cc41860a43ea,9e25814d70810b79bdba5c8dd0b536f0fa283396,f735b5c97c2f1babf6e21a12e9383095b7c9df55,,True,True,True,13,43,380,2,True,13,Tests_passed,14528e6b8a4fc99308a121bbec6244f120166d9391132f641edc9c36e24b0b73,True,Tests_passed,27833bb73adbcc500fabc3fa0c53b194c30ed82c4a305edbc47a4d05e333a89b,True,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,0bfec9b7659bde72779d0c689e4c71246e3c3929fe8772a02264c24e23302819,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Tests_passed,500c2056482f31d80d821d1ad4265dacf8351a46f82472e14ccc55af781f2b4b,Merge_failed,88bd5c0544e5989e5b77d8e1afa9bc6739b8ed9040cb1f04e42cfb4be3319e30,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,b06c4b4c259f85719ca119e8ddafad376fd5e17b475cfa94f8a90c5df05d642a,Tests_passed,500c2056482f31d80d821d1ad4265dacf8351a46f82472e14ccc55af781f2b4b,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88 136,refs/heads/master,6070b11414a006e8f3c05e457543200a9f558809,cc39c2c3d3b5129d13425d83ad232d4b3b0eb35e,ccc1746eb27eb5577ccf193becad078378878e25,,True,True,True,26,70,864,4,True,26,Tests_passed,7c0dd339b633f4a0849988d01f83c1f93564991bd30b986d69ea8f7c0bf6b2d8,True,Tests_passed,8ac28bbfb4c60056451141d9d19160cf2ca51cde2de44d6c63b19200760c4e27,True,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,5db246df7e3a898ee1fec7a4ff59d37c9bed3e19caa8918749715ca3c3bfa88a,Merge_failed,f96c090efe5bec7a1b6d97bab6669211db5d24bb35db0a3bb16f933541869d5a,Merge_failed,ed4ab5fd5980cdbb0cd6b1d9225524d4b3e8353caf8240eda8c472b42d0719b8,Merge_failed,b4426a841954c21b5643baab2d43d06adc8172420fdddfbf69e5dd03ad7215d4,Merge_failed,f96c090efe5bec7a1b6d97bab6669211db5d24bb35db0a3bb16f933541869d5a,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,e97e06269c6d298c3aa30051d08d7cd1a5df9d7f75561149e17a3c7f43afb73b,Merge_failed,b14cd1987dfde604008cb859740dceb961dfa6b993427f84da596396dbf87bf2,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd diff --git a/results/combined/merges_tested/redhogs/cron-parser.csv b/results/combined/merges_tested/redhogs/cron-parser.csv index 0b8b406f4d..58193278f0 100644 --- a/results/combined/merges_tested/redhogs/cron-parser.csv +++ b/results/combined/merges_tested/redhogs/cron-parser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,8b533c72f08d906092af419379d7fc6482aa8ff9,b5a18a790367a82946f6dedcdf1ba161264263a1,9dfc6a4e55e3c69ec10f0443fe2aa8550d86ec08,,True,True,Tests_passed,41c47ba486913e72e5d9763d2560f0326a31a8b318bb3fb67f3fd7698a7727aa,True,10,34,123,2,True,Tests_passed,609c8897e7d4c6839d956bd733145f6268314b2273e8bdebd5e3dffb36aa1d14,True,10,True,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,72777731639eb3fc79473777ae9e04ee5a24b518e21da29078ef8580052a8a1c,Tests_failed,a96a83ded86c975e85cee29deefbae8c208d2bb5d318b580493155f146ab8933,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,72777731639eb3fc79473777ae9e04ee5a24b518e21da29078ef8580052a8a1c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c 11,refs/remotes/origin/pull/46,200e4e12bf5d866a9b127c78d5c44dd1ca5180a9,449f4a3742f32e463fc9f360f325c67c5f3813b5,e0a8d56ec328b0c3f6fc397891948545e0804cce,,True,True,Tests_passed,8f1f1e38968faf4bdcf4505d19d38ae747bc70f038cbe2e7ddcdbd16230cd2da,True,7,17,1176,3,True,Tests_passed,d005990ece286fc40fc39a12143ddc3bc898d928f007561d70ff34cd1068ac0d,True,7,True,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,9c37059bdf68f69e63f3677eb768e996dcaa2d1cb450de5a35b56407feb2f988,Merge_failed,e6f4a50194a441f2f03e7f9f2478691804751cc4326c0bf99cf8ac4e7b8a4269,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,81bfe11d6d63829c81eb6af8462a91378fffdb1d4367cd2b7fe6935982fe444f,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea diff --git a/results/combined/merges_tested/redline-smalltalk/redline-smalltalk.csv b/results/combined/merges_tested/redline-smalltalk/redline-smalltalk.csv index 985d9a9169..e9eae56e72 100644 --- a/results/combined/merges_tested/redline-smalltalk/redline-smalltalk.csv +++ b/results/combined/merges_tested/redline-smalltalk/redline-smalltalk.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,1130f6577957874e62749c9c1fb06de15a29846f,099d159ac5420f9e2eb900fb0f050db1b1fa2cd2,6f53baa8aaa6cc6b614e09f1cdaf44aa5c69118f,,True,False,True,6,9,24,6,True,8,Tests_passed,ec193b9bb1f4e091d033e5df7b26d57420e5e4f2688e544b4ae0fe15894de403,True,Tests_passed,a0a2bb94f8b9df7b3f93c67bb63728114c0c09b0e6faab31ae3d4168ed4c3533,True,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,9c51dcf14b6edd9823b42421ce15497a753f22acf7fbf648fec36efa78637ee0,Merge_failed,163949c5ab87d911f169ca773bf9d69bf02eb17b3d66374c83f548769accd032,Merge_failed,b636ea95cf5244c04d582f7b78e5817829aa74dc540ddd339760786f58bd2362,Merge_failed,73debb584b69b8a12e9e7594f43a2a1538e7c5431aa5a2225cfff99c46e6932a,Merge_failed,163949c5ab87d911f169ca773bf9d69bf02eb17b3d66374c83f548769accd032,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,10e4358c2b34d019647937619cf7ada3e5f8e6428c4a21c9606056dba7bb88e9,Merge_failed,1a736dae1db9340d5b785febcd07fad7130762bd3bda7bff9f7171f95c5fb1d8,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b 20,refs/heads/master,9cf94e88e0aa92bd28fbf690202b6428789fa3d2,c789c22cdb1587566a1db933c5e94e470eeb8330,ba962853fb12f7b9caa3a7f35e75ed5bf3aa994c,,True,True,True,31,82,320,2,True,31,Tests_passed,42e27e8e2ef5d8978a01c1e4d77f9831016a7ca579cdd7e29bdc09f332c2bdd7,True,Tests_passed,0a72157776f23d88bfd3527734732155be398c4591ab878e22ca52a7171d9433,True,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,f3ade887df686001949dd8648e6cbcd54bd134f3a2688611a4a83d9998297578,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22 140,refs/heads/master,3051df27c7e8c7c5ab002198e0f7cb817bc00c89,c43e3dae0d0e480a3f3b16897ce97d335be29658,dd314b98c87a840369d8c35a7829bcdc33de5340,,True,True,True,14,26,106,3,True,14,Tests_passed,ebabf4a59a8088fc3f6c9f6db283042e327a994edb1acec70369a1893aefe04e,True,Tests_passed,398538bcd72d57a9b6bbfebb33c32f4bb9e2ce231972c4e9f36e7d6802ff58a1,True,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c30d07291a4dd5e1caeeed7cf3e46803dca545233cfd6b9cbb00fc8ed813cb8a,Merge_failed,42357bc9fbc35acae136635de92008c18777cb067b639b0edb28a6cae1fa85a3,Tests_passed,e1e255244694853e7298eb0e181ac9c1c8ce4ee865c7e375fe0734e66f993e06,Tests_failed,97bf56fe9223b1f1317f8fe53f57a9ddcc2f03623c089015e4f09a7155def8ff,Merge_failed,42357bc9fbc35acae136635de92008c18777cb067b639b0edb28a6cae1fa85a3,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,ecd96d9874b531d361d96e0459640c2c39786ac70ec0f8ac0e0e49cb1268774b,Tests_passed,e1e255244694853e7298eb0e181ac9c1c8ce4ee865c7e375fe0734e66f993e06,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9 diff --git a/results/combined/merges_tested/redsolution/otr4j.csv b/results/combined/merges_tested/redsolution/otr4j.csv index c33de2cc9c..4a6a5da095 100644 --- a/results/combined/merges_tested/redsolution/otr4j.csv +++ b/results/combined/merges_tested/redsolution/otr4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,282b34caf770e1c59f2aea66544055f2bac531a0,4af67307df155fa3f23361b44fa891cba63c3edd,445fe2a8ad55d7da4043a22a4adc2c09ee4097f4,,True,True,Tests_passed,6e088c0fc7d846359d4caf85f933d789f41d1effca1da842933a0718272441e6,True,10,53,570,12,True,Tests_passed,d023de0be9ef42bba48aab5a9c5631e8755d3301526b84832c7a00dda9a0021a,True,19,True,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,e39e1f452d09e37a55ace953c8512d854d0a4652427b472262ad9e7e68ccca5e,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,33683ddaf301ae0464e9b0407598931b7f57aa777edea50d542e573cdafebd46,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,7844371ffb079937dd904bc9a139d92ac6afd0411fe4e09359890575f4288bcb,Merge_failed,9c04ad398e2ba258e6398b0db27feac317cf2bf528884eaa0f06327f715b5c9f,Merge_failed,a5e699ed88a58739fdb83c2dba50a5c61589c43d0ab3a3d85e899a783ec356f2,Merge_failed,8a3a2a4e526c2c1c5207e4ffa9f635a4de6b758ca2549225a3bddb0b313008a9,Merge_failed,9c04ad398e2ba258e6398b0db27feac317cf2bf528884eaa0f06327f715b5c9f,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,33683ddaf301ae0464e9b0407598931b7f57aa777edea50d542e573cdafebd46,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,05ebcaf0846a6a21f3c8bfe39145aa4e86f0135068edf4071f619b43840058d5,Merge_failed,2cfbd82bb9cf15f1c05e185383f5e0301cf3654f523cdaacb5b7e659a9c6f67c,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,e39e1f452d09e37a55ace953c8512d854d0a4652427b472262ad9e7e68ccca5e,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6 5,refs/heads/master,fee9c908d0389fa3e5ae469d907f2c872a23ce39,61f4011bf4abff5d60aab546bec06f886267b848,001049afe7cabe92929fed4bdc5b639a581763a9,,True,True,Tests_passed,18e903ecbd4b08fe7c00c8308ac378c77f01176f89bb5af75880d3b70baf2639,True,15,86,2135,2,True,Tests_passed,d9d5f2b75a18c7e67a058524f550ff03fe02b2b30d0a219540b7cc50fbe40c03,True,15,True,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,5ac512d983d560539d00ec6c24c08ef9b93fbc303419434a7d931e40ba86ec01,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Tests_failed,e207537fa310f8c3ce2423bac93cb0f1fc9043e3791c3d42faaceacf3f699dd8,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,f9a6c9be6b6308231f5aa55c066aff601276b448a1d9a63541e02c351a62b0e6,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730 7,refs/heads/master,001049afe7cabe92929fed4bdc5b639a581763a9,ee2330ed90169480d82594be170c2daaf157b4a7,aff85957782f43df69931332eb170f5c5efc8975,,True,True,Tests_passed,8a277fbb30dc1f930749b53fb7c4affe12ab7b6c45476458620edde73a5dec9e,True,50,131,13070,9,True,Tests_passed,4b8452420e0207c362ef2f59e4c1fbe0bd8399d4681677975a71ba60d9de4c01,True,50,True,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,27585f430f28c75dbe1cc753cdaf3d2b9eeabf705570de0a9e1d614184a92524,Merge_failed,9565bef7e06f2b682a344cf33521dba1dd1093f74aae120431f76639e690d1d7,Merge_failed,4d44ab8d64084da5066b3399732b48ea2b4cd3ed06cddae61a7c6c7baa80ae6a,Merge_failed,150dd50b4eae0f82f7124a2bf85c1478c791fe3f225141975f75be9a8c9364d4,Merge_failed,9565bef7e06f2b682a344cf33521dba1dd1093f74aae120431f76639e690d1d7,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,ca1941b913e3f3bc8649e8cf70369db570b0d1be4ed3e90798b0dec8e4f29f74,Merge_failed,5dba55b3bc365eb791a8710b00685f59df4514e50931c53642891c3654d19517,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81 diff --git a/results/combined/merges_tested/reficio/p2-maven-plugin.csv b/results/combined/merges_tested/reficio/p2-maven-plugin.csv index 5b2b23080b..dd6b737397 100644 --- a/results/combined/merges_tested/reficio/p2-maven-plugin.csv +++ b/results/combined/merges_tested/reficio/p2-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/heads/master,d3cdd1c58dd31c5b6a2ece582ccb58cec53b684a,fe15b0719486b8eda7c323abe2d6de77a7826314,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,,True,True,True,6,9,188,5,True,9,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,True,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,True,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a 71,refs/heads/master,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,3af99f9ee41c4dcff10ac4dff938fae7fd3c7b1d,6afa2123158661745199250d4ca8c9a9e70935d0,,True,True,True,5,6,13,2,True,5,Tests_passed,8f926a3699ef8eca3dcc19343d795004b0cdb304863287b69516dd51f83ba60a,True,Tests_passed,a1cc5c0e957ff59c19ec5edf804d840f482ccf0f5b99d50da12c5d2f8b161ac1,True,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,5e21d4ff375c2c1a9c524393614b8daf17144cc5b0b08d5a310ec5ac96ef0422,Tests_failed,ddca0ba9eab512125bda554a5c088b4b5c4431e2fdf1dc2d12a332ad45874a13,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,5e21d4ff375c2c1a9c524393614b8daf17144cc5b0b08d5a310ec5ac96ef0422,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad 80,refs/heads/master,b8ffa656364064d932f09d197181933ac23091b3,d73872526af67acb85e48475a499c0c78d3b0b10,1acc034dff68f5b574007c121f7487ed6272c3b7,,True,True,True,10,20,182,2,True,10,Tests_passed,d3ef669190be017dc3ffb72b3676e616b0c1c315d5abd255cec43bcdb34448b8,True,Tests_passed,4a745cf3fa8e6c8e43720d68ca2baaff9782c0f1693cd4d2bf65c5fd876f2c60,True,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,e0861d7acf1adc643bb98cc7c91e4e78d04b1c4994c6be2b28e9c514a2abf8dc,Tests_failed,89965b0cac51596e0b3f81a6ae3c37c5b670dcdcffec455dada6223eb3f9ba5e,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,e0861d7acf1adc643bb98cc7c91e4e78d04b1c4994c6be2b28e9c514a2abf8dc,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3 diff --git a/results/combined/merges_tested/reinert/jjschema.csv b/results/combined/merges_tested/reinert/jjschema.csv index 427199a2ab..1f7526585b 100644 --- a/results/combined/merges_tested/reinert/jjschema.csv +++ b/results/combined/merges_tested/reinert/jjschema.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,cf68aab8c3476922e3b59759894aba0bcc06f2c9,5a79670f46345762c70ddc1b003f6cf4132432f2,057e5f5e7c8cd7661a0ee64c4aa8a9f998330a22,,True,True,True,6,29,83,2,True,6,Tests_passed,33897a62816668f77765cfeefe08015c3e8da96f35af28999cd785bb0651c5e7,True,Tests_passed,2047e994eab0986e4c351a0361e44c3678546ccdf079f76b4e1c2beda36d58ea,True,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_failed,f77e49da6fd7cfb152e1a4cb9e75ca9587d53d90fe9519b05f428b0ebc185d74,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee 7,refs/heads/master,1276436b3b812eaaf43853b357eaa08039f5f291,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,3cda79e6dffc9bb6162bac5f926f2ec5721d12c4,,True,True,True,8,28,74,4,True,8,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,True,Tests_passed,a475a662b481575e3dcfe3f088dd0f303541a96b1d302632d87b5d2bf1f3a1a1,True,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54 8,refs/heads/master,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,2dc51ab95919d6e7765202332c906b7e15bb0bdf,ae602e2b5f3227f78b9892da86b80bb5df16c719,,True,True,True,7,14,44,2,True,7,Tests_passed,50b7061971f9cdb1e2d934437fc598b8bfaa572d5eab1b0d8faf2911293d1ff9,True,Tests_passed,40d45477a8bdcdc7224ee1d28e1b2614ee75b8e3bcfe690cc8cb9da0b55d8ddb,True,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_failed,4a1f43c880039b877468946582c060529a84b9d9896234a5927d129bf0575032,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6 diff --git a/results/combined/merges_tested/relayrides/pushy.csv b/results/combined/merges_tested/relayrides/pushy.csv index 72d3772cd7..e9adfce6c7 100644 --- a/results/combined/merges_tested/relayrides/pushy.csv +++ b/results/combined/merges_tested/relayrides/pushy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 105,refs/heads/main,d3f972ec9fc67512d4ee7fdaf486621453d3988b,437fd8aa85310e472a8d45f8870bf4eac3151421,ffca8c8ac376fdc6e72985dea2bdc34299a2068f,,True,False,True,3,4,10,2,True,3,Tests_passed,e4f4722a1ff6d13db100010aadccb184daeb44fc5a12953270358f2722b7e483,True,Tests_passed,59b773d0c313fae97e4459ff913db6e31acc526a6999fbbad9c1c33b03df6651,True,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,2b98907427d98103a76ce2215d764d984ff0f3c39faf75a8b9e2f216a8dde0c2,Tests_failed,8835ec2c7db8b9a5284e9161daa7336f0899a9bf8fd5bf7699646e71f93576d5,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,2b98907427d98103a76ce2215d764d984ff0f3c39faf75a8b9e2f216a8dde0c2,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1 146,refs/heads/main,ac2b7da9562b8bb28a29cbb0e6a5787bb5964180,5b89933ea3a2f5e52c7abc790951d615318ba086,6521deebcf6f79f10bc4197dde721e9ab762bca0,,True,True,True,8,62,440,2,True,8,Tests_passed,f14ddc6e089d9e95338e27b9367e9f7eaa44dff21b19a2b7b3f6f7ce0cabd663,True,Tests_passed,bc15d1855882b465782c53d157855e35ffa10259dcec4eaf3dce58a46cad3c6d,True,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,b7ff1be0b1a0f95d3b58b43416ed5feda423ceb3375bc13ac265fbbb9c38a9e3,Tests_failed,ab90ae76108eb6eaff0c86989807dcf30a7391baf53d53bcba7963d715ea4b38,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,b7ff1be0b1a0f95d3b58b43416ed5feda423ceb3375bc13ac265fbbb9c38a9e3,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e 152,refs/heads/main,21150905f25ebda8cf4dacfc99ada626f5113a8d,31608c7a15eecb7c7f7584786a24d34e5d1d61e4,53e1b320e03ef4f48b2359e1d799d906a8537f26,,True,True,True,29,210,1193,4,True,29,Tests_passed,c7141dc83a26a5679e58a89624b413675bd1c50ce0da21c5fc857d98a012a0c7,True,Tests_passed,ec2bb8c627cfa495ec756777cd2d556d8661a9cc0e8c23511b65e2f83898dacf,True,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,92da13f812f253d499522ecd9c993121acab59046761288060059af1dbaa5e91,Merge_failed,1699960b91ccf223adae474b681e194bc9706c637c7781c38f927122e90fedfd,Merge_failed,6ee805fc04ae0e58d63f30c7c422167b8f0acd979c3e0ce8057490b2e45e93ef,Tests_failed,814fb5e96df7b652ead5caecdf0e35fc8b3c64b84447ed93b65bd150ba4a30de,Merge_failed,1699960b91ccf223adae474b681e194bc9706c637c7781c38f927122e90fedfd,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,173a94a4e7a4709a6726df061da5390b11711865a75504d5590207a3f05946ff,Merge_failed,6ee805fc04ae0e58d63f30c7c422167b8f0acd979c3e0ce8057490b2e45e93ef,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea diff --git a/results/combined/merges_tested/release-engineering/pom-manipulation-ext.csv b/results/combined/merges_tested/release-engineering/pom-manipulation-ext.csv index 9a9b0613ab..2a010d5f49 100644 --- a/results/combined/merges_tested/release-engineering/pom-manipulation-ext.csv +++ b/results/combined/merges_tested/release-engineering/pom-manipulation-ext.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 195,refs/heads/main,9800d78d1ffb2a4c1b1bd0aab55bf9793961f724,6334195991f442756b3594898b61b0ba6cfd3621,6b4cb89f926efcb040f9795d473afb6db51f69bb,,True,True,True,23,77,500,2,True,23,Tests_passed,1b17812c58c7925363b8cac970ddfa8c9af30b80a62840417eac235dad16d777,True,Tests_passed,b71b4c83d42b3b2788d3ca7e00b8d14ecb9d439c77f6d8b7792306d6579efac2,True,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,0d9ddeab7b5de5bbe78cf40a4cca1eb702f11c475e9427725315702d99c849f0,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,0d9ddeab7b5de5bbe78cf40a4cca1eb702f11c475e9427725315702d99c849f0,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148 299,refs/heads/main,f742e2398f271a294be77b95814feed3fcddd144,80b6b8712f99eeef4fa92845ed66d47bbb0c95d0,2af23194cabbd906de81e134e0e54cd8efd92dd8,,True,True,True,5,16,76,3,True,5,Tests_passed,051eb4d82150dd58e8bd4f4a3647c9cd556dccf92e7347a83d492bc774760b36,True,Tests_passed,635508baf24033af50ba2b5b69c5f69fe49bc0fdb648a80d3fe61f67304797e7,True,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89 diff --git a/results/combined/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv b/results/combined/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv index 3f12c2bffc..3368479493 100644 --- a/results/combined/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv +++ b/results/combined/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b8670c933b7952cf06b007deb4668bb20fbb0b05,3c3b5d86544da2ac3b780428a856db731b3be5b1,e5f45d00d6aecf3a3803367f2629c706bc11c62a,,True,True,True,143,217,17306,29,True,155,Tests_passed,f21f858f3c3822757d28b3c9fe471abcf034e96b1cfc104a028b034a113095a6,True,Tests_passed,88e13b4ff81c6ba4bea29fea3406e43bbd51257a647cbc150dfc29df53f145b8,True,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,af288634a18ee7df1b99f67f49bbc4abd22f2fb7b86f79c13e6e1effbdad0e16,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,b56b0a618e101e88dadd0bb9d0513d0ddc2e6693ec267da1e2c83182d14d3fee,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,10788022f2b9c948ebd125b7f7a48def6409cf501ec317587a067d8eb8539bd9,Merge_failed,d4a1cee122f6f301b764b05e0ff9f3568816f0b1f19f1ac88cab46e2eadc05bf,Merge_failed,af4eb7fce5c36150dc4a9cc595453f3de92909fd20f1470f1e6dfe05775e8040,Merge_failed,d24a1b89c1ff0f797285f1aa6636f4a4d41b855f852e4f562896ee9650de6658,Merge_failed,ede05b6bc09f59f93fa22cbc4b1059c60a0864dfe716572f8b660d2ba02a4c57,Merge_failed,af4eb7fce5c36150dc4a9cc595453f3de92909fd20f1470f1e6dfe05775e8040,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,b56b0a618e101e88dadd0bb9d0513d0ddc2e6693ec267da1e2c83182d14d3fee,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,10788022f2b9c948ebd125b7f7a48def6409cf501ec317587a067d8eb8539bd9,Merge_failed,618d319ad9c8a89480921becdf5b615b48714e4cebd9ad45a5cd9a00ad165892,Merge_failed,d24a1b89c1ff0f797285f1aa6636f4a4d41b855f852e4f562896ee9650de6658,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,af288634a18ee7df1b99f67f49bbc4abd22f2fb7b86f79c13e6e1effbdad0e16,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69 12,refs/heads/master,f8105ddc44d47cbadcf250db7f2e6240addce1de,159a50f8e2b21ae099529ca63155ade49e5b64a3,d1fe078010338d875bd7eb034505e0bbb8180878,,True,True,True,10,69,1910,2,True,10,Tests_passed,94dbcabceb1b23a8c1a83275a4882391d257edf919655d326212e4f8fdafc8dc,True,Tests_passed,7b76b1b94de96f93eadfae1aa0f02dd874d579db6ce983bf5b16d7810636620b,True,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed 15,refs/heads/master,cded0b4aa28d135082421dc12b3fb357b642bfcb,c139a75c33bd34b725e9cd57824ac59a63e0abb3,31619999e6e97ce703029d0164ef197b45d13478,,True,True,True,44,162,4009,2,True,44,Tests_passed,e38b8c244f7ae6366253dcea2587bad4749b249aa718dd36fd991ee9fd063521,True,Tests_passed,e53e125fcbd2e8d43f3f75165d64494dbe98f4087d29418abbd62ae3afa4ccb6,True,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,6982c9924b90aa09e353ef0dd249d9a9981cc6de71b07de86b8bde1933c9b4ff,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,6982c9924b90aa09e353ef0dd249d9a9981cc6de71b07de86b8bde1933c9b4ff,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac diff --git a/results/combined/merges_tested/renggli/java-petitparser.csv b/results/combined/merges_tested/renggli/java-petitparser.csv index 06bef5c9d3..74087f9e44 100644 --- a/results/combined/merges_tested/renggli/java-petitparser.csv +++ b/results/combined/merges_tested/renggli/java-petitparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,5,13,32,3,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,5,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,6364a3812cdc5b4e14163c71234a7b2b04c94fde57e36cc181e3def70758e30c,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857 diff --git a/results/combined/merges_tested/renggli/petitparserjava.csv b/results/combined/merges_tested/renggli/petitparserjava.csv index adab56abf9..f3e7c79c29 100644 --- a/results/combined/merges_tested/renggli/petitparserjava.csv +++ b/results/combined/merges_tested/renggli/petitparserjava.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,True,5,13,32,3,True,5,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857 8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,True,18,89,800,5,True,19,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,85cdb350e3ef34101be7fffd2144198f9dbfc409bc0b4d576dbf1b0d741abc97,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504 diff --git a/results/combined/merges_tested/resthub/springmvc-router.csv b/results/combined/merges_tested/resthub/springmvc-router.csv index 16cce382e4..3580769945 100644 --- a/results/combined/merges_tested/resthub/springmvc-router.csv +++ b/results/combined/merges_tested/resthub/springmvc-router.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,71d38b423902b98a187292a1c0e9a6665fe35231,3bc490f1e9e979e3189625ac19f2741a69699010,bd30ac190818c9c32c8031cac4e3000058fc97d1,,True,True,True,20,111,2216,4,True,20,Tests_passed,feb2b6df8a147fdf1601ba8eaed7f15db417fef74a5efa6bce8909e5dceb63b3,True,Tests_passed,471c3694e6663ad3811ec61d10dddef8a7abf46b0481061bb3338b069eaf362a,True,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,102e69c0660440003e727d3fab4699276fd76ffeb22aebcad00f5467613b895a,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Tests_failed,cb62aeaa9cca9562e53c67fd31855c8d90c0486159989292ad0f4fa15039ee0a,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,655f360fed45d4400928443f03794f0986e448f05c9b229c2bcda93088329f9d,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f 26,refs/heads/master,cf86d464ca1768fae380c8a99223c5d536fa0b3e,7522c6c3cfcc73f071583e9f5ac0700ceedbbbc2,66fc0836883492ff4e0f1c738a140942e8f29ff8,,True,True,True,18,51,2210,6,True,18,Tests_passed,627ee8df5c215c9174c67b1c381aa062c1a1cd148ee546f56b2ea781fd1a98c6,True,Tests_passed,11c3d1a933d6371e9861e31bd57d3f4bdd8a027f840df405ad217247b451622c,True,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,bc51cacf51ad15deccb4393b0fdaad5b9b3629d986862dc453a9b66f9eaf4b94,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,99d540cbd7ef714d79b792d43f4c79d0ce95bf7a9756abbe5dd32f5826a936ff,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,d95df8e72d79016a118254bc8c8e6b40cef14c8ca6055a551e9fcc57b97fc931,Merge_failed,c4244453a4bbbade9ce4f2f6666e55ca16a7a05ad6e0048c9121daa1e0adf9a9,Merge_failed,71aa689f436c6d2eeadeed58c6019b7eca1326c16255229118e227f1b1d40a9f,Merge_failed,fbe16e04689e12724128e857e9eb8b0ae1d3f2bebdf825c0fba8342300761bdf,Merge_failed,f21879f20fc84bcbdf654d9d8581b5e1a1006e9721d296ca8791ade968b52177,Merge_failed,71aa689f436c6d2eeadeed58c6019b7eca1326c16255229118e227f1b1d40a9f,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,99d540cbd7ef714d79b792d43f4c79d0ce95bf7a9756abbe5dd32f5826a936ff,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,d95df8e72d79016a118254bc8c8e6b40cef14c8ca6055a551e9fcc57b97fc931,Merge_failed,c35c6208d5e32fbe6b4749e6c07e66c5c8cafbc80cb306511be76f7274d56b1f,Merge_failed,fbe16e04689e12724128e857e9eb8b0ae1d3f2bebdf825c0fba8342300761bdf,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,bc51cacf51ad15deccb4393b0fdaad5b9b3629d986862dc453a9b66f9eaf4b94,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8 31,refs/heads/master,43b5984109507a1956226b3ce4bb4641cf1f4dbf,2b4f6d9ba1e16e9e1cbb0f860d6417d7a5268a2b,e4270319fd079a7d5aeaa35a20630480a3efef98,,True,True,True,9,84,440,4,True,9,Tests_passed,cfae5d291bddee033cf78ab38904e82ccc63ad0475d81e4f282f3d6343fe79ef,True,Tests_passed,4460cddee2a34e32db6faaf676435030bdb44ef55cced86877155c3fc4af3a86,True,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,4bc810bd02feb2a59b4ebabfd245626ccec78b30a4ca313dcf8926c7acbd86cc,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,416e8b7e7b7ed1b3b4e631fcaf2ee975a7a115084f588b73bae1090180ad4aec,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,7cad7b916e4ee1ae87df4988f73ec3ddadddde494fce1b55e68550f2288794ec,Merge_failed,a9d1f54425447866a1b351d10b697b84522455cd121d859ecd7e38060ee87b06,Merge_failed,c1fa7986a464e22538de5188aa3a050bf9dff4f389e85f39266637e845a95a20,Merge_failed,a67215715887fff533f3ede3c0007930e77d0dbbd2fd1f4ee0bfe74ec471fced,Merge_failed,989df0d7df276d22f3736c48e2978b4e3bea4bc3be809767a422a31dfdf6ae13,Merge_failed,c1fa7986a464e22538de5188aa3a050bf9dff4f389e85f39266637e845a95a20,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,416e8b7e7b7ed1b3b4e631fcaf2ee975a7a115084f588b73bae1090180ad4aec,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,7cad7b916e4ee1ae87df4988f73ec3ddadddde494fce1b55e68550f2288794ec,Merge_failed,dc00b08c823b75a95e5bb938d6878a1298247df364295426672146b1aa7fb125,Merge_failed,431ffb81d8b63f5b64c22c16faa772c06e0f8f9afa4e9e069498108bf55dc01a,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,4bc810bd02feb2a59b4ebabfd245626ccec78b30a4ca313dcf8926c7acbd86cc,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6 diff --git a/results/combined/merges_tested/resty-gwt/resty-gwt.csv b/results/combined/merges_tested/resty-gwt/resty-gwt.csv index f112983291..404b6249c5 100644 --- a/results/combined/merges_tested/resty-gwt/resty-gwt.csv +++ b/results/combined/merges_tested/resty-gwt/resty-gwt.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,867b917c43c32acbdcac55767e7f04334006c866,05733cb0d13bbfd97adc6a9eda47b4ea3dcf04e6,9d45c90a98203c46b16910b1470fead4b3ae09e4,,True,True,True,76,362,3588.0,3,True,80,Tests_passed,833d3a55324d94ffa54b859d6714376079b6e3c1ecef892dad5248540068965d,True,Tests_passed,acf6165089b11a4759d351a9b67c1f38511392d7d788a3aa22a0ba1871060943,True,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_failed,5b4de61dff6d7b716d03562d27889d741b9821b13e3bd218a9c132b7ce27de73,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b 24,refs/heads/master,6b049ac6ac63e9fd3607dacd2c4aa8302e7a4949,0d2264c7b565582fe91d9b3a517ec8a88266b0c1,2432bfff9617a12060d0a4f29ba80d9361da7056,,True,True,True,49,130,1531.0,2,True,49,Tests_passed,6ba53951e4ebd1105f83805a774b4e9ba580a5751c1261a7911a22516bd14180,True,Tests_passed,6921a678edf76159b89e9c621d54cb0c9894b3557794e5f2564923625b5b6b0c,True,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,dff04477bc200af8d7be8f829945d9c1162bf8d22f9b69ad8a94ec8fc19564c4,Tests_failed,7fdfc6125a8c42d4cca4d2010019b6e5fbbd1dca5e47dbcabcf5e96b7a6735e3,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,dff04477bc200af8d7be8f829945d9c1162bf8d22f9b69ad8a94ec8fc19564c4,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928 28,refs/heads/master,6de0c4fa354a3ed4667376c4d14df82a5753e6e3,8e7b927692cbf2ab6d1f2918ecb6032e6765cad1,2585123b77c969d615b3952a780f1d8ed5764d50,,True,True,True,11,21,297.0,2,True,11,Tests_passed,100a79785fb4e375c83af14654dbbb84ef8735cfbc01b4d686a2d51b4f038812,True,Tests_passed,5a5a4d357b335ea6dfc99410bd0b72936c6281ea4d600d29f31582f71ae3927f,True,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,dbb55847338b245d23fafdb37fa48a8fd4b2fdb86a68eb5115094a6b1575abba,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,d65abfdf995e3aa4537c10d96831ce703df90635dcd4d1b9e93a62b07b2efbca,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,0ab1156c0513e1dcaa6f893dd4bcf1bfe6bdcefe51ccc0c925316cf04a4d0b66,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,d65abfdf995e3aa4537c10d96831ce703df90635dcd4d1b9e93a62b07b2efbca,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,0ab1156c0513e1dcaa6f893dd4bcf1bfe6bdcefe51ccc0c925316cf04a4d0b66,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,dbb55847338b245d23fafdb37fa48a8fd4b2fdb86a68eb5115094a6b1575abba,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73 diff --git a/results/combined/merges_tested/richardwarburton/lambda-behave.csv b/results/combined/merges_tested/richardwarburton/lambda-behave.csv index 0535210f16..b0610e1d0c 100644 --- a/results/combined/merges_tested/richardwarburton/lambda-behave.csv +++ b/results/combined/merges_tested/richardwarburton/lambda-behave.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,8695b135250902be1dcc7fba1dd727f372ef482a,eba960cd7f4a1e341997586a5e774d53860b64bb,225f5a428f94e6488009fe1bc3c72b981215ed7b,,True,True,Tests_passed,715a5c51fed66ce04d5bcb662628fae30b6d0410f4dbf34dc98a5284e9cc9159,True,37,103,1063,2,True,Tests_passed,75cc845aeaebf03855ecfe0fb82d99809a697560c4264ad7c65fe808049f66ba,True,37,True,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,70cb4f1a0b8acce5581363c82398c37ff415c6d9e12d1e6ced9c51e39c0efb89,Tests_failed,d2fa2032dd5f80970d0e1badef449426ffe4baa1a03c232d7765ba5dc6649cd3,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,70cb4f1a0b8acce5581363c82398c37ff415c6d9e12d1e6ced9c51e39c0efb89,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59 21,refs/heads/master,1122d7779dd0c352baf30f702efe19bd4852b727,cd83aba4a3445415807b25b8198eae8fcc31816d,f94034d1b799357cb1ad4d61c99951870c75ec3a,,True,True,Tests_passed,1f4ab1f542d90df8e1491c780eb558a0f597ed6f1da5656e44984dd62c75d1bb,True,23,45,246,3,True,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,True,23,True,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,7d00a2af8e60352da908b9251a69541dca840ce922502a249d3b410b605f80ca,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Tests_failed,2ce40dfd880d5c928eadede3c6f8fd3345890896a064ad25abd7f9ba6ea56f00,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,5f13f16cc71d2ae8d3987645986830db16173c5cf803ff87dec00b0215c40591,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb diff --git a/results/combined/merges_tested/risingoak/jenkins-client.csv b/results/combined/merges_tested/risingoak/jenkins-client.csv index 4a255d65c7..9a27d49741 100644 --- a/results/combined/merges_tested/risingoak/jenkins-client.csv +++ b/results/combined/merges_tested/risingoak/jenkins-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 79,refs/heads/master,56d27735ae3aef791a8aa330fd489917c7ade50d,65516173af2f28b3b4f5f76feadd0a9120e28ac6,887cbfd64c010a702f92b171ae3cac3fd48893ba,,True,True,True,14,44,551,2,True,14,Tests_passed,d3eb9f97f751086ec1a9e98f9b157db5337b74c91f85eb2f61b89090822bd465,True,Tests_passed,140999204148a5c381e11a068b608fb303d63bae532d725c9f7b66460929056b,True,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_failed,231bc4b0e544034f5646d15fd87b8e7b2bb8b9192485453818a67af62cdd1dc1,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd diff --git a/results/combined/merges_tested/rjohnsondev/java-libpst.csv b/results/combined/merges_tested/rjohnsondev/java-libpst.csv index 2a0bb88743..0eb518fa93 100644 --- a/results/combined/merges_tested/rjohnsondev/java-libpst.csv +++ b/results/combined/merges_tested/rjohnsondev/java-libpst.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/develop,c4092b6aa4bf8d1d48bf15d72abd7de6fe8a4723,977850371bd36c57202d4e70c92d7757693846d3,5fd2c7553b3b9569bacf17faccb9a692fab459e7,,True,,Tests_passed,4b820c146c8f3df9e7d6bc06ce475639775a0134cfa363a0ff085d18db6619bd,True,28,522,,4,True,Tests_passed,a15d27e69852b33b51acdf8f6e589bdd17fddb01f12fd638f95cefc250a05755,True,28,True,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,78f33afb54026243298546a2bba8041e1dd10a3f32e2d0b56a8b3504f7466df1,Tests_passed,bd6bcbd46da5d0f7443ec936c149a1df912c4e5111d7d14e39ff447c4888c1e1,Tests_passed,c1a9a7a6692ca70e5266846e390a5e54b64128fd1f823052dc6c98c528f3a465,Tests_failed,e0471495fb797ec51feb792dcf65c598c896fc8d09e2bb36e905ec696e231add,Tests_passed,bd6bcbd46da5d0f7443ec936c149a1df912c4e5111d7d14e39ff447c4888c1e1,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,00037898c571affcab707522940546a3b879171c5d71690144493a72ea8dc2ff,Tests_passed,c1a9a7a6692ca70e5266846e390a5e54b64128fd1f823052dc6c98c528f3a465,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7 18,refs/heads/develop,8fc5a5c5d12b78425941201f89f76a3d2d0a50da,e0296adde1bccf18d25b2cea922d5955d7e98ed6,6b8a24004fe1140303f403a4e15d59ba3baa8fa8,,True,True,Tests_passed,1f0f28817352bd3ed687715154efa1336eafd178739ed3d3b7f1e9f388336ce2,True,14,93,718.0,3,True,Tests_passed,b19a06025c8ae73ee9fccdbd9340cfd5addad69285bb94c0f1de7db54fe49f8e,True,14,True,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a diff --git a/results/combined/merges_tested/rncryptor/jncryptor.csv b/results/combined/merges_tested/rncryptor/jncryptor.csv index e9680bc265..32984f661d 100644 --- a/results/combined/merges_tested/rncryptor/jncryptor.csv +++ b/results/combined/merges_tested/rncryptor/jncryptor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c54c76bac35c50d72514642ee6390435c3a93590,7ce2822d12b3e6cf2e23bc42ff6e2ff540544357,94cabd7011843fa8d95c448be63db95183b1bf4b,,True,True,True,10,31,181,3,True,10,Tests_passed,178ade38a2ad32d0c458f2476afa73460be8fc83af2a76721571a596867aa453,True,Tests_passed,2ee8b274c7b1d22c925932b64d8d4d3b95b6a6c35c042ce8da6920c5c42fbb63,True,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a diff --git a/results/combined/merges_tested/rnewson/couchdb-lucene.csv b/results/combined/merges_tested/rnewson/couchdb-lucene.csv index 6bb348340c..36a065775d 100644 --- a/results/combined/merges_tested/rnewson/couchdb-lucene.csv +++ b/results/combined/merges_tested/rnewson/couchdb-lucene.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,5a7f9c7c1b8984d91cfa707f7d69b4007bcc1679,51a152b363bc753cbe4ed6a4353b57bddd26c272,07d49de6d47196e901138e2d036ded3ac1ff7185,,True,True,True,9,28,111,2,True,9,Tests_passed,b74d1188f22a9ed791c386d43e0b0cee8cfe074f9618d2ed905b85159b85704e,True,Tests_passed,ddb48b297d148a048b8d34b7977eb38c1e61551de9ec6e225db707e62630d728,True,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,43fb7f0dd51fa89b477f1a9ffad9080b6c4b05b0acaf20299c8e2aad0f17f613,Tests_failed,dc2ce195e93b3ca47afbb1ee19f2b83211434ee5b8c266acc2ea17e6e1f9b488,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,43fb7f0dd51fa89b477f1a9ffad9080b6c4b05b0acaf20299c8e2aad0f17f613,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da 26,refs/heads/master,51a152b363bc753cbe4ed6a4353b57bddd26c272,4219e5e14c10df1aaf93bc8dee071ba3b81ceaa0,d957e64409599e6ddc18f741168e259bf339f3ca,,True,True,True,10,24,86,3,True,10,Tests_passed,91b4356306bb8d8ec23fed03379a6511576560891b71d3bc5d1535f870a84006,True,Tests_passed,e2e5100e41504126de4e5550b827494a24dcb9d0e312041d52e765103ead49c5,True,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,c6afa037f5fd4ac066c2e1f688f7e9ce49d3ebf6fe9e485ad375157f5b42e05a,Merge_failed,9267a58519db509b97e764bdbbae480a5a1fb254e9c5d931e83f228a9c5b79b2,Tests_passed,edf907f06cf5d7b83c0fc4e64901ddb1182ba9314eb7d08e0aa8bda138387600,Tests_failed,1868a5d86ea8b1dcc4277c4e8639702da72185b8bc402598423ad13ef46cdc6d,Merge_failed,9267a58519db509b97e764bdbbae480a5a1fb254e9c5d931e83f228a9c5b79b2,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,cd187642b567d04e3523defc684544530602174ed49b123c30f3d604d93b95ed,Tests_passed,edf907f06cf5d7b83c0fc4e64901ddb1182ba9314eb7d08e0aa8bda138387600,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45 28,refs/heads/master,fcb4abcf019317a1cc1c1c9d0ee382cfeff26256,4f746d237a670a1de79167e6549f3e33b336ab90,ca21eec6242b8544e69646769a2505c994984d78,,True,True,True,12,35,119,2,True,12,Tests_passed,dfdc419d81b61f116eb646bc99d787bac8243f295d996b5b04ab99097ee47d16,True,Tests_passed,e23a774266f4711cd7825cbfe81235d8573afde106e73905852f16638a238979,True,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,b95cb19b2ef1491bb8c54dff3c6b2d7004502f010bcf79c66435e27287c54d13,Tests_failed,7f18c453ed8fbc4572961dcb81fb186b575df514cf4354a4912a819c18379449,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,b95cb19b2ef1491bb8c54dff3c6b2d7004502f010bcf79c66435e27287c54d13,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a diff --git a/results/combined/merges_tested/robert-bor/csveed.csv b/results/combined/merges_tested/robert-bor/csveed.csv index 114a43b125..5413f8dcb0 100644 --- a/results/combined/merges_tested/robert-bor/csveed.csv +++ b/results/combined/merges_tested/robert-bor/csveed.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 99,refs/heads/master,6c5de9e47a9dfbd88ac154496de8e0f39008342e,3005cb13ec5f182427a825d107c5c86031de66bb,833be1401f2e231a9c10e79097a7858c903cee2a,,True,True,True,17,24,124,2,True,17,Tests_passed,22ed8a3258a42fded3a783ec83f397ef4947fd6b604bd0a40fecbfc9819380d0,True,Tests_passed,906def81e1897c982c7a1112b79ae913b8ac1616b30e489a296d67a611264a77,True,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,6a98da8714135cfa9136cadf7fff45e4e55d392a415964cb2e71e0d39f9a2eca,Tests_failed,d1832d36111a425035112da4cca32f2b43ae46aaf067d9b7401d1b2c54f4a6ba,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,6a98da8714135cfa9136cadf7fff45e4e55d392a415964cb2e71e0d39f9a2eca,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997 105,refs/heads/master,b99c0263d2893ce82b0cb4e45d34cc526acd4704,520c0ce425155f6353e4cafda41d9c3895a30051,84a334ca087a8e2a90ba5bbd7e3eaaf7e539b42b,,True,True,True,15,47,194,2,True,15,Tests_passed,ad361a9cb59de8aeb762342b49184f0238d2129b669d483c6d9acbd85d40b2a9,True,Tests_passed,7ebce14368dd8b9d3e5ae1585402e1da284244e452872a236d3804ac89850cfe,True,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352 diff --git a/results/combined/merges_tested/robobees/simbeeotic.csv b/results/combined/merges_tested/robobees/simbeeotic.csv index 935fd07f47..0e2b38df99 100644 --- a/results/combined/merges_tested/robobees/simbeeotic.csv +++ b/results/combined/merges_tested/robobees/simbeeotic.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/autoheli-dev,8b525e23773abf00d51bd55086fb24781ce52528,860c4ed1bbede9eeb2f7354f8b15205539da2376,6c55b90e9325ba2f56586e5bd8c054529e4bef0e,,True,False,Tests_passed,d568f343315ce56653ed19ce0f9f2b9bc70a3bd1d886f7e01dd084d8e264c2aa,True,6,64,376,2,True,Tests_passed,1e5129bbde22dadf2eb1a3e4521c037f432143852da03c159ab11011ee96a9a9,True,6,True,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,264e7f93d34c07fe24d50596046f2ac1ef1438db5fc138a6d54817bbca22e6f0,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,264e7f93d34c07fe24d50596046f2ac1ef1438db5fc138a6d54817bbca22e6f0,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd 9,refs/remotes/origin/autoheli-dev,d8cc9db915bb7f2fd6a528df8c173d1c08407ec4,749d71d29f5e2109d744395ac371452d3e53d26a,d7ac67438b4894fe659d052451d89690ddc44da1,,True,True,Tests_passed,726d92b4178350acde3e24a7432e7fe303490b084cec6f579f4f67370afb0869,True,13,144,836,4,True,Tests_passed,2715556027cc8e037d2c518193feafac6679a0313e79981c996a000317ced594,True,13,True,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,394a5b5b7582767cd21bf0fbd0de2f0fed4bafc3e5b1db75d7ba496be32bf6dd,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,4c38f05f55337ff7069f8e35122b28046f8e8b7277ef3977c9b97094258e8152,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,890ceeb23bd7c4f9f5bfe64463466775243cdeb261ad24cd095043315d27011f,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae diff --git a/results/combined/merges_tested/robotframework/javalibcore.csv b/results/combined/merges_tested/robotframework/javalibcore.csv index 12d600c11b..9760a8ae35 100644 --- a/results/combined/merges_tested/robotframework/javalibcore.csv +++ b/results/combined/merges_tested/robotframework/javalibcore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/develop,84e942f595e4fb4db9da155f4a448a6d1d76dcce,11bf4ea41799866526a7c70d40d9c76fe8be7496,f7adc77f3618f17cdd9af0ae35a485b724292fa4,,True,True,True,53,71,3957,2,True,53,Tests_passed,4544f1fcd61d4753afee64ed9efd1cfdf3e41bb35cbbb187907d23e32a2b9e7d,True,Tests_passed,60f0efe8fec3f6f504ff9a33999ba55c423a8161516ac577cbbceed27502e8ae,True,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3 diff --git a/results/combined/merges_tested/robotiumtech/robotium.csv b/results/combined/merges_tested/robotiumtech/robotium.csv index 581a67f7b2..a5a3c0201e 100644 --- a/results/combined/merges_tested/robotiumtech/robotium.csv +++ b/results/combined/merges_tested/robotiumtech/robotium.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,4476410ce640326a4c4dad7a6373a572b6277c79,d1fa149f493e3313b1c321e35b3ef0935380f73c,246b8682eb7977fd19f17cda345115899fe5325b,,True,True,True,16,72,286,3,True,16,Tests_passed,04ba55c0915cb933b3c02b8613be0264da8e0cb7d4804c35114b39b4a01d602b,True,Tests_passed,a8da5f92ad3447119e7bb7e7a88b6c8003056c64e33870de3cacdd7aea15dff4,True,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,86968050e9aef9bc058d5d375d463bcc33ac45a5940587bf367ceadcfe573549,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,86968050e9aef9bc058d5d375d463bcc33ac45a5940587bf367ceadcfe573549,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654 27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,True,20,147,760,2,True,20,Tests_passed,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,True,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,True,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,b6d677a147b41a9fa7be61498d50cd062463766a02174677829065710a989c58,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,1ca63c9e064947f5c49946817bfb9487df93659f03e4b7269ef366390da3a540,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9 39,refs/heads/master,e4e8e55b531c08b6b551949013e9a41a98727023,bc56decc35ae1d64e8ee75b921beef4b5676ffcd,d0afd0d30d35476cea530c81bcefe924bce4f315,,True,True,True,7,50,232,2,True,7,Tests_passed,01fbc5b347b8130aa4200de408b98a83b3e9a1fabec10cd634859a9a412be8f9,True,Tests_passed,923c1d2b84351cdb2dff0d2c755e9a3471cca0ec3b04af753ec5b4f2beaa201c,True,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,77db15ad23cf9fdeba62322d1a0f0d293e0cabbb99f0946be2483e18b5da3a7b,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,77db15ad23cf9fdeba62322d1a0f0d293e0cabbb99f0946be2483e18b5da3a7b,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be diff --git a/results/combined/merges_tested/robrua/orianna.csv b/results/combined/merges_tested/robrua/orianna.csv index 2fff9bfba0..ad4dfbdfb6 100644 --- a/results/combined/merges_tested/robrua/orianna.csv +++ b/results/combined/merges_tested/robrua/orianna.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/master,1115503e06d523ceb185a8bf300681607a00ac05,8554cdd02aa1f8d77e089f09ad94c5e7ed1a6217,a96461df162a2777b1a3cfd13f984deefdae9431,,True,True,True,17,53,3747,2,True,17,Tests_passed,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,True,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,True,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_failed,77e2b4880def2302671ec37871f01e36d8ce7e431f32e2244e5ec9123195e80f,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01 45,refs/remotes/origin/pull/14,9a25a31a4be7ef7572044ef26d11ba55395bbc59,ce872febd076a19ce53c7024de2f8e06569a1d12,87726ac82247ab8002fb2101b3e6a3167bf8ba85,,True,True,True,17,53,3747,2,True,17,Tests_passed,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,True,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,True,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01 65,refs/remotes/origin/pull/85,69c2b5fc2ab8c8e03e989a64ecc1d582894da7ea,f4d2f99dc7af60f8605a9ce8f5e8939645417d08,f78725825d6ee77c3a298db2a614d61c1b894450,,True,True,True,39,55,2631,3,True,39,Tests_passed,c9dc01800b7d3fa1c1e978b3a86423333dc90b9dc78188418ca28253a9778296,True,Tests_passed,1b9e38aacec41232b738ff58d389ad0fdb8034106fdde7f0b5573fb8b8a5f9f1,True,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,c091566786546264d532604cb26445a0f103c3fe95ee575ab6447b68c8acb771,Merge_failed,baf0b7a528b14f2196f038dc5402de3907c3639cc05a28164977d15c8865172a,Tests_failed,47d2b9a963c81173e16d23bc531aa31fe332bb913a2640c1cc243ff2a365c66f,Tests_failed,2d7b0e8c4d16fe20c949f7be085e6cc76113426f8317dc5f16fb9515289f9a1d,Merge_failed,baf0b7a528b14f2196f038dc5402de3907c3639cc05a28164977d15c8865172a,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,bb4f05b06839c5ac4685600ad14fadf82bec00b22e889a3b9d12c5f0afea9ca4,Tests_failed,47d2b9a963c81173e16d23bc531aa31fe332bb913a2640c1cc243ff2a365c66f,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83 diff --git a/results/combined/merges_tested/rocketscience-projects/javaslang.csv b/results/combined/merges_tested/rocketscience-projects/javaslang.csv index 8598a45b1d..07cc50b2d0 100644 --- a/results/combined/merges_tested/rocketscience-projects/javaslang.csv +++ b/results/combined/merges_tested/rocketscience-projects/javaslang.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1174,refs/remotes/origin/pull/2745,fee08d022774a000e65551fc71a74ae5f865866a,e07b9e2b96211219cc1b5fc87d1e38994ec74dd5,26181f14b9629ceb729a73795d3854363c7dce0e,,True,True,True,331,1178,18550,8,True,331,Tests_passed,758362099cc2193eaa631d765a90f790a2c19d3f9c488a4f3e57827c1a73a193,True,Tests_passed,e85dfc6d60d80af3f858131d96a7646c775e8302f46f8200fedcd1612d4c7ebc,True,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,fcbaa247b4d7599e51ab63b56f2d7740f583505fe211058f4743efe230b928fe,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b3b3cdc5a6968b8e88a43951fcbdf9d5fb68ee982576cbf1a69ddfed90a0cbd9,Merge_failed,c0f68e5f20c9c6ec7c98ad83ed32b6674fd42ea187b6ba73462e4a96aeb8062c,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,89a962605d95493b3babec67589220a84eeae458bd7921e367f22e7096a6c8df,Merge_failed,e3704272f907370a7a6481847a32a4af07242bd568f79f02d50f419ee907b746,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555 diff --git a/results/combined/merges_tested/rometools/rome.csv b/results/combined/merges_tested/rometools/rome.csv index e6fdd44f65..c7e3b7bd3d 100644 --- a/results/combined/merges_tested/rometools/rome.csv +++ b/results/combined/merges_tested/rometools/rome.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,0de36f1a02e1eb86a90adb362239474aa26151ae,e3dc44cf971a74e5fd7e3af7b7ba3835ffbeaa30,20e07a97e16fa762d275ba80db8e7f6dd35ac4ac,,True,True,True,112,231,638,2,True,112,Tests_passed,c775a4537ef113cff864923701a73b269577fcb23ae68a103fa49256668e4a63,True,Tests_passed,29f56cc1c4f1e7d62e4ea59508aef9e70235f4f1df9de25606471fc7bb09313d,True,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac 13,refs/heads/master,af93948e78009760102ec5a4d83b0dfb51351334,961a6407e11d1c1c02fab9f10e4887e324f8e9b4,29b992ba025119d716113b52a0c21da02dd210f6,,True,True,True,431,831,5956,3,True,431,Tests_passed,1c694b77a1cde4f61723b1aa62085ce5a84dd26285d8338e3adcb16b809fe30b,True,Tests_passed,0463e90e462605abb84039632350a15b9f51317dfaef3b6d1a1e3c29cef9425d,True,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_failed,b744a6e31a82288ff06945b7bba7cacac4db8aac1d44261ac1333245e144c403,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f 77,refs/heads/master,648a1f04cf5a4c55a13bfff801389cfe93c6976e,77c50c516bd562a4982e4455e96f3871dd9fe4ca,a2d3689d9f7bd66f27c956210747c9d61c82355a,,True,True,True,78,407,1785,25,True,78,Tests_passed,e021c91fac5180e7a07f5944716c752f294e2841e97ad5234b138cccb178628a,True,Tests_passed,534442442ccde2f3e4ae66d31f18370829451e380bbf49f4a146a7abb2d43747,True,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,707fc5ee14df6f3a7298088a5921375596564fab44835789cda41b3524ce165e,Merge_failed,daa9af2eb0330a71139227e2f43611edd2224536bc864b1ce188873c9996727f,Tests_passed,f3002bf7f129bfa1b65cb37231d7ccd5f9bedb756110a2c0658bda87367e6989,Merge_failed,280a29dcc876e5b622b8623abaf3125d6eb915280141fd07540d6c2c7f54a0af,Merge_failed,daa9af2eb0330a71139227e2f43611edd2224536bc864b1ce188873c9996727f,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,f62635ab9690d5cc0064f59a93ffe6b031712b19ce7c16e8c98725d7f4ed446d,Tests_passed,f3002bf7f129bfa1b65cb37231d7ccd5f9bedb756110a2c0658bda87367e6989,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb diff --git a/results/combined/merges_tested/romix/java-concurrent-hash-trie-map.csv b/results/combined/merges_tested/romix/java-concurrent-hash-trie-map.csv index 0bb90e467e..3798b43c74 100644 --- a/results/combined/merges_tested/romix/java-concurrent-hash-trie-map.csv +++ b/results/combined/merges_tested/romix/java-concurrent-hash-trie-map.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,03335a9caa6fc867344c8c015d6dfc2d11ab062f,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,3e7efd43b645924502c3acc7e5ebe211090e855c,,True,True,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,True,7,32,149,3,True,Tests_passed,fdee5637855972184693f2c625baaf20f7f2e00089e0cccc6e07543bcfe68556,True,7,True,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_failed,69c07fbdef179b87e2d682ee7b17b6769f947783ea72d92695207477f1c02723,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568 2,refs/heads/master,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,d470c98061287bb08883c4867adbb785ddef1935,cae6e1cce4710b2e179c5bdaa764c2977a83b475,,True,True,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,True,4,9,63,2,True,Tests_passed,8f911f583eb2fcf7f335d79d431179293d852b4c6031d7ecdb17a3897b02371b,True,4,True,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,604f67bc97cbab602b5be7f96fdf44502819d277dfb585a86790634585617a9e,Tests_failed,d2059005e0221fb4ac767005eb820df5354cf3f0174e15fc15788a4e9e17e988,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,604f67bc97cbab602b5be7f96fdf44502819d277dfb585a86790634585617a9e,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a 3,refs/heads/master,d470c98061287bb08883c4867adbb785ddef1935,5cf056a923923ab53cfc999aca71109d71ae82f5,92eadae20f0d3fa0de3d859f285751223fee62a9,,True,True,Tests_passed,88352cd0d21a6c39f9565f2272e4ab551ecf8810d24fdb564f046a3604d2ecfa,True,2,4,14,2,True,Tests_passed,d58f52cfbab8c31b8bac53f5ded2f4fd54907856972f0de17949849027d69978,True,2,True,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,bfa7fdd8c334c9514f869f8f8bf5c930f998b7d6ee8be55004a713f1ffd5bd43,Tests_failed,df07a90ad9a654bc611d9f61ef1c0413291597d71fa5f4b83cc9d6fb3d817dcb,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,bfa7fdd8c334c9514f869f8f8bf5c930f998b7d6ee8be55004a713f1ffd5bd43,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781 diff --git a/results/combined/merges_tested/roncoo/roncoo-pay.csv b/results/combined/merges_tested/roncoo/roncoo-pay.csv index adbbb289c0..aca57f698c 100644 --- a/results/combined/merges_tested/roncoo/roncoo-pay.csv +++ b/results/combined/merges_tested/roncoo/roncoo-pay.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,61acbdbc5fa10afe86aa18660b1cad22730af022,764f122f7c890579e31ac93d0d006fc2250d78f1,ccca546fb46e38dad6085df47dbdc9e1327b86f5,,True,,True,370,877,,234,True,496,Tests_passed,b8916bb0b66ad6ddde1134d375c527a549b910d70700bb62c3024c7dcdaa65b6,True,Tests_passed,77039be23788f4e7eac59e11ff24c2fc1397f65ec3ee76a238613f7c06326af8,True,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,1fd71cb93ca5110de173613da6ce924a1c141fb0d0cafd4613de20d20451d394,Merge_failed,8d24a41d13771e8341fcffed982d7385b1bc380b59b61904b4b0129c42784457,Merge_failed,386945e269f5511f6bee82345c1cd7f2a5b71d5af93991696b2069dcec2c6fb2,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,187fb127ccfc4646488e4fc2bf273ff7ca10e8c2740b906ebff0cc07e5b43323,Merge_failed,997f7af0d8be211e85bc369cd2c20a03e41da2fc77fc59cd76dfedf4d2f1e227,Merge_failed,e4be64fb07f6d275362c041de32dfe23f62743283066d19ee9f4b81b4e40a86a,Merge_failed,5db3bc257efee707c85be3a91ed5804a3ba18db5e68178e6e6754c8fadc1bbe4,Merge_failed,d4453a01f5b9bc937cffd2d4727a06be88b80d15cac09ffe4dec71d6d40aecb8,Merge_failed,e4be64fb07f6d275362c041de32dfe23f62743283066d19ee9f4b81b4e40a86a,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,8d24a41d13771e8341fcffed982d7385b1bc380b59b61904b4b0129c42784457,Merge_failed,386945e269f5511f6bee82345c1cd7f2a5b71d5af93991696b2069dcec2c6fb2,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,187fb127ccfc4646488e4fc2bf273ff7ca10e8c2740b906ebff0cc07e5b43323,Merge_failed,7d6cde7cc61347b130737e0bb69c110ba73cf82fd56296e57f9715777ad9c0c7,Merge_failed,ba77056315cabb1506275c6c153e0ad341915a81194463d64abfe05866519843,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,1fd71cb93ca5110de173613da6ce924a1c141fb0d0cafd4613de20d20451d394,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9 17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,True,454,1016,81789.0,15,True,456,Tests_passed,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,True,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,True,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,bffba307306921b7593bceea518e05510a309b6499e94beb6a41d0b37c1f8cf1,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,d64afbee676d3a35e2a6eab85c813863cc5d9c85b18d2274df5276be87def460,Merge_failed,473bcd20a3c891fc4a75e5c3f18c547ca2c4d63e092bd4c957e3c82de3f04b3b,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d diff --git a/results/combined/merges_tested/rschreijer/lutung.csv b/results/combined/merges_tested/rschreijer/lutung.csv index 14b3f8e448..92375c48be 100644 --- a/results/combined/merges_tested/rschreijer/lutung.csv +++ b/results/combined/merges_tested/rschreijer/lutung.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,70e3458c0a4c096d7b1ca7426e61f5a876025fe6,8048493cf975b711e28a79be0705ff7ea8a5b27c,db1238d7be4edb64826603189f3cb48e9d8de7cd,,True,True,Tests_passed,e800d7eac14e7f1d8ba73ca1de478b3673b7b935b95591d3e29b3e8a576db623,True,10,168,601,2,True,Tests_passed,391cba75427c89f6f270f662d424c3f8983726cf48002fc8e100e0b6b8601ec9,True,10,True,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_failed,8911fba26592cd8378f5490a7da6eed0ad35a942c670a4dcbf6bd52dc78f4d23,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b 15,refs/heads/master,2f65e975a8878ebcbd78fbb87e3fa878fa46b41b,7de0c05a78dd31ed2b353915c1e945eb786c7fec,7ae086f85f7e0e1a44cba41b4e08a531c2ac575b,,True,True,Tests_passed,336716c9d5082e067c479f7657ccf5b4bbfb61c698d8929de4cc14106d237eb6,True,16,37,382,3,True,Tests_passed,42ecf3a3bd19acba3ce4c3bcc49abdea475c0f298870a2a5f0e34e05d8115210,True,16,True,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,b963a9b39f06a5e45185556d128cc2418c2be64190d453993e511e3be7ad5dcd,Merge_failed,6f8018e1e0f133021c4afb787f5bada94740a043e65169da13c34f93503fcca5,Merge_failed,aa96d205215878c69e4dfc850606261cc0c02c683a4d4f6c253b5db91a76eb21,Merge_failed,2925245e073d5694335a1cb1e2903129ff1df5524ff66d9e9b6de040ed0ae8c3,Merge_failed,6f8018e1e0f133021c4afb787f5bada94740a043e65169da13c34f93503fcca5,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,98b14baf3868ba4ecf7af647f543b9e9f57ee9d982153d60b3ca67cf3858bb56,Merge_failed,aa96d205215878c69e4dfc850606261cc0c02c683a4d4f6c253b5db91a76eb21,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635 17,refs/heads/master,747fdbc2ccde5a130386cd425ef70a475af95b27,6dbc04f02e22bb5fbee09470738bfbf427e7b564,9ae6ca12f7ce446c59aad1b9a430a74294a1c604,,True,True,Tests_passed,ca5ca7c0d3de878211a231de16c105884fb2b2cf14fb8a9559b682737442f810,True,54,266,3563,2,True,Tests_passed,3a8a500d771cdee0083494928a444f147e30f18f40c4f69c33c826cd5da0efdb,True,54,True,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,005cb8f99d34ef39d7acb63e72365edac8428b09faa3e27cd1b2f72dc539735a,Merge_failed,a6303d6bb386b8dcb5e93ea0907800fd15fb36a354263abc1a2481b05919b611,Merge_failed,2701fa9b4eb6694d0974ae25a1dc2e4f10a0efd75985c74b2def63c981b05db6,Tests_failed,98386e9edbc546d21c516fc26b7ee193c7e1ca944b4783f1b199c295e3b25dc0,Merge_failed,a6303d6bb386b8dcb5e93ea0907800fd15fb36a354263abc1a2481b05919b611,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,668f2c92c30d8f05675904ecda00c11d7ae84adcb586bb12e90ab98eed7f8f70,Merge_failed,2701fa9b4eb6694d0974ae25a1dc2e4f10a0efd75985c74b2def63c981b05db6,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126 diff --git a/results/combined/merges_tested/rtyley/android-viewholder-listviews.csv b/results/combined/merges_tested/rtyley/android-viewholder-listviews.csv index 30f6b416f2..69d0376fa5 100644 --- a/results/combined/merges_tested/rtyley/android-viewholder-listviews.csv +++ b/results/combined/merges_tested/rtyley/android-viewholder-listviews.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b5a40bb804382b21052c99890298fc5afcd4b6b1,f1a4013c4f3a8d85879574f36c43e60214116b9e,a357f921c5ce966b1e8e61650d5541fa02ab2f27,,True,True,True,4,5,16,5,True,5,Tests_passed,52852961f97f69652d8b6831bbef8ccb09bf651c37221b84087567baf5236619,True,Tests_passed,5551da408aa8f3ac531f4cc4413936307e9a8553eaae4007eedb2fe74be3336a,True,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,407bbf3e6d1c5ada81b2d459b23ef25666e9b6f3136ae6bc83a772c9fb9d3c75,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,1c9aa07d0fed893515971bde710cbe56e61e57e11b814b3c37dedf9774a6039c,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,efa6444b492b195b0736f3b05956ec094654a59e17548665bc9dafc94f3405fe,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead diff --git a/results/combined/merges_tested/ru/casanova.csv b/results/combined/merges_tested/ru/casanova.csv index de8373b2b5..c47c71d557 100644 --- a/results/combined/merges_tested/ru/casanova.csv +++ b/results/combined/merges_tested/ru/casanova.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5e273b685e538556085f1690a49b15613d18c395,245a35003662012ddd4ea6c178204f559f50c9a1,f702725b4b49ecd53451582f19732f3431740be4,,True,True,True,51,139,11123,3,True,52,Tests_passed,e9cadce2d78ddc33738bf4ffae51eb1ea9ad272d3355311a93519fbd3e84128d,True,Tests_passed,e523bc901bdcb9eff24881fa9caecb156664b44d0a891a3f6eb5c1452a4de48d,True,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,e1c80a1a7a38b3e07f4f85169a8148f0d8891c76c5ad9dbad7a8c89b5a99249c,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,12aed1dfb0e166411adf563fba2f945c694d3f0625fb6913d55af0a95586a4dd,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,4120ba62cbb62dec3f028cdf594e10cf217138b3564079227a5c9b7070b39ad8,Merge_failed,fa03aa34f7bb18f85180bef148357a8d329bb8b316ca11d80140e0089502c881,Tests_passed,03c824b9dcbd2d330a7c6d6f22c6121972c11a7d0b0a1e5b1d57d6808accce90,Tests_passed,4efb9ada580ac2dfa3f64c5108675333b87aff9970d2c9dd3ee23a63e359e522,Merge_failed,fa03aa34f7bb18f85180bef148357a8d329bb8b316ca11d80140e0089502c881,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,12aed1dfb0e166411adf563fba2f945c694d3f0625fb6913d55af0a95586a4dd,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,9ba0c54e819cac30f52d9e7fb889aa9f3483ef93c3a955d4ea5f8c7787f48e28,Tests_passed,03c824b9dcbd2d330a7c6d6f22c6121972c11a7d0b0a1e5b1d57d6808accce90,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,e1c80a1a7a38b3e07f4f85169a8148f0d8891c76c5ad9dbad7a8c89b5a99249c,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476 3,refs/heads/master,455f0369c9e8ebe41eee39f890ceb6ddd9310eda,d2932adf48fc17976dc74f3e965030522fcbfe12,1da9ce5a7695fdbab0c29966a594ca5fed796faa,,True,True,True,53,60,4468,2,True,53,Tests_passed,1149d181575fe104cc30e2e433f5aa9b440c4bd53725e9ff539477759a8542bc,True,Tests_passed,cfa82e0dd62db04aed04507c99da6acbe43353205595ef3e0a9a26fed0c26f2e,True,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d 7,refs/heads/master,b0a127d82b21260d9ed9bc2e2570db1f41303216,c7408edf092333c5067054cdd400e8c8307ed212,30febd577047f776b3a3a025a20b30abae9d06ee,,True,True,True,59,143,7374,11,True,67,Tests_passed,1108e3348e60485485877a241c046c83329ece54b426d03a8da58bd5f6a8d2be,True,Tests_passed,3dc0715cfcda019617134e6d83937cc7d35379af57dc31bf42722593121bc225,True,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,cb580ba6774999ef3425c0f2b1e13370b585869e14a61519f37fd73208c4b0b5,Tests_passed,2c0c7f843c3a74ef00b03bd2052769743f94e5bff886702facd16fcca0181f0e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,cb580ba6774999ef3425c0f2b1e13370b585869e14a61519f37fd73208c4b0b5,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118 diff --git a/results/combined/merges_tested/rubenlagus/telegrambots.csv b/results/combined/merges_tested/rubenlagus/telegrambots.csv index f4c3ed5647..b9a62da3ae 100644 --- a/results/combined/merges_tested/rubenlagus/telegrambots.csv +++ b/results/combined/merges_tested/rubenlagus/telegrambots.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d1c70210f13920291335024d0655f164a838e6ee,4a53ed85e434e6d0410bf47efee944caecf8a651,b3099f58cfee3dc1140abd82b1536467b926958a,,True,True,True,60,136,1028,4,True,60,Tests_passed,9ec08527b8796e8b041ee9a0b1ac081779a14347287a17147e7dd2d1fb447d63,True,Tests_passed,8a2c39ec832e40c65974375e64fd20d8b816fdda5994a3b1e7d1c5f8d62f16ad,True,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,c6160c64a7c9c5b07a315c38a73e467824fca70f53bf5d9781d3beeb393425d7,Tests_failed,612d3924c161627447752250fa10b6e917fad98d2084ab43796e26c85b7b271a,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,c6160c64a7c9c5b07a315c38a73e467824fca70f53bf5d9781d3beeb393425d7,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5 18,refs/heads/master,69e4a6a149fe041ef4f015076a224a1e44729b08,92c7b1c3ce781556f103f027d7a9ef90ada802dd,80ef86b90d4a3ce3fdae795d61a5772febd0e980,,True,True,True,87,388,1564,2,True,87,Tests_passed,3ff3fb8e8c974df3e51d6767f769fdd03b543ab238ae0cf9a1dddb23d90ae55c,True,Tests_passed,95c30bcf036aa2a343ff49cd5a08b75e49eb6a5abb640a7797fba3ba5b05bf65,True,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_failed,6df26913bbed74bb9c15a36e8e2e2e794fff733261d35821e16afe6647ff4d0e,Tests_failed,ae18f3e8e7787a88ba8659949577264c984d2d0fe3223b55fea2f092ac61b2c4,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_failed,6df26913bbed74bb9c15a36e8e2e2e794fff733261d35821e16afe6647ff4d0e,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca 70,refs/heads/master,7287c384440479a69cf1104fab81a00c625249f0,4ae315eb0995c3a336c4b21a32a8fdf74f25c4a3,39a5678543c6710c5bc27b9d633828777b8e8205,,True,True,True,20,65,363,4,True,20,Tests_passed,2369271b71276f3be007c8d35893e39661f638b3dbe132260c4fda6fdc5b05f6,True,Tests_passed,393ee2b2d41ee220723e447eaf226b33f1153708a6b6efb733339f840f199989,True,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_failed,d08e53ecdd0d3e8dddf936219d2bedc9fb6892e6daca16e17153744d6cd57527,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_failed,d08e53ecdd0d3e8dddf936219d2bedc9fb6892e6daca16e17153744d6cd57527,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab diff --git a/results/combined/merges_tested/ruedigermoeller/kontraktor.csv b/results/combined/merges_tested/ruedigermoeller/kontraktor.csv index b3baa3542e..a39d76dc2c 100644 --- a/results/combined/merges_tested/ruedigermoeller/kontraktor.csv +++ b/results/combined/merges_tested/ruedigermoeller/kontraktor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/java14,b8ed9bb629b78fb9e64991252a2554260323ead0,d3ac25c82aa6fd921352e9bdf7ee3878397ebf1c,bc9d0d697ad281de065610ca8fb2298ff38f7434,,True,True,True,20,52,474,3,True,21,Tests_passed,dd46d9e739e4bb8a61c233ed3173d3c74d0c9cb34c6e225900f959e80d59054e,True,Tests_passed,966a793f07c9b1016df2e5df699c8b8159be2575f6c8fe2f0343d8d31b9199fd,True,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91 93,refs/heads/java14,541a55afaebf5674b8c9bcac87deadc1b3bc99b4,70a99e69b15756905b841f804d640f185ff1a900,aecdd2a866ec12f3cbe7b9a656d3f81a23a24e2e,,True,True,True,12,36,261,2,True,12,Tests_passed,b526da359d97e64c596f776ec38e16d5ab0354eda386731ef6224a331dc0ced5,True,Tests_passed,831fd89c2954d3f163d54adbef135f1845544a4beb3a9336b6d5e90acea49f05,True,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,ab2f2649bd212d6e2da7914f245a2ccb0d02e72f908d662ca3f260b7697d04d6,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,ab2f2649bd212d6e2da7914f245a2ccb0d02e72f908d662ca3f260b7697d04d6,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4 97,refs/heads/java14,54fa3de6899427de183bc5434da2d17bbee13023,812d6fe2d71c6cbe4e79118dd78b0711c9e3e9df,fd4aff27b71c9fb55c4d987a74497637dfd4a1ef,,True,True,True,8,21,292,2,True,8,Tests_passed,1df0f00b5dfc1e84329acd9502e3f2f627c45d8a085d4e941bb453bb95b6e07b,True,Tests_passed,b914d37f046b9a679d540bb34e566d01b4ae0a3a3c6b53e539e44240b4df50f9,True,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,673815e3f5d71b2528f225ca847b2c9f1247876d59a2e69ba328c292b783094a,Merge_failed,e4f2bef601e97998369437b69e9974a150a75e469b3335abe0dec8c56c6ee2ef,Tests_passed,db1b26cdfa50f96965f3bf556d20d2b570957f208d2520df9486d7cd0db36a31,Merge_failed,5e96598fb4dffd58f5e6125651761fad4b6ccb38401f147d8d3f71a39df645b0,Merge_failed,e4f2bef601e97998369437b69e9974a150a75e469b3335abe0dec8c56c6ee2ef,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,5b06806f29d0079a145ad70784c26c5965d916798cdbd16c35d017d85a5dbdec,Tests_passed,db1b26cdfa50f96965f3bf556d20d2b570957f208d2520df9486d7cd0db36a31,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2 diff --git a/results/combined/merges_tested/runeflobakk/motif.csv b/results/combined/merges_tested/runeflobakk/motif.csv index e7ee1217aa..cc34359fbe 100644 --- a/results/combined/merges_tested/runeflobakk/motif.csv +++ b/results/combined/merges_tested/runeflobakk/motif.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/dev,2df475c5347893eec68348da93344790f6957fbc,e2e547e3c14524f255e0f6ca55c99bcd6ef0c338,61747cd4ffb978ae2dfce019d190825ee4d620d4,,True,True,True,27,94,777,3,True,27,Tests_passed,520d919493b5743dfc0929dcd4f9e7bdc96c9910728c42bd8b18ef1d5c5f3286,True,Tests_passed,88b0b166c1d41b07354158ae5b7be8757cd81644f853c4a8a7fe2f412a5401bf,True,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476 diff --git a/results/combined/merges_tested/runelite/runelite.csv b/results/combined/merges_tested/runelite/runelite.csv index c931a1dce1..46dd5d9a29 100644 --- a/results/combined/merges_tested/runelite/runelite.csv +++ b/results/combined/merges_tested/runelite/runelite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 227,refs/heads/master,ca11d1926a6f00820640bc73564a555c56fc44df,ea71fcf4bfcd51f76630bc7066ce07a0402544bb,eb098792053145a2e44410b2c60475799d493890,,True,True,Tests_passed,5c40fcd4d8d6a303ec0931375b98649ea3dc57695abc732c71aa7556ff3e80c3,True,139,527,5898.0,2,True,Tests_passed,19aa6a3b48a3fc0f3b165e187b28ba0282f7e1aec4841f289eb220ec65d35475,True,139,True,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,e5da70f45a27cf79ab4418f5b5615851fea4f87c8319d071130a35a065430136,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,e5da70f45a27cf79ab4418f5b5615851fea4f87c8319d071130a35a065430136,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d 661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,Tests_passed,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,True,219,1354,9917.0,2,True,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,True,219,True,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Merge_timedout,,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32 2004,refs/remotes/origin/1.10.17,3700063d3b801ae16f046d6af77785543cb58eb8,5a524471f8358e75405f787964391c986e529029,8d65dcb1eacc0b6a2ebb4a88f41b5474d3302408,,True,True,Tests_passed,d071d55cc798058956fd8ad55249f9379c7c88bb28006563c9f48928ac140437,True,153,809,6055.0,2,True,Tests_passed,4827eb724fecad1e7aba71a7ce022e703d219d37304869d784d7436ead63e590,True,153,True,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,749b3c987e831155258bfeee54613388d09d5b83dd02e4004c29a0e291d9ca50,Merge_timedout,,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,749b3c987e831155258bfeee54613388d09d5b83dd02e4004c29a0e291d9ca50,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6 diff --git a/results/combined/merges_tested/ryantenney/metrics-spring.csv b/results/combined/merges_tested/ryantenney/metrics-spring.csv index 518bc8043a..39028bbc4d 100644 --- a/results/combined/merges_tested/ryantenney/metrics-spring.csv +++ b/results/combined/merges_tested/ryantenney/metrics-spring.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/v3.1-maintenance,5244ad0b109cc2814221012c959aee61705efe5b,32f5ac65aefa8fa8a9b4d96ad60eac5aeb01f096,ccd21978ea0d9b2ec4e5680e81093ae1c54f0c7c,,True,True,True,75,171,1945,11,True,76,Tests_passed,7487bf355c7c49ad1c8f49aff0184e5177884159b82a2abc679229a05bd1160f,True,Tests_passed,07606770b047e7a96c5615ad76379d1f66c829ada41d83970efae9a6657350af,True,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,a80ca6f0954bd07233d28a2e94c059fe84fbe32dd2a5592eeb093667c72721b0,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,bf643a544874ca6efd201eb6eb7d5a0964593049a808a217b0d0f179c7b0b1e2,Merge_timedout,,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,882c79888f26166916b791edc5b4bdcd1ef606c305515bcba9e77b81a8d4d891,Merge_failed,d9849779c9a83752351625200a826d8b177a9a2243a7ec50e5559b91401fd166,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347 46,refs/remotes/origin/pull/137,f0668b736f868eeae7c125b3aa04941fdf2bf958,1e52fbc31b9f18e095291f9b361f5c15fd20c5e9,51e5c2f55cfff76cb53715bf87229f6f103e8a49,,True,True,True,4,7,56,2,True,4,Tests_passed,93a6af2b6f2b9a6940bdfac8262ec83a4caf08027ac89d977a43ed90347009f0,True,Tests_passed,7a1e233714cd1c7942f370f91c836848e73233050d27eb5f5afa69f435c285b6,True,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Merge_failed,bdee5d0ff50073db01da55b05f5e1b66a720a0e7645c3682020944b71d4e828c,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Merge_failed,bdee5d0ff50073db01da55b05f5e1b66a720a0e7645c3682020944b71d4e828c,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72 54,refs/remotes/origin/pull/53,4ddab2725aa59f451c78609e432999812eee675a,3f95d1574197bc5ba49e7cbfd122557e9eb90553,a74305e661470406f594dd25954d77c9c6d49738,,True,True,True,44,122,1771,6,True,44,Tests_passed,8b590ce7a2ea16572f1fa9257cd06116f2b5ca7a6642a202534029c28422eea1,True,Tests_passed,8fe4244849f57082d479f077102c272399314b63c9292c624a52b468765f4fa4,True,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,46dec5297b3434312b35d163f31167f96d8188807b9e7b3953ffa5927b8c0385,Merge_failed,1558ffa3c5b5b9e7053c25c7a8b00c57595f1145869ea7e275689b2984a59310,Merge_failed,5c7a4281f43cbab4444cab1a79c101f0153f612149c46e88094c4a91f435ae4a,Merge_timedout,,Merge_failed,1558ffa3c5b5b9e7053c25c7a8b00c57595f1145869ea7e275689b2984a59310,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,aaf013a845b4369e82b178d136b66835e5bddae757212ee9f69ee583e87b84f4,Merge_failed,c609cbd850fc40633eca8a75fa50da9def2084788fe6f2615fbb948fcf2447cc,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd diff --git a/results/combined/merges_tested/rylinaux/plugman.csv b/results/combined/merges_tested/rylinaux/plugman.csv index ec0c5d1c16..2e8c8f9726 100644 --- a/results/combined/merges_tested/rylinaux/plugman.csv +++ b/results/combined/merges_tested/rylinaux/plugman.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/remotes/origin/pull/53,cd097a5e02123e8341949738d8b0a91b9345b684,b4eb99945c41fc6f4006bdc4c89e9afedf372020,940979e30479e718afcfa6bb71a0b4bd2529f23e,,True,False,True,3,6,22,6,True,6,Tests_passed,369094163191050836bc326e7c0619a31ef18e9d12b0d546acec62ddb5104a4c,True,Tests_passed,5e9443034202cc68c8596fef46a595d4e3fb6046792be089028c0162847147a1,True,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,82334ce55c1e61b8c0c1b52f5fa0786686ecae2f1108a6ba8fea9b798b3286f7,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,bec72c1ec71f1cd2e66a81af3a01c8062ef8b35953f3599ef677f9de9b67d1da,Merge_failed,d7269860ca5eb0280b4dc0e9ba65f3c325fe5fc61c637c05c5dcb516b70d2ec4,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,0bbb884e2d80f415e38b72522e66315cec632c57c5f40c37ddaf108838d12cf2,Merge_failed,03a229fb74c8bff77b1a7208efddc242513d16493a7a1e8f4eec5412338dee9a,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84 diff --git a/results/combined/merges_tested/s4u/pgpverify-maven-plugin.csv b/results/combined/merges_tested/s4u/pgpverify-maven-plugin.csv index dee6889026..a0c226f418 100644 --- a/results/combined/merges_tested/s4u/pgpverify-maven-plugin.csv +++ b/results/combined/merges_tested/s4u/pgpverify-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 145,refs/heads/master,86423815da5ac60c8f09cdf198e6d08a50f7ff87,bc4854a58fccc72f9c68290fd4e68e6cdc828978,086cbea80d0b32b10041a57dc9e71d9c8d20ba0d,,True,True,True,10,62,839,2,True,10,Tests_passed,8615ffce9fe64589a6f708b6ac559cb2c6cfb0785d0284987708c98a52a4933b,True,Tests_passed,7bef9b09c737852d75a16f57e98c98c1979c577a83f6e945d4ec4704f32d1597,True,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_failed,c6048999a833894694521fcfe9a2a2a5ff6d8e26bfe27a4f222f6dab67989aa5,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e 148,refs/heads/master,183049d43b4244b16ed2c6df4ddd4b43205ee177,6b035ec72e6e731d9e9a17dce110bc529a1672f7,cbd2405f38c10be592123824d3532338fa732d71,,True,True,True,3,7,13,2,True,3,Tests_passed,2083af0658a30f2058b3eba4ceb615c2cd5b295e3ca320cf87ccde61b204493b,True,Tests_passed,391c2e421d5b4c09a27d006aea4472fd9b9df541ad5f40b7b446ffaadf015cdc,True,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,e770722ba1e6f886bd7cfabebcf0f450797dc1424624c993f4cfd5e0bb6f831b,Tests_failed,4b07a60928671471208648471917ad8a5d9d07190e1dfd5c70b651406050a521,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,e770722ba1e6f886bd7cfabebcf0f450797dc1424624c993f4cfd5e0bb6f831b,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a 173,refs/heads/master,f0dd58a6d1373ac33ae4d1bec076b1e7f1a8b3cb,03695f01817c1c19ba31b9d2c968906743dbf2ee,841cbccebe5b706222dd224e1f5c159f97691e25,,True,True,True,9,27,429,2,True,9,Tests_passed,8c921cb8bf17c849dcf7b34db6d63a49d05bfebcf7769e5403550310dd0f041b,True,Tests_passed,167960e1ea6edc5752d2348cae736a74e02cb1e73629216db7376c783a1a7d65,True,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,128c0656460ff5e4fcc073166e5a19fc3bd7bfe82c1f6111059b261b72fb7717,Tests_failed,e79fa68243c79e7314e6d4acf50632804b0936eb592abd4e67214866aa51ab73,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,128c0656460ff5e4fcc073166e5a19fc3bd7bfe82c1f6111059b261b72fb7717,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333 diff --git a/results/combined/merges_tested/sachin-handiekar/jinstagram.csv b/results/combined/merges_tested/sachin-handiekar/jinstagram.csv index 084cbd70bb..1cf41d5601 100644 --- a/results/combined/merges_tested/sachin-handiekar/jinstagram.csv +++ b/results/combined/merges_tested/sachin-handiekar/jinstagram.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,9dd479841addf836661d8acb523429974d029268,6e062eb16b9f4676749ae1d04e6e554622829666,b5be52ac4da86dfe8511d2eb769d44b86b802fcb,,True,True,True,4,10,60,2,True,4,Tests_passed,333e536c12b9820dbca005c3f6cb804eca42989cae05cb195cdc1c19a1c2df13,True,Tests_passed,61ea8af8111700bcbf78072133f6b26e0efdb05f5557a1b88928a8013be28808,True,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,89bf3e7fafafb25c077dffab586053d8480bf84e2d8c5ecdf03954c3842956f6,Tests_failed,415e82895fc30de0ad3c4fb52d401ac5e21da3799f0c3f11aa17ab913200758b,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,89bf3e7fafafb25c077dffab586053d8480bf84e2d8c5ecdf03954c3842956f6,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688 34,refs/heads/master,8a29221353368d4d290973e4d8ebe90325567793,1758fa70e7a74e72c0a4ffad99cf6c7435676173,840c591a5e5cf424f5f1745ec911a79d2cd1185d,,True,True,True,82,771,9732,2,True,82,Tests_passed,9e6663596a779a6b3091f01f6e904946348a9e3dc9e332460762642c27114cd7,True,Tests_passed,0bf72301352fd98232923cf9535589946937d73fc1a2bb5c15989820dcddca5c,True,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53 66,refs/heads/master,b09245f4cd9a3ac6d4fc4fb341602a30e7f13983,30fc89783391edaadf99bb70214d91761bdbc7c9,5c46f18fca43f06ac3685442dd9602f05013254c,,True,True,True,5,15,44,2,True,5,Tests_passed,9dd00a885fa0f70ea70e138aab1b565abde33bc81f65c469c43efa3b823195c1,True,Tests_passed,7830bd7d36eb45025709d792cc0d483eadd293f89a6240cd2d720101950b38d4,True,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,2bd0587e8fa88ab0411ed9bf9d9602669153aaf4214e725cf74b5b4f723e0c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,2bd0587e8fa88ab0411ed9bf9d9602669153aaf4214e725cf74b5b4f723e0c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47 diff --git a/results/combined/merges_tested/sailthru/sailthru-java-client.csv b/results/combined/merges_tested/sailthru/sailthru-java-client.csv index 5689556abd..8574df6f1f 100644 --- a/results/combined/merges_tested/sailthru/sailthru-java-client.csv +++ b/results/combined/merges_tested/sailthru/sailthru-java-client.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 46,refs/heads/main,212469894d8504e03099bac92066de1583c33ed4,89f4a682f5ee3aa15b404d2a89da2f0de32a35ac,b52c11f90ce0732b17d63f3f682450ef27851bdd,,True,False,True,3,3,8,2,True,3,Tests_passed,eceee400fe40ac018cfb63fcd210b267b7fb952dde756713d682be6198bf2dc3,True,Tests_passed,7a5b3b364665a1fc55a201528e3073994b3e13b53cccdfacf93588e0049f085b,True,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,d7134d2557449f79a0c8b05ede336c579583ef2396166027672ab01609969664,Merge_failed,a43428cdab2c91bbede776ac9ee87b26be63dbc662e53156df47ef2fd23236bf,Tests_passed,49f2914d575a681dc90a5c55bab86372c3d34b5aed9aae8306de0704721a37f6,Merge_failed,3c9b51231ed63ae508ea567a76201085ce73dc260bd60008946ce063320b7534,Merge_failed,a43428cdab2c91bbede776ac9ee87b26be63dbc662e53156df47ef2fd23236bf,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,eff8fc1f95c2248ed5d6ec48779024accee58905ebc0a5cd2cfb2924f716c4a9,Tests_passed,49f2914d575a681dc90a5c55bab86372c3d34b5aed9aae8306de0704721a37f6,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a 55,refs/remotes/origin/pull/4,ee1f9176009eddb98d87251dfd9d8476b8684fc3,59fcb2eaa94d5b401e3a510f5deef270c613d727,2281a3407450b6811fa6483d0b54c4f954d1deaa,,True,True,True,15,39,267,2,True,15,Tests_passed,00e414fbd0762d5af9bee125b260a97e47b17f07b177702e3f360c674c16120e,True,Tests_passed,4d36e446f25b93fb1ae090e5f822e43e090098b1b84e8390d7d0413b4ec89b1c,True,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,ec276bb69517c9e6c6592b029a625de165c6a3d4cae8acd23bdc702bb806fb0a,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Tests_failed,948cade4af456ce2edad58c37373f98b646f102618dda4ffd0b3f708618a2c37,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,9e205a122caeef015eff5d26e981b7f62d66241c034964d0760b76d8685f1597,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9 diff --git a/results/combined/merges_tested/salyh/elasticsearch-river-imap.csv b/results/combined/merges_tested/salyh/elasticsearch-river-imap.csv index 06aa33e717..4bb1580895 100644 --- a/results/combined/merges_tested/salyh/elasticsearch-river-imap.csv +++ b/results/combined/merges_tested/salyh/elasticsearch-river-imap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,8827bca9e525e2306ce7d2ff8089317e31092489,fc5f5c074e841ecdc2d686ed07f4cceff940a4e9,d0a3a8b63781fc75f3058208e41a7e1be22e0770,,True,True,True,24,147,623,6,True,25,Tests_passed,53ac098e9cbc12d5d43d6d6100bfe330b8ac0bb51b8c4bdb67bd51b951193d2f,True,Tests_passed,8a52517f62352329303c5aed8f052af3a9c89f39e9bc6d209a59e0c6bb4a67ea,True,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bd83d0006c9ed814acfeb5ca9d9cd93e61503f6e366e9671f220ea99cd421df6,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,e4dad75633a02c7eb222e80ea1be70cc3f578ce271be61aaa30dfcb2f0686823,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bcbdeecd3344870d6deb209985f0d98d66c53e813aaf426a688733ffc575d118,Merge_failed,e744fa9c99211279645f29d9634a88b2632483cafb411dfa4ffc0d180cc7dfac,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff diff --git a/results/combined/merges_tested/sammthomson/semafor.csv b/results/combined/merges_tested/sammthomson/semafor.csv index aaf746d491..4b527110ce 100644 --- a/results/combined/merges_tested/sammthomson/semafor.csv +++ b/results/combined/merges_tested/sammthomson/semafor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/remotes/origin/develop,b8edc6883616b185adbf9ec68e084c92c7a0039e,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,acab8333fccdf4e648105814886c8bcb889b0d9c,,True,True,True,166,450,17347,2,True,166,Tests_passed,b1bd44f71c7281d47fc60a4cc762606c1298e79072fa6398b3c4350302f9f9ef,True,Tests_passed,d393eb563070863faff959932e75659d6a660448f17eff5910e9adcce3286147,True,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,eba75aa299900bb1478cdfa89ee8f4e6a5ab8a5089d837415c9d66eaf1a8ee76,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,eba75aa299900bb1478cdfa89ee8f4e6a5ab8a5089d837415c9d66eaf1a8ee76,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd 32,refs/remotes/origin/develop,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,4db260dd91b978ccd72a0a279dd9546413efd238,0a53b56bfd23a41697bbd84f76773d09ce8bac86,,True,True,True,183,573,18288,86,True,223,Tests_passed,361a0fbfbce9327bf5ea2ea8f428c5bef03568a96aae5eed0937e0ea1f4ccff8,True,Tests_passed,3da49e3a26b0f1705aea4d02707091d6b0b95da1a4b5896076b02aaeacff2556,True,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,630cc8fc1402c6fb6d7ebc0f6c7409b58833f43456c599eb2076fcfd698de7db,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,2ea318638e1d329fd93eb74484304e897e40988feb1012537f81c078cff69d60,Merge_failed,58e87a7dde4a6fcc4024b24dc922b2296bd59a02d76a4d14515d65e24413237f,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,6359a45b821e2fb5bb462e70e0528c6e4510d0c6cafaa0ab9715fe5608f39280,Merge_failed,fb0e04c587e0dfbe00f275269a2883fab13b84496f2fd4867cb533b3c4425c33,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b 36,refs/remotes/origin/swabha,fe9b0e7715ca6847928527c8bd6fb3d5d9f2ae4d,f6e687033b862cf9420de308bce95f2a0144ff03,0bbd451703ec153a89ca22ade590a2f50e90a3e8,,True,True,True,56,112,7217,2,True,56,Tests_passed,feae658662b731bfa2a1718f50144262ffc81e65f9f2215d967b6f2f4046b3f6,True,Tests_passed,f142f91e28d594df4b506af27fe5cd91e28fbd151ca1592c4ab66cb640718d2d,True,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,88c9a465f2a048136a1b4399dfd5a26f5387dc00254b33e4c80f5574eef3e045,Tests_failed,f8a60d200b99665832b4cb4bc05b6f700b091cf76a0015f49555c2592a2ab13f,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,88c9a465f2a048136a1b4399dfd5a26f5387dc00254b33e4c80f5574eef3e045,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641 diff --git a/results/combined/merges_tested/samskivert/jmustache.csv b/results/combined/merges_tested/samskivert/jmustache.csv index 3b2e461c91..3aae2b417e 100644 --- a/results/combined/merges_tested/samskivert/jmustache.csv +++ b/results/combined/merges_tested/samskivert/jmustache.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,940af397c4c27995bcf56fb26151d7a98a662e8a,c8915ffc3c76750c7c795225fe17db162dff43a5,d1d72031f209d864ee721c40cd9ce1e174383577,,True,True,Tests_passed,7754199c00a1bf066a8ad588e6ab14cf4ba3dd70bd0b0cf725600cfcd3b2fd0b,True,9,40,297,2,True,Tests_passed,c66c21a53b5ae8fb1d0424331487e954703c9cbd188aba10271ffec58818bc38,True,9,True,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,1810bb53c3441173b5e308c9053b7623ceca657b6e9855c6671ba3605f2a49bc,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827 diff --git a/results/combined/merges_tested/samskivert/pythagoras.csv b/results/combined/merges_tested/samskivert/pythagoras.csv index 15fe3bbfaa..4733394065 100644 --- a/results/combined/merges_tested/samskivert/pythagoras.csv +++ b/results/combined/merges_tested/samskivert/pythagoras.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,f32a7352154f38c59390d8dc569a23a492244747,c6321e4573bd15b0d3d39c03619cf6ca7d977c75,59416dca9ee6b9b625b1c16c2fed31119feade8e,,True,True,Tests_passed,914b02d70fd09cc01b836d886fd47d02f660431ffce454b40c0a11fc08abcd40,True,25,68,563,4,True,Tests_passed,ed2ce680fe64822b0b2f6daa12dfa218b440d6fd442b580134341c89fd486c60,True,26,True,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,914b02d70fd09cc01b836d886fd47d02f660431ffce454b40c0a11fc08abcd40,Merge_failed,46d0335ec3921da4255883113a628b706aa4721ecc2a1108a937bc8c4cc38a67,Merge_failed,b42bbf781a9bd5159aedf66edbb777d0829947d8783053bcb848465ac890e93d,Merge_failed,796654e9e104713c367fbf51d9072c74127c2621f2be941f342be38fd8011e5e,Merge_failed,46d0335ec3921da4255883113a628b706aa4721ecc2a1108a937bc8c4cc38a67,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,914b02d70fd09cc01b836d886fd47d02f660431ffce454b40c0a11fc08abcd40,Merge_failed,b42bbf781a9bd5159aedf66edbb777d0829947d8783053bcb848465ac890e93d,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca 8,refs/heads/master,c521fcd74ec43af2196b7dac29bffc6f2aba1643,402711b76630c2c012b4fb1f64d2ac51a7df4ba1,923dbc128472ae335d035dd934be0bf4132d204a,,True,True,Tests_passed,a427d656beefa5f9b2410d95fcd99403d1504ca39879adcc512d52bff3bc8f17,True,53,87,1125,4,True,Tests_passed,7fa68889ee7c8397c49dd468bf7ef35fb853896a5cd817d0a887b875aef29284,True,53,True,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb diff --git a/results/combined/merges_tested/samskivert/samskivert.csv b/results/combined/merges_tested/samskivert/samskivert.csv index 4a7e826ea4..e47e8ca2c9 100644 --- a/results/combined/merges_tested/samskivert/samskivert.csv +++ b/results/combined/merges_tested/samskivert/samskivert.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,d870dd2fac79ec07a7e9143cda4efe41fd3e66d4,5356672130809882e5d7d169af7d6a447ce7ebd3,a641e6c502f06dae6a0b6a4af3ed827040b05877,,True,False,True,6,15,39,2,True,6,Tests_passed,63a4bed6ef8c8446082eeefd4694b5b4e761688a9c19390dc16680f6ec66bfc9,True,Tests_passed,44b1d457e4a08d09d8f1c79a39be686a004bc4b71011ce1d41c02a017b5a449d,True,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9 diff --git a/results/combined/merges_tested/sander2798/enderstone.csv b/results/combined/merges_tested/sander2798/enderstone.csv index 4b17d6d1d1..52156f3e31 100644 --- a/results/combined/merges_tested/sander2798/enderstone.csv +++ b/results/combined/merges_tested/sander2798/enderstone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,3447f49bf49c20e95ab686145f937e780624c1f7,cdd8a4d95468837c815b418c4d8dee305cb6900f,a5b5035764387e258d17b2ccfd1735d38bef9155,,True,True,True,39,81,1497.0,6,True,39,Tests_passed,d76fbbaf4a996bc9d81ec6d380df141ec237cc7399dbc26c4e6e6823669df31b,True,Tests_passed,b948e4a8849750059e9e5acb9e77e849f89b1fe6878f8e4c6f1c60a883e7d506,True,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,d1b44d1c33a594ff11ecee8fdee32acbba5fb94e7a1cb163e960542e43710f2d,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,332aab35c9f658b0b10b7b38938492a70e828c54a22b5f53cfa3a2f18bc822b7,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,7bb7935b0f97955a5ec01c10910ca9f76c7ba9e5eef9ee90dae56d5fdc9471f1,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45 11,refs/heads/master,b515bac1b027442fee058b69e9c56f1d7941d55a,f3c670bc92b436f2fed3d5764c12c83904c3201b,5041a4756178745685ddbfbac216c28f075666c9,,True,True,True,27,130,515.0,2,True,27,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,True,Tests_passed,96721ab95d8c8330b1feaa337005a441183f839a065e6fe043033305a8a43ff3,True,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,3d51e3ee417085ad1c26f3e1adcaa729fe50344b5acf6f83b057fb29bc25c7b6,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,ffec8ca0a3c8f7d273f7538f28ab707054c784b631a5008884fd098748d18959,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,3c035d0b43be7a1f5949981261c6c1c75b4b089500adf321f59bbb92df561c85,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395 13,refs/heads/master,8e17a2983e231cf884b35d94c95cbcac6c4d0af4,67e753b46b2b76ea189ef8a540b2b9ba6b3c7d1a,e85904399fbc734b1d5bf49099d4863901c9c986,,True,True,True,64,388,1419.0,2,True,65,Tests_passed,786e535345f93d29955491eb2b3ce05c6b4b12ab94aa10bc7d068674d810c9b4,True,Tests_passed,e5b44bc3ec31f2eb8426e2d5bf79da91ebbea9478c1bbbf6be93fba8d22b1fc1,True,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_failed,785544fad0bf5ad01151ad584d6cbb196d7f16c0690233fb8ae9d87bdbc25d6a,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53 diff --git a/results/combined/merges_tested/sandergielisse/enderstone.csv b/results/combined/merges_tested/sandergielisse/enderstone.csv index 32c8eda5c4..168f924eb7 100644 --- a/results/combined/merges_tested/sandergielisse/enderstone.csv +++ b/results/combined/merges_tested/sandergielisse/enderstone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,3447f49bf49c20e95ab686145f937e780624c1f7,cdd8a4d95468837c815b418c4d8dee305cb6900f,a5b5035764387e258d17b2ccfd1735d38bef9155,,True,True,True,39,81,1497.0,6,True,39,Tests_passed,d76fbbaf4a996bc9d81ec6d380df141ec237cc7399dbc26c4e6e6823669df31b,True,Tests_passed,b948e4a8849750059e9e5acb9e77e849f89b1fe6878f8e4c6f1c60a883e7d506,True,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,d1b44d1c33a594ff11ecee8fdee32acbba5fb94e7a1cb163e960542e43710f2d,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,332aab35c9f658b0b10b7b38938492a70e828c54a22b5f53cfa3a2f18bc822b7,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,fb3ffc81b4a55ce47d9f20564cbf2891511ad9bb98281c0a1d2e318578f52a42,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45 11,refs/heads/master,b515bac1b027442fee058b69e9c56f1d7941d55a,f3c670bc92b436f2fed3d5764c12c83904c3201b,5041a4756178745685ddbfbac216c28f075666c9,,True,True,True,27,130,515.0,2,True,27,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,True,Tests_passed,96721ab95d8c8330b1feaa337005a441183f839a065e6fe043033305a8a43ff3,True,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,3d51e3ee417085ad1c26f3e1adcaa729fe50344b5acf6f83b057fb29bc25c7b6,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,ffec8ca0a3c8f7d273f7538f28ab707054c784b631a5008884fd098748d18959,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,46788bf113ccb572d14dbe14913d8dd14051ae43ef8ab535f21a30440e7c1ed9,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395 13,refs/heads/master,8e17a2983e231cf884b35d94c95cbcac6c4d0af4,67e753b46b2b76ea189ef8a540b2b9ba6b3c7d1a,e85904399fbc734b1d5bf49099d4863901c9c986,,True,True,True,64,388,1419.0,2,True,65,Tests_passed,786e535345f93d29955491eb2b3ce05c6b4b12ab94aa10bc7d068674d810c9b4,True,Tests_passed,e5b44bc3ec31f2eb8426e2d5bf79da91ebbea9478c1bbbf6be93fba8d22b1fc1,True,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53 diff --git a/results/combined/merges_tested/saucelabs/ci-sauce.csv b/results/combined/merges_tested/saucelabs/ci-sauce.csv index f7035c036c..7fea8c2062 100644 --- a/results/combined/merges_tested/saucelabs/ci-sauce.csv +++ b/results/combined/merges_tested/saucelabs/ci-sauce.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/main,af79f7d3ebfa4eb319de538e5a7dcbd183766afc,707d40ed7b1707b70a2c5c80111b364bafe6f597,97b2d2fbd9bafa0a0d58655a30c7653c130cfeea,,True,True,Tests_passed,a8412f3c3c542ba2bfacac35ddfbb688a99b9afa8835015dd6c696e6bb2939ce,True,5.0,31,208.0,2,True,Tests_passed,9672c4a317973e28bfa9c7a07d37abc95b9a91eab3034ba5b8fc0149b4b14ce6,True,5,True,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,b8cd2c47c920417be12260fdefd807cf1fdc66a515e7235addceecf3a0734895,Tests_failed,1954eb285b8278629994801fce5892a75011863f9ddc21af632b15dc1bdfff1b,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,b8cd2c47c920417be12260fdefd807cf1fdc66a515e7235addceecf3a0734895,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7 8,refs/heads/main,46cc1e6e2bce0bd5819fb9f1045666e678ec0feb,940f484bf0fd29a946a0da6c46b7bc62d5b4beb2,24d160f16d457a770121267820d492c355c03814,,True,True,Tests_passed,9f470db15aa826b67b57e0bf6e8c7655fd2466d24b1ded3788639ae27449aa64,True,4.0,8,24.0,2,True,Tests_passed,37ff35992ce1a29d448c42f5381b0db7732dbdb8ed0c66af6b5e3bdc656c532c,True,4,True,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf diff --git a/results/combined/merges_tested/sbtourist/journal.io.csv b/results/combined/merges_tested/sbtourist/journal.io.csv index 6e15e83ca6..320e1bf5f2 100644 --- a/results/combined/merges_tested/sbtourist/journal.io.csv +++ b/results/combined/merges_tested/sbtourist/journal.io.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,8bac7e41e6145a0dc0b5e315a5d683f54bb67172,a3ec3110f06cca7c0222f5d29d2d5621ae14baec,8e420a131d6b726abafd703d4fcaf060783f828d,,True,True,True,5,10,51,2,True,5,Tests_passed,f676f5ed2fd008313ad02325bbb63fd2f6fd868d69981e2cc6bedf98036c87a0,True,Tests_passed,715e2a1c763822ff0a9b88bcac1e5c96208d03328a6d5011538751fce365aa70,True,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf 14,refs/heads/master,99d7e8fb8cf93cf1d0d4537e9feb100112324778,d8e125b07439b8f4c916263b9ad0484dda2adc0d,6ca221a4fde87aa6acc1343e3f3271af77535b1b,,True,True,True,8,71,532,2,True,8,Tests_passed,8f58993fa425e8651767f813e0faa8472f328af685c4419f8d873b9d5cee74b0,True,Tests_passed,9f31a0bfe0ba5ee4855adfbc10d01f513230e3619c9debb80324fcaa89306b13,True,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,ef764c998ec50427291440d5a11cda39a7ed37dfe363231219ea539dfa52cf93,Merge_failed,92c630ce1bfe37d07bca00fe423f7ae99a8a49934e28dbc8c6013dfd6100e67a,Merge_failed,349572b62298ecca1b0da1d27c3290d101876183019722087bca993dcfb9a620,Tests_failed,8178d22e2d0b8830104490b694a8a1181f586ead2f1991b45c8c2e6579b23aeb,Merge_failed,92c630ce1bfe37d07bca00fe423f7ae99a8a49934e28dbc8c6013dfd6100e67a,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,f7cebb063bd8075adbeaffb856886d3eb8854e2e3dec3f63b6c4921bc88477c9,Merge_failed,349572b62298ecca1b0da1d27c3290d101876183019722087bca993dcfb9a620,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65 17,refs/heads/master,f13d15914f40f49d860acbb2501e31185ed70a41,df94e059ee5d0e67b3353725825e9dfd6cefbebc,50c56a171411cfb9d610e531df5b5abd113785ee,,True,True,True,9,149,603,4,True,9,Tests_passed,1a236522227e9049e9d88db90781b5b846737b6ca6b0eecacc74989ca7bc7eee,True,Tests_passed,99b03de96949c677a5a1ad6b7dc2758e33dce92269af29fecd3d86801972b000,True,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,845808713bae2624b3594db76903338af1ddbe0dd05e347bf8f4c8ec7b9cf748,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,1928dccbd6b47b3d5b2f1f5a86ee68df1ba5e4ce9047bcb580df28a2ab4b75fb,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,ba252622f35c937db23d7b1ffe452e5803e524b90e19bfd589841bda9cff717d,Tests_failed,069d4497e505ee4dff4f1188ea72ec41384e24f74716783f06516894e85b262e,Tests_failed,9d33b9be50541ba8afdbfe908858085b9c4fdd2da33d33373aa88947fffffbb1,Tests_failed,76b66b2fbecd47a809dbea7120be0b2fab95fdc51852793e84da7bafda3cf403,Tests_failed,069d4497e505ee4dff4f1188ea72ec41384e24f74716783f06516894e85b262e,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,1928dccbd6b47b3d5b2f1f5a86ee68df1ba5e4ce9047bcb580df28a2ab4b75fb,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,8fc3ff51c06c30e0b654662c68321429e47603c994a85dbcc8cca77c4eaad28a,Tests_failed,9d33b9be50541ba8afdbfe908858085b9c4fdd2da33d33373aa88947fffffbb1,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,845808713bae2624b3594db76903338af1ddbe0dd05e347bf8f4c8ec7b9cf748,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430 diff --git a/results/combined/merges_tested/schema-repo/schema-repo.csv b/results/combined/merges_tested/schema-repo/schema-repo.csv index d0a0f3f879..76374b6c1c 100644 --- a/results/combined/merges_tested/schema-repo/schema-repo.csv +++ b/results/combined/merges_tested/schema-repo/schema-repo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,f85f90da3d8305f4cd40870cf736123b49ae379f,451984af54baee5a10f21aba0da677f9299749fa,c467eb41915fc8ebb794f8121a4b9785f734540d,,True,True,True,10,23,110,23,True,25,Tests_passed,5e68d50ebde97a0439a267b07edc8028039372e44e046fdc4c4a40c983237b9c,True,Tests_passed,fd1c543fa3a9c99cbb59b31c78cff5aa5f2ba22d67d62ce8c7280e981870a0d6,True,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,9d9993feb89e5617e28c8bd0e73702e705d86c9c757d14698a11ef57dd312f8f,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,a13f319441127f91d03e922652735a99bc2450ff0758896fe31e3d65e4cc98bd,Merge_failed,c1a31a837ebe49b38ab9d9f84fe6bc0873c91fe15e628031efa21b5e4fa90b37,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,b82947ede293b70f13e23e36bbee8b84bb95052c7d3757dcfa786f7b35c9f063,Merge_failed,d3a9f20a3743204bd194235bf0eedab0633986844941f64f435fa48304e13827,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa 5,refs/remotes/origin/pull/21,0b51f83a62407e5a5c3dd0597e02b5733aad516c,ee378239b7fb40fa7959134a197a01b7ebc3dc16,4932f5494d29d461cab746b4667b728f06cccb5e,,True,True,True,10,16,314,2,True,10,Tests_passed,8310217bc26883a21be46d41bfb3c5ab88e9f3e9c8d1fc6d35f5bef2192c542e,True,Tests_passed,e4015cdca306fd7e842c03399ed18e8cca6df90163547686fe46805ee22279c2,True,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,48148a371df97c677d95f045fada3ce6d830791a5f30d5cb8940a0dd5f4b11b5,Merge_failed,53c56a133573c5dd2e9d1a10e38f424b9677d707ec8e311bc73885042a74451d,Tests_failed,a1bc7b77c21b659c9f01eb9d880407cc1c1fa8c04bb668bfde723dff95796c58,Tests_failed,443197fee9d20f77b9a5219ea61058101e9b8ccb28dd8961c42f34986147b6a4,Merge_failed,53c56a133573c5dd2e9d1a10e38f424b9677d707ec8e311bc73885042a74451d,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,64715b3a48f00e67cfa544b9f981aeb19855278b71c00303d2b986a824e07a48,Tests_failed,a1bc7b77c21b659c9f01eb9d880407cc1c1fa8c04bb668bfde723dff95796c58,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572 6,refs/remotes/origin/pull/23,f1a22946df99bc2bd9997867310bc9420c72adf2,8107439ecb425ebdb51a96e971348352a44fb89b,1653d869383df9c961ae69337b10dfc51f0b8837,,True,True,True,32,77,1178,30,True,50,Tests_passed,5288aec29913c2d5c7c33407a8c65deee191b6f3307b83c466807bf1c6e52ce2,True,Tests_passed,59e76214a74398c301c2177451ddca2e8cd63daa145dbad687d6dd69d1d5ed48,True,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,072024bdd838fcae55829175c85e6e1e3accec318aa7b05bc0a02261656f030d,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,59da9955f0ee7749555555a728977f7b9a4714a102851f673a16efe5c59496a2,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,b67ce4cd94a2808cc1d788e373e23859e0f7ff0b2e1f4c230dc1471bf4e75915,Merge_failed,58019ccc7a466f7a46db4100f2cd6666e8f6f23f48b2fbc64af7710c266a897e,Merge_failed,b5af247251610c422f2eeede60213cf6aa042cf317123b7dcf5d651d4d94f5dd,Merge_failed,b1ba73adfa079befaeda27220157047e9c4995d3e9f4da96d0a54bd573c8c16f,Merge_failed,58019ccc7a466f7a46db4100f2cd6666e8f6f23f48b2fbc64af7710c266a897e,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,59da9955f0ee7749555555a728977f7b9a4714a102851f673a16efe5c59496a2,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,62e6b056df22055dfaae146bfe3294849964c98457c4410541efd687002efcfd,Merge_failed,5436d33a13c3c0529740f5825213248e0c1f4120c900c8621cd15b6ad44aa6be,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,072024bdd838fcae55829175c85e6e1e3accec318aa7b05bc0a02261656f030d,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a diff --git a/results/combined/merges_tested/scifio/scifio.csv b/results/combined/merges_tested/scifio/scifio.csv index 4870aed883..da76a272ed 100644 --- a/results/combined/merges_tested/scifio/scifio.csv +++ b/results/combined/merges_tested/scifio/scifio.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,057b12613c528cbd789093ae86203d872e38ca2c,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,26064e23697a0eb96d77439e65ba0c097dfaf2c8,,True,True,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,True,335,370,1016.0,3,True,Tests_passed,cbb390cd83fcb1060af352741ec6d6ede6faae13f1dca8e90a7f74845067927a,True,335,True,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017 18,refs/heads/master,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,37d1717f4aaa5b3c92f508bce69105efdc9e16d0,c5fa746372d74a2ee23525f3fc5314af9f9b7575,,True,True,Tests_passed,26be160759408795368d5be85db9ce205999f6b67562732d6216db9b58ccf7dc,True,335,364,1006.0,2,True,Tests_passed,453fee771720640f4d0b601e45e3335190a355f7fe6628939c6b2382a91cfd0f,True,335,True,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,5ab4fdd974ae392f9111ca10dae07d70ab91b74164a77b39b89e2dd845f780d0,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,5ab4fdd974ae392f9111ca10dae07d70ab91b74164a77b39b89e2dd845f780d0,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44 35,refs/heads/master,60c3e1f8bbb3be0292e64e8c059f805299c1c17e,bf964aab86313d499313c5c4b4a0a40b27497d72,81981bd0fc59c0dd3c3b04aca5e25d41a4413646,,True,True,Tests_passed,2c81235c351826e26060ddf4617b653c168e982711a489af661a53552b88067c,True,27,125,3652.0,2,True,Tests_passed,a26c279473d68206643098970086189f2a093a7fc1351317d2b8963b52ab2c4c,True,27,True,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,4afb9f4722f35b09946160e4bb8ae9bece954d7408b90d651b6c1f06077094d1,Tests_failed,ee90164560860956cfe89971466f4795e30a913a1cf563ce5a23c4cfd7353027,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,4afb9f4722f35b09946160e4bb8ae9bece954d7408b90d651b6c1f06077094d1,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda diff --git a/results/combined/merges_tested/scribble/scribble-java.csv b/results/combined/merges_tested/scribble/scribble-java.csv index ed556762ba..3256e9c2cf 100644 --- a/results/combined/merges_tested/scribble/scribble-java.csv +++ b/results/combined/merges_tested/scribble/scribble-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/heads/master,6b8bbbb4fd120bb5e43a90254f149219914fca61,21fd2f48451653b3b92b94b8b376d1712b1c0a4e,b9ab0f45b86540857b3678b8ba5a4d137c255dab,,True,True,True,1321,2959,51281,22,True,1403,Tests_passed,3da8fb03d8ad78091323fbf54c20f315d833956d3a9c4b08f9e72f691e3d31b8,True,Tests_passed,700e4212d7356f54ae8f54f8aacee443e4c9dcef1812e16c28db5f3f6ed4a106,True,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e 125,refs/heads/master,164250d0d03a6cfb879d3ea5c5672bac5b0133ec,ea369a7bd0505034d7ed548fb26eeaeb70198517,2742ef8fd2ec92aa2b7f7a208961892a18ca580c,,True,True,True,49,132,996,3,True,50,Tests_passed,485c573108b2bcaccd8fdc91276e529ebefadd9467142339db70cc76d9c2e48d,True,Tests_passed,2d15da0a135d5e7e7502878823725924c1aeb4c5f1cee77a2a77fc89a9f2306a,True,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,1557bd724e43000449b11c959e03d2c3b1398314a06ed9c3a355dfbc61803e22,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_timedout,,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,13f8f81110f4482ac0f29df6dd11b68de42978cd1f73e1dcf88cfa84f1029d7f,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c 206,refs/remotes/origin/popl19-artifact,2b1e0e097b9d85a80a8d31d277d56643fa5e3119,84ed8659f50907a710e15be93bca2e0e3ab7ada7,47a53ac12fceee906fb5c230c2c750e5c55de291,,True,True,True,219,702,18717,2,True,219,Tests_passed,2106e49a687a59d3201578efb40f5f17795cb301538d4f22d8c3fc81e4d145d2,True,Tests_passed,98b21e28bea1a00d30db5d30b87249419cac492fd76e8d979702e1beff127880,True,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_failed,03c04fabc1b0d8c4bb6599bff214a46df75828d82b28925fc47a780392726380,Tests_failed,7e900c156c6f1f9ee580cdd26afda1a2c4178b221a741e40343d3b410cfdc878,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_failed,03c04fabc1b0d8c4bb6599bff214a46df75828d82b28925fc47a780392726380,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f diff --git a/results/combined/merges_tested/scribejava/scribejava.csv b/results/combined/merges_tested/scribejava/scribejava.csv index 6d0d5d59d0..607474a74c 100644 --- a/results/combined/merges_tested/scribejava/scribejava.csv +++ b/results/combined/merges_tested/scribejava/scribejava.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e 6,refs/heads/master,3b0c0e14ec2b6bf6f7adcac3ecb46c68caa26356,6007a9e712c4b7219d86a4e945835fdcd875943d,3f1cd63ae5c41dacffced9fc0d73446af9f1ca89,,True,True,True,47,123,2150,2,True,47,Tests_passed,5f4672078016a5b34965b94b52b65e71f09f516b32fa5861d65a5cabb5e81947,True,Tests_passed,63c3b896197a3bf80f4d79f734ae11d7fc1970f0427244abc2230b2e547183c5,True,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_failed,6d69b6184561462afe9d101593cd3857025de6a35f1d7525bc53762334632b10,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6 20,refs/heads/master,2f5d9b10ee3604387e16d355cfb95af096d3c51c,73c29f539804fbed6e7e2587a87f97898439eeca,5ee2173fbe4feeab5d5fd93d3b455e9f66771f21,,True,True,True,114,179,1976,5,True,114,Tests_passed,bb56750e94ef526bdcf3f7970d0cc06b5bfccdf77f602f988bab41b8b55da179,True,Tests_passed,b49634ae591d87ba5d6b8f46c82321cca02980f0bd42752835ceff487fcdd90a,True,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,89e5049a47671619ba138ff9b934166885a0ad64c4ae189404a60e9fa6927f5e,Merge_failed,62bbc9c2ef82ecc7af4fa8497e5cc9bb80612ee41b62244d243386894a05ee20,Tests_failed,8d3cdc09e6044c063e5d4218c172e52537d122a0fd601a876f95324c3c5f3f16,Merge_failed,898144c1fc87b9c52b42660e649fc3ec3e0a89c70d790c17413e1492e859e269,Merge_failed,62bbc9c2ef82ecc7af4fa8497e5cc9bb80612ee41b62244d243386894a05ee20,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,a77c0fb882b21e7b26e8cb764980a9882f9896f459b7705ee00476bbd104249a,Tests_failed,8d3cdc09e6044c063e5d4218c172e52537d122a0fd601a876f95324c3c5f3f16,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b diff --git a/results/combined/merges_tested/sd4324530/fastweixin.csv b/results/combined/merges_tested/sd4324530/fastweixin.csv index c9e8db4222..db07a721b3 100644 --- a/results/combined/merges_tested/sd4324530/fastweixin.csv +++ b/results/combined/merges_tested/sd4324530/fastweixin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,0519f3179f85a6f22a87251442e898f49ad53d7c,47807c2e49ac7e7f55c871302f817707c1eea40a,e36514545c95312ae45484a2b85539a09763e030,,True,True,Tests_passed,bff2c630b40d249c54950825d8c91e75d24e057e3732ab487763f33bce5dedd5,True,29,100,807.0,2,True,Tests_passed,c6d3e066455c128bf388ea1b88fbaebc9d775d68da74c3cb3312f6e4abc3ed4e,True,29,True,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,6849b82f983e98aeb8c91c19718c077f067ac0a757b65b2071cd296200c33d34,Tests_failed,867d5e6dbcd5150b0c153a4ab8272d128cbda16dd6f14d7618a1c1832c37b161,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,6849b82f983e98aeb8c91c19718c077f067ac0a757b65b2071cd296200c33d34,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb 29,refs/heads/master,f4aa5c9e2a5e5009160e2d1062d540641e668ee1,53405b48ba245741340013ef7859304fd8cbdcac,c029ac02521337ef75360e6cd06e8631516b15e1,,True,True,Tests_passed,e53d14076a1f9a9cbf5d5b48f6a6124bf7171f48d69bd814edff2905f4ffc858,True,33,139,966.0,4,True,Tests_passed,db280075ffab9e7baace574aa523c1a00e8973c308285c92b27e3e9bbc4b3024,True,33,True,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,43382d7d3757c6beb3fffaf37d759bff9983f30f6d9f7d1988a849f318d8b337,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,6faa722c2e30b94a412009243385713eb393e883730961dac1655c3bcbfa0ea0,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,4a83937b54ae152daeb19c6bd98122155480556d9bda4c9db199896d560fbdf4,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5 31,refs/heads/master,b9c911aea2bd0710b54afc94fb09c55e813ed9b6,53b5138ff7f9f52933a2c6b0c0d2cb102f503b68,e9c3ba1186d3bda64e46ad600efdf11fdc65ad23,,True,True,Tests_passed,643f9e701ef938286a4c7caedccca6aa9b5961aa801405350b5074670016d121,True,23,40,418.0,2,True,Tests_passed,229cf020fede46a8c539080bce48e23e2ba5401c963ecacb57c97f725b293334,True,23,True,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,0ac8f60d1649a779765a3ea22849cafffa18ec2f175972c2af4c1cad88e54efd,Merge_failed,731a28aee55ffaf9f2098c56b78de19d8c6361978301b9a1780189f1538d97de,Merge_failed,6e21cb4b8aafd1bfc2558cc1bf2128ef83a0fbb541ec17b83923cf9114060749,Merge_failed,b2108fd802ac817894232421866153ec122cfdd3f12151774d8f3ecc236368af,Merge_failed,731a28aee55ffaf9f2098c56b78de19d8c6361978301b9a1780189f1538d97de,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,c02ef5e38e3a43cb171b8efec7f2029de1db400fbd8368826804ec41b81845f8,Merge_failed,6e21cb4b8aafd1bfc2558cc1bf2128ef83a0fbb541ec17b83923cf9114060749,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb diff --git a/results/combined/merges_tested/sdllanguagetechnologies/testy.csv b/results/combined/merges_tested/sdllanguagetechnologies/testy.csv index 833256d44d..6bd32a8caf 100644 --- a/results/combined/merges_tested/sdllanguagetechnologies/testy.csv +++ b/results/combined/merges_tested/sdllanguagetechnologies/testy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,023b62b3a5b8622628e43128140bf7bf627ac6ba,bc559746c95aa6c5ef312343b0269440e2601773,16f86777febcf7668b344faf6dfa2890604c3c6f,,True,False,True,8,11,40,2,True,8,Tests_passed,95d60915409ad03e01027094493b5b043dc6c31681ffb52d3676ab6ad2ab6661,True,Tests_passed,e98c25633ffdffc9b363e3b2d17f5a9890df1dbe1d1b96d95ef7722d5c0ad370,True,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,b01dad5a3a706ba75b8e9d10317163e0c2f28158023267702c608d7bdbd182ca,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,b01dad5a3a706ba75b8e9d10317163e0c2f28158023267702c608d7bdbd182ca,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19 30,refs/heads/master,35283116d46d5daf14d53f20d03dd14febf9013e,768188acbf19011d40919e75e2fbc79cd41326c4,2c83117c52290b4a071363dfe5c3b3917aff6ba6,,True,True,True,80,144,915,13,True,82,Tests_passed,630582b42e478e88c2924552056c04a571de498042299b03ef74e78e1d8e374e,True,Tests_passed,7b2022f7c24b55d7619657795207d0eff307f0deba56b4b6221e2fd22e2ec552,True,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,a95e3b4cd94f9162864d5976d47afd94bdcb022b63aa624c7260e49e85b01364,Merge_failed,ab3ccd96eba85bc0042e338e10eaf1143513537b1db990ca49e66f4c100db789,Merge_failed,8707c61ea278491233aa61884f7c328857c350bbdf3a589277514b1c95bb25ca,Merge_failed,0f53cfdec29d659d5a9479349b58507bae63309fff213c4d6f4d63fe744fc0ac,Merge_failed,6e27848c9997f7ceb3b0f0ce7b784e4769883ff16bc4eaa078baa9dc57b57d55,Merge_failed,8707c61ea278491233aa61884f7c328857c350bbdf3a589277514b1c95bb25ca,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,a95e3b4cd94f9162864d5976d47afd94bdcb022b63aa624c7260e49e85b01364,Merge_failed,b4454658e96db4bc1af8acb4fbbaa5a030f6534697fd038494ac7b450891285b,Merge_failed,0f53cfdec29d659d5a9479349b58507bae63309fff213c4d6f4d63fe744fc0ac,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58 38,refs/heads/master,d3d2c7a43ad428e03c3a24d563ca24c615c0e9e8,2078cea14de9516d6e2b64b8f985f0b7f154c646,f30cd88b296132d3f4e44156822c44db51018934,,True,True,True,39,87,1023,2,True,39,Tests_passed,4615d68507b08ede3df6b2c7b01bf46d455b5b7134abc84d2a21745e38945d6a,True,Tests_passed,84e9349995110915fe5a559845822b60d441c654a8b12cf040273c9717183de6,True,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,6c1eb476cab18a0472b496b19294b85f32a8e72599b23c2a0a0dc5adad989150,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,6c1eb476cab18a0472b496b19294b85f32a8e72599b23c2a0a0dc5adad989150,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a diff --git a/results/combined/merges_tested/seam/render.csv b/results/combined/merges_tested/seam/render.csv index bd58b74519..6adfe38272 100644 --- a/results/combined/merges_tested/seam/render.csv +++ b/results/combined/merges_tested/seam/render.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5371832457e9d1037dba8e7091513b6521e5af80,14a752b7aeb92757324cda24a10eaf88a3eaab52,b380fe528888dfd752a4d43dc90aee4c781ff821,,True,True,Tests_passed,d16a0cbc2642704a82f1ac17db759746c6ceae3ed6b96761c4b77e1224065d19,True,12,83,675,11,True,Tests_passed,61819922851f7332362555523491387f3fee5afda86330e9149acc9dde441a26,True,19,True,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,48b9e50ac05d7c76a60d931f7af4a99af06ab7bcf7d3a1b52de87e51fd01fe2c,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,45881c7819193197adc2271cd4dfc31e3f413996e9b7335cc05ff5acc8a694c6,Merge_failed,ca3a7dd97512c984c42e480ee28a410fa459cd2c2270a3d5b24f9dc8d4e48ad6,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,7184111bc7bdf25c42d513457f3106b4009d8bd4cda903a4328e26148e1efef9,Merge_failed,af0a94c1ad825ed90060cdf5c08b3d719815674b518b0a1127b11077b52c2734,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74 diff --git a/results/combined/merges_tested/seanchenxi/gwt-storage.csv b/results/combined/merges_tested/seanchenxi/gwt-storage.csv index 705948fedf..159061f875 100644 --- a/results/combined/merges_tested/seanchenxi/gwt-storage.csv +++ b/results/combined/merges_tested/seanchenxi/gwt-storage.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,e3b59f05a045d66d1916fdea95aa76ce1cd2e412,d91b3f4d4c4add6220a78979bb19b0691f93b9c0,75262313058cc93b4afd3dc97ad3f859f9b0ff8c,,True,True,True,15,31,124,12,True,18,Tests_passed,bef041c62cd50d862b584e5fe1ac283b94e77b7668e38b976ee47bd8d826cc3f,True,Tests_passed,42871d0a0f0153aed90956f2f1bcde3d3f8821ecf3c6064e2981aab8c43e4a62,True,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,81fcbb9cf87df0635c7d140b123f6b679d6a116fbdf4873db18acac99863c112,Merge_failed,50e8f1e12507ba4237456efa5dc405717f0f0e400cba30b5e9fdf99f14c48cef,Merge_failed,f05d8c0082d170e1d0a574da766e7a28617644cefe0c4815b56087ba313d42c2,Merge_failed,99ccc27a9033d461449306be6bad9f892fdb95c4a81381659444384216e98ab4,Merge_failed,50e8f1e12507ba4237456efa5dc405717f0f0e400cba30b5e9fdf99f14c48cef,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,a5fa807b7620d592695a3fbd3031fdc190f3eeee27d32889b5c665faa7e1402b,Merge_failed,2999579a9dc5df5c956625dee793d9632555f0e9e6bbd7d891e6f4d3e8968097,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d 8,refs/heads/master,8ce0dc7d7973f330a05563badf54037c90cd129b,87b4707591b8e61609aa40f3a8c37568e3702e9a,f0e679c108f9bdb7a7246cc863643addcf8b5cb1,,True,True,True,15,84,207,3,True,15,Tests_passed,af5b7be2994a633165dfc66399ac5c1122f6215e48952a588dcb6740e51d0649,True,Tests_passed,fc2f89a04c8ba091c36031fd343f329711d660cdab05ff819a434ea90bf74cd8,True,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,6f98cf5dd872e0551a4dd71add1582352d899158525d900b9e415cac1a3394dd,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,b819c2457d494b2a0184f5d0ca9988f871848e2031740ef7c4f5cf369f046533,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,d5d5c3d158d0334fbc497419df2fbd9a9aa1d484274f00da61c29d6dc2cadbd1,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5 diff --git a/results/combined/merges_tested/sebfz1/wicket-jquery-ui.csv b/results/combined/merges_tested/sebfz1/wicket-jquery-ui.csv index d218da66fb..ce17074ed8 100644 --- a/results/combined/merges_tested/sebfz1/wicket-jquery-ui.csv +++ b/results/combined/merges_tested/sebfz1/wicket-jquery-ui.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 40,refs/heads/wicket9.x,d26c29217ed316b58ca7daf26f949caf2866b578,b0a253173342389021a5f41925b61d4041691969,bac2626a365dc38f92e188334fbe1f1aeb4096f7,,True,True,True,10,24,133,8,True,15,Tests_passed,547f624da3a4b80f1ccb4b18cf1ad03cc2c98365c48c91e040c364cdc8f4695e,True,Tests_passed,cc783846d9edca551d7b4de62438e1bdb551221f12a4ce02c7b503dd44deee51,True,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,1c259b0a7dc8dbab14adb804048c6fccbf1993bbb5fb6a0e418ae1d7f640a936,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Tests_failed,8a995edae439ca72cf2cdabfe33869b951f2a8823b9747d5217653d3fa45b2dc,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,266ad727d0925754d82fa7d780c6459a55cd1074975b4ac50420cff42ce92bf4,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b 46,refs/heads/wicket9.x,4dcd2f4760da881f9d34887f594a56c7f9b57ac2,97222065e783a69a6153f555023744ad3d130a44,84cad8af76c255ab6bf3d1c4bc8884023ee3a2c1,,True,True,True,75,232,2256,2,True,75,Tests_passed,c88ce07a85eac1161f465f45dd181f1177f1c0e7dc98b5e7b22a67e17c419f8b,True,Tests_passed,8e77d3de2395c57cb7ce603446b1d4986496ba74f83485fc62e8c04ab3c25a5e,True,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,46dab5dcd41629d78b1f901dc9601f0b280a06347b3fc9cff6d786c29b089602,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,46dab5dcd41629d78b1f901dc9601f0b280a06347b3fc9cff6d786c29b089602,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a 55,refs/heads/wicket9.x,dc0322d3475d545ccadd66fa377a81a030667a19,b64f88576505738440685a2572737e03ab51474e,513b44ec26548f684ced28a5b61bc7b7811a345a,,True,True,True,6,11,40,21,True,21,Tests_passed,3e79934fa3319b32bcca39c3df300c814708bc66e3cddc76316b1c79eac5876b,True,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,True,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,7b71c3e076d9bc951a1f984b13b01ba88e7bacab926518a338ef37bdb8bc4970,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d diff --git a/results/combined/merges_tested/seedboxer/seedboxer.csv b/results/combined/merges_tested/seedboxer/seedboxer.csv index b4625f4725..89c4792c56 100644 --- a/results/combined/merges_tested/seedboxer/seedboxer.csv +++ b/results/combined/merges_tested/seedboxer/seedboxer.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,5e0fa8ca27d69574dfd18124ba1f877fcc8d9ba3,6ddd15e9598f167b2c3015b80bef4c5b0f2abe22,d33c6d2728f200bc1f515ccc4d7d605c7735e89c,,True,True,True,39,118,2382,10,True,41,Tests_passed,11e911a534e7271b7c7ad2d0b5d71cf3b9506cade7495dc438320d3ca8596a1e,True,Tests_passed,754a457984f7571f2771421e01adeb101a73a0fbd9471dc50d355a6307eae918,True,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,19d431e63047089cf5760d7ca39ea8e732cc56f9788e61a96d823d6666352994,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,122c3e6f8ea8060d822b57725281c382f6436a2fdfacaea36ce285b3bb16cfdc,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,9999598db70028f9c14952a9fc649cd5b52bc209d097a68016d187b117c4788f,Merge_failed,2f737f8ba51d7c4610a48e665b418a1e9e40ef51bdcec02c8b04424ed21ccd99,Merge_failed,13b868f6cf5ede605ca7ac08499aa8c1fe5cb1a6e19571ec5b7e98e9754b4dc2,Merge_failed,13b868f6cf5ede605ca7ac08499aa8c1fe5cb1a6e19571ec5b7e98e9754b4dc2,Merge_failed,2f737f8ba51d7c4610a48e665b418a1e9e40ef51bdcec02c8b04424ed21ccd99,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,122c3e6f8ea8060d822b57725281c382f6436a2fdfacaea36ce285b3bb16cfdc,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,735ed9f24657ffb5c88adfebcd4a5e08ce1820442476c0e47fd76f67a2d982a0,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,19d431e63047089cf5760d7ca39ea8e732cc56f9788e61a96d823d6666352994,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133 10,refs/heads/master,0076809898ee1ef1330ce41242de492d4d0a6de2,b511ab595ccc81bed5d9daf8ce078e5ce56aa1c4,dbf23fc6adbc1bc80e104b619f9c62ff4688ab8d,,True,True,True,18,31,553,2,True,18,Tests_passed,4b2bde9116dd403a8a389bf6734e535cfeafa29dfa704ee37ad948923d074de9,True,Tests_passed,d6a7aaa7ce3dfc87e29c2a916469d0a1ec7d18850070fc139bc6e5fde91de778,True,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320 diff --git a/results/combined/merges_tested/segmentio/analytics-java.csv b/results/combined/merges_tested/segmentio/analytics-java.csv index 15367058ec..4bd374e85d 100644 --- a/results/combined/merges_tested/segmentio/analytics-java.csv +++ b/results/combined/merges_tested/segmentio/analytics-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,0d4a7b4e69e12cd36b44e1cf7392fbde416e2934,7e6903c8a63a7f257d5270bad03feafaa9a7a220,e923b62314fccf28065c046a5f4a59953a961baf,,True,True,True,7,58,627,3,True,7,Tests_passed,508e28a846c3ce4ce7d716c0b40f449d6a1728fc5a7f1fdb4e6adcf6b536286b,True,Tests_passed,66c02208678db361042f8447846373dda51f49a370bb750e1f826c9470cc96c1,True,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,d84ddc6f37f80b8a1edbbfe5aca57765d1d7f7c8c01c797bef8ff5a95fe462f1,Merge_failed,0cc7c00cd8a6de3b2687fedc12e0e50c49149f4bfc3e4e213e3cc66972440e6f,Tests_failed,3a193e3f2d3b63a9421489af5ec372ae3890e99f0c18954c7d7b0ae607599acc,Merge_failed,a6b1ded4e3f82c8caf978b8dbf1dc4b4e95851eeae1139dc9a3fb2d70788403f,Merge_failed,0cc7c00cd8a6de3b2687fedc12e0e50c49149f4bfc3e4e213e3cc66972440e6f,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,59218d14e97371de9beedaad415b8e0e920364c7646cbff1fe751ef9e8d380e3,Tests_failed,3a193e3f2d3b63a9421489af5ec372ae3890e99f0c18954c7d7b0ae607599acc,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483 114,refs/heads/master,b5a96236e473740ea83e5d1ab0548deea21a5656,8b7b1ee33b59215e43ce3ef57e6f9d8105b6f19b,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,True,24,111,1451,3,True,24,Tests_passed,da4e67631ea3ecd978882cd78108232eea8d19af4c470cb7ab8459b99230408c,True,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,True,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,52eae83a36e79f019592d0d2e39b834f3976c1ef6956e2eb171047f3a4cafdcb,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,1268617b4876dbfac9e8eb0fc097fa78249233bf0189e759e21218cefd9d904a,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,130d72cb2a54e4706845c47cadf2d6deac53156011644b67fc8bffe90b73e6b3,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99 115,refs/heads/master,b911863aa857887e12c7fb9b2bf92fadf20cb8c1,22960eb2684000f19e7bcf049d8678124850e973,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,True,24,98,1259,4,True,24,Tests_passed,88b9d69c60739777781739e3beec8d11e7c76ff360bcec4777516d3ab821eba5,True,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,True,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,36f35e74c9983d55b462c210ae1f8b230e6d9e523858ce6d56be289e4a71c911,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,5c7215f8571f023d3446c8c525eb16e8283652f40a476f55c3562d8d667ab9f4,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,318b356aec04c01b9c54474846000e9fd5a0265b8661a48c087f855df6df2b3b,Merge_failed,e360df0fc12118fa25986cefde0582b87914c965b55088f4751ffdb6d4dd413c,Tests_timedout,ad2e367e00937f189f1fc80b7b1f905ffb6e7c7678e24697dc03791a94b3655b,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/combined/merges_tested/semanticvectors/semanticvectors.csv b/results/combined/merges_tested/semanticvectors/semanticvectors.csv index 468c240432..f763dc0ede 100644 --- a/results/combined/merges_tested/semanticvectors/semanticvectors.csv +++ b/results/combined/merges_tested/semanticvectors/semanticvectors.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,58058d15d12a3b15eec26e609c5f656f5d301e85,73590b42957e7f7f81c31238e01641121fe14060,f5f7370a488ffa4a1ac597cf0dc773b507923662,,True,True,Tests_passed,75366712fad34f36ac5538c8ab1608ab52beba580beb4c1e14bf6bc96fcf8454,True,2,76,415,2,True,Tests_passed,eed294b4ad78a10cfa60efdfa14ec8b15209ed846077b530e65baf6955e6abbc,True,2,True,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,6551b72a30caca58dede218f656c77b0e7d8c60faae34a3e168be31bec3c9954,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc 19,refs/heads/master,4dbe868ff9d66dd4343f90cebd909bf887b81f21,6796d2aacc7f8037afe5fac951515404bb4a11c3,183b726e5b2acb12fecf0e40088cb9201a1c6ead,,True,True,Tests_passed,d4235ff00970bc7e6569fb27e719d6dc27d88e6329f253933ff332df36f251b6,True,14,22,571,2,True,Tests_passed,ce2256ef316a9182ed487132926010f15cc6fb0b8831435aa12b5e98fead7198,True,14,True,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,95233ae85e4d484f0a2d523aa573a726d5a90e175bcb283fd7270fec038cb2bb,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,95233ae85e4d484f0a2d523aa573a726d5a90e175bcb283fd7270fec038cb2bb,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba 21,refs/heads/master,9461e75688f8d1768140ecd58f13adbbc2d4c93f,dc54ade056cf4aba7ce5056a7c1216aa4622d5d3,b679d17bec13345488974a7500a0252f140ee506,,True,True,Tests_passed,c7b1f52d0dee879ecf343bde2e2126c02051c7fe707c00e2631663abce159769,True,10,65,397,4,True,Tests_passed,3aba0ae8a22f40bf10eb56af98421d21c038394d93aa5ab69c6e77851fd6b7f9,True,10,True,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,a3e5923d9bff81764081a0a64796d463b4c53edc5a88cfd93b7790a85b47bd86,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,c5eef8863888bec7eb284c5df39b2834b331ec7768f48e5f807474de18a0dcd8,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,a09bcee3224f898ec1ea9e286a839f85fc5580594aa51152cc0fb2871a487475,Merge_failed,45ffc2a25fcced0bc24d1bcfe18e4870ecb8465e00064aec462ea5355ee3cd0e,Tests_passed,44bf418b0faff6d4058cd8f96c2baf61036bfb48272a913d6fb7baf5989cf240,Merge_failed,7adf6f81e9ea68e5eee3dc463dc9b709501726b2ed5c9bca962702d818928085,Merge_failed,45ffc2a25fcced0bc24d1bcfe18e4870ecb8465e00064aec462ea5355ee3cd0e,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,c5eef8863888bec7eb284c5df39b2834b331ec7768f48e5f807474de18a0dcd8,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,06509ff4809c45af6f8ae8c38d9737d0102a84ece8b9bcd5f59621389db21d78,Tests_passed,44bf418b0faff6d4058cd8f96c2baf61036bfb48272a913d6fb7baf5989cf240,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,a3e5923d9bff81764081a0a64796d463b4c53edc5a88cfd93b7790a85b47bd86,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2 diff --git a/results/combined/merges_tested/sexyideas/moosificator.csv b/results/combined/merges_tested/sexyideas/moosificator.csv index 7126309726..269c9e6797 100644 --- a/results/combined/merges_tested/sexyideas/moosificator.csv +++ b/results/combined/merges_tested/sexyideas/moosificator.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,ee20cd848ac7ccde1208ef59fba0aa9b8f6318f7,51490f87bbf813d01164e101fd6cd32ec4a21596,f6f2a3c84faca1484ea4f6b85987a3cf9a1ff9c8,,True,True,True,7,27,341,2,True,7,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,True,Tests_passed,256e1e5e278762a53386362dfba1e6302c22bc4441a27dbce6ede9c30cbb764c,True,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,bf0264f86c5e3781826452624d082023fe050bfceb8b1e5b412147180812a7e7,Tests_failed,317e6a441ec0447add37ff354440b731ddadcfad513b61ad035d9749af4d6cd9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,bf0264f86c5e3781826452624d082023fe050bfceb8b1e5b412147180812a7e7,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17 17,refs/heads/master,51490f87bbf813d01164e101fd6cd32ec4a21596,a662006ee08d1fd941f2ae7eab1812acedf6f232,6b6a2301e40919efa350a5d9f5f2632e85f9393f,,True,True,True,3,21,181,2,True,3,Tests_passed,42e4d036a6e455454b2015304a532ad0b31c348d59b8353a80c96391841fb2df,True,Tests_passed,d865536fe26ff93df8cb6861c8a2f8f6f42db0d3ef81c10a2e1c70dd2d5bb33e,True,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_failed,b164b9ed0b51315260d180745556879aabf8734b0921c330e187673d0f261edf,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b diff --git a/results/combined/merges_tested/sgoeschl/jmeter-sla-report.csv b/results/combined/merges_tested/sgoeschl/jmeter-sla-report.csv index 35597e0994..5beedc22e9 100644 --- a/results/combined/merges_tested/sgoeschl/jmeter-sla-report.csv +++ b/results/combined/merges_tested/sgoeschl/jmeter-sla-report.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,True,True,True,21,131,558,7,True,21,Tests_passed,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,True,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,2fc449e6f33f6d1e4899541d6090246ebd4146c6bfba73d4951b445975b10cdf,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Tests_failed,0ca14efc38b9542fec6950f38cd79741ae650f3196b5f0428043f4b11d68427a,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,d0a57503e87a34700da60f870f70d7350ddf76ded84f2e1e0183f731515a7cba,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf diff --git a/results/combined/merges_tested/shazam/shazamcrest.csv b/results/combined/merges_tested/shazam/shazamcrest.csv index 03eb8639d2..d813c69d3e 100644 --- a/results/combined/merges_tested/shazam/shazamcrest.csv +++ b/results/combined/merges_tested/shazam/shazamcrest.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,9be9807f1cf79c5a11d69fde25afc99f3fb2f40c,c4fa05990bece3e3ead865e456dd2cfd3fb345d3,fa139e6f61d0cf631855edc581afb7afd724aa8a,,True,True,Tests_passed,871b1e77e5a4f82e1512f575042d7d5ddd28ff65efdb7c092e6e4a3aa6515604,True,3,7,42,10,True,Tests_passed,981bdbd883d0d232276f0b421b5a5776f0f6bd73038539a46610bec2d88d1e79,True,11,True,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18 7,refs/heads/master,5bb33c89041258a0f9fa7bc50a06026e7ecd0845,c2c745ef1585634d30110046e472b4b9d07dfc5d,ba45d3bf2608da528a3a24a0180c373e73e84a6f,,True,True,Tests_passed,22736595da2c6b768170c6894ded10f25e57d107eb0df79a086a2bf230065e5c,True,21,58,818,3,True,Tests_passed,8abb8640a1eb064bcf3051b9dc36003933c3944c596296e4efca084943187aaa,True,21,True,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,f5a34947564b2d8599e423604ccb161c1cf14168b073fabc201cff5e6e92954b,Tests_passed,0ba9bee03531864b94cbb5ec5cfa86b2493938605dfecea5fe896089ef2eabee,Tests_passed,3923280bf3f0c193766e54da91c5c75a47e7dcd61b9f5aab2e35e2564d5dd3bd,Merge_failed,7b31946f2acbac50710a936f103e18c065b7e0243b3f8b5431e8ca744f584c83,Tests_passed,0ba9bee03531864b94cbb5ec5cfa86b2493938605dfecea5fe896089ef2eabee,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,0155eab4c7c19eccc9551f286853d0ebae9babc3571a7d35bbd4941f229dbd82,Tests_passed,3923280bf3f0c193766e54da91c5c75a47e7dcd61b9f5aab2e35e2564d5dd3bd,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614 8,refs/heads/master,218c417aaaa48a7efc6e836d99eed00a215f2227,62468df247f55fc00b941d0e7eefabbf7c8b1871,0a75b2df440e7f419fb13f0ffecca25bd4a7e64a,,True,True,Tests_passed,b32fd0958c8d26a6d9577139b002363018e3da236179e1f916352e2953f053fa,True,20,90,985,2,True,Tests_passed,124ca9b4cc80d405be98c5c456a6e407a57cf515108a28377ef2daf695ff66bc,True,20,True,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,2e623fa32a94f74141fc85c3e218470d23c9d806d0ec0d42f148984a9001d3c7,Merge_failed,007887d9f2eb16ad787a2ae70900b660874a2b8a622084ebbb43d38b15d04953,Tests_passed,34d67577ee4a9afe963dd2c450da4d12ae52575ee6a6f56bf1af26551ade2a58,Tests_failed,d6383d4820e12d071b964fb1daeb36c913f0065b67656cb618a8cfbf37ca4dac,Merge_failed,007887d9f2eb16ad787a2ae70900b660874a2b8a622084ebbb43d38b15d04953,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,42d4f214b9e3f47177ce647466dc00736d5122da5b2fdf757ed4089d3bc84180,Tests_passed,34d67577ee4a9afe963dd2c450da4d12ae52575ee6a6f56bf1af26551ade2a58,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e diff --git a/results/combined/merges_tested/shhs-coding-club/drugwars.csv b/results/combined/merges_tested/shhs-coding-club/drugwars.csv index 9eaefab51d..644ba8c515 100644 --- a/results/combined/merges_tested/shhs-coding-club/drugwars.csv +++ b/results/combined/merges_tested/shhs-coding-club/drugwars.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,db4ab6c35e1e7da152fb4b2c12e0d2d83446a1e7,7dfc5293c275f0c6db1e6f361697ce18c6633904,77f4cc00672ef96c23aba8c432f14838655f85ce,,True,False,True,4,9,36,2,True,4,Tests_passed,e0fd58c9686e22cb377467551911e2a1c31f3e644f8cbcaa97422821f694ed86,True,Tests_passed,a8ba466c50f71cdcf9a6b3b994b856aa3af2745040a47053d1ff7189521d5e97,True,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,34814e3caad3e8d21ee9cdd72ec93db9949e92ccee21e60bfb5d062aaa3df951,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,34814e3caad3e8d21ee9cdd72ec93db9949e92ccee21e60bfb5d062aaa3df951,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b 19,refs/heads/master,f07c4b5d24a5a246a9de55940bb80151684c64ea,b8eb50bedfdf55ec6b51691779e564b80fd60799,c5e4ce34f82b7ce324f28144dd63d4f2480ee1fc,,True,True,True,7,17,54,4,True,7,Tests_passed,fdb5f107f879b7555c9c649995501707e845377ae68221f5ad5c5abf9842eaad,True,Tests_passed,15e928c0cb5581dd85d110f3ac905ccf0d68d81917a73e963c36c1905ce41329,True,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,de071cfa8128d6c528f9bcc11742a8d2d4c6296e8758bb64ff03e1e0c3f19d02,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,c28f5139bab47198f554d98887585c1d56efc549ffe25da7129051a984b0c252,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,feefd189a090f936fab49fed3f3f46bf1ca051f791a336c3c4a3cc07b9877da7,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417 26,refs/heads/master,c4e30329d753ba87176104bd8a1f90275ad14266,8bffb29c3e309b089e80c9555b1ef5dbc81177f9,e9d05a0436fe2f5f172ef83ccf8c890227938bad,,True,False,True,5,10,111,2,True,5,Tests_passed,f860d16be9e047d38a1bb1ad7e009104f965dc48d94fdb2ed25a7ddd6510a43e,True,Tests_passed,c1b3cfd4d72b545a11128a20daddeb6cd7860f53d2c26714fca2b65f3af953db,True,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,dfc9b7e3e39a9f4ec709b085c7109b5fdcf8ca2083f51241b8a85f88a08682b7,Tests_passed,5ae68f46527f1e1a392f2d4a522426c36525481c73f814f55bf0422fda47cef8,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,dfc9b7e3e39a9f4ec709b085c7109b5fdcf8ca2083f51241b8a85f88a08682b7,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1 diff --git a/results/combined/merges_tested/shimikano/spring-jpa-bulk.csv b/results/combined/merges_tested/shimikano/spring-jpa-bulk.csv index bf402790b3..3a48e7dbaf 100644 --- a/results/combined/merges_tested/shimikano/spring-jpa-bulk.csv +++ b/results/combined/merges_tested/shimikano/spring-jpa-bulk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,1bec64a7690dee7f6fb602f4d81137e45f9a419a,76c2031d5aaa0b245efdaa7addda008b2cfc2292,4a12f402b921fef6c1af92b29ae26e8ccd6409a9,,True,True,True,28,78,787,3,True,28,Tests_passed,d1cf6c3a02e28773666284e44cf2e36148791c486dc0c7d608776586ac4829b6,True,Tests_passed,3bde474f695068c743ed1256f637c5abd849f3b04092a69b40a3fc031ad493ff,True,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,7b9a0f59f2a208f3c3bdcccc3d0714ad4ec1b044e0336d736bbe6f36fca66e77,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,7b7f184f0e12780797f3a11b678db01b85d1e4a7a4ea23b9eb6f2deea33c1fd7,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,fdcff5035c1ffb2235d7cd1ccfdd999af21881bafad6e0842718357d7f6e1206,Merge_failed,a93ed9f287610e0015494bde2248ad611a425ac76344583d091902c3298e96b4,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f diff --git a/results/combined/merges_tested/shopizer-ecommerce/shopizer.csv b/results/combined/merges_tested/shopizer-ecommerce/shopizer.csv index 752153c07b..6d6aa39244 100644 --- a/results/combined/merges_tested/shopizer-ecommerce/shopizer.csv +++ b/results/combined/merges_tested/shopizer-ecommerce/shopizer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,True,13,25,189.0,2,True,13,Tests_passed,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,True,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,True,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,72eab868eba9b44cb2c5a053d69ed7e5a2b7fe54fa3dd36bd222af37ca24d836,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_timedout,,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,3f001fa1a7b94a41acf30a3f9f876476a983c7d397b919d5e69a4e00df281103,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818 24,refs/remotes/origin/2.10.0,47f960c48c69d24ac3bbe2daead14bb90ad522c8,bb3aab427fc25d0244bb71cf3591de25609e3c70,765f19c7f7688381ea65c84da33c28e27cd7f6fa,,True,True,True,42,525,6279.0,12,True,42,Tests_passed,aaffde4128975fca29caeccf936a77769cd182c2b519e024739ef6f0b4881f9b,True,Tests_passed,89c85bb34f311310197f657056b7d1c4e994ff66e121a772efbfca703a173869,True,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,c316d481236e8dc3822ee94406efa8b753fed0f013c84214182f5ef3063a0bfe,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,f33929587088b3d9d58802ebcf644195032d49f6b17fbdfc89ac7150bc2dad2f,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,ee3d88b3ec1e66596f8b9f18bbf9a9fa82156d080f6008fb0898ea297e01d9ae,Merge_failed,7d0212b92a09316307a028bf950ed219ac1817cf81a631c1a4d6f56b5860e70c,Merge_failed,a31c24a84120f32a4f712a508b6ebb0fcdc2e5f2b7171c216b03c35a3e1dfb55,Merge_failed,e96451e8b8a42607b8f7aa01a18ccc1394b3fc0d4b8b8f7a125da787c0812e77,Merge_failed,97711e83cc034e74c82517dc38f8ee032de3689a91bef61e0113f0e1498a4f39,Merge_failed,a31c24a84120f32a4f712a508b6ebb0fcdc2e5f2b7171c216b03c35a3e1dfb55,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,f33929587088b3d9d58802ebcf644195032d49f6b17fbdfc89ac7150bc2dad2f,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,ee3d88b3ec1e66596f8b9f18bbf9a9fa82156d080f6008fb0898ea297e01d9ae,Merge_failed,39705151b9461d4728735d68f513481848ccffe696f6566fe2a1cda5fad7cf78,Merge_failed,e96451e8b8a42607b8f7aa01a18ccc1394b3fc0d4b8b8f7a125da787c0812e77,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,c316d481236e8dc3822ee94406efa8b753fed0f013c84214182f5ef3063a0bfe,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485 36,refs/remotes/origin/2.10.0,d6c9e148840f85d4426ea278fdb832236d757ec9,18b1aed89b2f7db8e71800ca9e318f3a8b4cadd7,4bb93f834fcffe97dfb7b37f46d8856d5a5a338b,,True,True,True,13,16,739.0,2,True,13,Tests_passed,90a69f1652ef0d6f1669de1ba01690e78c14b2c4f7206a80f06c60d996943e7b,True,Tests_passed,99a0fc9df1d97c22040b6592f6b537aef7fe68dd6c89f19e41118e44a18d70a7,True,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,5b8686e3b97eb361549c68397564d05f09995298bc1f6d8e3dfb7c34b7af1a07,Merge_failed,d22750124e0efde57150cae3333ebd441d75fef239ceea121ab11accf0c9c67e,Tests_passed,4b8aab54c75130e26a1919221088164506600ab111ef6b0fc1abceed227fdbb2,Merge_failed,059ab78d51dcb1dd68846d6f8d4086ffa0c4fac8790e1de7aeb8f1a00e203675,Merge_failed,d22750124e0efde57150cae3333ebd441d75fef239ceea121ab11accf0c9c67e,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,51f6bc5460a09a349c5436145e56b5bb328beb7a1603adbb70f792951f6dff20,Tests_passed,4b8aab54c75130e26a1919221088164506600ab111ef6b0fc1abceed227fdbb2,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43 diff --git a/results/combined/merges_tested/sijpesteijn/mafia-maven-plugin.csv b/results/combined/merges_tested/sijpesteijn/mafia-maven-plugin.csv index 1e00b7aab5..c3e8fbf63e 100644 --- a/results/combined/merges_tested/sijpesteijn/mafia-maven-plugin.csv +++ b/results/combined/merges_tested/sijpesteijn/mafia-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,397e23f5f00948ceb35a9ab4cccdd34ff9543f01,911a3f7b5dd59a6aa1461b862ea42f5bcdb232d3,007abfe5eea0e36631d43093a83e58506b181921,,True,True,True,28,65,1145,5,True,28,Tests_passed,a7236748e684460349469fb9eeb09ea553e940206890ddfa0632bc0d54fd75b1,True,Tests_passed,3b4095e53f2aba162d6420ca26749f10c40d1f7827f2adfb0841b384db6d4c1b,True,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,f69abb0af99933d9aff2cee99e1cc9605114cbf750710b3645a5c220f9c2bf63,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,f9a38a6e7121bc9be8023d1fc0ecc68f1deb15c17afd902a23e3ddff6fcb1349,Merge_failed,ee6be996eb565776150070f34ad39e9339c33a0d00a8ea6466d828aba19f9559,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,a471aa366d65d49fc01ad6d1dd98de2cbfbcdeae08624334905804020a78d79f,Merge_failed,a9c45a54ec77b814175c47a1ecbd51e0b2d9b21733ec84c78ad5ca750710d7da,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3 diff --git a/results/combined/merges_tested/silverpop/engage-api-client.csv b/results/combined/merges_tested/silverpop/engage-api-client.csv index 0fa2a7db82..ba6fadf286 100644 --- a/results/combined/merges_tested/silverpop/engage-api-client.csv +++ b/results/combined/merges_tested/silverpop/engage-api-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,0c3e3e535b5514a92bd19280f2ce4bcde989ad23,c534abe100affbf873e577db76543f6a44c02a8a,1c532fc7d21e4a4a5ce3fb120ba7114626a02739,,True,True,True,42,113,1102,2,True,42,Tests_passed,10b3da864cdc0fcf0ceccbad7aa306cda1dc4e9c1608c52157660f71927f5377,True,Tests_passed,5a66e59d1d9995a540ff79fdddd6a68ce9906e2df384a829e4583a4994fac446,True,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b diff --git a/results/combined/merges_tested/simasch/qlrm.csv b/results/combined/merges_tested/simasch/qlrm.csv index 4e0c6b9a77..569d61ce82 100644 --- a/results/combined/merges_tested/simasch/qlrm.csv +++ b/results/combined/merges_tested/simasch/qlrm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/develop,e03f1617f3978b3a1906f96e92317514eef243ff,1d2aa4ed9d6c383f7b0e9c6ca0c6a286c553b4e4,14a5cd7ede23d4a472bf95090457ad367252378f,,True,True,True,11,79,866,3,True,11,Tests_passed,bc57a5c7fd3664d95670d140d7fa248621474729b14d763d1976e8541001731d,True,Tests_passed,2a85a98cbe62197750309e38b2c9a99ee0aa18034899e05835c0d0f31fd91eb1,True,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,d730020cb1f6084ef5dd870f73e66230ddb0aeef7ca27a97afda387c0aa75796,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Tests_failed,62606285ea34c262c9739ff9674da19e8ef5e22fa988a487cfd4e1084cc5fdb9,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,5c28ce7d89bd392f544c8bfb7006ea26b00ca3482e56abc3d54c7d68f2b3a5a3,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e diff --git a/results/combined/merges_tested/simmetrics/simmetrics.csv b/results/combined/merges_tested/simmetrics/simmetrics.csv index 5477f7206a..3413aa8fbc 100644 --- a/results/combined/merges_tested/simmetrics/simmetrics.csv +++ b/results/combined/merges_tested/simmetrics/simmetrics.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cdabedae8e4518093e994e091aaa8664172d72e0,8f4e8b3cd613438ff791f101718af89cebe473cd,1bb0d24c9a2b5fd2f3ed838fe385d2112469210a,,True,True,True,22,94,267,2,True,22,Tests_passed,00ed6f3f31fe1ba4f6e367c561acaa7ebb11303645ea9ce9393270c206b7a49d,True,Tests_passed,7738b0e29c953b69755bc334bf29547709fb9e01885fa9761aee0981e12e5c85,True,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,9a84f438682cab901aeb752b4efbe80570381c4d42e7a3a00e927fa08642ef5e,Merge_failed,4e174464c194ab31e3e1b9271e88a8d5d4b00a545a54302b781de9107dc392bb,Merge_failed,309b3c05e7ffb87bd55c84ddb8fb686df434fdbc1521f3d76d3f0c348e45bb07,Tests_passed,b673af49dfcb6f882f4c469a803cdb4f3f3087382ad2ce8e2f980752099bc784,Merge_failed,4e174464c194ab31e3e1b9271e88a8d5d4b00a545a54302b781de9107dc392bb,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,e5c4d4346022720e769987063567967e1acc28aff9f95edee172bb5ae7e95bf5,Merge_failed,309b3c05e7ffb87bd55c84ddb8fb686df434fdbc1521f3d76d3f0c348e45bb07,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c 5,refs/heads/master,26ac3158598828d1bbacf766272aa32bf4a1d370,b270ab278669cfe794899a550518de9ebb0863ba,53f9bf59fd1bd05606e52f2155e2cde1052a5931,,True,True,True,83,360,5580,148,True,166,Tests_passed,e4c9482f6ea91a6495121a97334763f520ddd851403d84ebd8fdece46047e54e,True,Tests_passed,07c3e4d3b44e0b98327e037e2c4dd02506bc2596b28653f3535941e5e997429a,True,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,49ed1802ee2c4bf6d97c5d37651693aacf86ba6b1f5046816f7409c86e73a9d4,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,1ee407ddabb70d6701681329145cc46278633954680068e207f4b8f770501a44,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,aa0d78f8c39bfc8c63d3f0595f0ebca2642a047f0f6c4d6c36e3723d59191c9b,Merge_failed,bfe287600887dbf4d608c9f193235430cdf8b3a5038978614de0e92cdd79f573,Merge_failed,05880e4c8a7233f3a42c40fb0ca35ff85fdc1579c571fe750f87d095c93f3dab,Merge_failed,3ae153c8a6d9632e631646e048f044ec4855917169681bf886a63a2a8eb50d01,Merge_failed,bfe287600887dbf4d608c9f193235430cdf8b3a5038978614de0e92cdd79f573,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,1ee407ddabb70d6701681329145cc46278633954680068e207f4b8f770501a44,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,7d6533caccb44e77c7972827b6a6a2e417dfc5238f45da9ade5c1848e4cb7451,Merge_failed,c16a7a44a18654c2e1a11a1ac58ed42d6d00aca4510e0efe846b78e8df59805a,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,49ed1802ee2c4bf6d97c5d37651693aacf86ba6b1f5046816f7409c86e73a9d4,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381 6,refs/heads/master,b270ab278669cfe794899a550518de9ebb0863ba,6403e182314163ef1a1840d42a666e5b5da8eedf,0a195751b2bdbb29248aea5081ddceb87cbc61b3,,True,True,True,148,235,537,7,True,148,Tests_passed,1439d8f733bcaecd84b492a6acb0f974872c4fcba50ec1431688ec8ec7c0bffe,True,Tests_passed,9772d303dda432e9ac93d353ec677f9604ac1b8d85a62c0eeeb4c0136b4dbcda,True,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,d1aff45bc0aa260c830e2316c9cdd21883cfbaac444aaf42d9f0ff3c444c722a,Tests_passed,80c34d0a1c8a64defb7b6658d4445ea04fe709ec56fed7b9cc95bb9767b2433c,Merge_failed,f3221291586f2522c6c6ab19fb6aaec7a1cce4ee7db4610db3a1fd63730382b6,Tests_failed,d97e74a621cbc851a3843aeb2dcb116b142a0a1b4199db3c3a756e68bf240e7d,Tests_passed,80c34d0a1c8a64defb7b6658d4445ea04fe709ec56fed7b9cc95bb9767b2433c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,f75809441bf35919b6805707baf22c7ffc2329fb84f1a8e51274dc08f1461d0e,Merge_failed,f3221291586f2522c6c6ab19fb6aaec7a1cce4ee7db4610db3a1fd63730382b6,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c diff --git a/results/combined/merges_tested/simpligility/android-ndk-maven-plugin.csv b/results/combined/merges_tested/simpligility/android-ndk-maven-plugin.csv index 66ccf547e7..352646ac35 100644 --- a/results/combined/merges_tested/simpligility/android-ndk-maven-plugin.csv +++ b/results/combined/merges_tested/simpligility/android-ndk-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,0432151e0e8138a983c601b2819b1545c8ff0385,c1740da3713bd8140e942082ba1b2c3a25da7fc3,f4c21f525979eb3b3741d55e9d9efd794ee8c642,,True,True,Tests_passed,89faae25697a9ab681135ac573afa485389fe5b2b721e64ba8fd7c90cae6d45d,True,15,40,690,2,True,Tests_passed,8973991a3ca3a68d049175fd377f64fe5af2488773f4666f4833fd8b12ef198f,True,15,True,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_failed,569cc7c62abe9d97e2c4e83f2f2acdf0946882546c95be491178c7c72ac932ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff diff --git a/results/combined/merges_tested/skyscreamer/jsonassert.csv b/results/combined/merges_tested/skyscreamer/jsonassert.csv index cbec65df9c..836c2b6399 100644 --- a/results/combined/merges_tested/skyscreamer/jsonassert.csv +++ b/results/combined/merges_tested/skyscreamer/jsonassert.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8af86e361dc13ad476fb1dd6900f24018e774ae5,f88b66943a37709c02193bd39541a17458347a8b,b4307f967459ff5369f607c40960ca43ddeeded8,,True,True,True,13,97,1142,2,True,13,Tests_passed,4b7003eaccffebb8a1a2cdd4715fa9418ca0727ffe556cf2286a02f2b536f362,True,Tests_passed,bfbddbee92caebbd10b0b5be3fb61e32a8fea256d487e355a3af2b7981f6dbbb,True,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,4b188af25420fbe69b3deba975519c1dfbc02deacf2f3a6d961c1df25dd4f59f,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,4b188af25420fbe69b3deba975519c1dfbc02deacf2f3a6d961c1df25dd4f59f,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92 13,refs/heads/master,2c6ec3c693d465934a99fe0c3d99218965ff74f4,9abc2bb5b97e2d075aa3f8c5f6e823f45ae8f2ef,054919c5723680b2821cc2219cc3b9fb72151b5e,,True,True,True,4,16,45,2,True,4,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,True,Tests_passed,e124194a166f50f012b045ce08509dd5f9e7e8b3ca9582d3a36f48f23f6088f0,True,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec 29,refs/heads/master,8b2593cd7449b1496c9ff3844db6f0592a049052,6d531e1a295dc54f6a24df8b8e740f3389b2ba8f,99b9a783c6f817d02a39c5175c119bf161ea8b18,,True,True,True,13,89,1148,3,True,13,Tests_passed,bf0255954c7ce04fcd0791a6ec30f3f730ca6df2b38123429aeb4eb976bb0367,True,Tests_passed,658193ace0f111718a0bf0ccd8d215c35b7f1a01c65138aa7224bf6f425f9837,True,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,3132132c8e5bee604d8b6cecab1eaf8ce84794e9187ab83a9fe8a721b5bdb2d5,Merge_failed,379b4c63c320671fe08d932cefb034be28ecc31f4184c972e113717b2391e38c,Tests_passed,e9157cd4b25545f885d74382d13976c978131eef8902160e5e2619d79c2606dc,Merge_failed,cd21a2f2c6b142d6a53316d90ab15e3a4c9cf01c20d83a0ef08358362a3a9a3f,Merge_failed,379b4c63c320671fe08d932cefb034be28ecc31f4184c972e113717b2391e38c,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,5f584c5957c8e7fdc63d753262850984c7a27ca07f75ec2dab50d20a10329b6f,Tests_passed,e9157cd4b25545f885d74382d13976c978131eef8902160e5e2619d79c2606dc,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7 diff --git a/results/combined/merges_tested/skyscreamer/nevado.csv b/results/combined/merges_tested/skyscreamer/nevado.csv index 8453e79aa3..eba77dc06d 100644 --- a/results/combined/merges_tested/skyscreamer/nevado.csv +++ b/results/combined/merges_tested/skyscreamer/nevado.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cdc23cde46c079ff30c9c1ca4758e54fed153620,1c2c2c37de204026e89eda86fb29a72a4c37883c,af182b41de95f020834932282f190a6200df419d,,True,True,Tests_passed,6c35c9628cf2e72824b5c98402f93df75e854c3fdaddb3b0825b5ca2ddf00208,True,11,23,120,2,True,Tests_passed,f4de6f489aa4227434f3089dbd9d85e2fd92989ae45931a0c7b9e6f5cd03e1d8,True,11,True,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,8b7d2a87c71ab3f7453b6c3b7d8f6387cc70b0e12fe6334823c6f67c8f538e3e,Merge_failed,7b50d27f910da9c5a05c2752ba6081a4e3f2c2ec6fde1b086c40ad1743f86b3b,Tests_failed,28277aab23c84ed4be5510d20e4119af7f8b7c209cebbfbfa4479a37f45bf95c,Tests_failed,37b87c4e65f5026997d00ba615eb71fb15d996a31278435da9314fc982519f19,Merge_failed,7b50d27f910da9c5a05c2752ba6081a4e3f2c2ec6fde1b086c40ad1743f86b3b,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,292274f20ba0c65a43d4d20a8cf180458fa10a76c002b2afb35d4053da1cbd7a,Tests_failed,28277aab23c84ed4be5510d20e4119af7f8b7c209cebbfbfa4479a37f45bf95c,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de 47,refs/remotes/origin/pull/112,cf100f0487d532b8ba2b16e2cbaecfcbce149f46,2f08cfbb74a3e4dd089d0bff9ba74f791718ab62,e56a0d771e3e40b14cfff69c49d9c87cd6ce720f,,True,True,Tests_passed,f0295fca35e28d616df73be758d533453fc4dec81413bbbf915520dde2913de7,True,11,26,141,3,True,Tests_passed,709040c3aea1ec645d19220eb6437517b54914585cb7ff657f8f5d60a368cc98,True,11,True,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,12add52f71003afcc0b9e94cc16fd34467826ca838e4c9eb805ae92ec51ea96b,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Tests_failed,e551ab3a517c7aa55f7e1c8a395469d9824325b52d3523447d18e3c11abac1a1,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,99e715e779e1a10daa907fe6191e4aed0c78a8cf496a43892aaa77d081b5c13b,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c diff --git a/results/combined/merges_tested/skyscreamer/yoga.csv b/results/combined/merges_tested/skyscreamer/yoga.csv index c9b7657d47..179f2e5cc3 100644 --- a/results/combined/merges_tested/skyscreamer/yoga.csv +++ b/results/combined/merges_tested/skyscreamer/yoga.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/master,1f22844c51753edd813e117213a7e336d917d262,cfdd480dd2b83b4ac26b1d1e5299939ae961dd02,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,True,71,311,1977,8,True,71,Tests_passed,f98b9b65692bd9500811a1a4cf0c74804498fd15039f75a4a8f4a9062aa3dbe3,True,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,True,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,ef27fc35ba7014340b6554ef0e99be793788558fc396657f0e31e0af1642d9e3,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,e97de2bb89b055588b0b7ec5b0b86f010ae7c750be970f20e12c8925722b754f,Merge_failed,2677e044961ab951d915db26abc586274a53533cd969455ff646fabd1215f9b6,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,d7466d03e37c2f38d33970942edf65d7d379dc532afd60c5ee2931f063c0e3a1,Merge_failed,ba570deebe5d0adaf19eb84f04b60272b6f4ae00b91f0214042381af7ac1767f,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57 28,refs/heads/master,a2314b3372b8426599ac46223a72706ea6974384,4feb70091c215bc6ccaaeb6e3f58537fa48e9263,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,True,70,314,1587,7,True,70,Tests_passed,df9eae2b745e25d6defff9dd4948ad3204158688c49284c18c1bad3ddb42056c,True,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,True,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,b7034e4484afa275cd70125445ee471e7e0a2805e8eb197b81ddefe3beadd97f,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,b7034e4484afa275cd70125445ee471e7e0a2805e8eb197b81ddefe3beadd97f,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be 68,refs/heads/master,935b0afdc7cb576ca50d3b4e4d02eed29f418d30,62cadd15bbfa249728f8568b4d9039e7b90aafec,6faa4d551bfb748f5ab92c396f0c2b212fc43fa5,,True,True,True,40,96,609,3,True,40,Tests_passed,9936a16c6a9a8badb5a6db16d038fbee39e9122b5c157a049380006cc6eda44e,True,Tests_passed,c3fbc1b247f70445a4386232a93824ed45453a6fc8e02eb6f159cca9f344e8ec,True,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,094095392ad9e44adc1ffe86f0935e78b7aa1448e340fa1b41e8108e3945bd5d,Tests_failed,36b5a0deb75f911a337489b0cadcf584304e208d536723115ef43f3f7c42df14,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,094095392ad9e44adc1ffe86f0935e78b7aa1448e340fa1b41e8108e3945bd5d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0 diff --git a/results/combined/merges_tested/smartrics/restfixture.csv b/results/combined/merges_tested/smartrics/restfixture.csv index 675110f76b..c887db4807 100644 --- a/results/combined/merges_tested/smartrics/restfixture.csv +++ b/results/combined/merges_tested/smartrics/restfixture.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/remotes/origin/pull/38,d8c6704346b6c678edcfb02a11c914f6db985b21,5a7acd31fd8fe2417a14c50f4b27dbc4fd9409c8,bfa6c9c2940e3ace3f2bea11ddb81e33a84d5c25,,True,True,True,7,16,116.0,4,True,7,Tests_passed,c0280a72c4e322859dbf07d9c240670206e9c076673d770ca87a39501161424c,True,Tests_passed,42f3798d7b235524aac0c29c067f427ec48c23d5e73e810a99ff36c1699f344b,True,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,311b66c4af3b13ce0a5bbd2bdd8b50814c44f2b448456f89b0ed857440d1a803,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,b99c1229d50061675eeb87d187d49510e7b6d68ce58649c874b822f3b406a0d8,Merge_failed,24e4214dac4c1773cb6537c6ca260640f8c693ea454a0259d7172dfaf1678be6,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,df75ed661d5a920a32ba18d5144a64590ac470f3a1b983e75d48a16eaebd25ce,Merge_failed,0676a2913b152de6f369a66ffeb4a30655274bd0e683c351d4355281d5c5305e,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c diff --git a/results/combined/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv b/results/combined/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv index 03ee1e3219..261b37cf83 100644 --- a/results/combined/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv +++ b/results/combined/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 71,refs/heads/master,e3a8071836d7e5cf8949174a783d1f0d9525934e,23244c7e820d404fea45d0d7faee587730603333,411e1cb4c61d34b5e6f11e5ab55e9b350b02e248,,True,True,True,40,122,1784,3,True,40,Tests_passed,f864f2b8307072228bd2e7800aad334f799ea82a087fd83be06631af41570b8b,True,Tests_passed,a436be6a4ddf84d6c7294ff5deb0323ec6c09fd4fc0e315afbe164f0ad7a4cf9,True,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff 79,refs/heads/master,1f165550865167adebef205696294cfd60d94993,9ae8ab9ca4381ec6b3007b6f04dfa926b9a23f38,484b20f5737e615abdff6242896af070d2a83524,,True,True,True,656,4145,18827,3,True,656,Tests_passed,4237edacf5c4efe9f0fe2bb816eb531cd45526347a2f29bb13573eb318fe9707,True,Tests_passed,acd140674213412cd93acb5d40bcc7ceb634f8fc690092783a7702e401220360,True,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,fd742648980f1a0d969cd1aef59944001384a8832d599de6dbb06b8101230d83,Tests_passed,33e83acb3015b1c56a8c2178424b8ad92cfc12ca01ba980e3160138f392f8593,Tests_passed,17dda8586295562ed0a4d45fcd5ccff2202a77d573200aef0062c85f9e472fbe,Tests_failed,809b0e2d5e3f5bc40489be7c194b8bf321751456c2f464aea1d7952da0d94156,Tests_passed,33e83acb3015b1c56a8c2178424b8ad92cfc12ca01ba980e3160138f392f8593,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,1965c9cf5755700caf3b0f4ec4d1ac2dd77d112f5f443d2d9f6bebc6aecd33d4,Tests_passed,17dda8586295562ed0a4d45fcd5ccff2202a77d573200aef0062c85f9e472fbe,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23 85,refs/heads/master,1fe3f6971fbd7a61b7785d8d0082d5622241e047,9fad80b636b4158ba14c2fe7c7bada55f7a84376,93082c445ba4ae6b40e6c118e687d925d69bcc02,,True,True,True,29,179,966,2,True,29,Tests_passed,686ebd3b99f11f061b2c756f53f8583279c9277453f8dc9a972f92fd43006b3c,True,Tests_passed,0be9924f0490d8c7d6c160c1fda202f53cca88020b71cbf638752d3750c26719,True,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,fbe4fd6d7e889c5ce898a8366464aca1f2f0dd34a7b9d5b89c6deedfc4e30102,Merge_failed,6c93e21192af63cdbb1c94ad099c42f26802fee96fd8085041ba4c9aff993297,Tests_passed,30f71cd3eea2f18c40bec31c77f414b11a5961f198869fc1febd97ffd7378a3b,Tests_failed,438c27db6a7d91178cf20e86fa025236517899a6234db364fa37192529de68bd,Merge_failed,6c93e21192af63cdbb1c94ad099c42f26802fee96fd8085041ba4c9aff993297,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,0e309be22301a43e67c7967a1e74e66cae29bcc07260649fb4143fb429166e74,Tests_passed,30f71cd3eea2f18c40bec31c77f414b11a5961f198869fc1febd97ffd7378a3b,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752 diff --git a/results/combined/merges_tested/snazy/ohc.csv b/results/combined/merges_tested/snazy/ohc.csv index 9e7e3e723d..2b167fa990 100644 --- a/results/combined/merges_tested/snazy/ohc.csv +++ b/results/combined/merges_tested/snazy/ohc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/develop,cf706bb89ebae023432c2bbd949266bfd68401e8,3e7f87adb7c65086351661cf5376c73e3f20d7c3,4d69670710441527e4a81f19596960986d30f63e,,True,True,Tests_passed,a2a902e5dd16d024e7ebc5166f2b160f12aad1c411be6dafcec88b8a16207552,True,33,162,958,6,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,True,34,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_failed,d76a7d3cf28ca4eee58e94ab59a9ebd7ba0613c7365f94801885758884a43c5a,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d diff --git a/results/combined/merges_tested/sndyuk/logback-more-appenders.csv b/results/combined/merges_tested/sndyuk/logback-more-appenders.csv index efb25bd6d6..3596e08633 100644 --- a/results/combined/merges_tested/sndyuk/logback-more-appenders.csv +++ b/results/combined/merges_tested/sndyuk/logback-more-appenders.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,ae3f6ef3d318598fc3cd1587a59a6358e3ea329d,5101380a368f76bc2fe058486266b44656f99360,e16baa5f46a753149085e2aabbcebef477f88064,,True,True,Tests_passed,154111fe41ba74d57075b5b0da67bc1b014c8d627344a82e5661b3da2221594c,True,4,21,90,3,True,Tests_passed,ead0b4a977837688584fdb15f956559587f7dfdcb693483376211f53455f507a,True,4,True,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17 diff --git a/results/combined/merges_tested/soabase/exhibitor.csv b/results/combined/merges_tested/soabase/exhibitor.csv index aaf6699812..9b6e61da96 100644 --- a/results/combined/merges_tested/soabase/exhibitor.csv +++ b/results/combined/merges_tested/soabase/exhibitor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,True,51,143,1676,6,True,51,Tests_passed,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,True,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,True,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,161aa20d88da027986c097f66b280b1c7df17e069b05cf196d09f691440a127a,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Tests_failed,53d2b1b10d7a2944a83064f5ddbc2000660ad2ac638790554f74ddcec760781c,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,dcbf706b555adacfb9d5c55afd9030432234c66dd0e939e1ae2de58d7ae07bc1,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6 diff --git a/results/combined/merges_tested/socialsensor/graphdb-benchmarks.csv b/results/combined/merges_tested/socialsensor/graphdb-benchmarks.csv index e41fc8c544..bdbdcdb5e7 100644 --- a/results/combined/merges_tested/socialsensor/graphdb-benchmarks.csv +++ b/results/combined/merges_tested/socialsensor/graphdb-benchmarks.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,87e995db5654b3325daa07c4181e8e358faaa887,93a1be1010118acc6c154755359f84b2eaa1eac1,6691219b7fbe7d54102ca0641348f6a1db78f7d1,,True,False,True,7,14,51,3,True,7,Tests_passed,097c95d3f82066d5e9650bb2b488f52475fe89603d27468b522631dd75e8278b,True,Tests_passed,a5ee3685ac75680f07ee698e1b883ee8798e30a9c879731073979fa195dc147a,True,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874 diff --git a/results/combined/merges_tested/sockeqwe/annotatedadapter.csv b/results/combined/merges_tested/sockeqwe/annotatedadapter.csv index 3ecb575a3d..6477b3521d 100644 --- a/results/combined/merges_tested/sockeqwe/annotatedadapter.csv +++ b/results/combined/merges_tested/sockeqwe/annotatedadapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,62c7d43b5adeee8c47a42f4ab48ff106a6444b7c,32dc59ab83720ed5891a8701647211050f298e5c,ae79611e8f48cf8be3b0168e56c457d9bef2cad5,,True,True,True,4,10,44,19,True,19,Tests_passed,ddaf68a6e7bfce4270454ffee8333a997cefa1115c72af36be631a80267b60fe,True,Tests_passed,38cf0f39aa1a0ce50a77d650636f7d5784473604919a97c116fcee9e556382de,True,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,05a5f1a4e82cc3ece27e0fffcddadc5f4b9d5cb936f62139709a54de8e625dc1,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,7a67939a410ed774b4a073244d26a241a84b2883513b604f3e02dc2b1d48220a,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,1baf33f091684ee949c85870b4de42ff7417fb7e921f09d365e3326c850a6b57,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e diff --git a/results/combined/merges_tested/sockeqwe/fragmentargs.csv b/results/combined/merges_tested/sockeqwe/fragmentargs.csv index 971815ff01..779bc41075 100644 --- a/results/combined/merges_tested/sockeqwe/fragmentargs.csv +++ b/results/combined/merges_tested/sockeqwe/fragmentargs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6e9506af9dd9fc0662d32080a9a5365ed7bffa0a,ba404aa9b8d30efd64ac6c6f281ef44a7c5958e5,64a24cd37a6707fb7dc88da55ffbee72d696a20c,,True,True,Tests_passed,56a4283b9c9abceeea3f0f2a52461d7fddda1fe780466a9b8b1042e7ca518802,True,6,10,41,2,True,Tests_passed,9d18930b60a1cc89aa0e0089242978e2751f707bbc392f421641c679d4f6425a,True,6,True,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20 diff --git a/results/combined/merges_tested/socketio4netty/socketio4j.csv b/results/combined/merges_tested/socketio4netty/socketio4j.csv index 681511ba83..2afcfd565a 100644 --- a/results/combined/merges_tested/socketio4netty/socketio4j.csv +++ b/results/combined/merges_tested/socketio4netty/socketio4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,6f75c7857711bda80083e0cebb0e3bd0aeca0fe0,ea46d3ebb741215b74195e2a386fb17454fc3bf9,ae617f16da15273b5014e1ee68a87c84965c1fd7,,True,True,True,10,30,294,2,True,10,Tests_passed,565df6cc25fd8dc1f5038ba090e67fc33ce94226cc58ab178bcfc2b40289cb82,True,Tests_passed,3a430ca49746b711d89f4488dfb728d8132d02a971fbaf8dbd26b3c619ee48b1,True,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,981786c0fbac21cf3076d21fb9f4b0e62c8cea42c116438187e65d856e38d5c0,Tests_failed,3e65088d8bd3d94d25ce74d89eb830ae0be5deca5d54986a7e59bf8068b47c5d,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,981786c0fbac21cf3076d21fb9f4b0e62c8cea42c116438187e65d856e38d5c0,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34 36,refs/heads/master,813f83b673ac76d5e779d19f146833e1646e09cf,84a94c3b791dbd85b99a40a88a75343fe831573e,f49db6acf7af63f796342cd2e201c119b4f327db,,True,True,True,23,73,440,2,True,23,Tests_passed,4484a3aa7796e1e5727ca87c88ee09918915f20bac17188b87a28028c0ecffef,True,Tests_passed,a1bbeeb072df1c84de322caf57d0c13456d868d1ea0443836b24f86819135767,True,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5 diff --git a/results/combined/merges_tested/sofastack/sofa-bolt.csv b/results/combined/merges_tested/sofastack/sofa-bolt.csv index b84b789a8f..14126548f9 100644 --- a/results/combined/merges_tested/sofastack/sofa-bolt.csv +++ b/results/combined/merges_tested/sofastack/sofa-bolt.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 86,refs/remotes/origin/pull/34,4834878705dfe112f23c859c50765ebe63ef39b5,fdc8b2928fe877158374046e0a25bc474f6895d9,c61f99695292e73ea481e40214f1b331238aa05d,,True,True,Tests_passed,f20baf5049b0dbff17f935467d31abf1e118c8390cd48a2d840f61c34a5a5b58,True,3,3,8.0,4,True,Tests_passed,e81e1e18e73c3dfa3d96abe229c8657c30090eb31f2ab90c6caa1809f39f47f2,True,4,True,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,7964b35d5ba5d03da17f73535fbcf0f2a91c3faf05f0fbd3cbec7254e53bb9d9,Merge_failed,ca52ddf85fd4ada1ef828a84ea46ab0c61486fb5ce259a60578be6e2dcd5fe11,Tests_passed,8e807a0dc5a589ba1909209402ca971c4c03e9cd3ed630600a90f6fea9afe931,Merge_failed,6286ae6bb6cd84e8cd1c2b9820246296689262f4a4215c575c1f21f1b8fa0399,Merge_failed,ca52ddf85fd4ada1ef828a84ea46ab0c61486fb5ce259a60578be6e2dcd5fe11,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,6c003ee76d30684126bb9188885f8ef352607aac7421e1d428bc499f8fd5564d,Tests_passed,8e807a0dc5a589ba1909209402ca971c4c03e9cd3ed630600a90f6fea9afe931,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35 88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,True,True,Tests_passed,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,True,216,252,659.0,10,True,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,True,216,True,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,c2e7d5a62eb388104c2fdf4c856623633d6b52a565b6a05b7ffb75b5c5b2fc70,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,459e9acb88ec5b327042473340d2dc8f403fd85560cdefdfe8256d8be99c643d,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241 diff --git a/results/combined/merges_tested/softinstigate/restheart.csv b/results/combined/merges_tested/softinstigate/restheart.csv index 7959d7afcc..98caaf3830 100644 --- a/results/combined/merges_tested/softinstigate/restheart.csv +++ b/results/combined/merges_tested/softinstigate/restheart.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,98dda32101d0e98366363d2f331662406af522b9,644eeabfd15b4195a051479fb711ddf368fa931d,07e9d6fb52186f08143b3ba973589d565498c48a,,True,True,True,68,185,4055,3,True,68,Tests_passed,eb325029575118e6ca4e1bc3a020b9a672f7ccbf025835029e0f660401154f34,True,Tests_passed,385350c8fcd98e4472faa0ef087b64c901729ba536ac5e64a66cbbf85cb03023,True,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,bc95f65d3649f8773144abc7cffd0b4c3c7aac6ab5e38105a3662b1e967ea4ff,Merge_failed,43d1c188d66dd3906ac6c458528f5abb7e882c0ab0ecb7de47e501e72b32130b,Merge_failed,8e9c074cb09e62ed88d026687128bf1a61564d0f4b5a1bb5b4f0b07afc71db68,Merge_failed,1796caa3f6f5820470f33e9fc31336ae9439c144153fc6629fdc0d01ea4a8fb7,Merge_failed,43d1c188d66dd3906ac6c458528f5abb7e882c0ab0ecb7de47e501e72b32130b,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,534078e7ceb9e8d36705e875cfab6793d1c44728a9d26adec02927494c2fb1d9,Merge_failed,fc38193ef835617c27f4ee965c90adf117468a0de5bb8a99f7d0127c3c72f399,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11 8,refs/heads/master,dc5b8e51b4c329b3eea3e8be98ee8edc496b4114,653ad64f19264fa1e76ce8d53473e94ffe0d0276,c49e8331213f9fb0c5212d68ee05506579f13d45,,True,True,True,52,98,374,3,True,52,Tests_passed,25c81cba04d202ea23ae8ddda29763f77d8bbc3f09acdfb768ea7822b35e5e55,True,Tests_passed,e7c0834a93fcc52ffa3a7250270a4b91a37284b8a29ee887ac8ef9c2ea031f0a,True,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,4d235746b4502facdd5667f0b32eee69fb2e3797c3aeb2f8aa6a686baaac5f89,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,4d235746b4502facdd5667f0b32eee69fb2e3797c3aeb2f8aa6a686baaac5f89,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197 9,refs/heads/master,b196d4fc15bb19a3a3c21b8a39559ad4405acca3,2126eb7d3410965e98c32c4e9264b27b51b90d06,95ed7534c2ce685ec19b36bbfbbb8a33c338707c,,True,True,True,149,1667,12132,2,True,149,Tests_passed,467b46772f57e82830506c3feb95e7f9e7453f806302260a31626ff299c8bdce,True,Tests_passed,8f20711e1e78ee8905efa9398433282d608a284dea1893bb5e754c60fc8ab3ce,True,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,e5345769a48efd465ea72d458e9dc9d3f525f63523e9b8a1825de0a214c57276,Merge_failed,48ee960175759de873cfc5245e5fb21296cb5b245044ec549ea74fcfb4e38c7e,Tests_failed,535b8d74132909773b52758c01ea7556f23bcbb2141e0d62d14907c47432a65b,Merge_failed,b1a4bdd892e2223ea37cf235f22af09119fe27028faaf7a549a7c785564eb72e,Merge_failed,48ee960175759de873cfc5245e5fb21296cb5b245044ec549ea74fcfb4e38c7e,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,74cbeda19e246f83366c2e3ab9e897df72afa0574902d54b2c8b683fb6b8c4fa,Tests_failed,535b8d74132909773b52758c01ea7556f23bcbb2141e0d62d14907c47432a65b,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c diff --git a/results/combined/merges_tested/solita/functional-utils.csv b/results/combined/merges_tested/solita/functional-utils.csv index 886dc88d1b..0cb37f9bf8 100644 --- a/results/combined/merges_tested/solita/functional-utils.csv +++ b/results/combined/merges_tested/solita/functional-utils.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,a64f974e8d33134ba7f1b5e2450dfcdf9e764731,0690e9cfb6695662bfa7971480c5787864adb3cf,c9832d266ab93c8270c0a775404cd92b8cf73e18,,True,True,True,46,273,1424.0,2,True,46,Tests_passed,fac7f7c2141bfb63e58ce4f40f70e6525014f603c7ee68ce29aa925661097cfb,True,Tests_passed,13e2792f96dbadec538ca821da28f9f954ee1993bdbfb6e08d2eee7229d68edf,True,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_failed,927db1cea10b9d041045382cff0272f56ac745b9c2656bb14160ea4fe78d02b4,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d 7,refs/heads/master,40cf23013dba22c6fb9af523f59036fff29f9e00,3c3a83bac008d48926302e6a58c3eb0fa381bde2,e7d8ccf77f4c675332131ab70c0ce1b4f9b0f326,,True,True,True,8,13,236.0,2,True,8,Tests_passed,ff6d1af3e838cc2f09f49888b89873f64812811b72cf62944a1b62b0d5354392,True,Tests_passed,1b5db2e66a4e7c95737c560e310e6ae1295819abe2646cedb7dc705e55646d93,True,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,c786cb813daa2b652c6e4de111852e5d9df0ba13373d8846b446efbcd98d2c4c,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,c786cb813daa2b652c6e4de111852e5d9df0ba13373d8846b446efbcd98d2c4c,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172 9,refs/heads/master,396886272a60f4a5ad21a5277071f7bc9c3247b1,2d4530ed4fa4f1cf86235595759720d5d622cae2,80a2b66a68c0b2db255627804c09df2b6b2dc22b,,True,True,True,24,71,705.0,2,True,24,Tests_passed,8a454a568877358759ef2518cb37ec43f98201237d361d1c3f8a6b8cad7d3ebe,True,Tests_passed,b514b73a6975a3555888f4aa0d75b7dfa756977661338170db254a526d6efbde,True,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,f6a5060eb290bd3bf8c2e74f490d3246143e39cc5911b9a80d60b18455ef37c2,Merge_failed,743b63f3ea9b3b96d723ef54ab9e77b21641fefee7799bd4a29a6eb60e0dc31d,Tests_passed,91363f2ebd82099e1b825fd0a896d9f6794f805a4506ddf1298d9a157e22ea7e,Tests_failed,57d2d9b2ca4ad45a1f84b3c6c5925aad868709a4050dc5190e7642992af39413,Merge_failed,743b63f3ea9b3b96d723ef54ab9e77b21641fefee7799bd4a29a6eb60e0dc31d,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,78876444fa4cfe77b618e12dfd3c1c1f6b1b9d12308a2a03d562dc550838b525,Tests_passed,91363f2ebd82099e1b825fd0a896d9f6794f805a4506ddf1298d9a157e22ea7e,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6 diff --git a/results/combined/merges_tested/solovyevk/htm-cla-visualizer.csv b/results/combined/merges_tested/solovyevk/htm-cla-visualizer.csv index 2a85d672b1..d28c173ecd 100644 --- a/results/combined/merges_tested/solovyevk/htm-cla-visualizer.csv +++ b/results/combined/merges_tested/solovyevk/htm-cla-visualizer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,94286559181db4d3b19d0d0d814a28efe3e1d783,f7894cf76d0b1aa1f1066187a6b2213b3630e338,ae607d6bcb18f27ddfa008da90d4de8aae5c57da,,True,True,True,18,47,513,2,True,18,Tests_passed,68372ceb2273588a76f20363acefb67058292d041bab067a32be34a01cc47197,True,Tests_passed,a068a97a3867cd212869da1291a42fe75e14bc6ab07c450f558ac3baa9c7fabc,True,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de diff --git a/results/combined/merges_tested/sonarcommunity/sonar-build-breaker.csv b/results/combined/merges_tested/sonarcommunity/sonar-build-breaker.csv index 2d4281f19b..07e8d668ab 100644 --- a/results/combined/merges_tested/sonarcommunity/sonar-build-breaker.csv +++ b/results/combined/merges_tested/sonarcommunity/sonar-build-breaker.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,0a474ef6d91248a199a65c9ca24556e598116fd1,937870ed1c0f1c0f785b318bbd66d91e2080e043,6654db7b83ce2e7900c99d2540bdcca57a9fd3b7,,True,True,True,7,13,817,2,True,7,Tests_passed,25357fd119adf4c68630353ed196eb309a8c4d6aa66b280a1eb22591ed7de169,True,Tests_passed,c4ba271d24bd7adbf3b7ab6130671ac90c9701f8e93d1483d9f500e5bde36c52,True,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,6bb2141e158e68f022858f9e3e4d90c367561d41f2bc4818f1cd26ab96ec57aa,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_timedout,,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,31c078189bb846184e8dfab1d3846a4282f7ee7c2c8e7799d83090ec13e4461f,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029 diff --git a/results/combined/merges_tested/sonarcommunity/sonar-ldap.csv b/results/combined/merges_tested/sonarcommunity/sonar-ldap.csv index 8d63b0c877..5fc9c20dca 100644 --- a/results/combined/merges_tested/sonarcommunity/sonar-ldap.csv +++ b/results/combined/merges_tested/sonarcommunity/sonar-ldap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/1,245133355f897caada1272aff129ffe56d3ad4a2,6a81bd5a6f17f247f39784815ff5cf3966ef2865,6b7fb9409178b44ab52175ba3b2265554062d089,,True,True,True,31,186,3936,32,True,32,Tests_passed,89ef06aa7e710d9e8ee37ea428148cadb047f8db7b9b1be99338c239e5ff39ed,True,Tests_passed,9b7200002758d949a0b1fe19afc07b4d22e5a8fb3dc7e5eed52b5812075a5492,True,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,e78f0e075844e298179d7ef737648d6a3fb4cbd04da9eb99f17255b7b1da4c92,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Tests_failed,bd26361dc8dbec425b786b6cd75b65cf6afd6f857c70aa25d21e82d94b222b7e,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,59aace462e3f4630515a94363e4466d8a4aceb14dbe290093d23cf6b94bb90ba,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1 7,refs/remotes/origin/pull/9,ab7831b6fffd82a5719fa7300316c4244e366a28,26c25448fafeebab43aaeb50cc8c5ddf5d6b0e2a,9c23ebddae98f5a705e5f44de41f59fe8d8a2f5f,,True,True,True,82,198,5388,7,True,82,Tests_passed,faaa0d2a9c06f953ab6c1b36c27684499aad5c85cb746e06f791bbd700976e4a,True,Tests_passed,3395cad6859a09647739bd4e05ed13971c3a051e1d97fdd332fc4374e6532c49,True,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,307d6c20847d85776adeaa062bcde5a60d6e6a0b94940ece8b8de20a3d9cb05c,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,6a43f18b9d2ed2aa13541a43a5f284b0d5cfba0c7e2b76d2dc9ef145519e49b9,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,5c0ff86db0ac3094e2ab48df27efef55a9a9257bff60a6a71c1804f8fd1aa63b,Merge_failed,ebd1473bf44cd9e49198a83146984e1343e91cf9669bfcf48046316387b36e00,Merge_failed,8c6362d1bf45f8d8eee1606f465be41c7da4a688b1fd2021db085c917fe131c2,Merge_failed,a878dddc34222ec9e539c44350ea73ee6e50511724ac9adf85a901907db4051b,Merge_failed,ebd1473bf44cd9e49198a83146984e1343e91cf9669bfcf48046316387b36e00,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,6a43f18b9d2ed2aa13541a43a5f284b0d5cfba0c7e2b76d2dc9ef145519e49b9,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,8a32a3ef830e95c374838b277e3bfb5b61320a653b6c82831b2855d09d75cf4e,Merge_failed,cd1b4569129e1db06087ddc3bbfa75c4c0337add5c6edb38a0c5be71b9ec138f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,307d6c20847d85776adeaa062bcde5a60d6e6a0b94940ece8b8de20a3d9cb05c,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f 8,refs/remotes/origin/pull/9,f2c7dc67661e8fc7757772065ec3e45481cfe626,f04698e5cc70e8f0b326ad8b3142407b5e6df418,764ac670978e5cb37566a96d2d4795e6d920ecd5,,True,True,True,11,39,288,5,True,11,Tests_passed,6bacc3ed877fb9c0eefccc4fa7a3d86e440e90c3fa85ad95ecbb6ce1f502870d,True,Tests_passed,e4d8d9e55400ecc736518b55f979c37baac43773c0aa45923a96c285fc396d9f,True,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,fb2926d99445263d5998a31454c4d1bea3d85f939bd3982d5fe7200c7ff8d04d,Merge_failed,b304a6f8c995c9fe1de9cc42f03eae02633b0bad98292d78b69f251fcc8b0a06,Merge_failed,c923a802a4efacb6cc1be7a9513be86d0543eb1a9dbb2ccd00e098fcc58d4701,Merge_failed,5fd45b02d79bc8b32dc6574815d0718b961cec6177a1bdc03cd70687dc4ff469,Merge_failed,b304a6f8c995c9fe1de9cc42f03eae02633b0bad98292d78b69f251fcc8b0a06,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,4a2cf82010040e293ea7bf866fa109e2ad967586d05fd5cb7ead57c6df480c69,Merge_failed,113754abee91f334f1d8059e2cd5dee5fdfed14af1bf9a6296c39a67a3541e19,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e diff --git a/results/combined/merges_tested/sonarcommunity/sonar-php.csv b/results/combined/merges_tested/sonarcommunity/sonar-php.csv index d1c775405d..771ff43704 100644 --- a/results/combined/merges_tested/sonarcommunity/sonar-php.csv +++ b/results/combined/merges_tested/sonarcommunity/sonar-php.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,76e939e3841dfc3f0d15b4e61ea893242000a417,e3c63aa81d12b083b637e1c16fcbf82bfa5cc013,0d0dd226a4ddbc20968f0b11a4b591563e63fbd3,,True,True,Tests_passed,8d052552724748e5c1a59027b02274d520c8ad318be27fb392f6cc5b18805ab2,True,265.0,748,4254,3,True,Tests_passed,23e9ecd12497cd9f223996605fbf280c911f4391b69bbf07fd50cd53b8a7256e,True,265,True,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,974a4bade30be5d3884408b9052f7cdd66014cb584a40288a9d97ce10864b4dc,Merge_failed,841ca268c63cb94d738506a9e9c2834df528f36005d293b6afa4fcc0608ad460,Tests_passed,e27acfccb7adfca4801a886ce8f5ab4a5de1f3c632d9191a8ae7d62ac4b48179,Merge_timedout,,Merge_failed,841ca268c63cb94d738506a9e9c2834df528f36005d293b6afa4fcc0608ad460,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,ffc2ff1464e04e43b9b7561f4ac1f470614343eeca986530ca3cc78289f823f8,Tests_passed,e27acfccb7adfca4801a886ce8f5ab4a5de1f3c632d9191a8ae7d62ac4b48179,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c 7,refs/remotes/origin/SONARPHP-1358,ff256d1615e1f9920551f3b66592fc8de1bf5e37,8af44b30460bb53e092d0709345dec8217a5c051,6b95326c8ed571c8e90316bef4f2f1373bfb2295,,True,True,Tests_passed,1108b31d5f38b0ed9e9595bb87c91c6da87ed58a330521aafbdda670d826790a,True,12.0,18,477,3,True,Tests_passed,f59a6416f5213bb4fc7951d0555dace35702e19b1a57011617adfd2b39e9d077,True,12,True,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,103761e96ef7f3c1f83b480bb1d828e6536e473dd6198360c3b95555aa580550,Merge_failed,6e07b3ddd6ef7e810da4dffcd46dfa585c5938433642943cd614bbafc4e23526,Merge_failed,559aeba3d01da96f05e0011408b68ee6cc2ff649fa83aabf16d08af1a899b2c2,Merge_failed,61ffc78258a6065d218511151981c3f6f9d611738d94cfb8db6b47044d9b6e94,Merge_failed,6e07b3ddd6ef7e810da4dffcd46dfa585c5938433642943cd614bbafc4e23526,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,66ebe8d811b15adf378dbd1dc81811aedba67950608bfb8688b6deb441cb6351,Merge_failed,a1d75dc77737a63c10b1a8e1cd44d6649d4d8c77bd1cb4b6b28778f1fe0bbf8a,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899 12,refs/remotes/origin/pull/1097,3fe8547d35d0746be5678d9dbc0abb839cb52b5b,00b56c0b20bf01d498343709267afbca737fb1b3,867a3015d9e12e1ecd565d4a22aef77271eda652,,True,True,Tests_passed,472655e51f482840f99aef10e48265c7a8235fd22b6fb35244693b17a041a115,True,844.0,70251,186467,2,True,Tests_passed,d42f7cf0ee2af4822aee739e2f50b74a63fef4a65a0c41bce09b2b09aab0ae21,True,844,True,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,9dbac954f933c0f42575b53087eac620c8c02e56e2468db4ebd8787ad26f25e1,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,9dbac954f933c0f42575b53087eac620c8c02e56e2468db4ebd8787ad26f25e1,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc diff --git a/results/combined/merges_tested/sonarcommunity/sonar-pmd.csv b/results/combined/merges_tested/sonarcommunity/sonar-pmd.csv index b51897ce3b..01855049bf 100644 --- a/results/combined/merges_tested/sonarcommunity/sonar-pmd.csv +++ b/results/combined/merges_tested/sonarcommunity/sonar-pmd.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,2301c0627b5ab5276acb103f933e68d2ab6ca3be,5effaff6010a887d22f3dfa1513dea659c7969ef,fa5241298cb79608748b371e11710daedbb5180b,,True,True,True,10,27,78,13,True,20,Tests_passed,a2e7d5536e4edd0058de29d50908e7abe9465e214e24f080de0458783676c19b,True,Tests_passed,90c8618c14ec0db17474d96e4757dfa215202d5f14bf11cbddee27dbd6300c99,True,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,254a5210401309d05b245002c5f232798cb8f5086f0518df41b350cb0f0ebd04,Merge_failed,aecad6f4b5f1b852c8eaf7488b2ee1033e38759852bb44ad4f09bd451e66e17b,Merge_failed,8975dc28dca166e0ec6044e7be1191f1f2723be2f1d7aa8c04b32e51fd2920df,Merge_failed,c0ee2be68ae461eed8aed3ba221857f4be2c4d26c952462da52b1649aaf345fd,Merge_failed,aecad6f4b5f1b852c8eaf7488b2ee1033e38759852bb44ad4f09bd451e66e17b,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,ea1a82ae5c6b43f677807e38c5d39d25544e393c41d1896b99badca58a4d7000,Merge_failed,8975dc28dca166e0ec6044e7be1191f1f2723be2f1d7aa8c04b32e51fd2920df,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c 95,refs/heads/master,933775819973c32cc8a831ea756e9a6c7a10f113,0a066a0b69aba7799612a24ce4647dedddc07c2d,b118e67f15d4f913fcd4e4952ad31b56291476a2,,True,True,True,253,640,6597,6,True,253,Tests_passed,4eaae77b2157c186abf57a4a21fdf7b72784dc2173c933c310afe8a94f077f01,True,Tests_passed,9fc2f862b927e7ae6dc2d2eaba7c186fa270202ad600af9dd62af7f06802d825,True,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8d8403ac294aa879cf0c872cc04619a9a9649dbcdd19e6a1a7b45a84c2be5737,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,6ac9740e775a8a7750f43aed5e62f206175f6d42dce94ceb258d21571e1221fe,Merge_failed,084ac0b4834afaf8faee710ddfd8fc04c8ea184679df110eac4a19de6b0272eb,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8f91023b1e0e6c0841fa8f32b2b531666e04a2d5493e6cb290c3a9111b86936e,Merge_failed,322246225c204ffe32985abf12bc4037e8322a8784fd0d0d48b61e24cf85c09f,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454 diff --git a/results/combined/merges_tested/sonarcommunity/sonar-scm-activity.csv b/results/combined/merges_tested/sonarcommunity/sonar-scm-activity.csv index 7dcd79980b..90305962c4 100644 --- a/results/combined/merges_tested/sonarcommunity/sonar-scm-activity.csv +++ b/results/combined/merges_tested/sonarcommunity/sonar-scm-activity.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/pull/4,eb6d39619d9c570d93b08239891ca2983e73e85c,2a004dc73737229a24009e64cfe68d8a9a4796f1,11e3ca2815a75f93ff30d276caea7caf48562f93,,True,True,Tests_passed,d415eab3e2d82e969d504dc93244f445a5337b5d4628194e23749b95d3370da3,True,50,228,1473,3,True,Tests_passed,2c4ad171e512e0f17fc186fb4f2773595f48144e8a01d634b63174b33bcefd9c,True,51,True,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,821133f4d24858a9d7305de5dac2feabc9205af64efa352cc26b26591f4694af,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,08a86cbda8b72f5d7c672fdef2ed11f8123c0302a9f887d6d014537acceb1fe8,Merge_timedout,,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,1d44e2213a9daad2d6a4d716de004b417c0b1a8ccaa9da203039d5179213d735,Merge_failed,fa57199e3af30a1f39095fb39616b8225efecf9577dd3446c84c50e0ec33ebda,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d 2,refs/remotes/origin/pull/6,5cc251bf86feb0684541aefacfab932916d461e7,f8059ff6436f09759485b58e060dc468ace1d74c,ec5d0b030682df1a3f8e881cc2b856df3a15f69b,,True,True,Tests_passed,2943ff94b02a0c5d6e32b983a4ab291fafc59abd743168cb787de7e064b2598f,True,48,227,1272,5,True,Tests_passed,d28646f1f02161542c3cebb85ae5908ee1b2f09027319408500f4ee4f7585034,True,48,True,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,fa3c61b264e3a14cb5188d1797d58506c186f42229b4ece81cd6fe018828f41a,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,ef4c3e5cfe141df65560328534c041bab9cc749e205b742fa4288068ef28d236,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,3188e68ea25e5a4f51231881e5116e6b35754dcfd0ecb6ccfcfab2299ee9a4d2,Merge_failed,4f44908c9c4f8950e37c97ead29890164785efbea4994278d2a4c84e50625a46,Merge_failed,b018df2678efa79ab9952419ebfa46708dbc0b61265c9072736892e6a4eb87aa,Merge_failed,3b3233279fee6c90eac854c24d1561d7fca0d3a00009d415e476a319d93ded5e,Merge_failed,4f44908c9c4f8950e37c97ead29890164785efbea4994278d2a4c84e50625a46,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,ef4c3e5cfe141df65560328534c041bab9cc749e205b742fa4288068ef28d236,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,8aa69e785c018e8eeb18d7baa231a08aff7523b5f13c8b97576900589d32fbf6,Merge_failed,b018df2678efa79ab9952419ebfa46708dbc0b61265c9072736892e6a4eb87aa,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,fa3c61b264e3a14cb5188d1797d58506c186f42229b4ece81cd6fe018828f41a,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8 4,refs/remotes/origin/pull/7,e078d44db1d5faba85e98ae78d74ff6099de7c3c,70249a38586653f8b0fd2843fa962f7478eb26c8,ec5d0b030682df1a3f8e881cc2b856df3a15f69b,,True,True,Tests_passed,7fc70831a9050af39a17625ed8363d4728a5af5e241e27b57ec4ca50a95ac06d,True,56,237,1884,6,True,Tests_passed,d28646f1f02161542c3cebb85ae5908ee1b2f09027319408500f4ee4f7585034,True,56,True,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,4d90e91d330aca96c3b8cf67abf83ac432b8f03c74b68c8e816d817488d52a6b,Merge_failed,0c17629af5ae3c1ff9b5b48b84612f5baee54e88628a455771dc4cd22b2845d5,Tests_failed,4854a0ecf78a509389336bb93a0567ba8dcc70a2e8b91f02d2876e1e80f02dec,Merge_timedout,,Merge_failed,0c17629af5ae3c1ff9b5b48b84612f5baee54e88628a455771dc4cd22b2845d5,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,4dac7efd9e2da82e8478ea3cfd329b9eac7b40ae53970e2f98bb479bf950585d,Tests_failed,4854a0ecf78a509389336bb93a0567ba8dcc70a2e8b91f02d2876e1e80f02dec,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd diff --git a/results/combined/merges_tested/sonarcommunity/sonar-web.csv b/results/combined/merges_tested/sonarcommunity/sonar-web.csv index e6908f6381..e5e08f8c9a 100644 --- a/results/combined/merges_tested/sonarcommunity/sonar-web.csv +++ b/results/combined/merges_tested/sonarcommunity/sonar-web.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/117,2034e49e0066e082d7277df1af9a7e54a33b1db2,aa8fa56ccbea9002264b8ee2115ea71e4727888b,9ed6f9f8f8fa18c779ef1de752b0f883496aa5e6,,True,True,Tests_passed,f77444fa23342a75cc2be7e7a9773744d4c681f2b075bd848fe7cdd2b2d21bdc,True,14,18,3407,3,True,Tests_passed,3b7a5f003b18c0b117f2688e0861e617fde0ddcc67c9dcaca346b61a999c9edc,True,15,True,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,0d78dce144b77a9c8e19fafd93360efbdd520c0dfad46d780045e7e7561090c0,Merge_failed,fd72a0d21944c6f2f80cf8aa9447ec3059345e5b20a36091bbe13d6afa677e04,Merge_failed,b4e87aa63aaec93a9912d5f70c2dda9a406ec20625665dfa175141a9789831fd,Tests_failed,7aec1d8ce20ef02e7ad22d964854e51f26b8a83bf08c35152fe2741d2bb5eb10,Merge_failed,fd72a0d21944c6f2f80cf8aa9447ec3059345e5b20a36091bbe13d6afa677e04,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,e517b39e5f3e9fb8d9784f7aa16a5f4c900bb68ed310d41ee89fc4d9f883be76,Merge_failed,b4e87aa63aaec93a9912d5f70c2dda9a406ec20625665dfa175141a9789831fd,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203 4,refs/remotes/origin/pull/117,b6a68a63c42d8f2dce3fd92a208351b3cf4f2857,b4c07004f18f2f89123e2f56316d1cd221efe878,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,Tests_passed,5cb9e4a18671d81d619d4dab64820ba17ce46aa2f7f79d4e18020936eb734b0d,True,19,31,11733,3,True,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,True,20,True,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,ca8d60db0082d675bcc3b177f267a487ca325771cf096b3c11cfc6c520184c4c,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,63ab2da013a8b9d10c44335a4adccc519f9d208e106e193d46b740f1549929e2,Merge_failed,adde5491deddc3f181201ae0bcccdc5d9b85a0e20c19146217d088694fa6ff00,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,bf16356cb79d728266f6698a912abe6c0c08cad726a56066f36c9501b6b95541,Merge_failed,1fcb3fd4559c9db821d535eb1786b6dde36382e6b9761d2b4e73da189d26b2da,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7 5,refs/remotes/origin/pull/120,503127154d0327868045098d7a8913339cdadc49,51bad826266ac08d6f20b41834be992a3ce2340e,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,Tests_passed,cac18bc8450793d3333966f6389324411a10f02120ada095433282104f9f6a11,True,20,35,14683,3,True,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,True,22,True,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,567a8e4261353e129570460f8886a1852bcfd159f20a4ae3eee07bc907de7d18,Merge_failed,9f8b68083666705a7fa2235e8d1d2d820f24ddd7cf6009dc374ba46b199ec382,Merge_failed,bd5258fb4bd4f65c5e930651c082d31d56471a5bed3b02eabfc4e372bf9c3f21,Merge_failed,d977668c7d381f76e4c98ea2b6900fdc467ff0e03ec39d557a11f890fc01e84d,Merge_failed,9f8b68083666705a7fa2235e8d1d2d820f24ddd7cf6009dc374ba46b199ec382,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,9673f0a45686835b806b4acabb02ce485c10f2332d789a14040ad375c8bc8649,Merge_failed,bd5258fb4bd4f65c5e930651c082d31d56471a5bed3b02eabfc4e372bf9c3f21,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b diff --git a/results/combined/merges_tested/sonarcommunity/sonar-xml.csv b/results/combined/merges_tested/sonarcommunity/sonar-xml.csv index 0fc73a3c7c..c9c7e78409 100644 --- a/results/combined/merges_tested/sonarcommunity/sonar-xml.csv +++ b/results/combined/merges_tested/sonarcommunity/sonar-xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0e1fee2967a660d9ad773b8279e8ffe5ab4d0908,7c4f9c62a54532c13a302793523e6c5ec498c54c,90964790a53ea2e1c81906221666a3fb33ab68bf,,True,True,True,23,117,624,143,True,153,Tests_passed,a77b55b7a45b441baeef7140fae50e2f005e93b8f7eaff4939fe71cf5b7f54eb,True,Tests_passed,a138b393b01e2f41e2588142f289fbe748e3795bc997e13f950a5f5310ace78f,True,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,65539822e0d594d5630b4feabc46ce2239216cdec3c716d65c59073641653d7e,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,5dacc30d3d17647f1644931d3371538e2d7053eaccf75866b9ac90492a247789,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,7c41aa6c1f84049b41e613e27ad6395109545901f0279b46f04e2dbc640dda13,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779 diff --git a/results/combined/merges_tested/sonarsource/jenkins-sonar-plugin.csv b/results/combined/merges_tested/sonarsource/jenkins-sonar-plugin.csv index c3e3e8a195..a1fed97674 100644 --- a/results/combined/merges_tested/sonarsource/jenkins-sonar-plugin.csv +++ b/results/combined/merges_tested/sonarsource/jenkins-sonar-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/123,b784e8f5f5d9658f4e644526211c2806df5b73ff,60097ed39284e2fa7816e71c832000d6f5e8fa0a,8340b8e13e11955c5a46b23cb223b663a1b0912f,,True,True,Tests_passed,35fb471c69fe2dba78f3be1756c41a1aba51752d6c7dd621701ad9b2abe38316,True,23,57,433.0,2,True,Tests_passed,5474fcfc72d5bcb42b744508f1bac21dbae35c025d458685e1a1acad5cc1022c,True,23,True,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_failed,8b703787aef7d1dc57ba4f1e984c05ab17b72f1019587441c2aafadc0b996f72,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84 35,refs/remotes/origin/pull/175,ffd5c4bca45dd46beef89274d9038c75674ebc75,8f1211f8bc2315b76bc8069e8634109c89824177,3ccb62e49f48393112a5de43295ef4ee474cf6b5,,True,False,Tests_passed,030ae5f4f6367f13cca4292050fa23065fd5af3beef9f5b416b229bcbd34dc85,True,113,119,264.0,2,True,Tests_passed,10c0ee8982cb9b767179e5529f3b83de2a6b7d2d894db1afb6a05a49c01e7eb6,True,113,True,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a diff --git a/results/combined/merges_tested/sonarsource/sonar-findbugs.csv b/results/combined/merges_tested/sonarsource/sonar-findbugs.csv index 55f8911944..f4b9b6a249 100644 --- a/results/combined/merges_tested/sonarsource/sonar-findbugs.csv +++ b/results/combined/merges_tested/sonarsource/sonar-findbugs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 77,refs/heads/master,bad6dabc5d6f9efdc87e67235050ea501bae51c5,f8927f65fd0008a729d47d75d60c4c91a1a5226a,59a19c839ed6014bb32ed482580ef9e597d771cb,,True,True,True,37,207,1361.0,3,True,37,Tests_passed,9ee7f78053c3ee226f34451f18f9a6948f0c70e22f1dd19574ff396eef108f7a,True,Tests_passed,cac278112d2c5097a31572da45056703ebc4d7e582e2dcba1dd0abd7a10de2a8,True,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,102f368c4fdfdad905fcfe790d8db1beca50d12cb05b9aed8ce52a47892c9575,Tests_passed,34b43537b470953796cef621e5d9405b066db5e17ce9fc6593d3ff780a3f81b1,Tests_passed,aa7e980fbd4d3cad76296a1d80a5c043e95654c87d107a82967be9e667236637,Merge_timedout,,Tests_passed,34b43537b470953796cef621e5d9405b066db5e17ce9fc6593d3ff780a3f81b1,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,ca564d81ab0d2aa00733ec1741d4019c2eb9d07beb5f0192555f9bc7d8b0a909,Tests_passed,aa7e980fbd4d3cad76296a1d80a5c043e95654c87d107a82967be9e667236637,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768 198,refs/remotes/origin/pull/513,91cc3c30b31fa91cd854d16ff0d4023c5eac065a,aef8cbaff11057158ef2684e2eb0134ba6d744b3,56846fa0ed28b02a6520922c30764993b397c286,,True,True,True,53,292,2921.0,4,True,53,Tests_passed,e3c33e798bc2970818156b9102a27f894434c3f3bfc7b680d02507f645326924,True,Tests_passed,02469ffd72167de21f4a18b3bd5b1ceefbbdcb1b379c6c8509cae4d490d31081,True,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,35a472a66d5947c329c94c7a039a7da63621889d51f9a0a614d8f15d79badabc,Merge_failed,4da3e853a19f79174d2dde64998f686e31d9a4c8b7c7e57a70c17cb7f249c84d,Merge_failed,a696f6a548af65d9248aad9c4a986c6b020dff17ff8b7c6cd32482940e9375bc,Tests_failed,641e6db6fed2a55226d58809ca309e117a6f9f4be42f3879089f797ac4937e56,Merge_failed,4da3e853a19f79174d2dde64998f686e31d9a4c8b7c7e57a70c17cb7f249c84d,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,310fbf28784adc043158a75f29cb540e8444894a17a12cdd83ac3a360620ad24,Merge_failed,a696f6a548af65d9248aad9c4a986c6b020dff17ff8b7c6cd32482940e9375bc,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257 203,refs/remotes/origin/pull/718,36fe7fdce5bb537ffb0c12869eeaf72f19ed1d6d,4a8de43c4fe22d8397f9fcaad2f27b202f875a7d,3abef2ff3f4fc6cee8f135aefc80ceb18837296c,,True,True,True,73,264,4165.0,6,True,73,Tests_passed,ead6e6d3a31f4b9ae04366c5ae506637809575ef4212889a4c4bb2ef8b5719e5,True,Tests_passed,1a338fe4059066d6cc17c3ceaa0b01367c569b2357b5ebb2bc8139712c9bef35,True,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0027032c6b3c0bb37aaa804d71575b4de2a53e95862546f9e4cdab001b5466d5,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,60ac881483aee97419357c4d6eb5a907f2a06bc43747289dde12fbcc9119346d,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,1816306f7504c00b06001e43a9da793879ac5868008c529927fa42fab531de8c,Merge_failed,24105b0c6bb671bab59079116bae84f1d92cc47f61e6bc291bea760c7158c37d,Tests_passed,1fa161d020e71a468f77637fcf5ed4753e11c32669344698bf70611fd5a72fd6,Merge_failed,bf4001120920f7e96aadb2ca4580faa0ac4c090b868a2eaf385e5a44399a2736,Merge_failed,24105b0c6bb671bab59079116bae84f1d92cc47f61e6bc291bea760c7158c37d,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,60ac881483aee97419357c4d6eb5a907f2a06bc43747289dde12fbcc9119346d,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,77f996914e645390204841730af020dd2c5afd09433a24b9d36c3192e85f33f5,Tests_passed,1fa161d020e71a468f77637fcf5ed4753e11c32669344698bf70611fd5a72fd6,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0027032c6b3c0bb37aaa804d71575b4de2a53e95862546f9e4cdab001b5466d5,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97 diff --git a/results/combined/merges_tested/sonatype/jgit.csv b/results/combined/merges_tested/sonatype/jgit.csv index a5a4463110..d47ec8a4f2 100644 --- a/results/combined/merges_tested/sonatype/jgit.csv +++ b/results/combined/merges_tested/sonatype/jgit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 38,refs/remotes/origin/struberg,7ce2207c2b66c7fec63cdcb816bd570c534fb829,ea4903241e2b096d85101dc4697b0b7b9749f820,6c5dff4f907654ffb7ba99887d36d57bdd0d1f74,,True,True,True,28,179,2745.0,25,True,50,Tests_passed,4c7c9f2cfcfef5418f353e07765f9500e1bb03ab765c5b671e226773ebdc8e1b,True,Tests_passed,5422cfa265a3148065a2dbab138da2b11f35aed165bafc57bb3669a1ff023ae8,True,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,8e5d2dee98b55f33840e00467dceeac83d81a45000bd4e96df1a39ebf7736235,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,da1491f4001f955051bb20683e7a27dbaf361dfc04bfc868be0efebfb3e3eae8,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca diff --git a/results/combined/merges_tested/sonatype/plexus-compiler.csv b/results/combined/merges_tested/sonatype/plexus-compiler.csv index 7933c12f78..a273d44927 100644 --- a/results/combined/merges_tested/sonatype/plexus-compiler.csv +++ b/results/combined/merges_tested/sonatype/plexus-compiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/remotes/origin/pull/36,379b6114536f2f3d363d096fbe2246f5cb3b8ad1,3eb04b388662f4f3394b51983837b3065b3aa3f9,70cce375cf186440ac930c41e026b1ef614202cd,,True,True,True,3,5,83,2,True,3,Tests_passed,c337201bd8796ab798364b29a4c5b47c9a1d1df453ea8b28f0ea82885c32afab,True,Tests_passed,f960cde03470289072c5f5033ad4910a9f0242fbc89f908d5d46ddd0e7968905,True,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_failed,4c0567bd18a760ef2290fff6f912d2bd23b82a3c6e1567ffc471b758d7f88eb4,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe diff --git a/results/combined/merges_tested/soundcloud/prometheus-hystrix.csv b/results/combined/merges_tested/soundcloud/prometheus-hystrix.csv index 0ca73ddd36..b93f3d3e14 100644 --- a/results/combined/merges_tested/soundcloud/prometheus-hystrix.csv +++ b/results/combined/merges_tested/soundcloud/prometheus-hystrix.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/11,fd664ae55bf754fbd5764a2c19019e1ed8d5ba14,876af34a18e3dec75c57c959a230921f32cbe529,7a8337d0fb5d70f209f5bbe6838e55d9789a6b57,,True,False,True,2,3,3,2,True,2,Tests_passed,0ed23bef9c2183e93b691fd4f1a2a737f46f1947cd24aa480fcc22a80f0db15f,True,Tests_passed,d703dcf1d53b48eb9b34cf5e1ff00a14c6d3c065c93a9cf67b27ab97ea397d0f,True,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f45f889ae4fcf16aba72b23a8819229366584fdad84bb4e6351917ada1e3c63e,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,Tests_failed,cd73ea4244ddb787f54fafc779933b0ce96e16d1c2e0a1b5a7696032d9faef00,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f517bf2eb64df6c3c49e17eff2eeacd3391d9e71b289f4a74077d8abfc017841,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22 diff --git a/results/combined/merges_tested/spigotmc/bungeecord.csv b/results/combined/merges_tested/spigotmc/bungeecord.csv index 698021a1fe..9dd311e89c 100644 --- a/results/combined/merges_tested/spigotmc/bungeecord.csv +++ b/results/combined/merges_tested/spigotmc/bungeecord.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 148,refs/remotes/origin/pull/2217,214e03697a5ae301bb33f1117c2476a0acabcddb,8d152de6a6eb9d450b47f59e7e81af0d7cca01a0,017f3a2424e0a210d5bdfbf45720aa1ef073a223,,True,True,Tests_passed,89109765826854e68d7c6b4ec8981dbf85359d6874bd308a63822511f8bd145a,True,50,363,2283,4,True,Tests_passed,8aadf8e204d9ebea1c376b31b146dc3eb08e83bca58e1640eb90ccb32887da2d,True,50,True,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,29f4f7bc94a0ade2657173f2d6d1b6cce158dcbcd911786ef7fffeaa793d27f5,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,29f4f7bc94a0ade2657173f2d6d1b6cce158dcbcd911786ef7fffeaa793d27f5,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78 158,refs/remotes/origin/pull/2241,06deaf18867ba169efbe23ccd20c831f1ffe370f,414b1281a2e4181d73553c03314dbb03a9a1376b,bd5a7e5b26b698c57e6f99933452bfc0659269f9,,True,True,Tests_passed,4316bf3bd51785c873e07bac786e82c07f0921d88eff0d46d778ffa5d1c2a7c2,True,52,349,2036,2,True,Tests_passed,bd4fbd92783b16f5da08da678d5b98cc85f6e5a4595153c52344711816933e57,True,52,True,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,9b3839425dfa845caeeee743b6a45fe0927d100d792b4b24c1e5b58a1f2da125,Tests_failed,c1e14dfddd77d730f1804cc630cfb9269761cf7bae5065f52f7752da368d259b,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,9b3839425dfa845caeeee743b6a45fe0927d100d792b4b24c1e5b58a1f2da125,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61 161,refs/remotes/origin/pull/2241,7c146a9b0553145ce14a78957402b027d4c57da2,214e03697a5ae301bb33f1117c2476a0acabcddb,a1f9c2e7d4ab917ed8d12ae3303a3f4357055564,,True,True,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,True,57,515,3324,10,True,Tests_passed,28354365f4db5f70e875b139c96f3717167105e3c3e77d12d19dc02557647212,True,57,True,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,067707184844a7a4207719066dcd0d6c19878d2486ef520af0006936f779f81d,Merge_failed,ba40594379f227f0cab11fac55015aed9cae547f046775d937b17fa0813b4e18,Tests_failed,a2b9c207c284c665e80c614ed532135524ae6083e3d1600c9a645ff29d5a1c55,Tests_failed,ea1260c9755cd7d301032942beb83e43c8cb2b448dde122310600fe4eb18a749,Merge_failed,ba40594379f227f0cab11fac55015aed9cae547f046775d937b17fa0813b4e18,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,5ec4086c20dab4c26ff6ef4b3ee56f3ca07920e626c40fa9ff812b2b3745221c,Tests_failed,a2b9c207c284c665e80c614ed532135524ae6083e3d1600c9a645ff29d5a1c55,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8 diff --git a/results/combined/merges_tested/spinscale/dropwizard-jobs.csv b/results/combined/merges_tested/spinscale/dropwizard-jobs.csv index 73d8c64e00..aa3e74dc23 100644 --- a/results/combined/merges_tested/spinscale/dropwizard-jobs.csv +++ b/results/combined/merges_tested/spinscale/dropwizard-jobs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,f10957c9cc94f1aebe4eb4416353065fa0fc4ba1,2c65c4f0accaea4a891af4e8cd063b3c733a3a95,8f70c45b5d1ebb3d13081a504a66e686b52dae99,,True,True,True,14,49,233,2,True,14,Tests_passed,e2e3fa4cc027cf9846be2fc5a9c019227dc2f044a8fe8628234e7e576d4f179a,True,Tests_passed,591c3c4baf550ce5eb82adbbfca17fdae086a3e951cda4972de6e0ff8a276109,True,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_failed,7a1dac1af00c467f9e88064b6fbbfdcb9098c07ad51324321509007f43acc51c,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0 31,refs/heads/master,7f683b73cae2a338656deb368e2e76ad9616e23b,46c4ba62d418f11f7ca73426cb7087034eba83f1,2084c91ddbce16a3b10e81d359ce971779fc2624,,True,True,True,37,104,698,45,True,47,Tests_passed,e9253a44c8e4541677257ca73d5643257771e91c03826a9e15b9fcf08dc1c06c,True,Tests_passed,a04929918cdc088362935d7f41def518d8bd7e8f6097839da6a02979ff5eda5f,True,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,80c49634a236063fa1df33a29e4087cd87b3bdcaabce56f68ac38c9594675089,Merge_failed,10464dc42e12f9feb7a6eff021ff4a5ad723cc4648da95e36d106250f1932e36,Merge_failed,849b15d28280ed6fb60f254bbd4e264b47d8a9e51a65cb405ef1616404e48730,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,475e86740df1c6c9c35ad9830c6ae0520ab3834711a809cece978d6655db14b7,Merge_failed,a856f1ae089a6624df09ff22488fe088525c110c90686bce4a9bc0bab9398af3,Merge_failed,44435bf24449cfb9a0178f5970e2daf318171d8d3862bd7d9cc83edaa58312a6,Merge_failed,935f33292038539c11cd7319c87a4048e19dc87c36b068a78c9a43fd71c5c88d,Merge_failed,9b6d13a183d806977b814e3a084d953293d54617cddf08d1c7e052991aa9155b,Merge_failed,44435bf24449cfb9a0178f5970e2daf318171d8d3862bd7d9cc83edaa58312a6,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,10464dc42e12f9feb7a6eff021ff4a5ad723cc4648da95e36d106250f1932e36,Merge_failed,849b15d28280ed6fb60f254bbd4e264b47d8a9e51a65cb405ef1616404e48730,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,475e86740df1c6c9c35ad9830c6ae0520ab3834711a809cece978d6655db14b7,Merge_failed,f8b523fd6a70036110ed0ece75f4d34a36c32673b818ac7c5ccc7d706b214809,Merge_failed,9c0efbb29480f31eeafe0202d29ab65e44d6d28a6af9d6585a772d0f540e232c,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,80c49634a236063fa1df33a29e4087cd87b3bdcaabce56f68ac38c9594675089,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b 34,refs/heads/master,7d15f031907935bb2581e8aa7f5736c82211b819,b43b867b14183dc99438505f4a2f6d967433879e,a2230e0a2b286eccf55a5f4f0d3c044da9da6a42,,True,True,True,32,47,694,3,True,35,Tests_passed,14e5d341d6015e940e80bfb4033e74c539204bfd8762c3dfe50b5910233706f9,True,Tests_passed,473b318d1410cd1723de39cb75b529e2b8ddf1ce2f22b8633bca164addbad19d,True,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,0c71ba2489659ea2187d5722983d125f0d980f2cb75a46cf3fb1dba7d1dbf173,Merge_failed,08d609882ce87ae5e06044ccbfb4fd0d35cc8b4113748107778e5d0a842c781f,Merge_failed,5415ef63472c19c0a928c8366921728b06e32da8299d9be04511aff0d5f00df8,Merge_failed,d03f93589fd9cd9d49cbb9bdd7ebd95dd2576386afcb01f5f7d6a572aaf1366b,Merge_failed,08d609882ce87ae5e06044ccbfb4fd0d35cc8b4113748107778e5d0a842c781f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,51ef901b52a4a512ffc4f222652d7d4e8df7178719620191e5175948ed3fe37f,Merge_failed,1f6e8c59eb7fbefa92f759d944750d33acc6612a436ffb53c0c6f69854a9da6f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f diff --git a/results/combined/merges_tested/splunk/splunk-library-javalogging.csv b/results/combined/merges_tested/splunk/splunk-library-javalogging.csv index 0304ed6e9f..9a6e21b770 100644 --- a/results/combined/merges_tested/splunk/splunk-library-javalogging.csv +++ b/results/combined/merges_tested/splunk/splunk-library-javalogging.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,f7bf37732d5d097c791341d348ef6e4ec67722ef,7319aa987d781b5ddb907feb22c7a635d994cbc8,82c4a568341449828699a6877e9221d9cb772bd0,,True,True,True,27.0,179,998.0,2,True,27,Tests_passed,fa3b9a1fdf2a2df1a7fc15bcdae0368daada85b4cd7125e40175b15c1041c371,True,Tests_passed,ed93738ff2901a1c51683a26509e73ea560c3e58a918718eb864bb13e0ddda09,True,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,0334064e64f0b8184c2552a2617fc54301f74af60518403c4730d110576e856c,Merge_failed,1330f95baf31e157d8119d457350993f1c47c61d80aa2525097e745b4cb609d7,Merge_failed,c8ce2411b66b85a96826311fe8c3ea00c58dcb3ab56d34fd9466acb6aa47e4ca,Merge_failed,29d0080fc79a9dc28cdc6dece74647d6015a188af103e8fbf39ab2c6153fb241,Merge_failed,1330f95baf31e157d8119d457350993f1c47c61d80aa2525097e745b4cb609d7,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,ec53f1628671d44f9bc5db66df3a66a5784b033119df738d2ec78cd2440804a5,Merge_failed,c8ce2411b66b85a96826311fe8c3ea00c58dcb3ab56d34fd9466acb6aa47e4ca,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171 13,refs/heads/main,eaabf143fcd981acedad944e96014590671bc8c5,f4c5d7d45b0dc154b2a4f2fedc4b02d0248767c9,256fc35520f005d938eda5b4bfb960c280a51580,,True,True,True,19.0,129,739.0,4,True,19,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,True,Tests_passed,47ca92145bf0073c74bb275215ae8322a50b96b68f71364744aaf45bb9d643e2,True,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906 15,refs/heads/main,d54c807b85871cf89f4eb6d252111bb671a0bf23,84e48fcc43984335dfc10ad7218d5a0a657df063,cd9bf61563086f87332484698affa5b909c3c179,,True,False,True,14.0,43,214.0,2,True,14,Tests_passed,7bb4d0f5319c622775cefd9193462806548fc866838508bc3adea66a30f3e5f5,True,Tests_passed,51c45730318841ea304ab1152d20d04d2fd0279339c29173c2a8b7daf00e04e0,True,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,9a57bc604b8159181f91c2aa3a70640ff4c893aae532840763da12df5d23b548,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,Tests_passed,dd7470f1c537437abf734ec34341fce5599358d75f9b96f50b2ae34a8be15f61,Merge_failed,aa3239732b466a4801211c1310de28976aea187ac27cb669d3697e3b58bd64fd,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,4edbe111466c420c885253c10d85406ce811d2f35f02a82c7fa10fdff6269b3b,Tests_passed,dd7470f1c537437abf734ec34341fce5599358d75f9b96f50b2ae34a8be15f61,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8 diff --git a/results/combined/merges_tested/spotify/apollo.csv b/results/combined/merges_tested/spotify/apollo.csv index cbd85c3dcd..fc239e7912 100644 --- a/results/combined/merges_tested/spotify/apollo.csv +++ b/results/combined/merges_tested/spotify/apollo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/1.x,35d43aac53b274e3d3c5e9553e63baef809c0290,b794228c82100ce5e58ee1518a0a9da4c5b15232,d3c4048f05baac125ee78ac38d031961e61d4a96,,True,True,True,43,181,1228,5,True,43,Tests_passed,642790e87065a7846f781a6cf71e581932ca93c49442eaed35801f507ac37365,True,Tests_passed,a254026c944d3d21dd88bd8be7f7872e8a5c06b99cf0d890e3ec2ca72d7210e5,True,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,3d94567aa8fe6dc01a640e09a7f69b7ab1a423a74e73be3b47a4d94a6186d8bf,Merge_failed,e59778dba156fa84698d09b37463bc833af5c677de3713538676adbe7ee368ad,Merge_failed,1f42e1ee61c45c687f4dd3e29aff9fb7678cf6ccb69f3e017272c3829118b529,Merge_failed,dee4b41db49cf611b2e932e1551633c646ebe916886e1cd7862e1f80b4924eb7,Merge_failed,e59778dba156fa84698d09b37463bc833af5c677de3713538676adbe7ee368ad,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,77061ec573c26e7c3cb11afac2a9329929b2d6060be878a8e2945c3cef1771ad,Merge_failed,02d346123fb665c3997b91a47ac7bd51238bbb0b507be9ec753eb6529b2412e9,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55 146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,True,240,348,6860,4,True,240,Tests_passed,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,True,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,True,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,444f98aa757f194157f6a61f23427f26bba24d910882ba7fefcabb33a1974c2e,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612 215,refs/remotes/origin/case-preserving-headers,3d1078e037d594c28b0ac72d7bcf4faa87637725,67c7c7094b2e6a15ca50038eacc994f3bba261d6,490de5209a9d8f20bccb496f6289c9f48d7493bf,,True,True,True,87,233,1571,2,True,87,Tests_passed,2395c367e9ea32cc7c92d41f741af9df6acbb6ef0c9a3978e4c4bb68e5de3212,True,Tests_passed,9e9d404517b091e7c9d430e33eb59eeac1072d3ff2dbb99b89765bd0503f4b4c,True,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,45347b6030be510cffdac1dd7a3f2f5c7681a288f001f4dfa8a53e0d8e451c14,Tests_passed,1bb92c23b961a369ef83ae109d77a6515c052d7027d35ee58e7db4fcb765fb67,Tests_passed,8625f60781d7c67d4437d2f585138718ea2db23d8d2f03425c235c114d9450a4,Merge_failed,f85ee99a42f54aa58b6b4cbd24fad3b475073904e869512071832abac0ea4423,Tests_passed,1bb92c23b961a369ef83ae109d77a6515c052d7027d35ee58e7db4fcb765fb67,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,2af215f2d38622566c13cc517f6b21ff5886e1ba02e8904b1955eea44272c493,Tests_passed,8625f60781d7c67d4437d2f585138718ea2db23d8d2f03425c235c114d9450a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4 diff --git a/results/combined/merges_tested/spotify/dockerfile-maven.csv b/results/combined/merges_tested/spotify/dockerfile-maven.csv index aff0d28dd6..08f46570c1 100644 --- a/results/combined/merges_tested/spotify/dockerfile-maven.csv +++ b/results/combined/merges_tested/spotify/dockerfile-maven.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,580f84d9277f80882d20aff38d6f065ed7206bf8,7066622eb72a8482465ededa6198688fd2a84717,eeffcd92e469b7693828a4764310d1c37662e325,,True,True,True,36,115,1053,2,True,40,Tests_passed,dd84ab43b68bf698670339f20240561e823b67afe2eb9dc98a23edfa10e78cbf,True,Tests_passed,bbc0423f3898f4d7633dece72970095016ff5d0ff2623aa5f01b510fff30f9a1,True,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,0e138e633606029e2a8330dff78ddcf462c0c314e6a2de4fd53e95725e251cad,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,e61fa2372705ec2722b3340fe44b2f3d5292ba487f605c1235dfb1d3ead7fb9d,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,b17108c91b6847c7d62f73999d91cb579213a30d8537089637012cd20ba349f8,Merge_failed,c2292fd47689ecc8ce96381467f3644b36a190502db0fea9e8242a77f19bc990,Tests_failed,150b74e7998d7ca2dfda6fb76437924146af7386d926239320f8c29917b8c180,Merge_failed,d026166cbdabbf1f1bba049a0711dc6aa3f9fe3e4de172c4bcb9c9fdbd3b5fe8,Merge_failed,c2292fd47689ecc8ce96381467f3644b36a190502db0fea9e8242a77f19bc990,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,e61fa2372705ec2722b3340fe44b2f3d5292ba487f605c1235dfb1d3ead7fb9d,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,012ebb4e87c300a0108392abbd73eb07d70fa9b7ef37c7a7d47f06c7b62826c9,Tests_failed,150b74e7998d7ca2dfda6fb76437924146af7386d926239320f8c29917b8c180,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,0e138e633606029e2a8330dff78ddcf462c0c314e6a2de4fd53e95725e251cad,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f 58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,False,True,8,14,117,2,True,8,Tests_passed,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,True,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,True,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_failed,9e89a24ace0ba4e0a779c9e067e8b2860330bed71a4256e061a77a1764003e2a,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b diff --git a/results/combined/merges_tested/spotify/elasticsearch-index-window.csv b/results/combined/merges_tested/spotify/elasticsearch-index-window.csv index f82f6eb6bd..caa57156ce 100644 --- a/results/combined/merges_tested/spotify/elasticsearch-index-window.csv +++ b/results/combined/merges_tested/spotify/elasticsearch-index-window.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/es_1.2.2/master,32d09a063be531c17ea178ffd24c1d250b560e80,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,ccf1d21762244db2a4231715da4fbfee4a0f2306,,True,True,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,True,3,14,68,2,True,Tests_passed,b598a96eaeee7daeb50b1158a49626dc8ec0dda0c7855797644849dfda7515f1,True,3,True,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_failed,18531d744b7a41919618935f086d96557c2f92f50d8530759b4e8deb309a5615,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9 2,refs/remotes/origin/es_1.2.2/master,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,01403e3fac4280f520171b57f441e624fba56eba,99d232bbebac7a4908a39c6f25eab4724c25909c,,True,True,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,True,9,23,336,2,True,Tests_passed,aabdbee5663ef6d5d6fd58beab4440c83ac6981f9dda3b163cccdc454f784b1f,True,9,True,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,7b8e7bba28c23857da3a10602d58a594a718162ac91df404c9474c9500f0c04e,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,7b8e7bba28c23857da3a10602d58a594a718162ac91df404c9474c9500f0c04e,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b 4,refs/remotes/origin/es_1.2.2/master,634335d9919069b9e58e38c23d82b2661251d787,c704ee65869330622a1459bed83874fd11515054,0dc5c8b1e324b092b5810e32d312880e7d4d3194,,True,True,Tests_passed,71b0da4069b384fb4ef135d1ce4e2456b08e402a946300fb1ab369fb9c69aba2,True,4,15,50,3,True,Tests_passed,7d0c17294d85070440ee05041755123516df10d0620c82cc7be992766256b1c1,True,4,True,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,8ac371bb747849ac12ffa28fa42705fd1d5628f47016c609c0f3954e86e60eba,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,8ac371bb747849ac12ffa28fa42705fd1d5628f47016c609c0f3954e86e60eba,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f diff --git a/results/combined/merges_tested/spotify/ffwd-java.csv b/results/combined/merges_tested/spotify/ffwd-java.csv index 717e9bf132..d3597f45cd 100644 --- a/results/combined/merges_tested/spotify/ffwd-java.csv +++ b/results/combined/merges_tested/spotify/ffwd-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 72,refs/heads/master,f03fcf1bdf4070e224e56d26eb0d2da20d71bb9d,a66a58f4683f76cd189f7c976497b8d3b568722e,34934670b4760870bc03ee52ea80fc3ea32815c3,,True,True,True,38,104,821,9,True,38,Tests_passed,8bd78f5802142070f576f5c30820424e9920556bb69a1bab3d14c15d80624163,True,Tests_passed,a67c13e0249d404dfb9d623d7289f385a2bae35904eb4996f27cdd7bb257d2f6,True,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e diff --git a/results/combined/merges_tested/spotify/hdfs2cass.csv b/results/combined/merges_tested/spotify/hdfs2cass.csv index 8ead9cd28a..6dabe3db60 100644 --- a/results/combined/merges_tested/spotify/hdfs2cass.csv +++ b/results/combined/merges_tested/spotify/hdfs2cass.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,d9ccc2bac7fe1bbb5a690b6a95ab80eac4e0fa36,7a757f461ac3132b81d96d92b7a033ca7c05bb45,f3a003a8385c087bbe4b372cfc5b3443696c2167,,True,True,True,11,48,214,3,True,12,Tests_passed,55a8f0595daccbea9e464f212df864dc7c8becab629047ad413ee8045a6a75e5,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_failed,c52724fec2478112b1e9835c831cbe4e8ef1bf59fceca0d627263bde5e860dc3,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77 diff --git a/results/combined/merges_tested/spotify/netty-zmtp.csv b/results/combined/merges_tested/spotify/netty-zmtp.csv index f00f97c212..81d46b7591 100644 --- a/results/combined/merges_tested/spotify/netty-zmtp.csv +++ b/results/combined/merges_tested/spotify/netty-zmtp.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cb6e3fe690f29ece9fb8ac166218227c6017fe4f,2c6761f2ba7fee6e481ba5c4959cf1ebda37f208,b5532900553f804307b5b973c52be2da51c892e6,,True,True,True,93,126,11777,9,True,94,Tests_passed,cd278632d6cdac79965bc60616bcc70802d5a728be1a026bd267e8e3140bc503,True,Tests_passed,b14e185aa6d175b15e69f325239ea96c5a00dc5653e1862d98cd0a17d5863aaa,True,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,cd0bcef0352eff452e6a8445ed8c0d04e1ba086027f1251becb5b089b1df30d9,Merge_failed,5d010612d0a28bcd1efa957cb74233bfd600da79900067a1b69546aa6e9ae137,Merge_failed,595bb3dee6eae816b95e2c7f5b5d289db9d664cadd77999372892beb3d5222a9,Merge_failed,595bb3dee6eae816b95e2c7f5b5d289db9d664cadd77999372892beb3d5222a9,Merge_failed,5d010612d0a28bcd1efa957cb74233bfd600da79900067a1b69546aa6e9ae137,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,d21bffb70bc91e66e957f6bd7a84786ed2c25bd3099b70a2e1ffa740d597dffb,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079 21,refs/remotes/origin/pull/12,8d02651ebcbfc80ea17699b5547176248b2635c7,7effbc621510cc26959f25d09d5857b663f46550,21fd8022c592b2c294c77090c16654ebb493a1be,,True,True,True,32,227,3832,13,True,32,Tests_passed,cdc535f07b4716c09bc13a1e68c7f375a89c65152118382a129bef76c574b480,True,Tests_passed,6770f99f75ba645ec74aceb050a396d4616d279fb694a65a6e5f48b59d7728d1,True,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,3c624374762e5c56605311228d7e31ccdbc83fcfdb1532c7f5cbe48dff4cc6d0,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c1bcd0ccb245361dbbf8ee9a3ebc490211535c0334c19c08271b805e20294e44,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,e72dbe5a38a74a11fb950f7ed0853d8dad669ba15f5bad9a29dcf3e004316d1e,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd diff --git a/results/combined/merges_tested/spoutcraft/legacylauncher.csv b/results/combined/merges_tested/spoutcraft/legacylauncher.csv index 3851fc89b6..1e73b4c8c4 100644 --- a/results/combined/merges_tested/spoutcraft/legacylauncher.csv +++ b/results/combined/merges_tested/spoutcraft/legacylauncher.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,f9e908c1bb0aeee99c390de2f0a47ae11fe83b7a,1bef15d9c1f7353f5b0a9468f7f40f5677cfafc7,0d6aa1e1d8826e2033771b88b4ef12bfbd61efbb,,True,True,Tests_passed,721d3d7c4c19d15641d337c22f1ec433386c8c65692c15ca3817ec804ef42d66,True,5,16,207,2,True,Tests_passed,51f5185da67ce77be9c9902f3fea5dc9b86ef4bf909c83de0305a443b361ab44,True,5,True,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_failed,78f86d7e8c2c4cd6875d7a1d6c9ff501de9d4c84cb03a7a80ec517ad37a2fb02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02 18,refs/heads/master,143fbc91db93fa38c442809de8d9e708ab9cec15,4381af6344a34eb9d80cfd6bd240bd705378bb49,03b1c8b0b5d754dec8045de19914bbbdbb2c72d6,,True,True,Tests_passed,41014b43cd20791300aef5e28d331d037839d86cd3779617a172c06bd5121495,True,13,56,208,2,True,Tests_passed,d6ecb107a68eebf0b7b1f8bdd4408ed50d4d15163546ed28524785c22441be59,True,13,True,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,2a5cfc954ba9737728449985be775a21bc6fe55396be735441fb5ceab132de52,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,2a5cfc954ba9737728449985be775a21bc6fe55396be735441fb5ceab132de52,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4 23,refs/heads/master,3999072ba8ae7e5c51a5620baacf1611c27f6a0b,866a8fc0179f55821dfb9dd4569e3bf863c541e0,be7273680c415e0ea68d6dbf223ad29174951fb0,,True,True,Tests_passed,a4fca68c7a0cf9cd028c4d748032cc239c20d5e481d607937a2b8271b7cca10c,True,7,20,87,2,True,Tests_passed,f43766fddce793bc6d1dcbd1435253c8d361b9dac10bdb3c8b7113d4bb31ef58,True,7,True,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,e6c517c9408ad795d9e530af0ea8596a3f491f194b065eb4f8eb13f61dd477df,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,e6c517c9408ad795d9e530af0ea8596a3f491f194b065eb4f8eb13f61dd477df,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e diff --git a/results/combined/merges_tested/spring-projects/spring-data-elasticsearch.csv b/results/combined/merges_tested/spring-projects/spring-data-elasticsearch.csv index 8d0e67ec53..3090800cd1 100644 --- a/results/combined/merges_tested/spring-projects/spring-data-elasticsearch.csv +++ b/results/combined/merges_tested/spring-projects/spring-data-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,True,False,True,4,8,96.0,2,True,4,Tests_passed,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,True,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,True,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Merge_timedout,,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5 diff --git a/results/combined/merges_tested/spring-projects/spring-guice.csv b/results/combined/merges_tested/spring-projects/spring-guice.csv index e63bf0283b..c8660d5fa4 100644 --- a/results/combined/merges_tested/spring-projects/spring-guice.csv +++ b/results/combined/merges_tested/spring-projects/spring-guice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/6,3cf16afb341868108e4b2bfd50dd6b80dec1880d,097a86e4a2005206aaa0701657afda65a1730265,1002284360c3ead3989c89d8f185aaf6f48943a0,,True,True,Tests_passed,56a38d7ee159e751444d30b9cc5609a7a3f9f1435d9876c5a5aecbbeadf819bb,True,17,75,623,3,True,Tests_passed,7912f0e692e80a35cf51a88f0b816e71118aada0a890a6532833c1f54707ef2e,True,17,True,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,e4a89858995b5b3a0cca4ca6b1ae482a530a7cf48a4e693d704d5c0b308e78b4,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,0bd07d848d5b3f7f544c2858dfc163cb1823c17e13c5cc51534378f24d6b7ad7,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,a8058652de2332aea9e8bf1dce7b372e1bd97991ed9211aeac7ab607b593ffb8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b diff --git a/results/combined/merges_tested/sps/pushover4j.csv b/results/combined/merges_tested/sps/pushover4j.csv index 4f6ba77506..df6ace495f 100644 --- a/results/combined/merges_tested/sps/pushover4j.csv +++ b/results/combined/merges_tested/sps/pushover4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/11,88cd636fabef766f358a3a81d802a07e940a5ceb,552d38a52a74750342db1341dc0547a23b0e66ba,edd25b58e3dc39bb01e3305f27ca4b8841be38bc,,True,True,True,11,50,472,3,True,11,Tests_passed,b4f52aecc8c8b4fc911d293c0dd059d1d5858ed74989b9c4ac929ada6d258925,True,Tests_passed,9dff968a536cc3c242a52f95638c895f20bd63963f3634f3a71ecbc153a12e1f,True,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,88b3416928043aa47e2a5c150fcf201f1dce9446019ac61bda65c3f8df11a457,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Tests_failed,148074370ea7c0cb0c848de2c7a4c303cefe7f1baa29a8025fae8300d22226a5,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,fc2e171fd95a34e3693e149d01f51bc8a2ce5bcfef00a79cd57c023c35e389d6,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e diff --git a/results/combined/merges_tested/spullara/cli-parser.csv b/results/combined/merges_tested/spullara/cli-parser.csv index ead0cdf934..cc26f5b42e 100644 --- a/results/combined/merges_tested/spullara/cli-parser.csv +++ b/results/combined/merges_tested/spullara/cli-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,a22d6462c8282339109510d2f810bc07fc09444c,2abb7cf0c7d114c33a521485910696d24f1e7ccb,7eac8a0be58bbcf8bfd82c64ec0a8c3f2fd572fe,,True,True,True,5,9,42,2,True,5,Tests_passed,e51d6970040173af365bfe572f4f8a1bba650f21b06e9d2b205e6c74d0fb25ae,True,Tests_passed,1ee40283cef307e10d83bbf2db9fbe41d5acf38cf19480bf77a70403792e4cbf,True,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_failed,b055054fa3520eb2951cffadfb2bb2c85b9de4aecab54da87e55537e9e6617d3,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576 7,refs/heads/master,5c50a599331413cf2f88915bec7aa35761861ebb,06f5ab6147cc2b8674677d42e7e6e33896b7b8e5,90dc1ef6b896073565831fd33312e5254b5e02fd,,True,True,True,8,25,200,2,True,8,Tests_passed,28159fa1e3b500579f2b30b721ac71e30c52b3eb15ee00f4d504236ce900d671,True,Tests_passed,f561d5db64539fbe4f04052c9e35d9b6657be0d8b5ae0b971aeb84c564ef810e,True,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,b8882a3ed83b50288407c64199cafcc696dc66d645bf13e65107dd52f3667d3e,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,b8882a3ed83b50288407c64199cafcc696dc66d645bf13e65107dd52f3667d3e,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2 11,refs/heads/master,d9275478266689c863a48898e019c6e13eb5680e,f02304ecce920e119913a893881bc9bca43ef7de,6bb1296cea485751ff0da629866de0bc896077cb,,True,True,True,3,8,51,2,True,3,Tests_passed,208b6cc9c12d408afdbb83b93c7578be282da6951b9a5bf7807ed37f991e4996,True,Tests_passed,acaa5b6103b8170063061e6215fb3921c7ab32d59e994c40b8857177bba4abac,True,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,dd0c6de8ebb78fc119dca32576094d7fd173139086dd0945809666f8b8d84900,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,dd0c6de8ebb78fc119dca32576094d7fd173139086dd0945809666f8b8d84900,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2 diff --git a/results/combined/merges_tested/spullara/java-future-jdk8.csv b/results/combined/merges_tested/spullara/java-future-jdk8.csv index 1ba32cf5ca..e1a34fbd9c 100644 --- a/results/combined/merges_tested/spullara/java-future-jdk8.csv +++ b/results/combined/merges_tested/spullara/java-future-jdk8.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/jdk7,0e8ce31ebd03ba223dda4339601f61b8ffd53ace,fa524323c0baa78224724f5cf3fc4871a4648e80,5f9ff75e9c4894e2cacaea19d87c5bdf5c00e23e,,True,False,True,5,31,79,3,True,5,Tests_passed,4e2a131c64eecbe0fb8936dab27bc856c2d180a28970affe87098d716d216a4e,True,Tests_passed,e057cba81f411c057ee988a51ecb046e23141ccaf9248c9af781b108d2187ad4,True,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,7478d12b713baa2dd4a01bdd2797d17b7eafb83406a7422ab3061b90d7c8b62c,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Tests_failed,0e9a1df776432dd054498f89cd8ed2d1d4154ffec691886425d0a26f95c9fdda,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,648b4903b1c92e2d7a9ec67e7e317a2fd5907fdeb9c2e8ff3746157e36b9b8e8,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf diff --git a/results/combined/merges_tested/square/burst.csv b/results/combined/merges_tested/square/burst.csv index d1ae0a6050..93c0ce4c9a 100644 --- a/results/combined/merges_tested/square/burst.csv +++ b/results/combined/merges_tested/square/burst.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,08629234e54b58a5477fe85f3cb7ddc115e343db,dc83bd281d0fefd7638b8a4228d810221a1b0a0c,ee3143a23bc1ea3c1cf2a5d2c150ed3ffac08e35,,True,True,True,4,20,104,2,True,4,Tests_passed,72d1bb911712919c24acd89d7729cdbad18a9ca0311c4f6b410c32aa72affbde,True,Tests_passed,20adda77977d15c38744d88224b928144162215bd388c8c934d97b45adafa5fc,True,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_failed,e7c3b03e714a82a52d1efb13c23371b4850a1e20bc34a07e75dca6f46b112f9b,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7 diff --git a/results/combined/merges_tested/square/javapoet.csv b/results/combined/merges_tested/square/javapoet.csv index 43ec4e9227..275da561f1 100644 --- a/results/combined/merges_tested/square/javapoet.csv +++ b/results/combined/merges_tested/square/javapoet.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,a6c9a7dd9433138c81ea40cb8f06009f0486d614,325ebb43e08bb3b7675e33ff44a0da775e3560da,19e1b4e3f253a3169853863199c932f36c5b6584,,True,True,True,7,12,75,2,True,7,Tests_passed,8c66b5a3b890eb88bd06b64f35002e2eecae5aefe3bdfc7ca0bbcba5b105adc8,True,Tests_passed,ccf2d89aff1333e5b248fbc0659ed47e058b522f5edc30a1a479c60167bb4c16,True,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,9537c534776be0ad2aacc8021d13ad60fa0dbf7c04c2e8df34786f54ae1de8ed,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,9537c534776be0ad2aacc8021d13ad60fa0dbf7c04c2e8df34786f54ae1de8ed,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507 295,refs/heads/master,270570874f5b8697768d5fc4e1fd20964387cd45,e66d8ba46f82eaa4bd1842dfa8fcfb5fe1d2ead1,84da75698782a506b2c6a6594e183591575f87ad,,True,True,True,3,9,51,2,True,3,Tests_passed,2be8d763726898300fb962972f9d1508fe4adb0856960131a184dfcd77bdac0c,True,Tests_passed,6d4cc9d590ec4d75875b3c95bf2c71b359c9eac3468f965e831a87504a66580b,True,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,4c8511131804d5d01e8334e770d49717eb5bcd0a6ff1703fce0615517bfe22ae,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,4c8511131804d5d01e8334e770d49717eb5bcd0a6ff1703fce0615517bfe22ae,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677 297,refs/heads/master,c0f4a89bc087d186bf05ee86ae9de4c12ff17130,98f792d249948ae559f7ef99a84fedeb6c799f11,35c59c5a2d7d03ef42726712bf28c53c665e8c1c,,True,True,True,5,56,375,3,True,5,Tests_passed,6a7687f7dec647c2b1d2db0e290e61fc7c06557351e4edff583211cdc0a8fa2e,True,Tests_passed,d33729cc5789140f90cf784553452e2a183d82278dc3ff43176ca98987527412,True,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,f554a5df723a21c1767148327659c588cf3d1eded1abf5dfc7abc3fc6fd38600,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,f554a5df723a21c1767148327659c588cf3d1eded1abf5dfc7abc3fc6fd38600,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f diff --git a/results/combined/merges_tested/srdc/ontmalizer.csv b/results/combined/merges_tested/srdc/ontmalizer.csv index a2cc4a593d..976ed63de9 100644 --- a/results/combined/merges_tested/srdc/ontmalizer.csv +++ b/results/combined/merges_tested/srdc/ontmalizer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,b20eed45e9a12168948f7c951699f7d2533356e9,92303866bd71e360416678e98c895e8f49dfb0d5,535e8c7861e8f22b042f46f624e5551a85bbde9b,,True,True,True,3,9,38,2,True,3,Tests_passed,e9a250ca003f14fbfe09bf418f5b6bde5499f78658d501b59f29eebd25631b09,True,Tests_passed,40a96c12c202781df45badc26d0df7644d9cfee73b84a7518f09d9f3597c3a32,True,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,68e9acddc8aee71f1464905c03a799458ca8429b48d9126593f89314aabefe45,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c diff --git a/results/combined/merges_tested/srt/asterisk-java.csv b/results/combined/merges_tested/srt/asterisk-java.csv index d9e998270c..fe742ea9eb 100644 --- a/results/combined/merges_tested/srt/asterisk-java.csv +++ b/results/combined/merges_tested/srt/asterisk-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 213,refs/heads/master,d051cefe929eeba446139b2480f4e6006502d896,5273f26cd083822e05ed63cc91e26ad6acee85be,fa6da8b9be4642c1d3b32c40498c7dfc00168331,,True,True,Tests_passed,a797604d7c46fdae42ed0d7f9fe97dd42456b339579e74e2617f56dfa715882f,True,22.0,215,3913,8,True,Tests_passed,e0360943d0b5c1294606cbbb66bc45cafaaf0e47d254bcfca182b33fb7898f7e,True,23,True,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,9f2a0dc9a619ce730404f44f352f11cabc348dfc6eda03063079ab292fcd5778,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,7694e977abc83a68882e5658dbf352cd8f0bc6870a3c542403231d1c105e8821,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,dfd5260d3565d546b519c40bfd6e9882a52fab43d349a0e16cfc8568794e26d0,Merge_failed,533ada6043112008393398e187a95a1cea8ec4eea4c59e4b94ae3f77314a3bb3,Merge_failed,f802eefcd5a92ecbd741a152eff7850d2b80541ba51b9c81b2b352d8458bded8,Merge_failed,6dc3606936f11d91340f14619ad08dcf2c5be32d40675a8388dd28aff19607d6,Merge_failed,533ada6043112008393398e187a95a1cea8ec4eea4c59e4b94ae3f77314a3bb3,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,7694e977abc83a68882e5658dbf352cd8f0bc6870a3c542403231d1c105e8821,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,ed96c56dfd531a755616e6b4fadddfe083585f87bb0105357f32d2649f6a695e,Merge_failed,f802eefcd5a92ecbd741a152eff7850d2b80541ba51b9c81b2b352d8458bded8,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,9f2a0dc9a619ce730404f44f352f11cabc348dfc6eda03063079ab292fcd5778,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808 246,refs/heads/master,a4b27137cc92af086da78fdfb634a441cb07e1d0,d99448f4a1021ad00bc2d75899852f6216cb62ed,93cdc9400b591aa3696bb2c07da548985123feb3,,True,True,Tests_passed,834ad6bf4657505b30c60af9cbb4c03fb4587ba30e7219bfe9dd98f15f78690d,True,217.0,1043,12580,4,True,Tests_passed,1f2e983d86b24afdbff5f3f8e08fcd61965a41351ef0040d23d3eadda256a9f1,True,217,True,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,3b6246c1ba273090daf815ef99b7a09f54168ac10337e5a3af2001ca9e0a89fc,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,bfec755b7828093274620c70023065911184c651fd4318081f6f90989c4e80f5,Merge_failed,2bc5141faa3c32dbcf446c03b7e010b82786ed6895101618d0a96e05c238c01a,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,c84db5d22928a935aaedf4faae944b97341e0017cf8c4518bbae0492d4ea032e,Merge_failed,d16ba4cc69d555a78cfa5a3dd4b16b1f82472e75d64b893b98b6c1cf385444bd,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131 257,refs/heads/master,2131fda1860f47da7d05dd3d494922e7d90b2ab3,352b3bfd5907ed0433f46bf3fe06dcaf5c928a38,97c3fe3f49a0912ca95b6d3d7ccb297150f53e76,,True,True,Tests_passed,87473ba36413f3fc52740887c305936db15f13612b3576f22594113a714fb1d9,True,117.0,303,3413,9,True,Tests_passed,91ad0772100461b15216af64bc278010e60271253fc41428764dae7f757dfee2,True,117,True,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,1625721b8941d28e30c9f7e6f2be6dfb4ab2663a2d12bc18d0ffa0b653afbe4f,Merge_failed,fdb94b51f8bfa01b78eecbece6732d8335e520598128ed15bcc9c64264caac4f,Merge_failed,7f644f672881f3e17250f2f903259596cfe45ab537c57a922ff96049580d13a9,Merge_failed,50ed30ced28fa160090b44249de331f3358f721b2ea3df593332e365a68ee19c,Merge_failed,fdb94b51f8bfa01b78eecbece6732d8335e520598128ed15bcc9c64264caac4f,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,0657618bd3a6e2e8d3cd99bfe2204dd8fd621c1b845073d2b5413686828ee0cf,Merge_failed,7f644f672881f3e17250f2f903259596cfe45ab537c57a922ff96049580d13a9,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0 diff --git a/results/combined/merges_tested/sstrickx/yahoofinance-api.csv b/results/combined/merges_tested/sstrickx/yahoofinance-api.csv index e70ae49a3b..4ddfd2c674 100644 --- a/results/combined/merges_tested/sstrickx/yahoofinance-api.csv +++ b/results/combined/merges_tested/sstrickx/yahoofinance-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 57,refs/remotes/origin/pull/177,105dbce94577989bfa366066c80d02b4be55cfee,cac7eed9b46ac8871831ff37d8bef4cadea3f0d3,2df2e65e84e36ee71abd8d1e5e2a07284eff3086,,True,True,True,6,17,126,3,True,6,Tests_passed,06933f95f324ab6a01b6a80836001a2d86ceb7039990548552f0486cb0eb5374,True,Tests_passed,7d45890047f12f07314fee4a3543d193b2681466c209866949d890c4eaa87af8,True,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,fc3c327328d0a20bb647413e62fc7042d7fef7c82a4ffe6ad253d4de9d3bbbc6,Merge_failed,bbbeb90ed9ce7b6f06bad09b7fcc5b914640dbc7e3289cb961e43ec6b3866008,Tests_passed,a1fb78293057f69bacb4cfd9f9c7aa11bd9a3a2cbf111328f53c6d88b0f3bf39,Merge_failed,0debeb3f38b28cf919949fccc4289e6c61369343c99dbb3c5b44cfc64a4953f0,Merge_failed,bbbeb90ed9ce7b6f06bad09b7fcc5b914640dbc7e3289cb961e43ec6b3866008,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,b4d81384112ea756006e48be835239e554ab5ae30ef0c97e52dee2b355b5fece,Tests_passed,a1fb78293057f69bacb4cfd9f9c7aa11bd9a3a2cbf111328f53c6d88b0f3bf39,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff 59,refs/remotes/origin/pull/177,c56607f37b486c62e41828b51ac752381d2974a3,1ad6c0d50ee724a2102cb3771ffe1fa93b4f5764,f06a1c19bed4df9b6ca31df7d293ac3ae7691a9c,,True,True,True,7,25,138,2,True,7,Tests_passed,96e2cbbf850b49e779ba8187bf989dfe7f02efd2bb12f8baa65231db43ac54cc,True,Tests_passed,46c1136d45572937624c8f0c9a04adbb3a80360652f02d07e764534d3bbad1f4,True,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_failed,af391b0548740e152582afef509fee2f55bdd212463161e121bb3c30228e4ce3,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a 64,refs/remotes/origin/pull/179,216ad700706d88020b9a9f8529f023327700320f,7dbc9be62a1d9cfb80c08c1442cad3e0c165d822,f4d60cc41ad61637b8a179598c474487339b852d,,True,True,True,9,40,301,2,True,9,Tests_passed,d53e14af08e6a3646bf43a495645d2fea68a4b6597bf738903f1121c0f6ea055,True,Tests_passed,508983b6287aec8b2a578a902128afbaed934ae5ab21c9ee27495a212657535d,True,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,f3c435a6ac6ddbe2238b317c64e833c0dec78fdc0440b48fc76ac7ad81eaaa22,Tests_failed,f9de5c7e1fd1709c722d5c02d710c9daf0fbc809b3c2c5d87373d3cf5b6126dc,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,f3c435a6ac6ddbe2238b317c64e833c0dec78fdc0440b48fc76ac7ad81eaaa22,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6 diff --git a/results/combined/merges_tested/stackforge/monasca-common.csv b/results/combined/merges_tested/stackforge/monasca-common.csv index b49d622c82..4a0e58b39c 100644 --- a/results/combined/merges_tested/stackforge/monasca-common.csv +++ b/results/combined/merges_tested/stackforge/monasca-common.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 114,refs/heads/master,856542f7e63ab0de3f7dcd4c6428ae30210a4ee0,f45ef6a540ca83b78fa11330201eeaed529b70d1,d832aeed98ccae4a192c61d24513b358f7837f69,,True,True,True,8,33,94,2,True,8,Tests_passed,14a6d00455b889e908fd0aeb80b1591b99e2e3668493ec2954be193e809dcc96,True,Tests_passed,62be44340c23642979c33b417de7f5cc9a0315cb1a054ba735e2c2211aac638c,True,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047 diff --git a/results/combined/merges_tested/stapler/stapler.csv b/results/combined/merges_tested/stapler/stapler.csv index 27a6889450..ecbba481b8 100644 --- a/results/combined/merges_tested/stapler/stapler.csv +++ b/results/combined/merges_tested/stapler/stapler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,e4c10835694bc8f5db30ffa1c15c50469c60acd8,93a11d2d52296fb4b622a61baa26c1d7a6a84fc1,a9519c27c7c26e92706ae40f03a75ba002e21f6f,,True,True,True,27,75,391.0,2,True,27,Tests_passed,105ec030e9c33296de9002d165d8cc09c95586fa5b615f81613af28af71929af,True,Tests_passed,50730b41fe09bb9bc597bdd89773766c895275de7426d87f7cf97850ae4af7d0,True,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Merge_timedout,,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80 57,refs/heads/master,81fbe28f9ae423dd16875f0efa768a7130b04575,6bb635895e7c27b96873ed711549a42c6a50ff65,a458b705aa1e88a129b76de719c823dce91b72f4,,True,True,True,44,137,385.0,2,True,44,Tests_passed,1c5370ba464ce19d1d38923c812a603968496a95eab1c01fbab237a9e8aa6b21,True,Tests_passed,52245b79eee217aa26eb5f252c949b58fc283c6bc3de35acbd739caf564d7660,True,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,20f19cce80bf119501063f2fe67bca5585c9477070178c2e0055951eabf50066,Tests_failed,43bf365ac15ba8bd9346d9e44d604407cbaf3e626e7d51b270a066feece7801b,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,20f19cce80bf119501063f2fe67bca5585c9477070178c2e0055951eabf50066,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58 63,refs/heads/master,b7b6502611c4fa5a8921f486b1d1646ee9c515c8,c32f9659033756f188d8d84664b15bef217c7cd4,8c0c83f98c413167126c1f87a2185f481808dcd6,,True,True,True,14,33,85.0,2,True,14,Tests_passed,2899bfbe9aa23f613cc9078e34348490b227a4d92aa036fc4e1396fff8af8927,True,Tests_passed,d05642ba15f3a93e5a30990a645b4367bf136ac2232895decf62dfb56597ce17,True,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,5b97ea73293d076a266ace7e80f9843274c8907241dc7604ebffbb3221286bd3,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,5b97ea73293d076a266ace7e80f9843274c8907241dc7604ebffbb3221286bd3,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37 diff --git a/results/combined/merges_tested/statefulj/statefulj.csv b/results/combined/merges_tested/statefulj/statefulj.csv index 04387a8ec8..fb3c36eff9 100644 --- a/results/combined/merges_tested/statefulj/statefulj.csv +++ b/results/combined/merges_tested/statefulj/statefulj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,04a51e8f65b0c1d909e035b63f77a12578cf0611,2fd1ec4bc04c51134b4d8f9be03713bf41cf47ef,68f69b76111e99a70e13b00fcc186531eb2cbdcf,,True,False,True,3,5,37,2,True,3,Tests_passed,7780dbed8659d784b31a924e4d8eecbe72642a1f2ea88080f7fee7f04b3efa45,True,Tests_passed,8ab6c1b017b3ebd08f66fb343f3f7cef463c4a3e4ccfc91d3d6616e30e5a59f4,True,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_failed,b69946fc3c71375276ef0ce2a0f15c2eacfeda5e464390c40938422ed3500536,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec diff --git a/results/combined/merges_tested/stealthly/xml-avro.csv b/results/combined/merges_tested/stealthly/xml-avro.csv index 642fdfa858..9ecc5d89b5 100644 --- a/results/combined/merges_tested/stealthly/xml-avro.csv +++ b/results/combined/merges_tested/stealthly/xml-avro.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,4459180f2931d596524621a3b388e756cc4a22e9,d0868a18ab93de4462f37343af37b1c448431958,41fa7820085f7a1b2c1fccb8bb65d1bbb0d4fa93,,True,True,Tests_passed,afcb3c36b18d285467c3bde9f18283be752fe8c1c627a90fa7d5cb38cb5b09dc,True,5,25,77,4,True,Tests_passed,6b88d04e18ef20ddd964f81a4fafb07c894e88ffe99a90d6a6ebba6ada256b6b,True,5,True,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,4e9f48a4503fcc91c2e516e5ec986b104da3162ce509c3360185a9cb9ca1c716,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,86919f951feb17b4b8623737cc1e03fd6d5228d7b2e9e319f73019cab6759e20,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,81dcc0745ba212e9d08bc6c5a82060bfb5afd58d73e7918562982c92daba7aec,Merge_failed,35bf85436622ce6f3065d41cbb4a99c6edfef6af9c73a1ab9169cb82db500828,Merge_failed,c4277c21d9933cf828a04fdca394375f26c5e6e1b4770bab81f5da24d8a4957c,Merge_failed,be5f9bd0991b5ee1668562df8f2a4fc586a43edf156a04522996b7d8cccef81e,Merge_failed,35bf85436622ce6f3065d41cbb4a99c6edfef6af9c73a1ab9169cb82db500828,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,86919f951feb17b4b8623737cc1e03fd6d5228d7b2e9e319f73019cab6759e20,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,dcf48b896cc0d32e02dcff99e2ebb534ca6f5d698008d23dfe314983bc964c07,Merge_failed,c4277c21d9933cf828a04fdca394375f26c5e6e1b4770bab81f5da24d8a4957c,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,4e9f48a4503fcc91c2e516e5ec986b104da3162ce509c3360185a9cb9ca1c716,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f 7,refs/heads/master,4cadd7d11f80af746499bcba731b0559642e621e,ac3bea4c04b2d23c845194634ab600d700989a37,9b30127c7477a4977b3a01198b06a334a229691e,,True,True,Tests_passed,c01c9bd493a0bec33888edebebf8a2960416874d5cb5995fe54506a1d48e6f74,True,7,14,151,4,True,Tests_passed,504469fcf40bd00d054cea9564f90575d4bf1fbce2e62023b5f75a8675a1490d,True,7,True,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed 10,refs/heads/master,feac27fac88bcbc7a1161e18bc15e63c3a3e4949,ad0d1a9a2158e4482248099acfb658fc31a86af3,12fd7407f9ac7f9d1fbfe6c2dcec035f9811152c,,True,True,Tests_passed,011873e7a02d53140f053d5ad8ee60ed39943ae479e90d38b205573fffc4908c,True,4,11,110,2,True,Tests_passed,6ef5e5008f1df1eeeaa3e1249a6dd074bbf3d3ea2c1e0e5d75ae160fa1a340cd,True,4,True,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,73abb852763082d0a6fc0dd9966782a8f13f6316696850c07f123021ce1c5a15,Tests_failed,461c9118f33baa8dd3e7d8c661545226df39ed09d3940d5469756cfac0f81c74,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,73abb852763082d0a6fc0dd9966782a8f13f6316696850c07f123021ce1c5a15,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8 diff --git a/results/combined/merges_tested/stefanhendriks/dune2themaker4j.csv b/results/combined/merges_tested/stefanhendriks/dune2themaker4j.csv index e1475f5d14..7711ab5d6f 100644 --- a/results/combined/merges_tested/stefanhendriks/dune2themaker4j.csv +++ b/results/combined/merges_tested/stefanhendriks/dune2themaker4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,8426f1fdc3f2eb6556747ed43b0e222c18609cf4,840f47146f6f489d8a505cc11ac1e512dbd8568f,dfa8b828c94b016577870380a09501516c78d17e,,True,True,True,16,58,699,2,True,16,Tests_passed,a2cea90b1110718f8bc327e77c03a6a087da9807860a131ea03b514821e40712,True,Tests_passed,4bf82fab00f13633cc4d6e8e4ee891ec15c63199ad8e2f75a8bce04be6870c70,True,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,1720b37c6c3bc6f70c57cb450684d13c448153badaf09de7397075ea8200e59c,Tests_failed,438ad1103760105cf368e7f1aae5733a61d25801f756f495612be0993c328570,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,1720b37c6c3bc6f70c57cb450684d13c448153badaf09de7397075ea8200e59c,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4 6,refs/heads/master,fa32851fce4806699ba6828e72e145fd0107837b,90456df635b83ac37be5033d96e119f530546d5e,846229488ab051e5265797975731d9cd8ae212ad,,True,True,True,61,236,1808,3,True,61,Tests_passed,bc6e14b3e17641792dbbbd6ef8e66a86acdbab4678d16b7996d5eb9e3db49848,True,Tests_passed,57cc38753454497d67a6657a342c1c0cc4b2865738524f4c2fbc3a52174cc3ab,True,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,7857064672993b15305d334f2dea2d4651a31402a9e971bce36bc46dd8aa531a,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Tests_failed,3289f320d7fa69a2f3c161d0f59485dc6f8d04e55dc1ad60fc790b880c906df3,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,89fb0782f5470d1644316e9d7d3487c35faee1f9d23ee5077c2ff85dfa5bc4d9,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78 diff --git a/results/combined/merges_tested/stephenc/high-scale-lib.csv b/results/combined/merges_tested/stephenc/high-scale-lib.csv index 5806be7e17..6381aa5e8c 100644 --- a/results/combined/merges_tested/stephenc/high-scale-lib.csv +++ b/results/combined/merges_tested/stephenc/high-scale-lib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2d63f18a07e62c62e5e72666a35d36bacbe95798,a8867cd95e0131f8c2fd9c757c6550d2e3a5aaba,634dceae3ff00fc9ae1b533dc77e5e53f969817e,,True,True,True,30,65,696,206,True,230,Tests_passed,a7ec06cd2c0def7c6c313ab0a02b06ba721613f829754576fb694db950fc9de3,True,Tests_passed,dfc44ff8513b67e1bad86a919a8cdcf6d11563b2fa4d18ccc57d4ea75e4f5c71,True,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,ddc604ba3d70cd1dadf956a0b6c0e32ae41d17776553654d45fec9bc32164e40,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,2b351ca15081d3a8b7ae16c58d7507bff86483185b3c7d5776b8ea963619394f,Merge_failed,1603069cf0e47cb88b1263ecf0e840e996678a9db83b3b1b8b9ee85597c0b06c,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,e4eb2ce5c35bb70b634b7bafb809e2d18c7dfeb0532bd3216ef8e9eb12ce5e7c,Merge_failed,56fa4711ac756afa44154cffa884adc906068f40c5055da418efe256caa4ff9f,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a 5,refs/heads/master,ec85ecfa8178b3c3d0d6da35144c2230adcb7c6b,59c7b863b410edea5a43498c851c13a4c519d36d,7ac5bed87d157f4bbc808165e16e95b4bb85974d,,True,True,True,26,35,823,207,True,230,Tests_passed,1bfb57051a2ef143aac676ad0ac894c52d9638b10f5b4d08522cfef55486a4cd,True,Tests_passed,ae0958f7da679d69b1ee701de4cfeaa3e3d6ddc3bc9293ffe617764fc2f338a1,True,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,10791a80d092c0aca2509d0af09d6eda0041c06eb891cf64b143fbfd3a188918,Merge_failed,d12a3aadef2fadc5f59d114afd6e2cd756d272b4398a99dacde9bf2b8e64f535,Merge_failed,7aee608b74778bf3b80e2a8e1a1eeb140d861587579188727793dd56564514ba,Merge_failed,af89533bd800c7e1fe69417f5d09283f7f775ffa6c9690ce327a81ad10ed840f,Merge_failed,d12a3aadef2fadc5f59d114afd6e2cd756d272b4398a99dacde9bf2b8e64f535,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,add0c0a43c116a69d5bcd51fabdd62bc6b1bc8ed339dbdcab62780df630b56ef,Merge_failed,6f2750e5ba69e2bd6a21df3fe9f70d4cb823cca7270b5992767b13115823f6ad,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7 7,refs/heads/master,c907304364b47bb9e246fe608cabaecaab110576,240830a93ffd5ca811403f490365d81fc0dee781,3fba09a7d6b12d2e3693778614bec5e2dc5f38b2,,True,True,True,36,147,2497,189,True,224,Tests_passed,0b8e6853e47b9ca5f2f17a86de3c4f3fade9b241a604dadb6e5dd73b13b9ad5e,True,Tests_passed,cd8472f5281b7b5fafcadcece97627bba5a64c3b1399da13f33f1be32edb9df7,True,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,e6e85e4e389d47642053a392555fccb9afae5b04ecb7f82bfc2dc375e3f31c61,Merge_failed,83678a38bed7b855f6796c2139dd8e2a5acbf7dc842a1b5686eb22cff5a4f2db,Merge_failed,0fe43f21a45c44b9edef0594641c969fb77228d99724903e8f1330e55bd874ba,Merge_failed,0fe43f21a45c44b9edef0594641c969fb77228d99724903e8f1330e55bd874ba,Merge_failed,83678a38bed7b855f6796c2139dd8e2a5acbf7dc842a1b5686eb22cff5a4f2db,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,9263b4030a2db30b0f1ceb25ef76c6255ec536cfc540ca7871b1b5a1decb0970,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc diff --git a/results/combined/merges_tested/stephenc/java-iso-tools.csv b/results/combined/merges_tested/stephenc/java-iso-tools.csv index 617ea54fe5..ccef2a0bad 100644 --- a/results/combined/merges_tested/stephenc/java-iso-tools.csv +++ b/results/combined/merges_tested/stephenc/java-iso-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,abb37e3cfda2f2774f128d2a4f8299b4d721b452,f1d38f9cb55dfda2daa2fdcc17450748d48e5b69,e19d5289c8764302aa3b53fabaf9b1d03742d5d6,,True,True,True,32,106,695,3,True,32,Tests_passed,cf6ee7b8f349e6091661786faf71744a24ed828424573aeafeabfa71d8b7e581,True,Tests_passed,1b211d7188d7dcec5f00c10c2e40047a2281ccfbb5ead8a303a1bde7b9958485,True,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,9c05a984098a3fa0c4e2e3708454523f67e30cfdea032124e45d9768abef6dc4,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,1ce65bf3b92d87f0970e31767226b6d380ccf770e44d6d78699b5abea3ed1836,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,dbfe9b393650cf1481a7b95e2795304760acf58e1b5c561bedb8f5f11ea8634d,Merge_failed,83c7bb83693783cc548ee3edda5ac9f8ac361e1cb22ed160d05920fe2de0978c,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00 diff --git a/results/combined/merges_tested/steveice10/mcprotocollib.csv b/results/combined/merges_tested/steveice10/mcprotocollib.csv index 42987893b0..5c14efc54a 100644 --- a/results/combined/merges_tested/steveice10/mcprotocollib.csv +++ b/results/combined/merges_tested/steveice10/mcprotocollib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,8b5631f78529bbdcc859bcf819b236e2c286e16f,b767a94417ee3392b2e294548b1cabcefe87acbd,a52397949ef05aa9794a917204b63fdaaf21cf83,,True,True,True,44,94,299,4,True,44,Tests_passed,dcc6e8158452a56028131478c553b1c70f0bd0e543e8ff5086ce2ea991998774,True,Tests_passed,055bb2eb391f1ff9ae3a72a6d483e67caca8a3bc1b818854ab88cc810265a9e0,True,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,c2c33ff53d4d2b00aff0bda887d3d1164c9758d7a764bd286d1ad1563f683123,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,c2c33ff53d4d2b00aff0bda887d3d1164c9758d7a764bd286d1ad1563f683123,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d 8,refs/heads/master,b767a94417ee3392b2e294548b1cabcefe87acbd,8008081eed651c5d131aa8cb8c28ad89f38f84f8,60547d54fd5b67a596183cfc4198c462ca750331,,True,True,True,114,205,4776,7,True,114,Tests_passed,786067b1b87560448b48381cb3de6cd8709ff884543515a8e1045fbed9c0384f,True,Tests_passed,71f6aa461df2a0f9bb14fe5082d0f661bdf308d76eabf2820a40c0c1ca0895ca,True,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,8da3bba42c4d90ccc50597afd9b81a37c6f98f3c2c3e347aa8ea4182070c5e21,Merge_failed,7a41f1f5c1218d46c2fbb0da509bf2b8de83c74f7134a02f5626c2decdeb9fac,Merge_failed,48f2679419779d18f63b0e45b7e1a0aef5f6837121d4d6c89efadce9e7b687f3,Tests_failed,c4c3f74f58e388f1ced874d436920ba04e1f383e4150fc14aa4bb30a43912b81,Merge_failed,7a41f1f5c1218d46c2fbb0da509bf2b8de83c74f7134a02f5626c2decdeb9fac,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,21176b04b764a30594beb3d3a47eae9d362641374dd23e61b17e5260ca942fc6,Merge_failed,48f2679419779d18f63b0e45b7e1a0aef5f6837121d4d6c89efadce9e7b687f3,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71 10,refs/heads/master,3bc9926a38425d608c601e301bb3f89c9668ab2c,867e5e2bb66c3e6e8d9c3dc399a35895e694dedd,70b0fa1bd42c28c3d7db886a92e613709dc9e1e2,,True,True,True,94,167,4731,2,True,94,Tests_passed,c1558ad1373c3fc08d98049053cf01a8439697807d9ff02fc875350be252d74d,True,Tests_passed,a728992cfb951923482349028db085684dcd462d860812168c5c0e18a3c9c55d,True,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,0fe75b1272ca6195cbf405d21c5d99b11ead8969d41a4dfa26e5d9b7846280d2,Tests_failed,639c83b25032d4fe88db3c7e3e0ec3529680200b6f6641ba65268d2b541b79d5,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,0fe75b1272ca6195cbf405d21c5d99b11ead8969d41a4dfa26e5d9b7846280d2,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d diff --git a/results/combined/merges_tested/steveice10/packetlib.csv b/results/combined/merges_tested/steveice10/packetlib.csv index c4d8cf59a8..2a5144636c 100644 --- a/results/combined/merges_tested/steveice10/packetlib.csv +++ b/results/combined/merges_tested/steveice10/packetlib.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/remotes/origin/pull/38,6fe86c063737c0d01d8ee7a1df92a887d4aab3fb,ccfb1aa94d25e4ad4fad52755d59fb88b10fd71c,9d4b476d200d07177db68256846441e177f18501,,True,True,Tests_passed,848143eb085b2a346571ac07c520751d038dd51a215c71fcc965017adda17cec,True,19,68,825,4,True,Tests_passed,b28d8e5bdf21eff371ed29bcace91a020365145edbec7b8771883239faef8882,True,19,True,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,3a1a009e8872c83a1f3ce36c0e879cac9f50a22ef25cb139664f872ccece206b,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,dcd91a4473e7271afaaa56d6c852942ef5ffd97c1c0a90ff45a6346c507587c9,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,02532e122397c343653ba8a366d3a7e38d5ddce4f4bf2ff10b8c8e5def20d681,Merge_failed,cd6024681578b1a2c5f09a8504652f6f48ef236f697843b205b8ff3a22ea9fda,Merge_failed,0a53ea84df467b9753a0f2c636409bb55a77846274306837e7cbbc26dc46628f,Tests_failed,aa5bfca88c8943e457fc97ef7c842aa89419e4398b4eeaf12ac3b0fa64288e26,Merge_failed,cd6024681578b1a2c5f09a8504652f6f48ef236f697843b205b8ff3a22ea9fda,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,dcd91a4473e7271afaaa56d6c852942ef5ffd97c1c0a90ff45a6346c507587c9,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,ca5e67155faff226c55967dbca5d39c18367874efaf5ef0f330ec70afcfb81fd,Merge_failed,0a53ea84df467b9753a0f2c636409bb55a77846274306837e7cbbc26dc46628f,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,3a1a009e8872c83a1f3ce36c0e879cac9f50a22ef25cb139664f872ccece206b,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76 13,refs/remotes/origin/pull/38,295cf3e47add5dd28970797dbf371a7afde444b3,75e3b5a85416dfd0f0ca7e9a8eced4cca810810d,0b7557069e3f8a7ab42caccf5b0a9fed7a7b6028,,True,True,Tests_passed,913cb9b9fa839697f26e14177e9a166fe63bf50986f065a9daf5e30ad90c625f,True,8,18,571,2,True,Tests_passed,f3b747ed50cb104aaa357420855a6955e9f034a1f452a4c2f119a96018c8b5dc,True,8,True,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,6d66af17c2528a95cb003fe3633867bf5b0212cb645093f8b91b8d389a8256de,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Tests_failed,3bd1246f6b80fcf1cb7dbc845f6902e6ccf5d38702b9a516850bfcf53453a414,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,f855097dac92189650393d15e7e4e0b8555604d5d15784c9d00b03e89715cb1f,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d diff --git a/results/combined/merges_tested/stevespringett/dependency-check-sonar-plugin.csv b/results/combined/merges_tested/stevespringett/dependency-check-sonar-plugin.csv index 658298ca80..88d1d736f2 100644 --- a/results/combined/merges_tested/stevespringett/dependency-check-sonar-plugin.csv +++ b/results/combined/merges_tested/stevespringett/dependency-check-sonar-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,f0032e903f332c22e4beb65b317edcafb7fdf2cf,0fbbfe26315c8cff715b08c614670989901aeefc,801282bd403a83d7c7bbf8fa83dc4ad6b6f5bbc0,,True,True,True,26,145,913,7,True,26,Tests_passed,656f067fa50cd57bcf73058e6d9882cddaf19c9271e07f1072e7423058fff067,True,Tests_passed,5adc31a7914b605c1fe722fe4946e32f8e984b5514d83c3f2fb748e8ca09fdb7,True,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,fa20fee3761b10f0e67468fd9e2b8248dbbc1cb864565157f745495e0c9146a9,Merge_failed,4804daad8b3a66539c0e0745ddbb9eb01ab0d17fbf77168a37d5ea2f77964b35,Merge_failed,c0a829b882794d0c66091e6f70d72008932485bac83706c6d132fea435fc20d8,Merge_failed,6cbf698a4dece8d578f2e9af856bb898b366f364fd7dd618aa4f3cc2a9f48b4a,Merge_failed,4804daad8b3a66539c0e0745ddbb9eb01ab0d17fbf77168a37d5ea2f77964b35,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,2763151a248858c02f9d6776f097bb8a009c44d5f435cb3100bc3a070043ca87,Merge_failed,c0a829b882794d0c66091e6f70d72008932485bac83706c6d132fea435fc20d8,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623 45,refs/heads/master,b3cbcd1d5b0a89d5651398bc0afd9bf04b204183,64e5a244761eb7c11334ee42d9b6f5b734b202bf,64a20550b8633495a6442fdbbbb3b562fd7b6b73,,True,True,True,24,126,788,3,True,24,Tests_passed,c1b23d5024b473a4add1e2d3edee58616407786d2c1ef6ef339644e4ef7cc861,True,Tests_passed,76ead37b6f8e0f9dd7baed602b49fb6a0552487afc863e9bb1637d3b96eb15da,True,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,65a2acfb2f0c042363f3f5918ba8a792443ebf8165042e3fb44e44d936056bed,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Tests_failed,fc5fc2c2c1b15d8bd7d3a83d2070b89187d39587d707b06819a392851f7612a1,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,b7567b3094d964fd1dbf037eb9b9cba88b2b3fb39131cdcbe283d158851ed5a1,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7 50,refs/heads/master,4860447c5040360d0bbfa21c8da9f0eefb60b8d8,2e980f513612eacce7a5a9b89303cb4947b52720,342ada025b42c92395b314eb7e3a3d9a9c6e8409,,True,True,True,16,41,134,3,True,16,Tests_passed,0683fd35defb0479bf68eefdade5398df8c6099a581d36371779bb4736fad8c6,True,Tests_passed,87d8480289fa29d565c4b7de440676e7af019773700b8b4ca4a54dcd5cd5b4ec,True,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,f6fc1f69a748a1947c765af8271db104a2d18b4fb32e524c2e8aace066f04414,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,f6fc1f69a748a1947c765af8271db104a2d18b4fb32e524c2e8aace066f04414,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63 diff --git a/results/combined/merges_tested/stoicflame/enunciate.csv b/results/combined/merges_tested/stoicflame/enunciate.csv index fa46728652..246c351a8e 100644 --- a/results/combined/merges_tested/stoicflame/enunciate.csv +++ b/results/combined/merges_tested/stoicflame/enunciate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 151,refs/remotes/origin/pull/1191,46949ae95bd07a25a0c66af8bd4e523ae21009d0,e5132c25ec1e98c91c9527d5b8e33ba4a5289572,1d6fe66363d73eedf0e9ba1fdb46a2010e752aa7,,True,True,True,9,18,1552.0,15,True,22,Tests_passed,cd0b8a7ad85ec9c762cbf5bcccc0bb20e235aa8dd5526110672b209085d746d3,True,Tests_passed,a5fbd41a2b94dacfc242203b7ffd37b4d189c4c01a11acaa9545edd6805d1d5a,True,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,94221563edf43b1330de689fdff480ccf874ac9774f48a02bb8c68b120d8aaf8,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Tests_failed,7aec0242fe2020399f3860cca7669db3947b1b1584d5543ce68ae4c4eda24c1e,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,39b05506380a0906cde745d61b7a7db089540e0c8c38004d0277361ac37fdd9c,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7 diff --git a/results/combined/merges_tested/stratehm/stratum-proxy.csv b/results/combined/merges_tested/stratehm/stratum-proxy.csv index 389ca745f1..9a34077732 100644 --- a/results/combined/merges_tested/stratehm/stratum-proxy.csv +++ b/results/combined/merges_tested/stratehm/stratum-proxy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,8c4102f284113c997d59037ea34224af3ef3b185,992ba71bf1093b04c68d4a938610e26b7d676d91,7fda0004f7456e0f43c7c7ac17945199be7e2290,,True,True,Tests_passed,90bf57f94d28323b9ba153bd612d4791f35508ff1eb2e67d9ee87b8d9a49b69b,True,14,49,651,2,True,Tests_passed,082c6eefd696ab9d39299fbb6eaf55032db2ba8849d81610b76b7ad3e3536d1e,True,14,True,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,23435d687be2fe7c7b632e4da358458039b0d0c00bf8a543076d8e90f67aabc7,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,23435d687be2fe7c7b632e4da358458039b0d0c00bf8a543076d8e90f67aabc7,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01 8,refs/heads/master,185a97668a9fa06017dd079fcebb91ce44fa2ef6,9a9b1254809deb4643c384d8b67485a226781852,c03b71882dba613280d87d11f9377e9b3dde3406,,True,True,Tests_passed,1991d719fd78aa7b9a5778f694c4626934bf650d9406f2512c64cc9468d3f430,True,36,72,10240,2,True,Tests_passed,114c06533c0fe832eebd2da2679cc984368e4702995bf1ef02a468a87b985f32,True,36,True,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077 9,refs/heads/master,3d9c994eece6a6a6ccf078915a9d6910c45b2f03,3fd5355bd4c07a05267725f0e00666f35f741388,63b33eb55d283001972542ea87b2c67a0235e60a,,True,True,Tests_passed,c652865911836fd6f08c345caede665dcb77b47c7b19f1adcb67e0ce5eb82c51,True,31,74,8826,5,True,Tests_passed,d11b4e43aa177597722b106f1c84f1afdc670630108825cfc9566689208a5e3d,True,31,True,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,03db79b9c7f278577ec591661402fb4b9b7fca35ea3e25a413ddf38467acf58b,Merge_failed,be7d65f4c309e64c80e2fd87c84e7e4ace5bb24fa352cfec4ae9e87eac3e6c14,Merge_failed,07f14037c86966089cd360e966943dda37d1e2e867fc99b63a3950cc772b5da0,Merge_failed,6f28d4a3892b2bf2d744d0fba7eb6c1c7616dbbc29eec5c87f84ef301ef36a9a,Merge_failed,be7d65f4c309e64c80e2fd87c84e7e4ace5bb24fa352cfec4ae9e87eac3e6c14,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,f69b53533f1fbe1bbbc444e4138a5e3e268c87c63fcb5346cf3a7569a77f6078,Merge_failed,6f9e240b36de19edcf8ad6957aadffc2d4599f413ab2a9bb8616791eb0f449ac,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d diff --git a/results/combined/merges_tested/straup/dogeared-extruder.csv b/results/combined/merges_tested/straup/dogeared-extruder.csv index caf5b55737..ccacb31cbe 100644 --- a/results/combined/merges_tested/straup/dogeared-extruder.csv +++ b/results/combined/merges_tested/straup/dogeared-extruder.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/main,9e1591ef45445b96c16a787ed817e71b333c295c,d7748a9ee58f3533bf9eca648fe11baf96d3f0fa,d1d2cbd7e3fda4fcffd32aebe80b9a7f4950fcc6,,True,True,Tests_passed,afb54db05a64eda23dc414eb296bf85c5ef3feda7d07bb63e6d1b4cf53f825d0,True,13,35,97,5,True,Tests_passed,4871eec25edef1f1af4c46029de144e6f8ae8242a748452592b8ee898b0f360e,True,13,True,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,4e9baca37d4e98840cfe2b8a94e55206a210418f168a48bb57bdc502a28e9e2a,Tests_passed,e21d23fcd1b700d388cbd90f636706376a9c334ae75c7e756ce7a8e8daa05a89,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,4e9baca37d4e98840cfe2b8a94e55206a210418f168a48bb57bdc502a28e9e2a,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529 10,refs/heads/main,0176ca61e4bac5035afc89e56f3063a206c3a660,4f94ff016cdf80bfa4d4484fd90811cccf32a24c,033b2ad62057286ac831cb111a73fb198852794e,,True,True,Tests_passed,502193e884edab48b986df72b3bc764320c2e1029eac743334a557e206b73592,True,12,57,518,4,True,Tests_passed,cf551a3072e83514947fc3c543d6854819268e726746c374175de33e4aea2bc0,True,12,True,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,b2f9d005b4d460d986a0a47b2f4d876c7318fd917056e5c0eb4b2a9aabce7d40,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,e8c402eca4edaf12a977d26fa4871730ceaa2d1fecfdbd05d5b5746ed40d76c3,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,7e67e5cfe2409d39644e35ee5774cccaf3172ede49d6cda90561f01d9aa7f2c1,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28 diff --git a/results/combined/merges_tested/stripesframework/stripes.csv b/results/combined/merges_tested/stripesframework/stripes.csv index ae9ba52d3b..9e4748d149 100644 --- a/results/combined/merges_tested/stripesframework/stripes.csv +++ b/results/combined/merges_tested/stripesframework/stripes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,2d7384a930c879ba29b87d3464de2d5807763e4a,74d8ef7c3c30424fca6af159678edf3c312d0a0b,a1ef07de7784fa30b030c310c5be86e25293799e,,True,True,Tests_passed,9f5556528269e22743f80cf773e53ac0c835c050362c97f0253df0db16f5d549,True,337,6006,32922,3,True,Tests_passed,308c7026258a2e4186b7f5ab891e4ac58d05b1ea0a61fbdaa43846dfe41558d0,True,337,True,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,aeeb95c15210762dbcb3f2f38da5dd7e139e2708c5c2e6e0b3a3f2909eb27c1a,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,45a934f626032f480a4024366f9e26aebb4027b5dfd1838b8700add8cd9906e8,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,ff57aaece3f644f0856a6ecda4119bb85b71aaabf84d6bf59a8a9376ed5fc48a,Merge_failed,e0f2e381c38bcde6fe0010d45f33f424a678c3eb6e4ac1c1d84a3a3a066d1d64,Tests_passed,9aec15d562cf90032901551d11d29fae286c92f001d14b030c28b2e35caf2ad3,Merge_timedout,,Merge_failed,e0f2e381c38bcde6fe0010d45f33f424a678c3eb6e4ac1c1d84a3a3a066d1d64,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,45a934f626032f480a4024366f9e26aebb4027b5dfd1838b8700add8cd9906e8,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,14ba9a1fa759fbd3d83dce7cf60f67303c6a48f0d4fcd58c27365a0412d302ef,Tests_passed,9aec15d562cf90032901551d11d29fae286c92f001d14b030c28b2e35caf2ad3,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,aeeb95c15210762dbcb3f2f38da5dd7e139e2708c5c2e6e0b3a3f2909eb27c1a,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c 8,refs/heads/master,28a8f08ed74f8c2082076c5b6cb79eed3a111150,61e31c483e62accafb29de9ffef8186870de57a7,a06cb5f3e874c90489f6d7f96eb22fa2546a2411,,True,True,Tests_passed,20c6d325506af3209c7697d0e95af238cc1fada4a6ca4e1afd01baff3889c405,True,32,60,395,2,True,Tests_passed,6f6fb3639d976afe3c4dd8831fd3acbe894df671b47310088ab0075f9576df97,True,32,True,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_failed,412dd7ebce9c0ebc5fc0a65b36704ff4ced3755c5a6eb0a3c746916be03787a6,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9 17,refs/heads/master,6259f1ec1d8a7156eb18e010862b43eaba824692,bdc83997aa9cc5774b6e10da63e5a5e5331b2632,5c39159f63128060d297d62332f2d9f176bd3160,,True,True,Tests_passed,56e6c6e1113fe315814976b4166aa19fdb89dde97dad1d0a836c466f7076b22e,True,51,131,2311,3,True,Tests_passed,f0aacfaf38245b944eab8c3b9a0e96e54cadf420ae2f884629256a8490ee83f1,True,51,True,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,1ebc1d07fa3b5dfb7538e9f2a1dfc3b7fcc72212ad9a84db17639aa47c412095,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,1ebc1d07fa3b5dfb7538e9f2a1dfc3b7fcc72212ad9a84db17639aa47c412095,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e diff --git a/results/combined/merges_tested/structr/structr.csv b/results/combined/merges_tested/structr/structr.csv index cf0d38833d..218bfaebc8 100644 --- a/results/combined/merges_tested/structr/structr.csv +++ b/results/combined/merges_tested/structr/structr.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 220,refs/heads/main,6fc7c9a53b47fc2815ccf201c3bdcfd41ce40604,e4a61bdb2b0dc86c4ab2e5941d42bcd90f7f3dfe,43de2c909844a3a8be59080e4d3858bbef4696da,,True,True,True,81.0,565,3985.0,3,True,81,Tests_passed,879ad76a33a9111cc49adcd78160d7982225c52fb47e5fa006729cf63e5a30bb,True,Tests_passed,e3432ed84ea1bcc117f09e33907550780b48c106a1861198f8ae26f873a76b3c,True,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,056eff467ff502a7cb0d8ac1c80a634f9a683b68007c5d04f17d4e2f85058e7f,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,6c5e09e263640558fbe39c085f06fe8d6f09b5baf275eef5b8803683e9f744ad,Merge_failed,d22ead3ef7782a230ce1e4234ff9167be107e6216d94ff3e1bad64e3936181e0,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,2b81d082c3157c22719c1e0d9ac51abf910052ed69dba904926d4aedb0e3104c,Merge_failed,5c83209a2889044494a554f185284477d433057118182657d06e8cdd204eb170,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a 223,refs/heads/main,3dce42885d3c184a95b670bb56a641781d444fc9,ce1ad23175c5e2672ba580911885ba5c2394adfe,afa586111ff02c9dec4c10a94163b46960f548dd,,True,True,True,51.0,114,372.0,107,True,130,Tests_passed,b12efb9121fa4b88bd1c119dc8eafc788a142a0ab088d0872872413beb563aa8,True,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,True,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_failed,e9763559b48adf250f8e86da5ef50ea32e1d5c3947708a21f57e7878a4151f0a,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c 281,refs/heads/main,5146de000000f34dd0324bd3eeeb199d2556ab34,42dd2cb3ab143baa6ab809a4590bc56efe968eea,4d5a8f894710bae0fd7e674137604ea197230747,,True,True,True,34.0,139,2085.0,2,True,34,Tests_passed,313c66d9fc69bfc1e561fa7a75ed80405004c07b1ca4339653526d4d25ede093,True,Tests_passed,b8f6de336171b28df30f185e1816ed750f0cf569a71c4f0117d8dc72d6633aa7,True,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,53d40c6f80660c528f640f446dd3d19815e33596b44898c375b98784b4260ff4,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,53d40c6f80660c528f640f446dd3d19815e33596b44898c375b98784b4260ff4,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc diff --git a/results/combined/merges_tested/stuartgunter/dropwizard-cassandra.csv b/results/combined/merges_tested/stuartgunter/dropwizard-cassandra.csv index 173e293400..6b37aec093 100644 --- a/results/combined/merges_tested/stuartgunter/dropwizard-cassandra.csv +++ b/results/combined/merges_tested/stuartgunter/dropwizard-cassandra.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/remotes/origin/pull/24,41f878d01c4d9c8015295cdb67599294ec53d75c,1b66691a6f4f32cc2efb2748087d357277877aeb,3f3ac96ec64bd26c14dc3111f343f87054621fe2,,True,True,Tests_passed,e575dfbb7d65d89c1209175e6f85c6cb8d1a1409dcb4559dde26d4038e774788,True,34,56,1363,5,True,Tests_passed,c3af472c3d1db1511e290e0ceabaee839e53cf4c361839e20b5333c6d2630bcb,True,34,True,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,021a0ee7aba501164086d79dfa960105811f554911aece30c4ad1243ff77a71a,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,22d5ac28a0ce649b0ba23e633d0ea4c74e03f973ef9b10da4dd90686fb677b7c,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,0c1448bd18ac8255265710d8f5078cfc232f96d8e9c83887c2093e37eb6fe213,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3 diff --git a/results/combined/merges_tested/sviperll/static-mustache.csv b/results/combined/merges_tested/sviperll/static-mustache.csv index e443a24c75..f4dfc7e9df 100644 --- a/results/combined/merges_tested/sviperll/static-mustache.csv +++ b/results/combined/merges_tested/sviperll/static-mustache.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,271693c779061cde2069af7507b5721c208da8e4,98354a47addf041d851017ae5af25db72d481fa5,85f6735c24b80909fb2cef22a1eb133c7b651f09,,True,True,Tests_passed,fc7abdfc47de3fdbe7c4b5773135afc05e4fe616ea6ed47b66286fe43784ab10,True,41,188,1230,4,True,Tests_passed,5416ff038be468f55ff05f041e8725b6acf330f3dfe928100964b6c05f520a80,True,42,True,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,39c0484515dcb3f813fd9c1f07861d57091775e6cc2e74caa829ff07503aa6e3,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Tests_failed,90d78b93ab6b6bf5957420760f252f6f6d0e30574eac9943535a1c2dac967e3d,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,6b8ee1be8877d034fa8d0a04485525a5306053c4b740979aeb923757ef917189,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282 diff --git a/results/combined/merges_tested/swagger-api/swagger-codegen.csv b/results/combined/merges_tested/swagger-api/swagger-codegen.csv index e9296f2464..9f02a62b0d 100644 --- a/results/combined/merges_tested/swagger-api/swagger-codegen.csv +++ b/results/combined/merges_tested/swagger-api/swagger-codegen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f477ae83aab64a76adc3d22b555f64127300bef0,11d899c9cd8d9b001d57e1e3f13a455a2588417d,2d21bfa21ca5df8256cd46f34b22442235d4cb30,,True,True,True,1075,5828,72772.0,6,True,1075,Tests_passed,fd033267d0618e2933939dc5a616603a3868ab9b03d765c86c34b70b9b012c7d,True,Tests_passed,9d11a0c222ac05963a0176917a052e61e7dd218e77fc9fa27484ba230414651b,True,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,5d656047c4e02a680e49948fb0ce07babd78a0e31a10a1cffde06837a507e4c1,Tests_passed,524318fac11ad760a84106c99d046ccc288948ec6d25eb23e6113c7d8f3d2550,Merge_failed,af8a60aaec0b68e3fe4c312003a6450ffcff6f0124a7caaf537cdabf3bbde032,Merge_failed,31e1a03174ef55fe1515aed598a1ca223e019b6bcb0ec4309ec7330b53705f43,Tests_passed,524318fac11ad760a84106c99d046ccc288948ec6d25eb23e6113c7d8f3d2550,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,66863e8865b06228deb948b73dd5e45a8c2d1ae8b39012b8a3c26c9c750225b9,Merge_failed,3853c6ddef9ef8a2e8176c9d6cc2016518d621b0c9817b9569699009941be94e,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0 2,refs/heads/master,640b16b58a4c9131c18e53f03c204ac1b7fee3c5,8153284f071ddb368597e23f7953906999c9fbf0,e66566a9710a5f65e89986bac8fe533164e5a3a6,,True,True,True,838,2132,43826.0,2,True,868,Tests_passed,48153184ace34e1c856723bf80621ff8304ba211dda610a6e1aa0346ad6727c4,True,Tests_passed,de77886ed46e96bb6e2de4bca2170c1ecb825cc88a1894698f2d644da6e4d261,True,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,670ba57294723a24bf3a5d63886ad39f9d29f8effc39cba77e8b0d254e074fd2,Merge_failed,1f605248c68b5c4a1b24840ec389740579f75f3858fd82bad1a8a51128d28149,Merge_failed,972791f6b937485148e3e459d41f9dcce91f6e7db36d3f9ffaf2c646e9d8fb19,Tests_passed,2a14fb18cdbe0af45ba229b2f3e26430e9716759f4bcfe61d486699b6d530c81,Tests_failed,aa5c91a3a7f4b30657e3ab694ec6cca667ba8f8184244c038dd68dfd2498c8ce,Merge_failed,972791f6b937485148e3e459d41f9dcce91f6e7db36d3f9ffaf2c646e9d8fb19,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,670ba57294723a24bf3a5d63886ad39f9d29f8effc39cba77e8b0d254e074fd2,Merge_failed,19f5ba1980b293b993c8fc4dfed98a3bf29a0183b2717befa9eff85a315674bb,Tests_passed,2a14fb18cdbe0af45ba229b2f3e26430e9716759f4bcfe61d486699b6d530c81,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346 32,refs/heads/master,18e6440bcc766e2ee6ed5aa072085051fb94e8bf,009a039fc541897075ba0a646ed316c962092235,b84769d1e37d54ea5fe0c2220678f7f9ab9f05b8,,True,True,True,1543,8706,105573.0,49,True,1568,Tests_passed,75e6d0c20a6e691c4536fa91c71857e7b0d2c72ec00a630326eef73fc0c751e6,True,Tests_passed,748559c0550c0d1a0ab275d978a3a5a269669c538a307055d91b47c96d18e80f,True,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,9b8a744973aaaf83fd4b82718a53a9d714a4d067b1109cd042a85de23ee7dea5,Merge_failed,2289bf486a246da325610f0dbe2448de488f1b5c20d872439d96e8051595a2a2,Merge_failed,9ecc49e8ddb8e3d821b17d3df3077253493fd305a831096413b3133e508e77d9,Merge_failed,7f4faf6b5448f8c8d7cfe50f90ee336de2aae3cd4e01fe657142f50809cfa6c5,Merge_failed,2289bf486a246da325610f0dbe2448de488f1b5c20d872439d96e8051595a2a2,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,0ef2564e1a6582c6ded5cf3eb4928a72e352d03070d9b4e7a0417f7dfa1ffe1a,Merge_failed,426b9d532c0a88b7fa958e0ae7076349c7be05900147032ab53469db6c2a6d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b diff --git a/results/combined/merges_tested/swagger-api/swagger-parser.csv b/results/combined/merges_tested/swagger-api/swagger-parser.csv index 26729beb82..d6fd81c918 100644 --- a/results/combined/merges_tested/swagger-api/swagger-parser.csv +++ b/results/combined/merges_tested/swagger-api/swagger-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,9c6ec9e5c91fa04147c9e52ad7fabf9bd7caf192,58fe433c6572bb5ca364fed5c568a7d845f6a510,98e8a4e27d42a270b530fe15a3a772334390dd21,,True,False,True,2.0,9,76.0,3,True,3,Tests_passed,20c1799e360412d3fd52574fe812708c804abbab2c00f39925d3948656c3e011,True,Tests_passed,af5168a0ef53169f3669daec10cc09c1b5140468b45768ee0929be7dced3c4f6,True,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,7534add66c8c2ec798b9a78ef0db20a9cec3c251fa2e473c0532bda246a70567,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Tests_failed,325244ec0d1a0a11c79de33da0944bb197762d21f167265a6267d03b551132ee,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,c54f74f01a4cbfc466ba08af744049867040f7a03de74868ae99c2af4897a3e3,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59 19,refs/heads/master,a3857500eed34256a0504a36d2451d69cd7e7309,c1dc15727c98685204adc64f2121b0b0c8a0c2cc,08a76302e2501b3465b4febdafca733262a802d7,,True,True,True,29.0,121,1159.0,2,True,29,Tests_passed,0993b576fcd9bb82f3b245f8578f4b841269b923d812d334359deb7a0032d68f,True,Tests_passed,fff2d3d67e567212941a8f540d111821df0eb644f002d16a22970cfeb03a3472,True,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,6d718df58391b4294dc35ca63c5ae0e370b61c08342984bd90c7f37645ecf04a,Tests_failed,8e86d87a408fc100e66d9672d03041cc61e824f7e6ccaafd422033cd0f6d08b8,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,6d718df58391b4294dc35ca63c5ae0e370b61c08342984bd90c7f37645ecf04a,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2 27,refs/heads/master,d163a6c5aedd0f6405c3825998b14df8fc3f3f83,bf01547fcd2ec03dca5d1836a4ebde38d3f7dc4a,4e31c7395c779167cec7fd50dd11a6308aee260d,,True,True,True,11.0,33,450.0,4,True,11,Tests_passed,af9aa0a0e9c7efb9cd2dedbd2656cdaa715bcb38e93261d63166644f501a8aab,True,Tests_passed,0c7e295ea51526bcd83d22a0ad496b0dea622e1143f5ff7d1f88cde8ad326158,True,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,fb6644d55e509b5c0a98b017afc65c6ffebe9bdc8ddfd976d5f68b405822e04a,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,de1d2b45e5022c9500509d5ebd48de0db76170d7a018546ec6fb86de97abc57d,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,feafd194cb56435be82ed3bb907d0e66c2a5822c473e1a323d16631c03384a4a,Merge_failed,3f4cd976dfdb8421a0bd5f7fd6015f8866acd1f435310f4a62aa688a67f8f738,Merge_failed,deecdcd6d46fb0cc0d1e6b3fd992f0a1ed4e27f95d932f51ba01c067b6505c6a,Merge_failed,09e25e5f5241b1c33af6a02aec251052caf4b1cb5c44125951e72dab1ca371b7,Merge_failed,52a5a0704d068cbc091216c1ea3e18b10c887824dc32fcb80594d4d92a4440c1,Merge_failed,deecdcd6d46fb0cc0d1e6b3fd992f0a1ed4e27f95d932f51ba01c067b6505c6a,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,de1d2b45e5022c9500509d5ebd48de0db76170d7a018546ec6fb86de97abc57d,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,feafd194cb56435be82ed3bb907d0e66c2a5822c473e1a323d16631c03384a4a,Merge_failed,1399ce0bf4936d4962ddcacd66db0b91c5227dd3dfb73b456315830daa3d40f9,Merge_failed,09e25e5f5241b1c33af6a02aec251052caf4b1cb5c44125951e72dab1ca371b7,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,fb6644d55e509b5c0a98b017afc65c6ffebe9bdc8ddfd976d5f68b405822e04a,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe diff --git a/results/combined/merges_tested/swagger-api/validator-badge.csv b/results/combined/merges_tested/swagger-api/validator-badge.csv index db3c442b9d..efa130dafa 100644 --- a/results/combined/merges_tested/swagger-api/validator-badge.csv +++ b/results/combined/merges_tested/swagger-api/validator-badge.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 79,refs/heads/master,4c639d2905ec3696b846c1cb8ca0927bba92cccb,a103b035880a9d19da895504cde07b8f7c5c06ab,003d31acb9a4d4fb58db609f0eb2ad1d6b908b10,,True,True,True,16,21,1054,3,True,16,Tests_passed,289c4c3630601c6af205206c7476db3d77c6f947e1e8c3cdf3f820b674789f59,True,Tests_passed,b9ee81f88d3f7caf72d5f8c1b22c26e2143bec6e75e8a6e4098fad028ca5e1db,True,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,4197390b95cd34f5f584b78a5d3a05bbfa9fb45edf15c63a400f252a5166ab85,Merge_failed,ba5c4fea85e4a56c9e9583010edfcc9d06604c3fbc6f15de2d9391aa5a7f37b0,Merge_failed,676950d8e8ab47452d9d5f610ec7b0b01577bc7aacd59a6a8348362e6c1f33ba,Merge_failed,96cb0bc839384473158b18717daaa7d9c7df6fd90bd3c350f0e751a542ae7b14,Merge_failed,a1735f2e6374786fc216a0c73630014d971a2dedeb01f412e61b39fd5bdd996d,Merge_failed,676950d8e8ab47452d9d5f610ec7b0b01577bc7aacd59a6a8348362e6c1f33ba,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,4197390b95cd34f5f584b78a5d3a05bbfa9fb45edf15c63a400f252a5166ab85,Merge_failed,83e7405a95d4831d6adb8d283214ac0ca24ffea397754b628b9866bb954aebe1,Merge_failed,974c2601a937cdf897450454149681b0454db2790b2f738d8827ad50a48f5bd4,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc 97,refs/remotes/origin/pull/20,2adc075f5b157cb6cdd555e4757691aa3a64bccd,7dc4cab9ca327e4717ff60cecd03e816e669cdff,faa0dbe1995a027075ea369c41b369baa9ab7c15,,True,True,True,9,69,1789,3,True,9,Tests_passed,50c8add3df8a2d8df425529ca8ef8758412ea256b517762c667244cf876a96f5,True,Tests_passed,c785097acfede3937a05ba66e846c855c1bb74aa94ed974a680e05d1afef20d1,True,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,95450ef69108b32fad2ceedc780f7b057f5559fd61e6cbaf643261c4e60452a0,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Tests_failed,8ba589c435226f7818b1210ac2fcca4ceb3a28244551786ac4caebaf2e576189,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,6caf98cc5402f280afb936cb281309a5f733f59964bdaa3c2ca1b2b9f6c6f9c0,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1 diff --git a/results/combined/merges_tested/sylvain-bugat/rundeckmonitor.csv b/results/combined/merges_tested/sylvain-bugat/rundeckmonitor.csv index d0c716126a..d25089a42e 100644 --- a/results/combined/merges_tested/sylvain-bugat/rundeckmonitor.csv +++ b/results/combined/merges_tested/sylvain-bugat/rundeckmonitor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 41,refs/heads/master,4072a5bef34ba969de10ef3aac0401f487632ab0,3b94c80a8dcb04aaea5b51494afe4d495163c4d3,47dc44315b4dc9e09a3d37384e14a6b536fcca20,,True,False,True,4,14,54,2,True,4,Tests_passed,52d21b457040105f6ed59b54c43f4c86b377194348b308d23e73e9c2e3c11252,True,Tests_passed,dcfef962eecb9455166d77c9a86cadd2f7cfdf2c1f9d53c981e9b4d3adfb898e,True,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66 diff --git a/results/combined/merges_tested/synbiodex/libsbolj.csv b/results/combined/merges_tested/synbiodex/libsbolj.csv index 9bfe662153..4191abdd40 100644 --- a/results/combined/merges_tested/synbiodex/libsbolj.csv +++ b/results/combined/merges_tested/synbiodex/libsbolj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0ceaff01a914de507b9e40736a6730d9038c022c,92859a9bd3fd681c0e316af0472d00337d803ea4,39258e9b59518bcebb9c6d5a174b7d71ac2a5cdb,,True,True,Tests_passed,af285d8d27b1e3142d62ffc0ff5deedb4220a4d8be04bac04ae3d4c70bad3af2,True,10,31,560.0,2,True,Tests_passed,b57e30f3ec812c0f49f3783627bb97f37c350c4f35775f0ef80a7600ec992860,True,10,True,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_failed,6a83b7d989d81a85a631e6bc56dc96ac4bbf36a2c7090a4c84d6919333ddcf99,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca diff --git a/results/combined/merges_tested/syncleus/ferma.csv b/results/combined/merges_tested/syncleus/ferma.csv index 89407fdbf1..5df213088d 100644 --- a/results/combined/merges_tested/syncleus/ferma.csv +++ b/results/combined/merges_tested/syncleus/ferma.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/master,f113f2c4af4aae68f922c437a4c3d6acad4daece,f1e3ab2409e5fea718b17f5d7d00b6d21fa97a0a,c89d36cdc198d6b4c6e9036e746066c98b1919a1,,True,True,True,52,193,647,3,True,52,Tests_passed,2065aef7e8b721079b788aecc58a7fc6c2df07fc6cc66e197abf007b325b55cd,True,Tests_passed,5d9f7b3e8ecb7d7178f78881cf17daf90771e64966a105cc5ccd9798deee2e8c,True,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e 24,refs/heads/master,dc1fdab4a237f587cce4868ebbdd3ba250e24926,3b4258b7d414d002eed5cbcad9ba41d807988bcb,6ef489bc4b5a1ebca644244532d951416a00705c,,True,True,True,11,28,122,2,True,11,Tests_passed,98eb3f29d6c223d4ff2c32dcaa7970244dfecb6d3fe16e4d113235bd8f700953,True,Tests_passed,32f4d5fb1514540d8f7455b815e29c0de5764cac466474c6ef7a2c3852174f24,True,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,a65af06ac944e2dc8aa0a0e2487c8c1ee661b87bb5089b8176025c72fb6dc201,Tests_failed,d61149365b6aabbbdb34e1dc5ebaa03d157ca658630b68802f0c97a0eccf3e29,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,a65af06ac944e2dc8aa0a0e2487c8c1ee661b87bb5089b8176025c72fb6dc201,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654 33,refs/heads/master,b273f174b303afbba124b948e959de1f0b4ea1d4,bd1fcbdb8897ab9e7b3bb0144fc8911f6004199f,560882f584624eadd08737518d6c2ef6b63e01fc,,True,True,True,18,81,1992,5,True,18,Tests_passed,67abd69aa1c78844723a848dd901e34d3b234e5407a0bb88d0b5ec9d4fc4e29d,True,Tests_passed,ae0431048c33bf4d606c61458bfe2a5c9fff769c11c861580bec37138b779048,True,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9a4ab58669f105571d24e418fbd93f0f2c33b3f1c183690b30526674d19cc7bd,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,c644f94d0c59cb8848b63449110b67f7b4cf91824031aea511747c8d23d3631e,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,8abeebc040f412d2fc1c78eb29394d008f884e2bb68654331a8b3c6a3f3ff317,Merge_failed,e07c2351edd941abf9e1e7ca8aa329480771786da81ac736a74ff991274f083b,Merge_failed,fa5d56073050c94cea23aabb18611e2a379e9aa3bcdf04c91072df3f58ceed66,Merge_failed,3fe29431511e5646e4067962065f7bd69f47013b271686634b2a1402f12396d1,Tests_failed,d609467166fd67d5ad6c8362afdfb574b2b9d215c9415b32ebd743b0c80b080d,Merge_failed,fa5d56073050c94cea23aabb18611e2a379e9aa3bcdf04c91072df3f58ceed66,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,c644f94d0c59cb8848b63449110b67f7b4cf91824031aea511747c8d23d3631e,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,8abeebc040f412d2fc1c78eb29394d008f884e2bb68654331a8b3c6a3f3ff317,Merge_failed,7d9d7cb87b5c7277db9e79574653db3193ff801dab4410890ab07673bad5239b,Merge_failed,3fe29431511e5646e4067962065f7bd69f47013b271686634b2a1402f12396d1,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9a4ab58669f105571d24e418fbd93f0f2c33b3f1c183690b30526674d19cc7bd,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2 diff --git a/results/combined/merges_tested/synergian/wagon-git.csv b/results/combined/merges_tested/synergian/wagon-git.csv index 2de74a4f2e..2e887c1e0d 100644 --- a/results/combined/merges_tested/synergian/wagon-git.csv +++ b/results/combined/merges_tested/synergian/wagon-git.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b56e7945f404c808deb3efd468a888226dca89bf,b86d4a227212ac808ab985a4d1c66e13dd0e3080,284865d5c003c3cac22dd04ccee674be985f1e29,,True,True,Tests_passed,5aad08b0e2f9dd4ad1dd81c8f11b002e7cb0aab6958ebade9101d3473017642b,True,2,1,2,3,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,True,3,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367 diff --git a/results/combined/merges_tested/t-oster/liblasercut.csv b/results/combined/merges_tested/t-oster/liblasercut.csv index b8c804bcfc..0e8b1d2b20 100644 --- a/results/combined/merges_tested/t-oster/liblasercut.csv +++ b/results/combined/merges_tested/t-oster/liblasercut.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,1b8d7560d2e41b046bf2141db37a0026ef3cac1f,b1a2853dbb655ba49769907231c486fff2ed7815,cf14d4d95c09f27c4efaa35b2ebc3b4530b06315,,True,True,True,15,21,61,2,True,15,Tests_passed,6a4aadcab00381ab8c6b16c5b31b2cb6163486c7d0c4c500abd726bc6b36f687,True,Tests_passed,ca59dda4d0ec61d0c35e61e10e3625837bbbe79c2055ba483b7af0658082eeb5,True,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3 5,refs/heads/master,fa6cc8f9a28e09fa9900130012d3278ed7db7c6b,0f99d85a07cab01f500bd4e6a3ec193e0265aa20,8fc7ec1bb59ce715144b09e69aa60c70166be315,,True,True,True,41,70,245,2,True,41,Tests_passed,1f95b27264646efa36eb22a9e6907f1238a3bb6aec5a586e533957455c6e49e8,True,Tests_passed,afb86d4a6167a977f05d23a7f4d82e04f497f102ffb0abe593c11861b4ba374c,True,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,575fac3af63875edf1f8764729fff130e8f3966ae54b38f64e70be15bc09c3ea,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,575fac3af63875edf1f8764729fff130e8f3966ae54b38f64e70be15bc09c3ea,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6 99,refs/remotes/origin/pull/175,ba71c74a624199edec998d1289a51ba8d613f0c1,1579437be2222bba25e19c11cb060fc4a380ed85,24d94e2815796d022512f74c9f82860b942f250f,,True,False,True,3,18,83,2,True,3,Tests_passed,d8dc900841b18c92219112c614249d305e6ff5e595d76ab5d47fbe79c84d41f7,True,Tests_passed,3c4af53ac132588e16e5684560abca5e64542c85013897c0dda1acee9993a92c,True,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,461badfbc4a0ae6af203e391042c1c9a535d8c6670e606db7125befc697c6a4a,Tests_passed,d8dc900841b18c92219112c614249d305e6ff5e595d76ab5d47fbe79c84d41f7,Tests_passed,08e636787e970920b163010ca89be184a810dcfe8a631fa1fe1bf4064c700227,Tests_failed,8ceaecae6344fa7b23b0f0a6206369f05d1bab67213fa2394e69f8256a0dc17a,Tests_passed,d8dc900841b18c92219112c614249d305e6ff5e595d76ab5d47fbe79c84d41f7,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,ceb768999a0f00a86d3c4429032ba47a625618dca3dc40ddfe62093648dc1717,Tests_passed,08e636787e970920b163010ca89be184a810dcfe8a631fa1fe1bf4064c700227,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783 diff --git a/results/combined/merges_tested/t0xa/gelfj.csv b/results/combined/merges_tested/t0xa/gelfj.csv index 2305118c92..da6051532c 100644 --- a/results/combined/merges_tested/t0xa/gelfj.csv +++ b/results/combined/merges_tested/t0xa/gelfj.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,c56a08e9b339a99cbf8e8292d35c20fa63091260,39c835a8501b8f4b37132864a73fc860d6b63cca,2d6f667c4cfe5cca4fea00f9aa18ab870255ea5d,,True,True,True,2,4,17,2,True,2,Tests_passed,b56220ec575ba65f7aa0e2dd0e1a7b5593540834b9232cc739f34453781d3ce9,True,Tests_passed,8d9e29d6504de1aa5ea2871dd220870b5d034425ecdfc68899ab0d75bc8fc590,True,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,53ffaeb4af4f01fc84b644ca7bc483c2e816260b167cc8400d4d7f74791e3f08,Tests_passed,6a16bbb032bc88c4a1631fdf7b9fec8a77567021f00be4e90d8d3814bd479058,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,53ffaeb4af4f01fc84b644ca7bc483c2e816260b167cc8400d4d7f74791e3f08,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3 39,refs/heads/master,f57a572d8c372b60afde1f1f300fdb93e3d1a194,12b0e906d74e71e914a53f94d127a54f65cc5886,6a073dd4aeab69bfe117076da40f41433126bc74,,True,True,True,14,62,212,7,True,14,Tests_passed,4ac95891390d37748067ac2a2e08f79e1f2969c88a163ffa3fd952b5d169fd73,True,Tests_passed,ad9f380f9ad1fe692f75c7c87c3bbc1c64b31f26ed925f28fcab37e64d0f2e6c,True,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,10ad6a1bc4e4d5a52bcb0af16670de6c0f76e725b063edb9dd7e40478facbcbb,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Tests_failed,4b28297863cb136d94fe8fb8d33d259e9f365dbbd3fc8d830af3312729267224,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,8f86ec7a17563dd31946ee497bf7fdafd525d3ddce8584d553fc17e36647de9b,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9 diff --git a/results/combined/merges_tested/tabulapdf/tabula-java.csv b/results/combined/merges_tested/tabulapdf/tabula-java.csv index c060887e9f..38c3aef5dc 100644 --- a/results/combined/merges_tested/tabulapdf/tabula-java.csv +++ b/results/combined/merges_tested/tabulapdf/tabula-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,7e024fc13371c195639b213f6de673be2107b016,a747549eb66bab9992a97957e0cbf98f8026a477,adb7738c87f0019cf95519ff37b58e4d4992c51d,,True,True,True,94,984,11808.0,3,True,94,Tests_passed,fb9cc791b56602f71224c4bc96cbf7c7e253aba1cdf0a8e37e7b314fa8ae54b9,True,Tests_passed,f0674227958866131334c095755a454dd45e0943bc44322633adc5f85ed22e73,True,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,ddff885d4f2d8a1adaada44e09e79eacf02113feb5cd44e62cec3f6019784b19,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,aa1276b30149efcb68b0c630f1492488a1276e4bec61e44bbbf97c586a560cca,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,90bbc29a74dd824519ddc5b6912ac9bd53943e187291ba91bbc6ec144639efb5,Merge_failed,976815eeb8b1040a416068d8cf641a03348aa87611f17f6d04b9e0a31977b75c,Tests_passed,b33a3e5d6e7ed4e7fc21231c3ff4b04385c637d0ed8b4e41e7589cffd3badf1c,Tests_failed,ea82cec54679eebaba4aa14eb0ed036413c54b0576c1985b9530ae4799e14e51,Merge_failed,976815eeb8b1040a416068d8cf641a03348aa87611f17f6d04b9e0a31977b75c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,aa1276b30149efcb68b0c630f1492488a1276e4bec61e44bbbf97c586a560cca,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,60f8192f2694f36cbb9ccab01f3167d45723a2329bd67afd38cdc3f7e363254b,Tests_passed,b33a3e5d6e7ed4e7fc21231c3ff4b04385c637d0ed8b4e41e7589cffd3badf1c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,ddff885d4f2d8a1adaada44e09e79eacf02113feb5cd44e62cec3f6019784b19,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c 11,refs/heads/master,2639edd65dc370068bdc9b438daa70f29cc5bb00,5cdb22fc1ef951cbb1c537ef4afe8aa10679a295,4aa9568a70b6748d28491648e13598e5cc097c3f,,True,True,True,29,126,636.0,3,True,29,Tests_passed,e1f5fac83cd6db3b5c655843cc76319c57c3019e4c4a6b6e35300c0e5b552d33,True,Tests_passed,a2109752e10162913817e206ffbd840a6ca61aadc1d9d6104e111c3bd43503c2,True,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,8b9f482f5a2923211191fb02d650d594de3f8ae96759ca45fc7267ae06e50204,Merge_failed,324e65a99cff254d0bb0f59c30fe92106d2756f8c66699bf5b32c770e9c53423,Merge_failed,f9ff3e96660c4ad236c67bf5499a0c4ce004668bbd9f190763b19c5e2ea9afb9,Tests_failed,7c3c6edd9c0909e7a2445d147864d48e1651952158c0d4d7e67fd0d5ff5db83e,Merge_failed,324e65a99cff254d0bb0f59c30fe92106d2756f8c66699bf5b32c770e9c53423,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,fd391fb1d73bdf14ce4400a01b76224da690de670260aaaaa8fc4ddcf42f64ec,Merge_failed,f9ff3e96660c4ad236c67bf5499a0c4ce004668bbd9f190763b19c5e2ea9afb9,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344 12,refs/heads/master,4aa9568a70b6748d28491648e13598e5cc097c3f,fde2527605acf6fb7f9923e97a17644dfe2fb96c,f2f64cfd2e1813b1d85e36192f775d1561c05e5a,,True,True,True,21,76,374.0,2,True,21,Tests_passed,a5d8226985a58393f64e86f8fba7d49d0f63210ce24a027dac7542743b50c422,True,Tests_passed,62f1e74d4b458af575398a1d7985ba0caf456ff552a82c3e85fa68133efb2706,True,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,d53f637e84deea0509f314bfb01003ff6417dd8ac903dc62b1e46dfe24df5d82,Tests_passed,bde86508d1f1227b92f929415bec77993598fe7a0bb61e363ff1a6b2d0a26d0d,Merge_failed,5d3e3976c7eb022081690b6135f3b0cb23a2872e817ea3ce1637e142852af0d0,Merge_failed,409b3aa696c3ebc9f79b54bd82a47cdaf17185e92b89433fc149e7ad8cedbe90,Tests_passed,bde86508d1f1227b92f929415bec77993598fe7a0bb61e363ff1a6b2d0a26d0d,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,36539070de755caa0889575d4e692a476d104a0b1fdce15a6a683728a7f76bd8,Merge_failed,5d3e3976c7eb022081690b6135f3b0cb23a2872e817ea3ce1637e142852af0d0,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e diff --git a/results/combined/merges_tested/tacitknowledge/jcr-mock.csv b/results/combined/merges_tested/tacitknowledge/jcr-mock.csv index c4e32936c6..9818a56660 100644 --- a/results/combined/merges_tested/tacitknowledge/jcr-mock.csv +++ b/results/combined/merges_tested/tacitknowledge/jcr-mock.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,c73aee7bfb9d5c3488412b84d8f83961f57abcd2,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,439a077b1b18513bf3f5098302d0ed60bf8f8b95,,True,True,True,6,37,216.0,4,True,6,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,True,Tests_passed,f2e6f1df83fd93d10934762faaebbd3c784216a6e0fdde6cdef6fa00cdc777bc,True,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,7f6b25d333fcc462b9152cde69a9313af3b9b71d4d353eb2c5ebcffe5b173844,Merge_failed,c9ef29c38557d8c49184bd504ca3bb64e2a7b2b00492055fd2525b72f3581876,Merge_failed,4825ab61ae374d4ee946273b714ac18896920002ae04488c41ab41d070f8b0bb,Merge_failed,ca195c913bcf7a4d82d1984f302e9db409bb587f5feb753c6044a5df5e779393,Merge_failed,c9ef29c38557d8c49184bd504ca3bb64e2a7b2b00492055fd2525b72f3581876,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,bdd04b421a99817536d89e0814785d50d78dff1076a213e1d454b4d0ff3406b7,Merge_failed,4825ab61ae374d4ee946273b714ac18896920002ae04488c41ab41d070f8b0bb,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d 14,refs/heads/master,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,cb49187d9a84ab070a49d6af8a16bb00b59da572,399a1ef752b17491e80b0fedc1f4b2668e51ed36,,True,True,True,6,27,194.0,2,True,6,Tests_passed,1b7bdf6ccaca77f530e33d4247aab27392b865be1741ee544661d01ccaa061d5,True,Tests_passed,5f9b74f3ba14a3159e310483d79e86567f1d607d607205095d5288a11ded26d0,True,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_failed,d00c0556813aafd5d8714c2f62cd94925a5a7fac1677f999c369da01f6e3cc8c,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d diff --git a/results/combined/merges_tested/tackley/dbdeploy.csv b/results/combined/merges_tested/tackley/dbdeploy.csv index 537da6bad1..bf7af1fa5a 100644 --- a/results/combined/merges_tested/tackley/dbdeploy.csv +++ b/results/combined/merges_tested/tackley/dbdeploy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,50e6bb3003bf2e91512f9263a966f9e30fb17113,22c01a36a381eea3fc3650a2761bd55c14c84e28,d879c80b39966a526add4c1917914fd609194273,,True,True,True,38,79,1000,32,True,60,Tests_passed,13ba18ea3211bcde7d10dd3ba2c942c8c3555683e1f05456f3770576345438f6,True,Tests_passed,a3dbe934c9df25f77e2804d71d996605a5d5c712105a4f43af8b6a188f2ba0ee,True,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,7db308de47c446f14384d467d7e5883ba65d167327da25a909a5bf10c15bfd24,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,fb914efb04b7928ab7ebb9b937f7352943bd7639c52d0933b29120090e2610f0,Merge_failed,ea3619407f3e9007774c4c21425d79abb5ed7a2663e2c82b8fba2f5a35634241,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,239c1bac1e731df029611814709867a1eefe20d9abf1b2a24b9d670f6f88314f,Merge_failed,00bc7d8c5f2637915d80ca262a5b1929d2ad4d3236d168013d2d54aa0ac198d6,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28 diff --git a/results/combined/merges_tested/tadglines/socket.io-java.csv b/results/combined/merges_tested/tadglines/socket.io-java.csv index 66b18d77a4..c932828f04 100644 --- a/results/combined/merges_tested/tadglines/socket.io-java.csv +++ b/results/combined/merges_tested/tadglines/socket.io-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,aee8aa7b44022cfac0a87bd27282cccb1f3b388b,1b9dda4e3cf3ec5419599ec37868a28e30e0fa22,66fdd460f188f787a382aecd1161efbf9d465b58,,True,True,True,16,163,1738,5,True,16,Tests_passed,d43900df37aa76cf21998e900a8a9bf85e4bd9e5f6ba8bbfd54ee7da35a822e7,True,Tests_passed,2c5d2040da44e3a14e50fd6dc944e889a3225ff8c6b40323c598dbb65785060b,True,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,bd9c68d190760b63ddc30f45fe748656d7feaec4024391bee1a2e8e135210b86,Merge_failed,8ebd6b1044370070296126f98c4b6b9fe00e184e3d5d063d24d4a5a4565a5d0e,Tests_passed,5aac389bbafbf9a1b7d96d52d5aa010001fc5dda2c91cad6f266d1447bea245a,Merge_failed,c978c9b3d030e8edafa54bab8cb1b7b1f171959c8bd0c30fc10396c43f1fa23a,Merge_failed,8ebd6b1044370070296126f98c4b6b9fe00e184e3d5d063d24d4a5a4565a5d0e,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,3f8af57b492f8b3e781773770461c202068b5a0a86613e5dc6dc6630d921a8ef,Tests_passed,5aac389bbafbf9a1b7d96d52d5aa010001fc5dda2c91cad6f266d1447bea245a,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63 9,refs/remotes/origin/pull/5,0b8d2cd18442e598db6bdb1df67e815bc23b0e24,8e7d52406fd6ab70d0f536846c547179da689598,9e85c5a5b25fca09c22322af5b99dc6c77986cdb,,True,True,True,100,203,5642,3,True,101,Tests_passed,4702dd6ada2d6c527be42fe3757e01ccdb6d201b21a29c284a2b33476ae4fd5a,True,Tests_passed,dc317441af3533bf1923b17fdbf79590fe733faac43f91aace9952a1c33348b2,True,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,604f000927785c46a80ec3fc8956abeeaee2fb33a6b8f31c52249107f514e646,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,d7b4982b99e0389c22e167ab4a063b3386410857d08ce186df4a6deefbccd637,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,1caa06a37b2f0fa3c86a439d5635a751f4c2a93a96ae74638f8ae058955bb8a4,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240 diff --git a/results/combined/merges_tested/taimos/daemon-framework.csv b/results/combined/merges_tested/taimos/daemon-framework.csv index 18a757fefa..bad0d564d4 100644 --- a/results/combined/merges_tested/taimos/daemon-framework.csv +++ b/results/combined/merges_tested/taimos/daemon-framework.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,f1696c8958a9311d29297b106064211abec721dd,f0d0273d57f9788f4ec9f67e775b72cd3f67989d,734108ae9a6c9041a6cc9d2dae044288a15a5914,,True,False,Tests_passed,36e16e2a7b16c01841741244c419038c7b176b2b6ad930d96fbb491c9a40ea02,True,3,3,6,3,True,Tests_passed,23e98da8783a222b4f3eef095527de5997fc4f2df434492d0e43913138abe462,True,3,True,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,695108cb5cc5792fc21d161fe390c2f8dada4a5f6c99f3147224f54fbcd8c6e2,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,482605dc79de940fa50c2b5abe64c904203554de03a2ffc0451665caedd1f523,Merge_failed,ac760d4bb31cfac6c106dfdca47545de4a8d1ab3bbf00c7ebbdf386fecf8418e,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,8c25adc39395eda546923934949b906b4834d0b7c6e92bdbf569dc6debd862a6,Merge_failed,3c7523c0e223bb3fb804820b51d52800ecd2f21b954a4f3cefe5c2636a7eb135,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d diff --git a/results/combined/merges_tested/takari/maven-polyglot.csv b/results/combined/merges_tested/takari/maven-polyglot.csv index 23c80f6a48..56adf2be16 100644 --- a/results/combined/merges_tested/takari/maven-polyglot.csv +++ b/results/combined/merges_tested/takari/maven-polyglot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 112,refs/remotes/origin/pull/257,746ef5141b10b1281a83864bd72ff5b78816762b,81f25ea0fffb6c4e6f06b45fbf095ec1cd5c8faa,64c31c9ec3f960f91c03c9190058ce46015e92d1,,True,True,True,189,325,844,6,True,189,Tests_passed,b467f82db537e206fa5bb04b80cd2d9cfd68ef9a4a64c9e2b042012887ac8311,True,Tests_passed,9f6c159422c4e3c711e033a45403aed025b389ca66eb5de3ac9d11cd54d9baf0,True,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,4e30b7a9c9a034e657831f288ed056a7396ac78aa914f6a3469454daf14417d9,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,e08ed24e65b4f80ffc67cc8efbe016edca9276f3f374d73da0b47b56cfc3e27c,Merge_failed,0d9a72dcd41dd6794888fea88d34f018039d46faa4413f373bb095f42a5ef78e,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,69ddbf407e8db56ef69c9e32d8e8d1b7a4dcdcc81a9ff23a6739f1a02593f17f,Merge_failed,1f120238937b0e6c82df1cc15501044514f140487d0eb116345876bc961bba16,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff diff --git a/results/combined/merges_tested/takari/maven-profiler.csv b/results/combined/merges_tested/takari/maven-profiler.csv index 9d94a60f59..933d771ed7 100644 --- a/results/combined/merges_tested/takari/maven-profiler.csv +++ b/results/combined/merges_tested/takari/maven-profiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2d7f5eba094953230771d27e6d178cfe31373c6d,1b28f199e81f4644158ce00777be0a01c9ec352d,bd79a8b0afb29357df3d1e6567a4a08b8fee6b07,,True,True,Tests_passed,62069443749a1b72cee7ba90461fc8b46c73539adbe0031cb0a851e36898629a,True,15,28,289,2,True,Tests_passed,acbacc44c3b64f710cbe0eb3d76b2e42ff12df0cc78a946c4ddc765bdd747ed7,True,15,True,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,237b60a9d7ecef48390b0a7d41e5940753a453249807802133f53246b30a9bd4,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Tests_failed,060b51bd82b48feb35cb776f367b829f7b7e2c6bed0e79a8ac24eb5f9968cdbf,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,d33df7247d603e08e318e45456bec75d87947ed42e4688d2ab58efd69e7fb858,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83 diff --git a/results/combined/merges_tested/taotaotheripper/sault.csv b/results/combined/merges_tested/taotaotheripper/sault.csv index 71a8accdb2..40a23fbdd0 100644 --- a/results/combined/merges_tested/taotaotheripper/sault.csv +++ b/results/combined/merges_tested/taotaotheripper/sault.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c42a266c8aca381fb541ecf5cabf1ad9594f7026,933d69d97a75b7e2b5e6f8eabd004a6bcf789e86,9cda7b949bf4e8acfb7afba7dc17e83307b83b50,,True,True,Tests_passed,a916198305d4b0c58d332060d3084a179fa14278dc36ebf80d30d62fe86cde03,True,13,80,481,3,True,Tests_passed,0863541900daa4d3cad7f5d42ce2a82a639377ad1192b6b490b0b778e8ae51a1,True,13,True,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,b87e902701bccca60a6922cbd3fcf6a887ce9d0705e434ca47e7cec8132a0162,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Tests_failed,32b8b708a7176f441b13e0eaf4fd1c3b942bb774df46c37275e5b4e6f09e800a,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,75ebc1152a4f1f730dcff681d89ad906f84127c11082a30fa27c00ebd3b9bb74,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed diff --git a/results/combined/merges_tested/tarql/tarql.csv b/results/combined/merges_tested/tarql/tarql.csv index bcca6a5c5b..1d92755737 100644 --- a/results/combined/merges_tested/tarql/tarql.csv +++ b/results/combined/merges_tested/tarql/tarql.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/83,0644473c2bd9194e86eed5131e12cc580cf2956b,343224e3375158c06a2e4fafc7f4463c39a3822d,8f17e28a9cb099b6c1c4dfe8e03f800c8d947a81,,True,True,Tests_passed,6a39c94c100e8e5f5435520039216821f405f5bd3435be6742f2c7ee147af28d,True,5,14,119,2,True,Tests_passed,e62e083db65054b04132adc83c650d77d3b07ec2da039b6a31904ca3a7a1fd83,True,5,True,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,eb15c4879377776fe522e35b7ea78a8f1a107b02c114c62292dc1dfd80f6f6ec,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Tests_failed,3846195068aa790310619ec837c5a7e200d3adb646ae3b120bdf0615121816d5,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,01f68e9c33b9583f4da597e6c3f24344f08b9c712ada87e86a4c1c7d510520a9,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4 diff --git a/results/combined/merges_tested/tasermonkey/thumbnailator.csv b/results/combined/merges_tested/tasermonkey/thumbnailator.csv index 129ae40e14..60aa8b4d4e 100644 --- a/results/combined/merges_tested/tasermonkey/thumbnailator.csv +++ b/results/combined/merges_tested/tasermonkey/thumbnailator.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,658ca13b2ea59e424ececd86df21d96abf3faecd,d1eaa5ea1e75df953f5411458e5deb73acbc023c,a5b774ffb53f86f36b97d39dbfbe0741ea203438,,True,True,True,7,109,972,2,True,7,Tests_passed,db26b1a0544f1c8a11a5351fe880eddeb51d289f71cc590ebc23dc64ef6561a7,True,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,True,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,fb4aaa4c76bdb5a627d391afe5ff0c8b942514e25bc58ddcd9438b03975b53a3,Merge_failed,9a03e1241e2067373f501060f41ce082ab43b9250c8bf74763984040c3f6db29,Tests_passed,d47a8eaac750f1b67ed390bbba2466fe9b96a99aa9963d59dbe833d3ea28679a,Merge_timedout,,Merge_failed,9a03e1241e2067373f501060f41ce082ab43b9250c8bf74763984040c3f6db29,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,bb9df7086f70537fa8d2f78751a2cb126b3cc484344adc6aabb435cf53a19a83,Tests_passed,d47a8eaac750f1b67ed390bbba2466fe9b96a99aa9963d59dbe833d3ea28679a,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d 5,refs/heads/master,a5b774ffb53f86f36b97d39dbfbe0741ea203438,f7798c6a0ce4ad760eacb103bc33cefd3e1f6455,1576ec739a73e4416fe431f8249aeb74aa6e5b97,,True,True,True,5,16,997,2,True,5,Tests_passed,fa3b945e2f9a7d0d09f0a740b2685a5332a9694ade8b0bed86b5a69b6c2cbf86,True,Tests_passed,2de97e5c3df6490ed251b3184db36772e6c29b89f81972a053cde7015cddd5e9,True,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Merge_timedout,,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb diff --git a/results/combined/merges_tested/tatsuhiro-t/argparse4j.csv b/results/combined/merges_tested/tatsuhiro-t/argparse4j.csv index 97476f9188..863cad3188 100644 --- a/results/combined/merges_tested/tatsuhiro-t/argparse4j.csv +++ b/results/combined/merges_tested/tatsuhiro-t/argparse4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,c3b38c0b78286623022b1bfb8b4cac5a5d732e8e,05f1be895ef13eca5ebc195863a901093d9c63be,e05ab77b5f2e5562b109f4669bbaad0ab6113b5f,,True,True,True,40,189,705.0,7,True,40,Tests_passed,4d1b2e312f9a0da65efae4eaebe70fb50d864c7d88bdaef362d831fbf69c6eff,True,Tests_passed,1143f6a8dbb39ab2a96152b6ffdd09ce909ccbf0a52546980c6458c4933a2630,True,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f 29,refs/heads/master,b8440ba6c3b618ffcfc5e2bafac672e048e15c5c,609fbe564c3868dba09a56e48c685aa73f2ba814,da0f73c66a84a939275104887e56eb37370810cb,,True,True,True,24,97,667.0,4,True,24,Tests_passed,2a6faee7e8a8247962ce7d2589204ef2461594ae968478d821ff475835ad1ff7,True,Tests_passed,d37323f82188536be01e56ef73a40897085bcba15e02b42afed3c8dfcf81c821,True,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,3a7b15e9a29d7045725e0346c2298330b931c720389783e17ffa1608397e0ea7,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,3a7b15e9a29d7045725e0346c2298330b931c720389783e17ffa1608397e0ea7,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef 46,refs/heads/master,ecd18960004f843b2ff2f9b373db0b30fdc322e7,f34f010834d92fef29a24056dd3c0f5fa9066d8b,b36f8b7a068f31d6f82a93b25a14186ec72c8533,,True,True,True,5,9,52.0,2,True,5,Tests_passed,add87a243b86698d78447581770d52b8a1f178ee49842a1071559558a06e2844,True,Tests_passed,7e9590f402399523e29a68fc5e5cf6d0490e15922f7bfd1821e8c8387447cf05,True,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,e6f5555d47c1a68b090914dede9a8e29486474ec5d669366309fcf8034cada8d,Tests_failed,417422fee648d91c2747260155e150982715c207332ba57b52c7b5b8083f631c,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,e6f5555d47c1a68b090914dede9a8e29486474ec5d669366309fcf8034cada8d,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13 diff --git a/results/combined/merges_tested/tcurdt/jdeb.csv b/results/combined/merges_tested/tcurdt/jdeb.csv index 6eaf833cea..9b6b1c96f4 100644 --- a/results/combined/merges_tested/tcurdt/jdeb.csv +++ b/results/combined/merges_tested/tcurdt/jdeb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,ee0f3d4470642db81ebb0be600934b61863d34dc,ffee60c7c591da9d3d359b84110612a97559404e,5f3f5c73b72e1d38062f40e0c0d2c4cf99a05dbf,,True,True,Tests_passed,aaa28a0f4cd86b88f5134dde37a39c1827c7dd04a61ce37f2f52cf2ccc2058d1,True,81,400,1828,2,True,Tests_passed,861d79b1fb9e64dc96a7cf57a9a08522a1f1008c262eb9e7436db703d3550190,True,81,True,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,051e1af36681192251e71a7b1eba2d728baa779b8eb873f71339a5f4684278a9,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,051e1af36681192251e71a7b1eba2d728baa779b8eb873f71339a5f4684278a9,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4 13,refs/heads/master,d9b8ae4994ed1a742e205d42e49babeffe200531,bf268c7c1ae38c40712233a8f3070735e590613e,5152ce927699e6c9ebf7285232076dca8616a1f1,,True,True,Tests_passed,561e2639fa23196be29a2192901aa94554256aa8b1064e65497a82f503a87205,True,80,404,1891,3,True,Tests_passed,7f239ced3c635b4a616adde4fda3003d232e513fa7e4525ce6f8c43dba7e8098,True,80,True,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,e050b215f9c175a8abdb803d4683d301b5fa0092d362b3ddfc4120495ebd6c51,Tests_failed,7970f1543fe937adfcc31fd02a553fde1dedccacd165166c8139fc2019f47c1a,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,e050b215f9c175a8abdb803d4683d301b5fa0092d362b3ddfc4120495ebd6c51,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60 25,refs/heads/master,de300005f033a22b2c6424745628cbbc1f7cb509,e8d74077f2669e40b84150ee511c12aaf3088f35,cf388cd07945edd6c5a94735b44b68b83ddbc924,,True,True,Tests_passed,d660b78da129c0d3fd4beffa312259413c88a6887de4760ef400cae4289a76f7,True,17,68,391,2,True,Tests_passed,05ab0097dd96e7b08c9c00b4ec91a42547707693329be247ada26422bad7274c,True,17,True,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,576909d7d7708601b11ddd335ca189dd849a0200b3ac3557a2229332362b3309,Tests_failed,2fdd0d2e83adfccc5fde6fafeff482a207ba8b20e43ea7511cb246b58095d267,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,576909d7d7708601b11ddd335ca189dd849a0200b3ac3557a2229332362b3309,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c diff --git a/results/combined/merges_tested/tdebatty/string-similarity.csv b/results/combined/merges_tested/tdebatty/string-similarity.csv index 93d1502fa1..a090c7330f 100644 --- a/results/combined/merges_tested/tdebatty/string-similarity.csv +++ b/results/combined/merges_tested/tdebatty/string-similarity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,2b2930e1f500efd5f9efbd95891a62ab7da3a818,4f03e3415088bf26bbef62b06090b525974a7cd8,25ac055200fb6fc1f762258aee8cf30d166b0cc1,,True,True,True,5,8,134,2,True,5,Tests_passed,f8ff744cc3f1436d03a0f83e3199e8eb96e1b55d3191e23453c641baaa17ee35,True,Tests_passed,f51968e07c00a98b945404ab66db082ac8a53bd51cf50a948c54c1ca803f354a,True,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,b00ede1d197a5939dc211eda4e5a00a002bfb0e44aa407f8f1b061f443776c8e,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,ed9a7f5d930117d6b1016d2a3ab2a1a9f9d9f872ea71ee3f488971b9e4d7715d,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,bdefd09bcaa2aa921d347fbaf7cc70e0f507495acfbace6e3d1b319a47055692,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d diff --git a/results/combined/merges_tested/tdesjardins/gwt-ol3-playground.csv b/results/combined/merges_tested/tdesjardins/gwt-ol3-playground.csv index a5f8701361..ec86708df9 100644 --- a/results/combined/merges_tested/tdesjardins/gwt-ol3-playground.csv +++ b/results/combined/merges_tested/tdesjardins/gwt-ol3-playground.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 112,refs/remotes/origin/pull/64,89bea69f8eea1dfa5e8cc75c0dc1a941e6306aa4,5550df625dfea8ee9cdccc0c0cb4f4c68fd46fd0,92604b1effaeee499cc82b3e833466c1303bec80,,True,True,True,36,133,1188,14,True,36,Tests_passed,1b2b48bdf7513b63b9be55f04eaf0057a560a16a7a3ce244c4ec83569cd52ec7,True,Tests_passed,54b465ab5a627006d402301d7c245fafd6ef29de9b2d2c6e192f94d6417a8997,True,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,c02643b2efdd21d2b9e2a247f6370d22beb7b4060cc49169b4178acaf16123ce,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,dd8f339e65965937767b23a452a9d847306c1f98859f3c29e4786c87e05c1b67,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,b210ae4024bd29b735ff23b28431c29ecddadb617de0cdcec0b1eeaf6341f6dd,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29 diff --git a/results/combined/merges_tested/tdunning/log-synth.csv b/results/combined/merges_tested/tdunning/log-synth.csv index bf74100a70..e91e717950 100644 --- a/results/combined/merges_tested/tdunning/log-synth.csv +++ b/results/combined/merges_tested/tdunning/log-synth.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,83316ef849229d87b24ce5d0d6d54f1f76764759,9dc731e51f7aff44ef46e482eff7347ccbb7f964,0bd3362f7812caacc674024dc4cda930a158e634,,True,True,Tests_passed,c51ac52e88aa2f1e3863298a11b40c3a9a99311e221123f8a4e613c91f702922,True,26,74,944,4,True,Tests_passed,83b269ceac94ef3691fcb2d40c6afad1169c46a8e7cd406812a82538efac5c61,True,26,True,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,56585a9fcb31b1620e93ec10d1c477609e029ca10790d94b5e7d06e3edd302b8,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,17cd769645ccc98c31a139a7df609a9f26d2310e2b6d7b752e3eb142732bcd63,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,18fd40e797293b6fb94c21da387c79252acc5a846a021860cc16d1e4fa121b6c,Merge_failed,6143455cd592fd3f48f70feae8ba8ab5697bd043c04fbfc1d0d8d867ee39cf96,Merge_failed,9ce9410fe9796f37b5a53cefcff51218473799fb44d32dc843498eae60fb2812,Tests_failed,c3c67d16f9dac772625e3da2b8f715b00e883269a4787b29c1c9df6a8eb39368,Merge_failed,6143455cd592fd3f48f70feae8ba8ab5697bd043c04fbfc1d0d8d867ee39cf96,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,17cd769645ccc98c31a139a7df609a9f26d2310e2b6d7b752e3eb142732bcd63,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,af521d1f82e89e9ab18609eef332d19d8b3bc665b4fcd93af505467ebb7370d7,Merge_failed,9ce9410fe9796f37b5a53cefcff51218473799fb44d32dc843498eae60fb2812,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,56585a9fcb31b1620e93ec10d1c477609e029ca10790d94b5e7d06e3edd302b8,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0 9,refs/heads/master,2e2af435a69c21d5c6ad352db9c030ae8e0abf89,1b65c0f09bb7cb301c4bce5ff90700ef7b43b24b,c8fae8ddb4b84601bdf5ab75e1674b512a129ac3,,True,True,Tests_passed,4512c6e152d4ea54ff471d3459ee563966be8d63a6f860ceb09c9c54c7430f81,True,8,9,42865,3,True,Tests_passed,691ad4c2f8927ebc887c33c802ba8031ba86bc423406f275a570edc990691176,True,8,True,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a diff --git a/results/combined/merges_tested/tdunning/t-digest.csv b/results/combined/merges_tested/tdunning/t-digest.csv index 659d800adc..39e27ab2c8 100644 --- a/results/combined/merges_tested/tdunning/t-digest.csv +++ b/results/combined/merges_tested/tdunning/t-digest.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/main,f028aa397892b426fe384f551b7ccc36b2f1ade7,2460bd11d91a2a9a2e1b4eca0c20b005e856effd,f0ca2a55413b4b8346a7e7a7ba0bcbedfd411aff,,True,True,True,13,55,218.0,4,True,13,Tests_passed,783d6dbf5fa1370e7c447d893f1ced461f7194c88d0c06ebb460ced4b9651709,True,Tests_passed,f9cbf54b3bba2f3f6dfc3ea779e24dcd02e273a0839a3289b86b6576d4efd874,True,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e 34,refs/heads/main,396e56c59c883e657776cd2b3e915f5d30dee5ec,c5342cc739b07c100a4ea194f77f1527b75626a3,a0360a481db2005674f43f28a8020f1b27cde83e,,True,True,True,12,16,243.0,4,True,12,Tests_passed,3d0428614c1e35ac346aafaf592bea8dfc22db7d48f50e2f7a8e24ce5c1ad361,True,Tests_passed,731679c5d3789c513ca806e0efe0bbd45f781b685cd1e7232548cad81e971932,True,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,d114622b3ceb782848d4b74f1e89a86382a29305d1896ed1a22837829ee712c6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,d114622b3ceb782848d4b74f1e89a86382a29305d1896ed1a22837829ee712c6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6 37,refs/heads/main,09d73eff96297b9bdc793e345cbf8c1e18f7457a,7be70e77c8308e870c6bddede676fe9d9584c341,ab39ab0ed737509e37533c4d7bbe226a05ca7b02,,True,False,True,6,12,69.0,3,True,6,Tests_passed,79dcecfeee0ba4d41c0941dc592c410ccecf630f2bb64b3e31f31f2555ae064b,True,Tests_passed,22439211afd42851d9b1419ee01e63cafb703b1101d89f7c8b8c5f5c4f818cfe,True,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,b0942791d49f7163b7e54ee57a7fc77f8780fbd03ca28e88435836b4cf939e91,Tests_failed,ca3afa9c5bc30406e72144c7fa1995d73c01edf4f4e9ef140bb2174d9bd8789b,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,b0942791d49f7163b7e54ee57a7fc77f8780fbd03ca28e88435836b4cf939e91,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a diff --git a/results/combined/merges_tested/teamed/qulice.csv b/results/combined/merges_tested/teamed/qulice.csv index b7646740c3..b35f8f2fc0 100644 --- a/results/combined/merges_tested/teamed/qulice.csv +++ b/results/combined/merges_tested/teamed/qulice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ad93f0b28b154ea6cbd4901d05f3bedc74a0ec82,d577051ce5ead53e8c888a9be4624835169cfc68,4b1608ac72f3a55879cc4583143355faf3982981,,True,True,True,21,47,384,4,True,22,Tests_passed,ecc11d354ac877a3b85318e386e12953880405b21d219f54a7a9bd5172e8e594,True,Tests_passed,02d78e81a6e221767be4ff4f33fc7c29f8c16406a4ff54afc6981d0c7a40c334,True,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_failed,5ea8510f9be11f455bf7b158fac29149510b7cfeb13bdeb0b66610ba7a76f4cb,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057 diff --git a/results/combined/merges_tested/tech-advantage/sonar-gerrit-plugin.csv b/results/combined/merges_tested/tech-advantage/sonar-gerrit-plugin.csv index d444e51a04..b0609c1349 100644 --- a/results/combined/merges_tested/tech-advantage/sonar-gerrit-plugin.csv +++ b/results/combined/merges_tested/tech-advantage/sonar-gerrit-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/master,7599e6becd5b64bb5a00786c488b037f257b2f20,fabf6eeec8809cf1b9f7e775c07db71a41578dfe,df0d909e3fe4165912b13a76ad6ee40bca8b2eb0,,True,,True,9,15,,3,True,10,Tests_passed,0d70fe434f25b498fdf5718709d7e7114e72fb25b78c94f2186f16ed2d7cb286,True,Tests_passed,2ae4f768488199e8511c6de69c952047a050633ad5b1bf1397d6f88898ad8ed3,True,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_failed,a0ebd7c8629b7063ec6ce839fa9ad0c87ee31b1d7ec5bc8e5dc0ea8506ca3d30,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f diff --git a/results/combined/merges_tested/techblue/alfresco-restclient.csv b/results/combined/merges_tested/techblue/alfresco-restclient.csv index 34feba807d..27898a11c7 100644 --- a/results/combined/merges_tested/techblue/alfresco-restclient.csv +++ b/results/combined/merges_tested/techblue/alfresco-restclient.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8e71d5b8d714d63b1c3cdd4b8d70de278f04bc07,039b6f1fd1e3d214a90f74ff0c60319be73f0e24,d803b272aa0c08461eb4e0e9c63e12be5ebda020,,True,True,Tests_passed,7c128dff941dbe2fd39139010b2994aa344030a8cc92ed36f19c8095c583a2f6,True,30,92,847,2,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,30,True,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d 3,refs/heads/master,d803b272aa0c08461eb4e0e9c63e12be5ebda020,90eee0a764ea101a01fb540a9866ff3aa892db47,0fa7725dbb9300d05338e9d1437c4c796c6ace63,,True,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,22,65,750,7,True,Tests_passed,ab261bcdf25f8c027a4136d17c8e199cd86c49e0ac2cc8595e80ba16e03f4773,True,25,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,b84f4096e9da8905e67eca879d4647ef01fb5587042532f5344fb969ff83bf8a,Tests_failed,20e5ca37a2150b8a75517d21686b525a66984b6738d55e041272d80305656fe3,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,b84f4096e9da8905e67eca879d4647ef01fb5587042532f5344fb969ff83bf8a,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac 4,refs/heads/master,90eee0a764ea101a01fb540a9866ff3aa892db47,4c9b74a8e152894c7b6b34abf5558cb5fb99472f,87d56a1dfd92cc7c21a08fd21d9d45ea79ecbb9a,,True,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,25,70,763,2,True,Tests_passed,3b1cc69c3401ca24fb38967315871885dd78e59e9f4e4b3cc5dcc1bf6dc7b3a1,True,25,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,3024d4c1650e7ef20a6781cee67a931ca3bf2034249011fa98dfbb4b3d5c8de8,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,3024d4c1650e7ef20a6781cee67a931ca3bf2034249011fa98dfbb4b3d5c8de8,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac diff --git a/results/combined/merges_tested/technicpack/launchercore.csv b/results/combined/merges_tested/technicpack/launchercore.csv index 39a14ff747..52ac635a20 100644 --- a/results/combined/merges_tested/technicpack/launchercore.csv +++ b/results/combined/merges_tested/technicpack/launchercore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,4ac1958198ddcdadd9ae665e250037300118a39eaa37f421fbb1179721aa556f,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f diff --git a/results/combined/merges_tested/technicpack/launcherv3.csv b/results/combined/merges_tested/technicpack/launcherv3.csv index f94c4ed881..9f7db168ff 100644 --- a/results/combined/merges_tested/technicpack/launcherv3.csv +++ b/results/combined/merges_tested/technicpack/launcherv3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003.0,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,ba55fb901c65a2e130f31db1fbfabd7a2eddce5282b72bcf6d0bd6ed63fd88cf,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576 diff --git a/results/combined/merges_tested/technophobia/substeps-core.csv b/results/combined/merges_tested/technophobia/substeps-core.csv index a56ae7bb67..60dafe8b9d 100644 --- a/results/combined/merges_tested/technophobia/substeps-core.csv +++ b/results/combined/merges_tested/technophobia/substeps-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,07b94728d642a789e11b45c284432544e6a013a9,982720d6b47d67d338b4af39487f52731500066e,0e08102f130e1d739ae7817224315b4608324526,,True,True,Tests_passed,c4037c0e6b73121199741ada7d8c9765365744051cf7ffd757a5a731822f46f8,True,61,668,4287.0,5,True,Tests_passed,452f1ef83993cfcc6a3c675604ff2e7a4bba5bc0c0b8707c4dbf64de774c2a83,True,61,True,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,7a8c68287ec73b6318231a953d726c90b83eebc65b151022475206187e9d81c0,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Tests_failed,dc7d72b4a2c22735e07810d3e97c5fb422cf327377be7ca32179341f4bfb82fe,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,d767b91373beec30dae73f9b6ed16adbbbe422c5aae5dcfbc28d5a4b8f4b87d3,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a 31,refs/heads/master,f51e19b36c2a13d3d11fe9744381a0c910d61c6f,a171a4aeb953834c6a2526fb0f47dd7a1eb2b6ff,c4c32777666ccdf3fda101cb9a55a3199021863a,,True,True,Tests_passed,10847221e373837f11789ec152df874adeded28f573cf65b9ec55205ff038bd0,True,40,365,3556.0,5,True,Tests_passed,2f2a2d670e154042077a9917a28e3dc2886a87b171edab42ed286e03e69c3749,True,40,True,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ee83a3ecf5a87cae376c90b650d4b586f5442a2c3a9b4600acf952dae6a15f38,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,58418f1cd5a1852fd9d3763a2a08b6af1e61a0d1343b09a614c911b3b3a765a4,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ca315c71525a5fc2a8210e3298fadd7b5d753a43452477664b92d0c09638f0fe,Merge_failed,b3718983f6bbe2f59f6ab6abc114099271f581b759c093aa94e3bde0a71de698,Merge_failed,52b0efe40de37c5a7a4275a17f8677a250848ea26524b2d6898bd78a98227151,Merge_failed,95855e8d32d43f37248e0ba9a42852f5bfbd8959dbb0c54e4a80f453a830b623,Tests_failed,ebfb6165437c11ede12bdb93a601aefee03f6cf1433bc5f4fd996ac3c230bc99,Merge_failed,52b0efe40de37c5a7a4275a17f8677a250848ea26524b2d6898bd78a98227151,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,58418f1cd5a1852fd9d3763a2a08b6af1e61a0d1343b09a614c911b3b3a765a4,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ca315c71525a5fc2a8210e3298fadd7b5d753a43452477664b92d0c09638f0fe,Merge_failed,9162337c4da733eccf6872d28e1377cdb37ef7e949e4b9fc1f8e4301d4357642,Merge_failed,95855e8d32d43f37248e0ba9a42852f5bfbd8959dbb0c54e4a80f453a830b623,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ee83a3ecf5a87cae376c90b650d4b586f5442a2c3a9b4600acf952dae6a15f38,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f 42,refs/heads/master,158700c1f3b0f4508a9b2b75fbd43be18f5fae4f,c0f252e6d61bf5940daa407c0e754d200da7710f,7f88b5fd1e4f634a002902e393e3cb1f1f1c177e,,True,True,Tests_passed,6488b7ce89e9e1ed52e2cf1e3874d947b87c3dd122c16a457d7a5231567054b2,True,12,96,2307.0,4,True,Tests_passed,795ceeefa61996f8d731b42ee34e40890bbf4db1d6e222c3546ba544b20fd7a6,True,12,True,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,1c4ae906fbeffc1183393f0a45fd1a75227bda4e1edf21dd5410f4ccc30cd0b9,Merge_failed,1bc0118173592da297bca736be1ef123f8bc4de0ffea6dc25e9e4030457d012f,Tests_failed,30a6338b143d113f5812c2f70fe2d022baba11fe131fa527297325efc5de84b8,Tests_failed,2c787928ffa030b1991264d3d79a4b3d0edbe063d1ad3012c0d3b50e541a8ddb,Merge_failed,1bc0118173592da297bca736be1ef123f8bc4de0ffea6dc25e9e4030457d012f,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,eb635e31823a3e004347c4e5e48480256908a51d3cccd8110c126769b71bfb49,Tests_failed,30a6338b143d113f5812c2f70fe2d022baba11fe131fa527297325efc5de84b8,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e diff --git a/results/combined/merges_tested/teknux-org/jetty-bootstrap.csv b/results/combined/merges_tested/teknux-org/jetty-bootstrap.csv index c57a7cdad2..f4ef6649b8 100644 --- a/results/combined/merges_tested/teknux-org/jetty-bootstrap.csv +++ b/results/combined/merges_tested/teknux-org/jetty-bootstrap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/develop,6a9f52a5377a484397eeca4b0511f356f493696f,b5d69b0f71bc1c237a812300dc16d329c3168af9,17deab171882d57f5d02052ea6e631cb11aa0d55,,True,True,Tests_passed,d16c36cf32321568dc09a886f2ca9251ed8dd7a9446205f671072016ca8a5ad5,True,26,138,2386,2,True,Tests_passed,f2e4909ccc10ba1af65a62ec0cae23af0331e8fc10a800aa2ef2aa9cf7df80b3,True,26,True,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,423e42fd9f24726f4b24b0bb6e4b2f88f73aa656f4dee152ddfcc7212913ed6e,Merge_failed,70ed7009eafae7f56fee0ba752662d02de6386f91d7a46d911755a6416a2d6de,Tests_passed,d0b92e71809af297130f296fd4e21c588e6ecc2e5e13ee97ae4551cfa82177f5,Tests_failed,6132b1b41239be17928385f026aa4df360b067336260495489851b0e5d353b10,Merge_failed,70ed7009eafae7f56fee0ba752662d02de6386f91d7a46d911755a6416a2d6de,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,ea1b9b051df7221c83b28ad13421d163bf044cd61775d0a499a69aef4f10a8f5,Tests_passed,d0b92e71809af297130f296fd4e21c588e6ecc2e5e13ee97ae4551cfa82177f5,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8 5,refs/heads/develop,17deab171882d57f5d02052ea6e631cb11aa0d55,46488ced29a30f06d91e594c3e8e31e4345410d6,9f9fcbcf522fd5cf99bd44b8dfa146bd4bfecf8b,,True,True,Tests_passed,d048ccc41e8a36c201a618801271ae063c616800933def0d128a3d0418ef2901,True,17,105,1757,12,True,Tests_passed,7061200a232d54e21761bb3a497208a97c2d70466f7787f4b61516b866987e72,True,19,True,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2b8a6a2902f9fdd51646e5e1120099e0bafbc3cd9f1b4d7f84f2d4057a81e5b8,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,0f73de83f944567a46dc00878a55d6f9f063678d3a318a4580a67a0ec5b88c41,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2507f6fa45e99cb3e9ad178ffaefc69d1b64aa40d707858cbd5e61c7fd09de2a,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896 6,refs/heads/develop,2852e8553b9363628dc21c1186599e714ee1cdad,d6643caba7549416e944aa90fb9d77341605ec61,3b2a04639e85573dcdb099ba8d72c7b8f1856404,,True,True,Tests_passed,aca73dba94f9bb09dc9195d79222708b927473c64afe13c8f9713f32e7e17d0a,True,20,147,791,9,True,Tests_passed,84afe341c70057a6df2407fcd28d96f2a19fec95c0ced69c792befd83e2ca558,True,22,True,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,507ed489997618b4815bbaeadac28374553527a1cebdb8a7fcff0a16a2ab37ac,Merge_failed,c9c1feab03f2d9bc55a24d731caf27f77f1c9f27c7e466cfac33599d2f199c9b,Merge_failed,5322122fa164647f5ad6879d0a8f289066bc592165b2b664ac272b1c95d0eef0,Tests_failed,b8dc9e7e441911a25f0138468d007d7e861029cbe0e9e26e583031fda66999e3,Merge_failed,c9c1feab03f2d9bc55a24d731caf27f77f1c9f27c7e466cfac33599d2f199c9b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,5c12f3bbbbdac050d201a4507f1fc44ecdc5414c7f2687a2694351a3f4ef3969,Merge_failed,5322122fa164647f5ad6879d0a8f289066bc592165b2b664ac272b1c95d0eef0,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b diff --git a/results/combined/merges_tested/telefonicaid/netphony-network-protocols.csv b/results/combined/merges_tested/telefonicaid/netphony-network-protocols.csv index cfccdc13d8..44144b73aa 100644 --- a/results/combined/merges_tested/telefonicaid/netphony-network-protocols.csv +++ b/results/combined/merges_tested/telefonicaid/netphony-network-protocols.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,07041eaa5a5fe329a0efbcecbe079f3323b65462,cb0053c31186271ee39b7c5daddb1eb9fd88daf7,d4e3ea6f26bb0413528ccc36a566193cdcff34da,,True,True,True,27,69,2109.0,2,True,27,Tests_passed,c4ae8338aa0fefc439526a3c6dd7d2ede514a3caa2f1984085402ed266637269,True,Tests_passed,df775d0dd2635c873fa4e808030416ff7c2e73ef711d0c2d28b3646664ae040f,True,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,32f7e5c26f583c074a6cdcbe90e96ecc2dd442ca78ec7329d5771d7114454d67,Tests_failed,c2590ec7cb13de70d05b819adac396dfc15ebc3b6328206b2a35c9907c4a5e22,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,32f7e5c26f583c074a6cdcbe90e96ecc2dd442ca78ec7329d5771d7114454d67,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11 31,refs/heads/master,44919e4a94b5992d04186779c82da587aa5e3bc8,ef3cd2327f0ddcbcf186789fbf279ff312c45d7f,6c226b6329de94a4a026717628bad8f9eda81b02,,True,True,True,20,51,1698.0,3,True,20,Tests_passed,a95fb0bfc0ead9397c75ce5ad54d0f7d11d1c76db19311af2f085f7f13556c4c,True,Tests_passed,6f494c650b125f509d23c1430260b0c7f266bb80bfa8631a1274d4d7a9a8aa45,True,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,4a0ad4325e08006f95ba15fab41f12e4446b3c83a33e6120bf13fd8d39a15970,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae 103,refs/heads/master,cfab35baf55c9496446ba24b76345d8e52145511,55ac1055522700bda8d43cbabd6ea90fd4a7a188,ba458655337348a8057c877871f821315713eb82,,True,True,True,10,79,325.0,159,True,164,Tests_passed,b6ae5dd67077039308a0a66da76c755f158b8cb156a23992e0f7097c9cf3669e,True,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,True,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,a9f32ca3c2c3d9a318972aaab793e218a5e690bbc24f6d622cc4fd595ff98a40,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,a9f32ca3c2c3d9a318972aaab793e218a5e690bbc24f6d622cc4fd595ff98a40,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959 diff --git a/results/combined/merges_tested/termd/termd.csv b/results/combined/merges_tested/termd/termd.csv index 276c0e2f93..13e66b988d 100644 --- a/results/combined/merges_tested/termd/termd.csv +++ b/results/combined/merges_tested/termd/termd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,True,True,Tests_passed,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,True,28,172,796,2,True,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,True,28,True,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb 5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,True,True,Tests_passed,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,True,37,181,2394,2,True,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,True,37,True,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a 6,refs/heads/master,75f5c20e784c95a7d810d61508d3c6be690661dc,5c19495d24ba0737c9f85bf776587389fed17523,7fd15df092a23eafe8f3c6cd615f711beafc2679,,True,True,Tests_passed,427dfb68096f9363315a1037419f286f2f35fcee7cf60774d0139d7155fe0a83,True,41,168,2290,3,True,Tests_passed,95edd89cb94de2919294dece0ad9636a2079fa89387d94d1da037fe374c6d162,True,41,True,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,dbfb948050938f46582462c612ef25d4d3c9a719300d7211939192344c12b7eb,Merge_failed,1f888f86dfe02e7873c91d8c72d0cc8ad2ffd109e65993d2f9919e09dc34c678,Tests_failed,e0d413352c7e33ca89d09c184dd5a05c24f312121a2fd763e12bf35b6fc656a8,Tests_failed,47ee8a6a0be73497914f3ac836a561121336d2088189375620f5ff5dfcec9134,Merge_failed,1f888f86dfe02e7873c91d8c72d0cc8ad2ffd109e65993d2f9919e09dc34c678,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,25d1faac356bd356a8a242ace3cbe1a27a54f996166e6acd2110f8b9b0943ccc,Tests_failed,e0d413352c7e33ca89d09c184dd5a05c24f312121a2fd763e12bf35b6fc656a8,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd diff --git a/results/combined/merges_tested/testingbot/testingbot-tunnel.csv b/results/combined/merges_tested/testingbot/testingbot-tunnel.csv index a0dedfb87c..6d4c8605e8 100644 --- a/results/combined/merges_tested/testingbot/testingbot-tunnel.csv +++ b/results/combined/merges_tested/testingbot/testingbot-tunnel.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,03f9869d5ccd78ac84c044fcb9fdeeed2b7dcf7e,f0d54b7695c5d52d74c1c9fbc1e3d1ef0f9a7f21,d2973a80f7035752b3aef640becd903bbb2e5daf,,True,True,True,24,187,1323,23,True,28,Tests_passed,e2e708ee3eea597ca1059b6ed69476d06c126eb0d644ea56825e9d157c4e09b1,True,Tests_passed,5fd252cb12ca97c213229b976901c529310aa6c65d1b9cccfd2510d0d46df22d,True,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,df9ce9f170360fcceadc84dbca0dd73faea4e13bd90e269a4ef0b90de4449913,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,374b4a70c40e37a740f15b8b1963237b53a4438f056aec63adeeba008fbf512c,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,e5266797ece6ee3eca5034a9c8524ddb41dc335d8f1514fa13cc31f71466fca4,Merge_failed,9ba20b4c70b24e496bf9a22838a8c616707a454fe06ae936fca0aa2d98518249,Merge_failed,22ba0e6379c8e026c5f213625f2ccc23325b954912fbf2cc643645c7fb74ce2b,Merge_failed,3f51d1cedf7ccabbba54b4efadb9c4dfb4f9773a8879fe3f4a538507a2b5706c,Merge_failed,8b94440aa8577ed1048781768804cd4c3416116983d593e5ad8e749184aa908b,Merge_failed,22ba0e6379c8e026c5f213625f2ccc23325b954912fbf2cc643645c7fb74ce2b,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,374b4a70c40e37a740f15b8b1963237b53a4438f056aec63adeeba008fbf512c,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,e5266797ece6ee3eca5034a9c8524ddb41dc335d8f1514fa13cc31f71466fca4,Merge_failed,8704afdb4de48c75c3686163fc1733d878343ac63e7d7a771e74d961973805f6,Merge_failed,577568bbb6f967b4d4a358648cefba4532724f5d1baddcb5ae9ecbc0b6a277ed,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,df9ce9f170360fcceadc84dbca0dd73faea4e13bd90e269a4ef0b90de4449913,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf 11,refs/heads/master,ce11672c43fa8e85ed7201f026f455e7382da7e1,32db181f6873158694db8e270063e62fef2c5947,facda2b071f90624ea57358b6613b9979dadb7b1,,True,False,True,12,23,181,3,True,12,Tests_passed,76ca400bc42ae691ec4003653e48bf9597a12cd525506661e6038f171f133a22,True,Tests_passed,ea2398f2962636de879c22b9fc3ad3835f7e0889dc3ffe426deb884e2223472a,True,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_failed,d144578ebebd1f9f08c1e0bcbadf52ff98df6b1d9625dd0fcc12802d5fca251f,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70 diff --git a/results/combined/merges_tested/texasdigitallibrary/vireo.csv b/results/combined/merges_tested/texasdigitallibrary/vireo.csv index 48d8f6602b..85fa0f6c66 100644 --- a/results/combined/merges_tested/texasdigitallibrary/vireo.csv +++ b/results/combined/merges_tested/texasdigitallibrary/vireo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/main,4b5dc59cfe12549b797941e4dd561c0b6665b5cf,652d9f280761401d9f774df9769214bcf6091696,7d947fc0539bdb535cf3f63e51ee25f056a79dfc,,True,False,Tests_passed,db129a66d3a14cf0aa68dc89350f975f0f81a43a9fd301bf781dc447e4ef5745,True,8,51,241.0,2,True,Tests_passed,83e5c85de437b95fdabd72c20fd98096ff1958a8ebc0b76b5cda9957f71a3f9e,True,8,True,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0 95,refs/heads/main,43950c643237887f8f90905e832a68c0f89aa047,1170c70db922e5bbe169db9f027c81d2e8646854,12311b33723ec219a7a68f750d57d3a0551c58b3,,True,True,Tests_passed,b7e5d19b298aaea02526de787afed1dc036fbe57131bbe70782de4d54713c804,True,24,120,558.0,2,True,Tests_passed,5be584642a16fcb6919c650b817de9334b5425a4e417d8c1092437ad6a2ccfc4,True,24,True,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,08868f4f60521bc4478fc2ee7863029c85c55afec8e4a4fa86ae52c5c90d3636,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,08868f4f60521bc4478fc2ee7863029c85c55afec8e4a4fa86ae52c5c90d3636,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,2e294df04532c6b16bf74016f76c3f653b0442b23d1642c3c5890e4318abaa1c,Merge_failed,d7f8515d88343b2104dbccc3079d253764da0618d7c569e462420a0d1daf0165,Tests_passed,2813517e31cfa068380bb37afa412f345ca4019a8a417e251e7670b38be495d7,Tests_failed,7ece77925bc748f38c59944d222edd27a4139d6bb6d14c143573609a90e86ac9,Merge_failed,d7f8515d88343b2104dbccc3079d253764da0618d7c569e462420a0d1daf0165,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,08868f4f60521bc4478fc2ee7863029c85c55afec8e4a4fa86ae52c5c90d3636,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,81562c72d621203127ea62f5d7bead807fce9e7d14cd15121f05dcac7500eb13,Tests_passed,2813517e31cfa068380bb37afa412f345ca4019a8a417e251e7670b38be495d7,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,08868f4f60521bc4478fc2ee7863029c85c55afec8e4a4fa86ae52c5c90d3636,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9,Merge_failed,451b4cce02f98f647c9b45a9e0bece9b5f57adac148d93de6e567b9da97195f9 100,refs/heads/main,bdcebee25b25d7b7929f30576bbde9c1edc10317,f5c1a5b92f1129da36e4e2742e7751d7dad45d02,5db449725ea722c2e2a44f67e3e91def8fe6e882,,True,False,Tests_passed,9f3d3494d5510a2828b40de938cd98db24aea85b0b92fe458cd18f4f8b199d87,True,2,6,47.0,2,True,Tests_passed,0094fb38ae2dbcabe386255214a5697ff8a0e8b20b32736deba65a62e584cf62,True,2,True,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,c1459731a7f47cc68290e59016c86af02506db13d746b0049d3b780292cc2f7a,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,c1459731a7f47cc68290e59016c86af02506db13d746b0049d3b780292cc2f7a,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,a0c9a4ece695614601806611f97e7f34d72552c7ac453495b14f7846a05c8e60,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,c1459731a7f47cc68290e59016c86af02506db13d746b0049d3b780292cc2f7a,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,a0c9a4ece695614601806611f97e7f34d72552c7ac453495b14f7846a05c8e60,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,c1459731a7f47cc68290e59016c86af02506db13d746b0049d3b780292cc2f7a,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5,Tests_passed,3657e92a7ffdd31ae463a7fc45939a967af3aa5e24a2223ecbb2a149be69bec5 diff --git a/results/combined/merges_tested/tgac/miso-lims.csv b/results/combined/merges_tested/tgac/miso-lims.csv index a1c5367406..e488929228 100644 --- a/results/combined/merges_tested/tgac/miso-lims.csv +++ b/results/combined/merges_tested/tgac/miso-lims.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 566,refs/remotes/origin/pull/2747,fa7593e209edb54b5a5c11eeb0b07103c0b02a94,4507173cbdcd0d2389767fe4aeb43936629af24a,0955feeaaab386ffc307e46d7c65bbbaa953ee8d,,True,True,True,4,40,209.0,2,True,4,Tests_passed,36a1c96b6544b5018bbb56254c2f658744a0aca87cfa1e7284e6fa1b78384261,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,39c4338a9fecaefacf887140db1e315af14172a22d04d3c4ed5e02caa209af90,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8 diff --git a/results/combined/merges_tested/thealgorithms/java.csv b/results/combined/merges_tested/thealgorithms/java.csv index 238ac47f88..4e45d44c3b 100644 --- a/results/combined/merges_tested/thealgorithms/java.csv +++ b/results/combined/merges_tested/thealgorithms/java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,True,8,50,800,2,True,8,Tests_passed,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,True,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,True,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,2ad62f9843f992482061f6a245a76a8ad90a8de64a4a1ffc7136df7509aed821,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,f0d3b4704e2de4cd5333777dc5333d0172d4edfa0f688b08fa94b1d516b400f1,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7 1430,refs/remotes/origin/pull/3919,6896fbb09ca80618d128c0d7694cca4b9f6aca5a,914b7f772c1c7c1da08ce683205f25f2942b8c77,2418604f7aa448edfdac18a258841ae3afcb462c,,True,True,True,3,4,124,2,True,3,Tests_passed,1b1fbd1a904b2f94475c0f8f1f7b45c1442c13aa30041057db50fe7c1221fba9,True,Tests_passed,569b0b0c50256257ab71b3f3e8bc83f734bbc8a112723c3d037a0b791f0d47f8,True,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,537f52e8daec58a879452bc4cd5b0f0a19a7da572cd81d1bdc36c0a35d6cacd5,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,537f52e8daec58a879452bc4cd5b0f0a19a7da572cd81d1bdc36c0a35d6cacd5,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a 1434,refs/remotes/origin/pull/4131,a0a07dfe59c8acd2075eb279e8e9f666e1afaced,9643e6414a7bc226a088f2c2e95954ec6b4741e9,58db2f7839d057bc5aeb6873f4b4d0a5ab846ed5,,True,True,True,3,2,50,2,True,3,Tests_passed,3ca7a8d874f79eba6a8ac7bf644377f7ad913f09733c07b6381cf4300d51a522,True,Tests_passed,3445b568922b15db28aa9307d99fdbeadcf9ff66e84b8bca9c463dcdce9ae0ea,True,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,97347bbe1355b38281cf670366ff9069b1baacc6b071269650022561b41b372f,Merge_failed,76b66a12e550fcbdd8cd06a21bea2aee26ecf0c4e1e0a7205d40d5eb324ad234,Merge_failed,6b0266e8732c5c80c6f9914eea9b0c9feec521cf2b926f3ba48a2068f96df5a3,Merge_failed,ceb4ad59ce84e68fb0004334667bb1f199c79a86d83b39cb9654cf9097820c3d,Merge_failed,76b66a12e550fcbdd8cd06a21bea2aee26ecf0c4e1e0a7205d40d5eb324ad234,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,72442449e49dd67c73f51a1eab8c2f1f4cc9b932b067fa0217c980ae94d48635,Merge_failed,6b0266e8732c5c80c6f9914eea9b0c9feec521cf2b926f3ba48a2068f96df5a3,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68 diff --git a/results/combined/merges_tested/theholywaffle/teamspeak-3-java-api.csv b/results/combined/merges_tested/theholywaffle/teamspeak-3-java-api.csv index 8bba999a96..27dd93577a 100644 --- a/results/combined/merges_tested/theholywaffle/teamspeak-3-java-api.csv +++ b/results/combined/merges_tested/theholywaffle/teamspeak-3-java-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,d41446711b7338794a8c348f50c7a53b99a08d4f,4811ec5f9bf8b712817248a7808bc329a3946189,a43548c29475a68e4e6b2b5a2a7dca5d803691a0,,True,True,True,13,52,534,193,True,203,Tests_passed,5f3c598a5cc7ecc43addc7b2286c8f86b8421a79ff9f5155e95a9374cb0bf4e1,True,Tests_passed,58c91f8610af1f116ca759dc3c846aea399da76a38be8d75dd8439f9f4311908,True,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,50953d3d312416299d57dfbf6c596b26e9918bf0e52b690c9b6b8fb79f85822a,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Tests_failed,1184b5050180d5d3bf7e361da946f8cad30c35110fa4b5f7d907d1eb6cc8d856,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,36ca8d78a00d29cab06692c09a03cf60f2c39c3c126073a957d47640a1fd34d3,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03 diff --git a/results/combined/merges_tested/thelinmichael/spotify-web-api-java.csv b/results/combined/merges_tested/thelinmichael/spotify-web-api-java.csv index 16bb851fdb..2856fa4bce 100644 --- a/results/combined/merges_tested/thelinmichael/spotify-web-api-java.csv +++ b/results/combined/merges_tested/thelinmichael/spotify-web-api-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,486691eb608d4758d2b6aadb231913f9d1f0dccf,d78ea37c1f9171e9394128660eedbc0fd1d6e186,7683a952cc154155e775f98e41aeb23fa70e9d77,,True,True,True,7,28,456,2,True,7,Tests_passed,de790a0d58cefb7e3c67ff2e97297f288ae8364b76be222223da3399933612e7,True,Tests_passed,b79d5e3c4efbc0d8958a39c2ba0d689cd7a7fddb8832fc0e7b20825ecd040fe9,True,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b 12,refs/heads/master,8b0d292b1217c719fdcda58447b0e1d7218ceb2f,56776d05fcb1710309af5c974820e029321d1fcd,c94a32ab6fe2ffa6f5736d530f511df3bf8d6008,,True,True,True,137,351,1946,3,True,137,Tests_passed,d1a40930bf4cfe60db845bf7e056416fc8ab6d308588f0f1892264bd27febf53,True,Tests_passed,f2d93c53a1a952b0952b1f2e142931c018397a110346a2298acfa14f93d34e4d,True,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,6eb4f3164afc0c0bad6b1e6e7e4a53cf03168dedc7136bb3a0946deb27fb396d,Tests_failed,8ab3a670a4dcf834edf2d0b5343bfc5f6df1491eb6d2a26f4c258d06639d39c8,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,6eb4f3164afc0c0bad6b1e6e7e4a53cf03168dedc7136bb3a0946deb27fb396d,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e 95,refs/heads/master,fdd0be7353b2a99469b5e243b7c3405d865fa6d3,edd5c033477820e4401328b7e9944105acf74e00,9c5f81366f25a1d3c4068978e6df695cce2ac4f6,,True,True,True,993,50452,268870,3,True,993,Tests_passed,5ddc224a8373d328ed931ffceb797dbf201f377d29917e7ee01b20da4d5d4d6c,True,Tests_passed,59e52e58879bbe961eca07a5370cedc462c6fd530eb278e2130ab124802b764f,True,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,867bcc7c3a8af60bf46807969a5b7bb563b661760d2658cfb0ef9150bf47eb0f,Tests_failed,5aa02850574d541b45c00eb223a268cf81eefc2d0a780a9bf426667dc1ecf14f,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,867bcc7c3a8af60bf46807969a5b7bb563b661760d2658cfb0ef9150bf47eb0f,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb diff --git a/results/combined/merges_tested/thenewcircle/spring-hibernate-20120924.csv b/results/combined/merges_tested/thenewcircle/spring-hibernate-20120924.csv index 4f002d25d0..6cf6c7ee2a 100644 --- a/results/combined/merges_tested/thenewcircle/spring-hibernate-20120924.csv +++ b/results/combined/merges_tested/thenewcircle/spring-hibernate-20120924.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/new-cheatsheet,7ec9c1b4bb69e9fbd58d5bef0bab16a09ca7bf68,a133049b147a4e77cbb9fd22068680adec4a8dca,28040ef7891dd8179ccfb25a3d3b1ef7dfa40553,,True,True,Tests_passed,98a80124f8d4c0863a2bd42439a176d63b90d0530f12a64781de8351e97140b2,True,21,41,496,2,True,Tests_passed,68e8015eee2df1f6c36c9288f4ead74cd1dd26d81d1b9470ff64dfd53a267937,True,21,True,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,d542f3bf343081fd66267d4fb614e02725311c37563457de5dee1f880ae3004f,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Tests_failed,04c806debd70d435e5b6bc15b3af7ae276b4d00d3b74f25b608eb8ee0c7323af,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,deb2ed6dfb51761fcc829efa45d3aa3992c64141dc338d688a9daadbc7599ad4,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049 diff --git a/results/combined/merges_tested/thepoofy/foursquare_v2_java_adapter.csv b/results/combined/merges_tested/thepoofy/foursquare_v2_java_adapter.csv index 3dae76ecd9..337a978ed9 100644 --- a/results/combined/merges_tested/thepoofy/foursquare_v2_java_adapter.csv +++ b/results/combined/merges_tested/thepoofy/foursquare_v2_java_adapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,dacecfc813308901bc17bdf1bc849c3ca820eb01,8a91258647f7283dfc59c43c5cb9e6947e668d16,7251dbe912796e499451016170d0dd1dca2bb969,,True,True,Tests_passed,c29ee449380aa2417cfb01a4e30ce6e1a22810275ef08fb3d474cc4c47fdc3bb,True,13,52,159,2,True,Tests_passed,ba1018dcc74b75db03bb7a977ce73f721171735346fcf70550b72f44be193aac,True,13,True,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,2dcb801ab82596fcc1e662c5594a3afba3770b10e1da5f65d02bffe533f1ae34,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_timedout,,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,0dba0631590c7d401dec9e2c10e6f11ee894f4f49847bfa9362815914c40a2aa,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6 diff --git a/results/combined/merges_tested/theupswell/appengine-counter.csv b/results/combined/merges_tested/theupswell/appengine-counter.csv index 5621e523af..6aa21c220c 100644 --- a/results/combined/merges_tested/theupswell/appengine-counter.csv +++ b/results/combined/merges_tested/theupswell/appengine-counter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,303ad503d31a1b375af2a85f46a0c512ace1dfd1,40b139ac04cd6c2e2a4ddfe86bf2fff7b90a1bbf,2eaf5b5c27c22c411eb066f546cb5051b1a73a9d,,True,True,True,17,163,1959,4,True,17,Tests_passed,8ddc69f47b9783365844b5ca259198e29c2cc640bf60ac9b5bdda52451107b18,True,Tests_passed,185dc3f8bb12a351eb4fec64ca8012277f6264c27174b768a1320c7c08c8b5a2,True,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6 diff --git a/results/combined/merges_tested/thinkgem/jeesite.csv b/results/combined/merges_tested/thinkgem/jeesite.csv index 7691acec19..ff78a998c5 100644 --- a/results/combined/merges_tested/thinkgem/jeesite.csv +++ b/results/combined/merges_tested/thinkgem/jeesite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,False,True,2,1,9.0,22,True,22,Tests_passed,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,True,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,a8db65bb3362c7da5be0d9eb7f443738ec481b79d4f6244803202fee20c23254,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6 diff --git a/results/combined/merges_tested/thomas-joiner/hunspellbridj.csv b/results/combined/merges_tested/thomas-joiner/hunspellbridj.csv index 177550d6d7..e673263db5 100644 --- a/results/combined/merges_tested/thomas-joiner/hunspellbridj.csv +++ b/results/combined/merges_tested/thomas-joiner/hunspellbridj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,fc1359b4df627beb16aa657b3d6944e83b72fb9b,d1d5bf43bcc12996715030a6e73461cf507d7a88,275ff63bccd4e5d57f763840ef9eb118616bf987,,True,False,True,14.0,10,69.0,2,True,14,Tests_passed,b8a2e2248c52cb23a5e8009aee6124142b3988a3fd94effbc60ec6f585b509bc,True,Tests_passed,34077f203c3b3faf45c45fe12d6ebdf626e4e25dd64df57b67f8eaceb1adac9b,True,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_failed,1d7e619363e00637ef9b4b83b86022a0734323d9ec0fbce7d59830f4f2ab38f0,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8 diff --git a/results/combined/merges_tested/thomasjungblut/tjungblut-math.csv b/results/combined/merges_tested/thomasjungblut/tjungblut-math.csv index 27a31181e0..b757318867 100644 --- a/results/combined/merges_tested/thomasjungblut/tjungblut-math.csv +++ b/results/combined/merges_tested/thomasjungblut/tjungblut-math.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,e93e48e4d4a1335c20d31794ba41eea7641603d3,87ca2f19f4519fdc576c7344aeda35855a369dd2,551e96fbb6c1231e912ea3110c677e2d0c8421df,,True,False,Tests_passed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,True,5,5,39,2,True,Tests_passed,0176f50d794e17693f7406820808543e7951cb19d7d44d4f2e8ae980ad90907e,True,5,True,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,3fc0c01ca386e9fef321d14e0c43291c1fec12009bd29db2410ab4ffe5ea4868,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929 diff --git a/results/combined/merges_tested/thoqbk/traprange.csv b/results/combined/merges_tested/thoqbk/traprange.csv index 04ba0ee734..3b486624a0 100644 --- a/results/combined/merges_tested/thoqbk/traprange.csv +++ b/results/combined/merges_tested/thoqbk/traprange.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/22,8227158f2f52cc7a01bb3775e7dd0b6a3274e0a3,7efc7d786d536bac577259823f5425dd7b357bbc,2fda0c4474fc8f1563ec41b24d631118570f5203,,True,True,Tests_passed,4d8e34a5097ed424996d23ebc356045a3d3ad38c5dcada4bfc800ff23535cfa9,True,19,88,1466.0,3,True,Tests_passed,b95b1ba3a6af63749572a2696a0d13ad71bb37198d8fa3ec6ff260b1c802f19c,True,19,True,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,29e3b54d712a223cc40f98977f472bb8933b58c94f3a4ffdd6855fcabafc1a9c,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Tests_failed,d27fc4c23466aab78773b034ba8afbd2266342da5212f53c06e424ff9f0ef4f1,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,f5ca52ea27430c56fc3bffb9e4efbc80cd59f2720eb668f35545e29b5a4463cc,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc diff --git a/results/combined/merges_tested/threerings/getdown.csv b/results/combined/merges_tested/threerings/getdown.csv index 545bc021d9..5ecb524da7 100644 --- a/results/combined/merges_tested/threerings/getdown.csv +++ b/results/combined/merges_tested/threerings/getdown.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,ad32699ca3156b8423fe198b0486c346f18cafbc,b18f96c1d69599132c94fa352308223a715559b3,0a4bfe65c4f08e8fbff4db6a88211d742258e913,,True,True,True,44,241,1845.0,2,True,44,Tests_passed,86c6bc37113b6aeaf7f5814c861100e6d42e3fb15e95e595a0801e3bdd16d389,True,Tests_passed,6c2df12e2287a4cca52bc982a184f8f8d4b45898266f644526251394d75e5be8,True,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1062e27bb89f6581a031307603b90980ccc765e9b7bc7a3b42672734d369ef1e,Merge_failed,e38e3c41b366f9e0478a15b062a4dd5404dd670eb02849212ef0ada0c6cd91e5,Merge_failed,24522581c9a85f20aba00392b01ac3acbcdba222f4d3c136a238628fc0e862b7,Tests_failed,baa8592eaf50781aaf0295e3443966290a10f0a9559797b8bf90ed45fdc7c16b,Merge_failed,e38e3c41b366f9e0478a15b062a4dd5404dd670eb02849212ef0ada0c6cd91e5,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,850eb64637fb8e4bfc2ef066ecd9086eb14d3db5a23bdda8f66e703417b1dbcf,Merge_failed,24522581c9a85f20aba00392b01ac3acbcdba222f4d3c136a238628fc0e862b7,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770 20,refs/heads/master,f087863098a6bc43551643f94cbe1893348773e6,b57524d0d6eaa00a1cd5737d446fa015c8980849,6af6081648724ebb7bc62448e44f2ef44159d810,,True,True,True,34,138,762.0,3,True,34,Tests_passed,9a1df4730b492bf5218d149a2e26d94b262b58a9711ba7f5ef62030d4f523877,True,Tests_passed,5539a376de9ddc0351d79618bd7c088a6340f9138643df1f7599881475381ef5,True,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,3a98ccf6b5314ea07a43844c18af944502f36fb94d0178643c68cdb63eceb31f,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,f283cf5d4a1a74e4f6e81e8e456e83f085bb06c6885f969529e1ec4c1e1c01a0,Merge_failed,e2b3c125122b99eafaada9277c85eb1b25bb8b8f6cc1885b62cfe672238a1715,Merge_failed,b091550ee257de719158ca2bc66af55a72e20d3bba043a1d545cc9f4b7a4cf62,Merge_failed,8e82ef666a4e29ae922e075b189b601501ce5ea455fa87aab546bdd4569c2d14,Merge_failed,e2b3c125122b99eafaada9277c85eb1b25bb8b8f6cc1885b62cfe672238a1715,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,d44e4030f3d7c30b926c93396442795445f0008a5107b4ddb7bd10039e8735fb,Merge_failed,b091550ee257de719158ca2bc66af55a72e20d3bba043a1d545cc9f4b7a4cf62,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,3a98ccf6b5314ea07a43844c18af944502f36fb94d0178643c68cdb63eceb31f,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1 21,refs/heads/master,ac499c1e3c4dc81fadfe3e64e617357892c5d0e8,c45615f0a028cc373788e47a58f9b7aea03f0b63,0d384966a6af9556c2838d3d5ceb401e494e5b5e,,True,True,True,6,29,141.0,2,True,6,Tests_passed,880e83997fa9290fa375e8aad3f400d3101df484c76f7f49a66119484c774da5,True,Tests_passed,81a59d05ff685c264bbb7f7a7fa0ebbdda7ce3f13fb857a9ec00a802763be5de,True,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,09a01c09e5c4f72cb8984967221ad4612f456d76b47f863d90f65e45cab35417,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,09a01c09e5c4f72cb8984967221ad4612f456d76b47f863d90f65e45cab35417,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f diff --git a/results/combined/merges_tested/threeten/threeten-extra.csv b/results/combined/merges_tested/threeten/threeten-extra.csv index bc849b3d44..a8824aeb5a 100644 --- a/results/combined/merges_tested/threeten/threeten-extra.csv +++ b/results/combined/merges_tested/threeten/threeten-extra.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/main,f0bf686f1738f1d253e907670e43dcb57789a592,28f100b913b407c72fdcb509ff02eb6de4d68bb3,01f5e014d8e158e32353355b1c09956794c6d8a8,,True,False,True,10,27,235,2,True,10,Tests_passed,9414c830421dc01c4c1fab23dc6a1e2bb71e5db052b083acdedcfaf63e634cf6,True,Tests_passed,2798aab0ee424cc0d2efb1c737ea81b5d4b883790ec8dc6d5e6ee42e88e9abba,True,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_failed,76beeb909d7884bd25040e4ea4cba2087f7bdbf163ed103363cc0d27e9fdb332,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713 3,refs/heads/main,0dd15948cedd9c1fe21d94982cf724bfd96753bb,dcbcd59e11e8de1e8b16f64fa7ce1b95524b51de,bc239b7c65adf8f3f708c8db0f14b55d044f3157,,True,False,True,3,4,94,3,True,3,Tests_passed,542e0c032bb22a350774bc8eb21e132bffd7028b6b46718664e1dee3c704803e,True,Tests_passed,c245b472a748f1588b9e6b0f8819fb32fa93562eb3a141e2b72e915f209505dd,True,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3 26,refs/heads/main,a291dbf8192d922e5fc5f9e98d9ca768e0d62603,ad315416100173b72b82edd5eb74c5edd58969c4,85aa6b71253c8071f6103c3d1057f562d9295c26,,True,True,True,38,1086,5679,2,True,38,Tests_passed,822987c45baf110b58f3e339ba8833f30cba0738f80c8069307ed955b7ae1504,True,Tests_passed,757de6d242ade9a43a4c1b4fdca72465fabe1a5ecca7abb034da767a9387233c,True,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_failed,aab5861c55d84e76945f3e2f0f4ca79597a5e12be0d5abd90f1fe3c708e96203,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3 diff --git a/results/combined/merges_tested/thymeleaf/thymeleafexamples-springmail.csv b/results/combined/merges_tested/thymeleaf/thymeleafexamples-springmail.csv index 6b57a897bb..5dd25f3d12 100644 --- a/results/combined/merges_tested/thymeleaf/thymeleafexamples-springmail.csv +++ b/results/combined/merges_tested/thymeleaf/thymeleafexamples-springmail.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/3.0-master,158fb6406b10311f114054c66f6206dc7e915917,9210b250b1667cd62f21b06849ca55d4fef2764b,2e149543aa353adaf99eaa544f2c78ad5d091bbd,,True,True,True,24,91,472,11,True,29,Tests_passed,aeb3adf5ff75668d4a1a0c0f0534aabf158afcd762f278d5a30038c51711ea23,True,Tests_passed,49691c320824661f6155e51f0219bcf10423dd997edd806f0e05c1d2e6429aa0,True,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,03cad3ba7bd5bcfcbef1e1af5cce620cd4be49dff444c1c25026294b270ef756,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,687a3ae1da9fdc2f4293d61eb23a5e46421372b37b9c937eafcbf2310b76df20,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,603e6290faa506118f9c9fe59a7954d7b96bdd4177970730f270bacf4aeac6d7,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1 diff --git a/results/combined/merges_tested/timroes/axmlrpc.csv b/results/combined/merges_tested/timroes/axmlrpc.csv index 9ee7d22bf1..eda06289fb 100644 --- a/results/combined/merges_tested/timroes/axmlrpc.csv +++ b/results/combined/merges_tested/timroes/axmlrpc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,be8156e8c76bb2cfede311ce136ead1916be2fc4,860c8ff40e85fa27d30c0c37fa6ebfe6688197d0,abab2528a322425135d44257e6efe3e7e361b6d8,,True,True,True,10,23,107,3,True,10,Tests_passed,3c502d00da89828d147caa07a3825a1d61ec315548c61a269234de0073303b98,True,Tests_passed,aec16f12a61218c227c51387c6fd8227e3d851d404262e9a122500dc548cf5a0,True,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d diff --git a/results/combined/merges_tested/tipsy/javalin.csv b/results/combined/merges_tested/tipsy/javalin.csv index 7ded3c0e2d..fe08606a3b 100644 --- a/results/combined/merges_tested/tipsy/javalin.csv +++ b/results/combined/merges_tested/tipsy/javalin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/remotes/origin/pull/129,93b9b43928f8b9c5d753674f3896c3af7acb0e3d,db051546671395b924f921f7615c0d2018c3b53b,fbf314378f2bfaf86b7c4548304b472a4bbef803,,True,True,True,28,204,1495.0,4,True,28,Tests_passed,319dffa1f05969183a2a96759f69a6d02619383042c667f43cc2183fc487855c,True,Tests_passed,5b89b205ccb2196191340e64042c2ec26ffe79ac916b2fb562b29ea71d1b399f,True,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,e684643687c0ed18e0a2ff9ca819091a97ebbb5dde667432919201d8c1bb6840,Merge_failed,6b63d0dccc67b226beb3f2eb753a5a6b44701f81fccc085623e505304fa3c42a,Merge_failed,30d15462c2af81032aeb5ab7abd4109c13b7a480b9fa98be87aa84cb0dfa9a96,Merge_failed,034b4dc3b030f1e2da4002f8525c0f88def00a02fc1e04b309c5b82691a6080f,Merge_failed,6b63d0dccc67b226beb3f2eb753a5a6b44701f81fccc085623e505304fa3c42a,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,8613d5c4dae3f987eb19abb4d71803cbecae2fdd15de47c83680cac0e72a36ad,Merge_failed,85457bd6da9aa232d11d36defcede16048a8fb25f28f20d422cfab90a96085f6,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d 96,refs/remotes/origin/pull/2013,659aff13b5362770708cb1b7a93e3c43fdcb4038,de9472bc18f48eb225eaf7f3b3143a0cbc29bf8f,3d90520031a97d4fd47e223ec3071e64aef656aa,,True,True,True,65,363,1558.0,9,True,65,Tests_passed,131aa7ffca750a8756a961eed9b647b5da350bb6705535c5cfa27c2974620063,True,Tests_passed,14a6064f01b57e5785c589047aa78438b7578b988ec80b4a7c128950859ba479,True,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,5021c68b0e9918fd979d5816caad5b058827add5185e35d6f1f5f1415e3e6bf0,Merge_failed,0e9fea5701faa82adf7d2441f2e6814684fd89a446b8d47234ec4f3e63776f4a,Merge_failed,82a5441ac904129bb76ec0e5e1655698fbed7913b6cb4e917b13f9428b354287,Merge_failed,84256df77acb31b5aabdd68c5e76d451d51d6762498deff7f4619ed57082af19,Merge_failed,0e9fea5701faa82adf7d2441f2e6814684fd89a446b8d47234ec4f3e63776f4a,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,dd7b32dae6165e42ce8a8e1ccefd1dcb115d63f5193058fc1a94641088102fa7,Merge_failed,13ce83155bf9f6962049700fca490f18ef8510f37004dd9b46b84d4c54ade065,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466 97,refs/remotes/origin/pull/2013,de9472bc18f48eb225eaf7f3b3143a0cbc29bf8f,b24df3c9a75fefc26e0048cb7e4fbfbcb84dcb27,1cc315a8135c26f51ee3f1c26a3a7cfadc06af44,,True,True,True,37,99,431.0,3,True,37,Tests_passed,797e96db6747cc8eeeeb6aa95964e075ea8d006e5a94b1e794ad62ee04869fe0,True,Tests_passed,61e49a71e861991e85c4bb385b2e7a283a7ad049560826c15ce7834394d17247,True,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,547e0200c6dac9b7a4f094e21ea837368df3399bc4cb0d83c09b94706bc0819f,Tests_passed,b782d76dea310fc3038819b2353c52161355fefa86efb7d30a1b07ce9eb77df1,Merge_failed,c3a9955318b3926de0bb603a9446e4bb1931da66707bab5031d0fb920698d50d,Merge_failed,eb28928d7bf38d1ce6bb47662fffe9c4abeebf7b0754c94eb7ec366d5e29fad6,Tests_passed,b782d76dea310fc3038819b2353c52161355fefa86efb7d30a1b07ce9eb77df1,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,5456266650fa9e5b3e7ac7805bf3dd0f86f5289d0af5e0d6f7d57053c385ca76,Merge_failed,383bb5a325f2293d9f9bc8083a8e41efeb7b536aa84eabd035fa2dc14b74ab8d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d diff --git a/results/combined/merges_tested/titokone/titokone.csv b/results/combined/merges_tested/titokone/titokone.csv index ad48b15555..bbbe4ca903 100644 --- a/results/combined/merges_tested/titokone/titokone.csv +++ b/results/combined/merges_tested/titokone/titokone.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,b4ac484b6a1a0484bc131e305cb531835efe9aa0,db2a1a74458f65887c532c52c60ab73d99eb6021,642f4a961a4c51b8baf679211a7e4de1bcc17b00,,True,True,Tests_passed,74cf1e3ed7e57adc6162b7432c67b363b79e4df1909f3524c2142fa3b2172d88,True,60,539,2631.0,2,True,Tests_passed,a23397a2d22680845537fca02f46c85344b1b7f5dd9abdeaefb9491263eed114,True,60,True,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_failed,71926a2dde501078bcc30f481319647fa8349af681ceeb5af9d2521b162e67a6,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8 diff --git a/results/combined/merges_tested/tkelley-eg/collectd-fast-jmx.csv b/results/combined/merges_tested/tkelley-eg/collectd-fast-jmx.csv index 84c35d51da..6e97edb311 100644 --- a/results/combined/merges_tested/tkelley-eg/collectd-fast-jmx.csv +++ b/results/combined/merges_tested/tkelley-eg/collectd-fast-jmx.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,da86adcc3eae767206ff283909d43d4a94cdd8b6,292d4b40fc4f7ce235ce8055efce4b5c272c8a07,b4562fd17641bb0a03449bea9ea4651d6ffc9f5d,,True,False,True,3,7,32,2,True,3,Tests_passed,c5b1f3bf2be7ec9cfe42c76b3634ea618b20bb92761fd92f0c63d7ea91c71e15,True,Tests_passed,96c4a5b285385e95748c2e79bd97cf6fcd80f2716d6d3728dee6b8d59eedc4a4,True,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_failed,cb72ffc0e807bfe83cd517c2a8feb1ae247bd9e88eaae3e8fa4209b105381c33,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8 7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170 diff --git a/results/combined/merges_tested/tntim96/jscover.csv b/results/combined/merges_tested/tntim96/jscover.csv index c3af19c4c6..88ae0ea3ab 100644 --- a/results/combined/merges_tested/tntim96/jscover.csv +++ b/results/combined/merges_tested/tntim96/jscover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,15,45,1706,2,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True,15,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042 diff --git a/results/combined/merges_tested/tomitribe/crest.csv b/results/combined/merges_tested/tomitribe/crest.csv index f0d40ecab5..5a791de26a 100644 --- a/results/combined/merges_tested/tomitribe/crest.csv +++ b/results/combined/merges_tested/tomitribe/crest.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,bab409d203df1b8681876ae3df368f630f5ac104,6c8e1a6a9c929cb9095009cff33c612c56e9e0bd,ffcec54f11b9471df920a004acd68fb1cb9cc2d3,,True,True,True,32,70,592,3,True,32,Tests_passed,98753b4a77b11a3c08aca4f3af00ac38c6e30961f88a93a51c79aee98cd33d1e,True,Tests_passed,3d2646136b11fff4df80bb5ade0eebb6edd3d0deae041b1a15c6ba8b33f99adf,True,Tests_timedout,1e20848ccf797449813b3662b204ec617c7f16fc1831238a1ab750d980ab2b0b,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 27,refs/heads/master,d23c256ef0e1c28707583fd2f1738b932dd0e832,7b4318ffe350c221991bd51e6d59053743f284aa,81d39d8b802bb3a45408b0f4c0fca973010199ba,,True,False,True,16,24,91,2,True,16,Tests_passed,dcaabc6052244ddc997dfdd2a00da997799d6866b2fc621cda352ce59f8d11ad,True,Tests_passed,05848175f35a6b36a10f9b8f5de68e9b60fc17ce94d52e1ad85eb2955d745de6,True,Tests_timedout,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 56,refs/heads/master,73469538cdc04b36ea4d09dccedc1cc50780904a,92bb9e363513aa63b82d539c7e641d117499084a,89c8e37844dfd7b4ae2aa96e246b466f2ed53c33,,True,True,True,11,36,493,3,True,12,Tests_passed,08a32c0f5bd630bb4ba391871d425976c34d70ca8fdcc8c7ce141a8f390ce1db,True,Tests_passed,a99f7de1c30f7258de8ce1ecbebbf3e286d6df86aa2b75b5d95ad831ed97bf3e,True,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,527d69ed31a7912fa6a89fd9daea9327527ece78a558fac540d50967136fdd4e,Merge_failed,05ad7f9ab85d5c7df720a5a60f2c267f7acb97ebe45e4dd5be6f86f683275cbc,Tests_failed,c63a4b1b3867d743146661abb4ea3ecbfda49a7235a6813036da8b52158fe551,Tests_passed,adf026f7dd139f1f9e4ffdfcab07f6855613ac11a83b12edba854ce8a279100a,Merge_failed,05ad7f9ab85d5c7df720a5a60f2c267f7acb97ebe45e4dd5be6f86f683275cbc,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,df61c5fd5ff869e830848f44a1ab51e79a76baf52596776ee6386d26580e1a7a,Tests_failed,c63a4b1b3867d743146661abb4ea3ecbfda49a7235a6813036da8b52158fe551,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b diff --git a/results/combined/merges_tested/torquebox/jruby-maven-plugins.csv b/results/combined/merges_tested/torquebox/jruby-maven-plugins.csv index 50ba304d4d..f0ea1b0e07 100644 --- a/results/combined/merges_tested/torquebox/jruby-maven-plugins.csv +++ b/results/combined/merges_tested/torquebox/jruby-maven-plugins.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,1571b55f4b470341a6ff1ef05e5ef3410cbc0418,2c944d6a12023c5ed33046fcc8ae99ce6ef6d146,3d550d56429568679fae47c9d1d640e2e3477cc8,,True,True,True,8,21,217.0,2,True,8,Tests_passed,fb5fe927362e284a846fce49ddc75a818be3bd204c48efda9267b523a1b8c7bf,True,Tests_passed,38490cf7d91b2434f63c5614a2d9495896940e09efd5847e0a3fc6c7d3bb6e62,True,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300 diff --git a/results/combined/merges_tested/tpietzsch/bigdataviewer-core.csv b/results/combined/merges_tested/tpietzsch/bigdataviewer-core.csv index a765c254b4..e3f13bd001 100644 --- a/results/combined/merges_tested/tpietzsch/bigdataviewer-core.csv +++ b/results/combined/merges_tested/tpietzsch/bigdataviewer-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,572d4602a6282501870c01d3660fea9b22a817f6,e864f1f1e4d68db74b726e700642bbeffd9aa0b0,b9e308b70afb1addf3ffb8c5199d2db45f55cde1,,True,True,True,77,589,13633,2,True,77,Tests_passed,88a97b0a639adf9b7d3a072fb57160985a73b231e5e329dbbe0eb7cc7bd3088a,True,Tests_passed,adcc4f24589e64f9b43272f5bef04f30282bfdcf61b844eeac3c811426777890,True,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,8875db91331758210eab280667ec532ac48e7b446597d438c5de503fcb9af0cb,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Merge_failed,90a941b4bce9074fd99ef9f4863bab33a616e579ed2010c8c48008367401936c,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,ab39aa64c9e8408bc12edfa16c035b150b4bb41a1fa1f6b7bd3a48800534fc8c,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3 24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b 27,refs/heads/master,6a23498e499ca4705744af0848c6a07407b65c71,8020eb38683b97e2322a72c064ecb9963274f59e,dc5c477dec555f8dfedbb590a877421bdcd60281,,True,True,True,7,25,227,2,True,7,Tests_passed,41731725d6e3a3a69eedc42ae593502d2cfa47ba543312519ab64213d184c1e7,True,Tests_passed,2c7099a0e60764b445df1d134b448b23da26732f5a16bf5891f30c816ccf8068,True,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,f4e4fd46d54f3029f840f8afc08131a2156eadfcd390a702786ee9ba1f7834ab,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Tests_failed,1424246b744f1365191cfe7f32748550adf662e5d6255d55a20e6730040f824a,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,81b317e637a46ca09ec022392a6bcce240663751d2824ca46a60a4b06e9bdd03,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd diff --git a/results/combined/merges_tested/tpietzsch/spimviewer.csv b/results/combined/merges_tested/tpietzsch/spimviewer.csv index ff5ca01c2c..4bacd7dfb3 100644 --- a/results/combined/merges_tested/tpietzsch/spimviewer.csv +++ b/results/combined/merges_tested/tpietzsch/spimviewer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,572d4602a6282501870c01d3660fea9b22a817f6,e864f1f1e4d68db74b726e700642bbeffd9aa0b0,b9e308b70afb1addf3ffb8c5199d2db45f55cde1,,True,True,True,77,589,13633,2,True,77,Tests_passed,88a97b0a639adf9b7d3a072fb57160985a73b231e5e329dbbe0eb7cc7bd3088a,True,Tests_passed,adcc4f24589e64f9b43272f5bef04f30282bfdcf61b844eeac3c811426777890,True,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,8875db91331758210eab280667ec532ac48e7b446597d438c5de503fcb9af0cb,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Tests_failed,c0fa7caf2e0abefb2ff914b2a90102e83c75f68d647238e5e6de629adcde43a9,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,09e465cd4e0bab32ad6f6507b3f47b3c988dd0a84ff44da129eef0c48792960d,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3 24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b 27,refs/heads/master,6a23498e499ca4705744af0848c6a07407b65c71,8020eb38683b97e2322a72c064ecb9963274f59e,dc5c477dec555f8dfedbb590a877421bdcd60281,,True,True,True,7,25,227,2,True,7,Tests_passed,41731725d6e3a3a69eedc42ae593502d2cfa47ba543312519ab64213d184c1e7,True,Tests_passed,2c7099a0e60764b445df1d134b448b23da26732f5a16bf5891f30c816ccf8068,True,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,f4e4fd46d54f3029f840f8afc08131a2156eadfcd390a702786ee9ba1f7834ab,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Merge_failed,22eeb156e3275475a5629ddb3f935ce36ca02f716a616f0f428b4678291cfd2e,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,d850f236fcb4b432e985a052fce5235ebbe79980f73e0f9cc559d424f37f0ba3,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd diff --git a/results/combined/merges_tested/tqh/uglifyjs-maven-plugin.csv b/results/combined/merges_tested/tqh/uglifyjs-maven-plugin.csv index 16de577546..c10bd25b14 100644 --- a/results/combined/merges_tested/tqh/uglifyjs-maven-plugin.csv +++ b/results/combined/merges_tested/tqh/uglifyjs-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,c77d67ab1de02ab8fca05ea264d59a50ef71cbcf,9c75486c84fc0a219d63db87d46e782f6a771030,4ec7118d75ff23876d0d08e8eb65884bf64fc7d2,,True,True,True,3,21,97,2,True,3,Tests_passed,bbbc792e3b4dd1035526207693bf33adb93d8a35482fc4dd0bc2f37b692addd7,True,Tests_passed,dcd0ad0bfc7a8d47966134a33190681ec1670d6807f6d68ba179a7e9feb0551e,True,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5 diff --git a/results/combined/merges_tested/tracee/tracee.csv b/results/combined/merges_tested/tracee/tracee.csv index ed90a5c723..46feecfd74 100644 --- a/results/combined/merges_tested/tracee/tracee.csv +++ b/results/combined/merges_tested/tracee/tracee.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 94,refs/heads/master,f75ef3990515f567880ae6045fed482ce05cc02a,62baa332cdbfcdd7955a7c72e827929e58254b04,d787ab20924a98d77c44dc8fe5ce5c27046d9b5f,,True,True,True,53,224,1825,37,True,57,Tests_passed,f4d6d2d762ce4d53448fe934fe38e8e2da67dc9b345ae5814b95fb39cd6e7020,True,Tests_passed,de969bd4b3c296052b56f85266ed185ab7c16b3cb53566781c5b510d78bd29b6,True,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,a38b6a5d40456754b09574e65a89bc30473fa3059c02f3b99684f747f58a7bfd,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,b725cfa0ac1b6f5fd689ad8e521c86f05c29bcb7aee42170dad92f865e4ed271,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2 101,refs/heads/master,330e569b8ab546597cbd82d43bdcc0b340e1c633,1688ed6eb0b27d1ea475493cd66ea2df3a50b3bf,09cb1f3663392108d2ca112b8e38281abb8076b7,,True,True,True,102,98,1199,2,True,105,Tests_passed,f080e9594aa600e4e59f74d06092a41ef34907ad7b60255463e3cfa4459a53a9,True,Tests_passed,f968a4088497317ac1adbee39163fd3544338af539d79c0fc824659a393f5b87,True,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70 114,refs/remotes/origin/pull/90,3d7cba11dab61c3fae92e9539b254198ffeafa84,eb1701c1733258f07f31d3c527524910048565ed,f233800337a4aeb33aa18ab3e1fa3270c07a4a66,,True,True,True,36,130,542,4,True,36,Tests_passed,4ea13fd34a9d788e365000e5225d13fa55f13cb68ad0e35b30713fc99ef6166a,True,Tests_passed,bff90d8ecabb516d85f47e3a59aa3f037b5e813fb5277185ef5ca972f1d48052,True,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,c4d30452813448d06419f0ac2aa873bdbc64fbe57c3d9764984b72182faf900d,Merge_failed,26df2eae3138f0b37a17ecdb1c2c951f646ed2fb76c0ac7fc922e0cb6c7f2684,Merge_failed,ea42db4d3c13953c41bbdf76b08647cbeb6ebd6613d426245425aaa67404044d,Merge_failed,ea42db4d3c13953c41bbdf76b08647cbeb6ebd6613d426245425aaa67404044d,Merge_failed,26df2eae3138f0b37a17ecdb1c2c951f646ed2fb76c0ac7fc922e0cb6c7f2684,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,4e400d81d0e55c4796e5fea5bd73f681739727fe8cd030b1f9db0775d8306247,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474 diff --git a/results/combined/merges_tested/trecloux/yeoman-maven-plugin.csv b/results/combined/merges_tested/trecloux/yeoman-maven-plugin.csv index 35eb2c0e5c..810373b051 100644 --- a/results/combined/merges_tested/trecloux/yeoman-maven-plugin.csv +++ b/results/combined/merges_tested/trecloux/yeoman-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/pull/31,5f3e6016a840a88e18f554d79d9d94de21a070e9,fc5039fe2138132a59acadd539481f1bb0e43aab,d56218d04ed9200e1eff7e35f3498f604aca4d86,,True,False,Tests_passed,f96a464abd63f497c626ffe37ea864f36d70d8e417529dbcbe274d34cdfe4ea0,True,3,6,60,5,True,Tests_passed,97d0ffe23c8acf9e3c4c101a2086e6cd3e238be91e42c10ecf6e6c64e600e30d,True,5,True,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,a7de7def47def04c383a986b3995fe6a74ef00f581c34a2886f4a26c3efad223,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Tests_failed,b12103bc467459b95674a2a1d35e196ef9830d683c4c62a7b7c336a43fa69605,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,3041254b31bef81d09e9526f8ed224524ba48b1bef0d2d9473841fc81334a8ea,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c diff --git a/results/combined/merges_tested/tridentsdk/tridentsdk.csv b/results/combined/merges_tested/tridentsdk/tridentsdk.csv index 0852800b43..3d19f3b577 100644 --- a/results/combined/merges_tested/tridentsdk/tridentsdk.csv +++ b/results/combined/merges_tested/tridentsdk/tridentsdk.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a33d481a2f096378f2db34c2db8acc985f5c920c978e018c649631512e7d998f,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf 10,refs/heads/revamp,004679e5bb6d1227b91f9e1aeaf79b72c317a397,d5844b55b3f6efe95d71450b49a3723a0b9acae5,ed227f8eaca49f6d1a65ccbcea8fad55b38d591c,,True,True,True,15,97,426,3,True,15,Tests_passed,06f41e3da5a99fa1855b1ab414f6b95d5c330ab6b27fe8841c590f052e994045,True,Tests_passed,cc3198654698c2e4774f971abbf38f0045361de1ec29fe479b44312c7a19fbd5,True,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,eb71efe653a3659ab58d88f1e5c027abcaf9f4a5df377614eeabf0ca13d2ef71,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,1f948cda894d56a5f839ca01f69b0b859e0d9b61fd8118120c23d464be2206d1,Merge_failed,d85a6c0d015c66fba987a8b10ec028de29365f2675f722e8c8a0df996a3a0374,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,3f8c50bfe26ac7bc5d801ba81f4a8d2f56d9a5209ec8d83fd84b7ba2d2e02ddd,Merge_failed,6fe24757cfac9cd2e746ed7f489d9155ef2553808a13b8dedae4f2515ece975a,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1 11,refs/heads/revamp,b53a148ca59225dcbceb1fc65321f98a0c5c13f9,0328aebe181d4896b2205893c521c1015eb69ae4,6dcfd0c9bf20779e4b23a3aa05d29ee6cde7364b,,True,True,True,75,253,1483,13,True,77,Tests_passed,cbee04c3151cae68ef2e931fb88dbe19fd26676962d2194b8acdef0be7b956e4,True,Tests_passed,7793f3445f483bdfc586988358a2a5506cbc255cf216f4ebd32dbf102a61e56e,True,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,295f6f04adaf67ce6ca87627ac686c54139f54adf7424f03b2af435897508926,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Tests_failed,975ce6186f7884bafc18bfc6a87aa6519ca75cc245ca9bdbbde6e371958032a5,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,f5858a9c9491667191f32ee10f69d762097887cf6a29152c72f3c2a6bf2c8f54,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e diff --git a/results/combined/merges_tested/trung/inmemoryjavacompiler.csv b/results/combined/merges_tested/trung/inmemoryjavacompiler.csv index 6c9915ccd0..2d4325e1d5 100644 --- a/results/combined/merges_tested/trung/inmemoryjavacompiler.csv +++ b/results/combined/merges_tested/trung/inmemoryjavacompiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,True,True,True,13,33,548,2,True,13,Tests_passed,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,True,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,True,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,0412aebef45f173e7cabaa7cdb28aa40e9e502b30955fca48da2de65c4354c45,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Tests_failed,de6480414d085ef1d577719fac7ceb6e3cfafb9f24043f952999f39c3f7b3da5,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,1bfa158fef813e526b1558caee3127281d50d73d74741cbe636e37e9f61492d3,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0 diff --git a/results/combined/merges_tested/tuanhiep/mqtt-jmeter.csv b/results/combined/merges_tested/tuanhiep/mqtt-jmeter.csv index c69658d923..0f9ebe638a 100644 --- a/results/combined/merges_tested/tuanhiep/mqtt-jmeter.csv +++ b/results/combined/merges_tested/tuanhiep/mqtt-jmeter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/22,0c9d74cdf98412aeadda94cf3267e82549b0a391,3536c9e59f9eca285fa7df740b2bd3175fd8b36c,8fbcc8f2e694e9a9b112219606d4039a529e5876,,True,True,True,6,15,400,2,True,6,Tests_passed,c871a2a1dd1d1ed7d57d77dd426daa961fac9a317abf6e6ba566a66279e3657e,True,Tests_passed,ca69d46e29de6a208e5542bfa77e620c95b8c471501999ffd71b5c77f364da92,True,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,8c1b13bdf5924604714bf1bf9a1f9c6fd97f3190cffcdabdae6afa200e6adf78,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Tests_failed,afb9daa7db495d06e62417076e81d9c81d0c41d2905d1406a36ccc23d268ce3d,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,a05828f86b08ce516300b0cc6104948ccf249a5049583dbd2fd4f2c1a9848529,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e diff --git a/results/combined/merges_tested/tuck182/harmony-java-client.csv b/results/combined/merges_tested/tuck182/harmony-java-client.csv index fae770d333..f615053f89 100644 --- a/results/combined/merges_tested/tuck182/harmony-java-client.csv +++ b/results/combined/merges_tested/tuck182/harmony-java-client.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4ab8d439f5706f4c11ca28f1f14c3f060fda010f,b328837d846c4861b10d467eb35c0771a566ab9d,e2edd039c10ade086fb67a66b335cc1329fd288e,,True,False,True,6,8,49,3,True,6,Tests_passed,37fcf09859c16b7d744c75dd60a0020375196eed20b34364465137bdae3a93e7,True,Tests_passed,77a02e052778244f66d16116433bc51648599d26db012e180c720e68e3110f59,True,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,a822966eb5ee706af6e684590d2121da2468c696143e9c7d2367c1b13b01f244,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,a822966eb5ee706af6e684590d2121da2468c696143e9c7d2367c1b13b01f244,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9 12,refs/remotes/origin/pull/18,fb735c719e4cfcc69791ce5365a58de81b892eab,c2b95a0ce01f03de824c68ffa44a724186d543af,208518395654bdbe14e712d57f61edeb25e5fc10,,True,True,True,28,154,2324,8,True,29,Tests_passed,061bc76cd8427cadaad08e053d52ba98ccbc23919e9a6700a523abe9fe264f66,True,Tests_passed,9b4ab486b57fedd69bd48c6d57310345381941388b59153ff6722441b8354998,True,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,b70925fc078c93576c38aecd623833730c1c87abd73e8c5c821531b82344fe7e,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,c034c11ab26f4ff3a13678fcf9b63e1a283dbec3878e2e49cca67c13d514636f,Merge_failed,e17224a247560c7038a0fd5e36eaf56c05a1bba5c3bf79419072a4e9d76b6005,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,16dfd1f9e6b30c37bb5de73c4c6b0b3083b029d8ff170b8bc8051c4146f8c0f9,Merge_failed,21e06b3fd4f90ff878b0c760b31227a20b203aab033032af8e01c2a3267077bb,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168 diff --git a/results/combined/merges_tested/tumblr/jumblr.csv b/results/combined/merges_tested/tumblr/jumblr.csv index 69b3f651c7..45395d67ed 100644 --- a/results/combined/merges_tested/tumblr/jumblr.csv +++ b/results/combined/merges_tested/tumblr/jumblr.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,68fa791e60021902a52c62792948b169c466f6d8,8f3b5d754b620e791d5839dab64d072918ae7b73,06df5ebc964fdcb7ffebd69b52e8804cb2074ecc,,True,True,True,14,40,193,2,True,14,Tests_passed,e4bca14a4582b88cf6e24169b244151746528167c2566033b08c90e3dab11d2e,True,Tests_passed,3458cc5882c6af6103025ef73fdc17d70503186d6131a851e8ca1458b63a239c,True,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,ccdba10d7e68aee234ea8bb0164bff2ee7f3719977c805ecb3ff6d9c192b6bcc,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,ccdba10d7e68aee234ea8bb0164bff2ee7f3719977c805ecb3ff6d9c192b6bcc,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a 18,refs/heads/master,31bd6f83359d9dfb9b9e37ccdc397e7db3fda35d,05daabf2b00fe7252d6da43e5a42bb2ac357eedf,1a8c269e91506dd1f050b30a6fa6d16fecc3bd43,,True,True,True,22,97,708,3,True,22,Tests_passed,211efe71c6a879f7786af3d12a8e7dd9ecba17b3f12ee4f1e19b47583883ec64,True,Tests_passed,8f3e33ebf166441fb8ea3582e145c90dc6cfd3772247873157bf6cd6a57087fb,True,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,f77513a0db72e1bc9e6472dfa851214868a7ed306a7c209f4f983f5f341a3871,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,f77513a0db72e1bc9e6472dfa851214868a7ed306a7c209f4f983f5f341a3871,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68 20,refs/heads/master,e826df70c8772e95f1327bac233ce0ca9d9fa46e,2fef8c416e54d353e9d0eca1de0c88fb49d8ec6a,703a299360ffa0a0dd3eb1fe5f9c09c7bd677863,,True,True,True,24,90,551,2,True,24,Tests_passed,e4f0286cee91db3fdf7968c079330c90a1c5a5e4a1ce0e8dd25bfaccd53a2651,True,Tests_passed,8653adea3c6acef2fe056b0aee097ee51c9dc87eab1a178f3565d1ad8b1794ee,True,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,b4630275ac6fc3187472287f20d41f41cd63e9d0b3b70f98232e3c29aa044129,Merge_failed,cdd54153ea18b98ac0112d0375a78cbac1939a7dcfc504314ff9b524c719d31c,Tests_passed,fae242d085a666c8f30cdc8931f537b462a751d3f95b9063fb2f10b027665175,Merge_failed,8ce8117c40feffd4c2a407c4d118bebcb8a4895f05d717864402676cbbeb82f6,Merge_failed,cdd54153ea18b98ac0112d0375a78cbac1939a7dcfc504314ff9b524c719d31c,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,0fc99d015a04999312697aa34ab37381f354a0ab534aca93f29631678b4ac228,Tests_passed,fae242d085a666c8f30cdc8931f537b462a751d3f95b9063fb2f10b027665175,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7 diff --git a/results/combined/merges_tested/tupilabs/tap4j.csv b/results/combined/merges_tested/tupilabs/tap4j.csv index 8f70ec5f5f..83a78a29f1 100644 --- a/results/combined/merges_tested/tupilabs/tap4j.csv +++ b/results/combined/merges_tested/tupilabs/tap4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,99628e2c44b0d5f5c4d7bad5e525a56566d16080,2620ea5c57e3da066aa1af75070a704a80854c2b,2fe814a4e5272af1d0976c2b24cf5b67160f810e,,True,True,Tests_passed,fafa762c385d191ebc2ccf86b45b1862bbd6644256b853ad21a0859ef06bd6a8,True,2,10,48,2,True,Tests_passed,948c1d31ca76688fc9ef8dbb95e608922e207e7487192d18c168a57937ad9bef,True,2,True,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53 diff --git a/results/combined/merges_tested/turbospaces/turbospaces.csv b/results/combined/merges_tested/turbospaces/turbospaces.csv index 7e330f5c67..abb218c98f 100644 --- a/results/combined/merges_tested/turbospaces/turbospaces.csv +++ b/results/combined/merges_tested/turbospaces/turbospaces.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8ae57f28d98ec897164b09822d86603b02833a83,0fd7d6b196273b3582b1ecf415ee6e853ac37bf2,5ff57c384e86fcead8f20be720e12a30b992b22b,,True,True,Tests_passed,a17078563d25fe2d807d3342993548764250989e81abc3e63441278ef670ccba,True,22,117,1267,2,True,Tests_passed,e94f1dc1fe358a84c77af71e0d6009644a002e7143af12afa909faac31733a40,True,22,True,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad diff --git a/results/combined/merges_tested/turini/vraptor-authz.csv b/results/combined/merges_tested/turini/vraptor-authz.csv index 6de64d19a7..cc0a4fb108 100644 --- a/results/combined/merges_tested/turini/vraptor-authz.csv +++ b/results/combined/merges_tested/turini/vraptor-authz.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,ff9a0b0405f0d759760b73d8963d788c837bc9d0,603809922d1ebfc28b76ced0a454f82ef3b822a8,c8106473de8fc96beef50f5f9f9c778455d23a08,,True,True,Tests_passed,342bbf7d6a11eb6cf5775789e02d3f32b3458ed218a58b408f08bd8bcac41351,True,5,10,59,2,True,Tests_passed,c874ace2b4c4d01a77fed200bcfd28dacf648237071cb058e02cbdd98fc371bd,True,5,True,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,d777f521f416c7ef2f024cccfe3d37d1eb03805345a2342132af6ed15095a2d3,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,60ab4b9ee6f3db69cb2cf7dc11d6f0ed562685d8f39a4ac0aee3fefec34c45ff,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,562eea3702397b7157cad3a4a87b5671271836bac27714869aaabf9ad7977eef,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7 diff --git a/results/combined/merges_tested/twilio/starter-java.csv b/results/combined/merges_tested/twilio/starter-java.csv index ab8f2e8237..d175606079 100644 --- a/results/combined/merges_tested/twilio/starter-java.csv +++ b/results/combined/merges_tested/twilio/starter-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,01cc9db061b3d98083e4e49d56aaa052434a1f2a,c5eaf35629aa4f1ada2a42df3a6c0957ba65b1d0,c9dba43c85333197b7592dd083fdf6e3dfdb7294,,True,True,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,True,3,2,4,2,True,Tests_passed,4f6d043d71d56d02ccc2f94323e736bccffdea3ed7fc33702df7b11607f727a2,True,3,True,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,8d6c4218cbf798d14b74e0bbed5bc7dcf0d08233197b7f7489344a69f001202e,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,cc3db33559ad68eae3b56591a6358a9ca97ac0df9389e2ee4e59f42b27cc64fb,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,27a495d4874e3690f1ddce84544979539d974c01ee3eb0f0777f693775ced5cd,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1 diff --git a/results/combined/merges_tested/twilio/twilio-java.csv b/results/combined/merges_tested/twilio/twilio-java.csv index b6f03388c0..c09688a0de 100644 --- a/results/combined/merges_tested/twilio/twilio-java.csv +++ b/results/combined/merges_tested/twilio/twilio-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 138,refs/heads/main,509423448344d02b16e6173ffabdd76035e012ec,15f06feb157874b975e905e32bb77f0a3d0d3897,b2fdaa7bb7b4347c850eae3e5bd629ea3f183bc2,,True,False,True,7,12,25,2,True,7,Tests_passed,3f6cab55ca724e707182e203a155a75908052e179898787768fd4001b978ff50,True,Tests_passed,ba0a1645a5ed2893f5af4eb49fd4e2913e77d9b627ebfb0b5b3954689c7b8f35,True,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,47d542a201e64f244ce0808378bc9df70c3bfbf3f503f77bdf875e02d20a4539,Tests_passed,d17580dddcaacd17852609bc26a273fd4aefbe573d6ec333a9a4525072ff8b12,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,47d542a201e64f244ce0808378bc9df70c3bfbf3f503f77bdf875e02d20a4539,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2 147,refs/heads/main,da7bfa5df647e4ebf4b074892143028abee0bdb6,b21b03e6e1ab2a1ce8bd61e84c56626b2069547a,3d0e236505f0ac0e1b7d1ff7f2da8daae17de785,,True,True,True,27,70,554,2,True,27,Tests_passed,62e835ab0e19498a73df01df0cec6aa334d047471f18e9f0e3efcaaa21f64b98,True,Tests_passed,06491f98033557195a2bbc6e35ef5e62092762b734c343a62ccbacfea758d7bd,True,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb 148,refs/heads/main,5a1cfdd0af7bfe792d29745bd0efe09a0d86c58a,271ae3b3a4d52debdbe615b2ee048614ffc8a48a,c5d4cb76d07b67091912d99f4fb978ed29112211,,True,True,True,18,73,435,4,True,18,Tests_passed,f5fd5ed791b7ac3f00c15179b79e6630934869caefdb16fab2c04d452be67174,True,Tests_passed,8adf75e75837d5d07651718bcff62d47ab75606b40c2e8fcc93b8e4d8952411f,True,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,305b60495800313667d6f362914eceece21ab28d2a21099e682a8cb29da2f699,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,b1b72d3771f3ea13792db2107d8b93a49527820080453b15e3e7187b93459eb7,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,1b42018955fdc92d6e2d033187eb8e067af3dae044d4f73a1bb577ccbecb2a94,Merge_failed,73dde6d2a66df014d87695815933920531f0b2cd38ab14a3079c7ac81a83a824,Merge_failed,08486086c4a0f6e970f0874485d0b6ea513ffb961fecf34e216fc3a99d86a728,Merge_failed,5fbea1f8c7f5025e9b2b00e2a977f6840c87fcbc7e61f6485b36552a2b3d4bd7,Merge_failed,f89295561e9cba971d27dc4cfd1c87a894896af081b07a830819aa30e957ec90,Merge_failed,08486086c4a0f6e970f0874485d0b6ea513ffb961fecf34e216fc3a99d86a728,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,b1b72d3771f3ea13792db2107d8b93a49527820080453b15e3e7187b93459eb7,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,1b42018955fdc92d6e2d033187eb8e067af3dae044d4f73a1bb577ccbecb2a94,Merge_failed,6e52a26de257f3c0d4c4ac08b700dfc574c2b73eb5a9ca10ee09e607cbadf14f,Merge_failed,5fbea1f8c7f5025e9b2b00e2a977f6840c87fcbc7e61f6485b36552a2b3d4bd7,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,305b60495800313667d6f362914eceece21ab28d2a21099e682a8cb29da2f699,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d diff --git a/results/combined/merges_tested/tyagihas/java_nats.csv b/results/combined/merges_tested/tyagihas/java_nats.csv index 31cb8f3a07..089298e981 100644 --- a/results/combined/merges_tested/tyagihas/java_nats.csv +++ b/results/combined/merges_tested/tyagihas/java_nats.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/8,2d1935a3170dcf60976924026ff17aa76a431ede,65f9995df7708f4b6024bc1e9d6128203b1255cb,e4f2f8ec702eb75455c011207ee9d2dc85d5fc6b,,True,False,True,2,4,8,2,True,2,Tests_passed,6ce70efb79ce9699b31aeadbd817d9332e5fa61ff930f5cc6b33a44c3cb68904,True,Tests_passed,c66d9976b329a83e46b297b76052df81de0509566661e4a8a52712da94d41f2a,True,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_failed,3b6c482fa49eb2f42ecc4b19bde3c7898f2672808f44cf65b1bc6d7bf45b61f6,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151 diff --git a/results/combined/merges_tested/tynamo/tapestry-security.csv b/results/combined/merges_tested/tynamo/tapestry-security.csv index e202a930f1..0ed8992ae5 100644 --- a/results/combined/merges_tested/tynamo/tapestry-security.csv +++ b/results/combined/merges_tested/tynamo/tapestry-security.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,568cab9871a77bfa6a90c2b463facf1b01df42bc,f5562e2b7a8700bbaf146edac5b015dc88d21aa1,c4ff9efea18c287783bcde4cfcf94b91d3372ac6,,True,True,True,11,21,136,2,True,11,Tests_passed,8ad7c7efae6dde5c39e3110d28ffec139463bfa76e230538e432308d40a83dce,True,Tests_passed,5d0c7c533bf3144dec45f5891a79ef9008fe18aff62c5aba55c96c99942f5d5d,True,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_failed,e96e414a96a5fb84d86fea33adb7411a43979220e253ec6b1170160c3b8dd494,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950 10,refs/heads/master,bb15cc313d89fbcb2447bfd8a018bfa7adad2ecb,301414d707dce777c982e56ffae69664ab0bb312,505c2943579e1a15a69fbc8038d4d8f04af54732,,True,True,True,11,61,343,3,True,11,Tests_passed,ccf4faa88f4f71312961bfd4bef3907feb099edd50c3068de11b0e22c1be6f08,True,Tests_passed,40673e0fceec636fa43e7596306eb0200879c054cb72392335dff6a06c6242c6,True,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,50586eebf6d009d554adf8822179b4d9810838fcf02557d9831457a36cbb0b7d,Tests_failed,1b38ed3660ea5926d74eef0be56df7ada508671ef03c2c4d5c6bb78c501d0fb5,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,50586eebf6d009d554adf8822179b4d9810838fcf02557d9831457a36cbb0b7d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080 16,refs/heads/master,42d2f1a5acf9b27b85456e8c4f325c59fa07e4a9,9b12556291957a952b82584267a23c7e84e7493c,868f3267d4a5e52bc54c9948a67649fb31e4e3fb,,True,True,True,7,13,55,2,True,7,Tests_passed,56dfd182f8f18f4d5835277b622665059d8e021d10019fc5da2f0b3293da3fb4,True,Tests_passed,c07ca4bb82a5ee79e41a530fde87443e765f943036323a7ef341e89b4fd7fee6,True,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,c3870b6d0ab03b5d3a2969661de640d17cf92344986feb057e057480e5964f48,Tests_failed,25d89752137a5cc6d828ae874112332fdc234777eb077bb2f5c32e00fba78f99,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,c3870b6d0ab03b5d3a2969661de640d17cf92344986feb057e057480e5964f48,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403 diff --git a/results/combined/merges_tested/ubervu/elasticsearch-river-github.csv b/results/combined/merges_tested/ubervu/elasticsearch-river-github.csv index 14eaf8e4b6..a8533d95bd 100644 --- a/results/combined/merges_tested/ubervu/elasticsearch-river-github.csv +++ b/results/combined/merges_tested/ubervu/elasticsearch-river-github.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,261184e89701acd7169b001d0dc58293ec680512,3e590fef47b5eb9b167659841295e40f298e23c4,e8b07ad4428dde2308166ef5e48e0c1f98ceed44,,True,True,Tests_passed,d78ea6fa704344eae1441581abe96566e8bfa96418123e8b7bbee7cd0b3845d1,True,4,35,243,3,True,Tests_passed,c3a6bf77979d06d0c5d5001209afdf15283038697cfaac6c97e119a6dcb50a45,True,4,True,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,81cc1a3606d60bec7525648bee539e11188ce56108b4a6c76eca784a96a005dd,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Tests_failed,e06e85507b97b75bc30267cbb8b51fad2aee88ce5f10e9ddf5855c9681fdf7f9,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,995746a518383563de600b181a00722d1dac639d11bb3291f158da789ebec57f,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e diff --git a/results/combined/merges_tested/uklimaschewski/evalex.csv b/results/combined/merges_tested/uklimaschewski/evalex.csv index b892fa7c39..2e877bf1cd 100644 --- a/results/combined/merges_tested/uklimaschewski/evalex.csv +++ b/results/combined/merges_tested/uklimaschewski/evalex.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/main,c152bc8eb6d302460f56f989e91c2967cc3a0894,5d9db79516070c1cfb1395891de45d9757fe188a,b9cb3eaadf28e6de3dfd222689e25d3195667421,,True,True,Tests_passed,b69601d494c5ebb798cea0713432b207347ef3c775ef3f89e5d941ddc6eb502f,True,3,21,212,2,True,Tests_passed,50c67c674c272dd26b4e936e2c710d3d80bdfd873f0363ca295436a3c81e4718,True,3,True,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,ca0f93d868fbe46c3acdd4e4843dd3f1cfc840057bbb944950def87c8d3619d1,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc 29,refs/heads/main,b712e336e13c0bc27119d445050721515f71f6d4,3d9cc3f853e4c6c83857cd4db8338c5ae668af5a,b707c2b2a7fa3dcfbc829d5df4b10295fc269744,,True,True,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,True,7,74,727,3,True,Tests_passed,99b24a147f8d8c87dfd6d13af42962cebfba1158838bc64d1f6e8c3fa3929d11,True,7,True,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,7f5d9dcbcaf27ae6ac2f00a92ae381d553e2af0a0d105bcd57a45c3d808f61a1,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,adeddaeef77f23b1a19acc1b0dd4682a72e260681e45d191c1a58091d7be457d,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,5a11bf8cab0ea3fc8cd7fd261f68c3258eb520bf487d78d49fa28d8fb62581bb,Merge_failed,e40e02d3bc11dec641f90297760e7e88be07a30f9e4f81ba5794b6d922bb1da7,Merge_failed,23964d5adaa0e633e5fcd611212c0a15bd4c9057d3a49839f3bb62599b8a0a02,Merge_failed,1edb4cad5cc28a3c0be5af2d40be62d71e84e2fc36881ca23f3afb7baa65f7bb,Merge_failed,e40e02d3bc11dec641f90297760e7e88be07a30f9e4f81ba5794b6d922bb1da7,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,adeddaeef77f23b1a19acc1b0dd4682a72e260681e45d191c1a58091d7be457d,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,229cd8e9daae9e014cfdb0475bc168016abfacd1edf739116fffdf86a8a04565,Merge_failed,23964d5adaa0e633e5fcd611212c0a15bd4c9057d3a49839f3bb62599b8a0a02,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,7f5d9dcbcaf27ae6ac2f00a92ae381d553e2af0a0d105bcd57a45c3d808f61a1,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56 30,refs/heads/main,3d9cc3f853e4c6c83857cd4db8338c5ae668af5a,6395f70e114c4525aa633320cb622a94db7f8ade,9d08aa70b8819f097b16f845e33230671a0680bf,,True,True,Tests_passed,808b269710add5d5e6da9137195f176747e4eb74de195c8c432bceb5d379fc0e,True,7,62,693,2,True,Tests_passed,f416ba97aeb62a830baae0373e391a023eb26596e425c72c6a1ccf64a395f36d,True,7,True,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,b01231a8e56acfbef246f0c5e14c22dc2396b80f9a3766b1566888b86299fd5b,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,b01231a8e56acfbef246f0c5e14c22dc2396b80f9a3766b1566888b86299fd5b,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353 diff --git a/results/combined/merges_tested/umut/spring-social-salesforce.csv b/results/combined/merges_tested/umut/spring-social-salesforce.csv index 62a9dce3db..07a2a1a88d 100644 --- a/results/combined/merges_tested/umut/spring-social-salesforce.csv +++ b/results/combined/merges_tested/umut/spring-social-salesforce.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,c0ba949826659e6d82e8cd4b958530add191586a,d2f14b90370242638f71cecc14ba6c2b880fa5a7,641d0c91b8ddddfca7f1c71fef1b195a5ccbb804,,True,True,True,20,36,1168,2,True,20,Tests_passed,a3f13e088e4c881b71e471946d45563600eb277e27d598a38675636434920b65,True,Tests_passed,5001d457983015612622eaf150d0cf15dbdfaa1f516a18fe18feb7f4ef093169,True,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,20551bfe0132a95905e3fc4c9a3e90afaf6ef8b332e43c6507a478caa527797f,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370 diff --git a/results/combined/merges_tested/unitsofmeasurement/unit-api.csv b/results/combined/merges_tested/unitsofmeasurement/unit-api.csv index 9a7423cd49..3d10429d6e 100644 --- a/results/combined/merges_tested/unitsofmeasurement/unit-api.csv +++ b/results/combined/merges_tested/unitsofmeasurement/unit-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,f16c43f7b6f090819c2530ac4d282e4e87f81307,bcc17012a1c8e32c9fb7f8f498b9ea457598b1e0,af3a3abfab663d442a692e5d1c503dab05665afe,,True,True,Tests_passed,d19d04c4db94456c187551ba428eb5340ef88fe763dd66667204af7520a5f3a0,True,5,26,280,2,True,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,True,5,True,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,8630b13b727dde8db9356a95321f7e1596e2bfd8550e1174ca33d9d8e6b3a9b2,Merge_failed,a964d69738b7288af776095e9c0a7b3efb4489d451fde48b117e628d6fde9b53,Merge_failed,6656759097d7996c8a3a3d1c3511d99cb5d03adaa9b03996d613991d141d4910,Merge_failed,6656759097d7996c8a3a3d1c3511d99cb5d03adaa9b03996d613991d141d4910,Merge_failed,a964d69738b7288af776095e9c0a7b3efb4489d451fde48b117e628d6fde9b53,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,04e9b0d29f8a1b93fad4c62a124b24bdccb70c723a0178b6538ecbf7f9616c4e,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404 56,refs/heads/master,af3a3abfab663d442a692e5d1c503dab05665afe,83afd3ef45cb4af71be258e7f5863b6384b7db5a,049ade04d1087a5fe8f4357c19db95b3fe167916,,True,True,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,True,101,121,15500,3,True,Tests_passed,6fce6f2b06d9bea3199a032dde14a83689ef0ca2d55f44103c5b3c819cdd5fdf,True,101,True,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,02a80495312b6003f1768b6f87473fcfbebd9fb3282233abb478c40fa09058c1,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,Tests_failed,157a2be2185b3c87d408afed6446e9a9f3a84af0326831c0d280a7e5dbeb6684,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,4a3eb11f598525bf7190aef02c3a8dac1331765f7e79892419640a7466453752,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30 81,refs/heads/master,94a6c1870f42d1953348b06105b5091951a3e442,5c9f2dae369afc0eba4a41ae82e0c6595c83cbd3,bf284962861418412da952acf9cdb282e41c380b,,True,True,Tests_passed,d9d1a607c57ebb19412ccdb661d47e143e6f0d41b6d2121713f8d069bba23a59,True,12,91,245,4,True,Tests_passed,1e9bcea2ff9b7187f49b56e20a3d6b484b2ed0160917a3bb0e388d2751a8a64c,True,12,True,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,3758702a37becae5c8d60528a928a1f522ddb28be1bfa6aa32a37e36e76a59f1,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Tests_failed,29f0ecb30143fccfd719b305a472237ce0bcad6cca102ccee82b4e2257a7ef50,Merge_failed,ee10846748486095ac31708cf225cd3e38516fed31afc994acf0f176dbcc6302,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,8f7841ec304394a28c2e4681c07f8afc56066df2c8274a7802594ae4e538f9da,Tests_failed,29f0ecb30143fccfd719b305a472237ce0bcad6cca102ccee82b4e2257a7ef50,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65 diff --git a/results/combined/merges_tested/unitsofmeasurement/unit-impl-se.csv b/results/combined/merges_tested/unitsofmeasurement/unit-impl-se.csv index 30dc462b79..299ec7f48e 100644 --- a/results/combined/merges_tested/unitsofmeasurement/unit-impl-se.csv +++ b/results/combined/merges_tested/unitsofmeasurement/unit-impl-se.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8a4c4c4961950dc6135e931dd34120e29d511a8e,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,64ff92d8a8f270edaa7d86c16f1dc13de3c41e1f,,True,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,True,17,59,431,3,True,Tests_passed,7ecce53e60cc01bc271ccdf916618bbc9da40642667689b7c161250d407562ce,True,17,True,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d 9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,16,53,270,3,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,16,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36 diff --git a/results/combined/merges_tested/unitsofmeasurement/uom-se.csv b/results/combined/merges_tested/unitsofmeasurement/uom-se.csv index 10bbf85acb..08143fae8f 100644 --- a/results/combined/merges_tested/unitsofmeasurement/uom-se.csv +++ b/results/combined/merges_tested/unitsofmeasurement/uom-se.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8a4c4c4961950dc6135e931dd34120e29d511a8e,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,64ff92d8a8f270edaa7d86c16f1dc13de3c41e1f,,True,True,True,17,59,431,3,True,17,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,True,Tests_passed,7ecce53e60cc01bc271ccdf916618bbc9da40642667689b7c161250d407562ce,True,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_failed,404ce818d8a646e24441357a64c3def8c696d8fe7e134cca99551aabe502ea73,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d 9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,True,16,53,270,3,True,16,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36 diff --git a/results/combined/merges_tested/univocity/univocity-parsers.csv b/results/combined/merges_tested/univocity/univocity-parsers.csv index c8cee133e4..d92cb394d0 100644 --- a/results/combined/merges_tested/univocity/univocity-parsers.csv +++ b/results/combined/merges_tested/univocity/univocity-parsers.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/master,9426fbefd3b6e57649e45d79bc7d4fdf674e9377,04cf38831b7fba1fa265e84c1deac9f0274046c8,8a463847eca82abb885b4203d1ac17e5f4384d90,,True,True,True,4,7,207,15,True,17,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,True,Tests_passed,060f8700b83b0afa92d6348c12c5fb1d0be6298dc82b019c2ceb1027cdc4bf72,True,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_failed,a85faab50cf7959f923be10f679eb94be242533ef47506d0393b5e4dda315ca4,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41 27,refs/heads/master,771ba721d9da416a5318353393497d9bdb1008ac,0beef50e1093930ee90ae97d15ee7ba49fe59381,b1d826293ed6d629e10629580e7df3966d444e69,,True,True,True,90,318,5993,13,True,93,Tests_passed,2fe99d0e5854dce39ed1ae175276edc21afec11cdbbf75807de61bc10a37efad,True,Tests_passed,16052c48cb00624d1f75766299fcbd5c1e51b3a92bcee8d095d8be95c9778541,True,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,805686accdc4506df4db41bdc73d84d2f39de8ce2340022c328156191ddd4ad1,Merge_failed,52e1e2fa9a7946bb6e38a01c5e7947d43a2b49d162f48bc3ed56af1a867a2989,Merge_failed,07db4093259864bb9b102edce84a29707e1dd16e4e61a35522ef7e10f5e4f482,Merge_failed,0c24bf27ddd1cc75d4d717d7adf01980972d07f60970980af303ccadf04cf3da,Merge_failed,52e1e2fa9a7946bb6e38a01c5e7947d43a2b49d162f48bc3ed56af1a867a2989,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,a83eecc7fc6aa0730530f90dfe1d4e67ac7d0a87885ae864c7490a125b39bb23,Merge_failed,cafeb57dbf853a825149b89d357edfe3143a65f91dad4ca7d3f94ffc757be01e,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf 28,refs/heads/master,4fe97f1e8b7a4487e66c4e653065dd39c79ad963,da594a5b017f58f2e56dfc79873ffda0254387ec,00994ff66979755cc1af7004019dbe7bcb56ae22,,True,True,True,51,194,2401,4,True,51,Tests_passed,17070f4f0dcd6015e5d5f93e3b1b18edd3fb0d22c7d9237285613693df6facdd,True,Tests_passed,e5ea7e3b1509f9e9d20b01998160108f0402ed43d1c9762774c163a0c890b8e1,True,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,70690c6041a3f171b1682379a7f84b566ef35dceb6f6021b22d8ac30312a1818,Merge_failed,f70aaacfab47ccde3cba6d93a307e0841fa40c03cbed2ed43eb48eb563ce2b5e,Merge_failed,d0dcba2c8061e12245a84bd1c0b57d17f8fee0c1fe1dd3c6d0b611b66be8ae10,Merge_failed,a8a93cb99ae0fe4333a3610ef9e5bb456718002243ed958e9197b4d44bee7562,Merge_failed,f70aaacfab47ccde3cba6d93a307e0841fa40c03cbed2ed43eb48eb563ce2b5e,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,0a1612d196fe1f78049cbe6c643645df18bc82c0690d53f280c0b5aba6ff77ae,Merge_failed,c18d14f2fa6de01cc5fd2fd921035d43f2e5ce8e0c1662a3c459730ffb7f9cdd,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d diff --git a/results/combined/merges_tested/unruly/junit-rules.csv b/results/combined/merges_tested/unruly/junit-rules.csv index c61f72c8b5..d77fec3efd 100644 --- a/results/combined/merges_tested/unruly/junit-rules.csv +++ b/results/combined/merges_tested/unruly/junit-rules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,9f9e68b409b45bc46b8210c50964508e185dea8f,7b70c0ebce2dadfa3c20c95a258562889b923e2e,492670cc827654754a93d59b562cfe27fad84c57,,True,True,Tests_passed,19aac3cb0894586e9cd50dad5781d0189f52adc3994e50d3432f48822ef6f374,True,5,12,114,4,True,Tests_passed,1c066bad00671b7bef3b5dc2ee06e82d0097162cde2f44de67d11d9f6addd734,True,5,True,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,11e610e9b8b910b9bedb0e57f82f16af16ea698be5043be4159e208d96197f19,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,fd014bd2375d4630eb6ef13e69652fda2d5c4fb131267f77a11375164da8b3ff,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1d203775cda1701552b32f92c72bf1b0cf542b9478dac70514396119c1bd2051,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806 diff --git a/results/combined/merges_tested/urbanairship/datacube.csv b/results/combined/merges_tested/urbanairship/datacube.csv index 51c1d03493..b7ec798624 100644 --- a/results/combined/merges_tested/urbanairship/datacube.csv +++ b/results/combined/merges_tested/urbanairship/datacube.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,2d5233dbf1f428b640c818f8e61234e24faffbaf,991174d89fbb279389fbc02f59cecd0f1f481453,6fce4b819ca2c04cc2272cb394e39f8dbb81edb6,,True,True,Tests_passed,5c3bf260c5a3e9a4cb68191206ed39528c455a27f352b327c84bbdb61a6ebbdd,True,20,239,1708,3,True,Tests_passed,30601f51e9486b2e3554e03271d283158b835a8c34ecaeabddc69e96fce0ccb2,True,20,True,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,279791dcaf9020afbead17205deee0d36595f54897a3c580d87453a5decccf4d,Merge_failed,1a86f199b4a84b7a6c9d280ddb93804957f44316d5e053f7f2f75f9255b67862,Tests_passed,e605e2a42360230d4b70c8cda8fceba5e5d05dd44c9c57cbea8ccf924630f5be,Tests_failed,bf2a175324a220219f2be4a9b73a1e32898d3c855b06adeff3bf6bb6be335c7b,Merge_failed,1a86f199b4a84b7a6c9d280ddb93804957f44316d5e053f7f2f75f9255b67862,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,6e4626c87fe68fba1a7e38700fb96f827142bd3c4aee9fd1208ee8dd3a42c098,Tests_passed,e605e2a42360230d4b70c8cda8fceba5e5d05dd44c9c57cbea8ccf924630f5be,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377 46,refs/heads/master,e98794fe0b952cfbec98456698cd0e1c8226173c,c176fe3f098b025057d82bb50e327d227f3cd154,b4f7933ed957d5b8841ae731e7156a70beaa2c37,,True,True,Tests_passed,3965a63425c8f76c65ff240d62a0697307679c0fc9ca6f389840bb9d48bcaa87,True,5,12,75,2,True,Tests_passed,298dbae6f5a26224c6fd0864e294572e10f950671ad2895d866fc426f68c39f4,True,5,True,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035 82,refs/remotes/origin/pmd-dev-redis-db-harness,641b92c0fc573ce4f284ef08917c0c68bb3eecfa,61755d7739de129b61dc18a7081377ddc462c5c0,c21dfca4a999de9d837aca533fa864106858b30d,,True,True,Tests_passed,d198afe53f3ff43c944d7f2cfe87d519bb0ce9e614d7c4e52dd27019c7199908,True,91,864,4050,4,True,Tests_passed,80e46d06124651a216cdb603e39f54c9bb0d01d576f9c090e34c5e5b97a4bf49,True,91,True,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,289cbba16fa3ea0377c7d7ea0cd15858d5e55b8328eccfe1f7add1e1da4cb33a,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,a123e2b45853a823d85b7f401045cd5c376c1a58aabb1ac92520856b2cbd2942,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,0b006815b2340971fa4078e26ecc4bf116bd134e24b774323a2bdb1893f2d44c,Merge_failed,19ad885f0a22cc07744eeb158c5df5076ea0f4cafa19a29da8e3098e4e98e024,Tests_failed,804dc432a34c49d648818c03789c62b930d0ecc0ebbd1ad7b80c5f9810b637b6,Tests_failed,9b47b508c5a2c174810f3788a730e8fce24084185d730cc7ae2f494706f0a801,Merge_failed,19ad885f0a22cc07744eeb158c5df5076ea0f4cafa19a29da8e3098e4e98e024,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,a123e2b45853a823d85b7f401045cd5c376c1a58aabb1ac92520856b2cbd2942,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,05e441d324e3157b72e3c563399ce88b188480370849d425f753e6bd759c2837,Tests_failed,804dc432a34c49d648818c03789c62b930d0ecc0ebbd1ad7b80c5f9810b637b6,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,289cbba16fa3ea0377c7d7ea0cd15858d5e55b8328eccfe1f7add1e1da4cb33a,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb diff --git a/results/combined/merges_tested/urbanairship/java-library.csv b/results/combined/merges_tested/urbanairship/java-library.csv index 7f9f815c1a..f5dcb1a158 100644 --- a/results/combined/merges_tested/urbanairship/java-library.csv +++ b/results/combined/merges_tested/urbanairship/java-library.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 57,refs/heads/master,bbe0297a107727f3f58629274f6ca5e42356e146,339d4f74219edaaf0bc250f689f0e4a394a418f4,2bc8dfddc90c867d8878a4251f8fb0ef8338419e,,True,True,Tests_passed,fb9c9df6772d3dbea0ffb4fce3a20e82e91d0e04196365b5098512f4ef7c7822,True,19,64,959,3,True,Tests_passed,13507b592b123bb58c6c378884fc56a29bd7e61a5adae10d0be06c71abf44ff6,True,19,True,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,65e89943b4c447ae8e1aa6d6422c787fc39be71f5df8dc27b627d714c0c5120d,Merge_failed,aa2313126c7826d8a3f02383fe2e91de3eba5d6477a8982791c234c03ecfa316,Tests_failed,7fa7dac3d023a0b3a1a8ee128e440d040da3d39d839c3617d470fb8ec79556fc,Tests_failed,c29c1ea111eb0619191895f0b6441e43ad32f7a3931071b3d94858d4b0ea11cb,Merge_failed,aa2313126c7826d8a3f02383fe2e91de3eba5d6477a8982791c234c03ecfa316,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,d7c81f742fe8b7ea5b2e5fba3948e19a2f664cc95d9d7ef16082ffc765990a0e,Tests_failed,7fa7dac3d023a0b3a1a8ee128e440d040da3d39d839c3617d470fb8ec79556fc,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72 85,refs/heads/master,4be3d18ac5d8d4f21dd63731ba9cf92aeadc16e5,dd350b3bd64c7ecec5926bf19c999ea77893f5b8,9f8273317362999795cfad1aa6f5fb82d38271b0,,True,True,Tests_passed,d8712d36339ffd9c2bb7b2006dce6bda868a989651256d2727cff7d549e9c8ad,True,5,14,30,2,True,Tests_passed,704f38aa289e58cc08ca0da8dc47c5017bab946462644f5b309ed12f5ce4345d,True,5,True,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,929531a547dd74ae1723adb7a5c040a5711cf722a8be8fab375dc525f2a7252d,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,656b483fc5eaf7402260cbf2042707288d319725888f2801cb391c5f0d6e5574,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,ad792b2c1065307c8bf3eeb766a7282553966d803ab0a31ca2022196bcf12f2e,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3 112,refs/heads/master,c47c46d2ea05b3999eedffc0fe659e3e28eb89a2,ba00daa3a769e4d2327b413ea75292229ac5af57,b4d282131d27dd2014d1b9e4a0442c3d5e6d54ec,,True,True,Tests_passed,d4290906aee4b84083b09e3f3592b0f3bd97423b2b4f1403a07d7382ea0a34c1,True,28,99,765,22,True,Tests_passed,5a706f39bc03a655c9947b0de1ff0100bf3bee73f0150cf992cef311cf654202,True,40,True,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,08b4f99baaf4b3e704643d34ecee7ec2a320c3a26fde82e879639f38bb060d76,Merge_failed,3b32d3878153d339d0bc16424569342b3568ebc16176977b964acfeb0a97db7d,Merge_failed,1f91f7c825677f3b61e3c75bfa6ddd9d6a088a5ae1845f00911be7774ea0d445,Merge_failed,d01755ac82b12422814be34297e108f802b7281dab95ea0daaa8cda544cb8c45,Merge_failed,3b32d3878153d339d0bc16424569342b3568ebc16176977b964acfeb0a97db7d,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,34934b3119bb207ba69c0c77f5fc38faf40afe192ec13efa9131cda83b447315,Merge_failed,1f91f7c825677f3b61e3c75bfa6ddd9d6a088a5ae1845f00911be7774ea0d445,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477 diff --git a/results/combined/merges_tested/urbancode/terraform.csv b/results/combined/merges_tested/urbancode/terraform.csv index 1acb7223ea..358bca282c 100644 --- a/results/combined/merges_tested/urbancode/terraform.csv +++ b/results/combined/merges_tested/urbancode/terraform.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,c4253bb945f73b671cc8d21349ef88f05d92d42a,ac7e8bc99b2f5d1b35dae800e96679463cdd1852,57aafd37764a669662cdabe3107bffe138d069cb,,True,False,True,2,3,11,2,True,2,Tests_passed,b79f7d7bff97ce62875facd258db4862b5a99aa286e8652d48aa77ade84884a8,True,Tests_passed,6067a9de2743a1815b615ed6adf925c697044d84b54fb4881ee271604c0e464c,True,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,4243320cc663497bdb59b136b881aafcd00aeaeea1eeb974cda4d164182529de,Tests_failed,47f70167023037531fff4f8e8ca9a55a926159102060b4c259c085703dd6ffa5,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,4243320cc663497bdb59b136b881aafcd00aeaeea1eeb974cda4d164182529de,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab 3,refs/heads/master,23cda111d2be54f22e8222a29f71f29bb61f3188,95b28fa95c875e4c1e7c85d1e0164f5f2783cbd9,7da71a46727f3db5c199f4ffa765cc95c16997cb,,True,True,True,8,32,345,2,True,8,Tests_passed,79d4a2f1c49febe7730103f9e960f015f5cf3e76dd3ca2df46144e260e5e1437,True,Tests_passed,b0b544f09b12a5d7cd396660e3f709ecab62e1ad918da0f9f83023e57ac9897d,True,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,ca6d61dcd21a17f86b12a4453d5d7340847f0e59739d1f2e16ed09c017a0061f,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e0eeb42530b3e98720ea65d7ab0af1cfa8c8940127638a134b774d5198e25606,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,1256bbc2638df5e64a1e909a8b60954f40af0434432d99decac8a518f0726b1f,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16 8,refs/heads/master,22ba463ff5e8f14da07637f3f580fc8720ea9be6,648f7f8f85db00572cd401de98800709ceafa46f,c7596afb71454a5cc64b1b0528dd8ad3b45dfcea,,True,True,True,32,82,510,2,True,32,Tests_passed,9eb964c649e02a0d9f0a48859b63a132b04f298bbfcfe543242efbd877a15799,True,Tests_passed,cfd2eae528a8a247c6ed10ca00c2428dadfed82637302b04a7b9828c9dbc5270,True,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,d0dfbc9b967dde11f108cb531058d96afaa814ae2473079eee0bcfa5afba5ec7,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,d0dfbc9b967dde11f108cb531058d96afaa814ae2473079eee0bcfa5afba5ec7,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802 diff --git a/results/combined/merges_tested/urish/gwt-titanium.csv b/results/combined/merges_tested/urish/gwt-titanium.csv index 90c2a7712f..7a9c5a203e 100644 --- a/results/combined/merges_tested/urish/gwt-titanium.csv +++ b/results/combined/merges_tested/urish/gwt-titanium.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/emul,8283194660a0d362eab3f08a61e31d400d9a56a9,a22853e43bd0683d9a09f4e409ac0ed431bb99ed,18650ec3760d6293ad56fa70c3eabddcb24ccf02,,True,True,True,153,257,34067,35,True,153,Tests_passed,20c475afa38390c216f3a9a0f9deda4e64dfba181ea1d2a213561fbf541d7f4e,True,Tests_passed,070e30656769757e7cb688bc5a2d3d9fea500e09bb5aa28da515f8dcd5029901,True,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3d8ba7b26749216bc3de5c4bd583f73e5d23d329aed370dfc50e5ba33ba2880,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Tests_failed,35129bb7c9a10431e89331c05256d9aa956b876f0a6758bb38e679ce85d78712,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3c5eebd57ffb99e3148b8dd5b240541fad2108c894df3f31385204cce1ddb0b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7 diff --git a/results/combined/merges_tested/uwolfer/gerrit-rest-java-client.csv b/results/combined/merges_tested/uwolfer/gerrit-rest-java-client.csv index c178062385..730db25bca 100644 --- a/results/combined/merges_tested/uwolfer/gerrit-rest-java-client.csv +++ b/results/combined/merges_tested/uwolfer/gerrit-rest-java-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 114,refs/remotes/origin/httpclient-android,63c4c0de93ac1545662f946e7b8b821c6c85da68,db86712fee757b5b1808098856d6ac77837c2801,6b9cfe0eaef6462b8405ca2362a4b8a54b062fa4,,True,True,True,178,639,3533,4,True,178,Tests_passed,6abd3aac8693c66ef661bfaccfd62caf6b63bc2f347ae65add0a4058db77eda2,True,Tests_passed,8eb92b00d86730c2de3dd37ec19a9f8a15567df3237dd74fdd6a3e4152539178,True,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,4f003efaf94b98bd4d4da6e1ebcd7cdb009c96892e3b9f2e82d2c253c37a9698,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,dff161dcd17e4fb34650addf26e521ff5eb124cd505b3b3dd1d316a98165a417,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,593f349be4fa0a69de0aa9cea9f3c2d4b20737e3205fb82a977e7b161b6f02f0,Merge_failed,53e21196a543cd5fd57979f751a6e935c34a30d1cb307234c7d3292c4c42aa14,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7 116,refs/remotes/origin/httpclient-android,35856ab8bd9a7ed4d6946e68a23f2653c94ada5c,a7f5d5cf65b3f363a19d72eb799ac70c94a39843,e86602dca68a90bc04aabf1b2de45cdab104bd12,,True,True,True,70,182,1913,3,True,70,Tests_passed,4a98ee1c2d6c37a2c0c71d67bff5438614b2e47b2c78fb1993754a48c2a64922,True,Tests_passed,46627b95166ce4b2c4b09615d4e8d8d8718963e46ddc40c2f22a1293a2f026ef,True,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,299e00c9f4e8c3fc14ecfefd90bea6b3d28e08d1d97f3e2214e235fb142cf6aa,Tests_failed,164785c4edab1611adf1b7da1a5868c516a672227f655e1de28e58df604c19f4,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,299e00c9f4e8c3fc14ecfefd90bea6b3d28e08d1d97f3e2214e235fb142cf6aa,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8 120,refs/remotes/origin/httpclient-android,fd4ae7d03dd1783b33f38e7dbcfc6d908ca135c0,1091b6047f4913f26d45cf571186f2b9d86a44d6,beb8b810e0bbde2cfe89ed43eb85eae0f042e394,,True,True,True,27,80,854,2,True,27,Tests_passed,06a27c65e13b9442b9c3104265a621ea901306da39f43a9ca8368a9c7977024c,True,Tests_passed,7fb1d2b4e40e9fe3d8512635613c9bde7abdec7ff046d230bae41903924679b5,True,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,887742edbda8f16c8ad84d8da6194f06512e43a916d9326621ced03e0f95686c,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,887742edbda8f16c8ad84d8da6194f06512e43a916d9326621ced03e0f95686c,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d diff --git a/results/combined/merges_tested/valotrading/silvertip.csv b/results/combined/merges_tested/valotrading/silvertip.csv index a308c310d2..87c3535355 100644 --- a/results/combined/merges_tested/valotrading/silvertip.csv +++ b/results/combined/merges_tested/valotrading/silvertip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/master,9d31f8111075f508c9ecfbe3680b12d13a48f927,47b363321c14cd5e46ef5d2eb91463007b8916c5,7be1073b258791c55ebb6a8d499f0b8ad76e6cc0,,True,True,True,24,33,445,5,True,24,Tests_passed,80df0a65c04ce8cc250a78293d6a24c463f1564052101bcaffc8a04e27f74d05,True,Tests_passed,984964b6a6d87f1e8c8d38fda84d3053daadcd389a6a6376443b81db4dec6603,True,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4 diff --git a/results/combined/merges_tested/vandurme/jerboa.csv b/results/combined/merges_tested/vandurme/jerboa.csv index f24035a75c..e043c77413 100644 --- a/results/combined/merges_tested/vandurme/jerboa.csv +++ b/results/combined/merges_tested/vandurme/jerboa.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/remotes/origin/pull/4,263efef5a3a930b599415d8920b119ce0aa9b698,6b05c1b87121f315477c79ea137d25f32d1d4f2f,05251e54e75667b526fc42d248ffd3e65ff26f34,,True,True,Tests_passed,f4ac36484b9d165debf20fc38569957951d3afe77391c3b2274685931be3fcfa,True,51,290,1528,3,True,Tests_passed,62e3f63bc951103ddbec95806a175e673b1c7a691c791ddb140c48bc304560de,True,51,True,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,8c2057dce7ec0799e02480b6c5f6871881891ca3f6517aed5ffc30edb08f3c45,Tests_failed,e00bee7c927b5e9212d3c6cd4f8f8c851e07afea9e50c8d55d08cbf243b74522,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,8c2057dce7ec0799e02480b6c5f6871881891ca3f6517aed5ffc30edb08f3c45,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509 14,refs/remotes/origin/pull/4,3ce0e6dedb14acd3be38b052f4158734778b4973,d4b49e2bfb050626774cc3f3fb654993a3fcf099,6f00c6fe70e86fcb6f6e78ee7f1f590108cecba2,,True,True,Tests_passed,9e7b018019fc6c5fbca750e359a122d184930595e31bd19f4e6830848ab2522e,True,45,259,1260,2,True,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,True,45,True,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,2ddc0b1a6a4c96d97009f9b701988102e8509d838287fc20bbc487b828967815,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Tests_failed,c812b70eed7120580b5a83568f6cbc0b613b1b69e996da5eb2fdaf80cea455aa,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,87bd5a077fb44facbd3efb647b96b9599142ccec7b213134ebab1ae50a94c3bb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b diff --git a/results/combined/merges_tested/vanduynslagerp/enml4j.csv b/results/combined/merges_tested/vanduynslagerp/enml4j.csv index 0623447a3c..be9473b6d7 100644 --- a/results/combined/merges_tested/vanduynslagerp/enml4j.csv +++ b/results/combined/merges_tested/vanduynslagerp/enml4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,61e72c5c3568a9dc49d49cc19ef79a19972ccd26,83c3de81ff9b7fb8a047be4abb0a9b3b82256cbc,0e08aa59830a000eced31b31a2d556531d15283a,,True,True,Tests_passed,21b135e72d860adb5d727b37f264cfec4eaa2832ca87e463f67daad48912d812,True,17,156,697,2,True,Tests_passed,8cbf4b26ee339dbf2eb63874a67d64436fd103bd089d1ef397a7ba0d02448ea2,True,17,True,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,d3c673a974574947296fa7f4b66b0bf130cfa1985b63fe062e8bcfc81761b111,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Tests_failed,544d1d32813f91e4d061daa8aec00227e9fcd666e7a3a22f51b6578c013ff4c4,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,c0a54544fb2e7251030b6a27b916589dad872c46bfcf1e0a6e1b31d3d41627f4,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af diff --git a/results/combined/merges_tested/vbehar/rundeck-api-java-client.csv b/results/combined/merges_tested/vbehar/rundeck-api-java-client.csv index f5f76fd8b5..bb29c6e9e0 100644 --- a/results/combined/merges_tested/vbehar/rundeck-api-java-client.csv +++ b/results/combined/merges_tested/vbehar/rundeck-api-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/new-style,ca48a23f4bc9ba6e23057d3615272938e61eb670,564a3ce90f61dcb10c46c4553e68e6221f516248,2206d677247431280a262ccbdfc9d3f4b2e4065a,,True,True,True,24,73,1496,2,True,24,Tests_passed,467a2fbf1959be604c388e7cebadbad43fdc77005247cc7d2be077c506c5a757,True,Tests_passed,c43917a5a447a89393e014c98848fe09f50a3bd0bc22f2103a0977dd936a4872,True,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3 diff --git a/results/combined/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv b/results/combined/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv index 0d5a99c177..57baceb30c 100644 --- a/results/combined/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv +++ b/results/combined/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,88d2426c11714615322d84934cc2e1ac72fd08e7,1874da0eac0466062024733152861fd994f2d863,ec64add49e8afbc99404f1fcfe15285457553b68,,True,True,True,40,101,797,2,True,40,Tests_passed,6c082e8c67aad2fff9df716176724babd11e8c014ae326571b9f2963ae2a035d,True,Tests_passed,eaf097aa2d90637a13cbff55442df88b305635dbfbbb27ffbe78fcf92905646e,True,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,65e2c707537d3826be17d3d7c61bf18548d03f64f17c238e9097a16b835b07e2,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Tests_failed,20c9dc28359056a064f47fc783e7ddb6fdc9ae3eebbedd83db235d249679b9d7,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,30d1d1468ff7de72fcea320c29ca85452598cbf2ce35eb7bbb0b9d6abb15db90,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b diff --git a/results/combined/merges_tested/vdurmont/emoji-java.csv b/results/combined/merges_tested/vdurmont/emoji-java.csv index 604720d204..ba0a4c87b3 100644 --- a/results/combined/merges_tested/vdurmont/emoji-java.csv +++ b/results/combined/merges_tested/vdurmont/emoji-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,False,True,6,15,1799,3,True,6,Tests_passed,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,True,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,True,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,51ebf42a2f8d9d37091a6725527b15bf7c8a78aff4b2706afc1e5806a503a638,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Tests_failed,c5815305e7a225afe29e0f8aabd52000cdb462188ab69830453840773ad66d30,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,f65b3a6c898a16b1c787ec8938a39634a8d6e19b7f14291a50b9d14e3e48c865,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268 diff --git a/results/combined/merges_tested/verbalexpressions/javaverbalexpressions.csv b/results/combined/merges_tested/verbalexpressions/javaverbalexpressions.csv index 0157c38d73..328ab7253d 100644 --- a/results/combined/merges_tested/verbalexpressions/javaverbalexpressions.csv +++ b/results/combined/merges_tested/verbalexpressions/javaverbalexpressions.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,12533955388db6f9af49da4590b9744de71293fd,44ad0ecb58c5993a8048b38c455a579285430fea,89cfa80ffd865214808478cfbd87d8a00121421e,,True,True,Tests_passed,4a883117534b604938f98d8a5ef18f66afb54e11cb974dde5773dfa50da5fb52,True,6,12,58,3,True,Tests_passed,0dad5c9ee45391ca3fe2dcfc9e5c61a380738460dde483192306494c827ba16a,True,6,True,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,aa3036fb997820c79bc15857b59fb56a3f3d4f4ce85ee1112b9990ff95dcc1ef,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,aa3036fb997820c79bc15857b59fb56a3f3d4f4ce85ee1112b9990ff95dcc1ef,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0 13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,Tests_passed,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,True,6,11,95,4,True,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,True,6,True,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_failed,5ba545899eda6c8b251f801cd0f9fd8603209c22faf33c7a02e4ce85ca255af3,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf 26,refs/heads/master,1739d58c32a1c7b9ef9023e0330504f2126a4535,663787fc4d17acf0d36e04fc4fd869cb94d8a204,2afb0341d4d539fd7f8ad5e94041cb5d38b6a3ea,,True,True,Tests_passed,fff01f98d057acabaf6b30de0f12e90316ae6866fd5735eec8715df776afa2d1,True,5,53,918,3,True,Tests_passed,62120a8eeb62c064fbeb3a3c658001f1600f0c7e98fdf0fda4b69e7a33d44bf3,True,5,True,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,0d21dea9690f992cb28c3ebd21173a7696a73c5c5f17e8db5ff3c3b906c3b626,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,432f44ca233ea70693ab2b9538af2938dea574f396e4d43cac087c3652e44d65,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,6d639e0e050a493b6ce550b09946c4aff5cb3bebd50ed9c31db290bb14b5a05b,Merge_failed,38f244aafadeba30ac6f06b81782e8a4c2c580a7645d851b14c52ac04bfba207,Tests_failed,4795a1ed32e9a830ad068edffa5f65e8ade2831cf473c285962576c27b00945a,Tests_failed,2934704d6cab0b607e1d4d46e7dbf43b6a52502c1eb690bae785f7f3115b1908,Merge_failed,38f244aafadeba30ac6f06b81782e8a4c2c580a7645d851b14c52ac04bfba207,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,432f44ca233ea70693ab2b9538af2938dea574f396e4d43cac087c3652e44d65,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,a31d7c24fbcfb8b2703d5c488c6618d3f8a2d3a52917c6b28b68459b6a63bfae,Tests_failed,4795a1ed32e9a830ad068edffa5f65e8ade2831cf473c285962576c27b00945a,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,0d21dea9690f992cb28c3ebd21173a7696a73c5c5f17e8db5ff3c3b906c3b626,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351 diff --git a/results/combined/merges_tested/verhas/djcproxy.csv b/results/combined/merges_tested/verhas/djcproxy.csv index 32037eab27..30e379c566 100644 --- a/results/combined/merges_tested/verhas/djcproxy.csv +++ b/results/combined/merges_tested/verhas/djcproxy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,db3b9bf7957d4a0e56fda33ca5d5e9340d9625ca,9db5e5b7908a16e773116d2483bad160803e90d9,a32513a5d9a409c995562fbcfede61c982301c1c,,True,True,Tests_passed,009f8e66c25a54003cef9139b7e8e98abc066415a86c566d47a9d44ddf037dc9,True,5,8,77,2,True,Tests_passed,60f6295160ce31bda21ceda8a75c29c9972f48f79b234c93ebb7e034b6d2b832,True,5,True,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_failed,c34de71dc51846a2aa4c913bbe2e6a564e2b3f4b9a9b21a90bdcd5ca950a865e,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a diff --git a/results/combined/merges_tested/versioneye/versioneye_maven_plugin.csv b/results/combined/merges_tested/versioneye/versioneye_maven_plugin.csv index d05166f9ea..60b3ef4984 100644 --- a/results/combined/merges_tested/versioneye/versioneye_maven_plugin.csv +++ b/results/combined/merges_tested/versioneye/versioneye_maven_plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,fdaaa77a460d09c61bd2b8448f9debc6200e840e,a369f0e6806ad651d877692e6993fd76f0e2e884,65f4beefd4f5366ba88e67722f4101c33a368c89,,True,False,True,2,4,14,2,True,2,Tests_passed,81d9fd0954392a3921d1776561286442abcf219c1e0cf5f3e2b0641b17d2018d,True,Tests_passed,80034b578cb108e82027619ffcff57ecf721582048a11e51d072e06f75aae2bf,True,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5709842f4912c63ce723fdbef53d7c7502d1fbd1ceb90a4d517ab2106dd37719,Tests_passed,a5c9614b99649b339967536b37a29ade83a5657fe8604f2d7f689c5331a4efb0,Tests_passed,f677fec1bbba90c70d7b126a6c2a3eb95611c46c3ce0089ec4488cdc01a29b68,Merge_failed,02ac095aeec11ccb08b30517e15a00ed58f02ac3cdc120a6e949434ec1b846a2,Tests_passed,a5c9614b99649b339967536b37a29ade83a5657fe8604f2d7f689c5331a4efb0,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,dd69e2182b0f4f0d928b844c860fd1a5f923b01b6331454d6ed318767ff22bbc,Tests_passed,f677fec1bbba90c70d7b126a6c2a3eb95611c46c3ce0089ec4488cdc01a29b68,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf 32,refs/heads/master,a890d82eb3698c4a20b2035eb3fd1e871bf52aa6,fbe5f5fd02487b865ec5b1b63891b56c8ddf642e,73fa448ea55736bb6281bb34d6bb5efb4e618fd3,,True,False,True,3,12,47,2,True,3,Tests_passed,34047f9faf00864135bf7eccf1f5de85c653b53251c2a6b385f63f5e53f2dd55,True,Tests_passed,82f3effcb60635228fe2447d9a023afcc33b523a47b7bd9dd27a313efc33658b,True,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5 diff --git a/results/combined/merges_tested/vert-x3/docgen.csv b/results/combined/merges_tested/vert-x3/docgen.csv index 3eea40b3b8..7c3efeeb45 100644 --- a/results/combined/merges_tested/vert-x3/docgen.csv +++ b/results/combined/merges_tested/vert-x3/docgen.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,9134f5b15fc02c05c55070e38e6d186817873f09,34b830c5d7ca867dce2374899b5b129a89031998,3f7283c63d19b9677b7987b626713c40e5f95b57,,True,True,Tests_passed,260e28288879ce655d414fb0f5c7607bc0a30bb39451e990efd84040c4cde309,True,20,38,614,3,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,True,20,True,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_failed,bfbab5320f9d672fc867ff58ebdc9bc251fe5d04070518243a451318412a12cc,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76 5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098 diff --git a/results/combined/merges_tested/vert-x3/vertx-docgen.csv b/results/combined/merges_tested/vert-x3/vertx-docgen.csv index be9ebc4bc2..ac51b1d127 100644 --- a/results/combined/merges_tested/vert-x3/vertx-docgen.csv +++ b/results/combined/merges_tested/vert-x3/vertx-docgen.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,9134f5b15fc02c05c55070e38e6d186817873f09,34b830c5d7ca867dce2374899b5b129a89031998,3f7283c63d19b9677b7987b626713c40e5f95b57,,True,True,Tests_passed,260e28288879ce655d414fb0f5c7607bc0a30bb39451e990efd84040c4cde309,True,20,38,614,3,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,True,20,True,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76 5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098 diff --git a/results/combined/merges_tested/vidstige/jadb.csv b/results/combined/merges_tested/vidstige/jadb.csv index 5941de77c4..bb64afe134 100644 --- a/results/combined/merges_tested/vidstige/jadb.csv +++ b/results/combined/merges_tested/vidstige/jadb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,6c84fe654222121475fb066fd217db3143fb901a,d3bd5c5ba684549f03086c46c0223f2e968af32b,3db1b31a0c4f5e74503cf43bbdcf1d1dc51b8ab5,,True,True,True,20,61,165,3,True,20,Tests_passed,824287fc2c4692fa431c4bcfee647a51b871eb82fd3feaf20a2544de1ddfd0cc,True,Tests_passed,c473f07bf2bcff4853b65549831a6b7ee9ee89f9fa3a44eb65b9e9ce7af4d29b,True,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_failed,c39b4b16d4b80274439e845e1d3e6354a38ee017172322069881ed869cc08e3f,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab 37,refs/heads/master,70ea021bf0319649a94486d083d83810fa9f3ff8,46045ce24198a66f4684f8326ffe89af30be30c8,db5d9e13bcd894015e8d234fe100b42de37b21fd,,True,True,True,7,19,201,5,True,10,Tests_passed,eaebaa64154ed235f09f8e0a6ce7eb4afdaec4c192f90862a55d60931369c46f,True,Tests_passed,bbf279edcd2a991906bde541360492cd1494d9281f1261bdda67ecfd295e634d,True,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0 66,refs/remotes/origin/pull/54,a48695a428d2f228d108f3986533b212c68f61d1,733818773b8ce2a6e4d76f202f0e99aa60fcb805,23d185b015746afab7bbf329fc5e915cc2396975,,True,True,True,15,27,2362,2,True,15,Tests_passed,e27c8ab0aafa4b820be550e33ab01201504563778c0c91faae6172f96903bfd9,True,Tests_passed,0c15d208394aa3fdfc7908f5396c9229551876353189971cb0cabeacc623ea4b,True,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,0957222fe01d4f5410f265c38618efb852eec6addb666e3d59f5ab02273619bc,Merge_failed,3f5c63aaf77191b5c04b1260b9d45d33ab764016554c28449d92197cb1b5667c,Merge_failed,1f7a10ab97c61f51f1788d249a14c7f95e3d0d217ec3009fb5ff80e49bc91e85,Tests_failed,31bb377907ca5b50c23778a0f85b8906524b2579512bc56698780824bf6b1455,Merge_failed,3f5c63aaf77191b5c04b1260b9d45d33ab764016554c28449d92197cb1b5667c,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,a65083223e2991fb21146a8040d7e708328dad24f5251862d68fcfbf27ad98b0,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9 diff --git a/results/combined/merges_tested/vietj/modsh.csv b/results/combined/merges_tested/vietj/modsh.csv index d6f18cce72..91d2499f15 100644 --- a/results/combined/merges_tested/vietj/modsh.csv +++ b/results/combined/merges_tested/vietj/modsh.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,True,True,Tests_passed,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,True,28,172,796,2,True,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,True,28,True,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb 5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,True,True,Tests_passed,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,True,37,181,2394,2,True,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,True,37,True,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a diff --git a/results/combined/merges_tested/vijay2win/flume-cassandra-sink.csv b/results/combined/merges_tested/vijay2win/flume-cassandra-sink.csv index 07476c0c59..b875f71422 100644 --- a/results/combined/merges_tested/vijay2win/flume-cassandra-sink.csv +++ b/results/combined/merges_tested/vijay2win/flume-cassandra-sink.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,38cdbeced79a3299317c1d44123c7e5c60e42a83,c7587b8c301132433d6f7663c31018f9ec44b503,981bd79f59b939b49f342d12b1c00c3805b632a1,,True,True,True,12,22,324,4,True,12,Tests_passed,23aeb5e858e4a85fd9e1f890f98b3be9facc42b5791ec1ba9deec9ef8cf35726,True,Tests_passed,584006bd6823b8480436f8d3d00324548d86af8d085cbf82f2cb42c5fe2547a0,True,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2 diff --git a/results/combined/merges_tested/vipshop/saturn.csv b/results/combined/merges_tested/vipshop/saturn.csv index 09b8fe0284..8d9a7439d1 100644 --- a/results/combined/merges_tested/vipshop/saturn.csv +++ b/results/combined/merges_tested/vipshop/saturn.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,True,33,101,2917.0,2,True,33,Tests_passed,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,True,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,True,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_failed,cf6cf5b64dc559b25eb46db144e716e3b701c8c2b055ef3fe12bad3f24df7089,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d 19,refs/heads/develop,4c666dfa3ce224a288e241247cb30cd9f38ef202,8c36cd0082e34c6856fe2a1974442acff0450a61,78a52abcb37c9a77f3ef28d282a6a51bcdb928d0,,True,True,True,62,331,2177.0,3,True,62,Tests_passed,c962c69efd59fe5206b53a7f607d72b2b183473deb4efc966a01feee8200e634,True,Tests_passed,3559a9965ec71e3ad618079a277405fee4b312531a4144a8796f0f96bb47368e,True,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,0746a958cdb67196c988c32288eeab9d0114b78ef51196e82459d3d870bd09de,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,60e9dd5faeb6a488f8b4e6d27b4d7c6a826b9d4d9749f16fca227ec380a0ffda,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b29eeed52add153ca2b48ea65e0b8419dde5431bfc11d0c51017b45299f1eebd,Tests_failed,5b11cb0c81a2142117bcc4053aa2f0fd08d97326db3487bff278df1359fd1210,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,60e9dd5faeb6a488f8b4e6d27b4d7c6a826b9d4d9749f16fca227ec380a0ffda,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b29eeed52add153ca2b48ea65e0b8419dde5431bfc11d0c51017b45299f1eebd,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,0746a958cdb67196c988c32288eeab9d0114b78ef51196e82459d3d870bd09de,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f 24,refs/heads/develop,22c8f49bc54909be8cf7fc2808fd41f4e9f389c3,555e74883ffa4e6d671d37e2523646d28872fbb2,18950c2d9a62613a3923db9c5d444cfa510bb22f,,True,True,True,45,301,1862.0,23,True,54,Tests_passed,7eb8ad3f4be334e556b53bb8fd3eb9b215bed1a892da4192b36a09f84de924ca,True,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,True,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_failed,9830ab12ae9902657cc05a628fb4e86a713782819f8948fb1430604336bcf2a7,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78 diff --git a/results/combined/merges_tested/vkostyukov/la4j.csv b/results/combined/merges_tested/vkostyukov/la4j.csv index 8eb85fa0f8..93e3eeb07f 100644 --- a/results/combined/merges_tested/vkostyukov/la4j.csv +++ b/results/combined/merges_tested/vkostyukov/la4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,965ce08afb0f6e85991ea707d72c97a293b2010f,1229fcf1bec83b678ae8655fac893dc14b8e70ec,4d368a0cb4622b1b99298a3f1d9890e44bd38dcb,,True,True,True,4,6,40,2,True,4,Tests_passed,df72f84ce360854d6c2155728c1ec9accc5c607c68778a1bb3ecb5ef5e03d718,True,Tests_passed,8da09d8986e8ff637f6d693f78be703219038d12af19ba43e5214def4f1c4952,True,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368 5,refs/heads/master,f0eb677360872183b98f8821051b6cfc9aa8bdf9,296af31f54e1501dc9efea807fd6da62c01463d7,b0c4057efd2065d5c4269b1a41923d4de98ba0b3,,True,False,True,2,4,17,2,True,2,Tests_passed,65caff6501e85b1a79acb9dc320e7830bf023793207fb62cb78c093e2c5bfb7e,True,Tests_passed,9f20ee87bc159c58e2f73ed7fb4abe5e51bc827d8bd36f6c3d4126275d4e7347,True,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,f62c301f502f54e397bb7f55bdda81c14f05277453ede5b918a0f09c84620e6d,Tests_passed,bf3a34a0795df44303ebd8235e98b7707301c61ba2651bd9fac59e9b1bbed879,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,f62c301f502f54e397bb7f55bdda81c14f05277453ede5b918a0f09c84620e6d,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7 28,refs/heads/master,07f02eef0043d0f9b6857ed3e1c67882fe9b9159,0b36b109a0da0105400cf94a44c156beb7c67683,1bae40823ae1e0ea4b6962d6fc777a7ae56e9d6f,,True,True,True,11,96,561,4,True,11,Tests_passed,c6cbd82357bd8cba2aa0ea26ac8561b79f34c4d517ce5ff594db68d577d9e69d,True,Tests_passed,ce52a7bc83aee7f652418bba5c0e714f77510decb730dc6a555206f45967b080,True,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,119f4f765f489fb1379896835a73640df897504d08f6e7915a8a111e4baf453e,Tests_failed,7bfa21eadbd758d3341bb97967127c30b96e17f31a31802a91fc057be362fd00,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,119f4f765f489fb1379896835a73640df897504d08f6e7915a8a111e4baf453e,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd diff --git a/results/combined/merges_tested/vojtechhabarta/typescript-generator.csv b/results/combined/merges_tested/vojtechhabarta/typescript-generator.csv index 95a02e9f1b..8a1ebfbe5e 100644 --- a/results/combined/merges_tested/vojtechhabarta/typescript-generator.csv +++ b/results/combined/merges_tested/vojtechhabarta/typescript-generator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/main,21e67d4ad2285b28c6abba515a8aeaf823083c25,6bf3790e1a165828766d008ea774dc5ab44bb63f,fcd79415718d23a5142acb80b46ae8c6eb68a8ff,,True,True,Tests_passed,940f160fd1cd3bd11904eb508c50579b7fff355006474b37f16acbaec3ca7d3c,True,25,62,420,3,True,Tests_passed,52b40d523a47159e37fa9aab00fcdb3d332dc0b8c49115aae5b5ac5d23ec62e8,True,25,True,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234 17,refs/heads/main,d44a704cd00045c731f3d66de3d6a2079567af88,597446625e1ee9ac77a1c3a0b012a8771febf5de,39fd8bd2c598e485354fed47fbb6c71134aecf84,,True,True,Tests_passed,9b865674ff9a3d091bb50383c2253a06d66f4b7d1014751021b09399562be737,True,38,148,1667,5,True,Tests_passed,23ee0c8f6900a9f3235f037224842e33ab18524498ed8f8c7ed6d8db15b1ea20,True,38,True,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,3ee6bc2410ce8f8b57d6ea54075e16d5dda680e996709ee3f343a38cee9e656a,Merge_failed,667710ff2d7aecdbc1baee884379028f15788efdb2702bcbbf1a1035379528b2,Merge_failed,e0162443d254dbbeb0f30cf74304de0ba6cb00c232bee19ee78466dff8072347,Merge_failed,e0162443d254dbbeb0f30cf74304de0ba6cb00c232bee19ee78466dff8072347,Merge_failed,667710ff2d7aecdbc1baee884379028f15788efdb2702bcbbf1a1035379528b2,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,bf052dc58a1ca316738a12a683bd31b596485b276c463a0a9351a3d4bdcd66fd,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177 24,refs/heads/main,d35af8140a6870436d9ff2b8f2e47164d405af58,22b28594442ae4228113d8a867df5451e9240947,9d26491e9b5859135826e35bd1250bdd563af58d,,True,True,Tests_passed,8c53029031cd7b52f3572d0612cc6e41521cc67a504c2014afabd4c75c696fae,True,38,160,765,6,True,Tests_passed,f14a10a9936238762fd2a02ab85626162ca9933473d7e2ed857daa0674690262,True,38,True,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,036b4979ced1868e4f43010f0c9c971099f7f5ff0a43b9015d23f3ceaf7b4ff8,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_failed,4723d7554ab32d1f9553b66f0597957d2969cb0fd95ef57e0958512ac3b09944,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,036b4979ced1868e4f43010f0c9c971099f7f5ff0a43b9015d23f3ceaf7b4ff8,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7 diff --git a/results/combined/merges_tested/vt-middleware/cryptacular.csv b/results/combined/merges_tested/vt-middleware/cryptacular.csv index 65c4a38152..29b3f30d82 100644 --- a/results/combined/merges_tested/vt-middleware/cryptacular.csv +++ b/results/combined/merges_tested/vt-middleware/cryptacular.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/remotes/origin/ISSUE-31+32,beff926fbd2c8940c25922973b25fa29f403375a,236c0a813a83cd2f0db82e3c713c484d0fbef9be,c105eb282f4fd13f11db26207b342e3580646abe,,True,True,True,26,62,1046,3,True,26,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,True,Tests_passed,678b4849bac8b899bf8a78b88b9296570468df858afe01c8db38dd66ff5718bd,True,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10 diff --git a/results/combined/merges_tested/w3c/ldp-testsuite.csv b/results/combined/merges_tested/w3c/ldp-testsuite.csv index ceafb6678a..10716ce14d 100644 --- a/results/combined/merges_tested/w3c/ldp-testsuite.csv +++ b/results/combined/merges_tested/w3c/ldp-testsuite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,72e5a506c66eb3f3864ce1830a7d6a26e24df6af,7dc1d3f3988aa7bda988107da8c95b0bf55440fd,74c5d493011cf0c3c15badae87203641aeb24fa0,,True,True,True,18,21,145,3,True,18,Tests_passed,38d6d2624deeb297aa74862539c30e08603ffa924faf13429477025272e9ce7b,True,Tests_passed,f9068bde2818932cf899c1ac77e4f5a956782a317a79d0006e320c0c55079989,True,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,ab392a9e6efa6b6b27c58239853aff8d25b1e8c624fb0907d37b49607579151f,Merge_failed,1a43032096deee04624616b94942dfb24aed69e0c41a1e212d4d0dd43edb7990,Merge_failed,fa71da161d7a7988270a410b8f8e1a4cbb62a888c820744add6816935d67c56c,Merge_failed,c6d403dff264ec50701dc74ce8b4974d6c7b822eabe6184bba6416f6982a7631,Merge_failed,1a43032096deee04624616b94942dfb24aed69e0c41a1e212d4d0dd43edb7990,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,bdd67bf049c8cb9c63c5f540705b13882af4c4c9c936ebb05d567ebb85f7ef76,Merge_failed,3a06894ac9d4236a103527ec851c3f7b745e4fae6667e616d7a1bf07c1a28f6d,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0 4,refs/heads/master,bfcba1b108acef92bca7a67ba2662f5de8b3599e,3ad28f105961768a22e962fe98941376b05a1cda,2648740b2a27e79f02c2e4499e567c226c87a1c3,,True,True,True,10,81,310,2,True,10,Tests_passed,ef5c1504ace69ed2ed45f9fb692b7ec89475a3052766f7b3991188c12a297093,True,Tests_passed,8c0f65e92df7a0415ea6d9e3f23ed3295599105fe9a00e9e59765851350759f0,True,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,978694f3f46266d190c9e4a73039342cb27b74ddfaebfad399ceeb449ed4df88,Tests_failed,d0989db836bed6b3422dfa52616fc297df65a20c64da68b853a00dbd1385cb90,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,978694f3f46266d190c9e4a73039342cb27b74ddfaebfad399ceeb449ed4df88,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530 9,refs/heads/master,dfa115c56a406470cd38433a006ea48ab74e34ee,2a1792eddb8695dc2151961d129d2ba6e44c3184,02138c959040aa7188c845b798c8a92663560f4a,,True,True,True,2,10,82,2,True,2,Tests_passed,460227aac595894ad762f27747d9b5e8d92d06673757bb85f36c613c66eb3246,True,Tests_passed,5597b39309eceaf62f7ecd190d50f90b568ac1ca8c114dca170d1c971dd851c0,True,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,d0f7bd2e7685fbe7e4aa22158fa38f72c1cd6c2edd3f0e32fbc8faff215e1b4b,Merge_failed,5029f428ddd41c6104296162677bf72cbdae246b78fa27073f057ac7e2564738,Tests_passed,db98b257ffea71e3286da69541bd280ceb10cfd748b4c39d2195087ac5729dbe,Merge_failed,f5bdf8ade2502a527af9e3a6f05db8a2a2e64a78ad312b0e0fb2118b76e6bb81,Merge_failed,5029f428ddd41c6104296162677bf72cbdae246b78fa27073f057ac7e2564738,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,97ebe04b86f6c95215f2a0a0282f42c2731a86b59905c533951e59944ede5f82,Tests_passed,db98b257ffea71e3286da69541bd280ceb10cfd748b4c39d2195087ac5729dbe,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e diff --git a/results/combined/merges_tested/wakaleo/game-of-life.csv b/results/combined/merges_tested/wakaleo/game-of-life.csv index 4103474133..126d0581f3 100644 --- a/results/combined/merges_tested/wakaleo/game-of-life.csv +++ b/results/combined/merges_tested/wakaleo/game-of-life.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,False,True,2,2,8.0,2,True,2,Tests_passed,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,True,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc diff --git a/results/combined/merges_tested/warmuuh/libsass-maven-plugin.csv b/results/combined/merges_tested/warmuuh/libsass-maven-plugin.csv index ad2557eedc..9eaee0eb52 100644 --- a/results/combined/merges_tested/warmuuh/libsass-maven-plugin.csv +++ b/results/combined/merges_tested/warmuuh/libsass-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,b0dfdbd7a4774d227a6a5948d44506345ad9d08b,e6325978b1bee1bad13457c5f480228a3de74a85,b5df2be37584aea6c16fea9ec19f522dc98cd596,,True,True,True,6,15,79,2,True,6,Tests_passed,a2bcccd161130e7c75904de293529ef636d286e6086001004175f0107eaff51a,True,Tests_passed,719c603b43304f7de93e239e6485ffbba739ec166552f47083ee3a38f9871a3b,True,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4 12,refs/heads/master,5ca7b3f086d9f586184824abd3d00aab62d629cf,616e14a1dbfac214b61874339b24be34e2798d4b,01c75a9d37f8ed49993239d5cdd610fd354a107e,,True,True,True,6,15,642,2,True,6,Tests_passed,6518d09df6b0576f609699ce43437b31406e3d5f9fe3489a1441d5b3640b79ff,True,Tests_passed,932e417e6c6b60d38996dd138c7d2bbe310a42b86ee05b34d7572a75fd048ba2,True,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,9677fd70cebdb9c05ab6f24239982d1baf5e10e41edffac3e8bf150c86474bca,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,e39dbb0ca128f0fb483b501a5ff483a22103dbf1064daf2fb87b9bf5d17480eb,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,f49015ec7c4af248e9bc6b6294b74aac4b1841c07141a9876e455b772e007224,Merge_failed,afd71c1740d834922ffa95bb3fbc14c73878d411dab434e9e29e36db401ca11b,Merge_failed,7ff82090dfaea48d6e1c8ac6543c18e8bcc65ce63736b2a599e9d84063893e2c,Tests_passed,c57ffac05524ae77b204f6f5fdc8a7f97b385aa57896942639eea71bd60c6d85,Tests_failed,96aaa8e2cc9135c75d47f061fab24b434189a2e97eceb94519a67e0b3b448c6b,Merge_failed,7ff82090dfaea48d6e1c8ac6543c18e8bcc65ce63736b2a599e9d84063893e2c,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,e39dbb0ca128f0fb483b501a5ff483a22103dbf1064daf2fb87b9bf5d17480eb,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,f49015ec7c4af248e9bc6b6294b74aac4b1841c07141a9876e455b772e007224,Merge_failed,b2ac1d46e08083bb5d4bdbe4d7d4823960029806d093c0b66ae4ffb4cef176d4,Tests_passed,c57ffac05524ae77b204f6f5fdc8a7f97b385aa57896942639eea71bd60c6d85,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,9677fd70cebdb9c05ab6f24239982d1baf5e10e41edffac3e8bf150c86474bca,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f 28,refs/heads/master,3f55235a63376fa8cff15dabc9138d7a97d92832,5453d2a506cebc68c6b6ec938477d137aa281fd8,62ffde8c41b182e88b47793764a91ed36425d648,,True,True,True,21,47,807,3,True,21,Tests_passed,570b8a9771cac892a3bd8a57f66f5d6222444cfbc5f8da4ad38dad970f5a1929,True,Tests_passed,d4242314716c4a1f13f5a91780b79d424ddd5908d64d0162dacf5cc2e50c31ac,True,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,083b73c26d322e2cbda813834f1c5c4d7e8c66d9c594a965d6d5f770c63be625,Merge_failed,62f928a7ff9ff58c2e0d75f4166c43d0b2cddb41ec72b928093d59a367720c3f,Merge_failed,24b17d10456f5fe8be580cf33b0237ee1a51f339ea8b91063f17df83e782e02f,Merge_failed,8f41035ddee3bd6eca10e65a9ee9281ebda68d67142f532399eee778c7715d19,Merge_failed,62f928a7ff9ff58c2e0d75f4166c43d0b2cddb41ec72b928093d59a367720c3f,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,dc7239a526f2da876a36e3299d42d0a119be4ab6e5eea3210947a29544ad5b55,Merge_failed,f7bcc73dafbb2c987279092290953009894073c6ebe09358d1e54688a32a00f2,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3 diff --git a/results/combined/merges_tested/wasdev/ci.ant.csv b/results/combined/merges_tested/wasdev/ci.ant.csv index 6e3f1d0aa7..1508c8f986 100644 --- a/results/combined/merges_tested/wasdev/ci.ant.csv +++ b/results/combined/merges_tested/wasdev/ci.ant.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/remotes/origin/pull/37,efb665d50069552d430474f751de1200b18c1ffd,f3495fe4c5c4787e38713e4a970b45f344363cb1,79a92e604d15aa4001563419b192ee44a1aa9bd4,,True,True,True,21,132,856,3,True,21,Tests_passed,f0ae1ad6024d95e54631d8187f67961f3c6dc551c84d1cecc6623c0ae917b667,True,Tests_passed,b1783fc936ea374af8edce8d3f105bc8606aa4baa496c948a4161ccbf2f89fe0,True,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79 diff --git a/results/combined/merges_tested/wasdev/ci.maven.csv b/results/combined/merges_tested/wasdev/ci.maven.csv index e92f6fc26e..9f577a04bc 100644 --- a/results/combined/merges_tested/wasdev/ci.maven.csv +++ b/results/combined/merges_tested/wasdev/ci.maven.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,e89bd0b2b6e7257272066f402a8532573a1607b3,33146088d4bd577ff80e1c9e46e29b0b33cfbd76,d7c279b42e0116f9910d8cff4cbb1f3b8abfa936,,True,True,True,71,275,3355.0,2,True,71,Tests_passed,ac2ed92811a5d6bb30a733ed954a78e8395d2e187b65dcf0b161f1b6b517f93e,True,Tests_passed,41e993ed19abc571332f6bb2227566cafb2cb03ada61919c841443beb88c0815,True,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,35a79b3ff8e36304797f93cac1be4c3e2d73d34936acff751ab43c8c2eaea909,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9 437,refs/heads/main,cb3e380ef1b5cba7e829084eaadeaa9fc222a5da,664f0befcf20efb7ee4a6e4ded74b0f77214daf6,58ec62cd460ef1d38c4c19da9d01a959fceacba8,,True,False,True,8,15,37.0,2,True,8,Tests_passed,74d1926cedf2d68e55aea663a30540ad7a5a22e2daff12df4dcf8c92e1ccdebb,True,Tests_passed,42303a1c583040817bbb647e23d37e87da5f7e0246ed3f91af5499e2c0be91c2,True,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_failed,5464bde4a5e39f4afbe1c5cd2070dd8cb2b30cf8faecb8c33bd3b13104c93af8,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1 602,refs/heads/main,dbb259b09f43e546683cf3f913241c3e66f04f3e,ba6fe0c8aa963ce2c574b7fe6af5dc347009348e,1a56e9766dec62ebf6c59c3fab7af59d6158da31,,True,True,True,12,147,603.0,2,True,12,Tests_passed,583d5e091a48f6b50a6bec8db9973c1f6596007f35e48d0113a61a5b848e9495,True,Tests_passed,329f6271d1ef407f308c74eac82981a582c51a87bbcc7b8a2d867c53881bc3cb,True,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,7f59fdb7334cc5303dc9c2188522d003b89683bf7b15f97c202bf5b9f90286a5,Tests_failed,9d5c3c1bfdc0b4ec28daafe0d54eb8a89f2fa7d8b6893119cf95e3c6e820856b,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,7f59fdb7334cc5303dc9c2188522d003b89683bf7b15f97c202bf5b9f90286a5,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4 diff --git a/results/combined/merges_tested/webbit/webbit.csv b/results/combined/merges_tested/webbit/webbit.csv index 01129bbeb7..ad596835cc 100644 --- a/results/combined/merges_tested/webbit/webbit.csv +++ b/results/combined/merges_tested/webbit/webbit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/master,715b22a19aca478ab140eef9d9ab1767c9cef8ff,2b83a04996b3aaf9f5cb901b83f9545262ee64eb,1dbe3b9b2bad402db7bc50b00f35dd56313ad949,,True,True,True,25.0,52,163.0,2,True,25,Tests_passed,696056b601a512432cd1c53fe5cb044cf592cec0f2bd9d5952cf969ed459f5ea,True,Tests_passed,5d5d0ebd9f54b53ee69f31a4437826fb8aa6c8ddaa719f32bffa7d8d126b681e,True,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,137cfbc6e244996e93035b2e61df5d0bb3622b1f1aacf21ced4a84bb076ae15f,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,137cfbc6e244996e93035b2e61df5d0bb3622b1f1aacf21ced4a84bb076ae15f,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29 69,refs/heads/master,9d2ee1bdfa18f1df22260361a5005f52a5a6934a,474607b64bce97663f3ef42fb8298a4d2973c5fc,f5b8e55ad46b1e8a8f7f303f6deec1f629af98bc,,True,False,True,2.0,13,42.0,5,True,5,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,True,Tests_passed,f4368f73732f333c3a9039a5c8a2499cd3042f744cb0d9d602487e9e32b9f840,True,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_failed,dec7fa63657acdceed2098b975ab809fb4409fd64d6d25bae13a6d10c6c6bb40,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca 78,refs/heads/master,089c664c71c95df14a01f361316dbe99a27b0182,fa8ee66d296f88482329d1892e47a07e945a4cc1,da44853aa65e0b995aba560405a87c47059cbeb1,,True,True,True,60.0,172,1527.0,6,True,60,Tests_passed,77d802b4f4dca44dafb442874580983195c1168b4d1f27be2dc3ce558a690faa,True,Tests_passed,180d541903c12c6512a6abf5a3723a2bb55d1b4110d39442321f06d22041ef6b,True,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_failed,2ec3c89aad3c5086d2a01114622abf5e84031b75762b37d12a1df4c23873665f,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_failed,2ec3c89aad3c5086d2a01114622abf5e84031b75762b37d12a1df4c23873665f,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b diff --git a/results/combined/merges_tested/webbukkit/dynmapcoreapi.csv b/results/combined/merges_tested/webbukkit/dynmapcoreapi.csv index eed946e1a8..edbda5bb89 100644 --- a/results/combined/merges_tested/webbukkit/dynmapcoreapi.csv +++ b/results/combined/merges_tested/webbukkit/dynmapcoreapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ac66071a804ee6c7946eabc804948c54cfca6bff,682b3f0dca03e0bc60c929bef9a3d0d29278f34a,905966ed4556fa95ca1df8566c0315bbe8e4120c,,True,True,Tests_passed,ae6436802ce4f311a9102e90cc4296e3a1032213d0cca7251435b24196257806,True,13,43,100,2,True,Tests_passed,1cc4cc7d62b08ada071354d1e4663b68b83d5ce2a48b9b70e479c124113fe24b,True,13,True,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,5d62152f702d53dda4494de09028e26ee60c122a33955a2266d5b04c51fcc0d6,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552 diff --git a/results/combined/merges_tested/webjars/webjars-locator.csv b/results/combined/merges_tested/webjars/webjars-locator.csv index dd229e29d6..e4945c88b1 100644 --- a/results/combined/merges_tested/webjars/webjars-locator.csv +++ b/results/combined/merges_tested/webjars/webjars-locator.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 98,refs/heads/main,f1e9409c5e7d0673f11f706f24a057fa10543437,f48e291aa4a673d9ee9caa7788b60e4991bb78aa,dd6ff5b32dd139d765a94292145f71b277f3ab74,,True,True,Tests_passed,d2bc5223325798f1e7fa75b2f18e3d7bae0f83ab4dd7a73e5f01b176a6350f84,True,7,6,175,2,True,Tests_passed,2ee20809e253d76052803b83942c528b3b60760af0fa3d0d7117b4bbc53383eb,True,7,True,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,b8e5637a91a40d6485add7f396880845c7cb64c38b1f5cd10dbe7a2261659f50,Tests_passed,ab041cb5653ba12657eeb468e9119496fda3036e9c8c2500fce17e11cf2be275,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,b8e5637a91a40d6485add7f396880845c7cb64c38b1f5cd10dbe7a2261659f50,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0 105,refs/heads/main,15dd8b3a1ab2c18d94d61298070d2cffc27ffe5b,be05d7649c5e2d84cf40e61c04eafceaa9af2939,4d6d1579624536495b3ff568f139e4a524b61659,,True,True,Tests_passed,e842e670ce94390971e192f9f2f5b22e0b47bce88018a7d831f4e5d33968e418,True,5,37,441,3,True,Tests_passed,12fd811e54cb21e34645fdf29fd240cf2861297a084da0732765b5d3ee3f77f8,True,5,True,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,46d2bf5e79e70a5a11c0f511f21e789d0e3de42ef3d82959865fe2cbaa5604c6,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Tests_passed,f8ebb7564e7b42a921c98b15883522585bf4417f84404fe4bfb7ddadec43f630,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,3bf9544ec81ff963b447cec10fafec7e850d5fc07d9123d470f4072c388e49c7,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69 diff --git a/results/combined/merges_tested/whizzosoftware/wzwave.csv b/results/combined/merges_tested/whizzosoftware/wzwave.csv index bb04ed4d0f..8650e9ba08 100644 --- a/results/combined/merges_tested/whizzosoftware/wzwave.csv +++ b/results/combined/merges_tested/whizzosoftware/wzwave.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,7edcd6e59b0a91c926e32931ea28db8ff2db0bb1,8c1d455a4da9988de13007d2d320b496f92d4db7,6c8e3e9c2006be210db5c5c2d703ed64ad9d1b11,,True,True,True,81,446,3095,3,True,81,Tests_passed,947f00e2b8939a892a828f83b228f87f7e7e0889c90d149c0e1339303d975b48,True,Tests_passed,4ad717a2eda43345e2d613dccac6bdb86fb65e0b6316b549546eeb06b0723e50,True,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,82b4a8dff80b163d60469e989af68181ad694e785b712ebc66c357d8aa9595ed,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,82b4a8dff80b163d60469e989af68181ad694e785b712ebc66c357d8aa9595ed,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0 26,refs/remotes/origin/issue-24,957ba2027da2ce9a5bf458ec36101136224e2711,f9a9c84695ac50bb8a33092b3cd49ad05dc3a31d,fa8e6835b13278aef2bfd1b0e521c1d0cf096061,,True,False,True,3,8,44,6,True,6,Tests_passed,12d1cdeb5b6905d5e398a04d5362d6197fcd1c92494d4a4f493908da87f23de3,True,Tests_passed,c9c8250933a872e65495d71fc0cb00be4314f1a496f9738831d7d1a6e037160e,True,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,5703d69f10c3c746bc60870267019fff3aa3f5bc75d6079d5dc7b357afd49e71,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,449c1c093127c59e89c225b54eec21af13f6198a683df6eb1afcad6ecb070884,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,d2c1885286beeaecdf8765f731503c3d3cd079fb4820b3a471c8acf1e13ae806,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8 diff --git a/results/combined/merges_tested/wikimedia/search-highlighter.csv b/results/combined/merges_tested/wikimedia/search-highlighter.csv index bd9f5d8942..38e875db05 100644 --- a/results/combined/merges_tested/wikimedia/search-highlighter.csv +++ b/results/combined/merges_tested/wikimedia/search-highlighter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b871bfa5025d79dff5ab9324144558ac61319b47,96cf93e041a289e531e7b2fa54a603926442e700,4ca041a8710fe41d6e6bbba1eb22998c7d9b2537,,True,True,True,7,17,142,3,True,7,Tests_passed,208ed4a9c1f937c1374a6206501fc7100cef30f602e4c7fa45af0e528294228b,True,Tests_passed,999e708a253838913fca82306cd404567920cb874aef1d685b0e028a269e61fb,True,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_failed,f2d7a575857547b3c885db21a66c75decabda15681198fb5565cae123ea58225,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e diff --git a/results/combined/merges_tested/wildfly/jandex-maven-plugin.csv b/results/combined/merges_tested/wildfly/jandex-maven-plugin.csv index 9861b789eb..835ff2860f 100644 --- a/results/combined/merges_tested/wildfly/jandex-maven-plugin.csv +++ b/results/combined/merges_tested/wildfly/jandex-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,fc8c548a01a12414b6cd29b3ab989a9bcd6ff5c9,90a4465a8f2c38bdded0c6465192ad5ed62b0d0c,f9d792e8db337e6bf9c75975e42ef081d49b8fa5,,True,True,True,6,29,72,3,True,6,Tests_passed,ea110df99ae5bfacff758e03849525665e7749ded0d7f88ac5381fd10994cdea,True,Tests_passed,c154a3c0618cf08de56b92e8aeb45da04eae0b6bb297a465ef30e29f796e427f,True,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,9ede9af94ce1b09656562d57b3437719f7b4e3d21e997b5dec58c4996de5b79f,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,9ede9af94ce1b09656562d57b3437719f7b4e3d21e997b5dec58c4996de5b79f,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11 24,refs/heads/master,15cf92691e506ecc0f08820c7745c4e922d9a6ea,328a4172c6252066abe263160dbb7d7ac3850e82,bd0d4a8a73f6b72cc8262ac7796c50fe1b7057cf,,True,True,True,7,18,808,2,True,7,Tests_passed,ba67dbe65fabc8c0679f77914bb9bb0ba75efc0dd2c4990ad8a2c2fdc8bf4cc4,True,Tests_passed,e2b1bc8f2a07af67292efcc1945be51206063ed19b81f8da4b1d9c6e203d3a13,True,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_failed,0ddd76de99706a063093fd559615fdf9d3b449e71cb11379bf9da98848a1ef84,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a diff --git a/results/combined/merges_tested/winder/universal-g-code-sender.csv b/results/combined/merges_tested/winder/universal-g-code-sender.csv index 1fa4bf0483..837dcf1ffd 100644 --- a/results/combined/merges_tested/winder/universal-g-code-sender.csv +++ b/results/combined/merges_tested/winder/universal-g-code-sender.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 300,refs/heads/master,337afed03660c93e9b299d686e2c3629c0c2a563,6e709807faa349dadb8ee68df1251798a1fb7762,39db73e390d0ab7c533868c6955264f136ac9633,,True,False,True,11,69,1338.0,2,True,11,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,True,Tests_passed,dd4470793b378bba12d0107d580407910701e0bd939f5297a2442de3f73f64e8,True,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_failed,832fdcaf16b73f26efb721807ca6ed24ffc30e1ec9bcc3858e510370c8502caf,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_failed,832fdcaf16b73f26efb721807ca6ed24ffc30e1ec9bcc3858e510370c8502caf,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21 301,refs/heads/master,6e709807faa349dadb8ee68df1251798a1fb7762,0a30eafb121dec262ccf527fffe51fa8cfc31787,5e4e69fad60b9e69dfa38d9e7d289654f363bcd2,,True,True,True,18,40,149.0,2,True,18,Tests_passed,a1e974322c6207d1edd0621949ab2514872fc03843513cf721d0c1ea47eb2f04,True,Tests_passed,9ef284815b4c22af6cfa49bab7a204f5821cdbc290d6fcde6ca23373dbec0d4d,True,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,8ec0c6a2093dc12bd6dfc83d180ad2145017d9a2caf6231b98a8c571a90deba8,Merge_timedout,,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,8ec0c6a2093dc12bd6dfc83d180ad2145017d9a2caf6231b98a8c571a90deba8,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6 320,refs/heads/master,8f1015bceb298de27146fa3b9aa0274fbd49e807,6ae62f7321ab2424a35c8f7a05cd9a39bed4d993,e2dfd725cb62fcf3d8af6e785b4038f0e63c55db,,True,True,True,82,261,2191.0,4,True,82,Tests_passed,444b575c870296ceb5f3f839038b5a77359fa1e9b8efb35e18c553e3041895be,True,Tests_passed,2eae53733eb6fbeb9df0f242edfe0cdc511c658d6ff9a6283f2451e14f8badd0,True,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,ec6b80c66b535f9cb365c0c054b65efb66a89b3ad256916a277edf11f04e82bd,Merge_failed,1856a709d2321d9f8a1c1aa33727e3009f496c0fd101f395c08db98b770cc017,Merge_failed,b805fc1ab284f9cf7ef2cdf23425e559bcdaa246058f266df322914518ba1aa6,Merge_failed,4032f46d47ef458a84c720af467a25c915963051438382b1d98e03649e6a0ae1,Merge_failed,1856a709d2321d9f8a1c1aa33727e3009f496c0fd101f395c08db98b770cc017,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,5b6fe55ae79731734d55973a7fffea12ad3ba203b53dcc6ca14a146541042979,Merge_failed,b805fc1ab284f9cf7ef2cdf23425e559bcdaa246058f266df322914518ba1aa6,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48 diff --git a/results/combined/merges_tested/wizzercn/nutzwk.csv b/results/combined/merges_tested/wizzercn/nutzwk.csv index b2e872b902..ece79abd7a 100644 --- a/results/combined/merges_tested/wizzercn/nutzwk.csv +++ b/results/combined/merges_tested/wizzercn/nutzwk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,True,92,249,4046.0,2,True,92,Tests_passed,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,True,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,True,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_failed,fcbb97186af4d68cae18568107d95ea16f3b1dd5e5c7746ce8f5477263d81860,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056 diff --git a/results/combined/merges_tested/wkennedy/swagger4spring-web.csv b/results/combined/merges_tested/wkennedy/swagger4spring-web.csv index 99a42aa06c..b2e8d966df 100644 --- a/results/combined/merges_tested/wkennedy/swagger4spring-web.csv +++ b/results/combined/merges_tested/wkennedy/swagger4spring-web.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,7dd2733c22ee77c38df42d845c0d43f669528b3d,e47cd3336c793529d944af45d39864995b0a0d9b,705b69c4994795fd6223048f8b7ae501a4f039cd,,True,True,True,10,46,377,2,True,10,Tests_passed,fdaff6f963d2206d94beb989be08e8f0e7132f5b8e9e99018e504f3dd09687fa,True,Tests_passed,3a81822f6b8512b92fd844968ace77ea03934aa29c191ea3fb9a582507e022e3,True,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,c1afb8b861ff4ebd1486869f70809a70518602664e74a9e213e3f720386e8b91,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c diff --git a/results/combined/merges_tested/wnagele/hadoop-filesystem-sftp.csv b/results/combined/merges_tested/wnagele/hadoop-filesystem-sftp.csv index 7471c5be66..f24089212e 100644 --- a/results/combined/merges_tested/wnagele/hadoop-filesystem-sftp.csv +++ b/results/combined/merges_tested/wnagele/hadoop-filesystem-sftp.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/5,dce4039d7a7b792e1fca28d344a305891a078538,30e07e8547f680141604c982af385bd5fbd7d987,0ce4d472c88e79d65b8f8857da67d8b117d716d8,,True,False,Tests_passed,0e7a5187b1789c0d122ab5e4e383e12c7fb970a53890a3bfcc85af3b859c78a7,True,4,7,72,3,True,Tests_passed,c541504b64e0eff087d9f381abd1ae627071529e014870379e0c097183c08782,True,4,True,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,7d8cd21eff4c78f81f27a7570e3b155938519c71b84d3d7596921fa63b1ea37f,Merge_failed,10f92a9edacb6281e143f52b4f8000da1a329dce69f126622fd94c0c391291b3,Merge_failed,09a0bda95077849c88a66a109fed1988ae2e93f2186b8984b60651ce28eba1d8,Merge_failed,6c38c92f82bb27ef262bd90c0e125fb6689ee16bcc82d5864ce2faa64f9c3ca5,Merge_failed,10f92a9edacb6281e143f52b4f8000da1a329dce69f126622fd94c0c391291b3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,0b4723c099f31b77f6e37f7cb5cc0e3ca16eda493dbab40f45791803c1c9ae64,Merge_failed,ad18405036482b165f20233841c6484305b15cd88e3aaf62b507c5163b0c4a50,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3 10,refs/remotes/origin/pull/5,4251b394791f3e0fd46204502b6a6dccc43dc08d,2132dc226541c0ac0317a6a607688408074498a0,7dec3d9fe4cc308bb0654b315347877cafc10ee3,,True,True,Tests_passed,40d3b11daa126236987ec8f60d93fc346ad89db239d3fc1505c62b84e685155a,True,6,69,379,2,True,Tests_passed,21cbf9e028e10988382431d337e3c54abe6f7d8774edde878b126ecc8b1c0a15,True,6,True,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,81a8f18016ab66dbdbbf6556ac9c94f7694e19eeedb5b13f2210e9cd4d56a7ea,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,83dba2724114e619895d6a4bcf126fd12f6a0ac5088bb989e2a7f669ca0455c7,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,5877e45023ed965509039a48bd7ab6ceaa6ea30677844536a690ca5ac67f35ec,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63 diff --git a/results/combined/merges_tested/wnbittle/dyn4j.csv b/results/combined/merges_tested/wnbittle/dyn4j.csv index 34d16526fe..3c53044824 100644 --- a/results/combined/merges_tested/wnbittle/dyn4j.csv +++ b/results/combined/merges_tested/wnbittle/dyn4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b6c114ea1ff974840b5daa3092732877134ecda2,63f89ed0cd89ddf7076f252e57a585909f931326,0a67375f798efe71e1ec4c5e20348a35962ab0d5,,True,True,True,247,1282,34297.0,37,True,250,Tests_passed,55cedd7301612cbd29284787291e7eb4978585d765b75e4c301cfb6a69771b3b,True,Tests_passed,45e9ddf50076845b8a4c5548a2078ace4239c3a51b4e25a3ec3921994e512552,True,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,75f5aa7d8a5c5de16491c4af76409d532705d73f0d1376932a2b4a7ea83e830c,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,20c66693c31cd2a87805f310e9147b66449be149f1f7083bc5d62241ce65fc5c,Merge_failed,805ebfb3cd846b7986a754e06394b6875856b8e0b0a6a58ffccf46ee78955bc7,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,bed7c8474539c1d2fd0ec65da74f791417ef592f8ac886b389c11178698f546d,Merge_failed,78ad608afd7e5ea8f0b95f568af9d214907c2320ac946500ee33fa1ce6942b09,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9 13,refs/heads/master,bc4a8d51912dc9956fb3d64324b0323e238bf5cb,4c30329c8e6a2edbeef81b32a3b0d4dc93066002,5c61b3d55841797a96287c892a68dab5bb65b8ba,,True,True,True,17,70,374.0,7,True,17,Tests_passed,15361e6b4309664c029bd8d9c4bb224d028181cfca6ddf062bd6c6deafdfb79b,True,Tests_passed,f0a2e245eb78bd5bdfdf1e73aef4fb0d7a21eabb65fe756af30b7691c4d36b89,True,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,dae52bbee0155c4a072d074a50387c15675f1593474e8e55eccab5714487b3df,Merge_failed,81b991295164683025876d5f1577cf1d6ac6ec1f2ce3d96a5088f0c11d11181b,Tests_passed,d272892f5cf1f96be25165ef9201641d6e2fd91b625017a106d52e56a728df89,Tests_passed,f08ebd9effeb5bea4292b46bfaf37dd347a2987fc91479f827cb7672c39cf978,Merge_failed,81b991295164683025876d5f1577cf1d6ac6ec1f2ce3d96a5088f0c11d11181b,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,e125f1f261165728625866878f19d40c117d27bd9a48f99a3f0dcbaefab8b35b,Tests_passed,d272892f5cf1f96be25165ef9201641d6e2fd91b625017a106d52e56a728df89,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68 25,refs/remotes/origin/pull/57,ec92ecfb6a92d441058d670eafa0c2ed22e6dbbe,ef08b7d2590cb62fe275c660121a880b8d71dad5,128bfd8b48c36b6e84446a0203b2dd55b67a1d94,,True,True,True,16,95,1246.0,2,True,16,Tests_passed,6f11f642dbb8ca3c2c2871fe44752a8d8673f7867b3e0915769309954ef3d616,True,Tests_passed,9e68126b86e0f0c976630e68194b4ade2302e8bdc4dd0b0ba143b16d1c39fd73,True,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,1bfa6b90bf201dd01179128c988c7582c803ed1c7a4506207b67b2390c2439ee,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,034e69d4d1979d3c334c279c74a110ea2826c42148706af0079450da979c6555,Merge_failed,84afc66e7198f6b93a01b38445bd637d7804eb0cda2f5c69efb0745591b23a41,Merge_failed,4cafd5ba9df2124a84ed9ffd448b2c6ebf60820684a1ba157a6e38ad626a6638,Tests_failed,92c3b916b8feade5adaadf7b6b5be2809a72b811802f49608bd839fd330fb3ef,Merge_failed,84afc66e7198f6b93a01b38445bd637d7804eb0cda2f5c69efb0745591b23a41,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,d78a65ec21abaa0ca5c3ffa0969df1dc0439e904510e11d14bcd1fdc5fa30c0f,Merge_failed,4cafd5ba9df2124a84ed9ffd448b2c6ebf60820684a1ba157a6e38ad626a6638,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,1bfa6b90bf201dd01179128c988c7582c803ed1c7a4506207b67b2390c2439ee,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526 diff --git a/results/combined/merges_tested/wocommunity/wonder.csv b/results/combined/merges_tested/wocommunity/wonder.csv index e53dd4e47f..dadc4f2c65 100644 --- a/results/combined/merges_tested/wocommunity/wonder.csv +++ b/results/combined/merges_tested/wocommunity/wonder.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,6829a78f8f8a42271eacb3c382d62a60c37c6c81,0cd2aa5aab7ab4a12b830da1a5d0e34136e3eb20,fbf8deff2330de216f21ec24cf390f2e5e189c00,,True,False,True,2,3,8.0,2,True,2,Tests_passed,9e6ffa91ec04b31ad61bdcad765ec90de37bdd721bff2f35b83bb326fb87c0e5,True,Tests_passed,bc61d500a00a1717e7768d0c3cc864c2e9f4eec267c53e112ab2bd04c288381c,True,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c 23,refs/heads/master,87766daee1a98fa029c2811c4df0b0771dc4c2ef,a09321cc27e5562323f5aba04a69bc1bc2cfe0cf,14d3216ba7d0bd62a96f592f6d08e2bce0280771,,True,True,True,49,175,1338.0,2,True,49,Tests_passed,7bb5434ea2c0097f636e7d2520759f85656b45867ad23236acac60f95e90659f,True,Tests_passed,fa854e01b06ba5b8be2fb7c81f6e5dfd0d05eb5a3d4beec382de3a42e7f9cc62,True,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,f296dc641449395ff3a5f2d8c0d2910132975c464bdd497359569eae10d4c78c,Tests_failed,db85e90660ee3aaad69d6ce309586a14c883e76c2dd80e6568127e24ac2c038a,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,f296dc641449395ff3a5f2d8c0d2910132975c464bdd497359569eae10d4c78c,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1 946,refs/remotes/origin/pull/939,4b8ea8d4f52275fb43ea92afa9649b036e84de7f,e52982341d3c4adbbe27d05873d17941ab713624,d31dab704f580a5628581e35e50f48ed0d9d242c,,True,True,True,6,25,287.0,2,True,6,Tests_passed,11a7692c765aa26902d2bb1ad36c2efa83803c2aef4105ccf5e0cf88c98d3e4f,True,Tests_passed,22c1448d898534362f9b6cfb1d8a6fba5602af91720d933e40fc0862b414544a,True,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,4ae2a7de7ffefa74b7910264cf180f77056e7569447ab23d1c40b253831aa4c3,Merge_failed,77ddf9e2d2d1f681751321ed175ef14107bebff1519d8a0e7e931db4ee332ac8,Merge_failed,635a542ea69a8facabbcff4a485ded0ef53b530ee8f012db3fcbb709bdbc8887,Tests_failed,d3f9b51abad4d9e6bba2226369babca565d49ba05de303a4cc00e0371449f05e,Merge_failed,77ddf9e2d2d1f681751321ed175ef14107bebff1519d8a0e7e931db4ee332ac8,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,ca573bd6b0be619548711f4a6b5d6f8b6285b48c4d821a6e2bbc5955496b683a,Merge_failed,635a542ea69a8facabbcff4a485ded0ef53b530ee8f012db3fcbb709bdbc8887,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c diff --git a/results/combined/merges_tested/woder/torchbot.csv b/results/combined/merges_tested/woder/torchbot.csv index dd55d83fc5..2cfbbc5d9a 100644 --- a/results/combined/merges_tested/woder/torchbot.csv +++ b/results/combined/merges_tested/woder/torchbot.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,6abb7ded348003f1b3c925430650708220cc6b5e,991eb240e66262bb532a1d5ba813d7b9668c51a1,03dc14b732b486a232d57ac55af1030dc2517c8e,,True,,Tests_passed,09ed37b4747641f5fd1b228e0fbda09240d5a2125f8b1cc6a5e1a74bc0a4ccfd,True,6,30,,3,True,Tests_passed,bbb15cd30102698c469849041e9edca587b9698b50ab6589854fd4428cff00ab,True,6,True,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,8fc87dbbaca3aaedf340e68bd4bff05cce85add278cc6cfef27338cdbf457e75,Merge_failed,37026c8f8eeed8b2bc8b48b7430515586420e9d86bba9d15422a56995e610876,Merge_failed,8a600bcca95ebc1490533772eb14eefd0669124557f467880e4cdaa8a8bf6c49,Merge_failed,8a600bcca95ebc1490533772eb14eefd0669124557f467880e4cdaa8a8bf6c49,Merge_failed,37026c8f8eeed8b2bc8b48b7430515586420e9d86bba9d15422a56995e610876,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,799c2ea1b50370662759d3c1bbd2d5f7b714f45f6313a5d57c1bf7d85f16e461,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5 3,refs/heads/master,975c6e38b77419ee259a8f006ef9d342280c90b4,f9b31353053bc3293bf227153a4dbf156c842d9a,edad798eae80caa51a1413172f0101ce03ec2967,,True,,Tests_passed,cff7260d3f4f22d068d2e081599c67ec136280e625053ef0ad8cc6bbd380254a,True,10,22,,2,True,Tests_passed,fe9c192a65a8c9a8388aaac49041e5d08a4b74fc352668c73f3bd40501c46f97,True,10,True,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,8e801544deec94f7faa3c907a1cb327e22175d3683d9d25392318013a8449fcf,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,Tests_failed,f9500ed2f4c611f3596a0c8920a985a14b0819598e68a1e23e41bac4a19a511b,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,ddaf765efdd253ccb8bb4241122e336ad26a9019f6b5fce3f0cb24eb3dc76a12,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709 diff --git a/results/combined/merges_tested/wokier/teh.csv b/results/combined/merges_tested/wokier/teh.csv index 9b54a5fa81..5ea1820e24 100644 --- a/results/combined/merges_tested/wokier/teh.csv +++ b/results/combined/merges_tested/wokier/teh.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4291bbd98f8d30d9c9df931de88a54163764af15,8f90b419fa41ac2c4d00f280faaa163fb2316269,5d71673e219de860eef417580d6f93dbe7219ef0,,True,True,True,6,36,194,2,True,6,Tests_passed,0ed4fbb524c7a334573205ea7b3066f81cc588f11619052bca4aa1579120091e,True,Tests_passed,31995b7b6d111cd611f080a7993277384279037be6c34b011d1e4f6e24199f7b,True,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_failed,79def38101000ee453f030a27a17137b9dda63b0e1edb918c73e056307e9b576,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed diff --git a/results/combined/merges_tested/wordnik/swagger-codegen.csv b/results/combined/merges_tested/wordnik/swagger-codegen.csv index a97d973a1f..94d6746161 100644 --- a/results/combined/merges_tested/wordnik/swagger-codegen.csv +++ b/results/combined/merges_tested/wordnik/swagger-codegen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 80,refs/heads/master,e00d102c471a4150da186b30d36c468d2bd72b60,8408b97771f519253c2ecc9f26349d2a958564b3,e104803781270b91c964a2cc17dbaeb1e11e35ea,,True,True,True,132,520,6237.0,2,True,132,Tests_passed,303d1ff9a7aa2322b787cd2857769b550800fd4076d3ec2ccf0777038f3f12fe,True,Tests_passed,08c6109b0f2a509e68299ca15d2d567e00a98e236bd3cfd78033c6e534e53c7c,True,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_failed,d6f5f0221b3493ac88df9a2ea40a18cc6401d37f19996f681086dd7a106fcbc7,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09 1282,refs/heads/master,8836644d3773125db40e1e2c2af3adc3838dd6a0,e00d102c471a4150da186b30d36c468d2bd72b60,c07e30b8cf487282680f33693fc77cda917272ab,,True,True,True,50,61,3510.0,2,True,50,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,True,Tests_passed,6fe60368d048496904b7ecaba5cd9fd57966cc8c9d209dd2bdbdd6e07cff2891,True,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,75cb7532bbbd4715c00faa7f547caa3c9f75a617fb54649ab02c8a68c2bcde5c,Tests_passed,c207cb65e6b794276a956546492fff31774bf3f019a74ee5d5ddb5c8deaf3bd5,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,75cb7532bbbd4715c00faa7f547caa3c9f75a617fb54649ab02c8a68c2bcde5c,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb 2018,refs/remotes/origin/3.0.0,02f30a27f9cf8368098d39ddce2c1607a989d1b5,f32dd6f7bc4b8ca43bd3969290c709006d73cdb8,5b4e8a8ed5f36b566fe71be1b5e01918f3397d0c,,True,True,True,1331,9263,103328.0,2,True,1329,Tests_passed,f507999218efa981df5bbe9bcf6ea0d6f1eca9dd6cd33c871e4bedc5d46e88c4,True,Tests_passed,7c4d4e470a9d6ba2a2af2a1db3c629758e105b794997e3c6134541446c3767e3,True,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,ada9194638fc1bf9d957b3cf6299097562bfb2101d74c661a236985207d6f083,Tests_failed,c8289f8e8147ee833ba21173768b056ea49d044aebd6f81f4d07bfb81e709e03,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,ada9194638fc1bf9d957b3cf6299097562bfb2101d74c661a236985207d6f083,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649 diff --git a/results/combined/merges_tested/wsky/top-push.csv b/results/combined/merges_tested/wsky/top-push.csv index 82b7b98295..6fe45e976b 100644 --- a/results/combined/merges_tested/wsky/top-push.csv +++ b/results/combined/merges_tested/wsky/top-push.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,0ac546979c7028031ed0a6185c669e92174f774d,1013cf1396bf0c497c182b73439735136da8fb5c,1c9739f2f9f1f88821a92f368bc572b150385702,,True,True,True,12,47,139,3,True,12,Tests_passed,55fcddc4a714dcf25d676f6798bec57b75ae35ebb7d73aa3c75aeb4bccb6f0d2,True,Tests_passed,2a45fea9227624b6171e839e4ede06613fb376d84fb5b518d5306a9334d6d42b,True,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,ae1f7e8de0109a594e4f97f6d6a4a250939ea3a7018a00506bcdad319b845043,Merge_failed,180b273bf9282228ea241dd7b78ced7d2157801152d5b9fbe7f983ebfe61b0aa,Merge_failed,8418afd6317a0452f04ad71e1bded2cfcd33ca490df70c6de44d574c78bea138,Merge_failed,dd9e01300b4b2768719d50b7aa1ac27df76916471da48c674ff5f971e90e7fa2,Merge_failed,180b273bf9282228ea241dd7b78ced7d2157801152d5b9fbe7f983ebfe61b0aa,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,083dcfc820207f2809975471def7820558f973848bdba135c9f56c700b7c1f34,Merge_failed,a2922d0e2b12a56587e1674533572b30bf45636b92de6e1798454064829f316f,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072 2,refs/heads/master,9867decdcc897cc8538400054ffa3c2fde517cc0,37da8398d50cf30b90d81a0245f989d85fe1a534,f0fad16e227c00a986cebb5919b2ef9cd2b5e114,,True,True,True,8,30,165,3,True,8,Tests_passed,fac2c1b6ea7d391b3bc039ddf354e6dbbe37fbed34d89c34c5a610821cf897e2,True,Tests_passed,f6109671b473744080bca0224a8175e4d4063cb85dbabea311a709d1e04fbb5a,True,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,97327f0437154f64909b44ad5ceffa8bff0a1c4af95cf36461975589354b15f7,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Tests_passed,fa245b0623251d0f8e5ef8cb95295088e3e0e4b0aa629d7fcf95e128016896b1,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,eee4151a19b24c2cd7adb270c4b8d7d2509f4c171f3c07940a8bdda0e90471bd,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852 diff --git a/results/combined/merges_tested/wstrange/googleauth.csv b/results/combined/merges_tested/wstrange/googleauth.csv index 5a5f605511..35f821b883 100644 --- a/results/combined/merges_tested/wstrange/googleauth.csv +++ b/results/combined/merges_tested/wstrange/googleauth.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 41,refs/heads/master,bb6e4a0c6f4c595a93bcd3b06c05d0c55df8e365,ba8ef98003e0d88ad03b458469c00820482cf3a9,faf4deeade71408fa33bc8030ace85bf7b791f16,,True,True,True,9,51,576,4,True,9,Tests_passed,a178687b0494ce929058cea330860811825bc49d857294e4a2980421ec6f42a2,True,Tests_passed,7110f678829647334a2739db4aadf76582173dd04d5730a18d9ad874958e307f,True,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,46e5360d5e0b97e8ab490a0e058a30f201ae3c7416a3bcc35588a3d877bdc366,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,b7b09533a02d3bd79e8b8d118e8969bf2c90a14c6ba064c4ef727a1da4a19874,Merge_failed,23fd23fd6da1a2008375ab3d36ffc27a36fb41dba4d3b348659010777416a5e6,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,97ba6b02f06cfe9caca51c4302542d7f84d05591294876d314ec8639b625b3b5,Merge_failed,bdc974ca89cbcb38fca6dacb00f0cb94baea8f233b8494477f6c46dca7c59236,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03 diff --git a/results/combined/merges_tested/wvengen/proguard-maven-plugin.csv b/results/combined/merges_tested/wvengen/proguard-maven-plugin.csv index df7899df4b..e7393584d9 100644 --- a/results/combined/merges_tested/wvengen/proguard-maven-plugin.csv +++ b/results/combined/merges_tested/wvengen/proguard-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 99,refs/heads/master,f451e7e614d307e53025ba5738baa26724d3ad54,277db877cf85bad1c0305bc25b20546f317379f7,65fb4b434c390988653d6eec5ae61a4a60ef3f7a,,True,True,Tests_passed,489a443f3fb03dfc6962f316ecde516476aa6ad0a470c63adcc554050b672c67,True,7,49,330,3,True,Tests_passed,d2bb6c310e83e3e8fa7fdf5930a06fcd0303e93eae4f8fd1537413695e332b85,True,7,True,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,e95d87613b766e75d69948e272f575436d603742555d07f5e1c03e9f494b0f92,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,37dea98cb8545e19f3d4c95aa139e8e658dc856c2d03eb73c450c8a657a692fd,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,5f0adb809e7d370c4ac5e29ec377db6a06a08c4a126eeaab0b76eed0fd25ae14,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,37dea98cb8545e19f3d4c95aa139e8e658dc856c2d03eb73c450c8a657a692fd,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,5f0adb809e7d370c4ac5e29ec377db6a06a08c4a126eeaab0b76eed0fd25ae14,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,e95d87613b766e75d69948e272f575436d603742555d07f5e1c03e9f494b0f92,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f 102,refs/heads/master,abfad8528e0374a1dd18c74264bad8bf20fcffc0,f3e58ee5a050be49aeb4517afe3842254bc61200,06af46adb278389a5ef6e0cc00a57f3e4916abfb,,True,True,Tests_passed,2f94bc288ad2b3d351b4dd567ebddcb0e235f70cafad7a5a2a8046b86c155aad,True,4,13,70,2,True,Tests_passed,e2fe2b4c3e682c3633a5da4a71aa9e0f19fa1f6431c89d7ff1b7a0c1d9a507c9,True,4,True,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,c5d92821508bf241194e5e23792bdca3c8f1fc074a3ab57d1b1f6af027145cfd,Tests_failed,f539f4d534fd776bf202c67e41c83abf91174eced6d99def4ff0bbb8fbb67d8d,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,c5d92821508bf241194e5e23792bdca3c8f1fc074a3ab57d1b1f6af027145cfd,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5 104,refs/heads/master,65fb4b434c390988653d6eec5ae61a4a60ef3f7a,3a353feaa7ab44d735723a01a34dae6531d7ce72,1cc9601e1f768db280d6fed0ef6e70d2dc85e099,,True,True,Tests_passed,e3f640b17dc2f431f9c0a3d08f9b0b97ffe04b89f859cb9b84ca38f3879f7f46,True,6,37,226,2,True,Tests_passed,ca995cf24d9914ba4d6608aeb19bf1074366d1c1f0083766f509f9ce4e7bbe3c,True,6,True,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,a4f572e5e644f52af2fd6add8cc91c845b83a1020073fc210411c668f5c07ec8,Merge_failed,4a82bb035686713ac56f02f5f1936f65689a4c89c530c94fbd8d9d12f304215c,Merge_failed,63d1f59c8ee7b7f78fec09ae08e2adb4e2461cb6ce22aca4dbfefab753b08eb8,Tests_failed,9c635007499da71dfc655a3f0eee75d20e1c2aaa9ace4aac6f75a311e92ae709,Merge_failed,4a82bb035686713ac56f02f5f1936f65689a4c89c530c94fbd8d9d12f304215c,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,9f57fff7883796b60a68caea76d0db47102e87c82a0cadb5a4b5728c0ad2ca33,Merge_failed,63d1f59c8ee7b7f78fec09ae08e2adb4e2461cb6ce22aca4dbfefab753b08eb8,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f diff --git a/results/combined/merges_tested/wwadge/hbnpojogen.csv b/results/combined/merges_tested/wwadge/hbnpojogen.csv index 9540e0e06e..ea747fa82b 100644 --- a/results/combined/merges_tested/wwadge/hbnpojogen.csv +++ b/results/combined/merges_tested/wwadge/hbnpojogen.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,0526044550f5e9a82f65772029462a7434ecdd5c,17f4316b540facffefeed00c9470a34e484ff797,1df8c78acca6f5acca01d5166dadfed10d786df5,,True,True,True,7,17,97,2,True,7,Tests_passed,4d11c52c775a4602495d557fb460462c92116143625c73cf58cd4e7c8c93abef,True,Tests_passed,5e8b096cf5f3beec7e69bba8efddaa9ba27bae35da51bdf902cce9e11f21dcd9,True,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,1b7fe45d40590e95198e2d7759e2e7cc9530748713575cafb763ba22bbe9c409,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,1b7fe45d40590e95198e2d7759e2e7cc9530748713575cafb763ba22bbe9c409,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5 8,refs/heads/master,16f458ccc0b3675ec72a298481794ed4afd70666,583f67a93208929c28782528af94a6befa838c22,c05e424bdf26cc9587415dc1b34ac3628e6f0ea0,,True,True,True,11,22,136,2,True,11,Tests_passed,a8cbd141c88bbc428d841e90389995c171fe8021b35d1d0f6e6c75b6d96841b6,True,Tests_passed,5c9430292c82a9aa7a9bb357c563cef9def1a24418578eaccb2fc6617a018e1c,True,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Merge_timedout,,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11 diff --git a/results/combined/merges_tested/xaverw/msearch.csv b/results/combined/merges_tested/xaverw/msearch.csv index ccd6a7e830..936c1a18f5 100644 --- a/results/combined/merges_tested/xaverw/msearch.csv +++ b/results/combined/merges_tested/xaverw/msearch.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,ab544f9464acace234ed164113e9d6fc42fcc898,cd770473148aa5a7de33b3505b2257416a605c55,285cd0684d635bc4f6288be7b66d5513ff2f5268,,True,True,True,3,18,67.0,2,True,3,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,True,Tests_passed,cb4d57b07771831aa03da393176ab13571fa7b995235e5419b3e5b6c9fb01a0e,True,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9d45eb1f4284a70a3e4093ab5cf1141ba1bc8e1014bf1976e7c125d7b9b71ed2,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,bb84efae233f35826bd693c5510ffe64c92afef91b86b6605c058b565e989171,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,742dd1747c3c2a5f283fd7000a032eb92c067b5964edcf85752f664c30968015,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201 6,refs/heads/master,cd770473148aa5a7de33b3505b2257416a605c55,cfaa2e961bf0bad111f7cad90f35e189c6d84d3b,24ae6009efadf158401862338e84f7ba0cf2b354,,True,False,True,2,14,55.0,2,True,2,Tests_passed,5be751f454d9664567e919e0770325cf00fef50d41ad017ffc965ebf30ced2c9,True,Tests_passed,0b582440d39422f485d79cadb4f8af78a592d18ab2062cbd39107f42983f7a6c,True,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,dad490bd0dfa1b9c62aaad8fad7e4e613ddf9215c70bcda50b75ac3c1db5d2f0,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,dad490bd0dfa1b9c62aaad8fad7e4e613ddf9215c70bcda50b75ac3c1db5d2f0,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066 161,refs/remotes/origin/pull/113,89f696aad5e1bb5b729a747dee346381a944b4e5,3ce720ebdb0b1146fc680b12b2732231918a7af8,7025a6b6fab263926dd1f510df0d4957f4c49221,,True,True,True,13,110,613.0,2,True,13,Tests_passed,9213fce7a59a814a84733be932923b3e43fe8e4f05a618fbe1ea181ca91dc0bf,True,Tests_passed,6e43af11a7b7bac07dfd0ce9565de62eb45070613911933e94aca6b978e953a0,True,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,21b78da7e3ccd57d42f406e37381a37f6979193e6125c4795947efbaaeb2f694,Tests_passed,fc220527189fd15caa0f210d1dc2cc9fcf068bda36f4bb597b6d57026cd044af,Tests_passed,ef26567cb942efce929abfce65ca256700c13275f25fcaedd03d1d84ddc7a866,Merge_failed,c87c227b0d8b2254c78cddac43b3f1b18354c3b781772179fdadb5f498770b18,Tests_passed,fc220527189fd15caa0f210d1dc2cc9fcf068bda36f4bb597b6d57026cd044af,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,b57e15ddd68f63394c5f20254485b486d41b4bf9318eb8129840bfa2a6c4631b,Tests_passed,ef26567cb942efce929abfce65ca256700c13275f25fcaedd03d1d84ddc7a866,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95 diff --git a/results/combined/merges_tested/xceptance/xcmailr.csv b/results/combined/merges_tested/xceptance/xcmailr.csv index c4f232ea00..b43074e261 100644 --- a/results/combined/merges_tested/xceptance/xcmailr.csv +++ b/results/combined/merges_tested/xceptance/xcmailr.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,d2595e205ca2e2c05d51c0005d2a0a476346a766,57b3825589b9a4df633d45657f2f19b1aae327ab,e0e4311c3dad42818e9d6069f6a2234fd2dcf42c,,True,True,True,22,65,597,6,True,24,Tests_passed,e640551537f04f760b1f31e060acf3edeb744f3db132a70947b1dbf55fc86be9,True,Tests_passed,5cf7025ad9cd77670ad2b8f14758f387218dbab9ddaf72f3f23042a63c3bf3a9,True,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,aed7a1d9ca44ad3c06853689b0351782dfecb60680ff99fa34defaa077bc7da9,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,477173b308636e58d923a33ed366217d68443569a734cc900f24504318a22b1c,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,b85a9e782ffab18630979a93c23d353d1efd3ee2a5b85879ab7fcc7106664402,Merge_failed,26094e3bc6a080df84e924db09e7e7374d4b6bace096c7234f2983178a7e2803,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148 12,refs/heads/develop,d4168af7f11c87288226e057ae48dbd7788e6872,a43b911c16cc9b2ccb7b5996af51adc26c12a77e,ec936caa793e59240acca5239105707e9aec9c37,,True,False,True,14,29,128,3,True,14,Tests_passed,8c117f7998d83ec08d9647cba20fd0fbcd7f29847e70c8b2d3629a63143bb7b3,True,Tests_passed,69e2cfa4d05eb87ca733e751a565a6bb20b41a757562c439bfbadb5c621980b5,True,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,e8fcf279f91cec2bda5a0895eebca8b4dbcfea218a820fd91537d3d29a75fae5,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,e8fcf279f91cec2bda5a0895eebca8b4dbcfea218a820fd91537d3d29a75fae5,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931 13,refs/heads/develop,0e8854bd70c47bd4aaa4f232e05028e31935d1a5,720afecf7da67eb5be30d191b74df8a2e9d65217,b9a48f0bf6c626a6be573165fa6763560ebcb948,,True,True,True,13,29,106,4,True,13,Tests_passed,4962ffb1273064e43260bf5de97c149b405d11d859b54b77a7392b96b6a74221,True,Tests_passed,9ac452db09e0b81beea72debd698e706102f7b00361ac86437c30d0618390fe6,True,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,092c01dea283b61a0a1c14823fbb671c6ec47f0dedc08e60eb1ad67423335bad,Tests_failed,f5c220b6b6c4d4f27065935637190ac37f35b28cf36f84c20badb907c11dd54e,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,092c01dea283b61a0a1c14823fbb671c6ec47f0dedc08e60eb1ad67423335bad,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925 diff --git a/results/combined/merges_tested/xebia/xebium.csv b/results/combined/merges_tested/xebia/xebium.csv index 3c9f6be750..d64e5a0d99 100644 --- a/results/combined/merges_tested/xebia/xebium.csv +++ b/results/combined/merges_tested/xebia/xebium.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cbfab438393258e91f8f54b6020f3fd8c8c4cc9f,8aabaad9e4eb4feff9436848ac7f91661b68e4bc,a7659b3b11a3608328a30f64350703a798ff2c39,,True,True,True,5,6,140.0,2,True,5,Tests_passed,9b0f0a91def79e8ce7e4ce38326b5adcdcacc682b74b5a4f63a1932e277fa20c,True,Tests_passed,fa8b543b3168badfa92f35276d83e9d1529206cf008ac6bca2170c266f2ceb8a,True,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,a1e8db274c3cba320cf03f3ab213362e8da50745dffa9a6537a92b854bb58c8f,Merge_failed,03b92ea667e7138ea14633aa2a3210561ee4a526356984f0d9ceeb4eca7379af,Tests_passed,b84a7bcb40808b9477d72b2500b5ab21de04bcb3e0fcc3d81ae7cd7beeb8117c,Merge_failed,08c8dfa0999f58b820f06e708e540c804bc53358639c09d923abc7917ec8844d,Merge_failed,03b92ea667e7138ea14633aa2a3210561ee4a526356984f0d9ceeb4eca7379af,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,3b714398439361646f2f3e66835d0d9345288a017058796381209c2c5244fe37,Tests_passed,b84a7bcb40808b9477d72b2500b5ab21de04bcb3e0fcc3d81ae7cd7beeb8117c,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28 16,refs/heads/master,2808ba14a8b8932184099d8a63e9c5a4d69d6a25,5741e34076818d5ab03d55067a60a4a9db37a064,3a99245672b2f98fe3de5600d1012e2625201edd,,True,True,True,17,26,1083.0,2,True,17,Tests_passed,4fea512beed85924066989703783ab13254da091cda925f5ed2852253fb602af,True,Tests_passed,d8b3cef5ffdc8707665176455fa4c806a7f94cd22a6a82fcd9fd6ab724e940da,True,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,11fbe24fb046172c5104ad8794af73d3d6d8b91373c573e5395619cdc1492c4e,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da 18,refs/heads/master,a9304edb1a04cd4905ea1ec9569e6c2b8e63a1c2,45267eb71a65cf11fd677661e1cf75aef3964f8e,ee545b883bfd6bf65c05b9b419b0d3b437d815a0,,True,True,True,65,162,867.0,2,True,65,Tests_passed,1521d1bd20e473119e6163c24ea2ab6b791ff888c646013318f714c160a75c93,True,Tests_passed,3e6730e21ee9fc1e10715d215d64494536201810fbb88eaa890a070f453ed313,True,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,7bb69dfa1b3ec285d678bdd6a918bda6b4c8785bed0c58feefce1aeafadc0fe5,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,7bb69dfa1b3ec285d678bdd6a918bda6b4c8785bed0c58feefce1aeafadc0fe5,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f diff --git a/results/combined/merges_tested/xerial/sqlite-jdbc.csv b/results/combined/merges_tested/xerial/sqlite-jdbc.csv index e3b34c1ee5..88f14d428d 100644 --- a/results/combined/merges_tested/xerial/sqlite-jdbc.csv +++ b/results/combined/merges_tested/xerial/sqlite-jdbc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,1b28e87bebefd5dd7deb7b0712e2ab5729a363e8,60bcbe8753b72abdabdcf203381c7615e7df499c,a987e5deb8ee1c54c747ef5c364c83cb2425a8a9,,True,False,True,3,9,46.0,2,True,3,Tests_passed,90b3f767992119fe56afe43f9484afc247cc18627578d400bf1310ab5c2c153e,True,Tests_passed,21877632a27041a36fff6fb23c59ac8be08845afa59e64876c2c7fbb23a88662,True,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069 15,refs/heads/master,696d6b2667e37ba8fc340cb20eea87fe3f13023b,ab29e9ee3c3513a43848ae77f077cfbbd9e2f75f,7c33d754ae1cd10511cee6500b80c56714576b77,,True,False,True,18,19,167.0,2,True,18,Tests_passed,6f8866634877a63f7907107ef5d0208ee9591938d038d4be6c673ea951cd3d89,True,Tests_passed,454285e778a57428964a7bf6726934812635e738ab09ec4ece4039f51084771b,True,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_failed,e5095729da289ab59c6bc21b7750a91cc0cfe6122280d76a87211e4b6e52d070,Tests_failed,2cbbeadbcd01eb36e5d878ba0fe59840fbb5f96196e4f6d9b09a023c2d61f85e,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_failed,e5095729da289ab59c6bc21b7750a91cc0cfe6122280d76a87211e4b6e52d070,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c 17,refs/heads/master,e84316e759a76facbe26c590c3196b497fc46d51,203354fa561fa24f820dc445a49b410427427419,fad840fe0af3403a333c9d4ff6397f71747729bd,,True,False,True,16,6,24.0,2,True,16,Tests_passed,3badf12ce0f728c23eb00d8bf88ad2d1faabe2b6fe14c2f06757ca151b923aa5,True,Tests_passed,b2c3c163a0f05fbe94837bdd83bafead361b0cf445e5ee7241074c8b637ab9a0,True,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,74d5e8e0788dce8ad6f44a2e3fd3d4714a3880d26025abb808f4a7067e8b4e13,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,74d5e8e0788dce8ad6f44a2e3fd3d4714a3880d26025abb808f4a7067e8b4e13,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf diff --git a/results/combined/merges_tested/xuxueli/xxl-job.csv b/results/combined/merges_tested/xuxueli/xxl-job.csv index 04248673e4..190b621196 100644 --- a/results/combined/merges_tested/xuxueli/xxl-job.csv +++ b/results/combined/merges_tested/xuxueli/xxl-job.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,ebe88bd7ce1f20cda0d9112259c94a2cc99da68c,8c73afa2896d783ca54a3c0b802f20a3c7b09a58,35bceaac0b87f9ab7b5fe44c3ea355afd45b52a0,,True,True,True,124.0,598,6529.0,2,True,124,Tests_passed,a6694199897b2b53f9476a991fc3ef077958f603cfce24fbf71517857aae11ef,True,Tests_passed,1c432cd52cddfa8d7f158109f29a403d0d3c98c146e238de1ff9be8382c9183e,True,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1 46,refs/heads/master,d0f5c1f6ee60a1e11e89c23749ba2611e53f587c,cd68af99afa12089a76365c7a4336509c355b2d4,b78808259356677415ede135d3b08647f050c36c,,True,True,True,21.0,54,1432.0,2,True,21,Tests_passed,88cb695ed60296dcc968930517a5826307648944a74e341aca36afec5af5eeda,True,Tests_passed,05d0c896e4619e35657e790effb59ade4208980f8c1ac9d51252171929211c19,True,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,bd7485e79945e79dbafe74cabc3a4619d013595bf4da142d8f8a0f9a86acc322,Merge_failed,31d928129df6f735e518658fbe5d8071e7e42094b015120305536720815bdf0b,Merge_failed,efccbe4be75d6ff6d520eb75672f30c62276e7c6f6e5aba17b7983d0223ae10e,Merge_failed,d22f483fe6ff2b266b63525449003578a5368b3da4c02e0b4d7e4b5dbe1f6aee,Tests_failed,e2e5d8b5cbaa5600f09de9729bd6b28819c8f7d22c4533876076a6e92dbdfbad,Merge_failed,efccbe4be75d6ff6d520eb75672f30c62276e7c6f6e5aba17b7983d0223ae10e,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,bd7485e79945e79dbafe74cabc3a4619d013595bf4da142d8f8a0f9a86acc322,Merge_failed,f9b58ae198a910984f9a5afec3f2d4173deeb18108ca7d3b51ca14dacd948861,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f 65,refs/heads/master,8512a34469bf574b199268d855f7fd86a18d8fcc,4fa63e3aae9f6c438d3dc4949d533fb6a6b7db27,6659ce1b7ddbefb7ab81d03eb80af46afc884073,,True,True,True,50.0,184,1185.0,10,True,50,Tests_passed,ae81b0a502177019f8b7f0150bc6ee978672192b33117a04b80377b8c930bb6f,True,Tests_passed,27d0c1bc2fbf29dbd3bb8119222619e5c292c71c117d2edc38d2d73c70e7746f,True,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,2b89557173f3afcbe2ebc50b8a2a5110dfaec82936b24dead5ac79d6d9ea057e,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,0a9b9cdbea2fa9f50952448c8da7fce8cd8cc0fa4687da5ec8f232cc162ed332,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,991f3afcc402c9776f445ff1f6dbe99bfb093c18e3fd9a1042fb2ced8e258721,Merge_failed,2fe7b558ace74fb6375930034d91669826adf40008aaec3e5d490a1be9910176,Merge_failed,be88cf347c1c9ff6babccdcf5a241dabb456772223252a2955d987379a0a7154,Merge_failed,be88cf347c1c9ff6babccdcf5a241dabb456772223252a2955d987379a0a7154,Merge_failed,2fe7b558ace74fb6375930034d91669826adf40008aaec3e5d490a1be9910176,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,0a9b9cdbea2fa9f50952448c8da7fce8cd8cc0fa4687da5ec8f232cc162ed332,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,03a914cd0951c54e4c0dab44d07f91579c41722b676e08700ee42d8c0f884109,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,2b89557173f3afcbe2ebc50b8a2a5110dfaec82936b24dead5ac79d6d9ea057e,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9 diff --git a/results/combined/merges_tested/yandex-qatools/ashot.csv b/results/combined/merges_tested/yandex-qatools/ashot.csv index 037ce93023..63e36a205f 100644 --- a/results/combined/merges_tested/yandex-qatools/ashot.csv +++ b/results/combined/merges_tested/yandex-qatools/ashot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/heads/master,c885c16709720ca016eeaad7056c0a39a9490878,3f0f936d5420486e0fc81188a8b910efd658d527,c4dd51684fd9c41c3007a2738ea5956eb3de894d,,True,True,True,6,12,51,5,True,8,Tests_passed,fe30a35cebd8fd18b96194edc73b49b9ee0f724aa8c4e548f7bc6022c2d7eceb,True,Tests_passed,5241c4d02046c03f064e714c909160493feca3f1ecf6295fbcf1403682a0890f,True,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,de3f02302a8699e9a6cc8fcd5ce44d8a36e0620929858d65cbe60bf0f47b20fc,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Tests_failed,a09182471537a72fa3bff2dddf834528c4e38be5fcb84877045fc9b1833c05d5,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,961403e5712aa0c40d7041f5ad661b8791c0baae6adfaaed6276fb9d19991d12,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6 diff --git a/results/combined/merges_tested/yandex-qatools/postgresql-embedded.csv b/results/combined/merges_tested/yandex-qatools/postgresql-embedded.csv index 65e82e5219..90a1b578a8 100644 --- a/results/combined/merges_tested/yandex-qatools/postgresql-embedded.csv +++ b/results/combined/merges_tested/yandex-qatools/postgresql-embedded.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/70,ee78f139b59e3ca8a016ad361b96d95fc4440360,bd6f0c784969a4a641f0d0daf5ec8e1f6cc5efef,db9596df0e2f7c0168d9f789a6b76c6f0fd2074f,,True,True,True,15,21,220,2,True,15,Tests_passed,79843f2d5bf1606ee8332c6424107715ecc282f10a209e8bd3aa8de443cda3f1,True,Tests_passed,d5e91f64e1972ea95773642726ebdf45345809a698f74c2e172d0612ee07150e,True,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,3e459ea88c093936a438a2bf1b5642ac89fabb2b85daa9bfab41428235f4f4e9,Merge_failed,f26331705ffe2224c9967f3ab4e6f5881d336def8899b091aab16a591d160850,Merge_failed,feff1ff4e5e125dd4100369c1aa285c5a69770782ad60029b36b38995ae6eb6b,Merge_failed,49743f65b5bae3ab307220d6891ecc9c74530d86cd8d0d27c32a27a239bfd4ae,Merge_failed,f26331705ffe2224c9967f3ab4e6f5881d336def8899b091aab16a591d160850,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,c8e737041606c52311ed9c406c7f01a078befe3fe06e0742aab478d64eaee906,Merge_failed,feff1ff4e5e125dd4100369c1aa285c5a69770782ad60029b36b38995ae6eb6b,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df 30,refs/remotes/origin/pull/82,a3c37f7112acccd27f2c75daa7c0414fa495845f,b07cc8784d865c964493bdf10d4180719cf2c825,c9281552120f7d0ffb2b5a487e4f4cdb4138fe19,,True,True,True,11,60,305,2,True,11,Tests_passed,ca95662991c6369583c4236a41049b9b1551eacd2beecd145668229f90d75304,True,Tests_passed,9e1fb8c13cd003c9648748e88fb969fab05fbc039dad492b0bc05fe8c3e05465,True,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,7dba4a92afb17ea3d8b9fbca44eba5f21a698c99fc60682b6a1857e217bfd121,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Tests_failed,24ab39477d327cf5f0f9ae824bb5a7d02ea1cdb17ec98e90a0aa54e3c0292cd5,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,858b8a296a72be5a6e0298fc8e5c0ab82c2c259d50647ab057bcf1f2d1e12efe,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7 31,refs/remotes/origin/pull/82,6e15a53c7ee51c0199c28d591a40e17521ba06ca,08e4e7806823ee4cc2822164907ea56a708b7a08,6355501812b37bd670fdf9cadbcdd3d49eb54d15,,True,True,True,17,79,339,6,True,18,Tests_passed,ae6e96bc8d654323e7fd5e2a66cef7693653d2e127ca6fbc626bc459cfc2e719,True,Tests_passed,56c7a068a4f25e17e02b84072b25da90cc6feb1dfe173a418f523b00b8b3260e,True,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,679c3f9adbb57eec273886c63ce6fce5808b5ed9b0b00a740410854bcec5dce1,Merge_failed,4638cf48ff1ea6489c8ea1d488299b956057329486874d0c673e1ddc9c72a8e1,Tests_failed,cde51843466c8c6cf90cf9ba32b3b585be971b754362b2aae291bee9fbb68527,Merge_failed,e9773cb68ae34eb454365545bbfe5e35f6010ce70a9200e515afcce8a71087a5,Merge_failed,4638cf48ff1ea6489c8ea1d488299b956057329486874d0c673e1ddc9c72a8e1,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,321ae04313578f90e3dfd5bed66fa1439b3234807f52fa5868462f41e20eba94,Tests_failed,cde51843466c8c6cf90cf9ba32b3b585be971b754362b2aae291bee9fbb68527,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46 diff --git a/results/combined/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv b/results/combined/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv index f74ca5ef80..d183da7fa3 100644 --- a/results/combined/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv +++ b/results/combined/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,8918c24485205f725d3938fd5907aa0720faa326,0d3d7acc84e7a0b7fa0f34e299d0e1bd0c556d43,c0a771fc9886b28fe7e92c52116288b9bb497466,,True,True,Tests_passed,54b6422a1a2bd07869251c311059e159d2e5a4a600a2aa489e5650c5896e2c0e,True,8,25,463,5,True,Tests_passed,93607cdae7043222253b7ba823c1181bb2ab10cf7d0500b5f3036a66eb31c120,True,8,True,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,5272e72c437ecee7ed05b509166b3e83733094c8f2deb28575ea902351d606e9,Merge_failed,44de1feb7b6bcd2d7f6f1f92926a852dd6855f041156bfb5c98d06f122a67c68,Merge_failed,f1b8576556485115ca7d9a137c418cb82f4a698a6891172b737716203f561368,Merge_failed,f1b8576556485115ca7d9a137c418cb82f4a698a6891172b737716203f561368,Merge_failed,44de1feb7b6bcd2d7f6f1f92926a852dd6855f041156bfb5c98d06f122a67c68,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,3567ebfc96c6553d37a4c5e9942703a30c32089c379b47347560f57dc6fe376f,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d 20,refs/remotes/origin/1.2,5bf2597661014520aa35d0746d813bc012422c8c,33e6486562edeec6be5e0a90c6e7c868bd94381b,618ea967aaf811d96411c1ae2d921593de57446a,,True,False,Tests_passed,3d0810c58349314c5d970dd2c552f45a4be8836cdb5e2ab031cb6b788856009c,True,3,5,10,3,True,Tests_passed,9b8fe86f95fecb955372aee2fab01b5e27f066ceda4c1ef385a90bd58cdd3849,True,3,True,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,9a4244f358a7427417fbb4a913c1380cb724db529f7e85f3094cd47b323818ab,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,003deaac3ed01e8d7dc15fd6ac8ee03bf9da6050f54bf3186a10513b6bed854d,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784 diff --git a/results/combined/merges_tested/yaphone/itchat4j.csv b/results/combined/merges_tested/yaphone/itchat4j.csv index 6c05d58478..11b669f907 100644 --- a/results/combined/merges_tested/yaphone/itchat4j.csv +++ b/results/combined/merges_tested/yaphone/itchat4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,2bc3e1ad9d4b8db1554dce5b5fe7eeb8f153d283,047fb40cf09b9e7405de324c4a213074da14aa06,5a0bac9db35f5a337647b39f463a9e6afaf02882,,True,True,True,22,100,904,9,True,22,Tests_passed,4f57a04c700f3ae4128ca777388c68e669e5ce15e90e20df5324aa2a2f1ef225,True,Tests_passed,030098d179a69da74beb6ec901748595497229404c31ab3c2776ed79073520cd,True,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,48d2975b98c17c67f81be34c3c3f735c292614630ed400b1d56b176e0ee4f824,Merge_failed,ccf51d5c7ad5d028ee062d670390943951a4cd0d953cbb8274c173bfc1043d33,Tests_failed,c367b204708b9042df4918a51a405d354f7f9feec8a2db9bf67564c6d591ad53,Merge_failed,6ad5ec660911b22fba559bd4e8de3c44ab2057ebfcc6ce9dac3860f53463939b,Merge_failed,ccf51d5c7ad5d028ee062d670390943951a4cd0d953cbb8274c173bfc1043d33,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,800a32c8eec5253f88a90a9aa9e32d1baa99026cf3905aab2bef85cab9d9ec5f,Tests_failed,c367b204708b9042df4918a51a405d354f7f9feec8a2db9bf67564c6d591ad53,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0 8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,True,8,26,294,9,True,16,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,True,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,True,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,60e126a60599e44309d3ff50c6008481b1e9c8ed0eccefe7f350eb3a71814fd6,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d 10,refs/heads/master,7dd2c08938241c7fcc70a5f06b671553effee26f,5112e9ea84705897fffbbc9b8cd7bf76340d0cc3,a9581d96dec89ea38bf6871d78327a2b1662e8a8,,True,True,True,18,77,568,3,True,19,Tests_passed,60294d667a39c523205d4a0a87937e1d2a21e5c9ccd82427b0cefad95b958eb9,True,Tests_passed,5ddb9cba2949c9731c6bf98ff57c1c5f8c0943dda8736c97e5ca3844d6e8e7ac,True,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Merge_failed,b6bda2de0572a1800e89bde0e95a983a5b08935e15849e2e977f4513d18149ae,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,470e3c71e1c90c64c8ca3f699e74f08f4591b48f79b24669cf1b3849e7b75612,Tests_failed,be5c0f1767770f3bdd877a0d0adf5776f3234a942764dc5a308154ac748bdbe9,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Merge_failed,b6bda2de0572a1800e89bde0e95a983a5b08935e15849e2e977f4513d18149ae,Tests_failed,470e3c71e1c90c64c8ca3f699e74f08f4591b48f79b24669cf1b3849e7b75612,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e diff --git a/results/combined/merges_tested/yegor256/rexsl.csv b/results/combined/merges_tested/yegor256/rexsl.csv index dd7263ab59..73a54b11b1 100644 --- a/results/combined/merges_tested/yegor256/rexsl.csv +++ b/results/combined/merges_tested/yegor256/rexsl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,0c8dac7b6c144a3f260a7ebcc1367f9b1efac767,caab13af375e8059b2bfcaeb1af74d0b167f5d56,3dd37ca97a34b46cbd1185d9ec78bc0484f86497,,True,True,True,123,174,1505,2,True,123,Tests_passed,efa53ab5735db2aa4dfa9eabd58f983054d92c643607d66a704557a122eff0d0,True,Tests_passed,0113baa9e2be37aba416881b8dc77c0b4e0d4a0d69322a9066c6f35fa2aecc15,True,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_failed,ed636813ff8dc0381591bc5434fd4e1d16874f5d0b0394e6bec571aabad722f0,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a diff --git a/results/combined/merges_tested/yegor256/xembly.csv b/results/combined/merges_tested/yegor256/xembly.csv index 676ded3c36..fd802b3a4f 100644 --- a/results/combined/merges_tested/yegor256/xembly.csv +++ b/results/combined/merges_tested/yegor256/xembly.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,e279293590e9d10fbd09353bd505e6f97a060c8d,f058e1333921e0446563e5da54b16fbc6552832d,35385af641c110c21c0b6af59835b9370a5d674b,,True,True,True,69,264,2406,3,True,69,Tests_passed,2ae3bb884a481812716afec81dd4f72536ed652da690448883864a80c18dec35,True,Tests_passed,94eb3887b406f32733b84e93944f71dcf3f36fd960c918b9180870b2c4f1f16c,True,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d diff --git a/results/combined/merges_tested/yfpeng/pengyifan-commons.csv b/results/combined/merges_tested/yfpeng/pengyifan-commons.csv index 7f009b66fa..a15b54d9b2 100644 --- a/results/combined/merges_tested/yfpeng/pengyifan-commons.csv +++ b/results/combined/merges_tested/yfpeng/pengyifan-commons.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b896ec045faaf724ad11e9be56250fead3826ca3,20a39e77627495e9e4b5c63f8d50542b20f92691,2bb2ef36d9a59a64326fd42606238550260309d8,,True,True,True,17,27,57,6,True,17,Tests_passed,0ef90fe962f6f9ec829a69ef98aa8d4b3f97536f276d0a3dce9f2389bc175403,True,Tests_passed,7ff8b6ecc8a183def870e63866b73294cfc759aa1f423f62327cdf79f7a3e4ab,True,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,084d106a794f685da928d22681f8931602e147d446f74f69bd777d5c24cde447,Tests_passed,665caad39ae88ebdd5f3c9be674cfb2a130238e197fd0c0dd2c79d25e44237e5,Tests_passed,3745429c5eaa345b70afa7d85b5a68f6b40afe2491cb43326a811bc9d40f93d3,Tests_failed,0f6afe5f2fb0699aa3571a5a962eb9a685267eed523d06b6082998a6bbad56c4,Tests_passed,665caad39ae88ebdd5f3c9be674cfb2a130238e197fd0c0dd2c79d25e44237e5,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,07772756a4e10016012081a419ac1e1630fc711377f1c86211832f221a3dc637,Tests_passed,3745429c5eaa345b70afa7d85b5a68f6b40afe2491cb43326a811bc9d40f93d3,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146 9,refs/heads/master,12b4284589d4f1e0461def2ab4b95e07f51ad9f6,495932109e40fc131106c796bcb3357b3549b286,8292eeb7786230f3b080ff8b29868eea46a0d6d0,,True,True,True,15,39,86,3,True,15,Tests_passed,e10885075e953e4c4f2f35796af07521e202243ee79b80079ba91b7fa0d8057e,True,Tests_passed,7c1e8134a2ec2052b46ea435402026f23d79db6dba164631bd53820ed1359cc0,True,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Merge_timedout,,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d diff --git a/results/combined/merges_tested/yfpeng/pengyifan-leetcode.csv b/results/combined/merges_tested/yfpeng/pengyifan-leetcode.csv index 0a149a077f..9530802433 100644 --- a/results/combined/merges_tested/yfpeng/pengyifan-leetcode.csv +++ b/results/combined/merges_tested/yfpeng/pengyifan-leetcode.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,bb9b165e9b6f5db5725394be827250f61e87b71a,307fe1c63dac2e5049efdf21a478ed577fe1ed66,79216680be9c17f819e516efb5c9dfd210dad720,,True,True,Tests_passed,7389c76b28bb8988108f02d3f429c9a276769fc94c3b5b47a4382b34d600ac87,True,13,15,334,2,True,Tests_passed,732cba39f762d73abe26fcf138efdb5d481f7589c86d81d831d0f4957a95da99,True,13,True,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,f4e97aae0be0b94aeaa440bc929d863e40d627c3b89dc4449bf29ebf88247f12,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Tests_failed,5fc08050b0aecaa0915a9369f0745dda6f451f9da36dffc1487af0b7b18fc25f,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,a1e561e0e5a53bbe5c1e80806ed869fb91310b89b463b863961aa1df839d0e53,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca diff --git a/results/combined/merges_tested/yinlou/mltk.csv b/results/combined/merges_tested/yinlou/mltk.csv index bf0465af3e..265172096e 100644 --- a/results/combined/merges_tested/yinlou/mltk.csv +++ b/results/combined/merges_tested/yinlou/mltk.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,aa8e5f1f4d99c36af8e66768ab191547ccedc4db,d3ecd70f387e0568ad24f699003559a11869fa80,e9aecefe38d2f9dc6f596fd0422a18605790895c,,True,True,True,15,36,530,143,True,151,Tests_passed,b7e3343811556dee4b7fcfba690bc197290d1da27fe5e6cb873b5d27aef86c56,True,Tests_passed,44006b0289c41adf62eede8d99552a8eb7358a193757eecf9d3d25068a46243f,True,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,b9d74d55aa377acf2de063cc8df0e88dc5075a3a5e1c0a69880b8a27e4baed64,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,1fea5342e9393c1ac6f98e48a83594d1317ddba4b5f80c7953e3156af7b882ca,Merge_failed,e49f92c70f3e660bac71f7bb0b9fb63f21cdb496d216aae16655f83e199a2045,Merge_failed,331fa3932314eec41c57319dbfe6604286601e5cf5bca2a8b2252650a39ecfc3,Merge_failed,5f4bfb9da2f45a759d09cec64dc21478bfc8867e36dbe1ef60e892687fbfe4b8,Merge_failed,e49f92c70f3e660bac71f7bb0b9fb63f21cdb496d216aae16655f83e199a2045,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,1fea5342e9393c1ac6f98e48a83594d1317ddba4b5f80c7953e3156af7b882ca,Merge_failed,bf1d305a6f0ef032267316fdc3e9a2b73fdcb0193dfe6a6d389316c8ec284c8e,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,b9d74d55aa377acf2de063cc8df0e88dc5075a3a5e1c0a69880b8a27e4baed64,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857 6,refs/heads/master,d8ba61b83ab596ce5a69819325449353409fe333,1e2122a2841cd7ebe466af889c6e69ff6361864d,2fad94a58127f000fdcb9674e1c9a4591e23fd09,,True,True,True,43,80,184,143,True,144,Tests_passed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,True,Tests_passed,dd3673f125e6e0e5f6681bd64cdfa150aaca6ecccb350eeb99cd597ba33682d2,True,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,1034c047b0d0605bda212c41dec63863dd9b110b2a96df63a89d8ea6d35d9028,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5 diff --git a/results/combined/merges_tested/yinwang0/rubysonar.csv b/results/combined/merges_tested/yinwang0/rubysonar.csv index 4da7cbd3b2..e833979ad7 100644 --- a/results/combined/merges_tested/yinwang0/rubysonar.csv +++ b/results/combined/merges_tested/yinwang0/rubysonar.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,ba5f907f21493bf5ba964075e0a86118f31eec65,9066c7fa26e0bd041e1ccc6a8c285560f4db5959,e1cbdd9beec38b27307a5bdb42bb1074ce285486,,True,True,True,62,261,3126,2,True,62,Tests_passed,daf542615ad8bcab9170a650d71008e1e0553adf3a8a82d240e140211aa743de,True,Tests_passed,7e094c29bee19c611285d26a1fed91563cc553cba68f9addca80e92c6b9b2dd5,True,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,a8e980c84309f94d9284d93ef5052847b0423b5182842c596873411f7f2f7010,Merge_failed,a0d89b5fce477d16514cf6644b6bee070195c42f9c6ddda75c2898e17d90ff2e,Merge_failed,e4d1865046c78387fe6ce808700cc09912db30f2a2e57f0f1b61805cae81af76,Merge_failed,d409a47339360a6160d237d5ddafb8d473a0b761564c9c9bf3b265489f4490fa,Merge_failed,a0d89b5fce477d16514cf6644b6bee070195c42f9c6ddda75c2898e17d90ff2e,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,1615ef65180370cd36d2f5cab9ed23aa2711b2cb68e9fdbff087c6f735a21ee7,Merge_failed,e4d1865046c78387fe6ce808700cc09912db30f2a2e57f0f1b61805cae81af76,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36 15,refs/heads/master,fe4005af961bdc19c4f47fd0d60dbea83278b782,b216073a1f42d7eca77a755a5ca50289a7138606,1f10f0ded03292220c69999e0577a96026569dc5,,True,True,True,35,222,1323,4,True,35,Tests_passed,738502cdf6141889aa60d232a8b2b18fc3864f82cad46ea9c1a5ea2370fb35b8,True,Tests_passed,2f8655afdab831f4045ae6d708c557be0de01a5fc7273ee4181a49ee634144e2,True,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,8a03a5db56d203fcff8d452dcea1142fcd33ad1a7ac5fd52571ec0df5994d0e4,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,1bd907e6d2991ac94e9c7e31203e84893631e1a0217e815942d7b67b6f261e33,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,c1ed7d37cdf7cb670516863274cc11adba961ffbb04479f2be7a94fee57ac598,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926 diff --git a/results/combined/merges_tested/ymnk/jsch-agent-proxy.csv b/results/combined/merges_tested/ymnk/jsch-agent-proxy.csv index debaf337b2..ab6701b659 100644 --- a/results/combined/merges_tested/ymnk/jsch-agent-proxy.csv +++ b/results/combined/merges_tested/ymnk/jsch-agent-proxy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,ea7c6959a2c0acdd8bc10e88adbe25d680351b08,be10f22b86225a1829a2ff4074580f1a0482a5af,65aad5306572127275605244d7c78ddd4eec411e,,True,True,True,14,26,457,7,True,17,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,True,Tests_passed,013b7e275f48162a1fe3124ad12f40989ddd9501122b42a9b5d73bb8433cc623,True,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,489caafaaf523258a81649b84d47ee6cc61a2a51a96dcfbc7319c8c65a363f09,Merge_failed,f5afc23553df2ce93db55d19dde2c04e256f899e870f5c555c61ba683fa3b6ba,Merge_failed,03078803ca8cdda4ce05b86950ed8dfb08431a71723a89b7f66e9793b8f434ad,Merge_failed,03078803ca8cdda4ce05b86950ed8dfb08431a71723a89b7f66e9793b8f434ad,Merge_failed,f5afc23553df2ce93db55d19dde2c04e256f899e870f5c555c61ba683fa3b6ba,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,150dae63af421d88cd4df312fc296f97d50b9f36f28a5f223b42e0b7b7bc2576,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3 7,refs/heads/master,be10f22b86225a1829a2ff4074580f1a0482a5af,939214e7588fdf67c6efddaf4ad33b869fbd8146,4dd2606f9629045e4fd93c424e706d40bfb73cb3,,True,True,True,8,10,233,5,True,10,Tests_passed,20e66fcda3a3c4469312b95fec33cc22fda7755a2892418a7e645c8ca90150b4,True,Tests_passed,4827da6cc889d3a053eb6d882d30754efff45091167de6f34709f88045fda768,True,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_failed,4db7da193569eeaa2f9f47b2b2a0c027ebdc6c795b20d0889a7fdefbfedcf8ea,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a diff --git a/results/combined/merges_tested/yubico/ykneo-openpgp.csv b/results/combined/merges_tested/yubico/ykneo-openpgp.csv index be74444711..764a3f3393 100644 --- a/results/combined/merges_tested/yubico/ykneo-openpgp.csv +++ b/results/combined/merges_tested/yubico/ykneo-openpgp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,df508d799167e2667bf3488214b6df53e5f647b3,998a7e0f1d376b8b0cdfbd4ae512c0aef227923c,3f5a582f98187b408aa67180a2224e041436d945,,True,False,True,5,25,236,3,True,5,Tests_passed,68482b384a81381b88328b4f324dfc1b16589007875c4434d72af0007d01b05e,True,Tests_passed,f98c3c7db67ba9142cff006db01c9e15d03dbc09e2324acae7bc311a2f4f0621,True,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,dddc955e04460ab1921f567c95f4167eb6994bb7fb40a133aabceb93fe1f4a77,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae 4,refs/heads/master,2766bd74444ce9ff9205bf215c0cd05757331503,021f572735c8bba4bdb7f58e59ae8fbf10aa8fbd,e99c8df1f2e1d0e9f9fbb99de8ecd1a198af22d3,,True,True,True,10,161,1307,3,True,10,Tests_passed,d59cdf31440f2b3f24a20c3a4eec402473dbeca7aaa6f5d1d64d7e2a3fa7b00b,True,Tests_passed,cbf859e666367e84d595d6c28a97673775f237aeea60c7f2f1ac17fe8b453c25,True,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,406feb02cc4aa74dbe2e2ef80bd384bf990606c3702dfa749f3e0c84a1ea918c,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,406feb02cc4aa74dbe2e2ef80bd384bf990606c3702dfa749f3e0c84a1ea918c,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07 5,refs/heads/master,b145a6bdbc0b2dcc49cb2955bd7977e949bde7e3,8add85e590fb4e36e9e29b4e971aa1dfd75367b5,4bc4947cc5c1c481d5968f58f54d69a23674f77b,,True,True,True,5,141,1083,3,True,5,Tests_passed,12c82574ffcdc024d16d1329e6633c9730a9196e845316855e611a4205624c56,True,Tests_passed,7eca057a902c3279229d8398672a7918a357a9da0d65fdd788c959114fa8840f,True,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,a4c7eb9bf88b082090519e92f1dba3363296e1e689420388a7903037f6929585,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,5d20bcb6ef223f831579ac47e5eaf58ce79b96c29ee830e5d5fa6335b49f3c8d,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,7e89bdc2e3129d727cac9b25083c786973814ae3e49b9546861c29098b64e81d,Tests_passed,f42692973d6eb21969ad4a2145b80319563bbecf85453ec635389f409802b20f,Tests_passed,c091b66c3729d13b13c741b83410507420669a78ed7ed56cae5a970c15aaba92,Tests_passed,c8e748ce875c8f1190862a9ab0aee6afd6fbe1e3aa46b5fd647db549751a26dc,Tests_passed,f42692973d6eb21969ad4a2145b80319563bbecf85453ec635389f409802b20f,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,5d20bcb6ef223f831579ac47e5eaf58ce79b96c29ee830e5d5fa6335b49f3c8d,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,9dda205379f56aa2b1eaad110051b2386cafa782dfc4e74fb19ff97a3820e9ef,Tests_passed,c091b66c3729d13b13c741b83410507420669a78ed7ed56cae5a970c15aaba92,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,a4c7eb9bf88b082090519e92f1dba3363296e1e689420388a7903037f6929585,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5 diff --git a/results/combined/merges_tested/zalando/java-sproc-wrapper.csv b/results/combined/merges_tested/zalando/java-sproc-wrapper.csv index 6d4e901e1d..c67965a83e 100644 --- a/results/combined/merges_tested/zalando/java-sproc-wrapper.csv +++ b/results/combined/merges_tested/zalando/java-sproc-wrapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,d748054093c85a1696a2acd4b5183d47da342f4f,f4be887e89736120593dec1076df7e7f4032ebd4,bf69bdb95870794d0419e564ca5af1073ec1afcb,,True,True,True,27,60,254,2,True,27,Tests_passed,1427d00dafdcb90797233a1c08a8622d648fd043547efcc06b9f896183ce2a1b,True,Tests_passed,648be499fbd7eaaeb5eaf523af3e664e8bccb536fae3927d8b7979193ec47859,True,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_failed,a9ee9a2ec46030784c43e4c8d50863c05442b66821bec6cbf409215a760fd3c6,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d diff --git a/results/combined/merges_tested/zauberlabs/gnip4j.csv b/results/combined/merges_tested/zauberlabs/gnip4j.csv index 1966b92af0..9f5a0b8f3f 100644 --- a/results/combined/merges_tested/zauberlabs/gnip4j.csv +++ b/results/combined/merges_tested/zauberlabs/gnip4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 39,refs/remotes/origin/pull/60,d35413b32de39d510c4e83135bd19d0cde193cb5,8a565c2b37d45cde9afc9cad81792bc487885e17,dd812c3d70cfc1d1c38f7880ce6a60f67b7649ff,,True,True,Tests_passed,4d6e1c007ac90b5747bd6ca343549ecf0593674cee7aecd88576b950b8626011,True,38,82,232.0,3,True,Tests_passed,1b1d7d2e30d2950d052ed3cd0e8410aef64481566968c1eb29f8615fca02ac6e,True,38,True,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0228ecf40c74513b11087fcc171c0c0ab3a8f4842db29ca84850db7f63fb5786,Merge_failed,80b6e47c20a5849aec20e359ae614c2daa6c51f7a4daa8a98f41662e4e3ac5da,Merge_failed,153ec9ada2eeeaf09731b314ede439773244daea9fb2668460558a53cda05765,Merge_failed,7e81dcd298ed837ff66b66dadfd7f1227a88621d67f694f45dd4fa44dacb41bf,Merge_failed,80b6e47c20a5849aec20e359ae614c2daa6c51f7a4daa8a98f41662e4e3ac5da,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,c25117d953d429d564d6f08f44b281f01d19dd24f467abe558f646c9406e28d7,Merge_failed,153ec9ada2eeeaf09731b314ede439773244daea9fb2668460558a53cda05765,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c 40,refs/remotes/origin/pull/61,88be680a758bd1873bbabef4cf0a70d52220d333,f83b201e645e716eedc4c3164078612d9d571274,a4661012e34163ba24fa216b5d252831a25e6546,,True,True,Tests_passed,32026961cc0cf7ef2360fb62d63d102b980828a121a33adb5eef06445cc53ad8,True,9,19,123.0,2,True,Tests_passed,41bcb0b98c3473869ebf9a04842abd4900e731b14db2f64dc3b4b854c2a34126,True,9,True,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,ad5cd52fa1a7a994b4f1a507c146c0efdbfe3d7412e2e21413e7cd3294b45e4b,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Tests_failed,f6de7d7464608998f6f3c5bee70f24426b859252c1e2d1f926587ae502f832fd,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,be35a284ad53b2d9e44ed23154039573076c74b8064e81e5d663ba2652bb352c,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552 diff --git a/results/combined/merges_tested/zenria/weed-fs-java-client.csv b/results/combined/merges_tested/zenria/weed-fs-java-client.csv index 56b9512d5f..e84ff3c81b 100644 --- a/results/combined/merges_tested/zenria/weed-fs-java-client.csv +++ b/results/combined/merges_tested/zenria/weed-fs-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,9cb89da92f92cc11798e83769c332241e6a70d47,dc03761289040c0875e3108602f290c8967277ed,b19e89ccdcf91b972a4160ae81456acf548282e2,,True,True,Tests_passed,00e8db58db1486806e1bef826b0fd5723fa6c8c8857c616603f9f3975953cd0d,True,5,13,77,2,True,Tests_passed,a3eca0cb6bb9c0c8a8fc7978b5ba76b2b80d8105804d55824eabb903c80cfa02,True,5,True,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_failed,2655b588e351a6d571f1e8735d8d35be9ec6bbff353973e3e4a2b8e2de98a8e4,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1 diff --git a/results/combined/merges_tested/zeromq/jeromq.csv b/results/combined/merges_tested/zeromq/jeromq.csv index 1808515fac..16d6a1921b 100644 --- a/results/combined/merges_tested/zeromq/jeromq.csv +++ b/results/combined/merges_tested/zeromq/jeromq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,82bbdf0b66f2ebaf8cd845c77dd4762b96982363,c424e02c02e5e8c86082b1de353664bbfd858716,f5c6ecd1da3feb49d3cd6f4dcd53c457b062e519,,True,True,True,6,17,50,2,True,6,Tests_passed,50ca1aa6fbfabbd1446bd4915e1fcbafd586bb322df2649d93a0649bee5281e9,True,Tests_passed,88af2617aeddca172e8c4087af3e2eff659b15cc2676c915a143040c9483f60e,True,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270 93,refs/heads/master,c529e392bc595c92c3b134c2b74df8e59d182e0d,dd079be1a78730359a872fc99f99c112cfac0fa6,8fb8f1b3f8884aa7381e76f03ab84f4536ca3f3e,,True,True,True,81,246,1006,3,True,81,Tests_passed,c0484d75d4defb1eaa5d1527d2d7cd67d7de6766c98e20bcbe018558c75d5c9c,True,Tests_passed,ecac356c79234ee2fa8ecf775d2a9a3261f3bd94b17aba7a1ba6918cdfcf95b3,True,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_failed,c02f17da7737db91604f73eb64da9fa08ad736b870c706c6cf14d761216a7eaf,Tests_failed,e52808549b1eb965049794ba21c2805a6befc112d1b8c7baed3f92fbf794f534,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_failed,c02f17da7737db91604f73eb64da9fa08ad736b870c706c6cf14d761216a7eaf,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519 143,refs/heads/master,15d7299ba8224f96a4874c41398520ed37696631,422e8617b6fb771778c7fe0cef7f224938106635,d89fa27eabf9b72fa6edcd1b48ae7f1a63b7963d,,True,False,True,3,14,60,3,True,3,Tests_passed,6a4b4a419eaa912024513c4a447ca6349fea4c70806b72f39a58f2ef63a7935e,True,Tests_passed,9b91c6d561666fc772171cae5322aba666f871a61e7a06572f47bb6c9930c64e,True,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,e27b26c2811faff4dbd8d98b64b16afe06ffa7a5e9b118182acc86b9cd0badf5,Merge_failed,edc2558eaf78a8530c3c90fcac8b57abd0a9ac3547d5371b46f390d4a4cd3758,Tests_passed,70929b82855d56fc316529d3492cbdc64cd9c4e1ee40fdb1788e0beacba51aa8,Tests_failed,170d2d05346525bc2d30d3f0cce9deb490ca97ece593adbd442f43d39961e804,Merge_failed,edc2558eaf78a8530c3c90fcac8b57abd0a9ac3547d5371b46f390d4a4cd3758,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,1b7327c7c635a26ca91dcd8593f801e51789ffa94b6c284fa2f46415e46444e2,Tests_passed,70929b82855d56fc316529d3492cbdc64cd9c4e1ee40fdb1788e0beacba51aa8,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2 diff --git a/results/combined/merges_tested/zeroturnaround/zt-zip.csv b/results/combined/merges_tested/zeroturnaround/zt-zip.csv index 9637109190..8e6d640f90 100644 --- a/results/combined/merges_tested/zeroturnaround/zt-zip.csv +++ b/results/combined/merges_tested/zeroturnaround/zt-zip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 51,refs/remotes/origin/drop-pre-jdk8-versions,ce0ab9ec996a81db498e43e0b8d1c104d5c0f479,e077c8e83048c78c0ac13ff04c22d4098a556a99,6933db74aacfc56f2452061e2360386570228a82,,True,True,Tests_passed,48a6dced5edd2be8368cb73d2b2018c9d987796d8ed4eb1ad643440a197e0810,True,27,92,1149,2,True,Tests_passed,1bffcf567ab88edab1e9c2117b20a6a3b427c0370e72ac0847e2c082d5196b4e,True,27,True,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,c2c96189346997b1ecb29e0c28f52a33bc106076b50f4b4d059288c80e309832,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,1468feb88cf2e0e4579dd002231bd0977e4b201932dc31739a920bb0c46ad0d2,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,9c2a0ef248022e4f7288ece0dd891b10ccc375492e66a7c15e29c738a858c2ef,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be diff --git a/results/combined/merges_tested/zextras/openzal.csv b/results/combined/merges_tested/zextras/openzal.csv index f5a92451eb..4fd141621b 100644 --- a/results/combined/merges_tested/zextras/openzal.csv +++ b/results/combined/merges_tested/zextras/openzal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 692,refs/remotes/origin/pull/245,31fd311a6e3a8491ecf72c7a6bf8f020aeae7a63,c62df2463b60f8a3b79e7416db8c36ccdee3095b,3a719c8f2950f3b4a4d77c57510fa8a1766ad099,,True,True,True,5,6,71,3,True,5,Tests_passed,a31de397b1eedb12cc7d0ddf0392369ac4cee402a23dffc3135e6e7480be8143,True,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,True,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,956f282fe6889b8a5094fa580c771b54fa9da4d08510b9f744ae4c8bb47da7e4,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,7ac826d71842c96c4357e01b9e5bce40b4332c827bb18aad39a5d3461b8b89d6,Merge_failed,1cb11174718b2b634a8d651578725f3616057cf06fd4863d94b2b12568c4eb05,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,5d8a6fa408fdfaad6b55d57ca3af9106ebf0cabec86562a3ce9e80f498153e29,Merge_failed,b32b603ddb69483e1c01d42fb082693d896e2ef47121da412a76149463b3100c,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181 693,refs/remotes/origin/pull/245,5ec31424d8383e1fac60e1ac381f7fec5a4483ef,7b4d095a9b98fcfbe9bef711dff792c21fba5593,62987f02bd374d6337fd9d01e32fed9aa3a98ffb,,True,True,True,31,41,3072,3,True,31,Tests_passed,6b0d99755da3b1b948ec2ee1c426b2a0f46bf48b56da92466e9d3fd1e700d622,True,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,True,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,1de5bd535c2583b7feb356bd06d0b3d126b97fcecff0865a9d35b032d104bc52,Merge_failed,97dbe3466720d48483d9dbb8e5a1f86d3115fa362f9f48b749ecdbd2e25f6d44,Merge_failed,d39ff1a20482bb3caa15dcdabd38e5071bf195a28a6ee07f679720b90f665049,Merge_failed,8d52a108ce91a04ab13c44ab8d17e913627d89e09732a4063ff8df0973cd08fa,Merge_failed,97dbe3466720d48483d9dbb8e5a1f86d3115fa362f9f48b749ecdbd2e25f6d44,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,acd5001576c1c8cc6458b3673cc216455334bf8d4cefb779ebcbb1b1db48a43b,Merge_failed,1638b57e1852462fde8c329aa77e3dca42312e02fe2809b2967a01607acdab35,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3 698,refs/remotes/origin/pull/252,6c8c2b2532f8912f8020337fd39683b2705216a3,9fc96d51546c8f46699b2663de38f2ac590cd369,2284ce50ec3dc190b7bd982e2e4861faeed9bc4e,,True,True,True,4,4,27,8,True,8,Tests_passed,d8706a06ad0e011136a0a8481956a204fabd226e468bbde46ed2779f324344e7,True,Tests_passed,18158f5a824fbb0e473477b27ead6bad376a7e333f3bc96a5dd918718a3d69e1,True,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,df11c86e19784b767fe0f3fbbf6c40dd66248073d56ceb3684945d22767c6b91,Merge_failed,9b456ad4e9f45f94ad44a0600ba7be51d8b2f190bed55989c73a7e71cc8dfc36,Merge_failed,5fc6c7c7066fc07a4ea09142c7e0547c914635e0a41725d4ebd9677b357fdec9,Merge_failed,ab929135166e197ecd116303a92dfaf3882cbdc8c31f6b84dc402039be678899,Merge_failed,9b456ad4e9f45f94ad44a0600ba7be51d8b2f190bed55989c73a7e71cc8dfc36,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,0ff8b2566a3a768619d99bbd7c259538faa6458fb705bf01b76bf3f462678483,Merge_failed,a22abbf8c25e2d4c8b09e46c44af6c1c4b410b09db808eaf15a131ed5edca8ee,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891 diff --git a/results/combined/merges_tested/zhegexiaohuozi/jsoupxpath.csv b/results/combined/merges_tested/zhegexiaohuozi/jsoupxpath.csv index 560df3fd0d..7da9a65d88 100644 --- a/results/combined/merges_tested/zhegexiaohuozi/jsoupxpath.csv +++ b/results/combined/merges_tested/zhegexiaohuozi/jsoupxpath.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,7bb89fc158257cd01fef2bf643314aaa8f2bf782,a5438e9e638b6593a77c41ddd175d7df6b5e23d5,639ea24ff9343207d50b749d4801a17158d15374,,True,True,True,4,6,43,3,True,4,Tests_passed,b88668cb21b8192c55948800c4e03633d6fd7417403eae3b04ba47e9cfc3e514,True,Tests_passed,ece76845511886797b5b611be08657b27f963f800cff4b03ef1cdb4b7a482c84,True,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,a75b66b96bdeb2ef73c2d72ddf53179ba6811cde8b649b29896d3c51d2ebb433,Merge_failed,e62fc3ac2e3609500befd559319d6f687b98c7988dff2ee04635f7cbbd0c1e6d,Merge_failed,501db65761d0a17f05590c934afd26f8cc65e431afa4d75ae8ddbd5316ae51db,Merge_failed,b8c7efd44380a56c9b0688c35c6e3039691ebc415e46d51f218a14ffbc66d998,Merge_failed,e62fc3ac2e3609500befd559319d6f687b98c7988dff2ee04635f7cbbd0c1e6d,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,7e89dfd328781538a916eac2bb5d5ebc506631bd3bc06d74c386f4ecaa77d8d1,Merge_failed,f95cbb76b03199e6323f9896ca229f4112a73143d0b63c82e6871b80bca8efe2,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e 13,refs/heads/master,2183475da7a4f5a050c6fc4532e1f13052826dde,4ad42a4a0203c7391f2cf3bb72c2c5f6e4203ae4,0f3909ae5d5ab0939b7efc62fa018a0472055713,,True,True,True,6,9,58,2,True,6,Tests_passed,890b00a3e005a713a0fbc72e5ed456b539291c1e90e440feb7577f923bb62091,True,Tests_passed,bd233b41fea7dd70fe2c4fcd3515c0dccf504d794824b8032896dbe0c70349f8,True,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5 48,refs/heads/master,b5b48646d4cb7d0cc7344fff98ae6572dd808d6e,ef652cd7e7db3243b83965732b7d3111ff70fc60,7cd6b3a9f1493f36faeeec307b468aa025b09609,,True,True,True,25,37,314,2,True,25,Tests_passed,6445f053c84538278194528303787261098f9db655f105b2f9b7259ab77b6127,True,Tests_passed,bd309886fd8ed4d74e02675581bbb18e3092206efef8f7ccb0ee2cf315278dbd,True,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,32a83f8ee11eb71ab380b9dce0174b21964367fea2af4fef3c41c89decd4a7ec,Tests_failed,381d0bcfe49c51d0458d3b2b27f7d47c82e6f615bde9ebfa8cce39e5401ecb2b,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,32a83f8ee11eb71ab380b9dce0174b21964367fea2af4fef3c41c89decd4a7ec,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee diff --git a/results/combined/merges_tested/zhongdj/lifecycle.csv b/results/combined/merges_tested/zhongdj/lifecycle.csv index 2fc6a0b259..4724169fc2 100644 --- a/results/combined/merges_tested/zhongdj/lifecycle.csv +++ b/results/combined/merges_tested/zhongdj/lifecycle.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,39a2a8f6f0a2ec3438245cb3df6adbcd827aef55,2a89e793fa9216d9929f1790e2387daad170e513,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,,True,True,True,14,111,816,2,True,14,Tests_passed,d6cb0caed4fd529b6fe9079b62b6a75cf9d759f29762006a5bf74d57ca2539d4,True,Tests_passed,c11f0de75f55061f7e4ddaa35725bc6a7f3ccef8de6019009cab885637dac8c7,True,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,3b47e1603e7183eaa1ec780bc3e623322b15e604970253131f9e1468261187d1,Merge_failed,789a5cbf303f3d1812eb538009337bc18190c528f82986d6f858ff9fa87a59fc,Merge_failed,45dbe72de046067f8601abd705760bf28751795c1cad165ba26f6195bef6df23,Tests_failed,7c321aff906007286c5a06cfd96871dd291decc3c9d4e4ba895cf16a00f0014d,Merge_failed,789a5cbf303f3d1812eb538009337bc18190c528f82986d6f858ff9fa87a59fc,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,115f10a3024d6bc71ef32594eda0df38e4ac9fcea6ffae26e7f3606e329f0526,Merge_failed,45dbe72de046067f8601abd705760bf28751795c1cad165ba26f6195bef6df23,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c 2,refs/heads/master,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,de6837afbb460ae88d2aa2d580826df2933b151e,9fd474cd1551609c8d62449c15d40b3f40d03454,,True,True,True,42,214,2511,5,True,42,Tests_passed,b5a291465d69b1aad03f86c46bebc956dffa1380541490030d96e308a45213f2,True,Tests_passed,30e7d005cf53167db338ccd86721317803a435af87bee95e9cdc45650dfafed3,True,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,aa8ad9d0755398357318e1f9375172d90dd094f1024b9669189a61f00d54bd2f,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,024f97036a5eac7e7855040f83ec7ec34ea4a2c1b8983f041cb627938ab4afbc,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,50785ebe8c366aa38188f860e5480cb2ea6038ae7023c67816e610a177b5170d,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d diff --git a/results/combined/merges_tested/zhuowei/raspberryjuice.csv b/results/combined/merges_tested/zhuowei/raspberryjuice.csv index 20e1adc9cc..ae40869ca4 100644 --- a/results/combined/merges_tested/zhuowei/raspberryjuice.csv +++ b/results/combined/merges_tested/zhuowei/raspberryjuice.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2ee0eb700df6b7c0d9ece3beb40e89b3306bfd81,1962a461f098fe9c1c2b84483e6aa86780934187,944d0578784893e80ebd85fcf4ea5ec2b51deeb4,,True,True,True,19,62,795,3,True,19,Tests_passed,89ac769156dd3b424e963ac2ac4a9140ebc78f71e4688bc357d61841996928b7,True,Tests_passed,8c549fcbbf5c095490917a6909da5b4e0c54700b3d17e5225995b2c10114ac18,True,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0 9,refs/heads/master,8c537ab867b5f88945fb3985e05598c96efa70a8,28df7a5c2743b7fa8b43d378be49c84b82e11bfe,4deb15c845662e28d973c26b74650cf092dc0d73,,True,True,True,16,66,1251,3,True,16,Tests_passed,1f15ab56b8db882480879fcda00ab6124c0ac91b92a370509a6ec717d6a2869d,True,Tests_passed,7b3188e3707659936f9b50fc17325e158370b317d6d75506754894b8a7492ad7,True,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_failed,43bfc35a7e4a19e69085247a0446405e67d1aec21102bf5139c602a4c3afd6c8,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce 12,refs/heads/master,b217e89f5d8ef404aff86b5d889027bb386a598c,79c1ae06ef97468fb5ab0ef2c31ae911ac0d733f,74342eabbf58aa6c45805deabf068b83f606db27,,True,True,True,8,17,333,3,True,8,Tests_passed,dabb6717f5d824b1a6f8de88c79cc88dd86f3e2578f800e54d05c5bdee3aa39b,True,Tests_passed,a862efbf621470af6051024e5d5d818ea366bdd4401195d8b135d58471254dd3,True,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,dba482011d4b358a5aaecbbd691879621886a605a2fa69070bee01755ad251b4,Merge_failed,1b392bd20cbea20697531562b0c771f3863d15b8d8b62fc751f60a6df1de60ec,Tests_passed,1c810c44dc7051f56cc39ef19941dc9d7f2fb159423984411d8c8a7ae5da71ce,Tests_failed,7e23dc279d0c7d5c3ea5b4afb98135d0163c338015f1d92f909e78137d1d008c,Merge_failed,1b392bd20cbea20697531562b0c771f3863d15b8d8b62fc751f60a6df1de60ec,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0cd10fffbc054b0873b166198486c7b00d4393d993cecfb5398172c7a462dd09,Tests_passed,1c810c44dc7051f56cc39ef19941dc9d7f2fb159423984411d8c8a7ae5da71ce,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869 diff --git a/results/combined/merges_tested/zsoltfabok/dojo.exercises.csv b/results/combined/merges_tested/zsoltfabok/dojo.exercises.csv index 5cec5dfbc3..8511ff990f 100644 --- a/results/combined/merges_tested/zsoltfabok/dojo.exercises.csv +++ b/results/combined/merges_tested/zsoltfabok/dojo.exercises.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/heikkij,908be82a20bb82045861412089b7c7e409807de8,ae5e0ab1b02da13f7429822e9a1290bc065942bf,c3e18a0c82c7bbb1c7fa220d3d7a1701e9e1721f,,True,True,True,36,12,322,3,True,36,Tests_passed,e0d3707e4773af6228eddf33210cf51aa841f06a32579ddedcf43dc84357e72d,True,Tests_passed,7941519e8a53fd2f295b6a311a74cc0ada1997d9d148ca1929e59ea415e880a0,True,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15 diff --git a/results/combined/merges_tested/zxing/zxing.csv b/results/combined/merges_tested/zxing/zxing.csv index 6a076d6efe..443ea8cce5 100644 --- a/results/combined/merges_tested/zxing/zxing.csv +++ b/results/combined/merges_tested/zxing/zxing.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 87,refs/remotes/origin/pull/1411,e3130cc10e7b16cbcaeb61545f8a65ed12e60be9,aa1e0fcd8874fb7481c774809c79d2b045110271,b94349949a9d62d79135d2f5140b70d355cfbcfe,,True,True,True,839,4944,19794,5,True,839,Tests_passed,b0fffe935db6b288c70d52f81c93f74b613ddc77093a2be799623d6316d6ac96,True,Tests_passed,2e8eddbde5694e567cfc27c0fd966f2964910c07034a4bb7aa8383824baad60f,True,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,5b5ebad3e886e142e323631654040997d1dddaa02290008904107e6853e40b79,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,218a2eeaad3eea8beaff8034d7a34209a09f81bb476c8f8cab12601c6b141779,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,b556a013cf58c4b1bff5ed009feea76d30260b3fd0934bca1830d38e2ac09a2d,Tests_failed,47aade3af941e1fdcfc17c0d5b625a814bcaacd98fb2964a61060ddcc76211bc,Merge_failed,eb5c3e72e24c2d6f275d427359738ac1024089fe2f83d17a44daed13bd144f48,Merge_timedout,,Tests_failed,47aade3af941e1fdcfc17c0d5b625a814bcaacd98fb2964a61060ddcc76211bc,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,218a2eeaad3eea8beaff8034d7a34209a09f81bb476c8f8cab12601c6b141779,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,2c6195f6c506136be2a8a8ff83b5e9b2490b1debee057eae79198ad4286c41bb,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,5b5ebad3e886e142e323631654040997d1dddaa02290008904107e6853e40b79,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d 89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,True,75,188,3079,4,True,75,Tests_passed,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,True,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,True,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,93ff26f89efaf105b841b1709c3fb23a0cf238eed69f6dba060e2eff13ea965a,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Tests_failed,3d16d83380785522c9388650e790ed040d8b94b460b58f70f6524ca71417371e,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,244ea54eff03da5fb6b937150c56973dbc9573be093e8eaf118051112efb68f1,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363 90,refs/remotes/origin/pull/1446,620898d7d57a06972d8b31f61d58a4b25801ab55,153a4da399b03c00af6879e7e78bb6856832abdb,7a760c6384360a54d1a042133fc7c2805eaf3de9,,True,True,True,77,195,3277,3,True,77,Tests_passed,00a8401df9a8d7e0c398df594cf2abbde15bf5e6d4a8e608083c6eb9a5c93eeb,True,Tests_passed,c185b1e274b5f26be92739c0ca7aaa8280d9f1c986744fd4a800f3dc5624d8e1,True,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,1cbd4a8cc554eb47ea0b12994f5ed78bf561de564431096c454d2287a24fdef4,Merge_failed,a52f2dc3e984d96b80b799170ddb77342948bef2dd4f2c8234f1d972acf4879a,Merge_failed,9e15ecc086ddcd6d386ccf17592c59cf4b3374d081d597fd00cc15f2801fe62d,Merge_failed,9e15ecc086ddcd6d386ccf17592c59cf4b3374d081d597fd00cc15f2801fe62d,Merge_failed,a52f2dc3e984d96b80b799170ddb77342948bef2dd4f2c8234f1d972acf4879a,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,090aecf8af52b7dbf3d07fb75273d4d96b4805354a38116828cb1c116613d238,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd diff --git a/results/combined/merges_timed/47deg/firebrand.csv b/results/combined/merges_timed/47deg/firebrand.csv index f20e9e59c3..a5104bab18 100644 --- a/results/combined/merges_timed/47deg/firebrand.csv +++ b/results/combined/merges_timed/47deg/firebrand.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,True,13,31,147,2,True,13,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,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,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,0.012896537780761719,0.013041973114013672,0.014720678329467773,0.015104532241821289,0.015526533126831055,0.014889001846313477,0.015382051467895508,0.04253840446472168,0.07213640213012695,1.2309420108795166,0.5644748210906982,0.07754325866699219,0.12992358207702637,0.04659843444824219,0.0484769344329834,0.04899191856384277,0.04924774169921875,0.04807639122009277,0.08270263671875,1.1220703125,0.04463315010070801,0.04720592498779297,0.03627824783325195,0.047174692153930664,0.03620791435241699 diff --git a/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv b/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv index 98d300d6ab..73137c5610 100644 --- a/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv +++ b/results/combined/merges_timed/9apps/elasticsearch-cloudwatch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,True,False,Tests_passed,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,True,2,3,4,2,True,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,True,2,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,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,0.04126715660095215,0.043260812759399414,0.035515785217285156,0.041515350341796875,0.03974151611328125,0.04084277153015137,0.04258370399475098,0.15624451637268066,0.11542272567749023,1.0952305793762207,0.32166218757629395,0.0695505142211914,0.12148332595825195,0.03601694107055664,0.03682351112365723,0.03695225715637207,0.03709292411804199,0.03700518608093262,0.06767559051513672,1.060786485671997,0.0372014045715332,0.037702322006225586,0.02627396583557129,0.03679966926574707,0.026355981826782227 diff --git a/results/combined/merges_timed/ab0oo/javaprslib.csv b/results/combined/merges_timed/ab0oo/javaprslib.csv index 92148395ea..87a6a8a897 100644 --- a/results/combined/merges_timed/ab0oo/javaprslib.csv +++ b/results/combined/merges_timed/ab0oo/javaprslib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,,True,33,128,,13,True,38,Tests_passed,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,True,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,True,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,c1005244cea23c90b85f9ed83eacf23dd49eb4e3eb00850a7e7004672e125956,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,ef011810a94c8b74e909aac656c472c7479df2e338df82b87555a632af804902,Merge_failed,9df6aedb4433679f03a8ea6d87b32c6504aea4e5e25b1ba0b7c3bd02929743f4,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,0.06235551834106445,0.04878687858581543,0.06207394599914551,0.05366110801696777,0.048295021057128906,0.04230785369873047,0.05101799964904785,0.5498142242431641,0.4436039924621582,3.4207303524017334,0.6280825138092041,0.2522876262664795,0.15952110290527344,0.08056950569152832,0.07920050621032715,0.07949495315551758,0.07960200309753418,0.07943892478942871,0.21041631698608398,3.3321597576141357,0.08015227317810059,0.07862210273742676,0.05574846267700195,0.0783543586730957,0.05563020706176758 diff --git a/results/combined/merges_timed/abel533/echarts.csv b/results/combined/merges_timed/abel533/echarts.csv index 219e472704..a3edad95ab 100644 --- a/results/combined/merges_timed/abel533/echarts.csv +++ b/results/combined/merges_timed/abel533/echarts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,True,45,49,425,6,True,46,Tests_passed,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,True,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,True,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,907b1bcbd6c0530192451b5a6b3f6bcad63bbd66a493b72d3c22694852f4b5bf,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,69c908a14a0241ffcb5d5a451ed075adda2c56b1ec128e36754dd91353e3a1f2,Merge_failed,a1fabae4541d4a40110c0e590d4efb3d5969787a75f2270e1ecb357a830d0150,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,0.058470726013183594,0.05220508575439453,0.05234074592590332,0.01652383804321289,0.04126787185668945,0.058524370193481445,0.0620577335357666,0.37039971351623535,0.29036879539489746,1.5497477054595947,0.6489584445953369,0.17628216743469238,0.14480042457580566,0.062211036682128906,0.06273818016052246,0.06314921379089355,0.08604311943054199,0.06252884864807129,0.14731860160827637,1.5588772296905518,0.06405329704284668,0.06177210807800293,0.039960622787475586,0.0629122257232666,0.03879594802856445 diff --git a/results/combined/merges_timed/acciente/oacc-core.csv b/results/combined/merges_timed/acciente/oacc-core.csv index 18a537daaa..5074575fa8 100644 --- a/results/combined/merges_timed/acciente/oacc-core.csv +++ b/results/combined/merges_timed/acciente/oacc-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,True,214,296,1066,18,True,215,Tests_passed,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,True,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,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,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,0ad53a1530f8a34063dbd30466d149f7910e477ea05235886981b3b336b9fda5,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,0.050095558166503906,0.051225900650024414,0.06375885009765625,0.0576019287109375,0.05429577827453613,0.06433653831481934,0.0503392219543457,1.1793642044067383,0.9874467849731445,15.49375867843628,4.254236936569214,0.6208357810974121,0.32311511039733887,0.20580077171325684,0.2223498821258545,0.21094346046447754,0.20750045776367188,0.21061420440673828,0.6450910568237305,14.62095046043396,0.19781851768493652,0.20143842697143555,0.09458255767822266,0.19623136520385742,0.09511995315551758 diff --git a/results/combined/merges_timed/accla/d4m_api_java.csv b/results/combined/merges_timed/accla/d4m_api_java.csv index f4674dabb8..1be32afc54 100644 --- a/results/combined/merges_timed/accla/d4m_api_java.csv +++ b/results/combined/merges_timed/accla/d4m_api_java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,3d17b93fcaca70344f20d3adcd3bcb71b71ab097,dcd1e6bfeb129f5e5ca5c693082f255b47953e71,ffa103b362d32bf79911c413e0b290954a212577,,True,True,True,27,84,260,3,True,27,Tests_passed,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,True,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,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,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,b598962e1fd11802906787f69a7c036a879fdc16b1fcf9b9a402ec6614619373,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,0.048334598541259766,0.03995060920715332,0.047515869140625,0.015685081481933594,0.03248739242553711,0.05497384071350098,0.04095602035522461,0.1878986358642578,0.13338041305541992,3.1145060062408447,1.1394643783569336,0.18913483619689941,0.21742796897888184,0.21951937675476074,0.22431707382202148,0.22628164291381836,0.2277669906616211,0.22794079780578613,0.28296375274658203,3.0814931392669678,0.04998445510864258,0.22759056091308594,0.25402164459228516,0.19948530197143555,0.25374555587768555 diff --git a/results/combined/merges_timed/adamd/z.csv b/results/combined/merges_timed/adamd/z.csv index c2beed1c66..a9c3be9bf5 100644 --- a/results/combined/merges_timed/adamd/z.csv +++ b/results/combined/merges_timed/adamd/z.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,True,True,Tests_passed,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,True,19,71,1095,2,True,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,True,19,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,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,501c1d5967d59f0fb6ce694b4ea73cb0b831f431e603b88f8c8e5f4604c0a4bd,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,0.04894566535949707,0.032440900802612305,0.042497873306274414,0.040682077407836914,0.04343724250793457,0.0345759391784668,0.04829692840576172,0.1744997501373291,0.12603282928466797,2.02311372756958,0.6244802474975586,0.07886385917663574,0.12342286109924316,0.03988766670227051,0.04071855545043945,0.03954648971557617,0.04025125503540039,0.038388729095458984,0.07324004173278809,1.866750717163086,0.03828096389770508,0.038083553314208984,0.037473440170288086,0.0380396842956543,0.03824877738952637 diff --git a/results/combined/merges_timed/adangel/pmd.csv b/results/combined/merges_timed/adangel/pmd.csv index eabfa1fafc..e4f086fa53 100644 --- a/results/combined/merges_timed/adangel/pmd.csv +++ b/results/combined/merges_timed/adangel/pmd.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,True,True,True,436.0,1210,8471.0,3,True,436,Tests_passed,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,True,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,True,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b397d9858ce04ef6f080eef96ef54986de392de1a55dd54680660cc7c558110,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_timedout,,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b6e7c636f7601a8c6e5d7703b626b70b7dc8510783c36470b57de847ffddd31,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,0.059174299240112305,0.0492095947265625,0.061598777770996094,0.06244969367980957,0.07065439224243164,0.07184767723083496,0.06354117393493652,0.3733937740325928,0.17336368560791016,1.0058441162109375,-1.0,0.18217754364013672,0.19803977012634277,0.10521793365478516,0.1070709228515625,0.10737729072570801,0.10832881927490234,0.10465407371520996,0.1719684600830078,0.9919354915618896,0.09773516654968262,0.09721946716308594,0.0885930061340332,0.09921646118164062,0.09041523933410645 diff --git a/results/combined/merges_timed/addthis/meshy.csv b/results/combined/merges_timed/addthis/meshy.csv index eac40c94e4..8be7402ca9 100644 --- a/results/combined/merges_timed/addthis/meshy.csv +++ b/results/combined/merges_timed/addthis/meshy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,True,16,42,313,2,True,16,Tests_passed,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,True,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,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,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Tests_failed,ea332700fa1bedb43cd44d5a9367e6dffc6f15d75d2a8a6c117283c18f2d046d,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,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,0.01888275146484375,0.01868128776550293,0.023008108139038086,0.02333831787109375,0.023616313934326172,0.02317953109741211,0.023730993270874023,0.05086326599121094,0.07240724563598633,1.0570788383483887,0.5422835350036621,0.0953221321105957,0.15902471542358398,0.0655374526977539,0.06532764434814453,0.06453680992126465,0.06587362289428711,0.06335234642028809,0.1041557788848877,1.1451218128204346,0.06024503707885742,0.060067176818847656,0.052069902420043945,0.061769962310791016,0.05454063415527344 diff --git a/results/combined/merges_timed/addthis/stream-lib.csv b/results/combined/merges_timed/addthis/stream-lib.csv index e2f2cab137..acf58903f9 100644 --- a/results/combined/merges_timed/addthis/stream-lib.csv +++ b/results/combined/merges_timed/addthis/stream-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 83,refs/remotes/origin/pull/3,efd2e9109fb28ab7c4439d0cbd544de31b14c370,cbf6ced5ab8f1d937bd9b71d703a3aed92ed3bcc,87a0cde639eb0d7bd288942cec23e03ca05193ba,,True,True,True,25,127,1477,4,True,27,Tests_passed,2bdcd30693dbabdd1e8f9a98ebfc1a15ef63ae2275ff13d908e1660fd45e70b1,True,Tests_passed,6e3ab9557e76c728b79fd80513b734157b3fc184dc20163a195072574e828540,True,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,555f4683d4101904ed9ad425f9da055d43ecfd1cd733e4d148bb736109be10a1,Merge_failed,e39791edb5b80cdedc6778fe22d9c509ab4e643f7afc4b6cf49cdfcfd1238177,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,291862e1e8e2ebcd1475817a4ed815dea052423c51e72c3b63e7ecc46a4c5531,Merge_failed,80b94069a8b2394772642ccd89d2f6177ff8f1c25f2bbd8911fd8159ab612d01,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,Merge_failed,b85b80b9f66a62e922f77d0dda8402c44c5fddc93659ef2f10051739390708d4,0.04139542579650879,0.03820514678955078,0.0413060188293457,0.041778564453125,0.0441133975982666,0.03551530838012695,0.05505013465881348,0.1272902488708496,0.11559677124023438,0.6391665935516357,0.5595741271972656,0.10492539405822754,0.1646711826324463,0.061734914779663086,0.06064438819885254,0.06468462944030762,0.06328916549682617,0.060773372650146484,0.10353660583496094,0.6752612590789795,0.06047320365905762,0.06207275390625,0.06507492065429688,0.058470964431762695,0.06224656105041504 diff --git a/results/combined/merges_timed/adoptopenjdk/mjprof.csv b/results/combined/merges_timed/adoptopenjdk/mjprof.csv index 0bf8c185b4..3fc7c95ac5 100644 --- a/results/combined/merges_timed/adoptopenjdk/mjprof.csv +++ b/results/combined/merges_timed/adoptopenjdk/mjprof.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,754462e890ac29f2155ef2f60aeba253ad15ce76,4962f53609eea0aeef8b98fa156f0d8d12ced109,b53ee16a330b07ab9a9171da60c2919319542260,,True,True,True,44,134,1897,5,True,44,Tests_passed,5b9435e155856cdcbee1c87c1a2a84b98957fc6e9ffdc5bcfc0d512ec6cad1e7,True,Tests_passed,2b9f80aeff490dd0aba9103f23c5be1914eab72d338aa977739f57ec51c71cc5,True,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,62d9d6b1cb3d0a5516df5a5d0c2a35ff8c88c29768d81c546caf08eceb14eb13,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Tests_failed,7bb5087bd724eafa7d8aea7171c7bdda545a3b19e5f150d5b3140047d2a68a0c,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,b59b6de50e59aee634af8c13925e7b26112fbaa4c2d61cf66b0b2d168b87820b,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,0.04915285110473633,0.043497323989868164,0.04964947700500488,0.0445246696472168,0.051734209060668945,0.03849434852600098,0.05000710487365723,0.36870265007019043,0.2714059352874756,2.2204344272613525,0.6183292865753174,0.1753406524658203,0.14997172355651855,0.06325483322143555,0.06583905220031738,0.06613779067993164,0.0657193660736084,0.06590676307678223,0.153458833694458,2.397402048110962,0.06519794464111328,0.06718873977661133,0.04088187217712402,0.06684303283691406,0.04156994819641113 diff --git a/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv b/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv index 2c0413348c..fa42a2fdff 100644 --- a/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv +++ b/results/combined/merges_timed/aerogear/aerogear-crypto-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/master,4c895357e7aa06557e4ca3eae89f727c2c1534f5,592aac6c071772332a8f3f405fcc6d6c2b94fcb3,07beb7efc7bd0c3319076c9f14219f8392a39b7c,,True,True,True,9,21,75,2,True,9,Tests_passed,c63b54bfea1e25b29e519ebf48e0e4a7f834431446bc01f8a4fbf657a9917b2b,True,Tests_passed,8e399dc2b014f51497be382d63e2bef7b908ba4b122fd20dbf03847fac0aba46,True,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,0.04066610336303711,0.0356898307800293,0.049436092376708984,0.04321742057800293,0.04697704315185547,0.038055419921875,0.04082536697387695,0.16793203353881836,0.11169123649597168,0.5147333145141602,0.306011438369751,0.06867790222167969,0.12967395782470703,0.039357900619506836,0.039895057678222656,0.04025578498840332,0.03994917869567871,0.03995323181152344,0.07305908203125,0.5254068374633789,0.03894972801208496,0.03795504570007324,0.02885913848876953,0.039072513580322266,0.028562307357788086 diff --git a/results/combined/merges_timed/aerospike/aerospike-client-java.csv b/results/combined/merges_timed/aerospike/aerospike-client-java.csv index f94125fc63..f65f8bd854 100644 --- a/results/combined/merges_timed/aerospike/aerospike-client-java.csv +++ b/results/combined/merges_timed/aerospike/aerospike-client-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 66,refs/remotes/origin/proxy-stream-selection,94db6c183ad87d64bc7a89f731e55f65018ceea0,0df88d60943e223fb5842ed3292925c05f46e4a6,123bb510608100b0b51c51fb0d8b0f86d7628640,,True,True,Tests_passed,116d6520584868b62f4f7687e24e8dd133d7f90b5bdd1135564fdee82f46df0e,True,7,33,97,9,True,Tests_passed,af6222d6abee98f4a8744d2daf07fa3360d61c59321e0930640f1ab496b9f9c0,True,14,True,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,d6fa7cede56c5fbebb89fdf6e34c46ace5f6d8159cd5839021464a7163b7ad47,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Tests_failed,c9c12abc61fe491070fbdaa9ef4f0d740b05f4a2e3643fe26dd3071211f0d357,Merge_failed,d03d84d75b478a1d966a0fa830a8b13700c36f6314d4519b0349adec1df8f83d,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,ab1fec9101c2ee2a7fd8b4689eac2d6d7eb58bf5da07970607e79eaca0214471,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,d58af5729fbb83b3c7cd82f3a5a7ba3fadbc2d27b989cdd0c10e831a5ee77125,Merge_failed,df73568f22e587d0e55e24bc45c5921bf36fb63ff17927793a9bee89d10ef633,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,Merge_failed,1cdc5b22ed92a21458a8dfee178107c66c22114b94f5ff105eddba6e6b64b415,0.044617652893066406,0.04093766212463379,0.03664231300354004,0.044622182846069336,0.04131793975830078,0.04255843162536621,0.04135847091674805,0.18261218070983887,0.12122583389282227,0.629514217376709,0.8594145774841309,0.07409477233886719,0.11740446090698242,0.06825566291809082,0.03544783592224121,0.03487992286682129,0.03422141075134277,0.04207301139831543,0.09772968292236328,0.6453168392181396,0.03516650199890137,0.03503990173339844,0.034363508224487305,0.06356954574584961,0.03433394432067871 diff --git a/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv b/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv index b01058f053..7a011ae1ad 100644 --- a/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv +++ b/results/combined/merges_timed/afranken/jmeter-analysis-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,b5d8d8fc2b75beaa9fa6265208204639dc084991,a8efde4deeb7c6826c64e4e4656c99511ee5df11,7ce5946f318da235038f01f43c3566d8f34b3bc5,,True,True,Tests_passed,7b3c674776f4d8f8ab18c29f7e304225ace2138b54558f968612c557541dccfd,True,17,61,468,2,True,Tests_passed,5025ee670c84f99302eeaece879ea4b137795a40f904569bc0023892bc174d5d,True,17,True,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,0.025925159454345703,0.0280914306640625,0.02650761604309082,0.028182268142700195,0.029128313064575195,0.033614397048950195,0.02679157257080078,0.11139464378356934,0.10037803649902344,0.7550044059753418,0.5860507488250732,0.07901144027709961,0.13078022003173828,0.045044898986816406,0.04319953918457031,0.04500102996826172,0.04402470588684082,0.044008493423461914,0.07734465599060059,0.7258076667785645,0.04396414756774902,0.04271745681762695,0.03327536582946777,0.042910099029541016,0.03307628631591797 diff --git a/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv b/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv index ac3343a47a..e5b4add70f 100644 --- a/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv +++ b/results/combined/merges_timed/ahmetaa/zemberek-nlp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,dcf5bee7e969cb5716d5f3490e2ca5722690e318,837e0ae272fc50670019de5dcf6453b2207c2ee5,1796bb4a2081cedb2c82ca81a2205640e9de26bf,,True,False,True,3,25,79,2,True,3,Tests_passed,95ace073d911d2a7ae61404c02199f1fb81d116d47bd044a5460e18e2ff2b52e,True,Tests_passed,ed814382591eb25113a1995f80dee9b3ab804db58b06090d0e40e5b236180326,True,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_failed,a9c1989fb255328fd724775d5f055c9fb6ccfc9bb35177e4c97ddc605b53bf65,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,0.04303336143493652,0.04474186897277832,0.0574038028717041,0.05401277542114258,0.04700636863708496,0.05389547348022461,0.04616212844848633,0.1728227138519287,0.06926488876342773,0.9574501514434814,0.3625969886779785,0.07803916931152344,0.13907933235168457,0.04995560646057129,0.051430702209472656,0.04645252227783203,0.05092763900756836,0.04483222961425781,0.08705329895019531,0.939906120300293,0.0488438606262207,0.049173831939697266,0.03425121307373047,0.04893016815185547,0.03415727615356445 diff --git a/results/combined/merges_timed/ahome-it/lienzo-core.csv b/results/combined/merges_timed/ahome-it/lienzo-core.csv index ea311e723c..3b0d5c0c3a 100644 --- a/results/combined/merges_timed/ahome-it/lienzo-core.csv +++ b/results/combined/merges_timed/ahome-it/lienzo-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/2.0,bf4b253816bc316cd6dc5437f7ca25f35f591863,9c20b62e512757f686df15a748caa633ccf0cd88,c4be5cb68537dd419f2524786e41404f422ee8fb,,True,True,True,39,421,5543,2,True,39,Tests_passed,ce70921e19a3f1dffaa9a4963a8dcdddacf62da1c4e8cd21687762c526a66be6,True,Tests_passed,b07213c428a3ced1d96428b0b5994a5a8e6fae59332b29e48d1937e72f556e2f,True,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,0.04841494560241699,0.04838371276855469,0.04666256904602051,0.02518463134765625,0.06575679779052734,0.054121971130371094,0.06087636947631836,0.2000596523284912,0.1323394775390625,0.8441038131713867,4.581540822982788,0.12425112724304199,0.1526031494140625,0.05970597267150879,0.06053876876831055,0.08807253837585449,0.06004643440246582,0.05840182304382324,0.10103321075439453,0.8853127956390381,0.05817914009094238,0.05527520179748535,0.046357154846191406,0.0772104263305664,0.07068276405334473 diff --git a/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv b/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv index 611efdd1c4..5035359fed 100644 --- a/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv +++ b/results/combined/merges_timed/aleksandr-m/gitflow-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/remotes/origin/pull/126,21e89d1e201502c297cc8d03fae44c05bc51dfc4,98dd7f98f7ada6fbf3763e72a5c8498170ddab97,e5b220f1dff09d41d67719194b026555c620c592,,True,True,Tests_passed,429bb16fbb9c0e92ec28a971961e9100ff0eec66077fce7d1b811561d230582b,True,48,173,1191,3,True,Tests_passed,3691f73dc9c649ed52d230ac8d41ab2d3bfa5c0f997db0fa205fe13ca2f0d976,True,48,True,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,1faec877dbc5b7b05c524d7597f93607fede160a3a8f4f8a155f9ff15494db07,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,1d5606d138ff14b72de767d989e01c8cf55060c1a3ca5a5c009ed7e86512004e,Tests_failed,bd498566ddf39241b13a4ef13fcb9032bc17bf9642a307756d0986aff0af61b1,Merge_failed,1b77c8d8242d095cf523c6de06672a54bbcc6b7a710e5da359c045bcf9c0e9ae,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,e1c42a1782f525648fdbd102b5a72977b7381427a6bba74ef2a1a0d81004218b,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,Merge_failed,d40f5c7b0f353bc418fa303e1ba68c5e8c565993473d802f9c47213182c5f2e6,0.04816436767578125,0.05373859405517578,0.05527544021606445,0.05713939666748047,0.05809640884399414,0.04759621620178223,0.05447554588317871,0.2222135066986084,0.18268680572509766,0.035893917083740234,0.6096172332763672,0.11191463470458984,0.13296961784362793,0.05008578300476074,0.04955482482910156,0.050710201263427734,0.04640984535217285,0.05102825164794922,0.10001969337463379,0.06272697448730469,0.04918527603149414,0.047568321228027344,0.04971051216125488,0.04775881767272949,0.04815220832824707 diff --git a/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv b/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv index 30e5eb8683..b939db5306 100644 --- a/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv +++ b/results/combined/merges_timed/alesaudate/kickstart-springjerseyhibernate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,feb36bfc8ee3a9e0d4394ef8e845a97c8c489840,daf63b4a8f05792b6c0f530445dc9238b83ed136,f9c2d45541a4c000039e68f8f4cf23dec19efc8d,,True,,Tests_passed,829c333d86eab04b07bdb6004aff20a4904992aedaca3f8e2a60b1b86ef5b14a,True,15,40,,2,True,Tests_passed,52bd5a2eeca2dc99be68d4cc0639a7878f053159cb66dedff9a978108a9aa6ae,True,15,True,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,6fa4425a207d7a60fd6f4cf8191feac7ca4ec501ae4d64426766a7268aa7e207,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,26edef49b09c33360a2bc727f60a6c2147771e4b44de3eecb15528a30e6e7f32,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0e2b0ddd3ee3740b8ab6347c05c883bdb0a82bcfd2d9b5eb3f6246f2f5ad3262,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,0.008359432220458984,0.008524656295776367,0.00841379165649414,0.008128881454467773,0.008086919784545898,0.008294820785522461,0.00823211669921875,0.031957149505615234,0.06733465194702148,0.41270971298217773,0.42514848709106445,0.07677578926086426,0.11319208145141602,0.032802581787109375,0.0328371524810791,0.03309798240661621,0.03415536880493164,0.032782554626464844,0.06483340263366699,0.47101521492004395,0.03388643264770508,0.033768415451049805,0.032018184661865234,0.033376455307006836,0.03208208084106445 diff --git a/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv b/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv index 3d12227849..1f97c81b86 100644 --- a/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv +++ b/results/combined/merges_timed/alexcojocaru/elasticsearch-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 54,refs/heads/master,690d8dcc2e2b230c9aa4c5484f74ee56fd7ba029,56a03c07946d9e1137c25c34b561f269a85682b7,f9c65f30b453deaa676db4d2f40a43a61f237a16,,True,True,True,103,168,6423,4,True,103,Tests_passed,53fc56880a65ecfc2ddafcc027eb7040a993b64fdf36ca0154d26697fb8cb7b6,True,Tests_passed,f67be7c2def7ff51b5a974e2670e3afc7250b6f25a0daa39f159acbc3674f211,True,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,c89501900b6cbd0f1219843732848511f0ed9eb5f5e5233616047cfda61a9daf,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,8960a3dbaee15dd74a578c2c74375273c228fad8db78ac6a99e1688d59b709df,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,0.012655258178710938,0.012688636779785156,0.013115406036376953,0.01305842399597168,0.013622760772705078,0.01370096206665039,0.013699769973754883,0.051129817962646484,0.07194709777832031,0.01580023765563965,1.1894810199737549,0.09116601943969727,0.13595986366271973,0.05741429328918457,0.0566096305847168,0.057236433029174805,0.05835294723510742,0.05769801139831543,0.10539078712463379,0.06947064399719238,0.05584216117858887,0.05650043487548828,0.05259418487548828,0.05564284324645996,0.05364251136779785 diff --git a/results/combined/merges_timed/alexruiz/fest-util.csv b/results/combined/merges_timed/alexruiz/fest-util.csv index adc63f4f34..3ef87c22bd 100644 --- a/results/combined/merges_timed/alexruiz/fest-util.csv +++ b/results/combined/merges_timed/alexruiz/fest-util.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,3c3d01351f4149a749f8278423ca5d8112b18102,06f36741ee79cc5ed52de5ff4abd7ba2e676a40a,e95a95aac15a74c43627ec042c7a87bdb6852b9b,,True,True,True,19,83,452,2,True,19,Tests_passed,f9eca1f111e34587fdbf9e205daa8b08deb0dd575e934f26ac783e2561d1e199,True,Tests_passed,ca81b0f754f0d863f9395ed9304d5a041f5337275d61814628ccaa0719226661,True,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,3718cc6b0f38a1b20728c584984cb8f38a1f9419f841efc7035e3eb3dc67fc47,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,9473c23548c9422912b5e1fc1c2436a7692fd9efa67c23e788bfc0b3a780c3ae,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,9ee5dd5bd710b6ca9fc0e25e5520dda6455c946b92b9314f03d73ad511dc0a23,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,0.041092872619628906,0.04371070861816406,0.042133331298828125,0.03902173042297363,0.011235713958740234,0.036446332931518555,0.04188203811645508,0.17110371589660645,0.12440967559814453,0.5714268684387207,0.3770260810852051,0.08319735527038574,0.11625027656555176,0.03572654724121094,0.03550553321838379,0.03621077537536621,0.03604292869567871,0.03563666343688965,0.06788158416748047,0.5648777484893799,0.03574967384338379,0.03512215614318848,0.03425312042236328,0.035141706466674805,0.03373432159423828 diff --git a/results/combined/merges_timed/alexxiyang/shiro-redis.csv b/results/combined/merges_timed/alexxiyang/shiro-redis.csv index 30679caaa0..9f71084bd3 100644 --- a/results/combined/merges_timed/alexxiyang/shiro-redis.csv +++ b/results/combined/merges_timed/alexxiyang/shiro-redis.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,234a7ec09972609aaf89da8c78aa677add3c55ff,fd8a94fde3f6f4ca24d848ec013f71865ce9218d,ebd16b97867db297230fc5b3e5dd08c559144e6a,,True,True,Tests_passed,79ee8e9a29237c205e7ffdf1c7260b3c64450bde5940a840c0258afd36f51fae,True,16,101,1012,3,True,Tests_passed,d70087d389678cee0425fd419227cca89280f1c07fe7727fdaa2a1a55ef1b8f0,True,16,True,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,0.05762004852294922,0.04317760467529297,0.049735069274902344,0.06088876724243164,0.06081414222717285,0.04341006278991699,0.044286489486694336,0.2510559558868408,0.18559026718139648,1.3062961101531982,0.5916519165039062,0.11181139945983887,0.14487457275390625,0.055802345275878906,0.05463981628417969,0.05785489082336426,0.053902387619018555,0.05483078956604004,0.10925459861755371,1.3238873481750488,0.05375266075134277,0.05245375633239746,0.03820919990539551,0.05409669876098633,0.038062334060668945 diff --git a/results/combined/merges_timed/alibaba/canal.csv b/results/combined/merges_timed/alibaba/canal.csv index 1c16020989..047e7383f0 100644 --- a/results/combined/merges_timed/alibaba/canal.csv +++ b/results/combined/merges_timed/alibaba/canal.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 327,refs/heads/master,69a7e6d08380bf36b1c4d3e2febb91a9f87e9b55,a5d6c3b7478c882e24d3f891b006113685f75c9e,96454d4387695459236ed988c88a453c61334e5b,,True,True,True,7,15,48.0,2,True,7,Tests_passed,f1cddea9b809e8a8ed10df98f6997908631f8c89f548ac352c6e120638056645,True,Tests_passed,4fc2d7db2d9c3dbf2779cf476ad6158e653bad23cb5e4f67511c1d63b4319840,True,Tests_timedout,18a7344ba922d22413341c090248b69e3d20601501da1f213e70b5f5a0367014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.04437422752380371,0.04248237609863281,0.04226970672607422,0.0442352294921875,0.015264749526977539,0.037465810775756836,0.015923261642456055,0.18293309211730957,0.12026858329772949,1.124190330505371,0.5638904571533203,0.0809788703918457,0.14478135108947754,0.057115793228149414,0.09030961990356445,0.0880436897277832,0.0887446403503418,0.08868074417114258,0.13872408866882324,1.0652234554290771,0.04672694206237793,0.04542875289916992,0.03639340400695801,0.07463717460632324,0.06808209419250488 diff --git a/results/combined/merges_timed/alibaba/easyexcel.csv b/results/combined/merges_timed/alibaba/easyexcel.csv index 1ca27efab3..60e5918832 100644 --- a/results/combined/merges_timed/alibaba/easyexcel.csv +++ b/results/combined/merges_timed/alibaba/easyexcel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 285,refs/remotes/origin/pull/3015,832839a0296ee45e265ad920c48a5cbca050282c,ccdc73f2329cfe9c71f271b1f6bd6a99277bb658,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,True,160,784,4550,2,True,160,Tests_passed,97a7c8257ac7a0bc1e482f3dca29f5167778b894d6163fd26ae2d246a459f77b,True,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,True,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,9d44d947a727dc1bb6874f63bf1115fafe54a2d02941f81914c079f408a022fa,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Tests_failed,5bb4bddf6027d86cb8e4e2704376d001771a271e403399a9e360198d1df00060,Merge_failed,b7204eb29b60748055b65ca79d4b629b982f44a036f0d5641f58f317e048c5d0,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,b88f2ccd7ce777f4f9dfd0c95e59ff63f55bf58bcee082206a2f13960dc14186,Tests_passed,9238bd70ab886821a38275085f4acb97986138471f58c0ead9723a72d6440dfa,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,Merge_failed,540eb790fc5f90a340dde5e931136b5a4289a64e257b70746e0b166e71cc1a9f,0.025098800659179688,0.024544477462768555,0.026726245880126953,0.026868343353271484,0.027071714401245117,0.026689529418945312,0.027362346649169922,0.0856165885925293,0.08147931098937988,1.1937737464904785,3.2110533714294434,0.09441995620727539,0.14226007461547852,0.057419776916503906,0.056112051010131836,0.05771970748901367,0.05913114547729492,0.056409597396850586,0.09322714805603027,1.2236738204956055,0.0546877384185791,0.05552792549133301,0.056523799896240234,0.05773496627807617,0.05416679382324219 diff --git a/results/combined/merges_timed/allan-huang/remote-procedure-call.csv b/results/combined/merges_timed/allan-huang/remote-procedure-call.csv index e24a0db8fe..64b9c020da 100644 --- a/results/combined/merges_timed/allan-huang/remote-procedure-call.csv +++ b/results/combined/merges_timed/allan-huang/remote-procedure-call.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,True,True,True,14,46,139,2,True,14,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,True,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,True,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,0.009243249893188477,0.009147167205810547,0.009952545166015625,0.010413885116577148,0.010038614273071289,0.010265350341796875,0.010042667388916016,0.033628225326538086,0.010112762451171875,0.013350725173950195,0.3961646556854248,0.04410266876220703,0.12308239936828613,0.03885602951049805,0.03860116004943848,0.03906583786010742,0.038315773010253906,0.03816938400268555,0.06458878517150879,0.05098581314086914,0.03730034828186035,0.03654813766479492,0.030930757522583008,0.03730940818786621,0.02969503402709961 diff --git a/results/combined/merges_timed/allanbank/mongodb-async-driver.csv b/results/combined/merges_timed/allanbank/mongodb-async-driver.csv index f6dce52176..f227e15a56 100644 --- a/results/combined/merges_timed/allanbank/mongodb-async-driver.csv +++ b/results/combined/merges_timed/allanbank/mongodb-async-driver.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,81bedcbc10519b605deb41ef5b29ca78d17d4544,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,d60feb648a010c457b811122bde1eccd800dc3cf,,True,True,True,91,331,7744,4,True,91,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,True,Tests_passed,61800cedd2f345380aa7104c8c5df70b18762f4d942ae8fcf9527ebce00d6ee7,True,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,0.024473905563354492,0.12476921081542969,0.09948611259460449,0.15168237686157227,0.09874820709228516,0.15170955657958984,0.10056066513061523,0.14546489715576172,0.18889570236206055,2.9220919609069824,2.629531145095825,0.16626524925231934,0.19437336921691895,0.08864927291870117,0.09190034866333008,0.08821773529052734,0.08866381645202637,0.09027743339538574,0.1705927848815918,2.836998462677002,0.08406758308410645,0.08228039741516113,0.06288695335388184,0.09091377258300781,0.06083846092224121 diff --git a/results/combined/merges_timed/amplafi/htmlcleaner.csv b/results/combined/merges_timed/amplafi/htmlcleaner.csv index f67952333e..6adc2c740e 100644 --- a/results/combined/merges_timed/amplafi/htmlcleaner.csv +++ b/results/combined/merges_timed/amplafi/htmlcleaner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,5b1e2bd095894b31df3f14834a1d2df1da8bd203,70ed05ffd628822930987f1d43ca03ea2cd0881d,75a6251aac4918ccbbb59b52d5b85de3620bd3f6,,True,True,True,32,290,1968,2,True,32,Tests_passed,ca82ed754a52ebf432c9efa52fa4081a4310558a7b810a9fabd437157ada203b,True,Tests_passed,92d0ab5408293c8bdd89f456643bab91aa2fadde5626be494648cc103d31c3c2,True,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_failed,423fe0cc9c0c29df897059304f38fa22674adf39ad0c4e96c4a57f56a0fb271a,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,0.05621814727783203,0.07178449630737305,0.052436113357543945,0.06075692176818848,0.04867362976074219,0.04696011543273926,0.04081106185913086,0.1931743621826172,0.12928199768066406,1.2498857975006104,1.1974546909332275,0.08304023742675781,0.14274191856384277,0.05186629295349121,0.0573575496673584,0.05512189865112305,0.052951812744140625,0.054511308670043945,0.09471988677978516,1.235539436340332,0.05323386192321777,0.05161905288696289,0.04446268081665039,0.0550234317779541,0.041764259338378906 diff --git a/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv b/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv index 5d7b5136be..f112ee1a6d 100644 --- a/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv +++ b/results/combined/merges_timed/andreaskl/springboot-angular-atmosphere-quickstart.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,cadddbad17de1526cd54f53de4a0c633acb328e9,c5438560f54b525d3e1a8afb9fc4efbc6db9806c,ca84722195aac40f62ec2db5eed3eea4273a6ff8,,True,True,Tests_passed,afc2fb1335920e6cf399aaf2bddc8abb09b870393caefeccc2b2f792a343923e,True,16,42,4014,8,True,Tests_passed,681deceb3f1d91429c54cf81c807c924f7e374d6e2351e0aaf9c95a4d614ff95,True,16,True,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,e5573efae466ccc37ba93824f6ae7c87fa318908b9bcd9da0ca7683c4f3c1d93,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,1396adb50125b234604d4843012ded79f250975391afab4676df25472af57aa6,Merge_failed,aa769c067b9a1d5a4da3386fe8911ddbaa6bc622ca43e1d22919b83e71ce296f,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,a3468ed79e9f670af8607dcd657fcbb13f65a9e29161e4ca7a0c5d0581e641ba,Merge_failed,5b7faede93576782b5377b0768203f1933838b62f73ffa2d7ee85b41b7b2a4ed,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,0.009391546249389648,0.009483814239501953,0.00881505012512207,0.008926630020141602,0.008917808532714844,0.00906515121459961,0.00924539566040039,0.08899831771850586,0.23643279075622559,0.5392460823059082,0.37575197219848633,0.19397377967834473,0.15251469612121582,0.07279801368713379,0.07306647300720215,0.07278943061828613,0.07276535034179688,0.07390165328979492,0.17887330055236816,0.61191725730896,0.07345223426818848,0.07384872436523438,0.07358837127685547,0.0734550952911377,0.07260870933532715 diff --git a/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv b/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv index d26a8ecdde..0e1b5d8006 100644 --- a/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv +++ b/results/combined/merges_timed/andresoviedo/google-drive-ftp-adapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/remotes/origin/pull/45,7046a248be867a7bfadbd2c29fd9ef86c3cca54b,d0a2be254d0cac3cac7f989fa63614219ebee200,0193b2d43121b281e79b77bac820b46f6619de3c,,True,False,True,3,5,45,4,True,4,Tests_passed,ba31b3912bd8f0e88cc8896ab18c819ba2333f1b10d99c7cd38c3ca981213529,True,Tests_passed,247d93dc036dfbee14662705e443c88af623211c07b229f29d7a61c7de33d927,True,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,aadf2b6538766a44b8533fad3730cf113cb983564618533d1f942129f1364b29,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,0ceab100f5bc1fb0502923b0880f011e844f65f5ff4f8b01c55e69d9d5cf2c1a,Merge_failed,fa419cb44a7652398c4700fda6edb72273d7dedd818148845f73908b6b8de2b0,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,a124089abf6ac8f663cf7adff7f1b23bc0b96d8efc5a7ee9b7c631f57fe72def,Merge_failed,efd6ce716da6bdc3eedfaa591d18fbd4a1433c82d632a4d587274c014b9c5d7e,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,0.08356785774230957,0.03633999824523926,0.03760123252868652,0.09991264343261719,0.035610198974609375,0.10135698318481445,0.09868884086608887,0.2962057590484619,0.20772552490234375,0.613436222076416,0.3527991771697998,0.2355482578277588,0.12425065040588379,0.15058326721191406,0.15340709686279297,0.14993524551391602,0.15587663650512695,0.1505110263824463,0.21451497077941895,0.7508959770202637,0.13026022911071777,0.1349778175354004,0.15202784538269043,0.13879704475402832,0.15748262405395508 diff --git a/results/combined/merges_timed/andrewphorn/classicube-client.csv b/results/combined/merges_timed/andrewphorn/classicube-client.csv index 3eb08cdf2f..2161af02b8 100644 --- a/results/combined/merges_timed/andrewphorn/classicube-client.csv +++ b/results/combined/merges_timed/andrewphorn/classicube-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,cc32a2554eb5fac5492e7eaa7dcf1ca121b35012,84bf151168576bfa61dc0cee6bd09ced1f10b9f5,9f682a7ed6759e77374a0beb40e3182fd7cf7e83,,True,True,Tests_passed,857bf5f828f870e83eae7ce2249622e8b8a97d1dd242e4aeb75a75da30bb8e6b,True,20,32,166,2,True,Tests_passed,1dd16ab12f1a1f179b47341ec4b5ad6a6baefa51257f01a3e0ea3f2d3bf5b241,True,20,True,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_failed,17f21dd81baab93f2408b87df1948c8ad7471d1256d219a0f4ce06534b3c7099,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,0.0552675724029541,0.04412388801574707,0.04626107215881348,0.04636430740356445,0.06342291831970215,0.056456565856933594,0.05805253982543945,0.20055794715881348,0.11186337471008301,2.668989419937134,0.8294899463653564,0.10561180114746094,0.13667988777160645,0.07268214225769043,0.05016922950744629,0.07072830200195312,0.047696590423583984,0.07191991806030273,0.08568811416625977,2.517211675643921,0.06918883323669434,0.06766152381896973,0.03522086143493652,0.06736993789672852,0.03545403480529785 diff --git a/results/combined/merges_timed/andygibson/datafactory.csv b/results/combined/merges_timed/andygibson/datafactory.csv index 6a70fb4e12..b2cb978797 100644 --- a/results/combined/merges_timed/andygibson/datafactory.csv +++ b/results/combined/merges_timed/andygibson/datafactory.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,1d4a47b045ee2c13820416dd60773690f6093e62,9ce0ce8f79c37a97461cf79d032471b5183e0d34,11f6613d23702cf7280d66129478bcd917d561ab,,True,True,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,True,6,9,331,3,True,Tests_passed,e97a2256dfe1f376dfb6e7b30f61157af83de4f3295bffae65a5a3f51bb3880b,True,6,True,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,a332a8c1b78cae5b6c2cc929a757877f86e3386b3af40645d61b8044431da7e1,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Tests_failed,58b5d34278d52caba6cc75a593c7796db7cea203292308b1d1b7d68ebb45120c,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,7bae8c05b545c80d74e6eae6340604cf364c85cafebbf1fb8c9510774b465199,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,0.0393064022064209,0.0382235050201416,0.0402829647064209,0.04081583023071289,0.04092812538146973,0.03896450996398926,0.0423121452331543,0.22737479209899902,0.17236018180847168,1.4844064712524414,0.33509087562561035,0.0959784984588623,0.12006115913391113,0.03977847099304199,0.040895938873291016,0.04010796546936035,0.04053235054016113,0.040555477142333984,0.08733844757080078,1.4961471557617188,0.04124903678894043,0.04109787940979004,0.03292131423950195,0.04102897644042969,0.03236126899719238 diff --git a/results/combined/merges_timed/anjuke/hwi.csv b/results/combined/merges_timed/anjuke/hwi.csv index 06200da589..19d7e31d04 100644 --- a/results/combined/merges_timed/anjuke/hwi.csv +++ b/results/combined/merges_timed/anjuke/hwi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,94766cb0d37279e1842a9bff4769c366bf43e699,73c71cfc99f805ee178b5930e5d8a8adef6c3a1c,9340c5c00c8e261f1660113ef522e13229b39db1,,True,True,Tests_passed,5fd1fa7875970aae4d57cda371e1eae1cdbc124db213a7378d069062a7267607,True,7,34,193,2,True,Tests_passed,5e5a2dd5029029038841e7e40b11809075b3e6a536020abfce013374dcd5a817,True,7,True,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_failed,aec70c98dec34787e9a3f8e63ce283f201c288a5aa0cd79321be4fcb939464d7,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,0.011649370193481445,0.011630535125732422,0.013501644134521484,0.01334071159362793,0.014083147048950195,0.014062881469726562,0.014121055603027344,0.03943634033203125,0.06658172607421875,0.8354017734527588,0.340930700302124,0.08137321472167969,0.13786673545837402,0.04599809646606445,0.04788661003112793,0.04917025566101074,0.047469377517700195,0.04769587516784668,0.08353567123413086,0.8867244720458984,0.04674696922302246,0.04570603370666504,0.03504633903503418,0.04677462577819824,0.03402566909790039 diff --git a/results/combined/merges_timed/antlr/grammars-v4.csv b/results/combined/merges_timed/antlr/grammars-v4.csv index 5322041677..40b84ec5d8 100644 --- a/results/combined/merges_timed/antlr/grammars-v4.csv +++ b/results/combined/merges_timed/antlr/grammars-v4.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,True,5,41,157.0,3,True,5,Tests_passed,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,True,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,8d9cda6259bbb9199d7953d37747bccf7f81d986fb07464b5392f218c4341f40,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,0.06370854377746582,0.07728075981140137,0.09058952331542969,0.08777666091918945,0.07585310935974121,0.09036922454833984,0.06801939010620117,0.24136710166931152,0.20019221305847168,0.06107497215270996,0.36704516410827637,0.13332891464233398,0.1715381145477295,0.07582759857177734,0.0728292465209961,0.07446622848510742,0.07407379150390625,0.07750844955444336,0.14137911796569824,0.0867764949798584,0.07413101196289062,0.06926536560058594,0.05308842658996582,0.07190918922424316,0.055963993072509766 diff --git a/results/combined/merges_timed/apache/accumulo.csv b/results/combined/merges_timed/apache/accumulo.csv index 76f0e12595..53e19b4787 100644 --- a/results/combined/merges_timed/apache/accumulo.csv +++ b/results/combined/merges_timed/apache/accumulo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 66,refs/heads/main,ce3a886c1cf90ff764edd872159cf3c036ff182a,1415599a5b744df3f79d05f9cd49b4fe0e458c1b,1fd1f797ca70f043992fd90485c9dcb33641e928,,True,True,True,1012,7273,128524,2,True,1011,Tests_passed,21fca3ca9ee1354b5475c6e1033702af05e963b80a3b2c0dbdf8be99c25b811c,True,Tests_passed,745d863e7f0c6c4f8b5f0a6d6e0fef73da8c920dea5eb4c7ed2eb2bc574ef41b,True,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,05a6056efedf5074fd4e9095f4ee64d1aa44b26cc1e4644ece644e70a9561a41,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,a818912655d31e82d47d6c6469f8b3d1c59f95a27384885039c7158a45aa6db1,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,0.1207878589630127,0.12068510055541992,0.19636869430541992,0.1964702606201172,0.19556069374084473,0.1944572925567627,0.1965503692626953,0.2829322814941406,0.18050026893615723,0.1253185272216797,-1.0,0.3117833137512207,0.386091947555542,0.3125951290130615,0.31160521507263184,0.3108241558074951,0.31363844871520996,0.305178165435791,0.32648444175720215,0.30101609230041504,0.23418593406677246,0.2396836280822754,0.19887852668762207,0.23066043853759766,0.20895791053771973 diff --git a/results/combined/merges_timed/apache/avro.csv b/results/combined/merges_timed/apache/avro.csv index ab36ab98f2..d0c92690af 100644 --- a/results/combined/merges_timed/apache/avro.csv +++ b/results/combined/merges_timed/apache/avro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 55,refs/heads/main,c299da64ee53de57ea34e589b858d7fe8ada72fd,fd6c4228fbecc6eff3e3ecd5ee27d2ceb46339ff,57bea12e3a0860958b2060cab4f1193391584839,,True,,Tests_passed,fc9f0dd415a77e7ddd310c2a82e63988afcff970e9d2fec8964c376cf791db8f,True,374.0,488,,8,True,Tests_passed,dcc74ea3e9de72e816ade67ddc36b2ade7155232fd2539e5edd0a13345273875,True,380,True,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,a04291eda8f9bded4adece06dfa4c0c3bea0dc06b13be3d3328c829f528bc14a,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,ccbb6f579b792e1ff663b4151a39339017951cd1513d147981a48ea9d6c354f1,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,b3b1cd4fc59004192f6c12d4d7e3211102deda778814fde087951cbda4680f70,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,0.034218788146972656,0.027122020721435547,0.05997204780578613,0.05303215980529785,0.054755210876464844,0.06560945510864258,0.050069332122802734,0.2211301326751709,0.12684416770935059,1.2738161087036133,0.8964769840240479,0.10988855361938477,0.15875911712646484,0.07901215553283691,0.08113574981689453,0.07975149154663086,0.07703042030334473,0.07781076431274414,0.11176633834838867,1.2202904224395752,0.06701850891113281,0.06751823425292969,0.0579526424407959,0.06681370735168457,0.05962181091308594 diff --git a/results/combined/merges_timed/apache/cayenne.csv b/results/combined/merges_timed/apache/cayenne.csv index f5ea4368ec..e0fce566b9 100644 --- a/results/combined/merges_timed/apache/cayenne.csv +++ b/results/combined/merges_timed/apache/cayenne.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 22,refs/heads/master,40eed24a3ffad2197e216fef06227809c84c1e75,8725b265832a6c2d03ca5d866d5751cc1f35167f,ea1d6913bc80229783ec5842ec50b4b5252e322a,,True,True,True,8,22,55,2,True,8,Tests_passed,ca8ba6a6a4b949254d71541d85b75399eb829fe655fbd8dfe977867e3b9eda70,True,Tests_passed,1e31891107170cffd80248e6c4ad4ec32bb012e8c6594b7d971c04397c2a05e8,True,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,0.08471107482910156,0.09049034118652344,0.09269452095031738,0.0782012939453125,0.09391093254089355,0.09704351425170898,0.09974336624145508,0.21252989768981934,0.1510906219482422,1.2483057975769043,0.6258819103240967,0.10981059074401855,0.17415475845336914,0.07775259017944336,0.07850813865661621,0.07786083221435547,0.07718873023986816,0.07512545585632324,0.13064956665039062,1.168947696685791,0.07055473327636719,0.07227754592895508,0.05851340293884277,0.07026314735412598,0.06168818473815918 diff --git a/results/combined/merges_timed/apache/commons-bcel.csv b/results/combined/merges_timed/apache/commons-bcel.csv index a55a06b947..7045b25f96 100644 --- a/results/combined/merges_timed/apache/commons-bcel.csv +++ b/results/combined/merges_timed/apache/commons-bcel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 73,refs/remotes/origin/pull/27,38d50ba679622dbbfcbc835fbd4652d2bbde4f56,fdae273276026590f67009c7119db47a98b7153a,7cfc47ce577a43719617164f2234c5253638035b,,True,,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,True,382,483,,3,True,Tests_passed,f605eb87ad553734dee8608c3558e60d82a26f1e8494bb8884fd3a10a1612ec7,True,382,True,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,ffad47b543c0b651abf758b2a881d414797792340b3a5597c7dd82bafa87fe85,Tests_failed,7724caa28663198d6820381782ebf280de61e18b0b18f2beb32e89c5de340e98,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,ffad47b543c0b651abf758b2a881d414797792340b3a5597c7dd82bafa87fe85,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,Tests_passed,44e0c7d6c1b4296a38a1fb14b7431b0f0bbbb93c8dd6eba384371084d67b5360,0.037090301513671875,0.04035687446594238,0.053708791732788086,0.05162501335144043,0.06043076515197754,0.062462806701660156,0.058457136154174805,0.23001742362976074,0.15451407432556152,1.248809576034546,4.501599073410034,0.15847349166870117,0.21312522888183594,0.10697388648986816,0.10295534133911133,0.10799622535705566,0.10431766510009766,0.10782051086425781,0.17358136177062988,1.3211064338684082,0.09151864051818848,0.0919046401977539,0.08312821388244629,0.09894394874572754,0.08936786651611328 diff --git a/results/combined/merges_timed/apache/commons-beanutils.csv b/results/combined/merges_timed/apache/commons-beanutils.csv index c884e03cc5..a658960c44 100644 --- a/results/combined/merges_timed/apache/commons-beanutils.csv +++ b/results/combined/merges_timed/apache/commons-beanutils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,Tests_passed,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,True,201,1574,4281.0,2,True,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,True,201,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,09f92cfe7692f140bb3e839e2d664e5e955f77516bc42f9600e3b8cf9f9cd45b,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,0.04119420051574707,0.038867950439453125,0.05074286460876465,0.048506975173950195,0.061835289001464844,0.05843353271484375,0.04860401153564453,0.17496037483215332,0.10025286674499512,1.359971046447754,3.008755683898926,0.11013102531433105,0.16295790672302246,0.07099080085754395,0.0662529468536377,0.0727696418762207,0.06913876533508301,0.07113981246948242,0.10467958450317383,1.3517498970031738,0.06476020812988281,0.06679081916809082,0.07230281829833984,0.06270766258239746,0.0724945068359375 diff --git a/results/combined/merges_timed/apache/commons-codec.csv b/results/combined/merges_timed/apache/commons-codec.csv index f1652ec6e0..c7186e9e9c 100644 --- a/results/combined/merges_timed/apache/commons-codec.csv +++ b/results/combined/merges_timed/apache/commons-codec.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,False,True,3,4,8.0,2,True,3,Tests_passed,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,True,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,0.011223793029785156,0.05660247802734375,0.07021260261535645,0.06999087333679199,0.07027578353881836,0.07046747207641602,0.0693049430847168,0.0973362922668457,0.11384201049804688,0.02704334259033203,0.4569263458251953,0.074615478515625,0.23909592628479004,0.15031671524047852,0.044652462005615234,0.1499624252319336,0.08267068862915039,0.15436315536499023,0.21724843978881836,0.05766797065734863,0.14165902137756348,0.043572187423706055,0.13840937614440918,0.04177355766296387,0.14417028427124023 diff --git a/results/combined/merges_timed/apache/commons-collections.csv b/results/combined/merges_timed/apache/commons-collections.csv index 3f00636468..aeaacdae55 100644 --- a/results/combined/merges_timed/apache/commons-collections.csv +++ b/results/combined/merges_timed/apache/commons-collections.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,Tests_passed,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,True,37,108,791,2,True,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,True,37,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,0.047721147537231445,0.059247493743896484,0.021946191787719727,0.018861055374145508,0.057532548904418945,0.04597210884094238,0.032208919525146484,0.1586017608642578,0.09604549407958984,0.7446160316467285,1.2442584037780762,0.08776569366455078,0.147660493850708,0.05535483360290527,0.05749058723449707,0.05703258514404297,0.05821394920349121,0.056633710861206055,0.09557723999023438,0.7376129627227783,0.05427956581115723,0.05221247673034668,0.04510784149169922,0.05402946472167969,0.04394793510437012 diff --git a/results/combined/merges_timed/apache/commons-csv.csv b/results/combined/merges_timed/apache/commons-csv.csv index f1e3ec786e..ee6ed910ac 100644 --- a/results/combined/merges_timed/apache/commons-csv.csv +++ b/results/combined/merges_timed/apache/commons-csv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 108,refs/remotes/origin/pull/54,d950da2f49827211f4b72089eea80a6750d5019a,dd9b3ccf0f21719ed273f820eec8724ef405953e,a35797bea9bd7f7affa7ae94576bd471d822b01b,,True,True,True,26,90,557,2,True,26,Tests_passed,93656b7ff65108f7946c646ff6937e2fb506d30319c923143c515d3c4857fc0b,True,Tests_passed,0cd091656353c0aecf43288f074c7a0349f28159fc988f2458e36b86460891c8,True,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,e76459f34c589bf03010b37ca594b0f0cce9af621333f567dbf66c5891c2ca23,Merge_failed,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Tests_passed,697b2b6a37b7b23bc3e84ff184b2428bdefb3d82857d3cb1f5e4139714db577a,Tests_failed,08bdd2c395fee986c55ebfbcafaee6919a9d310493866995c84e59f70339df93,Merge_failed,dcf33a8baf2688e7733233b294938c9b7b1b95c4b61a28218783fc4f1bce111c,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,98ba9aa62fec0c5dc71cc72c0b87464b4d9726b6626009c0052c9105c2e578d5,Tests_passed,697b2b6a37b7b23bc3e84ff184b2428bdefb3d82857d3cb1f5e4139714db577a,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,Merge_failed,d027e8e4530cd31d81af14c8275f00178a0a8f6189053d2bb0889fa86fa17f6e,0.13837242126464844,0.13656282424926758,0.017828941345214844,0.13660907745361328,0.13665127754211426,0.13709402084350586,0.13437390327453613,0.1320650577545166,0.1937577724456787,1.0840263366699219,0.9873039722442627,0.316450834274292,0.25656628608703613,0.228651762008667,0.2310786247253418,0.22921228408813477,0.33893585205078125,0.22768068313598633,0.263200044631958,1.2988972663879395,0.28363656997680664,0.2926337718963623,0.2904648780822754,0.2840545177459717,0.29097795486450195 diff --git a/results/combined/merges_timed/apache/commons-dbcp.csv b/results/combined/merges_timed/apache/commons-dbcp.csv index 5de33a6590..095ee5583a 100644 --- a/results/combined/merges_timed/apache/commons-dbcp.csv +++ b/results/combined/merges_timed/apache/commons-dbcp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,True,30,137,1520,3,True,31,Tests_passed,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Merge_timedout,,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,0.03132486343383789,0.030832529067993164,0.037041664123535156,0.037801504135131836,0.038179636001586914,0.03787517547607422,0.03798103332519531,0.07374691963195801,0.0892486572265625,1.0309994220733643,-1.0,0.12185525894165039,0.1765298843383789,0.08488869667053223,0.09000825881958008,0.09133005142211914,0.08795046806335449,0.05908083915710449,0.14113473892211914,1.0003001689910889,0.05775713920593262,0.08240938186645508,0.07569360733032227,0.05716967582702637,0.07354927062988281 diff --git a/results/combined/merges_timed/apache/commons-email.csv b/results/combined/merges_timed/apache/commons-email.csv index 3ea3e07834..fa03cdcf38 100644 --- a/results/combined/merges_timed/apache/commons-email.csv +++ b/results/combined/merges_timed/apache/commons-email.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 104,refs/remotes/origin/pull/101,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,234aef759f76f4a4de53d2d311cd37806de9f361,2410f4bf5ffacb559984f7584e12cad802b7805c,,True,False,True,2,7,15,2,True,2,Tests_passed,e61be0a8f3eb18ea0261adba74391c43135a450c6b81d61969017e30bad7e18d,True,Tests_passed,41b28dfe3eba4c482094d558d2c80fb0c7925bd33c6793c95934e06add2c4f3e,True,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,0.035453081130981445,0.03744840621948242,0.03160905838012695,0.044489383697509766,0.040972232818603516,0.03978538513183594,0.046854257583618164,0.14773988723754883,0.11493301391601562,0.9342150688171387,0.3215205669403076,0.08340001106262207,0.1474008560180664,0.05514383316040039,0.05587458610534668,0.057187557220458984,0.055100440979003906,0.054223060607910156,0.09249138832092285,0.930809736251831,0.051602840423583984,0.05378222465515137,0.04316377639770508,0.04957890510559082,0.04234886169433594 diff --git a/results/combined/merges_timed/apache/commons-fileupload.csv b/results/combined/merges_timed/apache/commons-fileupload.csv index b093dc5be7..a16d9b16fd 100644 --- a/results/combined/merges_timed/apache/commons-fileupload.csv +++ b/results/combined/merges_timed/apache/commons-fileupload.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 33,refs/heads/master,5d3e1d8f4eafd654dec3e0ece71940597239a5e9,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,1b10014dddf12527f8dbad24169e4f6a9434e8c5,,True,,True,15,51,,2,True,15,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,True,Tests_passed,5736c3cc1b8062325082bf12feedafa77b5e37d3b23174926a613d2b9a543ac3,True,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_failed,d1e8f065a5a9d9e80afc1aacc906cdafa859ed39438f8154b7a898980ef63151,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,0.042112112045288086,0.05453085899353027,0.048302412033081055,0.05439138412475586,0.04271388053894043,0.06250882148742676,0.055606842041015625,0.16533446311950684,0.1304466724395752,0.8443593978881836,0.4975154399871826,0.08386373519897461,0.14093780517578125,0.05302596092224121,0.05223584175109863,0.049828529357910156,0.05287504196166992,0.053856611251831055,0.0885927677154541,0.805366039276123,0.05085325241088867,0.049393415451049805,0.040265560150146484,0.04904770851135254,0.039304494857788086 diff --git a/results/combined/merges_timed/apache/commons-imaging.csv b/results/combined/merges_timed/apache/commons-imaging.csv index 8b69eb2db0..19609dd2d5 100644 --- a/results/combined/merges_timed/apache/commons-imaging.csv +++ b/results/combined/merges_timed/apache/commons-imaging.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,888d6faf62dbb06004f2eae2cb889565ab044def,df36623d1826a43031e01af20783c9df4674c3d8,c0c98466358cedbd78ba91b238bb2cc1a4718f53,,True,True,True,480.0,1205,6176.0,3,True,480,Tests_passed,0d05ffbf27bc75c717c2fe0cf23ca003c37065bf54ab2f76d8e76e1b7b83e450,True,Tests_passed,a2a6ed14001f03ef10a083edace01b168e5876c281b69c0b082a2f518b86baac,True,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,0.2947847843170166,0.3325920104980469,0.48436713218688965,0.4855968952178955,0.4823265075683594,0.47649359703063965,0.4805295467376709,0.7423384189605713,0.4356272220611572,2.357090473175049,4.9480345249176025,0.5981147289276123,0.489546537399292,0.5392434597015381,0.5375375747680664,0.5461540222167969,0.5421609878540039,0.5452039241790771,0.5891737937927246,2.5071191787719727,0.5357985496520996,0.5426733493804932,0.5827288627624512,0.5330438613891602,0.5783071517944336 diff --git a/results/combined/merges_timed/apache/commons-io.csv b/results/combined/merges_timed/apache/commons-io.csv index efbe464b1e..730d46dea0 100644 --- a/results/combined/merges_timed/apache/commons-io.csv +++ b/results/combined/merges_timed/apache/commons-io.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 87,refs/remotes/origin/pull/377,2d0ad5c65cce8775c486edf607726612b856d2c8,081e43c49bd6377b731b2fe7ad45a4cf8940254b,c8e7b467794a0173409752933085ae20e15bf1ef,,True,True,True,7,36,215.0,2,True,7,Tests_passed,59b84830ef201b2c480ac6d9889976664fa5efb36a9a5142c86748edc15e689e,True,Tests_passed,417b73bf6549d5a143b9d13842ccf8333cda6a1cfdaa3c6f3cdc0e0dc1516004,True,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_failed,5d9ba6a72dac22704217e8cd2274784425433bc38cfb64db62b2d9f301779f19,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,Tests_passed,ecf4f3ac9d36a2550ad1c8f1ac66b13f3516d560e25517a8fb186c9f5abfea59,0.047354698181152344,0.02198958396911621,0.03225851058959961,0.04009127616882324,0.04873847961425781,0.021117448806762695,0.023444652557373047,0.12804293632507324,0.09441828727722168,0.045067787170410156,1.1162848472595215,0.09298586845397949,0.16134214401245117,0.06172990798950195,0.05987405776977539,0.06283330917358398,0.06020021438598633,0.0612332820892334,0.102081298828125,0.07318472862243652,0.05687093734741211,0.05665946006774902,0.048921823501586914,0.05706644058227539,0.04928159713745117 diff --git a/results/combined/merges_timed/apache/commons-jexl.csv b/results/combined/merges_timed/apache/commons-jexl.csv index fdd8bafc05..054613ff37 100644 --- a/results/combined/merges_timed/apache/commons-jexl.csv +++ b/results/combined/merges_timed/apache/commons-jexl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 168,refs/heads/master,153f1545226f1bcd238202853cc9584f11970e67,b54b3c9a912a3d96e584655f1ffd9564f28942ca,36a7f8da6676f4bdd8a1597189610aa4e55cb4d9,,True,False,True,21,38,74,2,True,21,Tests_passed,360017be1eb12be61ac6a2717dacad2d172e4bf0b84759eab830b82cf96c76cf,True,Tests_passed,8212f8fffad184fc8cff696d8e58a304bc8cb71dc9d8af134b8375743113b415,True,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,9ecc62d247798615a22de171432fd17b460d407ad4ee9c016ee3e408d4dd8228,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,9ecc62d247798615a22de171432fd17b460d407ad4ee9c016ee3e408d4dd8228,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,Tests_passed,e46438e7f6af1382879e1743d1073019e7797f167023a05bfa868d0f4bf22256,0.03750467300415039,0.05520319938659668,0.029537677764892578,0.05254864692687988,0.041976213455200195,0.028053998947143555,0.041548967361450195,0.17161798477172852,0.11366891860961914,0.9441494941711426,1.0397508144378662,0.10797309875488281,0.14728641510009766,0.07952547073364258,0.0820622444152832,0.05373740196228027,0.07947158813476562,0.08229470252990723,0.1243438720703125,0.9867212772369385,0.05242276191711426,0.07182097434997559,0.0652923583984375,0.07391476631164551,0.0705714225769043 diff --git a/results/combined/merges_timed/apache/commons-lang.csv b/results/combined/merges_timed/apache/commons-lang.csv index a2bc7725bf..2f271d0ad2 100644 --- a/results/combined/merges_timed/apache/commons-lang.csv +++ b/results/combined/merges_timed/apache/commons-lang.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 265,refs/remotes/origin/pull/533,62f744a7f25bc456354f23fb3e1b7455a4c53f7a,7efeb41b0af70d104e6431c48e74bf9557b65945,3d4ed4a8ac63db1e51601ffc31fed44dccbb276c,,True,True,Tests_passed,0d08e2a4f5e5e921e2ad0ad6b1b80feeecbb8b0e20d68e69945b4b9188bf71e6,True,47.0,151,527.0,3,True,Tests_passed,e63b0db615d9362451c87441119d9c191de3ec3274fbb1cad823e6fe85e78665,True,47,True,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,1cc72622ca9d77ddb424a96ec2eca55983fdad79946761fcd7e4d686e0d8fd0f,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,21abb1ad8b0d0229c7ff18e30373f01f3b8cb48b9b9ddcd349094a0323cc6f23,Tests_failed,4c6741b755721b9cae35f5262c42d989eae37d86941d53f482aabb4dd3077ccc,Merge_failed,e50a6ca1c3a3508fe4de0947bae53fe0526479508e1e7f62ecb2145c793a998a,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,12669e9d7b5f134de2232affe33e7d22eb4b412b117b8e9d5cad435214a009e1,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,bea74285ca408508b32595aaab411d82de866f1399e006b0bbeee44df48d4cf6,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Tests_passed,6badc7a4ce7daa9b700a1e1f68436dab4a948ec26642ad82898c2ba97d7a02af,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,Merge_failed,7dad9de52796dc6106e3c116a2873b3fdcb1cdf07ef44d7888a9dd04b518ca92,0.03367948532104492,0.0354154109954834,0.06110715866088867,0.051660776138305664,0.04875802993774414,0.03947019577026367,0.05798006057739258,0.23211932182312012,0.16912579536437988,0.05789828300476074,4.680435419082642,0.16013813018798828,0.18344378471374512,0.07976818084716797,0.10863733291625977,0.08138251304626465,0.07950401306152344,0.08231759071350098,0.14092350006103516,0.10493898391723633,0.07916927337646484,0.0940244197845459,0.07128095626831055,0.07743716239929199,0.07808423042297363 diff --git a/results/combined/merges_timed/apache/commons-math.csv b/results/combined/merges_timed/apache/commons-math.csv index 6ecbea9a9d..3bc6bb0709 100644 --- a/results/combined/merges_timed/apache/commons-math.csv +++ b/results/combined/merges_timed/apache/commons-math.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 48,refs/heads/master,c4c288a3e0e610ed02801b17ed26016b0e734032,a8c6d43b5a61d8da784f0ac188d40b88a15dad50,a3677db89ef3863e8ac7cf578df499f85d970b76,,True,True,True,300,1163,123270,2,True,300,Tests_passed,3d100917289ba2dc011dec4a4ff16170fd7c3e5679094ee328b85c9f21d18b47,True,Tests_passed,6b3fef96cee086a368ec7970f8305409ccb4cdf55ddefccb5cf958248542cbb9,True,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_failed,103b6ef99cae90de7f5cd6e5a9b95a6337e21bf2364dbf0c3efdfca6033012d0,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,0.05518198013305664,0.05426836013793945,0.0834505558013916,0.08368778228759766,0.08269381523132324,0.0839986801147461,0.08271622657775879,0.12947344779968262,0.10870695114135742,1.0606262683868408,9.587121486663818,0.18768548965454102,0.28775620460510254,0.15748119354248047,0.16153454780578613,0.1603407859802246,0.16131973266601562,0.15990185737609863,0.20391082763671875,1.016087532043457,0.1309666633605957,0.13300800323486328,0.12972807884216309,0.13002777099609375,0.13420414924621582 diff --git a/results/combined/merges_timed/apache/commons-net.csv b/results/combined/merges_timed/apache/commons-net.csv index 947f60e117..992973738e 100644 --- a/results/combined/merges_timed/apache/commons-net.csv +++ b/results/combined/merges_timed/apache/commons-net.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/heads/master,e3013d784b0b6c93a7624a36870f2dd73e6ecc41,2d0e6ece9df028b11b4592fce2d1c761f570533b,cd0aa01783cc7c0459f24ac9139b952f144c110b,,True,True,True,76,372,1159.0,3,True,76,Tests_passed,0e60b717d0b4708350b767069f2a58a7b80e7a91839ea474d86f50b786df605b,True,Tests_passed,6974d633c93ae3afcd6d7e82f6250dc718697b6613bdb8921807495ea703ca7f,True,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,a2999352b1213272dd1edcefbd298fadc2fcaa759cf4cf6b6d12cf590c6bb49e,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,784c54f9f2db2df21a5a2de5d19cad4f3fe2e80815dce82ba80f54e27caf692b,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,6fa3fc8d09cb57b5ed95207e1c5ec919e4d1434e0946036d2f4d2feeb176bc89,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,0.056407928466796875,0.05790519714355469,0.04941606521606445,0.05551886558532715,0.039900779724121094,0.06534934043884277,0.07602667808532715,0.19331598281860352,0.17734718322753906,1.9663341045379639,1.436371088027954,0.1315474510192871,0.1725325584411621,0.07653570175170898,0.06284189224243164,0.07787275314331055,0.07498979568481445,0.06354546546936035,0.12831711769104004,1.9373795986175537,0.07894301414489746,0.06202554702758789,0.06998109817504883,0.06171870231628418,0.07081961631774902 diff --git a/results/combined/merges_timed/apache/commons-ognl.csv b/results/combined/merges_timed/apache/commons-ognl.csv index cee67cf93d..c00f71ac53 100644 --- a/results/combined/merges_timed/apache/commons-ognl.csv +++ b/results/combined/merges_timed/apache/commons-ognl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 89,refs/heads/master,c1132d8fb32b81da8b9192ad1ee4e61dfa890665,812a35eb7f400aa93b2e60cf84151b1787a79cfd,5165bddec796a1e2278c01412e06f44de52c911a,,True,False,True,11,31,176,2,True,11,Tests_passed,01ccd28af5b5560f840e671640c614e7de2c0034fa319201f2701b016a5ebb48,True,Tests_passed,d04c3968e492f8063f94e925e78e31a108e85a0ad86a24b69babd6fce558531b,True,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_failed,8bacca06174bd381821055d56f710fcb9608aaaf1371dbccf004e42a531b0a7e,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,0.05082416534423828,0.047019004821777344,0.041263580322265625,0.03610682487487793,0.03685617446899414,0.05785393714904785,0.04591941833496094,0.17160606384277344,0.12070584297180176,0.8282818794250488,0.7130677700042725,0.0892949104309082,0.1698143482208252,0.04709887504577637,0.06892180442810059,0.047753334045410156,0.046906471252441406,0.0730123519897461,0.0809938907623291,0.8043577671051025,0.045688629150390625,0.06296229362487793,0.034529685974121094,0.06253790855407715,0.03853559494018555 diff --git a/results/combined/merges_timed/apache/commons-pool.csv b/results/combined/merges_timed/apache/commons-pool.csv index 7534290622..8dda87315b 100644 --- a/results/combined/merges_timed/apache/commons-pool.csv +++ b/results/combined/merges_timed/apache/commons-pool.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/remotes/origin/1_5_RELEASE,14d3779529102d835672c5bad513d859e5e1deea,dc7faf6d8ccfc4e960bc7af6633c25329d8d3f3d,81e055707a4ef6da311fd88a07b891bcd8a576ed,,True,True,True,80,1028,22102,6,True,84,Tests_passed,5ff845cf1883dbc6aa84287a20f41923443e4d202a6fccc6943623677c763d8a,True,Tests_passed,a9b859e5b94d1097e80b39d44f7536499f73a024ea81409747dfcd12064a239e,True,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,aa6e66911bea5debe129b95e7d0934e1c6c748ce7a9616459191301f9bac1af3,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,a8c414bc061f720ac53f6c7b7bf705a8bb8a0642cc290166bf4ce1678c5889d9,Merge_failed,aad768e89a333d52cf91ff5cdea265c54e144670c099dbfdd5cc898f6f9fcea2,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,bf2e0d540e90ec7c1ac909fb2dd8f83bf87dbe6bcb97f786cc09fcc2ec1a6ef2,Merge_failed,062103779e804d8c637af2d69addddd019610d292c25c12e7ea7759c9cd24438,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,0.06531000137329102,0.06485414505004883,0.07683515548706055,0.07419729232788086,0.07098650932312012,0.07061195373535156,0.062270164489746094,0.5534019470214844,0.49430203437805176,8.04391884803772,48.52143096923828,0.2907085418701172,0.17122507095336914,0.0951695442199707,0.09702014923095703,0.09754252433776855,0.09831881523132324,0.09676790237426758,0.202592134475708,7.203098773956299,0.08847403526306152,0.08883213996887207,0.08977222442626953,0.08907413482666016,0.0906221866607666 diff --git a/results/combined/merges_timed/apache/commons-validator.csv b/results/combined/merges_timed/apache/commons-validator.csv index e9e5c8c758..37b43141a0 100644 --- a/results/combined/merges_timed/apache/commons-validator.csv +++ b/results/combined/merges_timed/apache/commons-validator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/heads/master,3d8f2df479e5b0884bb8d58b6a194e0f8163102c,cf76af0ad3ba123eb9337c46a60a60623db7129d,79293404604cf443236e859df057962ff28676c4,,True,True,True,74,363,1667,2,True,74,Tests_passed,aee43ad24650e76057f1b884617cc35c9fec55edeaa2d07a9c9940bba7990d19,True,Tests_passed,078eaeaee7cc75875773b14c0fc6502d07c2e526d0e7fd04d50d86e67f45297d,True,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,0.05489754676818848,0.03796744346618652,0.04816913604736328,0.043924808502197266,0.0699460506439209,0.051720380783081055,0.0608978271484375,0.2087235450744629,0.12534284591674805,1.0217041969299316,1.4332237243652344,0.09542679786682129,0.1640303134918213,0.07552051544189453,0.060088396072387695,0.07650470733642578,0.07189750671386719,0.07238936424255371,0.09854936599731445,1.0202467441558838,0.0688631534576416,0.06773090362548828,0.05249619483947754,0.06905794143676758,0.059513092041015625 diff --git a/results/combined/merges_timed/apache/directory-kerby.csv b/results/combined/merges_timed/apache/directory-kerby.csv index c1d5f873cd..2cd5c2972e 100644 --- a/results/combined/merges_timed/apache/directory-kerby.csv +++ b/results/combined/merges_timed/apache/directory-kerby.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 226,refs/heads/trunk,2daee238dbcf01170a01936f0feddb65e7dd0726,df2539bed1b4fc59642979ade83abfd8809b53bd,44f40d11d8cf2d9017278d92aec5d9f48d3fb88d,,True,False,True,4,3,8.0,2,True,4,Tests_passed,66b814d0497c94eb54c444f56e9e953dc3ea268ac6cc1a203bced908cc5f0d84,True,Tests_passed,27352618feac3c7caa18496734a060a137f8bda57cdc3bdf06ff2a4e5427d130,True,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d5a54451ae15627b70efa617d0d9ab135d1d8f8e24e64ca39b3b5936aa1ac9dc,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,df34eed536cdf56d42f9c1eaf0b1937ea23ab8e65c390913a57f258617d3cb4e,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d4c3e57ae2c290b0f23fc922e89a6449738dec93ceb2f15b5a7aed7bd6cc5035,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,0.04034304618835449,0.04445600509643555,0.04687094688415527,0.041261911392211914,0.05078601837158203,0.04318356513977051,0.05274796485900879,0.18733787536621094,0.08249640464782715,0.9878690242767334,0.32527971267700195,0.07369637489318848,0.11709260940551758,0.0378420352935791,0.03794503211975098,0.03830981254577637,0.03847098350524902,0.03785395622253418,0.07329821586608887,0.9710903167724609,0.03719329833984375,0.03854107856750488,0.03654813766479492,0.03828144073486328,0.03658127784729004 diff --git a/results/combined/merges_timed/apache/fop.csv b/results/combined/merges_timed/apache/fop.csv index a75a4cf655..ce01fd23f9 100644 --- a/results/combined/merges_timed/apache/fop.csv +++ b/results/combined/merges_timed/apache/fop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 175,refs/remotes/origin/pull/3,7403425be8d6fe84d9ebd9614109629fadc8a752,7cae529cc4d2b6f3e8084d1950fefd630f29ccfd,9978ac1d3a99a429627198759affdedd2b10cd1d,,True,True,True,281,1150,4999.0,12,True,281,Tests_passed,cd1ff9e568e7f297b54ff98013502d203e3a67096b2503f6db7c2da6e438eeb5,True,Tests_passed,292361e45e7524ae9746da64b485aeda42d21a864bb8e63435c970d82863268e,True,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,1bf457ed34cb24c60b5e6807182c983abdc7ad606ff364e7aa5c1327e156bbd2,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,06d8ee6440cde442becf271f50cf589c8bb97cc24bb663acbb097dfe52cfde7d,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,c60b1d17d9202e31f2db0c32fec695029d187eb4789cfdd5529a67535c58f319,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,0.10559368133544922,0.10694169998168945,0.13389873504638672,0.13581204414367676,0.1354825496673584,0.13524770736694336,0.1648256778717041,0.5192890167236328,0.6908278465270996,10.537936210632324,11.23635482788086,0.5438268184661865,0.3899352550506592,0.28699755668640137,0.2905263900756836,0.2863125801086426,0.28943324089050293,0.35861778259277344,0.5592014789581299,10.802780151367188,0.25658130645751953,0.25952577590942383,0.17007684707641602,0.2597465515136719,0.16694211959838867 diff --git a/results/combined/merges_timed/apache/geronimo-specs.csv b/results/combined/merges_timed/apache/geronimo-specs.csv index fac8c7be1f..6a73e9e37d 100644 --- a/results/combined/merges_timed/apache/geronimo-specs.csv +++ b/results/combined/merges_timed/apache/geronimo-specs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 88,refs/remotes/origin/pull/17,229a0222332567f69c53b4bdac713238935e840c,8d5bb7178205a4171b69d0d352cff74a4f221439,8f32fef5f3dbd5c1f577d967fcfb41bbb8af497d,,True,True,True,7,10,143.0,2,True,7,Tests_passed,e8dcaa08c37afb37d4f0640e9083832b641b41a8d8191236b19ab68978d00182,True,Tests_passed,7147bed0aea305357e81b689c9f37b551abbc487a5304ac965f6391301784b31,True,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8999d89554b0214e00c8bb31db923de3c0a4f637dcb60e0e315caeb6c6bc618f,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,db3fadc461b96d53f4aa7d2974be7e96a62d5104282125b510e4287846e2e36b,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,4ed1822dbd8b9424e5f274dad2dfc6bde215e90dd1d9851ca00443712992d6fe,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,0.0780034065246582,0.07769227027893066,0.07170677185058594,0.07686567306518555,0.07898068428039551,0.09959554672241211,0.04746842384338379,0.2645907402038574,0.1489276885986328,0.4882168769836426,0.5305962562561035,0.08336019515991211,0.13266229629516602,0.05167675018310547,0.05327773094177246,0.051955223083496094,0.052381038665771484,0.053263187408447266,0.09505438804626465,0.47852087020874023,0.05144524574279785,0.05094408988952637,0.04902911186218262,0.04836440086364746,0.049236297607421875 diff --git a/results/combined/merges_timed/apache/incubator-tamaya.csv b/results/combined/merges_timed/apache/incubator-tamaya.csv index 25f7eddae5..74763e7683 100644 --- a/results/combined/merges_timed/apache/incubator-tamaya.csv +++ b/results/combined/merges_timed/apache/incubator-tamaya.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/master,74a73954a03c9854e80b7bafd46332a5a034a2fe,3a50d2e6eb06b7463e85a6f872463c28bc1142b0,45f5bb90bb48e1dc083e6e67138c140112f1dcab,,True,True,True,84,182,633,14,True,84,Tests_passed,cd2b85b49101b8714f817a3d58806b56b1b37f418d85d6a300fe45b7db783b38,True,Tests_passed,56d347327d56a0d41a3b4d4b8005abe2d37de34f11b2506284a72f6ac2503a13,True,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_failed,ff04d4d55d481a7fb000561d2123f3f9095d209d8004b3965883226173c4fb3b,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,0.04412198066711426,0.02231454849243164,0.06458353996276855,0.057370662689208984,0.056798458099365234,0.06700420379638672,0.06505393981933594,0.9765169620513916,0.7697136402130127,6.760615110397339,0.8118319511413574,0.4700300693511963,0.23228192329406738,0.1565260887145996,0.14388823509216309,0.15845322608947754,0.1427476406097412,0.15461301803588867,0.38696765899658203,6.648974657058716,0.13947200775146484,0.15367817878723145,0.05374741554260254,0.15240979194641113,0.05654263496398926 diff --git a/results/combined/merges_timed/apache/jackrabbit-filevault.csv b/results/combined/merges_timed/apache/jackrabbit-filevault.csv index 6bdd20ffe2..1b6405fe0c 100644 --- a/results/combined/merges_timed/apache/jackrabbit-filevault.csv +++ b/results/combined/merges_timed/apache/jackrabbit-filevault.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 38,refs/remotes/origin/pull/318,c4842868060884add8b7232d8d30224ad6bd2952,d4140d0987608e07f0b0b0d718ea1abfb892d5c1,d462b815ba9cca13721e6f36e40251e2b74244f4,,True,True,True,4,15,56,2,True,4,Tests_passed,1d98f63ca51c4c0e6f13357dfbce768de31ab86bb198a047741f894789083255,True,Tests_passed,d3cf4a0af32f12478d370f5264340ba5314244ae695cbc869a90e2a2e8774b65,True,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,4969e185faf3b86cd00d72721731493bc321c6c2e379924f224e6b1d1d0c8f38,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,Tests_failed,0f9d5a1b31707f769d8f58ef3ebda7a47a7e17204fcaf9b60b17f932fcc017c6,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,bb00a3c1c4e978ef5f589eeb721a7a9fc05c1011105d87ae07b2971a87a841c6,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,0.0649416446685791,0.061627864837646484,0.06561279296875,0.05686664581298828,0.06662702560424805,0.06759762763977051,0.06993365287780762,0.2211289405822754,0.14115285873413086,0.041666269302368164,0.3500335216522217,0.07992339134216309,0.1245276927947998,0.04287123680114746,0.04320812225341797,0.04291725158691406,0.04289436340332031,0.042153120040893555,0.07955002784729004,0.057193756103515625,0.04253339767456055,0.04236483573913574,0.03989982604980469,0.040962934494018555,0.04094266891479492 diff --git a/results/combined/merges_timed/apache/jackrabbit.csv b/results/combined/merges_timed/apache/jackrabbit.csv index b72699a6bb..312f79a18d 100644 --- a/results/combined/merges_timed/apache/jackrabbit.csv +++ b/results/combined/merges_timed/apache/jackrabbit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 78,refs/remotes/origin/pull/88,c980ab851ddaac027ad4237151e416167682a71b,df833def60f7ddaeb3388043b7617155a03faa0f,e0e0f4592be8d34c442b466bf94184cedf3b7437,,True,True,True,30,57,190.0,2,True,30,Tests_passed,2664596db516481df6480497e04bd6aaf6d460bdab6d08bf8ac19073971127b8,True,Tests_passed,982a484a16a3d6f5605f8cfb51395ed490fd1d9531ab41c635d7168e1be24ed5,True,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_failed,d3c9245810d5cb7abea852d565f14ca6506ee3b13a46830dc83a39f5c7a79378,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,0.02766704559326172,0.027326583862304688,0.032826900482177734,0.03347325325012207,0.032861948013305664,0.032878875732421875,0.03300070762634277,0.07567787170410156,0.08365535736083984,3.3357787132263184,1.0990891456604004,0.12632369995117188,0.18590831756591797,0.08685421943664551,0.08654642105102539,0.08460664749145508,0.08577752113342285,0.08920550346374512,0.13942265510559082,3.3967769145965576,0.0810556411743164,0.08083057403564453,0.06788921356201172,0.0817098617553711,0.06753945350646973 diff --git a/results/combined/merges_timed/apache/james-mime4j.csv b/results/combined/merges_timed/apache/james-mime4j.csv index 9a16f171b0..d995871a95 100644 --- a/results/combined/merges_timed/apache/james-mime4j.csv +++ b/results/combined/merges_timed/apache/james-mime4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,e5a2caca4d3b5b2694d7156cd42cb8e3f96541c4,293714fe2c91fed2b5c6a7fb351fa79c80e867e2,,True,True,True,7,15,46,2,True,7,Tests_passed,4938610b1e2de86cc71e85b0b31ca4c521bafc4aa24b3469a3af7aeca0edce90,True,Tests_passed,c8f1e41ffc2c675e72bacb41dd025c2073a095a729ec1f7fcc02094a7f5359e2,True,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_failed,ba66d74aaac86cac8467127b573bee718dac34e392a3cfa37e188e1a1fd5037b,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,0.014119148254394531,0.013367176055908203,0.013558149337768555,0.014026641845703125,0.013826608657836914,0.014172792434692383,0.014788389205932617,0.044965267181396484,0.07074785232543945,0.8709399700164795,0.44626402854919434,0.08177566528320312,0.13789916038513184,0.047554969787597656,0.046769142150878906,0.04807400703430176,0.04646635055541992,0.04629039764404297,0.08321332931518555,0.8255600929260254,0.04444074630737305,0.04581880569458008,0.035809993743896484,0.045581817626953125,0.035697221755981445 diff --git a/results/combined/merges_timed/apache/maven-enforcer.csv b/results/combined/merges_timed/apache/maven-enforcer.csv index 9bfac76ed5..49d6aa2b2e 100644 --- a/results/combined/merges_timed/apache/maven-enforcer.csv +++ b/results/combined/merges_timed/apache/maven-enforcer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,0f3207ac28155bce317658f813c6fb4022c1ce19,3c192e174a09cb3a4cb4793d4bc7a9b4b8ae6ddd,e48ef741173c57fa1b43a960db107b40cff49536,,True,True,True,18,59,280,2,True,18,Tests_passed,fca3e8aef5e88c65527ec6264547c226d8c481941fee173efb3b173fa64f9007,True,Tests_passed,dc8fc476507683e6bb9244dd9409d5b317b4fd0e6abef96a1e43a1d964ad851d,True,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Merge_timedout,,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,0.04601097106933594,0.039258718490600586,0.057570695877075195,0.027928829193115234,0.04933357238769531,0.05317401885986328,0.05611753463745117,0.18208980560302734,0.11168527603149414,0.9930119514465332,-1.0,0.0830087661743164,0.13448286056518555,0.04649186134338379,0.046189069747924805,0.046173810958862305,0.046805381774902344,0.04758453369140625,0.0798497200012207,0.9371602535247803,0.04573965072631836,0.045886993408203125,0.034636735916137695,0.04494738578796387,0.035356760025024414 diff --git a/results/combined/merges_timed/apache/maven-plugin-tools.csv b/results/combined/merges_timed/apache/maven-plugin-tools.csv index 25acee90a6..1447dcc000 100644 --- a/results/combined/merges_timed/apache/maven-plugin-tools.csv +++ b/results/combined/merges_timed/apache/maven-plugin-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/remotes/origin/pull/46,5fe527d2614d39b64e81881e52ff4fb88a0c6111,0b0daeeeada60052ab663d9b08122826c1e130d1,8f9ee789d272cf702aaf390004b78b73b78db4f1,,True,,True,165,622,,7,True,166,Tests_passed,c2da2b9f750344257c06e4d547aa76e8678bc43746be03e970b70c2d338602a7,True,Tests_passed,ec94dfb2d3ee664add509e4980d203c3bb86f42f604c133eafc5cc8e14d4d87c,True,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,9e6088178393a0fa09cb761f4edfeb0cf3048cfc289e2e25db02a520a6efbfd0,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_timedout,,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,e54a47c01d1d47e9a76fdff4ffcd77ccbeb574b84493e05d5d9791201048f96f,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,0.027008056640625,0.03358650207519531,0.02932453155517578,0.036153316497802734,0.03667092323303223,0.036715030670166016,0.03673863410949707,0.1335277557373047,0.3613150119781494,5.063374757766724,-1.0,0.2652857303619385,0.1944262981414795,0.09961724281311035,0.09854531288146973,0.10069489479064941,0.11089015007019043,0.09940171241760254,0.2184617519378662,5.081210136413574,0.09493303298950195,0.09932851791381836,0.08152914047241211,0.10841631889343262,0.08127665519714355 diff --git a/results/combined/merges_timed/apache/metamodel.csv b/results/combined/merges_timed/apache/metamodel.csv index 56dc394eec..3f831e2460 100644 --- a/results/combined/merges_timed/apache/metamodel.csv +++ b/results/combined/merges_timed/apache/metamodel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,292b40b8e2832d36c1cb78c845b6497211992518,56dd99fc519f8db5bf03906e01f4a89c3169df10,7e60c6066d3784efacc240e9a8dbfbff391eb172,,True,True,True,5,62,152.0,2,True,5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,True,Tests_passed,c1313624f5dafeb981796b2d8f7e96066fc00087decd626f4acf269564448775,True,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_failed,2658506b10a93eb0bd6683b1f6efca93fd25ef544a722532656149f0ac89f05b,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,0.06082725524902344,0.06186628341674805,0.06110119819641113,0.05752921104431152,0.061901092529296875,0.06868672370910645,0.05989837646484375,0.20444822311401367,0.12329316139221191,0.05340123176574707,0.60845947265625,0.08812594413757324,0.1479654312133789,0.05575418472290039,0.05445408821105957,0.05638313293457031,0.053565025329589844,0.05427145957946777,0.09438776969909668,0.06857609748840332,0.05240678787231445,0.05321812629699707,0.04179787635803223,0.0532228946685791,0.04295206069946289 diff --git a/results/combined/merges_timed/apache/olingo-odata2.csv b/results/combined/merges_timed/apache/olingo-odata2.csv index 2f296ac517..2734614610 100644 --- a/results/combined/merges_timed/apache/olingo-odata2.csv +++ b/results/combined/merges_timed/apache/olingo-odata2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,843fba1449b367d5eef6fa69f4606bbd7232a9d9,352a82c3ccfd91ab45e21f83309c675886332bd3,21dfed3b6b399e4629729e35cc300104b74cb153,,True,True,True,22,156,649,2,True,22,Tests_passed,89082f64daa0c2b0bb5c32a9d370927326bad450c8c788a072bcb6fdf78bf04b,True,Tests_passed,9df2bfc43c74ccd58819140a1fc0c0dbd696f603f3f7ac2c121ada075f985e8c,True,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,0.0696265697479248,0.06908702850341797,0.07357001304626465,0.06858325004577637,0.0803532600402832,0.055985212326049805,0.06085944175720215,0.19208192825317383,0.13961410522460938,0.04734063148498535,1.1117355823516846,0.10074257850646973,0.16330504417419434,0.06640052795410156,0.06699848175048828,0.0676424503326416,0.06643009185791016,0.06796383857727051,0.11233019828796387,0.0794520378112793,0.06442117691040039,0.062206268310546875,0.052858829498291016,0.06508111953735352,0.054378509521484375 diff --git a/results/combined/merges_timed/apache/olingo-odata4.csv b/results/combined/merges_timed/apache/olingo-odata4.csv index 6b7fb96520..2f4d78e72c 100644 --- a/results/combined/merges_timed/apache/olingo-odata4.csv +++ b/results/combined/merges_timed/apache/olingo-odata4.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 40,refs/heads/master,483ee9de15cf8bbcc18e2560496724b06be76cf2,0ce0a88be2766261c6d30665b9b9a2576b546c08,3584e1d71d260a44f9aa685503bdde2d62ad322f,,True,True,True,414,2569,23236.0,6,True,409,Tests_passed,40e26605249c22baf44606775b5cab512d21cd2e2d5dcc38090482c62f4d6f64,True,Tests_passed,5f04cdc200f8d8b71ca7db68494fd6760d45d046fba443849104cf69a68677ac,True,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,3bdbbdf211beae95b9eb8aae1770ff89cc83cfa6aad24e8f28b93c9dafb2d86f,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,f0d82b25c7369e1ecf860520a3ea5395d3e37cac10d1c5cc36e911db27685f84,Merge_failed,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,88ea6ac834183152fb6c47d0afcfb9cdcf22ce31b60c2dee5fe499a4f3e787ed,Merge_failed,0ec71aec798ca78d86fc017abb7d859350a2492ce902eef0a1f25535fb2b605f,Merge_failed,9acbf21858a22f43d416d30a3e7a73cfbaa92d9e17a8bb7793bd093418b748c8,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,3bdbbdf211beae95b9eb8aae1770ff89cc83cfa6aad24e8f28b93c9dafb2d86f,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,300492264e4caf03183741be113efaab99f22fe9bb4cd40ca3770d8945439daf,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,7e8aa42c7cf8813ddcd0009df7cf4fb55fdf3f01c1163aa29ce7924993d1bbac,Merge_failed,88ea6ac834183152fb6c47d0afcfb9cdcf22ce31b60c2dee5fe499a4f3e787ed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,629e6e989cde024a1e01a6f2ebd04330cd403ef3769e862532972a361834f010,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,Merge_failed,5a11c16a2bcac10ff2bc1bc97051c4f7d1fb58034454b4b2350d11d151db3bed,0.0724339485168457,0.06787967681884766,0.07810664176940918,0.08780741691589355,0.0795741081237793,0.08736896514892578,0.07506895065307617,0.4585099220275879,0.31332993507385254,10.227067470550537,14.351024389266968,0.26349902153015137,0.2344365119934082,0.15303683280944824,0.1500706672668457,0.1567084789276123,0.150634765625,0.15262913703918457,0.24928855895996094,9.406904697418213,0.13664937019348145,0.13742303848266602,0.1187448501586914,0.1358203887939453,0.11859321594238281 diff --git a/results/combined/merges_timed/apache/opennlp.csv b/results/combined/merges_timed/apache/opennlp.csv index 963feca86d..fb7c163857 100644 --- a/results/combined/merges_timed/apache/opennlp.csv +++ b/results/combined/merges_timed/apache/opennlp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/remotes/origin/pull/428,1f7ecee31581a733dd3af774c5ee464efa21c3d8,53c0e2d19c7ec0026e5ac079119edc6cfbb41332,ea0d6f7d8ae291770385b7f6c263ef433db909cc,,True,True,True,255,2940,11684.0,2,True,255,Tests_passed,d1961a64dfaa60c2d5a2f250968de9456ceb8237e02f79a1c4b953bbb1642eb9,True,Tests_passed,7485e65c7d697200d77f28df439e0df6f025c91034d527bf330e248e848ed734,True,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,b9a02e95505c123b7a7c08a8e78aa745076c7f4a0022e8228bf2dba8e63663c4,Merge_failed,26d7cf42e810a9304adaf3653179e0e2d2079c1a4befb3f597bddc13dcb5b879,Tests_failed,96060e0d71e5dba98954f30d4fd9bd569862fffe633118b1f9b3d1463c5df471,Tests_failed,3d418d13ff5911c09ecebb67a5d5edf6aca73fd7bb3e9515439706f9e327e457,Merge_failed,26d7cf42e810a9304adaf3653179e0e2d2079c1a4befb3f597bddc13dcb5b879,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,54cfd1c9b2cf40580f8feb39e5ffbf2d60223f725dc55efdcaded31ac1c159ed,Tests_failed,96060e0d71e5dba98954f30d4fd9bd569862fffe633118b1f9b3d1463c5df471,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,Merge_failed,811a9ec27b7c765d9a98ba6130747bf48fc145ac1d027ee752342103ef72b812,0.03857827186584473,0.03744912147521973,0.0417330265045166,0.0433049201965332,0.040277957916259766,0.04324460029602051,0.03714632987976074,0.09695792198181152,0.06531023979187012,0.7701776027679443,2.205427408218384,0.10720300674438477,0.1507854461669922,0.06891822814941406,0.06672072410583496,0.06864213943481445,0.06838107109069824,0.06963539123535156,0.10565710067749023,0.8200221061706543,0.06580662727355957,0.06431341171264648,0.065185546875,0.06497931480407715,0.06650471687316895 diff --git a/results/combined/merges_timed/apache/roller.csv b/results/combined/merges_timed/apache/roller.csv index 7f13721759..4a3d820f0d 100644 --- a/results/combined/merges_timed/apache/roller.csv +++ b/results/combined/merges_timed/apache/roller.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 93,refs/heads/master,4e955ce4618ef1484eaeb42e5aa42650f5abc616,ed48b479acea0fbee79c5ac1fcc0380d150cd06d,d456d54200e7c747ef0312ca190c2a15433b6b3d,,True,,True,2590,2108,,4,True,2590,Tests_passed,f74899072cafc24f821746c0aa5ed3980e86333f30290af9ca8bb204ac9469b8,True,Tests_passed,9bcfedea1bd9dacee52ea37b0461cac41da9dbff90ed51947b1035988fc61c4b,True,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,d9a4b57c9b8a24e529821351a33b089685ae929086e1c76e7e726e0464a47780,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,8349cc1020073a479dfde08dbae7aae4d3cfc8c34ed86f307c3ebe713eda7fd5,Merge_failed,1a92293bfb4ef9fbc3cc3f11d72353081af158bafecd909109ecec864a08b078,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,c24b3824774acb29026c6dafa9fd7a29f55626f95f17808ec564cc2042b8d6a7,Merge_failed,4996d1ca29060a1cf4042857a1801617d388be0e57349b0a27095d599d9c6f88,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,0.085540771484375,0.08616828918457031,0.15108203887939453,0.1514887809753418,0.1502377986907959,0.15017032623291016,0.14823031425476074,0.25634098052978516,0.2529897689819336,0.7700095176696777,0.7495167255401611,0.33290648460388184,0.34842944145202637,0.31009483337402344,0.29753804206848145,0.30756187438964844,0.3022336959838867,0.3064141273498535,0.3498547077178955,0.9440329074859619,0.24227285385131836,0.24750113487243652,0.1719820499420166,0.24519681930541992,0.1691572666168213 diff --git a/results/combined/merges_timed/apache/shiro.csv b/results/combined/merges_timed/apache/shiro.csv index d4c727745e..96f49a9e0e 100644 --- a/results/combined/merges_timed/apache/shiro.csv +++ b/results/combined/merges_timed/apache/shiro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,True,25,39,1940,2,True,25,Tests_passed,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,True,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,0.06206202507019043,0.04825615882873535,0.06627464294433594,0.06613874435424805,0.06657147407531738,0.06125378608703613,0.06211209297180176,0.16224884986877441,0.12031435966491699,0.795459508895874,0.46579861640930176,0.08836841583251953,0.15848731994628906,0.05914640426635742,0.059957027435302734,0.060450077056884766,0.05876517295837402,0.05904197692871094,0.09756278991699219,0.7705938816070557,0.05614328384399414,0.055658578872680664,0.04481697082519531,0.05481886863708496,0.04356980323791504 diff --git a/results/combined/merges_timed/apache/tomcat-maven-plugin.csv b/results/combined/merges_timed/apache/tomcat-maven-plugin.csv index 3be076b581..bff739bf8f 100644 --- a/results/combined/merges_timed/apache/tomcat-maven-plugin.csv +++ b/results/combined/merges_timed/apache/tomcat-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,True,101,145,13939,3,True,101,Tests_passed,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,True,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,0.04308342933654785,0.043390512466430664,0.05500459671020508,0.05586647987365723,0.05513334274291992,0.05595898628234863,0.05487871170043945,0.10307192802429199,0.15503835678100586,2.104686975479126,0.8381228446960449,0.16434812545776367,0.26012372970581055,0.128706693649292,0.07504081726074219,0.12613201141357422,0.11838126182556152,0.1336510181427002,0.14162230491638184,2.0482754707336426,0.10727787017822266,0.07642793655395508,0.10790657997131348,0.07245874404907227,0.10398507118225098 diff --git a/results/combined/merges_timed/appendium/flatpack.csv b/results/combined/merges_timed/appendium/flatpack.csv index b0f62e71dd..e7cd54f305 100644 --- a/results/combined/merges_timed/appendium/flatpack.csv +++ b/results/combined/merges_timed/appendium/flatpack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/master,5e09875d97db7038e3ba6af9468f5313d99b0082,4958463e5a0d1008a43fa9e44b8b4e653ca9c719,b9c4bd89e021b980bbb4809d0a7749ab4d12001f,,True,False,True,3,3,4,2,True,3,Tests_passed,8e935556279de81bdfb886820671c62a430cc8c315cead24cc588765449921ac,True,Tests_passed,101ca456068e58cebf4d2543931c88e218c292ee4e8550ae9d87c8cac4b85558,True,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,0.011675596237182617,0.011746644973754883,0.04848337173461914,0.04585409164428711,0.010799646377563477,0.04702186584472656,0.011513948440551758,0.08601665496826172,0.10047125816345215,1.2385060787200928,0.39307427406311035,0.19458484649658203,0.29906368255615234,0.16570591926574707,0.15903615951538086,0.16136932373046875,0.16499805450439453,0.16669178009033203,0.1510770320892334,1.2438559532165527,0.08321714401245117,0.1331956386566162,0.14303350448608398,0.13716602325439453,0.1413736343383789 diff --git a/results/combined/merges_timed/appstatus/appstatus.csv b/results/combined/merges_timed/appstatus/appstatus.csv index 7341db3978..0904e56c43 100644 --- a/results/combined/merges_timed/appstatus/appstatus.csv +++ b/results/combined/merges_timed/appstatus/appstatus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 70,refs/heads/master,c76bf77dfdbd3f235a7ab6dc304504a19e0947ae,b5f911a83e5319df2ff47603d24ab84b5c1cd930,08282fb20f2be3845592118435b9ae6f750ba2c4,,True,True,True,7,60,233,184,True,185,Tests_passed,0068eb6e8c396c3450fe57ff8866d29d5db0b689e6cbd8b31b007f9fdcf3cd84,True,Tests_passed,565af7ec27ba0172cfe94036b85cff7412f1e8a005516deb3094b8af9590442a,True,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,7ed8922ac73c7891f8ea4afbc08c014332d53294a6b9136b71fad615b17d80cd,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,b6be2f65453bfd1f1b96f17e65e75a2e6315f80399aa5aa0db2f977fecdc16f9,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,e6a0da9b536e2ac0057a2ae74e10604f858cb13d9a055d99921fa9bf5b45db7e,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,0.0669708251953125,0.05449390411376953,0.05269598960876465,0.06030845642089844,0.06444764137268066,0.0467219352722168,0.06419539451599121,0.43190956115722656,0.3472769260406494,3.497061014175415,0.5900299549102783,0.23021888732910156,0.17229056358337402,0.09137725830078125,0.09040188789367676,0.09082436561584473,0.09190869331359863,0.09170079231262207,0.1594221591949463,3.3522045612335205,0.08561277389526367,0.08568882942199707,0.07293176651000977,0.07535123825073242,0.07234430313110352 diff --git a/results/combined/merges_timed/arcbees/arcbees-archetypes.csv b/results/combined/merges_timed/arcbees/arcbees-archetypes.csv index 01dc2ba6c1..76396a94ab 100644 --- a/results/combined/merges_timed/arcbees/arcbees-archetypes.csv +++ b/results/combined/merges_timed/arcbees/arcbees-archetypes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/master,084676165de5efceeb6002f5fef9ab28411531ea,a28fc80a9d07b9eeb2eae944f59478c949983df1,e39e7ff7e6e62409ea54d2e9b6f5b05c209d3ebe,,True,True,True,132,276,692,3,True,132,Tests_passed,a92a1512f34dbf008ec12ced0cb44d2023b17e44fff1157adecc8c16e92ad0e2,True,Tests_passed,b36afc048802b58eb2bdafc8d28d8dee3ed0541678481f3a55a08d2573c14462,True,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,a0f65412de8b7d361062cdd991c0ff4b2a59261be0f8b32d85e41a20149e60dc,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,0.02028942108154297,0.020314455032348633,0.03157997131347656,0.030567646026611328,0.02295207977294922,0.025414705276489258,0.03133535385131836,0.06444048881530762,0.12803959846496582,0.6241278648376465,0.6962878704071045,0.1211693286895752,0.16592693328857422,0.07266712188720703,0.07139158248901367,0.08320736885070801,0.06946325302124023,0.07715559005737305,0.12648892402648926,0.6880016326904297,0.06725335121154785,0.06912803649902344,0.05264735221862793,0.06764554977416992,0.05303525924682617 diff --git a/results/combined/merges_timed/arcbees/gwtchosen.csv b/results/combined/merges_timed/arcbees/gwtchosen.csv index b106ebcdfa..fb00a70496 100644 --- a/results/combined/merges_timed/arcbees/gwtchosen.csv +++ b/results/combined/merges_timed/arcbees/gwtchosen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 106,refs/heads/master,d5d56191cde632b6ce9f22b6853ca259916891ae,b59b3895a44f81599ae677d9844ba74307c9d976,ae85f4e58a75ad64e4d2b1634f151f153a2b9f77,,True,True,Tests_passed,49a9f21dcee43a001f2555df84bfa40e6c854efa884329346627830df8eac79d,True,8,91,3672,2,True,Tests_passed,7c15d3cc4a12da563d7905dc2e5378d38b82dd90fcb9b459ec1abbcb5cf78daf,True,8,True,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,78382166aba9bf525c877700b1e3daeaaa1b34582f63edc8dcc1b98651532e7a,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,f9cc5f9861eb7b698d1ea88096ff7767db9e0fd7e500056f0a4f37ff75849668,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,Tests_passed,05ad6ca3e2497c38f2fb11f2ec92b9e609171237d0f8c1cc6cf85663c3c2e0de,0.015401601791381836,0.015916109085083008,0.017220735549926758,0.017998218536376953,0.017483949661254883,0.017423391342163086,0.01749277114868164,0.04494524002075195,0.0709989070892334,0.01885056495666504,0.6587989330291748,0.08845353126525879,0.15017437934875488,0.0561826229095459,0.055364370346069336,0.055701494216918945,0.0569767951965332,0.055785179138183594,0.09391999244689941,0.06996011734008789,0.054023027420043945,0.0539095401763916,0.042984962463378906,0.052237510681152344,0.04418349266052246 diff --git a/results/combined/merges_timed/arcbees/universal-analytics.csv b/results/combined/merges_timed/arcbees/universal-analytics.csv index 97332ff585..159e6f4fd8 100644 --- a/results/combined/merges_timed/arcbees/universal-analytics.csv +++ b/results/combined/merges_timed/arcbees/universal-analytics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,d4259d6249da0e00f06f46da5c68e12a89dc7f80,94a02010f5d77d4472e4a618af3c5d74da5207b6,6621d617e75f83815f297d2e734b4f6952d1615f,,True,True,True,39,361,1600,8,True,39,Tests_passed,c7ce74e29e8e7352afd4c31fc2bfd7c332d2dcb12d76e6e88acd8bbca83f67ac,True,Tests_passed,5ca1de52e35b6501158fe73bceb17c0364a2ef6981074eaad08286c416d28f17,True,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,781bcf97efd2cc2798964ae6bf73ad40bd9a301f511a617fc10762d089399f6c,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,1b8ed382758bb730d09b76f819445a82cd80d72729328375794ed0a453f3fb1f,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,283e5a1320d3c1cafde80917fb93867c8d41d94f89b1319493bdb1fc66ad4a21,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,0.038987159729003906,0.03702735900878906,0.04109454154968262,0.037982940673828125,0.043276071548461914,0.04789113998413086,0.046625375747680664,0.5518481731414795,0.45903682708740234,3.4041261672973633,0.5002834796905518,0.25182628631591797,0.15471410751342773,0.07632684707641602,0.07668042182922363,0.07737421989440918,0.07448387145996094,0.07588720321655273,0.20557165145874023,3.388197660446167,0.07668495178222656,0.07625222206115723,0.05238199234008789,0.07685327529907227,0.05325794219970703 diff --git a/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv b/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv index f737f07ad3..f05ee38630 100644 --- a/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv +++ b/results/combined/merges_timed/ardesco/selenium-standalone-server-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,957d978135279c122dcfaf9d72ed5a89f487b0ae,2fbb7e4f756f0288d11b2cf4bf2ca6e25cbafc07,c14176511dd6db04b8b175f5c3cb30abd9929449,,True,True,True,14,50,333,4,True,14,Tests_passed,33de56f17f9a862cf5be309b20f7dac23da7a8121ac3bd88510a53417b0391d7,True,Tests_passed,506a90dc93cd6f4f00ce7df0c39bee07cb8eb9a14f493a3c3e0a1036a900fb56,True,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,9851f5b1e8a39aa126a579557b022b04931ddd9d4f7a859002a56f0f2ccf913d,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,673377ed588ca1778189c5e347c0cd48242902be5aa73156c70fcc23060f3f6e,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,2b5d3fe603de9b434b9f03b7dc1b3b83525b69b557708de3cfac5a8bd06ae311,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,0.04118752479553223,0.039116859436035156,0.05435538291931152,0.03207087516784668,0.04249978065490723,0.05347084999084473,0.03549695014953613,0.2882046699523926,0.23501873016357422,1.321315050125122,0.4201507568359375,0.14012789726257324,0.13535308837890625,0.053629398345947266,0.05717325210571289,0.05590462684631348,0.0561370849609375,0.055883169174194336,0.12151432037353516,1.336122989654541,0.05526304244995117,0.05588030815124512,0.04762101173400879,0.05616354942321777,0.04711580276489258 diff --git a/results/combined/merges_timed/arimus/jmimemagic.csv b/results/combined/merges_timed/arimus/jmimemagic.csv index c2d28e8b77..b171915ff0 100644 --- a/results/combined/merges_timed/arimus/jmimemagic.csv +++ b/results/combined/merges_timed/arimus/jmimemagic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,c543655186711a1c141e3af8201ed0f45666dd5a,2f3cb6d930b665edfe70f06eeb03e76cc869bbe1,d2bad1e68bc2871c21c3baa67ac54f88aa7ab4f6,,True,False,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,True,2,1,18,2,True,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,True,2,True,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,979001eccde34158f1f6cd65cbc9d653bf43049328eed8d76ad400f4fb565f94,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_failed,affc0512dd5f97702796225b939faee8cfa753140035e339b3f43c76b2832d60,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,e1357f7a3622d04ea7cdaa39142c8dbade4c6e544dc0fc474fd0f0039b9b0b27,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,0.02512812614440918,0.01781487464904785,0.022598743438720703,0.026543855667114258,0.026401758193969727,0.023956775665283203,0.026828289031982422,0.12181258201599121,0.10940170288085938,1.1330008506774902,0.35521912574768066,0.08543705940246582,0.13964533805847168,0.0510556697845459,0.05026674270629883,0.03905510902404785,0.03948712348937988,0.05162239074707031,0.07305026054382324,1.0291728973388672,0.047232627868652344,0.04745364189147949,0.03682279586791992,0.04786968231201172,0.0366826057434082 diff --git a/results/combined/merges_timed/arnim/hdp.csv b/results/combined/merges_timed/arnim/hdp.csv index aa08bbbf25..3ec4d11f6d 100644 --- a/results/combined/merges_timed/arnim/hdp.csv +++ b/results/combined/merges_timed/arnim/hdp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,57e634d310aa6445d6b27e3262801d235a809357,d47b8c4e62b612f326f1b31c4c0db125b6597622,ea7bd11d56e0b1869ec861ecb011fa7fa309f84b,,True,True,Tests_passed,7c8982c3e9b5f2cc621b9e64dc0a27347185b827460129b4525347fcd5cc3d6e,True,18,43,1077,3,True,Tests_passed,d8919e0a2d04c70dc26597739bc83021437dfba63ff751fd79589df88da8ccb0,True,18,True,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,0.038593292236328125,0.038393259048461914,0.04069232940673828,0.015495061874389648,0.039173126220703125,0.04268193244934082,0.04114842414855957,0.16840457916259766,0.04257822036743164,0.03862118721008301,0.47010326385498047,0.045635223388671875,0.12147188186645508,0.03844404220581055,0.038692474365234375,0.039194583892822266,0.0389711856842041,0.03978586196899414,0.07242512702941895,0.05038142204284668,0.03855633735656738,0.03879284858703613,0.0363314151763916,0.03891158103942871,0.03659319877624512 diff --git a/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv b/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv index ced9fff9aa..d075754193 100644 --- a/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv +++ b/results/combined/merges_timed/arnobroekhof/kafka-http-metrics-reporter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,2def1e280114d209ed8a7314a8b236051b4c503b,85631073f159e2f624955db081c5759e6822c6ef,2371e6119d531a6405d6e89d7ec78a2aa4012365,,True,True,True,7,37,340,5,True,7,Tests_passed,df8c858ac71d05013d16bd16d82d10b3256166785586b6b22044608f55e9ff37,True,Tests_passed,03d8896cd387655bbc4eda5c37ad6f8305487eef241542fb3a87ee7f938714db,True,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,39f730c5f64333a92dcf2e502c274e8be4b14980d5933dd854523c56ad2805f2,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,6dcc8b0b29f434e5b85dffdd40538917c2fe0084288ad7b0f04964746938215d,Merge_failed,d0cd89544354f20cce3a5b73b5d30f7bfb7d6d0c6f0828e0dd37185180c92d6a,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,f8530239006d2eac8ce1029e1b339c90727ca9bce14bf0047f7053d6e2cf92de,Merge_failed,c59ed1f818d6e557a8da7d5795631429d4195536f6aca8f615f98046ce3c7c0f,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,0.04127216339111328,0.04114794731140137,0.009686946868896484,0.0388035774230957,0.03345441818237305,0.038841962814331055,0.03975033760070801,0.3564941883087158,0.31229376792907715,1.3407800197601318,0.25029587745666504,0.17226696014404297,0.1324462890625,0.05270528793334961,0.05344557762145996,0.05466270446777344,0.054288387298583984,0.053385257720947266,0.1302473545074463,1.3839764595031738,0.054427385330200195,0.054198265075683594,0.05265545845031738,0.054633378982543945,0.052741289138793945 diff --git a/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv b/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv index 88109b3cdb..1dd301765a 100644 --- a/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv +++ b/results/combined/merges_timed/arquillian/arquillian-container-jetty.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/remotes/origin/pull/87,39bdbff77e89dc772b812683a19a55b7db9ecb6a,38a562379eb854cc31391e754cf0e793fdf8e35a,e9c27acf0fa7891a0fa7b833da552ee7724ad8b1,,True,True,True,31,139,978,2,True,31,Tests_passed,de037d51ccfab8fd713240f1e405e9e0a45b3138f5d859d1519f61536bec14a2,True,Tests_passed,147af071ad6577bb1dd648880354c0ac645fd3ddfbedd1d03c602bf83635e014,True,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_failed,62865ba94f5477f30274dee864b138c46f296e2b6726f7b0dc611dc7930ff945,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,0.011631011962890625,0.011912107467651367,0.012829780578613281,0.012415885925292969,0.012661457061767578,0.012714624404907227,0.01272439956665039,0.038477420806884766,0.06759476661682129,0.8417479991912842,0.5748295783996582,0.07801246643066406,0.13411784172058105,0.045763492584228516,0.047312259674072266,0.048041582107543945,0.0461580753326416,0.047492265701293945,0.07924199104309082,0.8879899978637695,0.045043230056762695,0.0449676513671875,0.034807443618774414,0.04664182662963867,0.035825252532958984 diff --git a/results/combined/merges_timed/arturmkrtchyan/iban4j.csv b/results/combined/merges_timed/arturmkrtchyan/iban4j.csv index 61bba9b823..76d925b0ef 100644 --- a/results/combined/merges_timed/arturmkrtchyan/iban4j.csv +++ b/results/combined/merges_timed/arturmkrtchyan/iban4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,ee807e0a05fc291337dc0b8d5753265f55fed104,9de45a0291792726c86b1d8b843fa6b2fc7fb4f7,d1d3aa59e50447b135594902ef80877e5c852373,,True,False,True,6,18,71,2,True,6,Tests_passed,837a88b28f3967640d98a8a0aae019b256ec3aa12d8fef9c8745705e601a3c49,True,Tests_passed,2d0cbf9c6e73e33221c0a8342ccd3d5d38fa77dca15f10e2fec8590fd7f49006,True,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,c8b16bb4e0db3b5eb13b422624c3016d7eca9edeb7b572151a475263db7e3dd6,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Tests_failed,176fc8c75323f89e1166db637a3207a9f36ed241657fbc3a8edcf27cedbdf335,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,16cbfd1caecb32e26bb8a2ecd9c0a07f8599ba37532873f1415ff3a4e5072060,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,0.04063677787780762,0.043109893798828125,0.03419017791748047,0.03739333152770996,0.046146392822265625,0.03522968292236328,0.0422213077545166,0.17344331741333008,0.12125778198242188,0.9867944717407227,0.4022972583770752,0.07088780403137207,0.1148691177368164,0.03512430191040039,0.034368038177490234,0.03509402275085449,0.03585648536682129,0.035869598388671875,0.0662529468536377,0.9466607570648193,0.034925222396850586,0.03580045700073242,0.03252530097961426,0.03499650955200195,0.03400826454162598 diff --git a/results/combined/merges_timed/asciidoctor/asciidoclet.csv b/results/combined/merges_timed/asciidoctor/asciidoclet.csv index ba5eeff901..e2da5b881c 100644 --- a/results/combined/merges_timed/asciidoctor/asciidoclet.csv +++ b/results/combined/merges_timed/asciidoctor/asciidoclet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/master,e31ec7a8acded7cc6ed731a391ddaf86d13329da,4b279a4f9b5f6719ef1d99014d6967eb460488e5,06a32ee38abd15691f802949c797e428c8b9f07b,,True,True,True,12,53,409,5,True,12,Tests_passed,c9f483e06f2176eda62d75ac4205364a082fcfaa36665f886377fc3ed3e7670a,True,Tests_passed,4aced6fc18d4fe0f7ec8e17b133463eb7d37f8a8f8912c5d285b1b30973d2dd3,True,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,cc4c9076a0a1c22a313d2687b73140cbe8b294f9bd7aaca404dbe4e22a687cca,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Tests_failed,c41572ffcdb9a004b932761848ae131e275cd1ccdb62446b018d5390a7a69bc6,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,95a98deee5900f23eb6ff06f4b5d66dfa1bdb32034ccee2433dd3679d3c4ea77,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,0.03784441947937012,0.03348207473754883,0.03914976119995117,0.04185056686401367,0.04182934761047363,0.036245107650756836,0.010811805725097656,0.33919525146484375,0.27611827850341797,0.6074743270874023,0.2902872562408447,0.16285371780395508,0.13689184188842773,0.05649852752685547,0.05701112747192383,0.055933237075805664,0.056508779525756836,0.05527663230895996,0.13622331619262695,0.6276922225952148,0.05718684196472168,0.056763648986816406,0.03326821327209473,0.05628466606140137,0.0337069034576416 diff --git a/results/combined/merges_timed/aseldawy/spatialhadoop2.csv b/results/combined/merges_timed/aseldawy/spatialhadoop2.csv index c3999ad565..153b7718f1 100644 --- a/results/combined/merges_timed/aseldawy/spatialhadoop2.csv +++ b/results/combined/merges_timed/aseldawy/spatialhadoop2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,833f69b3184bfb8781abcacc04859fd8dbb01b0e,24b3b64b0443ce6d49e50ecd52934bddeee319b0,3d060e0c3804c23128a917d51d96876350d203b1,,True,True,True,4,9,169,3,True,4,Tests_passed,c92c2e0ffa0f0406331b6b4a7961cbf22ff143475c269aa9dbb022d0a8fc8cb7,True,Tests_passed,211649ad60b8a7b8ac004a571c67878435aa06379fbeed486874381cfe936cab,True,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_failed,2b34b6de605ffdc8bef8807147d9ff6294a6039ed225f6638304ac0cdbe975f1,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,0.044953107833862305,0.047120094299316406,0.040642738342285156,0.04626178741455078,0.042936086654663086,0.05080223083496094,0.04475045204162598,0.22522401809692383,0.1623845100402832,1.593639612197876,0.3349885940551758,0.1077108383178711,0.1335465908050537,0.08191847801208496,0.04983830451965332,0.04967188835144043,0.049102783203125,0.04813647270202637,0.10006570816040039,1.5683231353759766,0.047754526138305664,0.04942440986633301,0.030282974243164062,0.048009395599365234,0.029870033264160156 diff --git a/results/combined/merges_timed/astefanutti/metrics-cdi.csv b/results/combined/merges_timed/astefanutti/metrics-cdi.csv index e638a8c6a2..77f10d84fe 100644 --- a/results/combined/merges_timed/astefanutti/metrics-cdi.csv +++ b/results/combined/merges_timed/astefanutti/metrics-cdi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,e3afc46398a8f613fbf841984a64a838d7b7898e,29e7bac497513de420543497612180331cc5d1b3,1def8a8aa23211109f40b06e979c0f64045e0bd5,,True,True,True,123,281,971,7,True,123,Tests_passed,ab773b5fd6bfa9d866a6f39016487e6dbed2e3793b9df7cd9d882b17165985aa,True,Tests_passed,b1c2545045a10b07384a65323023f020131d2b0c1c5cbdd77e843fb473e1637d,True,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,0.04180645942687988,0.059825897216796875,0.04744386672973633,0.05860471725463867,0.06501960754394531,0.06337761878967285,0.07181572914123535,0.45502281188964844,0.37776827812194824,3.3867087364196777,1.0238959789276123,0.23675823211669922,0.18079686164855957,0.08912348747253418,0.09177541732788086,0.08994293212890625,0.09191536903381348,0.09097814559936523,0.21347975730895996,3.5291073322296143,0.08600831031799316,0.08886432647705078,0.0409243106842041,0.08606719970703125,0.04102444648742676 diff --git a/results/combined/merges_timed/astrapi69/jaulp.wicket.csv b/results/combined/merges_timed/astrapi69/jaulp.wicket.csv index 1af74260fc..097977cfb1 100644 --- a/results/combined/merges_timed/astrapi69/jaulp.wicket.csv +++ b/results/combined/merges_timed/astrapi69/jaulp.wicket.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 22,refs/heads/develop,f4a6f0e81a16add0005c7da1bc9ccc3188b974d5,b17cf26ca146d4d8eacaadc21b3f314ab1bbf488,ad14308fa5ce7ae64e07a37e30d973da77999c40,,True,True,True,31,165,850,10,True,31,Tests_passed,03679928af45d3cf429d0873a6c95e2f4e51195d4b0cac1ddae51a1e97581b66,True,Tests_passed,1c8f1af1715d3c95e0720e8dc3c09fd3f28985c6d6b378d2be39be54d32244a0,True,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,eb13a08a0ab6630fb2c7162e5679207c07418196228acdab5bfc1c6c1b61a25f,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,213c7d6609b3925ae62a5f20196367e1aa13415a1134949143c95b0f528e236c,Merge_failed,3353c85dfd422601c5fbb94dc3cd1e3a20aa5858a937ebfe7f416238ea1fa314,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,bcfa2773197488f7c86c493139bf8cb796ccba4ec5ebfe9b224173fd0496d9d4,Merge_failed,0c1f2d6657041e54d08d60e0985b557717dc694bdda1b22289892b31209a770b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,0.02112412452697754,0.02150273323059082,0.023558616638183594,0.02362370491027832,0.023669004440307617,0.0240323543548584,0.0181124210357666,0.17221760749816895,0.5193483829498291,0.5598175525665283,0.5927152633666992,0.32788658142089844,0.18625974655151367,0.0971381664276123,0.09951543807983398,0.11147332191467285,0.10084939002990723,0.09754776954650879,0.25562000274658203,0.6702251434326172,0.1114199161529541,0.09769392013549805,0.08952498435974121,0.09926676750183105,0.09024930000305176 diff --git a/results/combined/merges_timed/ata4/disunity.csv b/results/combined/merges_timed/ata4/disunity.csv index 0649359b31..2b7899ec5f 100644 --- a/results/combined/merges_timed/ata4/disunity.csv +++ b/results/combined/merges_timed/ata4/disunity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,True,242,336,13397,6,True,242,Tests_passed,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,True,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,True,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,d392dfd1cc301317c906977eb6e88f4cc93fcc968f42a7bf3f5b67eb0c4276b8,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,c74291a900df05eb1eae076fae81b8504eeb986cd2b66c10138caab84e17abba,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,0.1039888858795166,0.10417532920837402,0.18209600448608398,0.09692573547363281,0.1815509796142578,0.09480071067810059,0.18160700798034668,0.23134541511535645,0.21884918212890625,0.10659098625183105,1.1859915256500244,0.33333444595336914,0.3628196716308594,0.2825803756713867,0.2913525104522705,0.2837259769439697,0.2813875675201416,0.2767341136932373,0.3356144428253174,0.2769942283630371,0.20575857162475586,0.21011924743652344,0.20044755935668945,0.20702838897705078,0.20101451873779297 diff --git a/results/combined/merges_timed/atam4j/atam4j.csv b/results/combined/merges_timed/atam4j/atam4j.csv index c53ebe8cda..36246480e8 100644 --- a/results/combined/merges_timed/atam4j/atam4j.csv +++ b/results/combined/merges_timed/atam4j/atam4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,71fcecb071270981bc92b14d2cc3b0e56828c011,ac72c93c78397f60ed7d24de967e1fe34a9b36b6,fb6e6e5d5b8dbcbc2679e18f3f491847f6dcc33e,,True,True,True,17,70,438,3,True,17,Tests_passed,205610f2f84c4fc3fe3a162a6cb8f4409067f27af6a1d5840c90980f844b4ea6,True,Tests_passed,1f646b266f7cb714e05397072ac2744a0b05b86dfef6de5740f8ea203e17e431,True,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,e765739003097850ccc9ac0cef5745cb6e631e2b3bc22d7aaeec90a9a7930f51,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,e9f1476d364c6c41316bc7ec7456383d731d43a194bb35f76cc6c7904ea92fcf,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,d88c457cf7b5f27d58902f50a139d2260c05f96eecb8078b370e413b9b7ca9a1,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,0.009353876113891602,0.009544610977172852,0.009859323501586914,0.009628057479858398,0.009802818298339844,0.009476423263549805,0.009590864181518555,0.05025458335876465,0.1328134536743164,0.8956389427185059,0.5330078601837158,0.10342526435852051,0.12551116943359375,0.04197120666503906,0.04220843315124512,0.042563676834106445,0.04280281066894531,0.042359113693237305,0.08907580375671387,0.9507484436035156,0.04139208793640137,0.042665958404541016,0.04057598114013672,0.0433354377746582,0.039778709411621094 diff --git a/results/combined/merges_timed/athou/commafeed.csv b/results/combined/merges_timed/athou/commafeed.csv index 87915db48e..6ebca6ac90 100644 --- a/results/combined/merges_timed/athou/commafeed.csv +++ b/results/combined/merges_timed/athou/commafeed.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,True,32,129,751.0,2,True,32,Tests_passed,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,True,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,True,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,0.04391169548034668,0.02853107452392578,0.05548214912414551,0.03167438507080078,0.05568099021911621,0.03195905685424805,0.05533170700073242,0.15135836601257324,0.0884239673614502,1.131885051727295,0.5403134822845459,0.08333134651184082,0.19210577011108398,0.08585906028747559,0.04960465431213379,0.0494837760925293,0.08369016647338867,0.08331823348999023,0.10513687133789062,1.0621817111968994,0.07593631744384766,0.08239865303039551,0.07507801055908203,0.08100175857543945,0.03935718536376953 diff --git a/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv b/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv index 71fe4fed68..ec82c2bef1 100644 --- a/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv +++ b/results/combined/merges_timed/atmosphere/atmosphere-extensions.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 77,refs/remotes/origin/extensions-2.4.x,8fd31b3e8717249b185da0e271103a90b760e89b,7b84f67240d1fe92228648acbb9d67e4a0960ba7,3607c69f55516200dd452f86afc2751818f498ee,,True,True,True,42,115,886.0,28,True,44,Tests_passed,6f27fca37c4d9988982bf676fa9ebb9164f23efa3cfac7b1cd386c15f62c470f,True,Tests_passed,6031e123e91269536304aba4f3fbf17cb4abb736dfae882ac34014429e7b6cfa,True,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,5eaac6726137e4abcac5af959819ca7117d4cf6c34946ef68887e43f09a1f60b,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,3405b20ce96048e8d3b0cd4cd6d07d136977cc6de986167aed04fd77d9cc5804,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,ba478956bc8335a69c49d8f205ff854751f3dcd087e74d5cda96b5d6b6ee99a9,Merge_failed,2c678f04f97c377ff6cfec77e2f8e730c4117ed6067d4f4fddea545c3c986c4a,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,0.06305408477783203,0.06435751914978027,0.05757951736450195,0.020156383514404297,0.04812788963317871,0.06508135795593262,0.04471278190612793,1.698744297027588,1.5434134006500244,0.5253880023956299,0.558056116104126,0.8946628570556641,0.3009929656982422,0.2175915241241455,0.21872901916503906,0.21307015419006348,0.2202608585357666,0.221527099609375,0.6145279407501221,0.6958284378051758,0.21789765357971191,0.21420812606811523,0.21110129356384277,0.2161238193511963,0.21074986457824707 diff --git a/results/combined/merges_timed/atorstling/bychan.csv b/results/combined/merges_timed/atorstling/bychan.csv index cdb4fd9ed7..5db8016618 100644 --- a/results/combined/merges_timed/atorstling/bychan.csv +++ b/results/combined/merges_timed/atorstling/bychan.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,96d59116bbca17ba5b72e31736f17cb431b19ad1,9783d0571b7a7c006f5c295b536dbfecf5178f12,00e0379193b04458c930e16f42d0870700df6c42,,True,True,True,14,57,172,2,True,14,Tests_passed,771bd4150cc0ef221c8bd7a389faa83049508c489b3b98638b44cf458ddbd6f2,True,Tests_passed,4c5eacf255995b4c85be64a931da3fd3fc548a32e0a53ea8546a36e066b4a0b1,True,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,0.019611597061157227,0.01961660385131836,0.02458477020263672,0.023757457733154297,0.02486276626586914,0.02481698989868164,0.024790287017822266,0.05363583564758301,0.07502889633178711,0.8054416179656982,0.5189142227172852,0.10110163688659668,0.1330738067626953,0.06787490844726562,0.0718679428100586,0.04078960418701172,0.06912517547607422,0.06567549705505371,0.09057378768920898,0.8558101654052734,0.05340719223022461,0.06308174133300781,0.05535459518432617,0.06023144721984863,0.04973340034484863 diff --git a/results/combined/merges_timed/attoparser/attoparser.csv b/results/combined/merges_timed/attoparser/attoparser.csv index d638803f2c..1038dbd50a 100644 --- a/results/combined/merges_timed/attoparser/attoparser.csv +++ b/results/combined/merges_timed/attoparser/attoparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,798b83b78f7a4821456d8ec3d36f9f86cbc1d5b0,2c0f34f7637d172a354518387ece1ef19c01fb4c,9ea8984c9828d2f35f6754195a5e23b740c546eb,,True,True,True,9,19,152,2,True,9,Tests_passed,2c12d47073f152e140db1f836dd074f563a67b2df0693a51124a5c5e166749fb,True,Tests_passed,3bb345124a68f0dfe2c0417135132e6bf662acadd2b2486482b55a30f46df361,True,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,0.04937243461608887,0.04807090759277344,0.041295766830444336,0.06603360176086426,0.048183441162109375,0.04696345329284668,0.04155683517456055,0.17593097686767578,0.12469887733459473,0.05480146408081055,0.7976992130279541,0.08649945259094238,0.14539694786071777,0.05300617218017578,0.05149126052856445,0.05059170722961426,0.052934885025024414,0.05289316177368164,0.09422016143798828,0.06574535369873047,0.05314135551452637,0.049897193908691406,0.0404515266418457,0.0517580509185791,0.03925037384033203 diff --git a/results/combined/merges_timed/augustt198/lumen.csv b/results/combined/merges_timed/augustt198/lumen.csv index 185123e401..1693622692 100644 --- a/results/combined/merges_timed/augustt198/lumen.csv +++ b/results/combined/merges_timed/augustt198/lumen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,7d97ea8fcd51dbe8b89640b5aa4df71836c06834,f8caae07c25e99ce557f4a4e7c99f17fe15071e3,91bfe976e4de8e35b136285351f8430cb99903be,,True,True,True,26,45,457,2,True,26,Tests_passed,055b804925b7fa8654ec1fe911a72480ecbf1416d03155b8436c1ac4a67b5f2f,True,Tests_passed,9ef8a67610a72565cf195ce3ee4d0505c784ab9afcbc08a01950b2bd6b89232d,True,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,8c09719eb7ad7e3bdf337bfe5e7a2bf38577862fdf08e7a9f39e6121aadba24f,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Tests_failed,a2e891b964d64fdc85a734f6036898f3bc8ffb7b661801ada16ed510a25ba067,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,241b319cadb9518aa7367b7b89fe7a01124d2e5616370fc29133e1272c18a57c,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,0.02411675453186035,0.04845404624938965,0.0438690185546875,0.04414987564086914,0.04652833938598633,0.04970526695251465,0.03866100311279297,0.15722870826721191,0.1176455020904541,0.9991409778594971,0.5843617916107178,0.06954264640808105,0.11571002006530762,0.03871464729309082,0.03997468948364258,0.0386958122253418,0.040004730224609375,0.03803110122680664,0.06998586654663086,0.9499003887176514,0.038373470306396484,0.038854122161865234,0.03782486915588379,0.03963136672973633,0.03783273696899414 diff --git a/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv b/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv index 2e40e0a573..d6abc51710 100644 --- a/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv +++ b/results/combined/merges_timed/aurbroszniowski/rainfall-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/heads/main,7ac65a5f80090b7e18e9280be5ddb3a183d8da66,29a68d4ec812c2a6ca35b52f22f43c3ea4b67c39,8b883513acbe998713abbd743921ca455dc69445,,True,True,True,21,50,999,2,True,21,Tests_passed,ca603698c7f3f52f447d99d19e990cf7bbe01e9921a343c4f9bd25040ce9c5a7,True,Tests_passed,026bd25b9aa9406dee80143389a5178491827a84f4e277a99f8395b334ceb8bf,True,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_failed,c7c141d975834c095a87179787672f8ce58dd75a4af4802a92d338cec0f928e7,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,0.022207260131835938,0.02221083641052246,0.03868269920349121,0.03714632987976074,0.03306841850280762,0.03737783432006836,0.022181987762451172,0.11318588256835938,0.10169124603271484,0.7066237926483154,0.5040445327758789,0.08866643905639648,0.14632868766784668,0.05540728569030762,0.05481553077697754,0.05760955810546875,0.0569462776184082,0.05532193183898926,0.09447550773620605,0.681225061416626,0.05181455612182617,0.051627159118652344,0.042678117752075195,0.04906582832336426,0.04435110092163086 diff --git a/results/combined/merges_timed/auth0/java-jwt.csv b/results/combined/merges_timed/auth0/java-jwt.csv index 72d06038a6..631a7e4006 100644 --- a/results/combined/merges_timed/auth0/java-jwt.csv +++ b/results/combined/merges_timed/auth0/java-jwt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,True,True,True,63,299,2284,10,True,63,Tests_passed,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,True,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8545447a8a08f11db002c933f54a44fdea2db1fa4d7308d925582e04ad2743f6,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,0.06605100631713867,0.04931831359863281,0.050232887268066406,0.056230783462524414,0.048090219497680664,0.0627899169921875,0.05784153938293457,0.6624741554260254,0.5039567947387695,7.294728994369507,0.7811439037322998,0.30994701385498047,0.1846308708190918,0.10103845596313477,0.1011199951171875,0.09690213203430176,0.09791064262390137,0.09807777404785156,0.2663419246673584,6.877007484436035,0.10088896751403809,0.09770631790161133,0.054572105407714844,0.09746217727661133,0.054196834564208984 diff --git a/results/combined/merges_timed/avaje-common/avaje-agentloader.csv b/results/combined/merges_timed/avaje-common/avaje-agentloader.csv index 2e9bbec2cd..af384dec76 100644 --- a/results/combined/merges_timed/avaje-common/avaje-agentloader.csv +++ b/results/combined/merges_timed/avaje-common/avaje-agentloader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,1406ac7a25bad7155a3ace629e63da4ba6d9c4c0,9fef8b5a77120ba7feb1d1d46e763bc4b1052d6c,6652713f4ba4337ca030fea6c306cc21c932fdae,,True,True,Tests_passed,b600ab30bf1a6c2c0338e1364d1953ab9794ed902bc23873aea1f3ef70cb90e5,True,4,15,61,3,True,Tests_passed,d9f63ef2754a04cb34a1ab4e47ebbfd76fbabe9b62d7ad695671c6e13959833e,True,4,True,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,31057f913a038aba6f24db1aba3ea9e6779116409a6c53c0356ccf87630c7abb,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,834fc8ccf5b1975e010a5489af3590f2eed5c64c029d93ff98cb4c13796c5ec3,Merge_failed,bc78ea94ab3adabaf81382511dfc87fd8184b1ebbc73d94f08f6089fc9ee4410,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,c8de3c85e4f4d2722c5fbce1fc3158eec49b07837371b2b88a478849f01f2953,Merge_failed,9542ddd18bb2530a5c7a3860bfa3dd23d656997036bc24dedac727ce850c3e8c,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,0.010302066802978516,0.04129815101623535,0.04221749305725098,0.03571057319641113,0.03776216506958008,0.03697681427001953,0.040988922119140625,0.21999573707580566,0.1797330379486084,0.7902274131774902,0.2698984146118164,0.10272073745727539,0.12058424949645996,0.040659427642822266,0.040586233139038086,0.040741920471191406,0.04137587547302246,0.040639400482177734,0.08628630638122559,0.8034350872039795,0.04156780242919922,0.03954052925109863,0.03935408592224121,0.03969073295593262,0.038161277770996094 diff --git a/results/combined/merges_timed/awaisathar/dependensee.csv b/results/combined/merges_timed/awaisathar/dependensee.csv index 75dad7925b..28c6e68f78 100644 --- a/results/combined/merges_timed/awaisathar/dependensee.csv +++ b/results/combined/merges_timed/awaisathar/dependensee.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,38b5080a19a4b08f68e6255427afa7d8d57caae4,55efd475ca9223eb2ac75021f4862487b70ab2c5,56277c0e14a8c2bef74e4be02bbd2d980f4d939b,,True,True,Tests_passed,4f38be01ee9da8e1497a2544f50925a20a119f2b13d80064095318e001670c27,True,7,30,182,4,True,Tests_passed,c2128c07d91497e2179ba4694ad88b57660e18859d979bffbb8beb43db6e96d0,True,7,True,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,83c811f3b7cf490047ff31c0c5b8755c89f0442a3c1cae13e1377d5e6cc493c5,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,2c23e39635c8853ee25ca1c5285a8fe4a5ffce5b92f4fd59b88c0f53d9d0c74f,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,c495fefe4b29c6ae0db1f851bcd36fbcbe4a85c1cd22aa4823f4105424725e37,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,0.03763270378112793,0.041391611099243164,0.010508537292480469,0.012546539306640625,0.031003475189208984,0.03216052055358887,0.013474702835083008,0.3093569278717041,0.2251298427581787,2.2134323120117188,0.32756948471069336,0.1402297019958496,0.13104009628295898,0.047568559646606445,0.04769468307495117,0.04719257354736328,0.04716086387634277,0.04773736000061035,0.10807228088378906,2.1843626499176025,0.04890799522399902,0.04909777641296387,0.046190500259399414,0.048797607421875,0.04614448547363281 diff --git a/results/combined/merges_timed/awaitility/awaitility.csv b/results/combined/merges_timed/awaitility/awaitility.csv index d4a8394a35..bd79340cae 100644 --- a/results/combined/merges_timed/awaitility/awaitility.csv +++ b/results/combined/merges_timed/awaitility/awaitility.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Tests_timedout,51d8510d5ed040ef94e34f8be2c6198cb98dd31124aa0176ab2fb5539d83c4c6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.03825807571411133,0.026620864868164062,0.047556161880493164,0.01991438865661621,0.02585744857788086,0.05531501770019531,0.04225420951843262,0.22882771492004395,0.17362451553344727,1.2263951301574707,0.30504822731018066,0.1117713451385498,0.13161635398864746,0.04925203323364258,0.05039048194885254,0.04624795913696289,0.050537824630737305,0.04802060127258301,0.09953594207763672,1.213266372680664,0.04947662353515625,0.04856061935424805,0.04177427291870117,0.04842543601989746,0.04022216796875 diff --git a/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv b/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv index 17cc8a31bc..b0379b6948 100644 --- a/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv +++ b/results/combined/merges_timed/aweber/rabbitmq-flume-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,93b744705965d180aa463a576f96eb6c2e19731b,642e116773e5d3495f3f95682e72cd77a7e391f8,c8e66e6ebdab6bbf07c30912f64625fd8e8187b8,,True,True,Tests_passed,b470b08641dd44116f4201fb4d577b3ff69300ab5a0b2949327b64f8a236787f,True,8,18,43,3,True,Tests_passed,c598958f04ce09f559db8ef634d8cdb3613f46e9129a23d9a37de862526480ee,True,8,True,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,0.008794307708740234,0.008954286575317383,0.00860905647277832,0.008661508560180664,0.008766889572143555,0.008694171905517578,0.00875997543334961,0.042949676513671875,0.11600112915039062,1.5237650871276855,0.3500802516937256,0.09801959991455078,0.12721681594848633,0.04531145095825195,0.045177459716796875,0.04588007926940918,0.04634571075439453,0.04573941230773926,0.09427833557128906,1.5644323825836182,0.04583144187927246,0.045796871185302734,0.027587413787841797,0.04491138458251953,0.027400493621826172 diff --git a/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv b/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv index e6f6b6be0a..35509110ae 100644 --- a/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv +++ b/results/combined/merges_timed/aws/aws-cloudtrail-processing-library.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/2,75fb2ff17d00bd2a2f1f478901a13de2149b3f15,eb47dbe7b5f96148b77d94f0a1471de1d01830a2,3aa119cc6425360f76cb96fb5c7f103db1c92ca8,,True,True,Tests_passed,751d4a43b21d8de56b21e3a148883a4cec30be4695c800a6a3e691999d5ac912,True,82,96,278,3,True,Tests_passed,f8343de806fb0573de66933baf08fc3bb54cd37f2a49addbe0b73575573eef59,True,82,True,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,740ee519d959a4077fedb1b023a31b858563d9d47ffece415399fce7e81df8ef,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,6514943e1d33b0af754808af85fe340226f10188c54055b0ecb62aa1a2beae98,Merge_failed,a6a782362e5023408d76622d584944f96c822ab4d24dd6e5a04a268b13499d24,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,97ecd86bdbf815e5c111ba4c6d0caf77d07d46300646c3f94d87ef5da4f427da,Merge_failed,0acfe2cb0f0aeecda348798086df23987f0c7b4c75538ff49fcfff5fc664bc35,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,0.04653811454772949,0.05917692184448242,0.052701711654663086,0.05152320861816406,0.05758547782897949,0.055236101150512695,0.056145668029785156,0.2175917625427246,0.17685151100158691,0.7141304016113281,0.599341869354248,0.1074514389038086,0.12827134132385254,0.04770207405090332,0.04740095138549805,0.04728341102600098,0.04739570617675781,0.04801630973815918,0.0974276065826416,0.7122764587402344,0.045349836349487305,0.04619169235229492,0.03832268714904785,0.04694080352783203,0.03860068321228027 diff --git a/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv b/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv index a9650789c1..1d139fbedb 100644 --- a/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv +++ b/results/combined/merges_timed/awslabs/amazon-kinesis-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 120,refs/remotes/origin/pull/221,ed1f9d4dca07aefc6c353bd84552f7cc041a63aa,92c0b43b2a391f52f633ebe2eff4c288988b8cfa,f9701f96519acb1bb7e45f3b8cbabdb81f08ed9c,,True,True,True,47,185,1102,3,True,47,Tests_passed,dbf5991e5695532e2e2785d52ade252ac90a581263b493e951ccc81bed099d07,True,Tests_passed,6e21f76599e647576e6c2001eb548dcd56b9a05fa26f60cd8c8422aeefcae914,True,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_passed,ef6e994f040ba00849800a17428fcb3de54cdd97686bb88934d98477621874c2,Tests_failed,ec0689371e1b2189a2ad8ba6488c4bc303e295fd6ef461efe2b8c10755bddee9,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_passed,ef6e994f040ba00849800a17428fcb3de54cdd97686bb88934d98477621874c2,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,07ca1a132d9d7d587336cf8b364c814c847a39d079368942e1078069986247e6,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,Tests_failed,fed63f615aa65aa09639637af3a456db2749a1d952efed277c1c2d8fdeee7276,0.03161025047302246,0.0363924503326416,0.03439044952392578,0.06681108474731445,0.05126047134399414,0.03599882125854492,0.04647684097290039,0.1410083770751953,0.15465140342712402,1.2532639503479004,1.1540651321411133,0.13621854782104492,0.1766514778137207,0.08125567436218262,0.08266019821166992,0.08225488662719727,0.08136200904846191,0.058670997619628906,0.1431260108947754,1.2545063495635986,0.07486224174499512,0.07900166511535645,0.05996227264404297,0.0727074146270752,0.05836153030395508 diff --git a/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv b/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv index 58a65e8666..70b667c6dd 100644 --- a/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv +++ b/results/combined/merges_timed/awslabs/amazon-sqs-java-messaging-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,04b2881401bb35ae6113c4802484135c1c3533ae,721cd7d882b4af5168f474d16a071d780ffa91dd,091d3e41238d823838d761c2c41532ca7e880f97,,True,True,Tests_passed,09114dcb420c91af75b3e08615a81b4afc454335ae2df7c939c660ba9be72594,True,56,144,583,2,True,Tests_passed,842420198bc8701ec5ba7c5a3bbde3d742c921a48e89eb417cc6ee8ea49e7ca9,True,56,True,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_failed,0af47479ff6767c9a1d7dc1e2c84f654bc3d11510e7c43240cdfa545ee9e0618,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,0.042525529861450195,0.05101633071899414,0.06299996376037598,0.06098461151123047,0.03650164604187012,0.04703545570373535,0.04755830764770508,0.16946744918823242,0.11815142631530762,1.123809576034546,1.1631641387939453,0.08061742782592773,0.1398627758026123,0.04964494705200195,0.051422119140625,0.05165719985961914,0.05084419250488281,0.05155587196350098,0.08426499366760254,1.0509698390960693,0.04783987998962402,0.04947328567504883,0.03906822204589844,0.049164772033691406,0.039258718490600586 diff --git a/results/combined/merges_timed/awslabs/dynamodb-geo.csv b/results/combined/merges_timed/awslabs/dynamodb-geo.csv index 53976a30bd..8d3603eb02 100644 --- a/results/combined/merges_timed/awslabs/dynamodb-geo.csv +++ b/results/combined/merges_timed/awslabs/dynamodb-geo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,1d1b774cef3609a4e9f435c2ed8ea36359e058bd,f4d62cbb93f622c0565ff23a95908385d1d4a799,ef43ffecf577d610b6be671634c64bf1dc09adea,,True,True,Tests_passed,999c7d6c45f71b90674a9e41b7abc7f88cf4307059383432b586990243381013,True,5,13,95,2,True,Tests_passed,92b9ae4263d61671d401e712afa7c73976334d71e3a61b60b8cedb0a33449f7a,True,5,True,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,e89cc8059d250aa9f2173c8fdca55444dc6942b0caaf858bec1a671b73629bd2,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,0.09301209449768066,0.0930325984954834,0.05215287208557129,0.1341562271118164,0.13864517211914062,0.13538146018981934,0.11452960968017578,0.17320847511291504,0.11213922500610352,0.8321640491485596,0.3857078552246094,0.2762033939361572,0.395169734954834,0.037998199462890625,0.23525118827819824,0.03980398178100586,0.23642468452453613,0.0411832332611084,0.31438446044921875,0.8994655609130859,0.040930747985839844,0.19840383529663086,0.02979278564453125,0.20347881317138672,0.02883744239807129 diff --git a/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv b/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv index fcdab6f31a..fc20f441f7 100644 --- a/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv +++ b/results/combined/merges_timed/awslabs/kinesis-log4j-appender.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,4acb58fdc4040822d2f8bdcad0e89354a06a1157,3304473d0d47b00517e04e5942052f4205edca9a,cc0811dba8cb9210fa86aa57f2ac40d9e14ff244,,True,True,Tests_passed,a1eefa38c5061dbc9b605fd767ee746846b0e52f77fa831f49ae9d2b4cfd7868,True,7,17,155,3,True,Tests_passed,ff928199e1db91f59b72fde0191ccbe323b1e0fab491d8e8c9ee292aeb1a4bdb,True,7,True,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,0.043430328369140625,0.04649186134338379,0.0443730354309082,0.045194149017333984,0.04446673393249512,0.04247570037841797,0.041356563568115234,0.2168745994567871,0.1710834503173828,0.7936110496520996,0.26379919052124023,0.09773397445678711,0.12781786918640137,0.04542183876037598,0.04681897163391113,0.045587778091430664,0.043648719787597656,0.04487776756286621,0.09325599670410156,0.7743585109710693,0.04483938217163086,0.0456395149230957,0.02708888053894043,0.04494214057922363,0.027148962020874023 diff --git a/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv b/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv index 65955bb89c..19f6c492c2 100644 --- a/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv +++ b/results/combined/merges_timed/azuread/azure-activedirectory-library-for-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 107,refs/remotes/origin/pull/189,7ba3f410c7ea8203968eeb2c99ab62442eca40a6,58a2d8745bbe51f24c83ed6e1366f803938e6aec,6cbac35775566870f20a40e3bcec515b7abd24e9,,True,True,True,19,94,1316,4,True,19,Tests_passed,752b6a018987f3867236868724a405de7294f1d5368214a6d168ebb97ccd008f,True,Tests_passed,affbc3e449c2e8faaba9bcdd5ef5e150b19db4b16dcfc1ef64435f60fd9926b1,True,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,91501224b845f04d556e02acfb664188a88cadf7cb9d0d0746bc056d1b52e01b,Merge_failed,4d049b063393c21237e5e3a2f5e56a4868a1f080c5decf21a9b0608cfebf4c2b,Merge_failed,60682237aee3b42794039695f5272109751e3479d44515bea8bb49aa0376ff0e,Merge_failed,e8ad2e5031b24add152c3ae72bd7a1a0f6f6f0c0e7242789a8555ab6a222acc0,Merge_failed,4d049b063393c21237e5e3a2f5e56a4868a1f080c5decf21a9b0608cfebf4c2b,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,24d08fee974d5a8e03361406b699ae1b1e62311262cc84bffd71fad36399fa85,Merge_failed,60682237aee3b42794039695f5272109751e3479d44515bea8bb49aa0376ff0e,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,Merge_failed,1cb9a7ebdda1fa16f27568e2cb21d2bc6c9c9cebd2dbec40e327a90ccccf3104,0.03459620475769043,0.04503369331359863,0.038634300231933594,0.04508066177368164,0.053168296813964844,0.05708575248718262,0.054231882095336914,0.3261525630950928,0.2500474452972412,2.9412715435028076,0.6320598125457764,0.14130449295043945,0.13979792594909668,0.056982994079589844,0.05684709548950195,0.05854511260986328,0.05742001533508301,0.05702543258666992,0.12623977661132812,2.7540366649627686,0.05829930305480957,0.05576658248901367,0.04919767379760742,0.056772708892822266,0.04767203330993652 diff --git a/results/combined/merges_timed/b/kafka-websocket.csv b/results/combined/merges_timed/b/kafka-websocket.csv index 2f05f83539..1f61b82059 100644 --- a/results/combined/merges_timed/b/kafka-websocket.csv +++ b/results/combined/merges_timed/b/kafka-websocket.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,3e7fb0a946a78bee2f1ae85fcbdc36e3d85bc5d8,214dd17bdce8b4bb846f1906bbeed685bff07be9,c1cc4961a40a45b2b4fd1796eeda998ba5e6d617,,True,True,True,15,32,400,2,True,15,Tests_passed,2de6155d3b55b16d42dcebd7bfbdb5643fef262f33a5ab66f6ee22338a78d563,True,Tests_passed,b395ee4c0847300b9a2e4233f74ae41c237010fb93f1a9fa3326ecd7611cd0ed,True,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_failed,224551dccc1495143b99208718169e8173aa4712236f33dd9721fa4676c4098c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,0.008585691452026367,0.008965492248535156,0.009319782257080078,0.009346246719360352,0.00873422622680664,0.008953094482421875,0.00917959213256836,0.038961172103881836,0.11918807029724121,1.3069379329681396,0.464918851852417,0.09122061729431152,0.12636804580688477,0.03815197944641113,0.037672996520996094,0.038452863693237305,0.03880023956298828,0.03789019584655762,0.07536196708679199,1.321220874786377,0.038022756576538086,0.03859114646911621,0.027659893035888672,0.03862571716308594,0.027647018432617188 diff --git a/results/combined/merges_timed/barend/java-iban.csv b/results/combined/merges_timed/barend/java-iban.csv index 8a185cf514..7799544cfb 100644 --- a/results/combined/merges_timed/barend/java-iban.csv +++ b/results/combined/merges_timed/barend/java-iban.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 66,refs/heads/main,981e0311705b2f83cabb82c9c9e098952960b248,6f91a456f15385e0c713bf52e99249b7679222e8,97764aca73b79d78f8544cb2d6355501efcd0d2f,,True,False,True,5,30,168,4,True,5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,True,Tests_passed,138260e0ef7fb7cebe0f1d9e127da546ec05033e2ef378c0e6b2dfbcdd24f6b4,True,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,69dd05809a336ccfa9267c41766e292fcb17c00af23cfca504726a01a0350fb5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,de65cc873cd172aef52247335ab474571833c1d47551cd906f1afc5a3f1fb7de,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,2f28d3d17890592f5f6e32ecf70e36b5ffcbe15f7d0f69b486a8cd08c9012356,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,0.00970315933227539,0.009860515594482422,0.009824514389038086,0.010242700576782227,0.009905815124511719,0.009815454483032227,0.009597301483154297,0.06370282173156738,0.1849057674407959,2.5425896644592285,0.35222363471984863,0.13825345039367676,0.12732386589050293,0.0480043888092041,0.04808521270751953,0.04897713661193848,0.04953408241271973,0.049012184143066406,0.1136164665222168,2.2868776321411133,0.05024576187133789,0.048624277114868164,0.033354997634887695,0.04995131492614746,0.03301095962524414 diff --git a/results/combined/merges_timed/basho/riak-java-client.csv b/results/combined/merges_timed/basho/riak-java-client.csv index a2d053fbe1..95a62ba36a 100644 --- a/results/combined/merges_timed/basho/riak-java-client.csv +++ b/results/combined/merges_timed/basho/riak-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/develop,1cf7c917508a69d5ea12f3d5bebc3dab5984be23,e1c33ec9de33e6b395401183c18c60da5cad31a2,15da081ff85e6c899184b619b4bf87bb0728f4ea,,True,True,True,16,61,252,2,True,16,Tests_passed,3a228fafc2b902172c56310aa0b7e8b212d2ed676d56ca388c381af7c7be9baa,True,Tests_passed,8e3ba0cef7564135f171ddbe9b22eaec0c0f9aa01a6af618ec8b2bf6b34231f1,True,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_failed,56bc020f1539db12b3aafd53497c711b4f46c9fbb4109a66640c88ec3aeaea66,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,0.011985540390014648,0.011957406997680664,0.013340473175048828,0.013225317001342773,0.013278961181640625,0.013298749923706055,0.01287078857421875,0.039090633392333984,0.06747055053710938,0.01540827751159668,0.45018959045410156,0.0839529037475586,0.12718749046325684,0.04849076271057129,0.04888725280761719,0.04703664779663086,0.0493011474609375,0.04881405830383301,0.08300280570983887,0.059877634048461914,0.04777050018310547,0.046793460845947266,0.03592967987060547,0.04784750938415527,0.03724503517150879 diff --git a/results/combined/merges_timed/bastillion-io/bastillion.csv b/results/combined/merges_timed/bastillion-io/bastillion.csv index 1b10f98e96..7705006899 100644 --- a/results/combined/merges_timed/bastillion-io/bastillion.csv +++ b/results/combined/merges_timed/bastillion-io/bastillion.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,True,7,32,113,2,True,7,Tests_passed,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,True,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,True,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_failed,104d4e4275646fe3a9efa197b0c08323d6f353aa14172a3db0603ba95e5eca28,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,0.040569305419921875,0.020774126052856445,0.040750741958618164,0.031053781509399414,0.0456082820892334,0.07231497764587402,0.021005868911743164,0.13183975219726562,0.12875866889953613,1.1734318733215332,0.41932129859924316,0.07505512237548828,0.1636192798614502,0.0722506046295166,0.07000041007995605,0.04109501838684082,0.07157468795776367,0.0670468807220459,0.11454892158508301,1.1333777904510498,0.0615847110748291,0.06503820419311523,0.058837890625,0.06526589393615723,0.029799461364746094 diff --git a/results/combined/merges_timed/bazhenov/load-test-tool.csv b/results/combined/merges_timed/bazhenov/load-test-tool.csv index cbdd568603..8de6952f79 100644 --- a/results/combined/merges_timed/bazhenov/load-test-tool.csv +++ b/results/combined/merges_timed/bazhenov/load-test-tool.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,6593812db93b89deb415cd4e2728baf690b38487,34d51cd87873b3239c3fc65ee88f35468a23baea,63a868bfc12d00d726e6ecba2fd9be1b5ae29584,,True,False,Tests_passed,313f0c1ddaba97cbd2d795a390befa7e6f00f21d58ea17e4df27dd46c40a7328,True,2,1,8.0,17,True,Tests_passed,2394e1e6dba97558969834a69f14bb27c1062dfdd27c67cb2d4c5a418e1c0d68,True,17,True,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,ead356baef18eb94975767454fdc555baa489ecb7ca94e1acea0b3ddd919d8cc,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Tests_failed,ae7222ddd19b7e144650364a9a10ab4448991780a718b80c1a48467fbbd883e6,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,6b2eb3bb6755c466f43c2e8cbecef0d6f0fa8d49efa77f0c0ffbbcf11b2b1b4c,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,0.038123130798339844,0.0391240119934082,0.03932833671569824,0.030520915985107422,0.036347389221191406,0.04111480712890625,0.04415750503540039,0.17374277114868164,0.1041419506072998,0.44814300537109375,0.3598761558532715,0.06642436981201172,0.11260414123535156,0.033548831939697266,0.03374171257019043,0.0338132381439209,0.03329658508300781,0.03368401527404785,0.06340456008911133,0.4498140811920166,0.03432297706604004,0.03398013114929199,0.032441139221191406,0.03417634963989258,0.03192305564880371 diff --git a/results/combined/merges_timed/beastmachine/ggplot.csv b/results/combined/merges_timed/beastmachine/ggplot.csv index eff86c4c9c..ab09b44920 100644 --- a/results/combined/merges_timed/beastmachine/ggplot.csv +++ b/results/combined/merges_timed/beastmachine/ggplot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,e2841b05bab86e238732649229f3d0a2834badf7,5a94ad6e32c8175745c301c900a3184e83a6923c,ff2ab22bcb56d13c130004d312f0b56efd1f8ed2,,True,True,True,6,15,188,2,True,6,Tests_passed,a035e7a19867b9a5062fb37a9524b4745247c17f6f566cb42d5608cbf1931a4a,True,Tests_passed,0bb57dafc5ba5a54fa0b5aa060883bf862b8914b0dad133ed974d232eddfc10d,True,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,5e97975fa1ee062883fd625d36db6d0bf983a6951ddf50184661022b30b45348,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Tests_failed,461440b78a16fb516456a8e5a80d9c4c06c22a8c805fc428c8a6de418111952f,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,cf7dcf7c0d584f5ddf4706f486ffa237bade18138dca56a89916b466fa86fec3,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,0.03054642677307129,0.038384437561035156,0.04659891128540039,0.038292646408081055,0.03882455825805664,0.04100322723388672,0.032270193099975586,0.16979598999023438,0.10570454597473145,0.5409183502197266,0.3335423469543457,0.06667494773864746,0.11353683471679688,0.033789634704589844,0.0338900089263916,0.034761667251586914,0.034766435623168945,0.03538942337036133,0.06613588333129883,0.5195343494415283,0.03412270545959473,0.0345766544342041,0.03351640701293945,0.0334467887878418,0.0334012508392334 diff --git a/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv b/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv index decb8ac974..1d1ecf940e 100644 --- a/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv +++ b/results/combined/merges_timed/bedatadriven/jackson-datatype-jts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/remotes/origin/pull/5,1416f1af0698abdf85fed9076cf00896f176f3a8,980366ecfc5b313f23e9032c2cd766bd1905f777,9f80c5c8e0ca843d54cc23fcb5769a824f0b0ff7,,True,True,Tests_passed,a33534485efef0da7fa4ea4fb639e0acc16c6eea5069a81db41d5ba044c136af,True,3,4,13,2,True,Tests_passed,d1c22d1dc041af25a27710c793a4d2bf9c5ed4681c3df27570e7dbcc08bd456d,True,3,True,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,74cb1006fcada0fd6e0b9c25db6a64cdb3e6c872db4702d872d14957b27195b7,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Tests_failed,6eea65c340c77581b6d0f2601b9366fb865977a724fd1fc381f449ebeeee1cca,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,1561e874abba516ed1baca89e07729a5084f7fd260c3568719dcb041cf7ec598,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,0.030667781829833984,0.03727364540100098,0.03853106498718262,0.036594390869140625,0.03143477439880371,0.03269243240356445,0.03667092323303223,0.16221332550048828,0.10513496398925781,0.7702414989471436,0.2731759548187256,0.06427979469299316,0.11160063743591309,0.03158116340637207,0.031215429306030273,0.03121185302734375,0.03128314018249512,0.03162097930908203,0.061328887939453125,0.7116689682006836,0.03240823745727539,0.03203225135803223,0.029920578002929688,0.03206372261047363,0.030375242233276367 diff --git a/results/combined/merges_timed/benas/easy-rules.csv b/results/combined/merges_timed/benas/easy-rules.csv index 921215ba82..68e3a899df 100644 --- a/results/combined/merges_timed/benas/easy-rules.csv +++ b/results/combined/merges_timed/benas/easy-rules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/remotes/origin/pull/289,cc5de266d34bd622580059ef5de52d5e893c0b53,1967db34f27494adfbe443337a240891e96b50ad,b888b85119db7adde3d9399c9d9bd1d0079731f4,,True,False,Tests_passed,eda46100da055b1844a4bb18f2c5adad510930c2928460d2396afb8993500409,True,4,6,13,3,True,Tests_passed,ec8d986848f0c9e3b88548412c1332df3652820cb9578caf1cbb418bc0636e30,True,4,True,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,61d60f93ef0900a0209a83f92009f89d46755fb0ff4e42e880f7d7bc20820d44,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,3224e89bf539864fdab90426d1e7b9278e4da378a0b8e4aa736996733df48d33,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,6276e65d3ff7f69ffd1db5f3e3464783836962d7bfb8c2c7e004a4f09cd2c33a,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,0.028174638748168945,0.029384136199951172,0.041097164154052734,0.030654191970825195,0.04118204116821289,0.04319357872009277,0.034900665283203125,0.2266981601715088,0.14893174171447754,1.179353952407837,0.29004621505737305,0.11143231391906738,0.12304282188415527,0.047182559967041016,0.041014671325683594,0.04899120330810547,0.04875063896179199,0.04089975357055664,0.09844040870666504,1.231107473373413,0.0423581600189209,0.04960775375366211,0.04952359199523926,0.047333478927612305,0.046593427658081055 diff --git a/results/combined/merges_timed/benas/projector.csv b/results/combined/merges_timed/benas/projector.csv index 0dca718b9b..6720a37b4a 100644 --- a/results/combined/merges_timed/benas/projector.csv +++ b/results/combined/merges_timed/benas/projector.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,f088b5c59aefe6966218d6af783f02ec7508a6c6,a127d12133d0f2e3def0d99a999250ab6ed5d77a,52020bf4c023f00a76086ddd3b6f0a48eb69606f,,True,True,Tests_passed,d81081af6ef3c25acc3e63a9b8bd3c26de150dd9010cb876f5751813fbee2e7a,True,23,73,391,4,True,Tests_passed,c0c421cf9772eb05bde93d2d847ca3788a3e5bdb65b5d4e9af1eea167d4a13bb,True,23,True,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,b77ec165ba3526546a4b76eddd037b5a0e0541258c5bdd154373473128cbaf53,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,8ea8314c66d21214c4b665c125e3c5dcd8e0bf830a4451ae7e2b916106a2e4c3,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,eccefcf90ef97c10c61c30ca81a3125938f67717a249967d92fecdca00e68500,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,0.009256601333618164,0.008911848068237305,0.009033203125,0.008839845657348633,0.009224653244018555,0.009671926498413086,0.009168624877929688,0.05839204788208008,0.17456793785095215,1.5798366069793701,0.44384264945983887,0.1401827335357666,0.1282510757446289,0.049634456634521484,0.05007648468017578,0.049612998962402344,0.049155235290527344,0.05027508735656738,0.1135413646697998,1.6507749557495117,0.04984474182128906,0.050170183181762695,0.03408098220825195,0.04979753494262695,0.03330421447753906 diff --git a/results/combined/merges_timed/benoker/dockingframes.csv b/results/combined/merges_timed/benoker/dockingframes.csv index b9524c3f9a..ea887c211f 100644 --- a/results/combined/merges_timed/benoker/dockingframes.csv +++ b/results/combined/merges_timed/benoker/dockingframes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 85,refs/heads/master,c3dfb4ebbfeb49d09b88c8aefaa07183eb0fa06f,a290c6b19c9e7efaa8a780d9c97e2d6173b69b09,de608ff664a7df506839703b09a98b6f21d41491,,True,True,True,20,240,1951.0,3,True,20,Tests_passed,1bec92ba3e6acc88f87f589e9ba1b941f49efbcf9023abcafc424da963573e79,True,Tests_passed,9143dea5299555abf5e5e88b9862399b8bd701f9def2b8782fc3b4fa6aaee830,True,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,c30f0f27044f6f3252be16893f01707519fa4f0f7c62921cccaf0b72568ee680,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,bc1f170650e1f84ad34d96f427575c56e42410bfbfd9fcd0a3e39bff049cd76f,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1f878068cbb33d4cfb4f0ebbe553004ec67eb7f88ce304fc08b87e7a9ca3bd0a,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Tests_passed,9ce8d61148439f447ec45a2e66e2eb4725a57d8fd8ad3a676df2d6b0b0699bb0,Merge_timedout,,Merge_failed,93346f18f3ed0b973082c6522d6f4c0c2024345903690025d4d31ad8dc89f7da,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,bc1f170650e1f84ad34d96f427575c56e42410bfbfd9fcd0a3e39bff049cd76f,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,e79489fc640ec686bd2724864d86496b4e9dd24af44de7b6389aaba11d44ccc6,Tests_passed,9ce8d61148439f447ec45a2e66e2eb4725a57d8fd8ad3a676df2d6b0b0699bb0,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,c30f0f27044f6f3252be16893f01707519fa4f0f7c62921cccaf0b72568ee680,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,Merge_failed,1a483c97d3304e341c791c604c9af34415e84fd33ae51ddcf7a53f4a82803259,0.016859054565429688,0.0172269344329834,0.018302202224731445,0.018278121948242188,0.018211841583251953,0.017676591873168945,0.018522262573242188,0.07827520370483398,0.13207769393920898,3.0810937881469727,-1.0,0.1182868480682373,0.13452672958374023,0.054619550704956055,0.057746171951293945,0.05623984336853027,0.05728030204772949,0.05531811714172363,0.11003541946411133,3.123105525970459,0.055675506591796875,0.05518150329589844,0.05428624153137207,0.05397224426269531,0.0527806282043457 diff --git a/results/combined/merges_timed/bguerout/jongo.csv b/results/combined/merges_timed/bguerout/jongo.csv index 5a68e8fcfd..aad0cfb50e 100644 --- a/results/combined/merges_timed/bguerout/jongo.csv +++ b/results/combined/merges_timed/bguerout/jongo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,697fc67ed565bbaf3b67d4ad5e8a19ca8c09e90c,468ca36d2cbf8216f91c3543aa60be4254469479,bdcc9aaa22f9470ce4d424736aabbc49c4857931,,True,True,True,39,99,1921,7,True,42,Tests_passed,8d773af9214d52f12790ff4fb133e81df8c5699668bcd88742e1f3e4d58cf2a6,True,Tests_passed,b2ca0ce4f00d3864211e434312373e07b732d8165795867063ce1b92f1608d1f,True,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,8e76cb6a448635dd1fe09fe138a948f98b94c6d7d347f64bfe9fb22e4cf666ee,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,2f44c4684153cba4983fe6526cce452b0a5eae01d0b6c8e637c5207ea84d2115,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,35da450546eb595b7c0ce859eb74120cf73e84a0eae411e6f2e74e180eb7d011,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,0.055085182189941406,0.05562114715576172,0.04331183433532715,0.04566669464111328,0.05116462707519531,0.05127429962158203,0.04306507110595703,0.30126404762268066,0.20873570442199707,2.37990665435791,0.47820520401000977,0.13660526275634766,0.14347362518310547,0.05355668067932129,0.05984783172607422,0.05813956260681152,0.05199790000915527,0.06104564666748047,0.12841224670410156,2.2314939498901367,0.058431386947631836,0.060239553451538086,0.048055171966552734,0.05735969543457031,0.050492286682128906 diff --git a/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv b/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv index f106026bb9..2885135fcf 100644 --- a/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv +++ b/results/combined/merges_timed/biezhi/30-seconds-of-java8.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,True,True,Tests_passed,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,True,2,3,23,2,True,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,True,2,True,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,aecc17bc717623a21984d3b3e27ed054c58492c0002ecbfb4b744d531573194d,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Tests_failed,437b7e1683c8a0497ccd8e45561718e4c3446dbb6bbb294ff66d113d79f8b952,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,ad8dd15ad82b9ea258c6137fcdd93bb452e7c64cebd90087c43cffdadd21bcff,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,0.04017519950866699,0.0380709171295166,0.039852142333984375,0.03662991523742676,0.0381929874420166,0.03687429428100586,0.037882089614868164,0.16466546058654785,0.11150431632995605,1.436072587966919,0.3807549476623535,0.06524395942687988,0.11948823928833008,0.03165578842163086,0.03276777267456055,0.03316807746887207,0.03278946876525879,0.03289079666137695,0.062077999114990234,1.331087350845337,0.0332798957824707,0.03323507308959961,0.03117203712463379,0.03274345397949219,0.030991792678833008 diff --git a/results/combined/merges_timed/bitletorg/weupnp.csv b/results/combined/merges_timed/bitletorg/weupnp.csv index f29c155c71..4ee2d3e234 100644 --- a/results/combined/merges_timed/bitletorg/weupnp.csv +++ b/results/combined/merges_timed/bitletorg/weupnp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/remotes/origin/pull/1,9054d6dff4032b41ba55d23678931497ff2af75a,5c19ff9fed515e83b86f15acb8d095b2f5e0cf5e,14664d548c67775a219b9a863e67e51242bd5bac,,True,False,True,2,5,14,2,True,2,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,True,Tests_passed,e7e462d1ff0dd4d1ea6665e84491d4ec1e7d574a1d6de93cea91575b36300290,True,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,abd4e77e256c2ae47df2d738c7926f45886eb1d51543573a414e3f3156cde993,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Tests_failed,28b55b08566201dd36e78904b866d12057c8ce64f5d5a064b37c1c9325f22d49,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,43ae16839c19f8dc33d2fa19cb95d53eaa0a8e72f76a61801a76d6566c52e600,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,0.0402216911315918,0.043372154235839844,0.04049539566040039,0.04208564758300781,0.03528904914855957,0.03667640686035156,0.03760385513305664,0.055582284927368164,0.11000323295593262,0.781761646270752,0.28243350982666016,0.06251168251037598,0.11118865013122559,0.032648563385009766,0.0378420352935791,0.03288769721984863,0.03299856185913086,0.03326416015625,0.06332278251647949,0.7906219959259033,0.03344368934631348,0.037384986877441406,0.03126978874206543,0.03285408020019531,0.03144502639770508 diff --git a/results/combined/merges_timed/bitzeche/zencoder-java.csv b/results/combined/merges_timed/bitzeche/zencoder-java.csv index bdc250ed87..73b8905f33 100644 --- a/results/combined/merges_timed/bitzeche/zencoder-java.csv +++ b/results/combined/merges_timed/bitzeche/zencoder-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,116a8e2fb219900072f36ac16320fbbe459cac03,4a25777e403cce64e4e0b44006380f932d85843c,81aff4a5655d87bab53885f736501b0d1c3aa23b,,True,True,Tests_passed,10cfd377843a748955e24ef91b8f18e075813dcd815d591e1f9cd23fa43460fb,True,7,29,147,2,True,Tests_passed,e2fe6d4f35b12ce12831cd97bf9bfbb0ea6f638acc787c9088baff9554d26440,True,7,True,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,0.04459547996520996,0.047368526458740234,0.04953765869140625,0.04426455497741699,0.04794049263000488,0.043209075927734375,0.037962913513183594,0.16820240020751953,0.11035466194152832,1.056281566619873,0.372983455657959,0.07024121284484863,0.12578225135803223,0.038730621337890625,0.039876699447631836,0.04050564765930176,0.039678096771240234,0.04017376899719238,0.07328605651855469,1.030761480331421,0.03986096382141113,0.039225101470947266,0.0285794734954834,0.03944897651672363,0.02908492088317871 diff --git a/results/combined/merges_timed/bjornharrtell/jts2geojson.csv b/results/combined/merges_timed/bjornharrtell/jts2geojson.csv index 26b6c2b6c5..fd8b0bc4e0 100644 --- a/results/combined/merges_timed/bjornharrtell/jts2geojson.csv +++ b/results/combined/merges_timed/bjornharrtell/jts2geojson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/master,afbe2cdddd2d776744547752f820f0d8c03ad755,f190b3781a786d8102f986dd5246cdbf3652b8a6,bfe0f485963079579c710e12acd36d34971c775b,,True,True,True,14,20,153,3,True,14,Tests_passed,e1d3a06eeb005ef9624875d7442754e74c46d02dd642a54a0ea7464fb57121a3,True,Tests_passed,136350a3b76cae98a566f5af6ff93532df288ba825c498edf98e528f3b48e9c8,True,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_failed,ccb84a77be5c1bb83c71f413f8d00942c9e810e02b081b53cfd27047e1a4d105,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,0.04346346855163574,0.04460644721984863,0.042308807373046875,0.04250955581665039,0.04329204559326172,0.044895172119140625,0.03903460502624512,0.22295856475830078,0.16607904434204102,0.6618447303771973,0.296708345413208,0.09789061546325684,0.12757110595703125,0.04514479637145996,0.04525637626647949,0.045069217681884766,0.0446622371673584,0.04470682144165039,0.09360408782958984,0.6590819358825684,0.043988704681396484,0.044742584228515625,0.026456356048583984,0.04420208930969238,0.026751995086669922 diff --git a/results/combined/merges_timed/blockchain/api-v1-client-java.csv b/results/combined/merges_timed/blockchain/api-v1-client-java.csv index 6c3923fb93..3d4b06021e 100644 --- a/results/combined/merges_timed/blockchain/api-v1-client-java.csv +++ b/results/combined/merges_timed/blockchain/api-v1-client-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/remotes/origin/pull/36,e349598f954da532e51825f2580948d63d0bb743,3fb6d582999cfd32ce450a5f7bede6ad3704d08b,14d5560b04fd84ba9c4173b6669a2b7d90354adf,,True,True,True,11,37,332,2,True,11,Tests_passed,982ba1f18069e4e35900310214fc89dc60d0a05e75a76a6a49418e765fe69b07,True,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,True,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,8bf5c56890ce0c78978c8fa3dcb7f88cad797dda16517b779135ef400965a0c1,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Tests_failed,cf5f04cb95ee8406cd0bfe5053289bafc15048af1f2c7962cf72543b146a02ba,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,7d1d09dcb8425a4ea029cb446a6a321acae250b51e4d9741614713b67ed2025b,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,0.037313222885131836,0.03557729721069336,0.039875030517578125,0.039427757263183594,0.044836997985839844,0.04068183898925781,0.03649425506591797,0.1635890007019043,0.09402608871459961,0.6908097267150879,0.3778269290924072,0.07444190979003906,0.11434054374694824,0.03306889533996582,0.03419852256774902,0.033406734466552734,0.03464102745056152,0.03451204299926758,0.06592059135437012,0.6732151508331299,0.03332257270812988,0.03426647186279297,0.032965660095214844,0.034668684005737305,0.033165931701660156 diff --git a/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv b/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv index 3a2367dc41..a56117ecb6 100644 --- a/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv +++ b/results/combined/merges_timed/bluebreezecf/sparkjobserverclient.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,46f2d8d50ae406cbf93855eb99b88e0fe9003454,91c92ad05f63c8e1b472f6d9e0164eb92537e03f,5cd4602a8d657cccbf97ea489eea519446c0e401,,True,True,Tests_passed,8a7c2669ed7f66932c02dc0b26f2d9d5a0da8b3faadfc49a32f034b3c1ad6611,True,4,29,256,2,True,Tests_passed,434ad22f00ca5015e85fdea7ceb5d67365a5eefa83ef8620dfe92cc2fa5d31df,True,4,True,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,0.04646754264831543,0.04988241195678711,0.04315638542175293,0.03564858436584473,0.05012798309326172,0.052347421646118164,0.043356895446777344,0.1651782989501953,0.12100028991699219,1.4561455249786377,0.36045002937316895,0.07179379463195801,0.12575817108154297,0.039406776428222656,0.04147052764892578,0.04108929634094238,0.04088330268859863,0.04119086265563965,0.07291412353515625,1.3651163578033447,0.039666175842285156,0.04114842414855957,0.030176877975463867,0.040258169174194336,0.03013324737548828 diff --git a/results/combined/merges_timed/bobharner/componentworld.csv b/results/combined/merges_timed/bobharner/componentworld.csv index a9940172c5..03f7355bd5 100644 --- a/results/combined/merges_timed/bobharner/componentworld.csv +++ b/results/combined/merges_timed/bobharner/componentworld.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/back-to-maven,1a2ff04097bd33609bd1c4ea9aa833640357f362,831fafda54d270586421497d4c0036067a47838e,ff5f0c920c58135ce736d60598f8080b991b6095,,True,True,Tests_passed,446d6bff03c906d7fbf16009920c2d6eb262258abc08f32b836f2b2c650d8c22,True,30,17,350,3,True,Tests_passed,6d270490d1e754219ddf921a19de11ddaabf2a83d80e57db5116904bbcee7abb,True,30,True,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,c929b6baa3ee92bfd4fe6ea595ed7ae18aeaa1659183a216cda18e04102bc991,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,1ccf82ce5e23f2ec90495e8a2e3bcfd96ac8ff7a51fb12b6649613fe86b6c480,Merge_failed,6b461a8a8b6a5097d81ac39a204bd4885be5f32de98c964b62b9d1ecc752eb17,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,5feda344267eafca69a49836d76e3cf9366621b91dfc866a66ed5bef571fa699,Merge_failed,7e9ecfa572928a11b4ced9da19dea056ba62f334a643cbef65d2d2b1e0df02d3,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,0.08621048927307129,0.05714869499206543,0.11442780494689941,0.11373519897460938,0.09696197509765625,0.11411190032958984,0.11404156684875488,0.16920256614685059,0.19932937622070312,0.5063347816467285,-1.0,0.20089101791381836,0.24922823905944824,0.14958977699279785,0.1870582103729248,0.14846205711364746,0.14471054077148438,0.18647098541259766,0.24993085861206055,0.6156373023986816,0.137131929397583,0.11764693260192871,0.17689132690429688,0.11877250671386719,0.12896966934204102 diff --git a/results/combined/merges_timed/boilit/ebm.csv b/results/combined/merges_timed/boilit/ebm.csv index 24d5c32c4a..9059f9aa5b 100644 --- a/results/combined/merges_timed/boilit/ebm.csv +++ b/results/combined/merges_timed/boilit/ebm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,b29fc0d1313fff81549c25758b1cc7b1d8f8a610,49250bf09cdeb0eae3090090c1e73c5e87ee72b0,3dedd78526d1feb50991b74c94a9e962b0610fc1,,True,True,True,23,92,859,4,True,23,Tests_passed,fd4dfdca08d3015f825302ec21cabc87f93f120885734fb10f42ac2ce3fcb2de,True,Tests_passed,807672812daddb02e11e69ab92bf391754bd8dcfd4d208cbfa2c219132058223,True,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,0.03714561462402344,0.07161188125610352,0.10403823852539062,0.10439658164978027,0.03570437431335449,0.11525130271911621,0.10470890998840332,0.28221678733825684,0.21256780624389648,0.7728300094604492,0.5340878963470459,0.2344520092010498,0.33912229537963867,0.07984685897827148,0.21514058113098145,0.15373849868774414,0.20762157440185547,0.1901257038116455,0.33079957962036133,0.8102002143859863,0.16759157180786133,0.1709728240966797,0.16156387329101562,0.1754765510559082,0.1573951244354248 diff --git a/results/combined/merges_timed/brettflan/worldborder.csv b/results/combined/merges_timed/brettflan/worldborder.csv index 0a946d18ab..a3464ac445 100644 --- a/results/combined/merges_timed/brettflan/worldborder.csv +++ b/results/combined/merges_timed/brettflan/worldborder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/remotes/origin/pull/173,fbf9066966d4b472136dcaf207400d77e2652ca5,c2a45b5876985665c80be37ff343d01f20399fe7,c1d99e560c227b2b5e3a5fb2f0d410159ff3d810,,True,False,True,8,41,148,2,True,8,Tests_passed,6598f969f1251c250c2c6a2be0a5ec85b5cd6b46d3a80eb7efafcdbe6fff175b,True,Tests_passed,64b77d515fd91002a7092ca06daef30aa8ab91c4a549fc7e42b0708e73eab6e5,True,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,0.011594295501708984,0.011245965957641602,0.012764215469360352,0.01190638542175293,0.011964082717895508,0.012707710266113281,0.01266336441040039,0.03743743896484375,0.06677007675170898,1.0676310062408447,0.5465939044952393,0.0762488842010498,0.13139629364013672,0.04590010643005371,0.044561147689819336,0.04557085037231445,0.04548454284667969,0.044542789459228516,0.0793159008026123,1.1225056648254395,0.043779850006103516,0.04485034942626953,0.03372621536254883,0.04340648651123047,0.03394460678100586 diff --git a/results/combined/merges_timed/brettwooldridge/hikarijson.csv b/results/combined/merges_timed/brettwooldridge/hikarijson.csv index 1c0e0b5919..200ea80b1f 100644 --- a/results/combined/merges_timed/brettwooldridge/hikarijson.csv +++ b/results/combined/merges_timed/brettwooldridge/hikarijson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,f1b45352cf9c8510a94fd97c943d4fe526cc94ad,98fb6a09755102f18ced62474bc1d08093fe06af,dc0f7cdf4f2186ff65e8ac4fb1edd7b2930d6171,,True,True,True,7,23,186,3,True,7,Tests_passed,8d2a1271a18045a380a928f3f87fa85f72215fafeaa6cd022459005e346aa220,True,Tests_passed,618dc5d39d5479d4d406718de1ceb91417fc3d2ea9052ad15711cc34fc74e090,True,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,3d60a23aa6a36c42c76c04dffeef362638e5712c94aecba00c90c8f26854a10c,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Tests_failed,9289d2a851a28f6ce2c2a41c9f3d5adbca19b0b15c37ae20f9070b14e2a46273,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,651ba4f1c0c92329b48ad72145386b4040247231c13f54f14534b5be631b9cc9,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,0.03260231018066406,0.02874016761779785,0.0374603271484375,0.04066061973571777,0.033489227294921875,0.03817892074584961,0.060811758041381836,0.22415494918823242,0.18512439727783203,1.437009334564209,0.4330110549926758,0.15154623985290527,0.16063404083251953,0.07607316970825195,0.07138848304748535,0.07435321807861328,0.07593178749084473,0.07281279563903809,0.13230299949645996,1.3947336673736572,0.07046055793762207,0.07218170166015625,0.0645606517791748,0.07417654991149902,0.06729292869567871 diff --git a/results/combined/merges_timed/brettwooldridge/nuprocess.csv b/results/combined/merges_timed/brettwooldridge/nuprocess.csv index bae923f5ef..05335da05e 100644 --- a/results/combined/merges_timed/brettwooldridge/nuprocess.csv +++ b/results/combined/merges_timed/brettwooldridge/nuprocess.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/remotes/origin/pull/131,c18f600e9456192f1216d5f1e5cb8da32822bec0,014e357002becfa872b246373656ec1f8b5d9b25,9b42fc36d3c678939ffbdfc139bcae048fa96526,,True,True,Tests_passed,d78ceb58f5917736a3bf8715aac4a119be8619905a8060a617dd3510d5316a53,True,6,9,39,2,True,Tests_passed,e17e709961098ed93c9f2e67d78b96b5c8155e05f381dcedc2e92f67d7378390,True,6,True,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,4a96197e7a6cd3113209e78c39bc75daef22c4b7c5574fbe90aee8b4f213a30d,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,1df039dc0179d489cc27dcd6c4de08f6b0a32734f3bc6f3d26e867f5519f46a7,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,040f7d468258791940b5bb0ed3b227e9960edaad628b119c3c04f024bc110443,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,0.03422904014587402,0.04122519493103027,0.03450489044189453,0.037695884704589844,0.04033923149108887,0.03405570983886719,0.043050527572631836,0.16683006286621094,0.12568187713623047,0.5470924377441406,0.3884751796722412,0.07400202751159668,0.11992001533508301,0.038066864013671875,0.03863239288330078,0.03902029991149902,0.03808474540710449,0.036765098571777344,0.06987309455871582,0.5723347663879395,0.03650522232055664,0.03809762001037598,0.03644847869873047,0.03547859191894531,0.036464691162109375 diff --git a/results/combined/merges_timed/brettwooldridge/sansorm.csv b/results/combined/merges_timed/brettwooldridge/sansorm.csv index 582914d6c9..138ee321bd 100644 --- a/results/combined/merges_timed/brettwooldridge/sansorm.csv +++ b/results/combined/merges_timed/brettwooldridge/sansorm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,6e3a8b4303ad3c0778bd04f08ceacd024e9b67a7,0b4c876530d7f4b4962fe88142d03ace6ce4d58a,9d23c8e449cc138506f4c71454a3116bfd051d46,,True,False,Tests_passed,9a9a1099dcca43179a9602fd983d6223fa9ef507b60df10cd2138730eb1bae29,True,4,15,81,2,True,Tests_passed,a128b6699580ca29f9938c9b6b0233f0f8057045c755ce6db700d846229e8f32,True,4,True,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,0.010223865509033203,0.04660344123840332,0.04442596435546875,0.04543280601501465,0.043305158615112305,0.04065394401550293,0.043709516525268555,0.15832209587097168,0.11688232421875,0.6519486904144287,0.37714195251464844,0.06739401817321777,0.12299871444702148,0.03777718544006348,0.038869619369506836,0.03790616989135742,0.03785276412963867,0.0385589599609375,0.06988859176635742,0.6717219352722168,0.037674665451049805,0.038292884826660156,0.02731037139892578,0.03764200210571289,0.027797698974609375 diff --git a/results/combined/merges_timed/brettwooldridge/sparsebitset.csv b/results/combined/merges_timed/brettwooldridge/sparsebitset.csv index 31416a507d..8d4a23cd47 100644 --- a/results/combined/merges_timed/brettwooldridge/sparsebitset.csv +++ b/results/combined/merges_timed/brettwooldridge/sparsebitset.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/25,43cda6d2235f1133ae94cdfebce65d0dbaa4d83f,1f168799ce0dcac325cc7d787b8bb24465bdbfa0,8b32633706533a1fb828e05415dbdbc2c32f3a31,,True,True,True,7,86,270,3,True,7,Tests_passed,a54e1416719615f83999c52735a79585ce2eff4f501f620963eb6800e82e2770,True,Tests_passed,c8aa55b9556b30704d48f2bc849676a11897da893973dc603bc242943cfd0738,True,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,b9d12b06a107afd30cfb524158f4025941f73a29fef086396972740ba6981b51,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,426f5e18614476a5fc9646cfdbc8c815eb887dbb494af6e083e0ad80b55bf1ca,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,4809ec42fcf03adc81529e2d2687b7f3630420d8ec1ae9ed02e41939926c0f95,Merge_failed,bbc0e976759ec252a74bc6e8a963550b76c30cd9952daa13718ffc312f70e875,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,0.037149906158447266,0.05401444435119629,0.03854012489318848,0.05866885185241699,0.05214834213256836,0.03739500045776367,0.02592754364013672,0.2542381286621094,0.16827154159545898,2.279326915740967,0.699650764465332,0.1296379566192627,0.15075087547302246,0.06495976448059082,0.06439757347106934,0.06358695030212402,0.06344056129455566,0.06441044807434082,0.11708855628967285,2.1544930934906006,0.06491875648498535,0.06049704551696777,0.05334210395812988,0.06398963928222656,0.05549478530883789 diff --git a/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv b/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv index 00003b4ef3..6344963aaf 100644 --- a/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv +++ b/results/combined/merges_timed/brewinapps/ios-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/remotes/origin/pull/12,ccc17f78b72bd7d10a1e55e134f3eb6205a97180,f5b7f6ef62af71a4d9f953956d87c2a9eaadd25b,75e78cc2b436b169582ce05d7c0b6871c66424b1,,True,True,Tests_passed,429b77e7e100fe4099b801c308b7c330955f0dc68a7105518f0bf26e2817fbd9,True,17,140,1466,2,True,Tests_passed,360795bd1e13760e12a6c9fddc0e03f361a00b164389fd2559d9bc19a9d3c0b0,True,17,True,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,372529464b657ce5f91cee6fe1c5ba3bee9f84c2b649b6f37ebf107caacc3eff,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Tests_failed,f336987a4b15e8db1a9075a2ad46b3b64863e76289d87de94b980c4c770cf43f,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,a84c69bc1dc20c16368316b800fea9530fbbb193e4645e7377a325511c618e39,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,0.057235002517700195,0.047975778579711914,0.0466313362121582,0.05362510681152344,0.05224204063415527,0.04306769371032715,0.05707287788391113,0.17870306968688965,0.16486310958862305,1.7534911632537842,0.65163254737854,0.10434246063232422,0.11907768249511719,0.039144039154052734,0.037505149841308594,0.03918910026550293,0.03933525085449219,0.03862309455871582,0.0709543228149414,1.6078741550445557,0.037854671478271484,0.03858661651611328,0.03738832473754883,0.038957834243774414,0.03529191017150879 diff --git a/results/combined/merges_timed/brianm/config-magic.csv b/results/combined/merges_timed/brianm/config-magic.csv index f2e50ca5e1..cc47cd09b6 100644 --- a/results/combined/merges_timed/brianm/config-magic.csv +++ b/results/combined/merges_timed/brianm/config-magic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,a7953193ae2e296565ecee2809830b5abb3a3bb7,0b2b3049ac1f80ac94d49f7a449af8281ad462c2,9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd,,True,True,True,15,61,536,12,True,23,Tests_passed,729c70a5cce401e65730c1a776367d40596d97439f28693e55cf802a8fe0b37b,True,Tests_passed,dab5f506370335878353bba304d83b48b05cccb3b206ff36072c9a5cc6d154f9,True,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,7748651d8c623b99b0ba0156fd1580659486c8f0c98c3a08aa3148900e318b2d,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,9080527ca16f981f294563c98199425e3b0f768ffe435df4f892eaf9eb65a7df,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,deb7a2d54d2adb30bd533d94d012acf4811163eee93cd653cc50598d198ca790,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,0.04176616668701172,0.0466609001159668,0.04107403755187988,0.03494715690612793,0.040364742279052734,0.04706454277038574,0.0428926944732666,0.2882351875305176,0.2368459701538086,1.9646737575531006,0.8968715667724609,0.1353166103363037,0.1281592845916748,0.049155235290527344,0.049645423889160156,0.050485849380493164,0.05014491081237793,0.04938673973083496,0.11370086669921875,1.8862659931182861,0.04985237121582031,0.0519101619720459,0.034598588943481445,0.05046272277832031,0.034403085708618164 diff --git a/results/combined/merges_timed/brianm/jdbi3.csv b/results/combined/merges_timed/brianm/jdbi3.csv index 69d5b2df4b..14a710505e 100644 --- a/results/combined/merges_timed/brianm/jdbi3.csv +++ b/results/combined/merges_timed/brianm/jdbi3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,9f40c034b7d4b1a262f723ec81a630d1ebeb31bd,d4bf1ba6bbff2c9a9726839d0dfbad1f154f0c07,536ef1ada584141d12aba9135f744404f007c842,,True,True,Tests_passed,a13deb9bb2aaaf9cd2f71dc901689920efd234f151b2cb716cfe559d27a9b83a,True,9,27,294,5,True,Tests_passed,35508aedfa7e6c36aca6730ac32b3f82c99929041227b69b611066caee59f314,True,9,True,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c863ff0e204e9538b6bc0a39c5074be19f4c15087647e5a2ec3a2f07ca462f1c,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,b7361d7f9f382d4456a0fa6d01ff67778a6f362d0edfcd3a42517d9af8b68d3e,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,0bcb47231b3c936237cfc45de74b8b8ef5724d8355faaedbf43b9fcf6597dc88,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,0.04014468193054199,0.04041242599487305,0.03388571739196777,0.03688406944274902,0.03910541534423828,0.03461265563964844,0.034612417221069336,0.33057117462158203,0.24273085594177246,1.6061160564422607,0.37535667419433594,0.1333754062652588,0.13035798072814941,0.04848027229309082,0.0482330322265625,0.04850912094116211,0.047237396240234375,0.04631829261779785,0.11949658393859863,1.6114733219146729,0.04887795448303223,0.04840421676635742,0.039960384368896484,0.04797101020812988,0.03939676284790039 diff --git a/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv b/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv index a5aa24075c..54ba64a04f 100644 --- a/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv +++ b/results/combined/merges_timed/brianm/really-executable-jars-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,913bd85a3e0137af536fc489fe7845625da4c99b,692acc3220ae529dde128d24a6fb920e599359e7,3ed2c7154ac04c734cfb7459ba5046483e34437a,,True,True,Tests_passed,5a9ba7434f61d3ba973df6c3f8ec363af8c30b7c64b36fcda65ed99883768681,True,4,9,40,2,True,Tests_passed,2016b6b4b0bc06d7d2024adceff138d02b32f0c452250912dc97978795f7a49a,True,4,True,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_failed,b4e6399513be3a03cc0a300d673f659ed47ad801ccb0ec35ce21a6e289f4659f,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,0.0400090217590332,0.040825843811035156,0.031056642532348633,0.009676218032836914,0.03995847702026367,0.04093194007873535,0.04105877876281738,0.14660191535949707,0.08091402053833008,0.6507353782653809,0.2469327449798584,0.06564712524414062,0.11994194984436035,0.03572225570678711,0.03535103797912598,0.03560590744018555,0.03554368019104004,0.03577232360839844,0.06633305549621582,0.641303539276123,0.03549909591674805,0.03590226173400879,0.025054454803466797,0.0359950065612793,0.02564549446105957 diff --git a/results/combined/merges_timed/brndnmtthws/hdfs.csv b/results/combined/merges_timed/brndnmtthws/hdfs.csv index 0c62698231..6a0ef788c0 100644 --- a/results/combined/merges_timed/brndnmtthws/hdfs.csv +++ b/results/combined/merges_timed/brndnmtthws/hdfs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 104,refs/remotes/origin/pull/5,136f7cf97c6a687150950f7ccd1e03f2bde6a823,ee4b5ad98f64e7f278a565fe124cf316ea0d1b60,f334d6b0ffdf1dfc359d411dea29262e5aa683c1,,True,True,True,15,46,206,3,True,15,Tests_passed,04eb8d2879c632f63d8f2a71e239338125550765a2c825aa108c2b4626d1905c,True,Tests_passed,0f9283d967381f3d8f049bc76055bab2c500f2eea996a407423584fd32d60bb5,True,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,dd2a234393ab7b71ec8309c67475b0ee1fcbddc1bb3c2b76bf0a7808cc55bf0c,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,2e8fcd4e36182736ac917038ee48f81aa4e676d9f3fbe0396a6c0650f26ab607,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,ac70cd7824654ba4e77f383bbeb27bfc9dc878883f9b0326b267973455a5c9a3,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,2e8fcd4e36182736ac917038ee48f81aa4e676d9f3fbe0396a6c0650f26ab607,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,ac70cd7824654ba4e77f383bbeb27bfc9dc878883f9b0326b267973455a5c9a3,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,dd2a234393ab7b71ec8309c67475b0ee1fcbddc1bb3c2b76bf0a7808cc55bf0c,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,Tests_passed,c986b6d1f109453075dbf36c61b0b392c87484ae79791074e888b46dc6749316,0.012996435165405273,0.013573408126831055,0.014136314392089844,0.015053272247314453,0.014916181564331055,0.014269828796386719,0.014623641967773438,0.053568124771118164,0.1202082633972168,1.7166731357574463,0.5754294395446777,0.10781502723693848,0.14355254173278809,0.056494951248168945,0.05923056602478027,0.055603981018066406,0.05570721626281738,0.055731773376464844,0.10693931579589844,1.7583673000335693,0.05390810966491699,0.05522871017456055,0.03648495674133301,0.05296206474304199,0.03728318214416504 diff --git a/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv b/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv index b246dc75db..8dd32f48c1 100644 --- a/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv +++ b/results/combined/merges_timed/broadleafcommerce/broadleafcommerce.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 462,refs/heads/develop-6.2.x,4c906659b12b21ea55fd99e9e59d22de6a0133ad,5beb9dced0311917ca58e701bc6efbe0111f5237,af94f77e1218f0fb5357f6dcf3a0438fb6cf84f8,,True,True,True,436,1850,17483.0,3266,True,3386,Tests_passed,8301741259a9b51b2cf414140ef7bbe547bb91c7e578ce7ef1d0c6259a791e4b,True,Tests_passed,e61fba4c0c89674620006b27ff750c2ff83711232bc84eef5868e15db59b97f7,True,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,5a110cbc589f46e097a9ce3aa6fb4e5ac0a26bbb72fa023c35405825559f2974,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,06b8051893a5083887ab7d0f3bd8e848554a8b8a0e8b107fd2f03e687c3d8d13,Merge_timedout,,Merge_failed,04db2ed99d07b271135babc92b5dd667e91a14c18b156ea31e14171ebc7bf789,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,8a4b3d0b99d8e241cf823d29fb06b9839f4d2ed5a45619adfa1fe3c01f3401d5,Merge_failed,55d7ea3418e66732255a655c792fa9c598b6b1f19f027387c99f7ebb492a5653,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,ceadc82a1eb48c1c9fd5cf2f5e4ca976e41d3aec1139d59cb1b7d04df3f929e2,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,Merge_failed,fcc759bb2cc4b4de253466ad8f2ef03c8c6564c92bb2d863f2257d8201ea8641,0.18297410011291504,0.19223570823669434,0.20979046821594238,0.2157151699066162,0.20727753639221191,0.20778512954711914,0.21101617813110352,5.02060079574585,17.257490873336792,182.52923679351807,-1.0,10.415399551391602,2.775432825088501,2.681520938873291,2.6944499015808105,2.6873576641082764,2.7018449306488037,2.7070233821868896,8.986453294754028,183.75760316848755,2.673274040222168,2.6714584827423096,0.40928053855895996,2.6870269775390625,0.4076833724975586 diff --git a/results/combined/merges_timed/bronx/saci-vraptor.csv b/results/combined/merges_timed/bronx/saci-vraptor.csv index 1e32f2410a..01ed6d1125 100644 --- a/results/combined/merges_timed/bronx/saci-vraptor.csv +++ b/results/combined/merges_timed/bronx/saci-vraptor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,cb9355ed085d8366a0317c7be599c1ffc0256a55,5bd3bdf950aaa203727ed98c937edab28c6429b3,f7da6af523ed9afda669349adfd8f1f2361594ab,,True,True,Tests_passed,e72316aa393100cdd1b4386d606e305b84124f9e5ea8f3adf4eb3557148b4751,True,11,21,907,2,True,Tests_passed,fd47b49850c946f8857dca98fcf3f4b35c0b3a5edce8ec54a2a9ec81071931cc,True,11,True,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_failed,cc7b00e9fb77cbc052cb3a307e3dd35f12c444e516bf0ccc9af4e221dbb900b7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,0.009358644485473633,0.010475635528564453,0.01024007797241211,0.010410547256469727,0.010519266128540039,0.010383129119873047,0.010027408599853516,0.035186767578125,0.06761527061462402,0.5948057174682617,0.34839415550231934,0.0682377815246582,0.12271380424499512,0.038565635681152344,0.039526939392089844,0.03864598274230957,0.03776359558105469,0.03811502456665039,0.07055234909057617,0.5740046501159668,0.03845381736755371,0.03822517395019531,0.027788877487182617,0.03804159164428711,0.027184486389160156 diff --git a/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv b/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv index 782d12df2f..ccb2c9581d 100644 --- a/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv +++ b/results/combined/merges_timed/brooklyncentral/brooklyn-ambari.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 103,refs/heads/master,2b1a13acb9dd3617392ce7794dc7602908e46900,3b9261bbe998deeee80c9bb1aa5bb293b4367e14,503e498fda03565bedb43a9b7ee4b3fa9b3b5b88,,True,True,True,18,69,784,2,True,18,Tests_passed,f0dd30643fa21bafb6af4f12317388cffacc2f5fc20c84758027a88edb55bd49,True,Tests_passed,9aa221acf1421d39a4e3e841c443f151bdf14a8c982173ce48140c621e62ea01,True,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,0.009642839431762695,0.009598016738891602,0.009842634201049805,0.009564399719238281,0.010534048080444336,0.010259628295898438,0.009795665740966797,0.033881187438964844,0.06402778625488281,0.5444686412811279,0.4565727710723877,0.0712890625,0.13076329231262207,0.04003095626831055,0.0416407585144043,0.04143667221069336,0.04108738899230957,0.04147934913635254,0.07427263259887695,0.5733585357666016,0.04001450538635254,0.03993654251098633,0.030457019805908203,0.04000449180603027,0.02994370460510254 diff --git a/results/combined/merges_timed/brooklyncentral/clocker.csv b/results/combined/merges_timed/brooklyncentral/clocker.csv index 1423ca5e81..e7a99a099d 100644 --- a/results/combined/merges_timed/brooklyncentral/clocker.csv +++ b/results/combined/merges_timed/brooklyncentral/clocker.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 254,refs/remotes/origin/pull/168,76e41ca0646e971450da04a2fd88a74c32acc0fa,d2afe7308db3df086f829d424adb11a3c9457c44,c3e5c77d178fc046f9e94945b93c7b6ceb592bf2,,True,True,True,18,45,644,14,True,26,Tests_passed,3529cfb0ef4ca30cbd04b1f5a5b9ba47e419ca28a0fd63540bee4ce9b5c689f7,True,Tests_passed,b9052ed29357ce0599a6b4ed13430b48ba0303c2a6206bab540630c2aa0f674a,True,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,b234ea9b900b1c6d96be30456204fcb5f6c821a936f766203c586bb4c18ac75b,Merge_failed,9ee44866e8c4f74ad589568d22ee7fe037980323431f8b80affc50da1c1078f7,Merge_failed,cdab53e313a9c14d67f9ed73359e4fce1a877e8520cc9faf2de8c827ba22111d,Merge_failed,04e9850672b70c2767627a62d241b859f43adb460cb94fee97effe478866dc7d,Merge_failed,9ee44866e8c4f74ad589568d22ee7fe037980323431f8b80affc50da1c1078f7,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,4e49a9d2b739a999a79c477525161c5ede8e282c420871abdcd10ca8c152df30,Merge_failed,cdab53e313a9c14d67f9ed73359e4fce1a877e8520cc9faf2de8c827ba22111d,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,Merge_failed,c79c5f7c4fbc223dd41b69b64a3eab498b118c2a8eeea9df91297bf653680a0f,0.024641036987304688,0.02517867088317871,0.028654098510742188,0.028929471969604492,0.02815532684326172,0.028856992721557617,0.028774499893188477,0.11786675453186035,0.2931327819824219,3.6853456497192383,-1.0,0.21887660026550293,0.1711869239807129,0.08635473251342773,0.08864831924438477,0.06738567352294922,0.08530020713806152,0.08736062049865723,0.1878681182861328,3.802644729614258,0.08449268341064453,0.08379006385803223,0.07211947441101074,0.08028316497802734,0.04629063606262207 diff --git a/results/combined/merges_timed/brunoribeiro/sql-parser.csv b/results/combined/merges_timed/brunoribeiro/sql-parser.csv index be8b2f3260..369d8c40a7 100644 --- a/results/combined/merges_timed/brunoribeiro/sql-parser.csv +++ b/results/combined/merges_timed/brunoribeiro/sql-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,ec06c99726c4d7c4d5e94601535cf87c1f62f265,4c768844566b6f1d168a3efba5b26ed3f75fc91e,d298f8d193486310c8813234ec30a280f315c6b0,,True,True,True,23,48,383,2,True,23,Tests_passed,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,True,Tests_passed,9e5ca09cb1c6a5815ba01308d1e7c56f17d7c005ad15caa33aaa810bda44b5a8,True,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_failed,1caa0ba6fed62bb84d73e792e2abc267aa10319d5329aa2fc0e8b31ca3ffa1ed,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,0.04292464256286621,0.05312371253967285,0.07389616966247559,0.03236079216003418,0.04465627670288086,0.05565643310546875,0.04913020133972168,0.21632599830627441,0.12616539001464844,1.5211899280548096,0.5293316841125488,0.09309530258178711,0.15174341201782227,0.05994534492492676,0.06218600273132324,0.06136679649353027,0.06161379814147949,0.06059432029724121,0.10097074508666992,1.41630220413208,0.058780670166015625,0.05870532989501953,0.0452876091003418,0.06048154830932617,0.044835805892944336 diff --git a/results/combined/merges_timed/bryncooke/cdi-unit.csv b/results/combined/merges_timed/bryncooke/cdi-unit.csv index bb5d2bcc12..c9114b5841 100644 --- a/results/combined/merges_timed/bryncooke/cdi-unit.csv +++ b/results/combined/merges_timed/bryncooke/cdi-unit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,2af8a2a49d84164202df069beadd2041120415d1,472aca06eeb6b7b0859845da02053b0782c7c6fa,a02637bde4ca6947ca84a14958ae6988d6f587b6,,True,True,Tests_passed,55d0d9406cdac4af8de163a41136d54577eb78393bde2699af269846ee033e52,True,48,137,2037,3,True,Tests_passed,e64a5124920e28161f3c02cdf9ba827718afb9282834699f4461a82492edeccf,True,48,True,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,0.04314994812011719,0.043294668197631836,0.04682183265686035,0.05311298370361328,0.05108046531677246,0.04724407196044922,0.04959535598754883,0.2514514923095703,0.18256831169128418,0.04402494430541992,0.5358057022094727,0.11360406875610352,0.15530705451965332,0.05416464805603027,0.06393933296203613,0.0542294979095459,0.06431269645690918,0.0552978515625,0.1175377368927002,0.07528138160705566,0.053725242614746094,0.06049990653991699,0.0350794792175293,0.05911517143249512,0.03462338447570801 diff --git a/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv b/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv index 83424144c0..6d1e31e915 100644 --- a/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv +++ b/results/combined/merges_timed/bsblabs/embed-for-vaadin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,e1324f33636a9746384d621cddcea8cedd241318,b5e7156c005b7a106da3e82b051a4bb1fed5a7a7,2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a,,True,True,Tests_passed,36da6b0742033a2e04186d78207c31ee8d3ae201e8de6c637c24ad09f5fc514b,True,19,129,468,17,True,Tests_passed,9d007c72e73932718f03e83a9cf9a30df50923e3552d94f2de4478057f4417bd,True,26,True,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,664df9508bf1fff05c1da32bb7736dfa7585649776cd3f51796814efaca3b0f5,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,990e5c906bd4600e008e1016c8e43689a44963d03f03222a04782cc67efbe8e0,Merge_failed,7549cec2a5a1004651adb5cffcfbf2b0e356393c839a9f8351ef640c2c0f705c,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,a96dbfc6794e29386b91c4c776761d09d7abfa4771d14e973ecb76a3819b0de3,Merge_failed,6b26c2c9591cddfd41b1e757afc471c9150ac2b997e50b644eabefbd0b6565b5,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,0.012783288955688477,0.01258230209350586,0.012273788452148438,0.01244807243347168,0.012543916702270508,0.012357234954833984,0.01270914077758789,0.14211821556091309,0.5621793270111084,2.3340699672698975,0.5172312259674072,0.3459198474884033,0.17284560203552246,0.09413433074951172,0.09542679786682129,0.0932931900024414,0.09398937225341797,0.09475851058959961,0.2502098083496094,2.2555136680603027,0.09447932243347168,0.09610652923583984,0.08638238906860352,0.09558701515197754,0.08737635612487793 diff --git a/results/combined/merges_timed/bserdar/jcliff.csv b/results/combined/merges_timed/bserdar/jcliff.csv index d88bc22659..cfc042d524 100644 --- a/results/combined/merges_timed/bserdar/jcliff.csv +++ b/results/combined/merges_timed/bserdar/jcliff.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,f92b40d0588bda3a035268bcdf9cbf0ac8e6acaa,f9cbdf1261bdf671b12271025acf11f887bf47c2,6e4ddbd168592ee1df3de326fce2d1e1f16c995f,,True,True,True,3,4,6,2,True,3,Tests_passed,cd8946a704702159be7623b35cf5229e744effe1c88eb74c1383f193415b3d6e,True,Tests_passed,54cb902b3f59390abb61d730bfde833e7a73604e9f60d356f87740cb43c2c899,True,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,0.04919242858886719,0.0510249137878418,0.05398416519165039,0.04811549186706543,0.05256485939025879,0.04236340522766113,0.037043094635009766,0.17114949226379395,0.10742735862731934,0.9970958232879639,0.33173394203186035,0.07400178909301758,0.13495349884033203,0.04479694366455078,0.046811819076538086,0.046083927154541016,0.04623222351074219,0.04634737968444824,0.08006548881530762,0.9748361110687256,0.0441591739654541,0.044403076171875,0.03406715393066406,0.04358339309692383,0.03385138511657715 diff --git a/results/combined/merges_timed/btrplace/scheduler.csv b/results/combined/merges_timed/btrplace/scheduler.csv index e3feeac298..02d0bc35b1 100644 --- a/results/combined/merges_timed/btrplace/scheduler.csv +++ b/results/combined/merges_timed/btrplace/scheduler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 171,refs/heads/master,e98de3367896653a65052d04949c3d13f171d17d,6cd3ec8922c81f00b8ddba838c47c585fcf9ca25,f729a9d848a5e0ade380322464b3bf719357772a,,True,True,True,23,66,1095,3,True,23,Tests_passed,5b56903c911ed6e7008bc1120895e8b07bdeb132887d6eec7f8c67b3d27595bd,True,Tests_passed,b4622299446ab885d96cd8679127032bd920ccc385935298c45ce602b18120ea,True,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,5cc2e7713a6369c6414863974f848d1d423ee4c71c8cd15dab7d7323a799332d,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,4d54f49843f83c43d3eb0f1752f52d228f1c3283fd39a501321ae58a0211cc83,Merge_failed,8f98c17c6648d505315dfef750057ba027a113fc4a37eac472ee47e0afe452f5,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,8df3e5dc61b1fbf369717791af0ab0794f319ab325faddcf78add998f5c548c2,Merge_failed,4ac642d174f1cea3c47d421e56690dc687b81cb5778a8f3e513dfa0bbbf065a3,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,0.0537419319152832,0.03619098663330078,0.06673502922058105,0.0634317398071289,0.06121206283569336,0.05717206001281738,0.06220436096191406,0.31375718116760254,0.2001039981842041,1.2184102535247803,0.5804166793823242,0.10700011253356934,0.13491415977478027,0.05071115493774414,0.04890275001525879,0.05145740509033203,0.049376726150512695,0.05010986328125,0.10460186004638672,1.1847424507141113,0.0487825870513916,0.04931378364562988,0.04106783866882324,0.04882240295410156,0.039525747299194336 diff --git a/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv b/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv index 29f6db8bea..0ec2caeb36 100644 --- a/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv +++ b/results/combined/merges_timed/buddycloud/buddycloud-server-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 59,refs/heads/master,add022f6eee649d0bb3a578dbd43412abe750398,07e445684c08c14cb559b65b8e950dc48fe8f24d,1e845e6e49fcd1c4da5690fbc9c4514ae445bc39,,True,True,True,31,128,1318,3,True,31,Tests_passed,85c8d5cdba361e5e2979b588433736af6bc7e5b6c3938da2cb830999c02b37e1,True,Tests_passed,8566262c7b23ea71ca58cdc08694a779778b65c7d1ecaa99f2fbb4bf4fa494f8,True,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,918be263f4aac70c1d4a120fe82849d2ffb3694f95d8fe40bf79470818e4a629,Tests_failed,3c3c6f0d887050bd481f695a9a5c6a490ae5f9fee3dca838d9c09ebb136c32a2,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,918be263f4aac70c1d4a120fe82849d2ffb3694f95d8fe40bf79470818e4a629,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,Tests_passed,11a1c2688b35bece35b909bb89893a8ee83e55b789414edfeb95c0153d15f033,0.043459177017211914,0.047933101654052734,0.062213897705078125,0.0662696361541748,0.05861163139343262,0.04194307327270508,0.05280280113220215,0.23126912117004395,0.1873784065246582,0.8446598052978516,0.9811129570007324,0.16677165031433105,0.14524507522583008,0.05965995788574219,0.058196067810058594,0.05972170829772949,0.06578683853149414,0.08406424522399902,0.11192035675048828,0.8082423210144043,0.05636310577392578,0.05468344688415527,0.0385897159576416,0.06681680679321289,0.0753779411315918 diff --git a/results/combined/merges_timed/bujiio/buji-pac4j.csv b/results/combined/merges_timed/bujiio/buji-pac4j.csv index 6fd7ba3665..dae0fb4ea1 100644 --- a/results/combined/merges_timed/bujiio/buji-pac4j.csv +++ b/results/combined/merges_timed/bujiio/buji-pac4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 35,refs/remotes/origin/pull/68,1c7eb2acf1643212c399c9485bd30e3fdd5d88a8,3adfb5dce2e27bf2b7f1946ec097a7af5e324c71,92702c61d9db078febf717bbeea5e237a4bf9d2f,,True,True,True,15,64,658,2,True,15,Tests_passed,6198764f3533235188bb2e6581b643063bf9eb96f6185322429a185816903c5c,True,Tests_passed,b1221a13d7bdfd0ebeab7f885fdf6b845ffb9490af9ab9d4cc6a16daf6b24fda,True,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,7539d06b12858c20a246d32e745298e7da80e446a3a0aa7858be24766da09010,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Tests_failed,b835e8fc74b722f0d1101d97f7a301b4c2e04b1ff06ccbaa64635a0bf60e8e65,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,e5dccd6c3482aed6b7abc4cbfd97bea75e8e6c136db2572e33b71416ac680e7a,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,0.008528470993041992,0.008322715759277344,0.008201837539672852,0.00797724723815918,0.008054733276367188,0.008100509643554688,0.008189678192138672,0.03274798393249512,0.06450676918029785,0.5221312046051025,0.2962932586669922,0.06659078598022461,0.12343692779541016,0.033674001693725586,0.03352761268615723,0.03322649002075195,0.03336501121520996,0.03309798240661621,0.06525349617004395,0.5704441070556641,0.0343477725982666,0.03449058532714844,0.03277897834777832,0.03353524208068848,0.0318148136138916 diff --git a/results/combined/merges_timed/buschmais/extended-objects.csv b/results/combined/merges_timed/buschmais/extended-objects.csv index ae8acbad1b..317918be4c 100644 --- a/results/combined/merges_timed/buschmais/extended-objects.csv +++ b/results/combined/merges_timed/buschmais/extended-objects.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,46ec306cf6bed6dbcfa790383ae80542ebb61324,8b434139ec272993f04775ae7c4c2b3d3597d90a,7c316187356cf8c77c63e56af510fefeeeda73ca,,True,True,True,135,284,1152,2,True,135,Tests_passed,74f567f50a2c83d24c13cf4678bd243ce56b64f2510237cc2af460cfb1252d1c,True,Tests_passed,184bd57cbc90be0e41f6a750b7226c079670824734f7fb14ebeadd0304a3bca8,True,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,e78f52c4bdc316083afb9c7daf65a0c72e0e93d2b1af4fe274dbb30b1bc473d0,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,0.02429819107055664,0.023638486862182617,0.02200460433959961,0.022686481475830078,0.022323131561279297,0.03426551818847656,0.034597158432006836,0.04926919937133789,0.08048868179321289,0.9528591632843018,1.2398097515106201,0.093231201171875,0.15799546241760254,0.06526851654052734,0.06723308563232422,0.0648047924041748,0.06522393226623535,0.06654858589172363,0.10230469703674316,0.983656644821167,0.05938076972961426,0.06046605110168457,0.04740262031555176,0.05995011329650879,0.04634404182434082 diff --git a/results/combined/merges_timed/bytedeco/javacpp.csv b/results/combined/merges_timed/bytedeco/javacpp.csv index 0577baa210..d383d4df32 100644 --- a/results/combined/merges_timed/bytedeco/javacpp.csv +++ b/results/combined/merges_timed/bytedeco/javacpp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 43,refs/remotes/origin/pull/658,d0d81140d1557312cd24f331fdc54cfbe4af33e5,c78695feb6c380b5dd72151eb85e7da8e9926925,7a72aacb313e6b2bc488147a4cb2e89ef5eecac8,,True,True,Tests_passed,c5064432e6d1e38a608b3c04be7522852ff5a60987081cc89301526816f2e8cc,True,6,29,224,2,True,Tests_passed,4e2250bff77ced11abbd1dfd94c7843c9d4e25870d0c40b7d11d101f9ebaf73d,True,6,True,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,ba9e08f0cd722cee8f813a075241adbbe82a51631dce1da94f734489b3683577,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Tests_failed,e69cc8eab9a24a7ffc68b387aaa87beee0bf785063d7cf572b8b2ba1169aefef,Tests_passed,5782f0b41cdd098b846c8f127efe34aba50bd87cab405750768791696ec05bc1,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,b5d280cdb3d9454970c2a4cf01dde3cce41eda3641cd2efeda8fe17edd4aa6dd,Tests_passed,3e5b13892ff7a6f9e8489fe9702280df931bc211d589fed82befd7e4baf89566,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,Merge_failed,81e25cc9872eb1f5340bf670b494ee46e476a52f37b83abec2c5eeabfcce42fd,0.04938936233520508,0.048209190368652344,0.04940032958984375,0.03403615951538086,0.053556203842163086,0.059857845306396484,0.03450894355773926,0.1909186840057373,0.1036531925201416,5.2480409145355225,0.8933274745941162,0.11576962471008301,0.15226340293884277,0.06647968292236328,0.06533241271972656,0.06420421600341797,0.06291866302490234,0.06047511100769043,0.10079550743103027,4.883695363998413,0.0606837272644043,0.06011652946472168,0.04365229606628418,0.05994725227355957,0.06092524528503418 diff --git a/results/combined/merges_timed/caelum/vraptor-console.csv b/results/combined/merges_timed/caelum/vraptor-console.csv index 704e32f547..c69921e335 100644 --- a/results/combined/merges_timed/caelum/vraptor-console.csv +++ b/results/combined/merges_timed/caelum/vraptor-console.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,75017316626095be7d4b6cbb4c1532561e1ff8a1,10d80abb189438236c5a5d5723c222ec28a69ee8,db3d6f9a2375d14d9a96c2281572a6741acb32bd,,True,True,True,5,8,40,2,True,5,Tests_passed,96a540f2c8b27352d25886f40f3478f5b1002c52e02d6129a9f63c86bb124927,True,Tests_passed,4ab414c3cb61a6dabbfc4c8be31374cf153b0441f0da8203d36f1c64939d8987,True,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,0a725314e82bc8b3f61fdab978411ab12eddeaba1addc5d75ca6ab6f2a78a827,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Tests_failed,53daea6c54a628f9e50bd4d6c0975b8a6f294f887eb5f4983b9d2966881b9860,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,ad807156db648757f177a9a1afd2604b09d97be18ee0cf3856832a6a4bd433d6,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,0.03743886947631836,0.03560638427734375,0.03322124481201172,0.03760576248168945,0.03968310356140137,0.03226590156555176,0.04080796241760254,0.16326403617858887,0.10766959190368652,0.51505446434021,0.31754302978515625,0.06610655784606934,0.1212615966796875,0.03323984146118164,0.03293561935424805,0.032526254653930664,0.03182220458984375,0.03340435028076172,0.06438279151916504,0.5199735164642334,0.033513545989990234,0.033095598220825195,0.03188753128051758,0.03310537338256836,0.03165006637573242 diff --git a/results/combined/merges_timed/caelum/vraptor-environment.csv b/results/combined/merges_timed/caelum/vraptor-environment.csv index 97b3ab630d..a8d35690ab 100644 --- a/results/combined/merges_timed/caelum/vraptor-environment.csv +++ b/results/combined/merges_timed/caelum/vraptor-environment.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,57463c6eb5148d0640081dab2ba0099937ba72ed,f708e7975329930f818ed9ba45ec415748b2d73b,b95e39f1416ceff938c759f0684bdce789a93e59,,True,True,True,17,40,415,4,True,17,Tests_passed,011ec18143fe90baa19f61869023d2caaabc431a5473ed0b83a428e24551e0e8,True,Tests_passed,e8885593a15b29783e6b151351f0dfaa4c5235a1ca60b11cf91679b2c69aa5f2,True,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,9c8a55669205d9f3dbb68e5e9880ca9b4b588d77a0d8339ff8cd529986d202ea,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,2720cd2481515561bdaba21ca01454a9be41f3916d111c9c46a8feaba93a297a,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,112352105272526c53b8c397b1d23ec40b1906ee85c1d1ada79dde373f4b6a26,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,0.008309125900268555,0.00828862190246582,0.007877111434936523,0.0077893733978271484,0.007863521575927734,0.007895708084106445,0.007858037948608398,0.0561823844909668,0.17727375030517578,1.028254747390747,0.391049861907959,0.13193535804748535,0.12629270553588867,0.04671454429626465,0.04678082466125488,0.04701066017150879,0.04737591743469238,0.04675483703613281,0.10848045349121094,1.0871214866638184,0.0479891300201416,0.04799509048461914,0.04644179344177246,0.04847550392150879,0.045391082763671875 diff --git a/results/combined/merges_timed/campagnelaboratory/metar.csv b/results/combined/merges_timed/campagnelaboratory/metar.csv index 5eff0b2688..70c5c83b83 100644 --- a/results/combined/merges_timed/campagnelaboratory/metar.csv +++ b/results/combined/merges_timed/campagnelaboratory/metar.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 112,refs/heads/master,61182b0126310c7d1928e46a272f2e0a45e60627,2f9f9f0632c66144b9e64ac972d4b1c28a5658a7,07b736d27431c9d7db5768a8d13da0b30eff5217,,True,True,True,20,567,5822.0,5,True,20,Tests_passed,bcc741c9fc5c52f601790a2ac1e943c59950b10e3449469c87edf43303c4d33e,True,Tests_passed,7c95a505066ee15005c8fa7160004b6191e9af61dc404cb1e445200c8e046aa3,True,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,dd1acae356a8e4ad86fc3bbba5221ebf6ae7c7a29353a92241e952c337612f27,Merge_failed,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,ee54d577817039f1ef4ccef25588d472c97d02d549d85af42fc8b1511e3ef710,Tests_passed,da82b5792d65e74168aa64ca8313244b749e1eb6008406afeb0575ac01cebaea,Merge_failed,e704beb63ac8c084b71778414b5b4f829dd97169ea33868fafea4b821210960c,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,a5ff64a6cb9aea471ab997161f8feda5eadeb9a909b779c0d579d5e1a2db5997,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,3d5dfadc27076d6e18e1fe2dcc403ebdd3e41780432b4e421155819e55cd5911,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,Merge_failed,09589fc4b123d6147ec5e4f43b7493637ea40cef2ca4046bfd14a5a790a19011,0.08980941772460938,0.1245880126953125,0.09685039520263672,0.0995173454284668,0.13304591178894043,0.09218788146972656,0.1078639030456543,0.35518836975097656,0.38462162017822266,0.10971474647521973,0.8491654396057129,0.3211801052093506,0.3256688117980957,0.25464892387390137,0.2573239803314209,0.191209077835083,0.2584981918334961,0.1913318634033203,0.4369034767150879,0.28662681579589844,0.20295953750610352,0.2469465732574463,0.18880510330200195,0.22473621368408203,0.1296374797821045 diff --git a/results/combined/merges_timed/camsys/onebusaway-application-modules.csv b/results/combined/merges_timed/camsys/onebusaway-application-modules.csv index 39f72c688e..e143da1eed 100644 --- a/results/combined/merges_timed/camsys/onebusaway-application-modules.csv +++ b/results/combined/merges_timed/camsys/onebusaway-application-modules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 590,refs/remotes/origin/pull/139,a69d7b197eba2af2372cec23b93f547cb68342db,712aa4df21cf5249e26538de0f6a649ccd62cfde,c6116bb0dd552fe5c3b1edb98258d5223d808ad4,,True,True,True,63,109,399.0,44,True,63,Tests_passed,8fb373a62eb9d694c6e7431a5c10d5b37440528279eef8884a7f0a8dae56a46c,True,Tests_passed,c6356e272dab48b5fff87aa19e50a7d6adc8fed72bfad14a0c32e64f0dd5d85f,True,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,a94f2f84007648a218ff55927484f8584313a23d364385caf909a9432c7f3673,Merge_failed,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,fe88493a1932f4ea26ada1123e70d9a9dc7962d7669b57a4fd1d4d3f50c1c66d,Merge_failed,88d8b27062d9dfad391dc50f85bb31ffaf2d911a297fe635a9167e3e4b303cc3,Merge_failed,4f69d9130a79c20bc509853f251311e4428a300c58d225d71f5040684af434b6,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,ccae9ebb16a78ac648a498264836526624cfd287f18ddf380c0fa8c9fddcb429,Merge_failed,01b03986079ceef162db3a7290bfe7b6d190b10403c8db97c3fb51ffbf46aff0,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,Merge_failed,6693d3de19829a2b2ae592258f49155f4870436fd5ad88c8574fa41a08f29dfa,0.03401994705200195,0.03522348403930664,0.03727269172668457,0.03726696968078613,0.0368649959564209,0.037052154541015625,0.03722786903381348,0.6336073875427246,2.4250152111053467,1.6556003093719482,1.245051383972168,1.4891879558563232,0.4596061706542969,0.37467122077941895,0.3775622844696045,0.3716721534729004,0.37544703483581543,0.37581372261047363,1.1076536178588867,1.9995841979980469,0.36829495429992676,0.3711528778076172,0.3631107807159424,0.3706192970275879,0.3627297878265381 diff --git a/results/combined/merges_timed/camunda/camunda-archetypes.csv b/results/combined/merges_timed/camunda/camunda-archetypes.csv index 835824069c..0d511d3649 100644 --- a/results/combined/merges_timed/camunda/camunda-archetypes.csv +++ b/results/combined/merges_timed/camunda/camunda-archetypes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,4bc11ca34e0b8a811a6d5f12d45eaddd2f646cc6,a82d4b5ccd4d730dc2544bd5ee00870a91f30f09,b031aef316b7324b624b71a198e41e9cd434e08b,,True,True,True,141,543,4307,23,True,147,Tests_passed,5b339b1582680df894e0747a589001c73a274ba807c9b7cdc51376bc6585ff9e,True,Tests_passed,ffd6854096cd1b0c1e25215dec348f4f44892c9cce2bd941cbdf9c830739b0bf,True,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,b2d6ae170cf5a29aa25a8d1761ea49aebeb03b5c753c28d8ae8ea26917ee2147,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,a8df1c2cee8d1ce9929447beec3482d2a895929586f7eafdcf0c17853b259f50,Merge_failed,c2f964f9673867d125aa2401bacf8c87682db279e9f179948a2037b2f9784796,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,e3d2cedca60129eb495f0475947ffa5b4c0bc77c4a5fccf608f584328fcbcda9,Merge_failed,0e34751bd8042bea0b1d0836a7f8cbac841d57273378339d51d15faa934a1dc3,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,0.06413102149963379,0.0640265941619873,0.07694721221923828,0.05858635902404785,0.06177377700805664,0.05802011489868164,0.057660579681396484,1.4624695777893066,1.5384533405303955,3.5557923316955566,0.30138134956359863,0.8503923416137695,0.2874259948730469,0.19774675369262695,0.20077943801879883,0.19584274291992188,0.19995331764221191,0.19909191131591797,0.6176609992980957,3.7129569053649902,0.19882869720458984,0.198333740234375,0.10246825218200684,0.1998920440673828,0.10331273078918457 diff --git a/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv b/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv index c6d11344bc..3cb65dfd1e 100644 --- a/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv +++ b/results/combined/merges_timed/camunda/camunda-bpm-mockito.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 43,refs/remotes/origin/pull/84,3b9d3c98b5b6e2dd753097976e21ee5e3ca2ae0b,f86608325b39b5c68f406056fce6b8bfd30fd593,982b05589592f024e3fbf0af3a31862d804eeddb,,True,True,True,11,40,211,4,True,13,Tests_passed,b7be287fbaa90321d59d6fdb858dcf30099b5351e82c2eae99dbb59f38b01a53,True,Tests_passed,ed78dec0f4c077fef2fdc6ed29d89dc8975b4c0668167aeedb1c9419156074c7,True,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,101228a6d06446b22f705edf27ba7ad51e8e18856131f038a4ab083031b180a1,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Tests_failed,2c8f8957d45786c9dcc3719bee51f4880c4c8f2d631fcf4ef8acdca61effcfc8,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,93603ad80736fc96d246f327f61cee06794624d85ab10e4a80db2ffba30a8b96,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,0.017400026321411133,0.018187999725341797,0.020037174224853516,0.01997232437133789,0.020138978958129883,0.019504785537719727,0.019786596298217773,0.049218177795410156,0.07809782028198242,0.7609455585479736,0.5647528171539307,0.0936136245727539,0.11725163459777832,0.05193948745727539,0.03496956825256348,0.05269455909729004,0.03463602066040039,0.05067181587219238,0.06605148315429688,0.8137991428375244,0.04589700698852539,0.035719871520996094,0.04998183250427246,0.03568696975708008,0.05266261100769043 diff --git a/results/combined/merges_timed/carbonado/carbonado.csv b/results/combined/merges_timed/carbonado/carbonado.csv index 33f5b2f16d..f5e47ad766 100644 --- a/results/combined/merges_timed/carbonado/carbonado.csv +++ b/results/combined/merges_timed/carbonado/carbonado.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/remotes/origin/v1.3,13f58b778c5559b24f1b371cfb54ad80a5ba4b3f,32d20be647d80ec3509bfa3d7040b0d21cd8cb83,51d486867a0f610f034f1934e6d494e5d302f383,,True,True,True,13,22,111,2,True,13,Tests_passed,82df07c66438f8489a5a423933744d5c482ab95f513a5d209ca1a3d7b3bdabb4,True,Tests_passed,e0b92a6b14b8106114997025ce66478e7ac034d77a22a2febcd6a777a46aa261,True,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Merge_timedout,,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,0.04558110237121582,0.05028581619262695,0.05404973030090332,0.05296587944030762,0.049512386322021484,0.04705977439880371,0.04989933967590332,0.1501321792602539,0.11015629768371582,0.4259805679321289,-1.0,0.07387161254882812,0.12752747535705566,0.04235100746154785,0.042780160903930664,0.0422673225402832,0.04295992851257324,0.07540225982666016,0.08938956260681152,0.4432671070098877,0.04185175895690918,0.06289529800415039,0.07562136650085449,0.08253788948059082,0.08057928085327148 diff --git a/results/combined/merges_timed/carlossg/glacier-cli.csv b/results/combined/merges_timed/carlossg/glacier-cli.csv index d84bfb8909..befc79e075 100644 --- a/results/combined/merges_timed/carlossg/glacier-cli.csv +++ b/results/combined/merges_timed/carlossg/glacier-cli.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/remotes/origin/pull/11,71a1f6f512bc099e47cfccb15b46b33a3053afa1,ec9c094a73a35264837116dc831a5f7689a3b895,486498aba8bbeced3e5c3833793f3f2ad2c4d160,,True,True,Tests_passed,35dc813e0f3d097838b989d9cb45010c9a703def19508b0e51098ff9b1896086,True,3,5,123,2,True,Tests_passed,b10b46b7195fdef8f61e44bdfbe39b95da78828e512e520188049f1b70832483,True,3,True,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,a2b32d99c3882bf06491815901c3bce3e258af93f729b3ed4d75a1381878446f,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Tests_failed,572f50867b5c3e6f61ecc32f6b74ad19c8d9ee928984640ebd7541c2b4675d6a,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,4199bf2e6b57444c2427faa44b418f04920332381242e919f28e6b28bd1a9d26,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,0.007397174835205078,0.007379293441772461,0.007189273834228516,0.0069713592529296875,0.0071523189544677734,0.007109880447387695,0.007359981536865234,0.029959440231323242,0.06736969947814941,0.9392759799957275,0.31084346771240234,0.07148408889770508,0.11211013793945312,0.03125572204589844,0.03133726119995117,0.031965017318725586,0.0313420295715332,0.03105020523071289,0.06056618690490723,0.9766712188720703,0.031542062759399414,0.03215503692626953,0.030174970626831055,0.03200078010559082,0.030402183532714844 diff --git a/results/combined/merges_timed/cdi-spec/cdi-tck.csv b/results/combined/merges_timed/cdi-spec/cdi-tck.csv index e2a6b238f8..d2671ce558 100644 --- a/results/combined/merges_timed/cdi-spec/cdi-tck.csv +++ b/results/combined/merges_timed/cdi-spec/cdi-tck.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,d3b387c66f86d5594ff36573b593a928791d01dc,c252b4f509588a578ae033d522f35a45fc360a1e,f69448340df0a4dc54b658a796152b9952fbabec,,True,True,True,35,47,154,40,True,62,Tests_passed,26783a61133cdbd45413ecdc6e0c5e6673e016005d25ce1f1afd8870956b711f,True,Tests_passed,7fe74134ccd40a6f84eafc84eb0011bc94ffd0b9c2885b07aa9ad8da26b27784,True,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,3365611d4efbbba176412742ae3ce9a83baed75ce415e78d6af7e0501c8d2399,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,0b52e4c75a7475a363d9749014b41ac993966f3225c212e23e5ba64dfbf8a54b,Merge_failed,67ec3c6ce062fe5af578d6c507706341abaa06c80011f87d7dc059b8151595fb,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,0046bab0a0375f4c7806ea75ca58c9fd793c5b2429c3878b76db53214a64eaf0,Merge_failed,780c9e7cd71f39236a20e92c8a5006c8f9d51aec5bb41648ae2c12c1d0e71ff5,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,0.09740996360778809,0.08274698257446289,0.09839272499084473,0.10137605667114258,0.0916743278503418,0.09497594833374023,0.11279010772705078,0.899418830871582,0.8100552558898926,4.030128240585327,1.6918931007385254,0.47231197357177734,0.24480485916137695,0.16158175468444824,0.1669018268585205,0.16137385368347168,0.16200518608093262,0.15642857551574707,0.39643406867980957,4.111250638961792,0.15435123443603516,0.15937352180480957,0.14366674423217773,0.15254688262939453,0.1423337459564209 diff --git a/results/combined/merges_timed/cglib/cglib.csv b/results/combined/merges_timed/cglib/cglib.csv index e0daa70dca..7ec56ff69a 100644 --- a/results/combined/merges_timed/cglib/cglib.csv +++ b/results/combined/merges_timed/cglib/cglib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,True,2,1,3,2,True,2,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,True,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,0.03728628158569336,0.04141545295715332,0.012869834899902344,0.03226780891418457,0.01594996452331543,0.04367542266845703,0.03709769248962402,0.13685393333435059,0.08227705955505371,0.03081512451171875,0.3035576343536377,0.09350776672363281,0.16094732284545898,0.0659475326538086,0.06573820114135742,0.061806440353393555,0.06355500221252441,0.06448626518249512,0.10210680961608887,0.05712485313415527,0.06050395965576172,0.059328556060791016,0.028469324111938477,0.057816505432128906,0.05180811882019043 diff --git a/results/combined/merges_timed/chargebee/chargebee-java.csv b/results/combined/merges_timed/chargebee/chargebee-java.csv index 90475abba9..f84ee53f1e 100644 --- a/results/combined/merges_timed/chargebee/chargebee-java.csv +++ b/results/combined/merges_timed/chargebee/chargebee-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 34,refs/heads/master,0add5bcc4f9f339049d14a211e05e03546386fdb,0e60c0b862b9e980a479372812ceef2ebb555ed8,11156f634da00fe3852d459eff3cea67fa65b5ad,,True,True,True,23,75,240,2,True,23,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,True,Tests_passed,a9d631a4875e15e4d09d93d8b45fb9d661f2ba725aad49da243fc328e1b92e26,True,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,0.035103797912597656,0.03714895248413086,0.03603243827819824,0.043853759765625,0.045737504959106445,0.038839101791381836,0.04682803153991699,0.16522479057312012,0.11207294464111328,0.5762996673583984,0.4146256446838379,0.07080888748168945,0.12239956855773926,0.03903007507324219,0.038619279861450195,0.03859972953796387,0.0381772518157959,0.03863954544067383,0.07128548622131348,0.5579023361206055,0.038317203521728516,0.038103580474853516,0.02700042724609375,0.038364410400390625,0.027735233306884766 diff --git a/results/combined/merges_timed/chat-wane/lseq.csv b/results/combined/merges_timed/chat-wane/lseq.csv index fee2b1dfca..c0e962816e 100644 --- a/results/combined/merges_timed/chat-wane/lseq.csv +++ b/results/combined/merges_timed/chat-wane/lseq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,916d8a5efc2654df3f31715ed05eea52f7d09957,cd69de37ea8aec0bad1e5a4114a4a243f1b66442,86932f013055275c558f7f964225bf8e70b98281,,True,True,Tests_passed,57a196317ef2c7724708d82306b7196eac574a44a99f04d277efe6d2d37511bc,True,58,217,3102,7,True,Tests_passed,a51dca367610fc8df1b2476584962c82e0e4063a598405ba5ebbfc9926d28ecb,True,59,True,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bb76d4dafc96cb8a12f3c33ae792da766fe7d9a16ee5b6d74642b9d92402726c,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,c9edd0af6e769d396aeea0b46845f6378915226f36068778a39ba3a28b73673f,Merge_failed,abcabb3916461fcb662d05ef70dcec27cffd58ae2cea4c73abbfa8c0b95c473a,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,89ff484f6013936a71750f532b8174df5f471373d1e7dd8d8635fac6e42cb163,Merge_failed,ea07a4a17363607c93e37274cfca73b4224951763028f39ea4f16e58af2dca4c,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,0.04320240020751953,0.05004167556762695,0.05167126655578613,0.04486274719238281,0.0444490909576416,0.044400691986083984,0.04057502746582031,0.44109177589416504,0.3487052917480469,2.311600923538208,1.3124470710754395,0.19906044006347656,0.14409494400024414,0.06373095512390137,0.06292057037353516,0.061644792556762695,0.06281709671020508,0.06365036964416504,0.1657261848449707,2.370847463607788,0.06447625160217285,0.06451869010925293,0.06799435615539551,0.0643460750579834,0.06838822364807129 diff --git a/results/combined/merges_timed/chrisvest/stormpot.csv b/results/combined/merges_timed/chrisvest/stormpot.csv index bd1dee7a24..b6b18f3656 100644 --- a/results/combined/merges_timed/chrisvest/stormpot.csv +++ b/results/combined/merges_timed/chrisvest/stormpot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/3.2,375e8c807ffca5524e6333b5ba602e2ce430300f,5d5d75105eb5407939194035646bb312a0bc0769,58cab5d53fc9267a54c392c1cf72bcd98b268379,,True,True,True,51,512,3234,6,True,51,Tests_passed,bdf643a5e41853b19b664f4ed5658e33ebe16e2316bf0f9e896873a23c9a31e5,True,Tests_passed,5accb39e8d00069cb07512aa018a56f63c11f53c47234f5689e604a840703d4f,True,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,dacdcd5c85338c05554894549274e56f328207b8e934008180336206071a006b,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,7cb1f3a1cf71c33621e6ce922c409d5e63ba1bb3d2f1fcce8b1244f4946d343f,Merge_failed,1658d6a108e34730c783cec7a947c3233611f55593fcf0793814b1e00e109f13,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,386d220f1c10cd353796d000d2741bfd03dfe5b2c41dfbbbb3b45cc8036c9811,Merge_failed,eec72d5c542b15e33bbce16fdd0caeb5b7c3c1e94725dcca3cd7011163140d7d,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,0.015425920486450195,0.015787601470947266,0.01669001579284668,0.016431093215942383,0.016301631927490234,0.01630997657775879,0.01653432846069336,0.10386514663696289,0.30410051345825195,5.251710653305054,1.4770362377166748,0.20201778411865234,0.15250897407531738,0.07551932334899902,0.07306885719299316,0.07339644432067871,0.07098960876464844,0.0742034912109375,0.17036986351013184,4.745026588439941,0.0722498893737793,0.07449793815612793,0.05533266067504883,0.07295608520507812,0.05640006065368652 diff --git a/results/combined/merges_timed/chrsan/css-selectors.csv b/results/combined/merges_timed/chrsan/css-selectors.csv index 45d0be9b4b..53b0d1605f 100644 --- a/results/combined/merges_timed/chrsan/css-selectors.csv +++ b/results/combined/merges_timed/chrsan/css-selectors.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/12,0f725a05d197ffc54c091362bf84c34ad9654b06,861fa596d6df2e2e03f9378e39ffbd0b0515ef55,5f66d39ef4d3578146c81f4827bfde4dc7a0430a,,True,True,Tests_passed,ed83ca9bae0f7458caea0c624c0f1424a988fac9d675e50a98201d6810d933d1,True,26,117,1079,2,True,Tests_passed,2d12a444fd1c5795985ba1c35d320d06da697c105efb83a32b17c6b977aded3d,True,26,True,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,0.044500112533569336,0.026561975479125977,0.04722404479980469,0.04422307014465332,0.04936385154724121,0.04936933517456055,0.040087223052978516,0.16732048988342285,0.11932873725891113,0.5018410682678223,1.0656158924102783,0.07121419906616211,0.12590432167053223,0.041286468505859375,0.04172563552856445,0.041127681732177734,0.040779829025268555,0.041414499282836914,0.07383298873901367,0.5147876739501953,0.040276527404785156,0.04004240036010742,0.03087902069091797,0.04130220413208008,0.029839754104614258 diff --git a/results/combined/merges_timed/cinovo/cloudconductor-server.csv b/results/combined/merges_timed/cinovo/cloudconductor-server.csv index bc1b6e448d..53ca03d17b 100644 --- a/results/combined/merges_timed/cinovo/cloudconductor-server.csv +++ b/results/combined/merges_timed/cinovo/cloudconductor-server.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 69,refs/heads/master,5d364913a33784a026527743d51403af2a85044d,9b07fcdfd959835f66caf79868a8c5fc19eb51ac,51cc03e9d7130262015491537d4eb314d182f22f,,True,True,True,22,82,518,5,True,22,Tests_passed,bf96c5b1260da1152ef373c993b8904f61268593901ffbac6e523ef1dff0db8a,True,Tests_passed,3dbcfa915bb9a89aac99ed9547e9241036ff4a7f98827753312738ef443ce2a4,True,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,8cdd792312fa5c90fe309de431dc7f4db0565d329c4c74ddcbc8725b16669bcf,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,d2256b177962c36d492de4f863be8089ce222d1503b80df9f5bf1ace1ce84d82,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,51234c7b5bbb1f60047b9a8571528f7ed51d138a94a3c500987e37a353267688,Merge_failed,4e534a2c4ebbe5418a653457370f776b3f59d3575ceb57a4204df811fe09bfa1,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,0.021571874618530273,0.0218660831451416,0.01092672348022461,0.024278640747070312,0.02463817596435547,0.010862588882446289,0.02434515953063965,0.10075139999389648,0.23646163940429688,2.0650675296783447,0.4476470947265625,0.16133522987365723,0.17766904830932617,0.08029484748840332,0.06012225151062012,0.07898831367492676,0.07926225662231445,0.07810211181640625,0.1466832160949707,2.136251926422119,0.07790446281433105,0.0770118236541748,0.0535130500793457,0.07081222534179688,0.046772003173828125 diff --git a/results/combined/merges_timed/circuitsoftgroup/slackmc.csv b/results/combined/merges_timed/circuitsoftgroup/slackmc.csv index a070e9e029..3d4233f7f5 100644 --- a/results/combined/merges_timed/circuitsoftgroup/slackmc.csv +++ b/results/combined/merges_timed/circuitsoftgroup/slackmc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,6e2ed14486ced20af34a942ad5955026e20adae7,0649a0bbae0099b51d62062d8d5e649f68d3206a,b6d96b761a6927d80ca8864ea8f151076dbb0c99,,True,True,Tests_passed,db2ae016191cb6c8f16dda043af47ded9cf665d776d3f00a5b449e4440ffca39,True,10,107,574,3,True,Tests_passed,0b810c113bda7a4fa2af72f33b73eb47773cb8b086c587a079788ad1327177a9,True,10,True,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,54363e06249b0eac2c8169965dd0d6d0b7c74f9ffcf00fb8dcc442fa33ea80b3,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,5b4614ee3643b55d0f2ec0c275ead8b62a13a85e1697ce2c9c15861423bdd878,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d071214b6277dae93a7b5d593e18646b7b2cb65ea4664a7655fb75e8fc6328dc,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,0.0386202335357666,0.041524410247802734,0.036334991455078125,0.03660178184509277,0.039449214935302734,0.03630876541137695,0.030121564865112305,0.23308682441711426,0.17371344566345215,1.270369291305542,0.42896437644958496,0.10425257682800293,0.12052750587463379,0.039766788482666016,0.04012346267700195,0.039114952087402344,0.03947138786315918,0.03932499885559082,0.0847313404083252,1.2419841289520264,0.04027223587036133,0.04020404815673828,0.03836226463317871,0.04045224189758301,0.03864312171936035 diff --git a/results/combined/merges_timed/citysearch/web-widgets.csv b/results/combined/merges_timed/citysearch/web-widgets.csv index 475eaf269e..badcc95e41 100644 --- a/results/combined/merges_timed/citysearch/web-widgets.csv +++ b/results/combined/merges_timed/citysearch/web-widgets.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/master,309d4d30fcf2e785389d98854afe76ce753cef63,aaf7b3ab36f01b80b8f4ce821b6aea7e677903ea,f3d2b8d302d53caf03877c3182d56cf5d2c81417,,True,True,True,20,72,660,2,True,20,Tests_passed,51cf28e04439b5ff95ebc169d765dfbf2bf7d3b63da99d857197180105cc54a9,True,Tests_passed,70f5ccf567095aa86a7da7ce32dce5ae27f8a3f80b9144aab7f1f4129abf4a3f,True,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,0.050542354583740234,0.04491305351257324,0.05244874954223633,0.028238296508789062,0.06332540512084961,0.040883541107177734,0.04754066467285156,0.16937041282653809,0.0929725170135498,0.6458954811096191,0.5220749378204346,0.09652853012084961,0.1651902198791504,0.06724095344543457,0.0686490535736084,0.07120585441589355,0.06481051445007324,0.06884479522705078,0.10896992683410645,0.6596310138702393,0.06369471549987793,0.06525278091430664,0.05030941963195801,0.06266617774963379,0.05500054359436035 diff --git a/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv b/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv index 420cec51a4..b1f41941a3 100644 --- a/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv +++ b/results/combined/merges_timed/citytechinc/cq-component-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 137,refs/heads/develop,5c6c9e155afc295d410d1cc804d79ceb3d3f0027,dca55982f61de5380c281e5be0d48ce18147b2a8,17553059c6ff04d824fb4ff3816a4d83cbf50d98,,True,True,True,47,141,3766,4,True,47,Tests_passed,b8104589f4f845d80fbfb3d2db1bf0046dded477d3c945d0343daca39564756c,True,Tests_passed,a202203a2daa58081baceec344f65adf52ccc8b8eda6a79892d92958c1fffc27,True,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,1ea41a70043b54d3f3b22b1e8c795accd591a3cdc5f9a9d56176b00eb63f59d3,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,d648c2cad7dbc247151869009e0e7474bee4ac6f75dba5ee9891bd06a150cc41,Merge_failed,9d4bdf7d799a8c413fcbf48e259d73960ac8c74bda76519523a8589d657a1440,Merge_failed,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,a1bf39bbb21f1008b52e3e740b3749977b49676836e0cf902f312fec9ba473c7,Tests_failed,6c4f4041aaa291b53b7f7ac0d5e8724559f58ab14670d8fa6d613f45b455b4d2,Merge_failed,63ba86a828e165f982f48ca0906ad35a33a6782bed70d9bb0cddffea9ebc7292,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,1ea41a70043b54d3f3b22b1e8c795accd591a3cdc5f9a9d56176b00eb63f59d3,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,7091aed3ee820b9b6340e203d5d51837fbbfe14b0b1944c7184bc50982b0d44e,Merge_failed,d648c2cad7dbc247151869009e0e7474bee4ac6f75dba5ee9891bd06a150cc41,Merge_failed,a5ed22325420b375783d87bad5401c19dcd6f6baf7c8345968cd07e6c5f9764b,Merge_failed,a1bf39bbb21f1008b52e3e740b3749977b49676836e0cf902f312fec9ba473c7,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,e19fec5002bc41ed795da8d79ff22bc9f3fb5be60a95aac891677e3694a4d558,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,Merge_failed,65cf83177f09e0ea0d5fde1750a6ae36d84e2f0ca4c41299840411d67fd577b5,0.046796321868896484,0.04880094528198242,0.04749250411987305,0.058811187744140625,0.05365252494812012,0.04155421257019043,0.045507192611694336,0.3011176586151123,0.2861349582672119,2.683464527130127,1.1541297435760498,0.15331292152404785,0.13109946250915527,0.05205059051513672,0.05246567726135254,0.0529327392578125,0.05275893211364746,0.05317115783691406,0.11368274688720703,2.6575284004211426,0.0515289306640625,0.05177664756774902,0.04986262321472168,0.052739858627319336,0.04944610595703125 diff --git a/results/combined/merges_timed/cjwizard/cjwizard.csv b/results/combined/merges_timed/cjwizard/cjwizard.csv index d5dbc6da74..ff4e2fd5de 100644 --- a/results/combined/merges_timed/cjwizard/cjwizard.csv +++ b/results/combined/merges_timed/cjwizard/cjwizard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.009887456893920898,0.009513378143310547,0.010169506072998047,0.010102272033691406,0.010179519653320312,0.010202407836914062,0.010339975357055664,0.03479361534118652,0.0650787353515625,1.0320379734039307,0.38724708557128906,0.06974506378173828,0.12468242645263672,0.04274725914001465,0.043303728103637695,0.04178810119628906,0.04181861877441406,0.042226552963256836,0.07438039779663086,1.0661017894744873,0.042325496673583984,0.04217839241027832,0.03083944320678711,0.04164385795593262,0.029828786849975586 diff --git a/results/combined/merges_timed/clickntap/vimeo.csv b/results/combined/merges_timed/clickntap/vimeo.csv index c5ca7bb491..4e96d183d1 100644 --- a/results/combined/merges_timed/clickntap/vimeo.csv +++ b/results/combined/merges_timed/clickntap/vimeo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,cedaf74fc799691641f83a34a19f8ad479e77108,f40afce905a0cd5b0ff539eae41729e8788038a9,e546bda5980616e4d60bd30fdd5e8773759621b4,,True,True,True,4,20,70,2,True,4,Tests_passed,e857b022fc34a03c41fb289a8695e8b29ee23cab8b116c90ae3274862c6212f7,True,Tests_passed,5f2cbde4460700db3bbdd235693598aeb321bdd37b9d86f5013bacbbe205ce3e,True,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,0.036110877990722656,0.029940128326416016,0.00931096076965332,0.03453397750854492,0.040049076080322266,0.04227900505065918,0.04246830940246582,0.1423788070678711,0.09981274604797363,1.0457584857940674,0.3973276615142822,0.06513667106628418,0.11956977844238281,0.036965131759643555,0.031153440475463867,0.03695106506347656,0.03588390350341797,0.03652191162109375,0.06688451766967773,0.9656522274017334,0.036716461181640625,0.032395124435424805,0.025695323944091797,0.036481380462646484,0.025745391845703125 diff --git a/results/combined/merges_timed/clojure/clojure.csv b/results/combined/merges_timed/clojure/clojure.csv index 46e3c6b5ee..0f17c972bb 100644 --- a/results/combined/merges_timed/clojure/clojure.csv +++ b/results/combined/merges_timed/clojure/clojure.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 60,refs/remotes/origin/dev-array-type-syms,a7286b3ceeddd30571a61bd079d5f0fd1aad5933,c462337da43258aa5dfed0853c696b95786014c3,ffbb09b5ef55b9dfa88d16aedd44319a4b33b666,,True,False,True,4,9,32,2,True,4,Tests_passed,a38b58682530874a2c3b5be2ef8041248658f6b8981aef78ccc2529ee1692bde,True,Tests_passed,69607893e301ad982908fb580124f0199d386f3a3bfddaae8a81d4c27745597a,True,Tests_timedout,05d77967fbf0b69be4a9587b9f05a991106fc8c86aff407b1fb3d2467861e02b,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.06612181663513184,0.07367110252380371,0.03695869445800781,0.027616500854492188,0.029742717742919922,0.03697681427001953,0.058371543884277344,0.21283864974975586,0.11454176902770996,12.79997181892395,1.7908961772918701,0.145843505859375,0.14730453491210938,0.059917449951171875,0.10883903503417969,0.05681300163269043,0.11686372756958008,0.05791902542114258,0.16101288795471191,11.460891723632812,0.05657148361206055,0.0964975357055664,0.08897733688354492,0.05750560760498047,0.08408522605895996 diff --git a/results/combined/merges_timed/cloudfoundry/cf-java-client.csv b/results/combined/merges_timed/cloudfoundry/cf-java-client.csv index 64aaeebd0c..cd854aa49d 100644 --- a/results/combined/merges_timed/cloudfoundry/cf-java-client.csv +++ b/results/combined/merges_timed/cloudfoundry/cf-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 419,refs/heads/main,99db809073a23d10e771abaa23f586c1a53567fc,a69078adc84fd359a85ba12f0ebcc1cd05a87c5c,9acd5fd21c97b62b72e0065eff718a26a25af645,,True,True,True,96,1141,5285.0,2,True,96,Tests_passed,c3fe1cf280f3b0bd65661f90f95fef9f27ea640c1bbd87f90bdfca1f140d769f,True,Tests_passed,0d93d8b9ee70627a42f062cbc58d41844ce3a51f3490cb19396036dcc936551e,True,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,79e38bb1bd3abf8edd3eec5b5eb0461f5dfae2216c470dc228e5ef05dc6519be,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,79e38bb1bd3abf8edd3eec5b5eb0461f5dfae2216c470dc228e5ef05dc6519be,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,Tests_passed,614aabdda12825d70eac2335f8371cfbccee70774f0ca9efdad7edb17789d611,0.030318260192871094,0.02935624122619629,0.038018226623535156,0.03738737106323242,0.03762364387512207,0.03818488121032715,0.038004159927368164,0.07641363143920898,0.08618831634521484,0.606433629989624,2.5804455280303955,0.13179373741149902,0.20777106285095215,0.09989309310913086,0.09875607490539551,0.09714603424072266,0.09756326675415039,0.09665369987487793,0.14883899688720703,0.7059011459350586,0.09238219261169434,0.08932614326477051,0.08551788330078125,0.09199070930480957,0.08305072784423828 diff --git a/results/combined/merges_timed/cloudslab/cloudsim.csv b/results/combined/merges_timed/cloudslab/cloudsim.csv index 14e4669e8c..1335b55208 100644 --- a/results/combined/merges_timed/cloudslab/cloudsim.csv +++ b/results/combined/merges_timed/cloudslab/cloudsim.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,e0205e647461340fcbdf2de516d1cd0ad9fd1154,e0334f468311935d4d6bd424f3e0cfadf04fa8a6,c1ffe5a99703df9a2a03eb738a62b4e06146d732,,True,True,True,6,16,33,8,True,8,Tests_passed,1e5a990cd6230bd1349487409b1f854537dcfc974c057a9fdbacf61e4157aef7,True,Tests_passed,98721d9325e48626d8685176f77677fc4d81ccd4a5add362fbdff9d9dc06fd37,True,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,ff7f9960b0649308b3876d513052bb8925e676b0dc8ae12fae7ebccedad06fd2,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,ae204d2622ff03d2afe0121b924607314dc7c732e2cc217874213699bd6a4cf7,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,6908330f859111461621351c451fef064a2522ef39aeb30e84056427995e7cfa,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,0.057253360748291016,0.07322835922241211,0.0879828929901123,0.07173705101013184,0.08467674255371094,0.07996273040771484,0.09543371200561523,0.430753231048584,0.4353199005126953,2.5534117221832275,0.5896320343017578,0.2526848316192627,0.182647705078125,0.10282731056213379,0.10063409805297852,0.10060238838195801,0.1038510799407959,0.10235953330993652,0.22078776359558105,2.5833256244659424,0.0948789119720459,0.09404206275939941,0.09610104560852051,0.09688115119934082,0.09899258613586426 diff --git a/results/combined/merges_timed/cloudslang/score.csv b/results/combined/merges_timed/cloudslang/score.csv index 23d6c8a136..53534fcd04 100644 --- a/results/combined/merges_timed/cloudslang/score.csv +++ b/results/combined/merges_timed/cloudslang/score.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 415,refs/remotes/origin/ScoreWorkerMonitor,bfe7c0dad895f1f0fdfbdab5611568a717cab295,c4f3b87e475e3c87d2275a956a3d65e2b04f647a,640eab6d0c491a4c96e04b604d4ff14f34c688f4,,True,True,Tests_passed,e29a46423a25d1ee59e8135f3d5b6a65264987a0b97fb27fda0dbe27ad315226,True,54,93,911,3,True,Tests_passed,43429ee4c9c8115a2e5564a3951d14ce7aa7461efc0a53304d7c49bb24de29fb,True,54,True,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,31a6bc89e83b18d7806a4188a9027a5c76845dbbb43b53ae0386c560a4698cf8,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,96c88620d3dcc9fcece40d9ba9d59e02ccdce449398e1166910124efb24dea71,Merge_failed,208749154a1a368aec28a04ef5f5da48be59d6dda0c6c983715de39812d43892,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,d43a94f35ba0d0fda6d5d4c626bcfe8f12d4a3ee1938582b314e55b68274ed69,Merge_failed,208749154a1a368aec28a04ef5f5da48be59d6dda0c6c983715de39812d43892,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,31a6bc89e83b18d7806a4188a9027a5c76845dbbb43b53ae0386c560a4698cf8,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,aa9d0166a9d4ed7913f4c3057d40b4e7fa485061829748f2ec529113cd308896,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,8dc3dc40c0d57fe68418b0e49f9e3f5b713df8f8c61a636526addd770d4decb0,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,Merge_failed,fbcc402451d449efeaf35df0cad96bec0849f6dce15562e5fb8c7f693ae8144a,0.06289005279541016,0.04931378364562988,0.053435564041137695,0.0439302921295166,0.06134819984436035,0.05550265312194824,0.06338930130004883,0.24293828010559082,0.189605712890625,0.04369354248046875,0.45642852783203125,0.11388039588928223,0.14945220947265625,0.05551409721374512,0.05565643310546875,0.05544471740722656,0.05464887619018555,0.05506157875061035,0.10745835304260254,0.06694507598876953,0.05238771438598633,0.05489921569824219,0.05272626876831055,0.0527341365814209,0.05115008354187012 diff --git a/results/combined/merges_timed/clusterbench/clusterbench.csv b/results/combined/merges_timed/clusterbench/clusterbench.csv index 3ec69808ee..d7924cc7f6 100644 --- a/results/combined/merges_timed/clusterbench/clusterbench.csv +++ b/results/combined/merges_timed/clusterbench/clusterbench.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 64,refs/heads/main,e218cea656fa222ca1ecf2d6fcad6f185b3ec399,19152bf8782512305b25e7fefd2fcf17527e759a,ceca9cb677db82e8317dc707e09ddf5b5facc1d0,,True,True,Tests_passed,d001ac878bb52de0ad9138acdb51b9e4031616e8ebdc15ef2e905e5676585f2d,True,14,38,145,2,True,Tests_passed,944b1e2c32707514e6366f503de83de50bb1cd14001df37664706f42ed85a3b8,True,14,True,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_failed,1c1193300e3b63c27dde8066c58b08372c4311a3c5ceebce2d9f74249c71a1d9,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,0.037717580795288086,0.03677058219909668,0.07264566421508789,0.04570651054382324,0.047582149505615234,0.07420158386230469,0.06534719467163086,0.17192959785461426,0.1217508316040039,0.04115557670593262,0.3108100891113281,0.08570599555969238,0.13365483283996582,0.05704855918884277,0.05773735046386719,0.059650421142578125,0.05596327781677246,0.05637168884277344,0.0941932201385498,0.07169890403747559,0.0552060604095459,0.05524182319641113,0.046150922775268555,0.05384469032287598,0.04772686958312988 diff --git a/results/combined/merges_timed/code4craft/termblog.csv b/results/combined/merges_timed/code4craft/termblog.csv index 56a1a67e29..b9c0410bd9 100644 --- a/results/combined/merges_timed/code4craft/termblog.csv +++ b/results/combined/merges_timed/code4craft/termblog.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,794189f4401f172745bbc2ab1e17edf70a476b66,8d34534c9a05de46cf723f8cbb6dbaf9235597c3,df6ff5a8611c4a01e4da45590158b0de3b285882,,True,True,Tests_passed,17532e417f82faf1ad9f23d8b44387ab4fed6c8936b0a741b4433a1e011516db,True,115,33,3910,4,True,Tests_passed,0c73c7a54957b0fab91aaf3b35afd8a76805edb13db411143ba69ca517f3f45d,True,115,True,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,c144f95b69e512355210ba1f780da789e90dcae765aadb4aea60838bdbf48d68,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,920bb270126c8a585dd26403b553487e048858896d15ab40463a001a972ccde9,Merge_failed,793316272118c1a0b2d8cad0de1985c01d24100aaeba3fe2aef6d719cec87a34,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,f861f05035bb7ba7dcd5a5daeb18e639c8e985613e1720be14bd145653c8e514,Merge_failed,307557f9bce695e15e06546afcc5f291ae17a578d466b86bfc8518b1a35a8708,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,0.04150962829589844,0.049869537353515625,0.05292534828186035,0.03526639938354492,0.047705650329589844,0.04695439338684082,0.03488302230834961,0.26352834701538086,0.22367358207702637,1.1094958782196045,0.27344274520874023,0.13490724563598633,0.13387012481689453,0.05178546905517578,0.05170869827270508,0.050423622131347656,0.050188541412353516,0.051549434661865234,0.1127774715423584,1.1421594619750977,0.05192685127258301,0.05311012268066406,0.05231213569641113,0.05013585090637207,0.04938340187072754 diff --git a/results/combined/merges_timed/code4craft/webmagic.csv b/results/combined/merges_timed/code4craft/webmagic.csv index 011300be4d..ae2c2889ac 100644 --- a/results/combined/merges_timed/code4craft/webmagic.csv +++ b/results/combined/merges_timed/code4craft/webmagic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,Tests_passed,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,True,69,89,2060,44,True,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,True,96,True,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,11631b5943c563260b712705fa030a630299ce39595b160dcfa9e747f02b2f75,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,bb66ec256429f744a381d9761df927d1056c06cf05399f01c0b0c2121f654dcd,Merge_failed,e9a47a77d84740f02e8e3b1b4a0f42ee9ab03ccebba00a50734b5bd74448f13b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,0.06307768821716309,0.07529497146606445,0.08739137649536133,0.08552837371826172,0.07785582542419434,0.08044767379760742,0.07998180389404297,0.9370880126953125,0.7516984939575195,4.715071201324463,1.5783095359802246,0.5037195682525635,0.3049471378326416,0.20238041877746582,0.20383191108703613,0.19814753532409668,0.20385408401489258,0.19984173774719238,0.4770386219024658,4.628650665283203,0.2005770206451416,0.19976520538330078,0.18358922004699707,0.1969468593597412,0.18573856353759766 diff --git a/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv b/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv index b8103b42c4..7a9336453d 100644 --- a/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv +++ b/results/combined/merges_timed/codecentric/jmeter-graph-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/1,9d653ec06f567a6b301d02ba565f3d9023294c3c,59d801302875318e01477fb567789668477b5f98,c92922c382f7f67ee01722e4d05e54d323bdcb4e,,True,True,Tests_passed,3de1eb6cbe6aae4d61cc88763c3177533caa5fc7d5b50456e0cf2abf306b490d,True,4,23,257,2,True,Tests_passed,e5c0e89ff132330aaf8e8f7ce661d9efaccc878188eb622b92ffb4cfb148cab1,True,4,True,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,aa98e31a0193594abc09ad8431adc9bd9d875b782f3deb0318c620d8bd8c0869,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,9842c53d96ea8af2d4ac53c8bec8de792ea013deaad6fbf9d6cb1341ac988a51,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,792c46a47f56f03d7f81308a0c47ef52ff75669a65cdb6e81dfac539c7f8db0f,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,0.03888297080993652,0.03575253486633301,0.03396010398864746,0.036566972732543945,0.036795616149902344,0.03799915313720703,0.036849260330200195,0.16554021835327148,0.11408233642578125,0.8081326484680176,0.287020206451416,0.06712222099304199,0.11360549926757812,0.031519412994384766,0.03122401237487793,0.031868934631347656,0.031089305877685547,0.03136587142944336,0.06093883514404297,0.7713193893432617,0.031653404235839844,0.03123307228088379,0.030337095260620117,0.03249382972717285,0.030290603637695312 diff --git a/results/combined/merges_timed/codedance/silken.csv b/results/combined/merges_timed/codedance/silken.csv index 054f281a32..95e8540af9 100644 --- a/results/combined/merges_timed/codedance/silken.csv +++ b/results/combined/merges_timed/codedance/silken.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,True,True,Tests_passed,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,True,15,84,493,3,True,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,True,15,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,e1aeebbd5d0be941701f43fc6c55812644b6b15e59a87a16da95941417caa7ad,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Tests_failed,e889d1d5c8d133874dba2aeee77ca2070d03a55c7385317a2cd813867c3183fe,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b3144631da47b82eebf2c78b49d79afe305ca25209a7a9d2f55d8ababe88de6a,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,0.00909423828125,0.009138345718383789,0.008937597274780273,0.008952140808105469,0.008910179138183594,0.008941411972045898,0.009038925170898438,0.04394125938415527,0.12319493293762207,1.6382012367248535,0.44411325454711914,0.10372281074523926,0.12136554718017578,0.04172468185424805,0.042037010192871094,0.042015790939331055,0.041852712631225586,0.04253077507019043,0.08740377426147461,1.6637592315673828,0.042119741439819336,0.0413365364074707,0.03972506523132324,0.04191899299621582,0.0408022403717041 diff --git a/results/combined/merges_timed/codeine-cd/codeine.csv b/results/combined/merges_timed/codeine-cd/codeine.csv index dd8a03f320..b29b7f523a 100644 --- a/results/combined/merges_timed/codeine-cd/codeine.csv +++ b/results/combined/merges_timed/codeine-cd/codeine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 109,refs/remotes/origin/pull/252,e2d8cb4d560d49a12ffb9d53efd7bf10d1867e38,2ad519701f97ad01ab0c14e9a42166ec4d86b41c,ede7bcf188bba00a4fd167385cbab6661e64b26a,,True,True,True,12,32,903.0,2,True,12,Tests_passed,6fec22c803c70894e82950145f11cf498bba0d5edb682e5e79edd77b5d0f320b,True,Tests_passed,26430d5f2bb7fe88008dc5f809d79f6868682100907b4146add2432266275416,True,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,4f6d08032d23cd608dfafb0cf43cb54eddeb40dcb081fc3355ef9220619bbc90,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Tests_failed,781f4ee526970db229f4331c1080039e21bf13b00501e0bcef8c5d2f9db991e4,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,2d1938a702d7049ea4fa7d42c7d4cd781380d89e0c206f058d25c4c4e7ba4d4d,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,0.03825116157531738,0.03835892677307129,0.040407657623291016,0.05039858818054199,0.03997373580932617,0.038826942443847656,0.04228067398071289,0.2515859603881836,0.12093830108642578,0.9364640712738037,0.5792844295501709,0.07496118545532227,0.1225132942199707,0.04206228256225586,0.037558794021606445,0.040801048278808594,0.03646254539489746,0.04090523719787598,0.07151079177856445,0.9357023239135742,0.037139892578125,0.040871381759643555,0.0359807014465332,0.04119706153869629,0.03949689865112305 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv b/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv index c283a9c3ee..29a564d3cf 100644 --- a/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv +++ b/results/combined/merges_timed/codelibs/elasticsearch-dataformat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/remotes/origin/pull/63,7f6410361b640207341ac3b31112ad48aa23d64e,62100f1df607cdade1df3fd04f9daafe61cf1f47,204caf84298cf53c61e45b4c5ac34ac07e901e31,,True,True,True,4,33,97,8,True,9,Tests_passed,d20f8040e6a043326853f6ef8136328d7507f1cb3227af41444cd544b17bf7d5,True,Tests_passed,08dc3b66991e3b9477921a049920006a75c5049117808e931546e7f92c02db88,True,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,77217716027282e8123a61f8a68e13998a075afba453da9a7143ff35e7d77f4f,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,85a0087200faa9873202ec5fc873e16927b27f217b94ab874853706c07e7b9f0,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,f94d20836b6fcedf7cc393c01d15756f49be87538fc16cc8c0bc935a5c9cbf61,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,0.04054689407348633,0.04616904258728027,0.03885316848754883,0.04667949676513672,0.04768061637878418,0.04771780967712402,0.046418190002441406,0.24273037910461426,0.17908692359924316,2.5766348838806152,0.41704511642456055,0.10668468475341797,0.12809205055236816,0.04267597198486328,0.04268503189086914,0.04301881790161133,0.041839599609375,0.04129600524902344,0.09224104881286621,2.646768808364868,0.042684316635131836,0.042732954025268555,0.042052268981933594,0.044745683670043945,0.0426945686340332 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv b/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv index 7ec385adf1..90d2e10e20 100644 --- a/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv +++ b/results/combined/merges_timed/codelibs/elasticsearch-dynarank.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,2abe9cc9725a9ec581c0b25f4b6b8465be6ca2bd,bd20a839f948602a01cb0a05c7f27378cd38720e,f66429f2dd399ad0ea0dc65127321e8da4b2b0ce,,True,False,Tests_passed,013bc7dc36297c07aedfb0a9da4d4995f274e522c71fff4420ef5ad15cef957b,True,5,10,130,2,True,Tests_passed,93fea829e37aa9e397a61e6b342963c471f765dc6e05976753c275cbd5e0e596,True,5,True,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_failed,424b1dca1a519335df172b117f5bdd431b69266efd897390e4f13d5a9dff2480,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,0.04557633399963379,0.04357576370239258,0.04945206642150879,0.04689621925354004,0.032483816146850586,0.04746532440185547,0.04197216033935547,0.16209840774536133,0.11468172073364258,1.81307053565979,0.450056791305542,0.06940770149230957,0.12363481521606445,0.03994441032409668,0.04019951820373535,0.04019498825073242,0.04043412208557129,0.03997635841369629,0.07328248023986816,1.628387212753296,0.03933215141296387,0.03893876075744629,0.028882503509521484,0.038804054260253906,0.029281139373779297 diff --git a/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv b/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv index 494c305d6c..3f5dc55c25 100644 --- a/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv +++ b/results/combined/merges_timed/codelibs/elasticsearch-reindexing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,86d6547781fa856053b7c8778c5b072f3e2d13a6,c1654eb26efa5e84e1ee5ba545723b4f8d5c56c9,27a389ca858f7c681aeb7ca647e71b8195143cbf,,True,True,Tests_passed,968b77301b0cc1b36d9601389345cea395bb679451638d91006e5bbb14b8f915,True,5,19,126,5,True,Tests_passed,c1f00f7a4ee79a1242c4ac77a4a37045d5cc77e65bafc1acad96bb4638064469,True,7,True,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,13984e7942474b392a10e7675ee4dabcb552ec531d0320ae8df3ba4e98509792,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Tests_failed,e85f61c02255f31557e6788bb5815e22a018b752400fc412e55e9033cbda71e1,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,12dd06ecd1bdcf8954370347969cb5336b027105c6c06a1ef96e24ba36693f7d,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,0.043357133865356445,0.04159688949584961,0.039713144302368164,0.03939700126647949,0.04236721992492676,0.04009199142456055,0.040122270584106445,0.22452092170715332,0.19608473777770996,1.5984892845153809,0.6519522666931152,0.1097865104675293,0.11994385719299316,0.03997921943664551,0.040222883224487305,0.03951239585876465,0.038584232330322266,0.04001259803771973,0.08508443832397461,1.5771913528442383,0.039708614349365234,0.04073977470397949,0.03825020790100098,0.03970766067504883,0.03860950469970703 diff --git a/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv b/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv index eb0bf89f68..66b601d90e 100644 --- a/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv +++ b/results/combined/merges_timed/codingpedia/demo-rest-jersey-spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,158fc9108d0e0e0b32f9ba636048bc9901ee9e7a,ce83bed1e5da5b643f9967bab4470cfbebbfd897,05f5ee2f97b64ffb774cb8c4e0bc5b4c92374ced,,True,True,True,15,36,229,2,True,15,Tests_passed,acc2d476fc2ba686990e348d54362cd0bc845263cf2288ad429ad61cc65c0a23,True,Tests_passed,3539dfced015a9491ab87e00b89700d5a91dd009831772f5952d0b5cebf40daa,True,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_failed,c5183c9bf9499ee63e00e5a3f9acb628cecf47efe4a2e50ebb7930a3527b45a2,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,0.010289192199707031,0.010288476943969727,0.011412382125854492,0.011418342590332031,0.01153421401977539,0.011619806289672852,0.011581659317016602,0.03693222999572754,0.06628584861755371,0.013889551162719727,0.30578064918518066,0.07470917701721191,0.13216614723205566,0.04630708694458008,0.0435175895690918,0.045075178146362305,0.04445290565490723,0.04551434516906738,0.08061432838439941,0.05802607536315918,0.04319429397583008,0.04471921920776367,0.035044193267822266,0.04359698295593262,0.03377079963684082 diff --git a/results/combined/merges_timed/cognifide/sling-dynamic-include.csv b/results/combined/merges_timed/cognifide/sling-dynamic-include.csv index b58ec24bda..c6ddf8d407 100644 --- a/results/combined/merges_timed/cognifide/sling-dynamic-include.csv +++ b/results/combined/merges_timed/cognifide/sling-dynamic-include.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,4ede3baa98d3f20b494ca339783b40903ee9054d,93f68ae098594bf234f2d5249bbf2a4ac2516c04,883b0fe25d50ae895901c4650f23bfe15a78836a,,True,True,True,20,34,891,3,True,20,Tests_passed,95320c9357acf85011ac02378bd82948e49eee6d42f01917b0b7568d5591b1d3,True,Tests_passed,53ea631dfcfde5849e453b83a8dc19c3ab5492d3cb7355eb782a5be4f0137e97,True,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_timedout,,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,0.010549783706665039,0.011467695236206055,0.013290166854858398,0.011179924011230469,0.012944459915161133,0.010731935501098633,0.010038375854492188,0.05205345153808594,0.0701298713684082,0.025482177734375,-1.0,0.06955409049987793,0.1252453327178955,0.04110455513000488,0.04117608070373535,0.04128670692443848,0.04066896438598633,0.04039740562438965,0.08221197128295898,0.05239582061767578,0.040558576583862305,0.04057884216308594,0.0312504768371582,0.04016900062561035,0.03157401084899902 diff --git a/results/combined/merges_timed/cognitect-labs/transducers-java.csv b/results/combined/merges_timed/cognitect-labs/transducers-java.csv index 23ec7a8b39..b75713e0c0 100644 --- a/results/combined/merges_timed/cognitect-labs/transducers-java.csv +++ b/results/combined/merges_timed/cognitect-labs/transducers-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/remotes/origin/java8,b13061ed151598fd886572abbcf5576d8f701d44,37b7aace2623152cab33db7390d2546ca8901436,a1897ce7865dcc6ffeea78e1c3bfed26f713bcc7,,True,True,True,18,17,1859,3,True,18,Tests_passed,3955c23c9230ace087f77163a8f346abe008dfffc19ae9cfbff967f519d547e9,True,Tests_passed,4abb9548c02cfe5493ca83356fe2614e5e8b555a3afd8d0de166dc3c8edbdd30,True,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,0.04203534126281738,0.04046988487243652,0.03931903839111328,0.038440704345703125,0.037323713302612305,0.03833127021789551,0.037595272064208984,0.15863680839538574,0.03843331336975098,0.044553279876708984,3.780498743057251,0.04682183265686035,0.11846423149108887,0.03885817527770996,0.037978172302246094,0.03880047798156738,0.03880000114440918,0.03825879096984863,0.0721292495727539,0.05220913887023926,0.03984642028808594,0.03992867469787598,0.03784441947937012,0.038703203201293945,0.03766989707946777 diff --git a/results/combined/merges_timed/cognitect/transit-java.csv b/results/combined/merges_timed/cognitect/transit-java.csv index cd8c81d90f..9cc2df3cff 100644 --- a/results/combined/merges_timed/cognitect/transit-java.csv +++ b/results/combined/merges_timed/cognitect/transit-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,641ef0f68dcd139f4bdbb55b8618f6f6d26a0257,f4146b0a0d72a3b5bb2a0363a88b670428da2241,49f9534927b70ce5882b160d216f49a951753b81,,True,True,True,18,64,429,3,True,18,Tests_passed,76823149f28ada25ff05f29753e70d69a36f35131754456f64575bc992bae96f,True,Tests_passed,2aa09c053c09ef2ad21d8c23667d174d13d9343d850f201bbeb27e1644d5837d,True,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_failed,9c7bed53f5dc935eb55b1780445cacec14f2a215b4808316b02fbc88ba3258c3,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,0.042586326599121094,0.04252457618713379,0.043727874755859375,0.044794559478759766,0.05334830284118652,0.04994511604309082,0.05172443389892578,0.2388594150543213,0.16956567764282227,1.7480864524841309,0.6849625110626221,0.10431170463562012,0.14039325714111328,0.05788135528564453,0.05070805549621582,0.05066370964050293,0.052429914474487305,0.05648636817932129,0.11482048034667969,1.9917409420013428,0.05126476287841797,0.052243709564208984,0.03366589546203613,0.05213594436645508,0.034026384353637695 diff --git a/results/combined/merges_timed/comatoes/ftl-profile-editor.csv b/results/combined/merges_timed/comatoes/ftl-profile-editor.csv index 15ecd5e984..543ccd524a 100644 --- a/results/combined/merges_timed/comatoes/ftl-profile-editor.csv +++ b/results/combined/merges_timed/comatoes/ftl-profile-editor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,e87fe65818e726d317ec93c036d48205ed914f09,025d675787b49b2cdf34ee216d205248afa45f47,0e45353030b440fd729284b632da85770d40b73c,,True,True,True,6,68,825,2,True,6,Tests_passed,02a8c8a970b3f22d0251013d33c814db2609c1b0400441fd3b103054537fa8ec,True,Tests_passed,c98eef96740827a9a7d2b7f4e8807d20866c469c7d6259673fd538466c641c3e,True,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,87c963c092bca9004dd8d18fc1d1f750f9c22b23ae89920e3da6990acdb9da76,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,b4481a94ff8057373f1a2fb4c9a9a479cab1bf5e6dd3be2e0d6eb86668fbfa3d,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,267dfb230d660b11b87966c49a8af829e2735473bae2be369996259adfd7cfec,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,0.010855674743652344,0.011154890060424805,0.01185154914855957,0.011249780654907227,0.011424541473388672,0.011464834213256836,0.010877609252929688,0.04105949401855469,0.07241702079772949,2.098428726196289,0.6190495491027832,0.07080769538879395,0.1207435131072998,0.035192012786865234,0.03622937202453613,0.035056114196777344,0.036388397216796875,0.036342620849609375,0.0676276683807373,1.7822265625,0.03687739372253418,0.03656291961669922,0.03501486778259277,0.036650657653808594,0.03312945365905762 diff --git a/results/combined/merges_timed/comcast/jrugged.csv b/results/combined/merges_timed/comcast/jrugged.csv index c1a307c0ae..a3cc45ab74 100644 --- a/results/combined/merges_timed/comcast/jrugged.csv +++ b/results/combined/merges_timed/comcast/jrugged.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,01f77a72310610356739f066c6babf6bf29940db,ad2d4eb4c563ccf75a7790afbbbd7810ff0fa598,6c99d15ec7ecfe7a60fa9dbaf0624b4ee9630bcc,,True,False,True,3,3,5,2,True,3,Tests_passed,fbc679085039c61cef7947bd9a3577d1658c9181d7c6d4c2f1bc7c20d657355e,True,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,True,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,b6aa9ae8a5303a16d651c4e67e3366a5a3fae98ac9b0a954bbafdc778a6e0fb7,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Tests_failed,8e3b8f5be243eb74e2b455e6b7b0cb5f57dc53433b114c5ee44eb9129f1b763e,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,26571ae064aa479207050a6a3903d26f2bb5a023fc4ba0082fdff4d1158dec70,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,0.043529510498046875,0.04539823532104492,0.04171252250671387,0.04211926460266113,0.042873382568359375,0.047979116439819336,0.04828333854675293,0.17359447479248047,0.1260390281677246,0.938474178314209,0.33376049995422363,0.07044768333435059,0.13245058059692383,0.035878658294677734,0.03559064865112305,0.034998178482055664,0.0356142520904541,0.034894466400146484,0.11106395721435547,0.9378137588500977,0.03568220138549805,0.03559136390686035,0.0810537338256836,0.035666704177856445,0.034174203872680664 diff --git a/results/combined/merges_timed/commons-rdf/commons-rdf.csv b/results/combined/merges_timed/commons-rdf/commons-rdf.csv index 7a752e6e6e..a91142c1bb 100644 --- a/results/combined/merges_timed/commons-rdf/commons-rdf.csv +++ b/results/combined/merges_timed/commons-rdf/commons-rdf.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/old-master-before-asf,c3d344324564a68fdf91b0f2bca3574c3cf80951,e6b93fc8680e0d2cbba50b83c15767e6a4e64916,f3bf1b79225f243e7ebf6ebd0c8d455cc64aca00,,True,True,True,11,25,488,3,True,11,Tests_passed,1305c48cfffbe5937d39e24e5cdf779fafeb79cbb9980fa54894dc43b21a4a72,True,Tests_passed,7426c88b5b0e09b51b09236e85e057f3660fb247ba15748b8a50539fc0ddc9fb,True,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,1fbd8f8192179fd1292403d9f3d8f997659772b3df12b800e6cc6a40c33177fe,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,b59051ac3312cf15737719f7e02feed92a99a46c9028af4f2a21d78977ecc2fe,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,0f3e2b2cb7ced4622a748e18881e78a0e0c70a6c71589dbb78d19f12b30f7b4c,Merge_failed,4a4b644b5da003cb748989e4dd2e8b07a74887e2ae543da8674e8a69d1cea41d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,0.04026532173156738,0.0465090274810791,0.0353550910949707,0.046347856521606445,0.03623199462890625,0.0364222526550293,0.0369105339050293,0.13366413116455078,0.16765642166137695,0.4779548645019531,0.24250245094299316,0.09566092491149902,0.11945176124572754,0.03946399688720703,0.045127153396606445,0.03981208801269531,0.039099931716918945,0.039083242416381836,0.08591747283935547,0.49322509765625,0.03903937339782715,0.04550790786743164,0.030606985092163086,0.03961324691772461,0.031330108642578125 diff --git a/results/combined/merges_timed/connorlinfoot/cratesplus.csv b/results/combined/merges_timed/connorlinfoot/cratesplus.csv index 46dd88aee1..1b280f3f17 100644 --- a/results/combined/merges_timed/connorlinfoot/cratesplus.csv +++ b/results/combined/merges_timed/connorlinfoot/cratesplus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,50dfeb59338bf094290dbcd1bbea1112ec966900,3e1450cf764cf02d72f03b9490f9b10fa0ae7a8b,6e15f7b0367e0ae03b9e5727d2812247d8b81c4a,,True,True,Tests_passed,cb4d31e39601ab5685a8f26dd8fb87628d4f9e8865210400252c74471cdb4227,True,19,75,374,3,True,Tests_passed,6e6ddcfb87b6fed2d8f4681bfe9cd527c094efb7f1dc6abda6e33f308a84c912,True,19,True,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,dc6ebc980ffd787da495df7720bd1fd30f2d718bb32975e704621ed7d558840b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,3a76cd21838be6aa724d28ce14503b39445d8a0542dc46bb53b917fe1ff9710b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,396831111bf429561c7bab45482d28cb88e77058f7da13665f5469e49793407d,Merge_failed,39753fde25f9bb3fc3a3335bbbc999e034851515f545b9599b8626a79c3425e5,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,0.009582996368408203,0.009786605834960938,0.01015472412109375,0.01007533073425293,0.009912729263305664,0.010360002517700195,0.01027369499206543,0.04749417304992676,0.12041687965393066,0.4206259250640869,0.554124116897583,0.10423874855041504,0.12514662742614746,0.04369306564331055,0.0434575080871582,0.04394388198852539,0.04420304298400879,0.04232931137084961,0.09112095832824707,0.46870946884155273,0.04276847839355469,0.043874263763427734,0.034438371658325195,0.043702125549316406,0.034071922302246094 diff --git a/results/combined/merges_timed/conveyal/osm-lib.csv b/results/combined/merges_timed/conveyal/osm-lib.csv index f06013fd9f..af724cbfee 100644 --- a/results/combined/merges_timed/conveyal/osm-lib.csv +++ b/results/combined/merges_timed/conveyal/osm-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,True,True,True,20,66,851,2,True,20,Tests_passed,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,True,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,True,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_failed,6fa0a2f9780edd204386344f127aae185ef737869bc587285d18ab64ec494b2d,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,0.047125816345214844,0.04700756072998047,0.06699132919311523,0.0683290958404541,0.06673789024353027,0.06655669212341309,0.06665897369384766,0.11098384857177734,0.10310912132263184,0.6743433475494385,0.5115578174591064,0.16759490966796875,0.18410730361938477,0.13857221603393555,0.1334547996520996,0.1367354393005371,0.1307086944580078,0.12889432907104492,0.18571710586547852,0.7439000606536865,0.11382579803466797,0.1146535873413086,0.11713361740112305,0.11789989471435547,0.11554718017578125 diff --git a/results/combined/merges_timed/corentin59/artnetstack.csv b/results/combined/merges_timed/corentin59/artnetstack.csv index 0dfafdf591..1ac2933d3c 100644 --- a/results/combined/merges_timed/corentin59/artnetstack.csv +++ b/results/combined/merges_timed/corentin59/artnetstack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,f470681d57c8830ab18bf74db45fc67e8baecaf8,d1d1e64965cb8027fb1819b4e8657ba3f37e49c0,d10b58945b2d4ae6a7e82a83269a919bcf207f90,,True,True,Tests_passed,28b20d05bc3cb4d4de0fb2257adee1e81d3e6ee164542fc82ab54e8767ae96f6,True,20,272,1142.0,2,True,Tests_passed,a1e0dc9acf01b695c5708a7f79fb83f12b10c6140df734c66c9924bc1d1e39e3,True,20,True,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,719b241a1ffb75b4b03fed8254e81f1e14a229a4241a9b7c465905cd386be384,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Tests_failed,f758074615116886006b0ddf5897af8be30a193f592308b2f4e8b5ca52ce7aea,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,017ba4f154ef572529d41d5b75adde586ec817436c89f81a270cf6862aa8aba4,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,0.04260420799255371,0.04081463813781738,0.04115581512451172,0.03875732421875,0.03542375564575195,0.04297518730163574,0.04316425323486328,0.1633315086364746,0.11738395690917969,0.7153482437133789,0.3934667110443115,0.07555174827575684,0.1141042709350586,0.03384113311767578,0.034746646881103516,0.03436398506164551,0.034409523010253906,0.03444099426269531,0.06518983840942383,0.7340364456176758,0.034696102142333984,0.03419327735900879,0.033827781677246094,0.03481125831604004,0.033090829849243164 diff --git a/results/combined/merges_timed/corfudb/corfudb.csv b/results/combined/merges_timed/corfudb/corfudb.csv index 663386f825..7b9329ad34 100644 --- a/results/combined/merges_timed/corfudb/corfudb.csv +++ b/results/combined/merges_timed/corfudb/corfudb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 398,refs/heads/master,233e1eb18c40db72da1f101cea0b4935f8c6c880,a9e1a15d2d269f429b31d8ac197850e0321c4652,c18f2955cf32966675b363096e39f18027c51a4f,,True,True,Tests_passed,d32babc3b8fd3692ba30a7c61d343a42143192f774d57fdc34a66b8aff34d17c,True,27,79,884,2,True,Tests_passed,d9b2dc09d92de5db60297c5d088220370fc8132dbc4de8973016030ba4e01a88,True,27,True,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,04550d800ccc1af2167d29f9747451fac5ad3271f00ab3242fe0d8984925d712,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,0fda0b6a9c6923b0f0c7574c0389a59d5655c358440555549cd3a8099f764abb,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,0.08862090110778809,0.09194540977478027,0.10686326026916504,0.10752582550048828,0.1059725284576416,0.10632944107055664,0.1060945987701416,0.28328680992126465,0.15122771263122559,0.0925896167755127,0.7613368034362793,0.09400010108947754,0.2261364459991455,0.04381704330444336,0.04395031929016113,0.04457235336303711,0.07876944541931152,0.04390096664428711,0.07950043678283691,0.06183218955993652,0.041641950607299805,0.043746232986450195,0.1586902141571045,0.04365968704223633,0.042847394943237305 diff --git a/results/combined/merges_timed/couchbase/couchbasemock.csv b/results/combined/merges_timed/couchbase/couchbasemock.csv index f33cfe6d42..4150253319 100644 --- a/results/combined/merges_timed/couchbase/couchbasemock.csv +++ b/results/combined/merges_timed/couchbase/couchbasemock.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/remotes/origin/pull/34,8a2592ff627f404c008bc22f5a62773f787b288a,2585b651a9a91599b3e264ed630242e734bce980,b49b3867e48f677ac07e870e440f1e5c3793cd5f,,True,True,Tests_passed,38b4ed1436a351259c499525cc437d9d2cd6e677bb774b7b4e4f41f2dca2e3ff,True,9,20,133,12,True,Tests_passed,df0a161946aabca831ea842e5365e622b1ec60c703e209c03dccfbb59d215c66,True,12,True,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,697aad2461df12c1c41dabea8cb0eecc9e8624b23ab33a925e15b162da87fc15,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,0.01977992057800293,0.010582685470581055,0.022034168243408203,0.01040196418762207,0.02167344093322754,0.022333860397338867,0.02231311798095703,0.13669657707214355,0.44589710235595703,3.9203929901123047,0.3505747318267822,0.28878021240234375,0.15343356132507324,0.08561372756958008,0.0837864875793457,0.07323884963989258,0.08118247985839844,0.08656978607177734,0.212477445602417,4.0010247230529785,0.07596731185913086,0.07846617698669434,0.07224726676940918,0.07821083068847656,0.06973075866699219 diff --git a/results/combined/merges_timed/coutume/imageonmap.csv b/results/combined/merges_timed/coutume/imageonmap.csv index 5212850b21..be753ca60b 100644 --- a/results/combined/merges_timed/coutume/imageonmap.csv +++ b/results/combined/merges_timed/coutume/imageonmap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/indev,094905324ef45772cf98c7887958202acf69e581,ac51032e1a0426cc4e40b525433cca4e270a9273,a45638b86c302cc93967a737e87b6e2c8412c186,,True,True,True,15,38,776.0,2,True,15,Tests_passed,27dd1f4dc5b5b025019eaddfbbd70028792f943ddbb8505ef61e1d54113d26aa,True,Tests_passed,776e10b34c839faf6745b02462fa65f4a39ee8c91093f0d199c0d070f4663f5a,True,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,0.01196146011352539,0.012525796890258789,0.013127565383911133,0.013471126556396484,0.013625383377075195,0.013167619705200195,0.013176918029785156,0.03880476951599121,0.06641340255737305,0.5729920864105225,0.39487195014953613,0.07837581634521484,0.13544225692749023,0.04950523376464844,0.04980826377868652,0.0487518310546875,0.04753851890563965,0.04790496826171875,0.08272624015808105,0.634253740310669,0.046750545501708984,0.047029733657836914,0.03630661964416504,0.04626774787902832,0.03676176071166992 diff --git a/results/combined/merges_timed/coverity/coverity-security-library.csv b/results/combined/merges_timed/coverity/coverity-security-library.csv index 4a0d516093..47b7b09743 100644 --- a/results/combined/merges_timed/coverity/coverity-security-library.csv +++ b/results/combined/merges_timed/coverity/coverity-security-library.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/develop,87f5b259742c8db2aec081be12efedf6c3b76577,06b372aebec440bc64141af4a83ad077b8b4ba45,8656ab536af9a8547ed58a3178170bf3f482813f,,True,True,Tests_passed,e98057c6694e44a17de3da44397ae4eb571296c7882d93ff6e393118019cf105,True,30,48,2981,2,True,Tests_passed,5b84b4fbfb4e112f3ffebd65df62dbc17215bad3b7df9f061e15fbfbf143b11a,True,30,True,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,8e1c351e5cda54b4004c136f0aefe1f3916a3184b16f780d293c0b0fe1d66b94,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,0.05778098106384277,0.05587196350097656,0.051700592041015625,0.0532987117767334,0.013437509536743164,0.05094766616821289,0.052858829498291016,0.17708039283752441,0.11895370483398438,0.616478681564331,0.37355709075927734,0.07420945167541504,0.13152170181274414,0.043895721435546875,0.0441288948059082,0.04337620735168457,0.0443570613861084,0.04442763328552246,0.07800817489624023,0.6233170032501221,0.043230533599853516,0.04065561294555664,0.0329282283782959,0.041823387145996094,0.032617807388305664 diff --git a/results/combined/merges_timed/cowtowncoder/java-classmate.csv b/results/combined/merges_timed/cowtowncoder/java-classmate.csv index ff2f589c34..d4782fa052 100644 --- a/results/combined/merges_timed/cowtowncoder/java-classmate.csv +++ b/results/combined/merges_timed/cowtowncoder/java-classmate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,b6f993cddcb4cac4f1b8aa250f3e020e9727aaea,8aebf88f4c8bb9773a3fbdf1ca906bc83caf01b4,6f670f7db7b053c4690402fbfa60ace167b9e0d9,,True,True,True,13,21,68,2,True,13,Tests_passed,13426d420a43d9ae3c0924aeb207bd43e3993b9d4f9deb9d081420c8f1a72a21,True,Tests_passed,d9a6105f540e37aa74b7a1708f6432accc8f3f08835fc490da4afacf4e25421d,True,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_failed,808a35339aa2bb1e6963bb8c870ffd7c9db3d46f9d20c62d521253511c8fb3e9,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,0.04842329025268555,0.056157588958740234,0.04538774490356445,0.061743736267089844,0.06424593925476074,0.0466303825378418,0.044721126556396484,0.17714929580688477,0.11199951171875,0.9171280860900879,0.5676167011260986,0.07721614837646484,0.1324477195739746,0.04558682441711426,0.048009634017944336,0.04792451858520508,0.04454636573791504,0.04696154594421387,0.0830392837524414,0.9125826358795166,0.04566788673400879,0.047249555587768555,0.03425097465515137,0.04476428031921387,0.03576803207397461 diff --git a/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv b/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv index be87d2b6d2..0428b12f70 100644 --- a/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv +++ b/results/combined/merges_timed/cowtowncoder/java-merge-sort.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,259857f3675ea88d0f2d6361904e085ed91dafe7,37c22d00607f5618cab9a81eeb00dad848e041c2,af0c5ae57383b584ca1eca7cd5bcab218ca3046d,,True,True,Tests_passed,360643ef385c697e8e3adaeeea9449caecc7c3d799cb76850143b9d23d57398f,True,4,13,131,2,True,Tests_passed,19fad57bd5b751c6b2304ab92cb545eb13a5a2b98993b055dc04b9d9fa623537,True,4,True,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,0.009517431259155273,0.010026693344116211,0.009897708892822266,0.01006174087524414,0.010400772094726562,0.010065555572509766,0.009891033172607422,0.036084651947021484,0.06820487976074219,0.7103888988494873,0.2746560573577881,0.06966137886047363,0.12309503555297852,0.03874826431274414,0.03881120681762695,0.03933858871459961,0.03815007209777832,0.0393061637878418,0.07196569442749023,0.6819806098937988,0.038520097732543945,0.03851175308227539,0.028162002563476562,0.038600921630859375,0.027980804443359375 diff --git a/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv b/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv index bc56413271..56973920ae 100644 --- a/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv +++ b/results/combined/merges_timed/cowtowncoder/java-uuid-generator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,47f4b70d8392a721d18827121cde1be0179484c9,2a9673cf1473ed5f0abf901df6ab79687bb62029,54db1d59909096e3d6c843f2d5338b18a93f6df1,,True,True,Tests_passed,44c7ba77106e5af0b0728e09032143b11c7b810bc83a3567838b528e0ea4179e,True,9,15,103,2,True,Tests_passed,78de4abb536eb2e184a2147ca779b6cc7b102fd3977af97be2ed570e3ad57d23,True,9,True,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,a9c1fda0cbe0a3089ec87b69fe3e7034698bf9b494868786bc73bfa4bfab11db,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,0.04688620567321777,0.044298648834228516,0.046773433685302734,0.04509162902832031,0.05207180976867676,0.05414462089538574,0.059834957122802734,0.16636252403259277,0.11523890495300293,0.6558089256286621,0.347642183303833,0.07651424407958984,0.1343545913696289,0.042958974838256836,0.04469418525695801,0.0445559024810791,0.04557061195373535,0.047022342681884766,0.07901692390441895,0.6812889575958252,0.043875932693481445,0.04518008232116699,0.03363847732543945,0.043778181076049805,0.03275322914123535 diff --git a/results/combined/merges_timed/craigwblake/redline.csv b/results/combined/merges_timed/craigwblake/redline.csv index 191e2467e6..625d6e2283 100644 --- a/results/combined/merges_timed/craigwblake/redline.csv +++ b/results/combined/merges_timed/craigwblake/redline.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/heads/master,93d8982d66c56a3d198aaf792b4c5737295aedbd,d1720810ea8a53f15e01332d4d8cf31ad46bb381,71e1ca243fa959797728bb09c0abf3c6c2d9a697,,True,True,True,25,124,829,3,True,25,Tests_passed,d2d8a0203ef4aaa9877fcec35430e310efb7a665f2dee1effe6a7adefdfae625,True,Tests_passed,9ed3135958ce290c0bbc1910c1f3756206ae48b0787154dd6998e8cfe34c084b,True,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,7627d34b8ad0e5a3a8cda6409653016e055d00793f9a8332acf2c2ecd1f06509,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Tests_failed,f5932d025d6bbcfd68d6f2e7a138a1c0b425cf878fa51248e14daa2f9610ad04,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,f1730bda25aa5948d498c8a4630e4fcc08ba9575901918747a713db7ff032455,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,0.012245655059814453,0.012317657470703125,0.013009309768676758,0.012628555297851562,0.013041019439697266,0.013355255126953125,0.012796878814697266,0.05112409591674805,0.12578892707824707,1.4114482402801514,0.7128942012786865,0.10950112342834473,0.1303114891052246,0.04877281188964844,0.047939300537109375,0.0501093864440918,0.046656131744384766,0.048989295959472656,0.09664177894592285,1.4438197612762451,0.04791426658630371,0.04736161231994629,0.048293113708496094,0.045903921127319336,0.047647953033447266 diff --git a/results/combined/merges_timed/creswick/cjwizard.csv b/results/combined/merges_timed/creswick/cjwizard.csv index 32e9f76519..2165c2e492 100644 --- a/results/combined/merges_timed/creswick/cjwizard.csv +++ b/results/combined/merges_timed/creswick/cjwizard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,0.03646373748779297,0.042362213134765625,0.04679441452026367,0.04868483543395996,0.051816463470458984,0.039258718490600586,0.04535222053527832,0.16601872444152832,0.1098794937133789,1.12184476852417,0.4011547565460205,0.0730440616607666,0.12946677207946777,0.04209303855895996,0.041655540466308594,0.0426328182220459,0.04295492172241211,0.04209113121032715,0.07562136650085449,1.0745434761047363,0.04138350486755371,0.041426658630371094,0.0299532413482666,0.040676116943359375,0.030824899673461914 diff --git a/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv b/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv index c5af80be43..e656ed9027 100644 --- a/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv +++ b/results/combined/merges_timed/cribbstechnologies/java-mandrill-wrapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,0b7df0edc68a40c8d79c903cb86e247f7ec190b4,56a8b97dd8be278ed2636077bc5f1b929d0229b7,3887e2c173f89684b82ab5002499c435ebf3a60f,,True,True,True,15,33,197,2,True,15,Tests_passed,086872243a2eef8176f0ffb013f0f4aed0ba3e060a3a6dce8b9e7c7a098fee47,True,Tests_passed,fa4dce8419a625b5abb82d41d22a3f2fdcd3bb917dcdd00a9fcc11ce5eacc377,True,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,0.04108881950378418,0.04434514045715332,0.04111909866333008,0.04053759574890137,0.03910684585571289,0.04032325744628906,0.04710793495178223,0.17396998405456543,0.11359310150146484,0.6642420291900635,0.4315955638885498,0.07582378387451172,0.12698125839233398,0.04193305969238281,0.041699886322021484,0.042101144790649414,0.04030156135559082,0.04099917411804199,0.07608580589294434,0.6474156379699707,0.04034781455993652,0.04182863235473633,0.0301058292388916,0.04070258140563965,0.02989673614501953 diff --git a/results/combined/merges_timed/cternes/openkeepass.csv b/results/combined/merges_timed/cternes/openkeepass.csv index 9d2798af9a..65e2f6fb16 100644 --- a/results/combined/merges_timed/cternes/openkeepass.csv +++ b/results/combined/merges_timed/cternes/openkeepass.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,0691954e63c3576146e86809bff0c0c2b77a0f6f,6218ade3f2e50f22e5e263714197f176e856c5a2,18ba96ffbe2acabe644a155ef8c650548f3c7062,,True,True,True,38,119,767,3,True,38,Tests_passed,836933c08f60ae54c30f2e09ddc4c575aeb57ed7d1af55b8930d4eabae3e99f5,True,Tests_passed,027deee34b639e0ba83921c7135dd06ab6d20889838dda37e4edf841ad8711ae,True,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,19ce7a4296517faa89f86279bf3a90fd977c882d51305bf75abbbf2c99f133c5,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Tests_failed,e6a4f25f27dde16ec7b1430d8b6a056c83eb278028d1337aaded5ffe4eee5e15,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,d406fc0d0f684390df947eaaa6a457be4f6c4b53ac80f5683815e0159aeb86f7,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,0.044588565826416016,0.04640626907348633,0.02872157096862793,0.04409074783325195,0.03983259201049805,0.047217607498168945,0.04508256912231445,0.24869871139526367,0.17644262313842773,1.592029094696045,0.7297053337097168,0.11198759078979492,0.129256010055542,0.04679131507873535,0.04949235916137695,0.04625988006591797,0.048465728759765625,0.0496518611907959,0.09794974327087402,1.5300090312957764,0.04863715171813965,0.04791259765625,0.038954973220825195,0.04834938049316406,0.03827643394470215 diff --git a/results/combined/merges_timed/ctran/tinyradius.csv b/results/combined/merges_timed/ctran/tinyradius.csv index ef9d57cc5b..7e93a9521b 100644 --- a/results/combined/merges_timed/ctran/tinyradius.csv +++ b/results/combined/merges_timed/ctran/tinyradius.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/20,28644bdc78775695857aec787d220e81399454e6,4332168d74101944750e404a65f01664532e1b2f,82d5baf8774ce22e2301d5c856cecd9aa7348553,,True,True,True,10,37,271,2,True,10,Tests_passed,1d380689633a029030220c020d6280aa62adedd1cba5035502ac3ecb62ba0730,True,Tests_passed,ea373092ad708087253cb44417aa7b84052b06f4e89078ad3b80c7124716bc98,True,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,0.012056589126586914,0.011953353881835938,0.013063192367553711,0.013822555541992188,0.013204336166381836,0.013319253921508789,0.0135955810546875,0.04078555107116699,0.07064104080200195,0.9391317367553711,0.3903229236602783,0.07416367530822754,0.13347673416137695,0.044062137603759766,0.04593777656555176,0.04560494422912598,0.04597210884094238,0.0425872802734375,0.07792067527770996,0.8954708576202393,0.045257568359375,0.04378151893615723,0.032216787338256836,0.043787479400634766,0.0333254337310791 diff --git a/results/combined/merges_timed/dabsquared/gitlab-plugin.csv b/results/combined/merges_timed/dabsquared/gitlab-plugin.csv index f45a34daa4..9719886061 100644 --- a/results/combined/merges_timed/dabsquared/gitlab-plugin.csv +++ b/results/combined/merges_timed/dabsquared/gitlab-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 121,refs/heads/master,f2815dcb0482755e4185d2691a3a0cf37b862b26,49b97dfa8f9fdc0f172af04491ba5dbd1b2b5f5b,45e754db357692047e481500269a3b3be764dd82,,True,True,True,37,159,728,2,True,37,Tests_passed,71762fef9b65436d81101674ba3e728166bf44a8c376453ea883e96b58c9e0e3,True,Tests_passed,abf6299d51eceec06b0287b2c14b80ee7337f3589c6adc121e448779569735bb,True,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_failed,481a016496d4c1b9dc5c7a3960fa16080b08010172214e9e1f8a25cc32255c25,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,0.012727975845336914,0.01833653450012207,0.0224459171295166,0.022340774536132812,0.021999835968017578,0.014336347579956055,0.021952390670776367,0.05077028274536133,0.07353687286376953,0.8451938629150391,1.104487657546997,0.08018207550048828,0.1539137363433838,0.06495785713195801,0.059314727783203125,0.05000877380371094,0.06148409843444824,0.06092405319213867,0.10419917106628418,0.8979637622833252,0.05567216873168945,0.04803800582885742,0.04728412628173828,0.05808424949645996,0.0491633415222168 diff --git a/results/combined/merges_timed/dakusui/jcunit.csv b/results/combined/merges_timed/dakusui/jcunit.csv index fa4063de05..69fd3e1b6a 100644 --- a/results/combined/merges_timed/dakusui/jcunit.csv +++ b/results/combined/merges_timed/dakusui/jcunit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 94,refs/remotes/origin/archive-0.8.x-experiment-join,7f2740c44e080329b840996c537f006154566e5a,3f10eff6a4b93dc09797d2105707864577323c46,7c8b99f1e932c6dd8cd3f2bb7a3d6c824001f57f,,True,True,True,8,23,243,2,True,8,Tests_passed,bfffbfa98d1d5e06d2150e4683c3811b8d5175cb62f291515c6b9a26d67755e3,True,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,True,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,bae835e847f920076854d40b15f564b514488d37bfe0154dec8fa80fc9d60ab8,Tests_failed,aac781ae55b3422f77b1d1d6f349a6f0fccf2232ba4dfa135f694981c46fce17,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,bae835e847f920076854d40b15f564b514488d37bfe0154dec8fa80fc9d60ab8,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,0346239487897c5d93f27b880263797afd1db146bffa947b53cd3bccb946bdd6,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,Tests_passed,9a451cef1f10da3ae71dadfe3c4e4419f463fe209df139c82ea7247d1de3aa30,0.04571223258972168,0.015544652938842773,0.05146288871765137,0.026289939880371094,0.0527796745300293,0.03360605239868164,0.05479693412780762,0.17933297157287598,0.11561846733093262,1.2018201351165771,0.5768969058990479,0.12346148490905762,0.15722107887268066,0.044776201248168945,0.08603239059448242,0.08433270454406738,0.08320283889770508,0.044248104095458984,0.0803980827331543,1.158712387084961,0.04494619369506836,0.07263565063476562,0.07290124893188477,0.07764005661010742,0.06670284271240234 diff --git a/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv b/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv index 6eab539565..7af396d90d 100644 --- a/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv +++ b/results/combined/merges_timed/danielflower/maven-gitlog-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,0bce3a1367ac611fc90a265cee3fc6de53c75943,3330e18f01f39361c7cfbb21d26d44c8f9c21a00,2007bf5f639ec25ca7b30b77ffd3f9701923a57e,,True,True,True,5,15,264.0,2,True,5,Tests_passed,3d7af16377c293a7d23528eb1afdfe603d662751e175bdf24be4c61e18051ed5,True,Tests_passed,4e15b33f4310230925b7a35e55d0ddeb1ea0073f6e1bd2387fa5d5a13b400f08,True,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,c1a62f63f057a022f6fbfcd9fb9cf5473fb81a3054a9f649aac2b4e6420ef3b8,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,c75557219c0bdb3ecf1d179f3955073ce44f6e31b81f9a62ce93bf5c3ef24615,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,d8aa325463536df9f46d56f347633a457d1c7a5ff8834b175739770091e83706,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,0.009885549545288086,0.010724782943725586,0.01417684555053711,0.011085271835327148,0.010121583938598633,0.009806394577026367,0.009602069854736328,0.0691835880279541,0.06885623931884766,0.681602954864502,0.2988927364349365,0.07044029235839844,0.1141657829284668,0.03468632698059082,0.042636871337890625,0.034680843353271484,0.03522849082946777,0.03411102294921875,0.06629109382629395,0.6278295516967773,0.034772396087646484,0.040482282638549805,0.03308916091918945,0.03492164611816406,0.0335078239440918 diff --git a/results/combined/merges_timed/danielgronau/highj.csv b/results/combined/merges_timed/danielgronau/highj.csv index f332480429..d6fe3e0895 100644 --- a/results/combined/merges_timed/danielgronau/highj.csv +++ b/results/combined/merges_timed/danielgronau/highj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,57cae0eb2d9be81f18f7e6f05cb69e68cd731c7d,a0478ba744b7beb5b2c71dea640a6cf6b26f5594,83e3f970c0a9563ba289bc1d35204dfbdfa624b9,,True,True,True,254,698,1975,4,True,254,Tests_passed,293ed24c2bdf911155197dcdcd4b66c5add192b0f3ce37628a1a917f45bdbd8e,True,Tests_passed,69a85ed3e02b92d8bdcb0fe8cd66a630995461d02088a6af88c4c53dfda957b0,True,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Merge_timedout,,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,0.07220315933227539,0.06838583946228027,0.04171633720397949,0.07182550430297852,0.07147479057312012,0.06343364715576172,0.06454896926879883,0.2739529609680176,0.22988200187683105,1.5473601818084717,-1.0,0.17301297187805176,0.18673300743103027,0.08557438850402832,0.08649015426635742,0.0912473201751709,0.08733177185058594,0.08860564231872559,0.16595005989074707,1.5184991359710693,0.08478283882141113,0.08876419067382812,0.062428951263427734,0.0853569507598877,0.06996560096740723 diff --git a/results/combined/merges_timed/danielnorberg/auto-matter.csv b/results/combined/merges_timed/danielnorberg/auto-matter.csv index 9653301c74..ce7bc1d93f 100644 --- a/results/combined/merges_timed/danielnorberg/auto-matter.csv +++ b/results/combined/merges_timed/danielnorberg/auto-matter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,a076352517d328fcb10a4cb9d1dd25e823f47e1a,32b943613299e13becc4ae5ab310d3f911776964,978b269eba9f5fdd9c4b88a98d6236fd03c0e8ab,,True,True,True,26,72,716,8,True,27,Tests_passed,77c4cbc9f7f4215fad0b8f58abf46244e7ab064ac85ad7c8c13e918590a00280,True,Tests_passed,40e78e274138c689c534014176d9606b965135bb2e47197a9b1b77166d19dfb3,True,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0dc994035403edb4259cd0c3e6fb470a6e18fdc0c560ad9f23a8229dac5ec3a7,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,1595a4e90182371ff02cb073ae63964c5c91b6b65fd8df066b28e1a5505885f5,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,662a4e305c2ef760d58f9e26426d481d94b4b0f9429af40ddad614a8b8649f3b,Merge_failed,489931d6f9048e1e9f1ca3ec0037757d86a9f08d02f430d2c0a95cdad59ce854,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,0.04670310020446777,0.050632476806640625,0.05260276794433594,0.05561470985412598,0.05225992202758789,0.04320192337036133,0.046372413635253906,0.5303349494934082,0.3765380382537842,2.546903133392334,0.5779132843017578,0.23763656616210938,0.16819119453430176,0.07952427864074707,0.08234357833862305,0.07929515838623047,0.08032870292663574,0.07983183860778809,0.200225830078125,2.319784641265869,0.07996463775634766,0.07949233055114746,0.04092764854431152,0.07364392280578613,0.04143643379211426 diff --git a/results/combined/merges_timed/dankurka/gwtphonegap.csv b/results/combined/merges_timed/dankurka/gwtphonegap.csv index 9dc03bbdbf..c65fea3ce8 100644 --- a/results/combined/merges_timed/dankurka/gwtphonegap.csv +++ b/results/combined/merges_timed/dankurka/gwtphonegap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,e19aa67e33166f958e2cb1181d5811cbde2ff6ad,72aa0c929b6fb675fa29d56a0daf0405caf85906,9037a4172b06032e5133e95f0fc4f0fc9c3651b5,,True,True,True,21,63,419,2,True,21,Tests_passed,28b9675d2af90cfc8a0741471a1ba40af03a39fbfeb06b5ae912d0259bc27665,True,Tests_passed,6152f84e95cd50a4fa5d733320cacb3af9ded85e38b0f27aa14be15ef42da51b,True,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,b8e26278e5cddf0af3c37d17525b3002d0b2f21e7786758d150f93a582ad37d3,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,0.01567673683166504,0.010325431823730469,0.019463062286376953,0.01911187171936035,0.01933598518371582,0.01943826675415039,0.010653257369995117,0.04733133316040039,0.07062625885009766,0.4834458827972412,0.35512614250183105,0.07188630104064941,0.1522367000579834,0.04138445854187012,0.06268453598022461,0.04289412498474121,0.04341721534729004,0.059058189392089844,0.07528233528137207,0.5360488891601562,0.04181551933288574,0.054573774337768555,0.04625844955444336,0.0404667854309082,0.044989585876464844 diff --git a/results/combined/merges_timed/dankurka/mgwt.csv b/results/combined/merges_timed/dankurka/mgwt.csv index b79f6d6d65..0793f4ab6d 100644 --- a/results/combined/merges_timed/dankurka/mgwt.csv +++ b/results/combined/merges_timed/dankurka/mgwt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,74856a7a070dde80f5ef866eb6de0ec77d4c6baf,49d43a7d9cb9aff1d7409edc47a858653f1773f9,39d049502be0f9b1ecc7dc572b93c5e112d75f08,,True,True,True,25,62,137,2,True,25,Tests_passed,3e8368c81eaa5de1031f85deaefdbb715cfca6abc82d04133f9ee629a9a9cbca,True,Tests_passed,885e081f41745970e619b1b47a3fc5b497a8d2fbb9bfc43bde26c26c5be6d7ce,True,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,821def53ed549e07dfa5d5e8fedc9e112ceda9e32adf39179c091204a727a55c,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,0.014330387115478516,0.013762712478637695,0.01601099967956543,0.016266822814941406,0.015629291534423828,0.016180753707885742,0.015463829040527344,0.045032501220703125,0.06991934776306152,0.6943345069885254,0.5769205093383789,0.08797788619995117,0.14632868766784668,0.05378842353820801,0.05613422393798828,0.05428719520568848,0.05318427085876465,0.05417513847351074,0.09435296058654785,0.7414238452911377,0.051770687103271484,0.05262303352355957,0.0411074161529541,0.0512235164642334,0.042072296142578125 diff --git a/results/combined/merges_timed/darcy-framework/darcy-ui.csv b/results/combined/merges_timed/darcy-framework/darcy-ui.csv index 245cdc7fe6..cdae63243a 100644 --- a/results/combined/merges_timed/darcy-framework/darcy-ui.csv +++ b/results/combined/merges_timed/darcy-framework/darcy-ui.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 29,refs/heads/master,5e1d93a56c5c0ba82cfa8adcd706b1fc0214493a,3c9c0fdf31a278bbd8c65071ef901aaa731c0bc9,9ee241447d187a0dc5bfd5d05c9c89fdd196205d,,True,True,True,6,9,95,2,True,7,Tests_passed,12eedf2cdaa4653d0c84a03ff15518a526bb15fc690d073248b54b19fd5d689d,True,Tests_passed,97486b57bf593bf5c7c5c2c12f1dae25eb306ee1219502ccf54bc0f376457cbb,True,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,70a5eb4204f75505c73ab3ef840e144b2b292d82f1115aa84ca73390ede142a7,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,2ce79117ac6e5d7412efe54c83d6833c58751a338b09891d839ae67f678e0ca3,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,9b9bdacebfd235f47ecd2e95b4e1a7ab2165fdfe972bc24a9513f46924699124,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,0.010597467422485352,0.032956600189208984,0.051917314529418945,0.034049272537231445,0.03530168533325195,0.035765886306762695,0.03473067283630371,0.12940573692321777,0.11754155158996582,0.6139423847198486,0.27582693099975586,0.0713493824005127,0.11564230918884277,0.037743330001831055,0.03679251670837402,0.03770112991333008,0.0370941162109375,0.036521196365356445,0.0693216323852539,0.6331815719604492,0.037683963775634766,0.03753995895385742,0.03623461723327637,0.035835981369018555,0.03485822677612305 diff --git a/results/combined/merges_timed/datanucleus/datanucleus-core.csv b/results/combined/merges_timed/datanucleus/datanucleus-core.csv index e63755e625..9a2336299d 100644 --- a/results/combined/merges_timed/datanucleus/datanucleus-core.csv +++ b/results/combined/merges_timed/datanucleus/datanucleus-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,8bff557466f08b633c5e33856b83518ca6ab1a60,3828238f6d5647f4d38692745ee1cee610700ca7,95c9e42c5d1c33906f3b3bf8dd1218577ad2d8fe,,True,False,True,2,1,10.0,2,True,2,Tests_passed,781c23b0f581e0170e248f4c68c6fb707713644e2e114e271a338bc81b72ec22,True,Tests_passed,238863cbf8b631ff4466907b2733c4402699ad2ab404f9167deb36a043e37be6,True,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,87b585e824fd58878ca8e11dbd73a6f4f67d7dbe80755330c5619540516db72a,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,8d7b6aa9ab010e23e96ea9f6c1e83398ace48c9676ba982e27eca64d16895f7f,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,297fbaf82d7572f39be9063a58bac1689dba9a12701bf6ea6586ab2b66f7b7b7,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,0.05369377136230469,0.05219888687133789,0.047452688217163086,0.04802441596984863,0.05171465873718262,0.04989314079284668,0.052297353744506836,0.20630550384521484,0.12472343444824219,0.8847665786743164,0.3058302402496338,0.07300543785095215,0.11871576309204102,0.03691720962524414,0.03778719902038574,0.037093162536621094,0.03778839111328125,0.03837871551513672,0.07159662246704102,0.8610193729400635,0.038285255432128906,0.03757309913635254,0.03666973114013672,0.03855156898498535,0.036203622817993164 diff --git a/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv b/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv index 446adec2a2..12aa862ebb 100644 --- a/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv +++ b/results/combined/merges_timed/datanucleus/datanucleus-rdbms.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,8b0f2651b6768a96482214f18b37ed8e7db530ef,90bc13f2a6e17c7342db60332ffbfbc57352e46f,1e531d71634ca9c6c04014e18d22be290fcaa95b,,True,False,True,2,3,7.0,2,True,2,Tests_passed,bfa4017456838c35160dfabad2fb9e4f83ea05a13206de95c7d1a60119f7beb7,True,Tests_passed,3524b702f68ea620a94b34751a753bc714565ba1c5b8a6a9ac779d58e457825d,True,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,0.04441094398498535,0.0469517707824707,0.04565143585205078,0.04806828498840332,0.0476531982421875,0.052951812744140625,0.05333232879638672,0.18529081344604492,0.11692953109741211,1.5724849700927734,0.4177243709564209,0.08069038391113281,0.14020633697509766,0.04487347602844238,0.045914411544799805,0.04640626907348633,0.046532392501831055,0.046829938888549805,0.08213973045349121,1.504002571105957,0.04472184181213379,0.04490327835083008,0.0334930419921875,0.04443645477294922,0.03433799743652344 diff --git a/results/combined/merges_timed/datasift/datasift-java.csv b/results/combined/merges_timed/datasift/datasift-java.csv index 1655804362..a1e9d821c1 100644 --- a/results/combined/merges_timed/datasift/datasift-java.csv +++ b/results/combined/merges_timed/datasift/datasift-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,8a3d7f4df80693d7f2b43942ab2a2007640d6ea9,09b4a92a47b65a10df0cc273ec6a79b38ddfa2d6,3824498688796efaa27a58166063065537107c2b,,True,True,True,4,14,46,11,True,13,Tests_passed,efd79430b35c7a9994ee73ba6dc230c81987b99ae3b8f99dffc0f7effb1b9c97,True,Tests_passed,d68fd444e23d12793b4d82d394ab0a169c7932d4015c8e62eda59ed1cb4c28e3,True,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_passed,dd4a66e6029cbfcf1152dcd72b511e9fbe603b8ab6af26b1318fab755ede76ce,Tests_failed,8bc5c1822ed72ae6995389c2f289c6f3fb984a7cb782fbb875ded5f01e3c645a,Tests_timedout,6ba6b3218e4e494ac5131b7272194d2c2ddb4d500518f40d521bf641e41b9f28,0.039620161056518555,0.0393214225769043,0.03835320472717285,0.03041243553161621,0.02881479263305664,0.02776336669921875,0.03304266929626465,0.1709909439086914,0.11799907684326172,0.7182028293609619,0.4591941833496094,0.08520174026489258,0.1326124668121338,0.04381918907165527,0.04240012168884277,0.043389320373535156,0.04340982437133789,0.055967092514038086,0.07654881477355957,0.7325849533081055,0.043261051177978516,0.04324960708618164,0.03551125526428223,0.053995609283447266,0.03446531295776367 diff --git a/results/combined/merges_timed/datastax/java-driver.csv b/results/combined/merges_timed/datastax/java-driver.csv index 76b53f82a9..2511a31702 100644 --- a/results/combined/merges_timed/datastax/java-driver.csv +++ b/results/combined/merges_timed/datastax/java-driver.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 538,refs/remotes/origin/2.1,0dd96ea21f85de3a8323926450891971cb36d2e1,1f25c7e3a0bf10b65765b3b23bdcf9a5de30888a,9a4a207038a7ccf60bd70cc3bc71d517337f40f3,,True,True,True,100.0,477,10929.0,2,True,100,Tests_passed,56bb658eeb56b947489fa5d22d290404c17059832dd967db3a913bd832f3f8f2,True,Tests_passed,7772c3712b94da9d5b66f85b99bf764206c4ed6576210ee3887fc1422068ad74,,True,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,8bdaf004a7fc7beb7638b4639f6f51f9a14af35306495dbd9bfbbd3b10621598,Merge_failed,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Tests_passed,ac7755f46c04b17f31c30fbd7f51ef5f560d6c64739080b3c05202dc1be25890,Merge_failed,dfb9528b359575359a3d1be571bfd04a9a26db5d444d66d5fcf0d89037dd0a75,Merge_failed,cd0b00262df0f80d9d0d7296cec168c297d291d59f734ee856305bea5ecbb3b8,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,4f33fd55e5d9a67d642cee0ba14ec3296d3a148d8ea016e4593d676d29108535,Tests_passed,ac7755f46c04b17f31c30fbd7f51ef5f560d6c64739080b3c05202dc1be25890,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,Merge_failed,c3f5d9f10b81307632ecc186d650b8b6f1b85485ad3a23719f85af0a3ddf4102,0.02502918243408203,0.02506279945373535,0.02640676498413086,0.02759718894958496,0.02792525291442871,0.020661115646362305,0.02782750129699707,0.07098126411437988,0.08426976203918457,1.2053499221801758,4.860480785369873,0.1043086051940918,0.15427088737487793,0.06255674362182617,0.06216025352478027,0.06119799613952637,0.061032772064208984,0.06110525131225586,0.09789752960205078,1.2364563941955566,0.0587773323059082,0.05796217918395996,0.060654401779174805,0.05837106704711914,0.058771610260009766 diff --git a/results/combined/merges_timed/datumbox/datumbox-framework.csv b/results/combined/merges_timed/datumbox/datumbox-framework.csv index bc22cfdcc3..2ad76a0ce0 100644 --- a/results/combined/merges_timed/datumbox/datumbox-framework.csv +++ b/results/combined/merges_timed/datumbox/datumbox-framework.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/develop,5e74399e9e7d77bd82dc672ac73d17ac124f2eef,1f17e05fc3a9ae66322a9f33d34f40e2fc0de7ff,173ec6e155639b676c0ab57b22e17e5696039899,,True,True,True,85,607,4493,2,True,85,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,True,Tests_passed,cb67313a5f1acd7c804d0d6b530db5601ceeb99f67ce9350af8a88bd6ad9a5b3,True,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_failed,b15f9f4f92b8995269e43c18e6a2aeda2054147b05b85e35db3766b8f83ff626,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,0.0392603874206543,0.03528738021850586,0.06343817710876465,0.024880647659301758,0.04829668998718262,0.04682803153991699,0.06702804565429688,0.2009410858154297,0.13255691528320312,0.6172270774841309,4.068255186080933,0.11585497856140137,0.15521788597106934,0.0825958251953125,0.04758596420288086,0.08275771141052246,0.05796408653259277,0.059221506118774414,0.12581777572631836,0.6226644515991211,0.057085514068603516,0.05905914306640625,0.043677330017089844,0.0550076961517334,0.06983447074890137 diff --git a/results/combined/merges_timed/davidb/scala-maven-plugin.csv b/results/combined/merges_timed/davidb/scala-maven-plugin.csv index 03ac4a4bbe..5facb02191 100644 --- a/results/combined/merges_timed/davidb/scala-maven-plugin.csv +++ b/results/combined/merges_timed/davidb/scala-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 117,refs/remotes/origin/pull/322,c74fda72e2ad911abeef339d9503dbff1b4926e2,4c96c81343ff125d9d49ab19285a63dc2518a032,2c9ef6494c144cd7b23ce44fa64ef84fcb6f02fe,,True,True,True,23,139,1226,3,True,23,Tests_passed,250b5c4ca9c1651c23dd24f33423a2c65ccd3fc6be8cf6122f2194ab7bdcf7ba,True,Tests_passed,fc805a2095666ac7e4c49269e7d023d59111cc91b86643412ac81606dea2bb63,True,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,fbb71acf8904bfc3281edc293ee6737529715cc45d783abcc5a9456215fca24a,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Tests_failed,cb912c5d9bd087b5c31e83a7449d1eeb5d31466f6b637aca6e2fdc31da172179,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,f0ef12b15e6728f40ee43552537e6281670c262c1b0d6d0285d94df0ccc62e52,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,0.044088125228881836,0.051320552825927734,0.01881694793701172,0.04593205451965332,0.033965349197387695,0.037827491760253906,0.04458427429199219,0.20367765426635742,0.13909053802490234,1.531367540359497,0.5997843742370605,0.11208963394165039,0.13162779808044434,0.05163860321044922,0.06324267387390137,0.045053958892822266,0.05013322830200195,0.04630637168884277,0.10395383834838867,1.451902151107788,0.049741506576538086,0.06077122688293457,0.04407477378845215,0.04421806335449219,0.041934967041015625 diff --git a/results/combined/merges_timed/davidmoten/geo.csv b/results/combined/merges_timed/davidmoten/geo.csv index 6bf7687334..7ee344bd0b 100644 --- a/results/combined/merges_timed/davidmoten/geo.csv +++ b/results/combined/merges_timed/davidmoten/geo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,7427c57b931e1c9548227a7a0ea10dbead15edef,faab400a3cdc78dc7f9ef221d79129043c414baa,54f7ed3a72afe1ab1626269655ad64d824d7a5e2,,True,True,True,10,32,133,3,True,10,Tests_passed,cc78c9a90f15cc1af397195afbcf2b287a34dc4f4e134f09c31fb54756d78c6a,True,Tests_passed,db69dc60d0c8900ab08d3cb70719f8e82fb9b22d2f9e46c62d1ccef4cceb15a7,True,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,e907c6272ee7e4fa03cbc3df0d9460fb5af0ead7957e61ea2f6fef87f35b4ad2,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Tests_passed,017d1dc473e42e9664eda365ecea2440c5d0042015fe51140b882ef3a323f62d,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,4b0dd50bc64858993f073d28b21b2c03613db0f1e7db03df802c04da13b0d6dc,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,0.04286456108093262,0.042931318283081055,0.04335212707519531,0.032811880111694336,0.04061532020568848,0.0407261848449707,0.03599238395690918,0.21411800384521484,0.1702103614807129,1.520573377609253,0.40285563468933105,0.10032010078430176,0.12122893333435059,0.04032278060913086,0.04099917411804199,0.04111003875732422,0.040166378021240234,0.03978276252746582,0.08866405487060547,1.472243309020996,0.04115867614746094,0.040573835372924805,0.03168988227844238,0.04123425483703613,0.03188943862915039 diff --git a/results/combined/merges_timed/davidmoten/rtree.csv b/results/combined/merges_timed/davidmoten/rtree.csv index 587bba527d..779504ccdb 100644 --- a/results/combined/merges_timed/davidmoten/rtree.csv +++ b/results/combined/merges_timed/davidmoten/rtree.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,dd478c4ea8eeeede9848bc596dda5454a648541d,5671a0f6b7ac05c2b09f66facb7068ee40ef2113,ef97ceedf041d60b1cd421c8d16cec707b120960,,True,True,True,10,60,189,3,True,10,Tests_passed,7eda454d833a50fd276efca4f4f90170d87db6c427c9b75db01e5ae7bf1620bc,True,Tests_passed,3e286b168432f16fa4ea261527e79de4300088f4807386b4e493b15b239438a0,True,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,0094c489e959cc1130a5d27c96da03b2a300638f995f381324193109ac25e500,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,a40378ca43e93179c6cee0544ef5d1962a8090e846fbfb45921bd2dc5d3ad217,Merge_failed,b3e39f6ccc2a4b2eb6b6a790c66ca9464bc0950381ef178e6099119b1d0e3bc9,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,7757b45d31b6a32ee372c44509eac0f080603ac63476841f72c75e581d5c4ad7,Merge_failed,91dafbc58246c3632823520bb920acfbfa65865fca67ebdc05349cf32e28ba98,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,0.013810157775878906,0.014359474182128906,0.014834880828857422,0.014894485473632812,0.015056610107421875,0.014359712600708008,0.014902591705322266,0.05412650108337402,0.12867259979248047,0.9283463954925537,0.8753993511199951,0.1152491569519043,0.13376998901367188,0.05077981948852539,0.051917314529418945,0.050473928451538086,0.0505368709564209,0.05051732063293457,0.09926891326904297,0.9839155673980713,0.049535274505615234,0.05061984062194824,0.05069684982299805,0.04975700378417969,0.05016636848449707 diff --git a/results/combined/merges_timed/davidmoten/rxjava-extras.csv b/results/combined/merges_timed/davidmoten/rxjava-extras.csv index 7880e3edd9..4a8088ec82 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-extras.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-extras.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 44,refs/heads/master,f26ebf28972a5e850b038932360c89bd703d5a63,30a492f6aa66bfbe6dbf5f37a1fd20a575a49d46,ede7921057b88302676cb975e159b6240079b81a,,True,False,True,3,3,17,2,True,3,Tests_passed,f4c07085564a583cb7c3985b3b73bae3b6b4e6640e0e9edcebd133a546a8cee4,True,Tests_passed,fc004f335bf0a19fb93780b64f594b07cafe5454d681267cff5cb1e4d5284342,True,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_failed,2fe834683fa60c7b3d0d76d1352808b08dfc4db1eeda9e39869ecf48c85639c7,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,0.03865456581115723,0.03053450584411621,0.022022008895874023,0.04082775115966797,0.028805971145629883,0.040602922439575195,0.03810000419616699,0.16277170181274414,0.10243558883666992,0.5040750503540039,0.2559521198272705,0.06666851043701172,0.1196894645690918,0.036728858947753906,0.03685617446899414,0.036824703216552734,0.03709864616394043,0.03720736503601074,0.06867480278015137,0.5025503635406494,0.036942481994628906,0.03735017776489258,0.026237964630126953,0.0364532470703125,0.025812387466430664 diff --git a/results/combined/merges_timed/davidmoten/rxjava-file.csv b/results/combined/merges_timed/davidmoten/rxjava-file.csv index 0cfe0c3a54..715bcf4935 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-file.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-file.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,c7c2b3aa06bf4f2d022360aa6a0270798ea3590a,dda511e5d55e736906986d7fc3041896b04de9f1,d40c31053d8f9bec3b3d62465884559649ec1dd3,,True,True,True,7,56,328,4,True,7,Tests_passed,0318cbf469e559fb1528941c75de16ced0613ce7a205e71aa16ea9a0686e4304,True,Tests_passed,96452bd1137dada929286aedefb343a7d23babb3ef6e7c1850478aff8c67472d,True,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,229d330da1d567006a68610ab0f717f4e7ef547c057b301c9bacf7d40f98e9ef,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,a2bc0a570772e66814134889d1383ecc64eefb8af97b697139ad0ee7004a5e53,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,7f09b8ee03df48a32558138badaa2d26b8a96310faefd379cdbfb487e8990be0,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,0.043610572814941406,0.04028034210205078,0.0408937931060791,0.03769969940185547,0.04272270202636719,0.009502649307250977,0.04327869415283203,0.29689812660217285,0.23575735092163086,1.725569725036621,0.35540294647216797,0.13353657722473145,0.12816929817199707,0.04792451858520508,0.04769611358642578,0.04827475547790527,0.04738807678222656,0.04814791679382324,0.10999441146850586,1.6651577949523926,0.0489964485168457,0.048279762268066406,0.04027152061462402,0.04794955253601074,0.04007697105407715 diff --git a/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv b/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv index df3784ce52..f5908fb2db 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-jdbc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/heads/master,d14cea6ff1fd8032ddd006f555ae2f599bc85015,2a14e99e2eb35aec8476030458a4952b48260de2,9a3f632e59b95ee08fa175127269cdaad5e09fd7,,True,True,True,14,30,614,2,True,14,Tests_passed,230362b3fe1e8a8c8e2edab7824b2d519e4ec12c2faa1c2f3cefd9c13555306c,True,Tests_passed,179efcd744e1ad3859053044fb2cbc29691d5e9f5ce0080c4265e54ca3b9307f,True,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,0.05400848388671875,0.04473471641540527,0.04491877555847168,0.044469356536865234,0.05138516426086426,0.05712604522705078,0.0476224422454834,0.16247272491455078,0.10708856582641602,1.1559185981750488,0.38847923278808594,0.07239866256713867,0.12676501274108887,0.042624711990356445,0.04298758506774902,0.04349780082702637,0.044037580490112305,0.042630672454833984,0.07667350769042969,1.1294310092926025,0.04349851608276367,0.042188167572021484,0.03212428092956543,0.04239940643310547,0.03229188919067383 diff --git a/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv b/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv index 81a648a920..97f1f32f44 100644 --- a/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv +++ b/results/combined/merges_timed/davidmoten/rxjava-slf4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,fbe2fde40ff49bfd3c7454e4e9a21c33f1929f5f,a5182bc62d261c1cb8ec42d0260602248151876e,e0e2a3a97fbb66f524ff624a52ea40629de09bb4,,True,True,True,3,8,673,2,True,3,Tests_passed,9ed5426a2f180bf448bba74a95e7d90a7d5276710f0f6c79e7f5a59ede9a5953,True,Tests_passed,5f3b4e55baceaf572ffeed201f7d4830bdd03d13dccf990b0024bfb9ed1b3bd4,True,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,ef684bd36a5ac9b2f1d34819f1f1d49aec0110b2fcef94bebdc203ec386bf93b,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Tests_passed,91825fc16de546044d6cbe1fdc600161b0e525f25a998de2521fc0633b61d602,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,d7e6366444860a2feb770a61962c65700ddd4e7dbaa29ed893156cdb2685a007,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,0.03907155990600586,0.04024505615234375,0.04071235656738281,0.03821420669555664,0.040732383728027344,0.03822803497314453,0.039261579513549805,0.16308999061584473,0.10891222953796387,0.668973445892334,0.39299464225769043,0.06364560127258301,0.11137247085571289,0.0329737663269043,0.03317070007324219,0.03241252899169922,0.0330355167388916,0.032276153564453125,0.06467866897583008,0.6785976886749268,0.03290534019470215,0.03324007987976074,0.03140401840209961,0.03326869010925293,0.03171849250793457 diff --git a/results/combined/merges_timed/dbaeli/conf4j.csv b/results/combined/merges_timed/dbaeli/conf4j.csv index 8be80bde85..fff8f00c4d 100644 --- a/results/combined/merges_timed/dbaeli/conf4j.csv +++ b/results/combined/merges_timed/dbaeli/conf4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,aa63090d1c2b404d752cbc1369184db7766ae53f,a720763413c0f438b8ce65dcbb19cc4ca0e2b057,c4880a9bbc645b96354db770fe69c7c6c891a96f,,True,,True,13,38,,3,True,13,Tests_passed,292d070cf4a8dfa4c851b6228b97178f47454eef92b57f42994f4bdf7af283ac,True,Tests_passed,517245c84132729ae6157e74769ba0d570782d45706e2e85978bf253e918f84e,True,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_failed,eda096073f7d01646941b78bd9f6e7854fa33f9a55d6549a64cb5358eda42872,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,0.05125594139099121,0.05033230781555176,0.04727458953857422,0.05077171325683594,0.04987144470214844,0.044879913330078125,0.04539823532104492,0.23071599006652832,0.16560149192810059,0.4476356506347656,0.32170701026916504,0.10000419616699219,0.1308128833770752,0.0471956729888916,0.04880094528198242,0.047837257385253906,0.047801971435546875,0.046436309814453125,0.09617137908935547,0.44395947456359863,0.047196388244628906,0.04898548126220703,0.028225183486938477,0.048362016677856445,0.02897024154663086 diff --git a/results/combined/merges_timed/dbaeli/ez18n.csv b/results/combined/merges_timed/dbaeli/ez18n.csv index 42b55c227e..88225200b3 100644 --- a/results/combined/merges_timed/dbaeli/ez18n.csv +++ b/results/combined/merges_timed/dbaeli/ez18n.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,acee2a6039d3810a8424f77fb7b72017b31bd92d,b7cadc87f3b62d0e6ebf49608417a50f8666da7b,5c913b3a4e8dfeb9b9c1d268fc5684f327ffcfad,,True,,True,20,12,,2,True,20,Tests_passed,21c6ab0738fd31764a062cc042512ab56e788e185d49b740351ce545bdda8876,True,Tests_passed,b841f396d1a9c547184733966766702278a7563ac24838816532764ef68abfba,True,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,0.05963587760925293,0.059424400329589844,0.06212806701660156,0.061106204986572266,0.06174588203430176,0.06126809120178223,0.061420440673828125,0.13104963302612305,0.11665463447570801,0.8256447315216064,0.3758549690246582,0.14751911163330078,0.2312173843383789,0.11574101448059082,0.11554169654846191,0.11455154418945312,0.11422944068908691,0.11936378479003906,0.19552326202392578,0.7885050773620605,0.11346268653869629,0.11396336555480957,0.11256885528564453,0.11292243003845215,0.11276507377624512 diff --git a/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv b/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv index d2bad88e23..01fddffbfe 100644 --- a/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv +++ b/results/combined/merges_timed/dblock/jenkins-ansicolor-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 39,refs/heads/master,8383277430b4034662ab125edca8e76621b1e240,ebd0ac2c904e88dcff5e9440560846476b70eac6,518711af7d86fedfe00ccea08f9e9a2d53e72ae4,,True,False,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,True,3.0,2,3.0,7,True,Tests_passed,a4bee8680284c7a209ebaf204490cf121bda5091554e5c9bb309dbef8cb55a2a,True,8,True,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,d6f93781b321cc7eba5ea8a390827b10594ce08f984d0cf4c21f2a122280c2d6,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,2db01af6751306f760c9ca83cc68280cff2a75047a00359f96ae406a3ea63c62,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,0.010861873626708984,0.011110305786132812,0.012339353561401367,0.011634588241577148,0.012198448181152344,0.012130498886108398,0.012181758880615234,0.03583192825317383,0.06681966781616211,1.892404317855835,0.5608711242675781,0.07089662551879883,0.13550472259521484,0.04452157020568848,0.045413970947265625,0.04372000694274902,0.04269552230834961,0.04372096061706543,0.06708192825317383,1.8989076614379883,0.04227805137634277,0.042877197265625,0.03289389610290527,0.04354453086853027,0.03265810012817383 diff --git a/results/combined/merges_timed/dblock/oshi.csv b/results/combined/merges_timed/dblock/oshi.csv index 996b30a4ee..8bfe29745d 100644 --- a/results/combined/merges_timed/dblock/oshi.csv +++ b/results/combined/merges_timed/dblock/oshi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 34,refs/heads/master,7de1f90a6aa5317e87e60c690c16565eda7d3b09,7d0e1a4d9d90b3ebb916e69a71dbe767423ba4a9,74d7f29da9cc3b2da6cf73f746e2c2a282905f12,,True,True,True,54,404,5892,5,True,54,Tests_passed,5a7132f58b18c6f1bb6593edb7e4d75bd647c0c121341e88d3c01b88e094031f,True,Tests_passed,7b058140dca0f282834f7053414c14e4eb116312b0d61c2c3e4f3addf1d93366,True,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,752283a4d00ec1c14ec57425583a37b58495e82588c6f594a7e18757d7b8bb63,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Tests_failed,039615f08f5c744ddfe65fefcac754882f486958f64816c2a7f73a9d6e572ce1,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,0b44ad6acaf4aedaf688786186fbf8f72060980f6d0d37af884469685c27706f,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,0.047088623046875,0.04172015190124512,0.04158306121826172,0.05089163780212402,0.050446271896362305,0.05903506278991699,0.05275845527648926,0.39342737197875977,0.31026434898376465,2.633826732635498,3.197295904159546,0.18818926811218262,0.14994287490844727,0.06478238105773926,0.0630655288696289,0.06500816345214844,0.06451749801635742,0.06369352340698242,0.1439223289489746,2.6037497520446777,0.0652320384979248,0.06401872634887695,0.06325411796569824,0.06447768211364746,0.06387543678283691 diff --git a/results/combined/merges_timed/dcm4che/dcm4che.csv b/results/combined/merges_timed/dcm4che/dcm4che.csv index ac8d5ccdff..540b8690a8 100644 --- a/results/combined/merges_timed/dcm4che/dcm4che.csv +++ b/results/combined/merges_timed/dcm4che/dcm4che.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 57,refs/heads/master,af57bb9f016f2b44ecbb7650d26ad18591158627,887dc0240c2406c7f0f70f34851011067989e02a,4c9b37d5dc57cd421dcaee476b58a2360886d7c3,,True,True,True,2,5,14,4,True,4,Tests_passed,e4b63575d285f78e3b5cc7fbdc4923dede25fe523732225c66f1ad2dbb8e6837,True,Tests_passed,ba35885f07f3bf5d7f98fadd2cf624fe47bfba3aa2b308a10120bf55ca920d9e,True,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,c2067387f6db90ebe7dac65cd0239f5c851d5d0168102cc71d032e9e7a326bb7,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Tests_passed,5d53a658e5d82993c3a9c25d695193a2c1f7bd4d434ee4f94158d7175f04b9c5,Merge_failed,45e6c58e3714fcd79ecb0f67ddea1d7222bed4d3ecea2842734d93bec648dff0,Merge_failed,964a1a88961be83c8f50e4c89c71f37102af0df35b95d4a995dfbcea07f2384c,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,8973f1b90a7f0d4558d75bd72f0c6c2021494b588d0abaa697db69c805b19127,Tests_passed,5d53a658e5d82993c3a9c25d695193a2c1f7bd4d434ee4f94158d7175f04b9c5,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,e7814c158ec52bf1875a4e0edb6f11cb0562eec03a64e2aa3c62ca2af9006f08,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,Merge_failed,1fffffb885b75c9f884f3ca4570a369ed08a1a51225fcc3ee423fa3195a10e03,0.013808488845825195,0.0137176513671875,0.014709949493408203,0.014435529708862305,0.014685869216918945,0.014853954315185547,0.015162229537963867,0.08209490776062012,0.07277774810791016,0.8650610446929932,0.5312294960021973,0.08255434036254883,0.1265406608581543,0.043770551681518555,0.04309225082397461,0.04259014129638672,0.043913841247558594,0.04376983642578125,0.08238744735717773,0.9300785064697266,0.04096698760986328,0.04303407669067383,0.04177999496459961,0.04234766960144043,0.04125475883483887 diff --git a/results/combined/merges_timed/deathmarine/luyten.csv b/results/combined/merges_timed/deathmarine/luyten.csv index b1a4df8b22..77c98078a2 100644 --- a/results/combined/merges_timed/deathmarine/luyten.csv +++ b/results/combined/merges_timed/deathmarine/luyten.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,Tests_passed,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,True,11,84,332,6,True,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,True,11,True,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,f99aa30790233e62f9a2f7b0640846a01cff0f66770282c9bb36ac007334ee77,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,ab2db68a05781df04462e6e41e0929fea5d140d08b8aa26ddd0a757ed65adf21,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,0.050156354904174805,0.04946017265319824,0.04407072067260742,0.03726649284362793,0.05259966850280762,0.03802061080932617,0.04709768295288086,0.4507267475128174,0.32177090644836426,5.275756359100342,0.5271003246307373,0.20456218719482422,0.1539933681488037,0.0754542350769043,0.07404184341430664,0.072296142578125,0.07309865951538086,0.07311892509460449,0.17905378341674805,4.915667533874512,0.07271981239318848,0.07190251350402832,0.04314303398132324,0.0724785327911377,0.043120622634887695 diff --git a/results/combined/merges_timed/deemopen/zkui.csv b/results/combined/merges_timed/deemopen/zkui.csv index 17259bb117..e9daf1482e 100644 --- a/results/combined/merges_timed/deemopen/zkui.csv +++ b/results/combined/merges_timed/deemopen/zkui.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,True,19,79,508,3,True,19,Tests_passed,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,True,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Tests_failed,8ac7873650a0138d29417f2066c72baaebed3c15831f67e1684bfa699a69536d,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,b14ea75bd37183a1ccf65a6b6347eab48c4306349098a167166dbb5a4e3c94d9,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,0.014339923858642578,0.014275550842285156,0.015705108642578125,0.015341520309448242,0.015495538711547852,0.015753507614135742,0.015804529190063477,0.05568671226501465,0.12610960006713867,1.2856645584106445,0.38831377029418945,0.10877227783203125,0.13602328300476074,0.0506434440612793,0.052564144134521484,0.05056357383728027,0.05164051055908203,0.05403709411621094,0.1030125617980957,1.3263757228851318,0.04841303825378418,0.0511174201965332,0.04427194595336914,0.05059504508972168,0.042595863342285156 diff --git a/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv b/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv index 289e0dd6c4..ed16fc07a5 100644 --- a/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv +++ b/results/combined/merges_timed/dennisjzh/gwtmobile-ui.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,a0fa55093e7066a5356535bdbcc382f78daf23ef,c138b79d228f266a79b3e1059e0d717cb3059574,48843d4966dddb16e0af6ec69b8ed200638b2e0d,,True,True,True,8,22,273,2,True,8,Tests_passed,21d70804264e5add543795452bc2179fa93b8e1e75f40701605d7717678013bd,True,Tests_passed,13ef0184078bd2cfca4da13fadf9e95ae83842fd291ac6e2f8c5caadf845836d,True,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,0.04255342483520508,0.0408320426940918,0.037216901779174805,0.039017677307128906,0.0455479621887207,0.045958518981933594,0.04616999626159668,0.1689751148223877,0.07167863845825195,0.6277680397033691,0.3384857177734375,0.08777189254760742,0.12414336204528809,0.05786705017089844,0.0569918155670166,0.05607128143310547,0.05586647987365723,0.054671287536621094,0.07226824760437012,0.6459195613861084,0.053427934646606445,0.053932905197143555,0.04337143898010254,0.05196428298950195,0.044348716735839844 diff --git a/results/combined/merges_timed/dfabulich/sitemapgen4j.csv b/results/combined/merges_timed/dfabulich/sitemapgen4j.csv index dca936186b..c87ddac29e 100644 --- a/results/combined/merges_timed/dfabulich/sitemapgen4j.csv +++ b/results/combined/merges_timed/dfabulich/sitemapgen4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,a46ea9ffe51e0f77969a39cecfb2fc9fd479b19b,5ea973b161dd9f9606305784c087afdfc1e71803,54138163cee4508b3f2b28c461e75c6b20c9d7fe,,True,True,True,17,81,631,4,True,17,Tests_passed,2f9c9c6d06d8a0c22de8f31b953d81d872c52de2484c19312142667e68393c25,True,Tests_passed,95b879c19e25cf8b5540b01982587d2f63b8af67ee159e81f51b8e57f8abe004,True,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,0.0481715202331543,0.04665827751159668,0.04548931121826172,0.04579019546508789,0.04624128341674805,0.050652503967285156,0.05146479606628418,0.31298828125,0.22630023956298828,2.1235806941986084,-1.0,0.13317537307739258,0.1398618221282959,0.05712389945983887,0.0554814338684082,0.05658364295959473,0.05656313896179199,0.057007789611816406,0.12339353561401367,2.1238155364990234,0.056006431579589844,0.0566401481628418,0.030727386474609375,0.054418325424194336,0.031153202056884766 diff --git a/results/combined/merges_timed/dgarijo/widoco.csv b/results/combined/merges_timed/dgarijo/widoco.csv index 8931d91679..a16e15f067 100644 --- a/results/combined/merges_timed/dgarijo/widoco.csv +++ b/results/combined/merges_timed/dgarijo/widoco.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 109,refs/heads/master,dfa60976ada8bdced21ff043fe763dd86314b7cc,d57b8de32106b44b9ca3e00ecab1b20998a4a703,6f217334138887945085c9b24924f881f8cb1232,,True,True,True,11,123,885.0,2,True,11,Tests_passed,36d963fc2e67f2073cda9b2cffc2917f0059b4d2396f16ca33b45731994fcad3,True,Tests_passed,9772c3d82fc1f914621d7cff668b1c14da39d1ad3c4fd9c3c4e9ad0cab75f4b9,True,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,f1400af762691284f6ae1453549d42bb18427913582350db6e79a455fea2e1e4,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,66b888631afef1f5229f2a255732abb53d6e422a69f03e3a5d63c64681b91bd4,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,0.043245553970336914,0.027059078216552734,0.01644158363342285,0.01614522933959961,0.015887022018432617,0.021167755126953125,0.06280088424682617,0.21898579597473145,0.12728095054626465,0.0517733097076416,0.7047333717346191,0.07583308219909668,0.12592864036560059,0.04473376274108887,0.04565286636352539,0.046770334243774414,0.04857516288757324,0.04709625244140625,0.0812222957611084,0.057953596115112305,0.04649662971496582,0.046327829360961914,0.04625988006591797,0.14720463752746582,0.044378042221069336 diff --git a/results/combined/merges_timed/dgradecak/alfresco-mvc.csv b/results/combined/merges_timed/dgradecak/alfresco-mvc.csv index b46aa16bd6..92dc643298 100644 --- a/results/combined/merges_timed/dgradecak/alfresco-mvc.csv +++ b/results/combined/merges_timed/dgradecak/alfresco-mvc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,042d59bed8b1651367380523918f4e1145c9d9c0,ee2bb44d6352d83a1f6e322f464b326e90fc571b,18d4beb52eda96ae1898937be0539732b0757254,,True,True,True,47,101,1976,7,True,47,Tests_passed,bbdefa6792386b5057bca2cb5075bbfea0a5a9469e7bbc2f630500f7b532cd23,True,Tests_passed,cb7f688e83e2a7f7af20a83a98379bd5aa1fd11f425f5606771bcf27efe0a9d5,True,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,b76a640c49ae347c444620dd1e075f5864f232b5e5a2c74f5ec64235390e3957,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,25ee4db9cbb1181c979a6bd58ef2d592cb8d963df24aa120cb18d559fc1dd75e,Merge_failed,49d0eb5111a9200963af3c883afa5beb4bfaffe5ca4b0903ca909d89a5464de5,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,678d51b5fb840a99ea955f62f14981c872561a9fedd76c4e753d5e298693bba2,Merge_failed,0099f6ad0056ce31cd2e11b336a8f1c29c2506470dce09fd5bcc20ada05ed319,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,0.04387259483337402,0.0507349967956543,0.052436113357543945,0.04329180717468262,0.04560565948486328,0.048725128173828125,0.05033588409423828,0.4705078601837158,0.3805997371673584,0.957942008972168,0.3612101078033447,0.21817588806152344,0.1507422924041748,0.06728363037109375,0.0691072940826416,0.06844401359558105,0.06862258911132812,0.06936264038085938,0.17210912704467773,0.9463353157043457,0.0682375431060791,0.06922125816345215,0.06563282012939453,0.0664207935333252,0.0677030086517334 diff --git a/results/combined/merges_timed/dieselpoint/norm.csv b/results/combined/merges_timed/dieselpoint/norm.csv index 1a98a76069..154c9cf42d 100644 --- a/results/combined/merges_timed/dieselpoint/norm.csv +++ b/results/combined/merges_timed/dieselpoint/norm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 30,refs/heads/master,f8d53daf63a983bf21265165ea8b129400f132ec,a4a52133ef089e488bea27496ff0be716a6cc477,d1d69a623dedc255fbe98a446e1f29054bd475f4,,True,True,True,10,23,1228,2,True,10,Tests_passed,f3e3b7ae5e0ebc970955a30e835d301ab79715f6ac40edc3d2bf63894b96068e,True,Tests_passed,d0fe1f6b5e869dae8d572c51fe962ec3d395520e39fd9f3c9fe0e28fac10f4ce,True,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,165eaf1384bdeae0a034ca29e0531e3c7744af60f8457329a6eb6849362bd609,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Tests_failed,85c7c80c4bf82aafdf00a83093f1074e8474d8e7edf2aa40569f2defaeaf0259,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,6a9c00b944276a4e117657f9b0fbd9bcf695b609c354cfdbe4d777771f77e96d,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,0.009078264236450195,0.009577274322509766,0.008986234664916992,0.008676290512084961,0.009011268615722656,0.008988142013549805,0.009605169296264648,0.03590869903564453,0.06898260116577148,0.9315841197967529,0.4788320064544678,0.06549739837646484,0.11271548271179199,0.03310704231262207,0.03313016891479492,0.032952070236206055,0.032662153244018555,0.03339195251464844,0.06366896629333496,0.8738505840301514,0.033567190170288086,0.03379321098327637,0.0316770076751709,0.033330440521240234,0.03135204315185547 diff --git a/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv b/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv index b007f1be29..d890aaf0b3 100644 --- a/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv +++ b/results/combined/merges_timed/digidotcom/xbeejavalibrary.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,6279f85f74a80a9f651b3fdd0228fa0ec737060d,b359ecc56ceb9719bf00ade9d4beee4fef6fe3c8,96eead5f9fa275c93be11b9af8317c777828cebe,,True,True,True,72,492,20450,2,True,72,Tests_passed,e8b67e8e0794fc762fd35cc628592f7615cbc9629588f6523206ff57a045e8c8,True,Tests_passed,8b6d9cf1e529a48406b0b9ff6ae9b670bc6606ee103607e77c765da736e1faae,True,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,ccf012fac1cb6ddc6d72d7c7509f35e1bfe6fbfb9d44084427ada7f380cbe431,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Tests_failed,a2eb7275b4ddfc74a98d77ae9671fdc3633cdff589a006a8ed1edfeed86618a6,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,d6e813adcf06913e0e2270dbf25de8e46e50b080897c894c48587e19c41977bd,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,0.04504036903381348,0.04452061653137207,0.05915117263793945,0.06353640556335449,0.04470467567443848,0.04290938377380371,0.04634451866149902,0.17945146560668945,0.10410213470458984,1.5442256927490234,7.278707027435303,0.09072470664978027,0.13341426849365234,0.053983449935913086,0.052205801010131836,0.052520036697387695,0.05496668815612793,0.05181884765625,0.08790707588195801,1.399848222732544,0.049100637435913086,0.051163434982299805,0.04941987991333008,0.04881095886230469,0.0483705997467041 diff --git a/results/combined/merges_timed/digital-preservation/droid.csv b/results/combined/merges_timed/digital-preservation/droid.csv index 84b5572850..7fa4797770 100644 --- a/results/combined/merges_timed/digital-preservation/droid.csv +++ b/results/combined/merges_timed/digital-preservation/droid.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 437,refs/remotes/origin/pull/907,884dcf7cf3988311f20fd94dd84ead7a9b6ecf2f,2fdeab05e76191e920e91aadf0c4add3a3169f40,d2a137537d96599342213ac9976c7cff38aefb20,,True,True,Tests_passed,8266dbd6e11343bcccae65c3b897ae0931b6c2299ae13f5f18c706af7247d7dd,True,28.0,59,251.0,49,True,Tests_passed,7f1ec6c6f28c70f39259ba7653ac31cf9abad3b42c7d894064296403763d364a,True,53,True,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,b7a3409120feffe51b50bccb9cd6d8d39910c63944ac25316e8b39934287d0cb,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,e06f3853544cf5ef92a99829bdba3ba7e95c4f1212ae8dbf3f06a4d37f5047ee,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,0.0714263916015625,0.07446050643920898,0.08878707885742188,0.07451105117797852,0.09215831756591797,0.08580183982849121,0.07419657707214355,1.6202576160430908,1.4103388786315918,0.06419563293457031,0.8744063377380371,0.8079781532287598,0.29989004135131836,0.2152254581451416,0.21464061737060547,0.21178936958312988,0.21602439880371094,0.21572351455688477,0.6025006771087646,0.2313692569732666,0.21486425399780273,0.2140352725982666,0.1949453353881836,0.2160184383392334,0.19468307495117188 diff --git a/results/combined/merges_timed/dius/java-faker.csv b/results/combined/merges_timed/dius/java-faker.csv index 413045f170..a301013ea6 100644 --- a/results/combined/merges_timed/dius/java-faker.csv +++ b/results/combined/merges_timed/dius/java-faker.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 64,refs/heads/master,54149209be7428d6580269758b5a0a01d945bd11,0e4a4b8af5968a26b6354e1f7d4de2922d63835c,1ebdf4f9dbdaae373c3a070069bf70f4616fd30a,,True,True,Tests_passed,b7197dbe7403115f908c3895f1943fe99770750c393ff4636ca558a46062b0c3,True,21,35,303.0,5,True,Tests_passed,7d3950bff925778dd860dbfe7205e033b2d13114bcb4225e3e777d1a449869b5,True,22,True,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,b743d5030d0e1af0cd68d4d5e7ff09b811eb07ffe10e23aea72c75cea7e13b5f,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Tests_failed,db7160ae3936ebe64530509b4545bab72dc58ab63d665b23c4e84d6fb45b9eed,Merge_failed,aa5c991134dfc21f8680173e16b6a0be3708890dc2378c87a52eb2cc1b4fa4d5,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,3a1200a55d09aca398678ca1862eaaf4d6b1836f1da702a5c26bc6ade547fb14,Merge_failed,bcc20e675295e290598b2b9105476cc4dba9883021d76846d77109ca8bbc9535,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,831001939c6e9335ce0dbf04b7ef4863afc5791347c94477e44b23fff551ea81,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,Merge_failed,8e87fda18383ef8341882c307ca7ad2811e5a59f5bf36c67b1b48acbd6ed431b,0.029715538024902344,0.05209827423095703,0.04571127891540527,0.04636192321777344,0.03383326530456543,0.03962063789367676,0.048421621322631836,0.3156876564025879,0.2385845184326172,1.9065899848937988,0.5136618614196777,0.1439065933227539,0.132615327835083,0.053459882736206055,0.05212855339050293,0.0523984432220459,0.05173349380493164,0.05350542068481445,0.11720848083496094,1.8649852275848389,0.054904937744140625,0.0530393123626709,0.042896270751953125,0.052999019622802734,0.04482674598693848 diff --git a/results/combined/merges_timed/dkunzler/esperandro.csv b/results/combined/merges_timed/dkunzler/esperandro.csv index 7aa2ea1127..c124c3bdd3 100644 --- a/results/combined/merges_timed/dkunzler/esperandro.csv +++ b/results/combined/merges_timed/dkunzler/esperandro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,a504784178f32a425ca7bd38f97b9a77a2eb6dfa,e156637fdb31048b51adc5755955513eb79dd2bf,ea419131fe919ea4348d96d36120dd6691b9c4c4,,True,True,Tests_passed,918de87a6baf9ecfd333d88564636d8efde9d724ba231dcc737ac5794e9225f4,True,63,294,1208,16,True,Tests_passed,ae1837beeb423f43a5d7c85097ee3cb8768f1243faac88ba40af58233fc5ec95,True,68,True,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,d733da41ac521e1c851db1807df4390ad8013cae50f7ac93420671b14c592d36,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,17cd4b1c2c5ec36b0fb026d0597b0cf63aecfea3d80988d8d56e6347a268c819,Merge_failed,109773588707330c1e6e0b45eccd556c6c571fa2ed64a37d6f8600ba323b19fb,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,cab6d67826f483968487e6de1cef99cb56af4eb190d33fea1d6f4eb26227c818,Merge_failed,00b770a9a2f970fc5cbef9d537fdddabe76f3083938b354d121aed9d5fadf85b,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,0.013509511947631836,0.01413869857788086,0.014510393142700195,0.014476776123046875,0.015007972717285156,0.015017032623291016,0.015179634094238281,0.14395380020141602,0.571819543838501,0.4676089286804199,1.5968842506408691,0.36783456802368164,0.18860101699829102,0.10668039321899414,0.10864043235778809,0.1068732738494873,0.1037898063659668,0.1062917709350586,0.27677011489868164,0.5855464935302734,0.10696291923522949,0.10457921028137207,0.10549402236938477,0.10627388954162598,0.10506343841552734 diff --git a/results/combined/merges_timed/docopt/docopt.java.csv b/results/combined/merges_timed/docopt/docopt.java.csv index a53dbd14b2..a05a9b13fb 100644 --- a/results/combined/merges_timed/docopt/docopt.java.csv +++ b/results/combined/merges_timed/docopt/docopt.java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,2802ccf5c458dc747b15d3ceaa89889d41a4d0d6,2d23774813b99bb9edd75bbe7e9cd6370ac5f7ee,85e1eff2c7d4b171c5dc2139e484ed4dfe7d443b,,True,True,Tests_passed,06b2ab0fbb0ed241e3c5d54cc447839d3ad1540efd29e12e625b54b6e85a1a72,True,6,109,474,2,True,Tests_passed,ba91a7277eb2fef18a6cc6e603c9908577fb1b96f951dc260979fe67c29e10df,True,6,True,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b389e60baf2c2922876741920cf4de0cedeeb041e945266b0b9c2d9eb5f3c42f,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,2639434219ab08d3931d129dbe96bdaff133a861078796b5c021de3dc11fe309,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b214a77bb2b4287cec1df5fd30d738a170f5aa0a49816ee4daac65f2873e5124,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,0.03645825386047363,0.0465090274810791,0.03952622413635254,0.04088926315307617,0.042230844497680664,0.0385591983795166,0.036847829818725586,0.16632628440856934,0.11560487747192383,0.4084336757659912,0.4676065444946289,0.0742635726928711,0.11362433433532715,0.033513784408569336,0.039952754974365234,0.03333449363708496,0.0337376594543457,0.03413701057434082,0.06356048583984375,0.3988463878631592,0.03339123725891113,0.03956866264343262,0.03169989585876465,0.03353261947631836,0.03215336799621582 diff --git a/results/combined/merges_timed/doctau/garbagecat.csv b/results/combined/merges_timed/doctau/garbagecat.csv index 401d019b16..c6ae49f04b 100644 --- a/results/combined/merges_timed/doctau/garbagecat.csv +++ b/results/combined/merges_timed/doctau/garbagecat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,583416b443b6e9679f87705f5b98f0f42e3cd19d,9a6da251a0d88bbd1607fbefb75a2ddc2393d51e,b9db442fb05065af24a43906a02bd4201e9d265a,,True,True,Tests_passed,24a27151170cdb00180e48414ce3d9433c051aacadbb769d6b1a0836d5392dee,True,14,91,795,3,True,Tests_passed,3b63e37caf69facfed7fdef20d99533c34e7ab252e24647184698a58014f58f7,True,14,True,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,d2bccb4adfe40fa75578f77e396fe8908393032e4a0d59ef6229df9067b1a8fd,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,35d1366b2805181122d3aec3b037f6afde80a37fe89c61b668f6685706f99ce6,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,ae04cc7b3073b3b659eb535c583b05652fb73d875c85d05afa1ecbe6e1fbc6d8,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,0.03556370735168457,0.03444337844848633,0.02719402313232422,0.034110069274902344,0.04885506629943848,0.013214588165283203,0.0388035774230957,0.2362370491027832,0.12767529487609863,1.7932705879211426,2.065258741378784,0.11246633529663086,0.13925647735595703,0.0549013614654541,0.05678677558898926,0.05734968185424805,0.05593681335449219,0.057352542877197266,0.10698461532592773,1.695042610168457,0.05502581596374512,0.05437660217285156,0.046320438385009766,0.0540313720703125,0.04695606231689453 diff --git a/results/combined/merges_timed/documents4j/documents4j.csv b/results/combined/merges_timed/documents4j/documents4j.csv index e66f06162e..a5dbdd99b8 100644 --- a/results/combined/merges_timed/documents4j/documents4j.csv +++ b/results/combined/merges_timed/documents4j/documents4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,36,44,655,2,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,36,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,0.08667922019958496,0.08416008949279785,0.12512469291687012,0.12415623664855957,0.12436032295227051,0.12609052658081055,0.12473607063293457,0.1905078887939453,0.14074993133544922,0.6027977466583252,0.49395084381103516,0.2595944404602051,0.2387256622314453,0.21209478378295898,0.22020578384399414,0.226912260055542,0.23414301872253418,0.22708868980407715,0.2264862060546875,0.740908145904541,0.0917351245880127,0.18877887725830078,0.1977076530456543,0.19694876670837402,0.04062938690185547 diff --git a/results/combined/merges_timed/douglasrodrigo/bfmapper.csv b/results/combined/merges_timed/douglasrodrigo/bfmapper.csv index 87ee93723f..20507688e6 100644 --- a/results/combined/merges_timed/douglasrodrigo/bfmapper.csv +++ b/results/combined/merges_timed/douglasrodrigo/bfmapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,b0056fd6f8d833d7f7dd54543504f344787b53b2,6639eadfdbdaa63fe81a02bdb3f78ec38123d758,bf85cfee8a96e9e85ab29ea2d1021ec97dbe5e58,two initial commits,True,False,Tests_passed,b591f19e6b53b09c3202cffe91eebab9c80d020f7afac058e8384079d15f571f,True,62,8,244,3,True,Tests_passed,96efdb52c0f05045d148e13b2e2642ca1330633388aa85c73f3b213d10dcb7c1,True,62,True,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,0.03586220741271973,0.03745388984680176,0.03504657745361328,0.03326058387756348,0.03273415565490723,0.042084455490112305,0.03528022766113281,0.15718555450439453,0.027295827865600586,0.04256582260131836,0.5383567810058594,0.055931806564331055,0.13571524620056152,0.05119919776916504,0.04980063438415527,0.050874948501586914,0.04936027526855469,0.04961824417114258,0.09217667579650879,0.06338357925415039,0.04888176918029785,0.04929542541503906,0.03135061264038086,0.04848980903625488,0.03178811073303223 diff --git a/results/combined/merges_timed/dozedoff/similarimage.csv b/results/combined/merges_timed/dozedoff/similarimage.csv index 8cef872458..67f831bbdd 100644 --- a/results/combined/merges_timed/dozedoff/similarimage.csv +++ b/results/combined/merges_timed/dozedoff/similarimage.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/develop,8137e10d6d6882c6461a20848c0699404328c767,65dc547c6168c01e2399106e022edf1aa6bc8711,33070ec5138938496f3349197d8e0f0d84bce790,,True,True,True,11,59,364,3,True,11,Tests_passed,4a5639825ed45d13ad085d24d4b845a17db97c219feb349cd5be18d964332041,True,Tests_passed,dbfb2449c2152c7cccad58a1aadc3f8196ecbb40e832a6423e8cb0d2aeb265b4,True,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,d0ef92d365b73e8beb51d1ab0a2d228feba105727f1917bc53b8f7a41e88efb4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Tests_failed,9d4b9d111ae563d40d7b8ceb1aa39ade0e7e4e4e92d795ca45a2b35c413edda4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,9eadde18136d4315f6d395459c13dd7b245f38bec3c1545fee3898b06d56458b,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,0.026057004928588867,0.026169538497924805,0.029022216796875,0.02951812744140625,0.029026031494140625,0.029664993286132812,0.029549837112426758,0.07350707054138184,0.13980817794799805,1.487844705581665,0.40970325469970703,0.14398455619812012,0.12977361679077148,0.0719754695892334,0.07252383232116699,0.07107996940612793,0.07313919067382812,0.07156658172607422,0.1264960765838623,1.5467848777770996,0.04974675178527832,0.06977105140686035,0.043409109115600586,0.0683903694152832,0.042662620544433594 diff --git a/results/combined/merges_timed/driesschulten/dozer-model.csv b/results/combined/merges_timed/driesschulten/dozer-model.csv index 6fa3d4ce33..1833e4f086 100644 --- a/results/combined/merges_timed/driesschulten/dozer-model.csv +++ b/results/combined/merges_timed/driesschulten/dozer-model.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/hibernate3,c7260c73f58d242b6181dfb05d588bbd0b23d5a1,1ad2803395b57bb2caf6d866f8afc1e8283712c8,00dc759c0edb8defa788bf42ef8888fb40e913a1,,True,True,True,12,32,104,4,True,12,Tests_passed,cbdffd8a86739d9a1c7ddbe2698323e4a6ed294312a141d82cc14bd61e879b8c,True,Tests_passed,d688e4dbbe71181e65399e6d5440602208e3ef8f9c48251c74165fb95ac5f353,True,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8bff437674b2a1923b335a5236bdc465a1fcc7000fbf10746b3a8b972bb24a3e,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Tests_failed,8cbf56ff12e76d6183bfcf18ca1b4e17b3dcd09cc95a615edb7ab0ea134e1f66,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,86d0551959c198a203a04caed42f694297b391e6cc974cf92dca4032f9611bc8,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,0.008745431900024414,0.008878707885742188,0.008901596069335938,0.008735895156860352,0.008888959884643555,0.008908271789550781,0.008788108825683594,0.05600738525390625,0.17241263389587402,1.9921414852142334,0.49149322509765625,0.1422712802886963,0.13048195838928223,0.049382925033569336,0.04983878135681152,0.049108028411865234,0.04891848564147949,0.04748868942260742,0.1127772331237793,2.041156768798828,0.04993438720703125,0.04984474182128906,0.032147884368896484,0.05013728141784668,0.03310036659240723 diff --git a/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv b/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv index 48563c9c9d..1759f6dacc 100644 --- a/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv +++ b/results/combined/merges_timed/droolsjbpm/droolsjbpm-knowledge.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/7.x,b7c5e5eb55c90c36520b89c88d4b0886e458cb5e,7a2dc873c017d5e6ee34dafdd7d5e177463a3756,7fd75d8287091e6a2b6d2bd549ca526ef47778e9,,True,True,True,69,221,2772,2,True,69,Tests_passed,6baaa34ffb4c33c1c88ace172efcc35d9d205bd27b962d508958501d653ace5b,True,Tests_passed,429bf44be992718b907b1acb0af1bf9f706328051fd4fcbdfad948f164a41354,True,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_failed,b5606bf79546409679dd187002b8afb3b48a6f30ba52e52246a32cdca4a03fa1,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,0.013883352279663086,0.013405323028564453,0.016797304153442383,0.015958547592163086,0.01618337631225586,0.01664257049560547,0.01664137840270996,0.04328656196594238,0.07869482040405273,0.7170023918151855,0.9306778907775879,0.08376097679138184,0.14625287055969238,0.05439162254333496,0.05455923080444336,0.055014610290527344,0.05364656448364258,0.055283308029174805,0.08995342254638672,0.7586312294006348,0.05197858810424805,0.05285215377807617,0.03998303413391113,0.05204176902770996,0.04222369194030762 diff --git a/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv b/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv index ab2a7ea18d..2bdeac9a6c 100644 --- a/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv +++ b/results/combined/merges_timed/dropwizard/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,13,58,227,5,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,13,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,0a66b38321a70768c7f2a5a3b2ea115e8de82c63c465b5357d6356c76605d9a2,Merge_failed,b5bec5ff58eaf8910fef70949a53df1a55bb44112fa4f0ac6a6f83700add1cda,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,0.045053958892822266,0.045946359634399414,0.04284310340881348,0.03931403160095215,0.042591094970703125,0.03975868225097656,0.04336404800415039,0.36564207077026367,0.29024696350097656,1.1379117965698242,0.36657214164733887,0.17235445976257324,0.13708162307739258,0.05629086494445801,0.0563662052154541,0.05640220642089844,0.05538487434387207,0.0554201602935791,0.1313319206237793,1.1414589881896973,0.056279659271240234,0.0571446418762207,0.05349993705749512,0.05599546432495117,0.05428051948547363 diff --git a/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv b/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv index d5850dacc2..a91b1bed07 100644 --- a/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv +++ b/results/combined/merges_timed/dropwizard/dropwizard-flyway.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,8,90,644,2,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,8,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,b8e1d01d40238d7cc4f1ef6647931f2626e443173c14b0294769196984842bb0,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,0.04240727424621582,0.0504145622253418,0.041349172592163086,0.04639148712158203,0.040465593338012695,0.0366513729095459,0.04206562042236328,0.17728829383850098,0.12490582466125488,1.0232815742492676,0.4196162223815918,0.06775450706481934,0.11255741119384766,0.034093379974365234,0.04098987579345703,0.03344559669494629,0.032727718353271484,0.03398728370666504,0.06508994102478027,0.9470705986022949,0.03439021110534668,0.03978228569030762,0.03337287902832031,0.034301042556762695,0.033254146575927734 diff --git a/results/combined/merges_timed/druid-io/druid-api.csv b/results/combined/merges_timed/druid-io/druid-api.csv index 20e31894b1..2c87cf4928 100644 --- a/results/combined/merges_timed/druid-io/druid-api.csv +++ b/results/combined/merges_timed/druid-io/druid-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,ac15c8e6c4baa07aecc2208f13952c0adcce489c,7ed6284ffe6bd5542a2d9060c96e8ff55515c99f,f1486a2f94d2ba816ec5495a0518768ddaa429a6,,True,True,True,14,41,709,2,True,14,Tests_passed,424ff64fcb36e661b96cf7154f4680b4de82167844ebcb395a40756cbdc0ab45,True,Tests_passed,ca3f47c8223d6b93221232b342ae43abc8217f8150e27ab31e47a3d1c85dbc39,True,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,0.0344693660736084,0.04244208335876465,0.029029369354248047,0.05074262619018555,0.04823112487792969,0.041902780532836914,0.05707955360412598,0.1680145263671875,0.1023557186126709,0.8908791542053223,0.45378899574279785,0.07659673690795898,0.13319158554077148,0.04642462730407715,0.04611515998840332,0.04491782188415527,0.04522418975830078,0.0455784797668457,0.08005213737487793,0.9035749435424805,0.04436016082763672,0.044767141342163086,0.03380870819091797,0.04375052452087402,0.03489065170288086 diff --git a/results/combined/merges_timed/dschulten/hydra-java.csv b/results/combined/merges_timed/dschulten/hydra-java.csv index 66c543dcae..7640dd0458 100644 --- a/results/combined/merges_timed/dschulten/hydra-java.csv +++ b/results/combined/merges_timed/dschulten/hydra-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 22,refs/heads/master,31477c32b5705e46811843bfede533dae9682322,fad819e0f8ca98108ceaf081a108c18f51eedaf8,320e7b3e13f86b6aae1424df7a17bb67d75d96f1,,True,False,True,2,2,4,5,True,5,Tests_passed,e76023079412f3860140021a6b4f64fc5853c8c3068942a9bdf226a2522560e5,True,Tests_passed,6fa12531d9406c631dfbb6f1a9944961a505e6d176c485c10b0f7f7d9d02af0e,True,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,9f32ce54e0339718fa9b37244c9f4cdaec80c25b9a97808ddae2e0e4937e1ee1,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Tests_failed,79e2c0461f6f937a6dabec287b42c2f87c3377e49f21206d8bc37ed9354f8f15,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,f813eaeabfe8070132a0a40573a8d6046b8a7b5eea2a9d09cf36aa944c287ce4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,0.032613515853881836,0.03868913650512695,0.05065751075744629,0.05280804634094238,0.03309512138366699,0.013527631759643555,0.03807187080383301,0.16752076148986816,0.12488985061645508,0.7807540893554688,0.3824656009674072,0.0712428092956543,0.11777162551879883,0.03764081001281738,0.03787684440612793,0.03786325454711914,0.038311004638671875,0.03734755516052246,0.07028651237487793,0.7668118476867676,0.03798508644104004,0.03710055351257324,0.03720855712890625,0.03635048866271973,0.036200523376464844 diff --git a/results/combined/merges_timed/dspace/dspace.csv b/results/combined/merges_timed/dspace/dspace.csv index 6714e07bce..64248cf05a 100644 --- a/results/combined/merges_timed/dspace/dspace.csv +++ b/results/combined/merges_timed/dspace/dspace.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 525,refs/heads/main,f715667f36cae09f850977047b48d0da5e6f00a8,aa9880f0f5868fa697fa3c32a5c96e63473bebc5,1f15e032fb2ebe77557d4b3aa97fed64d8acee73,,True,False,True,3,6,14.0,2,True,3,Tests_passed,9b18c8122736fdc7135c01a80fc89c19bbded4e8742455d17526766d9cea6939,True,Tests_passed,0555121f3466b8a2a4bc1729ed27aba55be882335184e7b9838f7236b8555e92,True,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,Tests_passed,713fc2f0aace535c9a5318004376d30c95383aa71f78ddfc9637973497b16e95,0.07073974609375,0.042960405349731445,0.05804276466369629,0.05079340934753418,0.07265281677246094,0.06050825119018555,0.036457061767578125,0.2519657611846924,0.11930203437805176,0.05240654945373535,0.37928104400634766,0.09932541847229004,0.1654210090637207,0.06904411315917969,0.0691232681274414,0.06926131248474121,0.06815099716186523,0.07113885879516602,0.11779427528381348,0.08005523681640625,0.0637960433959961,0.06336760520935059,0.05292916297912598,0.06330704689025879,0.05472445487976074 diff --git a/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv b/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv index 74b29c73a9..922fd3a92e 100644 --- a/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv +++ b/results/combined/merges_timed/dtrott/maven-protoc-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/remotes/origin/pull/10,0cab1f593acdfed0347285c8518987a96711236f,3fc1708da72ad61c9066cca02c03bad8d68d4a4c,405ccd79c722155c0065f7d0f5eb676ac6855e66,,True,True,Tests_passed,07855a510bd356318e5f80a1951ec8054b6d6c05fad7abc9b0cbebb9cea21f9d,True,23,78,606,2,True,Tests_passed,8d6433aba4f09d54a08af06fa7bd22278f17464e23b971f1ba2c7e313a58fb1e,True,23,True,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,4ec3e2fe1204736edae2d265bb631e7bb4c8579d548ee2b1795cb66bbb26c5ae,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Tests_failed,d765b3588a9593c9ace208badccad4d6885c3b3c87bd7c9bdd4890f49d8e2dc3,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,7c2bf186dc092648593013e54f9477e704ec1e02489dfa23b4a664292bbb0214,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,0.04140782356262207,0.046434640884399414,0.04282379150390625,0.03838849067687988,0.0455317497253418,0.0439145565032959,0.04764056205749512,0.17337560653686523,0.11487030982971191,1.1155824661254883,0.35032153129577637,0.07434749603271484,0.11761736869812012,0.03817105293273926,0.0363922119140625,0.036652565002441406,0.03598189353942871,0.03864598274230957,0.06978487968444824,1.0561294555664062,0.0376133918762207,0.036910295486450195,0.03712725639343262,0.03636646270751953,0.037624359130859375 diff --git a/results/combined/merges_timed/dtrules/dtrules.csv b/results/combined/merges_timed/dtrules/dtrules.csv index 65fa3d0377..684fcee466 100644 --- a/results/combined/merges_timed/dtrules/dtrules.csv +++ b/results/combined/merges_timed/dtrules/dtrules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/5.0-SNAPSHOT,6f91cbdda5d9d2ff783833d2b7fd43fcefb81f12,e48a828c7ee4c90f9077beed380282eca16b196d,d83934d0d79aaa1c1dbd84b4009c05f05e222654,,True,True,True,184,425,26318.0,4,True,184,Tests_passed,6a30be910fdeac9495bd74619a2772a404a12c528a7d804d61ce11840206cb53,True,Tests_passed,c859fa4729382e964d1b8bbd783a4c502c1f2eb4351b20d41be3bdc867a261ae,True,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,6219c070ced46b4eda40de8bbcefdc919a7883210a628e38e618e07f98fda474,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,ffe40fedf3731d3a9e934d8d6c88930d979c51846c56c53db6f2a7e3bc315ab8,Merge_timedout,,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,bd7851b893afcb0536892bbb9df1bb5d59a1073b3cf8cea27da30358b95f10f7,Merge_timedout,,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,0.07908248901367188,0.07355642318725586,0.07282209396362305,0.0787808895111084,0.07722902297973633,0.07296228408813477,0.07873964309692383,0.3122692108154297,0.2705838680267334,653.4522542953491,-1.0,0.22763872146606445,0.21686887741088867,0.12171125411987305,0.12029314041137695,0.12580084800720215,0.12111091613769531,0.12142586708068848,0.20576739311218262,578.9815549850464,0.11183810234069824,0.1105356216430664,0.11057853698730469,0.10898280143737793,0.10969305038452148 diff --git a/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv b/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv index 3276e63382..1b79ca98e3 100644 --- a/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv +++ b/results/combined/merges_timed/duesenklipper/wicket-safemodel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/wicket-1.5,09940b84110f272a498b0956740d17684d48f1c3,fb62ed543a7b7e36412f501ffe1eb4906cb92dc1,eede8623fdeb4c0b07d4a37c6da1e5abe23fe37d,,True,True,True,5,16,90,3,True,5,Tests_passed,b4f0103eb7ebd57aa6c32cc98b88decf44f436d2ed182f2c409c58c4c84c6801,True,Tests_passed,13cee4d48a55de96ca5dafac1489d9a4af378733434f92b701cfc22eecf1c794,True,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,5e349304cfc4b2683eb4966c9b8e370593d115f0948c9e4eded54962c5fe4e21,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,369fef66ec15a5957089ca27b9dc122d6a8c84d0a4a00a671f948e6545de3703,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,6018247b4ba7d628ee254f36d751f165eec652aa080ab707dcf269c6e1f15611,Merge_failed,c54e3fc61b232e0a5fc62144cbe48641fe95de1b48b761304b903b9e29c86535,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,0.038802146911621094,0.03736519813537598,0.03849363327026367,0.038818359375,0.035156965255737305,0.03810930252075195,0.040132761001586914,0.21635937690734863,0.1702268123626709,0.9442393779754639,0.3524632453918457,0.09595084190368652,0.1174154281616211,0.03941679000854492,0.03964734077453613,0.039476871490478516,0.03904247283935547,0.03948783874511719,0.08491730690002441,0.912665605545044,0.03949379920959473,0.0393216609954834,0.030560970306396484,0.03981661796569824,0.030656814575195312 diff --git a/results/combined/merges_timed/dvcama/lodview.csv b/results/combined/merges_timed/dvcama/lodview.csv index 7930fe47b7..ac08c5a21d 100644 --- a/results/combined/merges_timed/dvcama/lodview.csv +++ b/results/combined/merges_timed/dvcama/lodview.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,ce117080514feaa63100345095aa4954a9d6d4bc,39f794baac72a3024ff3ca69a0b0fd9c1e830ad0,9cd0988f15b5adec4454a0527c1933d3154ad4c4,,True,True,True,11,29,177,5,True,12,Tests_passed,c43a1da7c4910dad4f7b2434f912ea7792c11c595b890a549052d491d0f60e13,True,Tests_passed,b460c7acdf763d86f5421153fbd3bdd971e932294f8a8542d98ad55658633e55,True,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a803fdcddc819cd727fdac19418fb634e2915672bfa0e3f6e657568708b7e2e4,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a6d1bf3967eaaf8fa72c46e9afe9b81d5cb92761fc55aa207d43f430453f7727,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,0.06262397766113281,0.0625770092010498,0.07557106018066406,0.07603716850280762,0.07616901397705078,0.07651996612548828,0.07581019401550293,0.14375758171081543,0.20682644844055176,0.06651067733764648,0.42998766899108887,0.24171900749206543,0.13828754425048828,0.13958382606506348,0.13922905921936035,0.14156651496887207,0.14454936981201172,0.14681768417358398,0.18611478805541992,0.16765761375427246,0.12211894989013672,0.12699675559997559,0.13908982276916504,0.12863469123840332,0.13807964324951172 diff --git a/results/combined/merges_timed/dvdme/forecastio-lib-java.csv b/results/combined/merges_timed/dvdme/forecastio-lib-java.csv index f72956ae10..8209e410b1 100644 --- a/results/combined/merges_timed/dvdme/forecastio-lib-java.csv +++ b/results/combined/merges_timed/dvdme/forecastio-lib-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,60570820cae9c489f6fb00a1c64a73ea7fdfdfae,c5157ff590ecd99bf07058d779a52818af0ce056,de802a0f9736572038a2147ec3cc804f0ef3cf76,,True,False,True,5,11,70.0,2,True,5,Tests_passed,cde9a0c15a1347cc20c80cfeec748d3e382696333655b691085cdbcf8fd314e6,True,Tests_passed,6575b7205c3762dc567541e31b58be4586b9db00c23c4275aa28ee71529688fa,True,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_failed,9b4be2ece491d0250c4ff5e1cd7e242bad152e0711f3d882f15581ce212b08eb,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,0.03851747512817383,0.04549908638000488,0.049376726150512695,0.050948381423950195,0.058693885803222656,0.04130721092224121,0.05769944190979004,0.17081475257873535,0.11396360397338867,1.031712293624878,0.3847825527191162,0.08072233200073242,0.14008140563964844,0.04814958572387695,0.0480649471282959,0.049048662185668945,0.046872615814208984,0.049172163009643555,0.08369970321655273,0.9982357025146484,0.045967817306518555,0.048082590103149414,0.03697776794433594,0.04720306396484375,0.03760409355163574 diff --git a/results/combined/merges_timed/dwslab/dwslib.csv b/results/combined/merges_timed/dwslab/dwslib.csv index c545497fb5..ecd93a4e68 100644 --- a/results/combined/merges_timed/dwslab/dwslib.csv +++ b/results/combined/merges_timed/dwslab/dwslib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/1,83dc42bd1fb663dcb6e293c7d9a951d373248c12,8cd70aed31c7b4ec1cc67f682b036236a4836e38,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,True,6,9,166,5,True,8,Tests_passed,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,True,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,True,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,ab4d0b464a7c8d688be4d837b11c8bc807eb1e41c733575bd7ef40d938710cd7,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,8fcd4cf8abf6e2b715725b325671b460a6da722708cbc1db005884a7ce2abca4,Merge_failed,b8f987e324d544fbaa86aeca4473f5c61e97af19005c28e8cca9d34444fad2f3,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,0.008374691009521484,0.008433103561401367,0.008753061294555664,0.008000373840332031,0.008295059204101562,0.008578300476074219,0.008325576782226562,0.045380353927612305,0.12120175361633301,0.6084761619567871,0.2781829833984375,0.09493565559387207,0.11956667900085449,0.03974652290344238,0.040224552154541016,0.04032158851623535,0.04133009910583496,0.04062986373901367,0.08738207817077637,0.6688308715820312,0.040918827056884766,0.04076051712036133,0.03253936767578125,0.040256500244140625,0.03122997283935547 diff --git a/results/combined/merges_timed/dynjs/dynjs.csv b/results/combined/merges_timed/dynjs/dynjs.csv index 11d95894eb..7e0177d678 100644 --- a/results/combined/merges_timed/dynjs/dynjs.csv +++ b/results/combined/merges_timed/dynjs/dynjs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,ee2219fc8b7178f9df605277b89200011093a534,b0f3e1e3217792abd2cec6e18bf7e376f56ae1d1,cf7bbe9e06fd28c686ecbc47ba59bfa25c854e47,,True,True,True,227,923,9393,4,True,227,Tests_passed,1a5cac1a138de84dfc3aca1145091ab3248fcce4c3e5839282e8540dd71cb981,True,Tests_passed,2b963c0b558bb7d88d02e3bf7feecc8edd731b36f4e00b825eb47ecf1acd951a,True,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,0.022417783737182617,0.0228421688079834,0.026670217514038086,0.026682376861572266,0.027187824249267578,0.027356386184692383,0.027282238006591797,0.0830237865447998,0.1852128505706787,3.2998459339141846,64.67376232147217,0.1645975112915039,0.18140816688537598,0.09004640579223633,0.0868680477142334,0.0867621898651123,0.08529353141784668,0.08602261543273926,0.16764140129089355,3.3423478603363037,0.08236241340637207,0.08176493644714355,0.05749106407165527,0.0810542106628418,0.053900957107543945 diff --git a/results/combined/merges_timed/e-mzungu/rjc.csv b/results/combined/merges_timed/e-mzungu/rjc.csv index 4ca6d7b838..81f99dc097 100644 --- a/results/combined/merges_timed/e-mzungu/rjc.csv +++ b/results/combined/merges_timed/e-mzungu/rjc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,3afc92b5e097f29763b600a8192f557f66752039,31a91e743de4b0de8bb25f306134117e887c6364,653b9123f2057024bca7cb4333d6f26060231bf5,,True,True,True,10,68,339,2,True,10,Tests_passed,508940ed4108d08289048940b0c9f0524c5d3e0085b4459c1ea1ecf7b4234486,True,Tests_passed,3c298e1930b87e25093586c38d4f790f64ae1aa480c2bee9029bc00d3387a0c7,True,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,88438f8d58fadb73e75beab0fc6a98c6fb7f98cdbcbd25f2291a61de7d396d4e,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Tests_failed,bb6da254f8d5178b3a151e28169177c6930134fe9936263c9b11c0243a3d3138,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,8ac1a05b6145ba6f68a3f3fb8993eb1c7c9f9daca75dc1d348ead0d9309ba3b9,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,0.011702775955200195,0.011842727661132812,0.012294530868530273,0.012068510055541992,0.011888265609741211,0.01207876205444336,0.01198887825012207,0.03963947296142578,0.07949328422546387,0.8306918144226074,1.0175237655639648,0.08647370338439941,0.1201624870300293,0.038999080657958984,0.03879833221435547,0.038453102111816406,0.03706979751586914,0.03788280487060547,0.07095646858215332,0.750800371170044,0.03750205039978027,0.03694438934326172,0.034980058670043945,0.03788566589355469,0.03624153137207031 diff --git a/results/combined/merges_timed/eaftan/hprof-parser.csv b/results/combined/merges_timed/eaftan/hprof-parser.csv index 0a255b9ca7..cfc847b75e 100644 --- a/results/combined/merges_timed/eaftan/hprof-parser.csv +++ b/results/combined/merges_timed/eaftan/hprof-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,3668fd734f79c2b949f0703654dfda812c800707,cd2019e5a76d7b2fffdf3cd2faa7738caefc47a2,4b860f8b50791fad8ca96f54899a20dc34d3ff04,,True,True,Tests_passed,5a222e78e931916fdf6bc576d04d4a197d0240ee1b97abd912d80bfbaba8ed5b,True,5,55,301,2,True,Tests_passed,8c1c891754ff5c8b94684cbe76d185011952bb913f4b4abba77ed5c39df42285,True,5,True,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_failed,ee639548fb0f39a770e1cd8d09de0861377b6f89705464579bdcc63806bc5fc7,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,0.054485321044921875,0.0552520751953125,0.0825040340423584,0.07899165153503418,0.08211636543273926,0.07959127426147461,0.07789087295532227,0.09234809875488281,0.11263108253479004,1.3085620403289795,0.5057661533355713,0.1744372844696045,0.2814972400665283,0.14914369583129883,0.15551328659057617,0.151564359664917,0.14803719520568848,0.15335536003112793,0.20399951934814453,1.2656834125518799,0.12813091278076172,0.12917113304138184,0.133958101272583,0.12047410011291504,0.12212562561035156 diff --git a/results/combined/merges_timed/easetech/easytest-core.csv b/results/combined/merges_timed/easetech/easytest-core.csv index 274cc2b4fa..45805e2fe0 100644 --- a/results/combined/merges_timed/easetech/easytest-core.csv +++ b/results/combined/merges_timed/easetech/easytest-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,38eb005d4af26d4efac55ee553a324707ca75486,0f668972d2ea34b04685aa7d8ea4dc20924e1dad,0671ea4bf8142f1731e00ac44c10b73abce310d4,,True,True,True,20.0,79,265.0,4,True,20,Tests_passed,9251f95f877e91999a10b5e5d5cbaa6399c9e608b994e19cd3d317d04f07b032,True,Tests_passed,640b135b2fcfa2a26afe641df242f6c416b7642895fdb16e6ab9f5da7967f1ae,True,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_failed,bbb08dc4182042bb9077f9a693da810758b7b54d1a4c3ca9f3b759237c2b96a1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,0.04332685470581055,0.05734992027282715,0.04378318786621094,0.061516523361206055,0.04619288444519043,0.05008435249328613,0.05159306526184082,0.3076152801513672,0.23147320747375488,3.70242977142334,0.5736935138702393,0.1512906551361084,0.16788482666015625,0.06026029586791992,0.07117080688476562,0.06009316444396973,0.0715324878692627,0.059401512145996094,0.14680266380310059,3.535219669342041,0.059732675552368164,0.07225632667541504,0.04419064521789551,0.06969761848449707,0.046694278717041016 diff --git a/results/combined/merges_timed/ebay/xcelite.csv b/results/combined/merges_timed/ebay/xcelite.csv index c37c3431f7..a2b479a9e2 100644 --- a/results/combined/merges_timed/ebay/xcelite.csv +++ b/results/combined/merges_timed/ebay/xcelite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,e43a4a1bda8dfa082dadd823d9b125c1b97e9378,46654b2fc1e9bd680156663055a6f185a5faca69,8330785c9980d941bab29ae076a6db86a0bbc97c,,True,True,Tests_passed,f90a42e7f2cf5ed9742998c4692fce28ac487ecadad12315d48e5a849dce4c46,True,71,101,1423,5,True,Tests_passed,cfce61083c42a4471bdebda5cd8d255ce282066e5067c0af88b8713ccdedc230,True,71,True,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,5b700d3946e447c3eea43f2172289943ba7184e2223daef00b1acdde8813759d,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Tests_failed,d92e8b39ddf4d6f5b3f7434fe047302d802f3e15dcba136c12435c7981f2e5e4,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,8b908b3ac6ca8db3c31d1305e9a937b9490585a9162066df357f45dc18bd5455,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,0.014155387878417969,0.014150381088256836,0.01495051383972168,0.014797449111938477,0.015190839767456055,0.015030860900878906,0.015348196029663086,0.07494711875915527,0.12360000610351562,1.2328314781188965,0.727287769317627,0.1206052303314209,0.14511847496032715,0.06400752067565918,0.06359434127807617,0.06574082374572754,0.0668497085571289,0.06577348709106445,0.14543437957763672,1.2925126552581787,0.06543087959289551,0.06332993507385254,0.041166067123413086,0.06545853614807129,0.04253721237182617 diff --git a/results/combined/merges_timed/edwardcapriolo/nibiru.csv b/results/combined/merges_timed/edwardcapriolo/nibiru.csv index e8387f0427..247935ebde 100644 --- a/results/combined/merges_timed/edwardcapriolo/nibiru.csv +++ b/results/combined/merges_timed/edwardcapriolo/nibiru.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,d4ad3fb0016120d5ff27b81f991adc2f98fff89a,9b75f2cf605b3da94473a9f7ab419ded5fbe43bb,6f38f28681cc5223d14ce5fe344c96ccdda32114,,True,True,True,14,46,224,2,True,14,Tests_passed,9bc55f49034361ce4f416cdbf492b4719b35b22649d07f6fc4bb627c5f341112,True,Tests_passed,f2ea64a4377d3741da1193a261091344807606998fbc4af1d01ecdcdbb71c228,True,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,0.030964374542236328,0.05541348457336426,0.04754233360290527,0.0469815731048584,0.05126166343688965,0.04294419288635254,0.051326751708984375,0.16785430908203125,0.11601042747497559,0.9091708660125732,0.5511682033538818,0.07552218437194824,0.13555240631103516,0.0464177131652832,0.04633474349975586,0.04709053039550781,0.046661376953125,0.044991493225097656,0.08091592788696289,0.869532585144043,0.045083045959472656,0.04474377632141113,0.034413814544677734,0.044731855392456055,0.03171205520629883 diff --git a/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv b/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv index 46eaab4efa..e26cb09dbf 100644 --- a/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv +++ b/results/combined/merges_timed/egineering-llc/collectd-fast-jmx.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,0.036690473556518555,0.046187639236450195,0.044205427169799805,0.0417327880859375,0.046073198318481445,0.04022049903869629,0.046515464782714844,0.11889767646789551,0.11903548240661621,1.0518982410430908,0.30756545066833496,0.06672143936157227,0.1203155517578125,0.0379946231842041,0.03932309150695801,0.038628578186035156,0.038075923919677734,0.03823661804199219,0.06996464729309082,1.0050075054168701,0.03835439682006836,0.038393497467041016,0.027376413345336914,0.03832697868347168,0.027661800384521484 diff --git a/results/combined/merges_timed/ehcache/sizeof.csv b/results/combined/merges_timed/ehcache/sizeof.csv index 75b11b62fc..b9a6e0dad2 100644 --- a/results/combined/merges_timed/ehcache/sizeof.csv +++ b/results/combined/merges_timed/ehcache/sizeof.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,0e8fcbf4ca3b391acc623d6d0c07908db180b4b6,f50d8bdf1403cb9855223cbe33ac479fa1606221,d632def2a5dae8f942dbc10546f2f0379387b088,,True,True,True,11,43,491,2,True,11,Tests_passed,c0861911e4977f4a47d09ab8a73cd15979a92df7f966acbe3152eb3984807696,True,Tests_passed,b8be5c75a518f100d73e3ca0c25cd4ec9102ed9694f988c7ae3df48acd146342,True,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,0.047981977462768555,0.04913783073425293,0.039585113525390625,0.0388333797454834,0.043399810791015625,0.047023773193359375,0.03549003601074219,0.17633891105651855,0.11764001846313477,0.8777697086334229,0.402332067489624,0.07507061958312988,0.12926054000854492,0.04256772994995117,0.04279494285583496,0.04402780532836914,0.042882442474365234,0.04332423210144043,0.07642221450805664,0.8448569774627686,0.04170346260070801,0.04221844673156738,0.03125929832458496,0.042145729064941406,0.03211855888366699 diff --git a/results/combined/merges_timed/einsamhauer/disthene-reader.csv b/results/combined/merges_timed/einsamhauer/disthene-reader.csv index 7c1e71149a..f2eefe7e13 100644 --- a/results/combined/merges_timed/einsamhauer/disthene-reader.csv +++ b/results/combined/merges_timed/einsamhauer/disthene-reader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,8d8c28bd2a9238ebbc6ff483aa18b2632e27806b,abf2f0ef5b03fd5eaf513e5935f24ea6ed719e20,5bb6dc15f0e17f31029f175da1ab15c047bc9a4b,,True,True,Tests_passed,548452c738e1fc81241c3aec5491614e904cb69fbb8bdba4a758db263fb1b9cf,True,159,641,3085,12,True,Tests_passed,bc17cdfc30fdaea86c59f60630e2d6932f13c7c81f990e8619bd236c596b0c24,True,160,True,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ddae62cea325581966160f952c45b1734cfc22c6932fcd21362446ca9996060d,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,4523bcc9ac8da0c79930e42144bfabcde16915e1083e2eae214bdbfd14f21efa,Merge_failed,bb1c09b804eb62fe50e82c1b01c6948eee0baa6f841612b810ae915d75495b4f,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,991127d2347d3d58e875965ff4f0969d6678b15e1ced07732bada368b9638b3b,Merge_failed,8ff0feaaf88a8ecafa45ea7dec6d0502e615547fc66274db38135bf94ac72bf0,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,0.027855873107910156,0.028504371643066406,0.030364990234375,0.030705690383911133,0.030994176864624023,0.031163692474365234,0.031351566314697266,0.18462419509887695,0.5813229084014893,6.812468528747559,1.3445711135864258,0.38775086402893066,0.20643401145935059,0.13079333305358887,0.13027667999267578,0.11583447456359863,0.13064336776733398,0.12557387351989746,0.29783082008361816,6.8577048778533936,0.1216878890991211,0.1247103214263916,0.0765373706817627,0.12146210670471191,0.09033632278442383 diff --git a/results/combined/merges_timed/einsamhauer/disthene.csv b/results/combined/merges_timed/einsamhauer/disthene.csv index 277599c546..9821d29b28 100644 --- a/results/combined/merges_timed/einsamhauer/disthene.csv +++ b/results/combined/merges_timed/einsamhauer/disthene.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,981e50d964a248b47b78104d0d9caf678e8abd81,efdf6e7a36f19e438ad2f1aa1803174b3b82b9cc,aee2eb5552e5e0723c23d8aa943b8c2a39fd3648,,True,False,Tests_passed,671812d6d3b15e4a4445abe235ec243d84ae6e7e79e1e8a344912bb3800bfd2e,True,2,1,2,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,True,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_failed,1d8e4a52f61a9c7c0512a6f59e52747d804e1ca78b8877c6e53bd8630efbca3b,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,0.009107589721679688,0.00919651985168457,0.009766101837158203,0.009589433670043945,0.009645700454711914,0.00965118408203125,0.009425878524780273,0.03374361991882324,0.06480002403259277,0.7571911811828613,0.30777668952941895,0.06874990463256836,0.12291884422302246,0.038426876068115234,0.03898978233337402,0.039700984954833984,0.039342641830444336,0.03891777992248535,0.07233428955078125,0.8127760887145996,0.03879833221435547,0.039231300354003906,0.028909921646118164,0.03826403617858887,0.02782440185546875 diff --git a/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv b/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv index 52f0aaf588..ad34d07015 100644 --- a/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv +++ b/results/combined/merges_timed/eirslett/frontend-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 205,refs/remotes/origin/pull/553,16d0b92ccb95873464210ae627841b4891b78dbd,f353ca49b4893c7ec32bc95bf4ea54e7217cf8e2,7c7f71ea0a5bdea86e94a09d5ae684fcb59a9921,,True,True,True,17,46,835,10,True,19,Tests_passed,85a6775a000c9ec94d2fdd1a3e003b44a03c4f7a74b0b20460b8124333982313,True,Tests_passed,070989b4b3a6b016bdbb4368e41adabb95b3a99e22ad1380c7c9a7887838e262,True,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,9e5516f24d5c23a693382ff4965cfcec5b150608ecd5c665f10438d496cb5495,Merge_failed,c22fc698444788a8804282f2d3c495bc02196c1329b713af1671e9f2fa336b60,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,7cefebbea769c9d816cfdb58a64a0dbc185b67dfb0191a4e6ab97f3e61c3791b,Merge_failed,679d76747806737201dd0eb0f4fb77c0af95eda8d23ef711a46f15520c3bde73,Merge_failed,0a657adc0f119bb4474de150a3eaa09e1ad83bc9b1479b981623b8d02548da54,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,0b7ce86376b459b6af6bc596fbf47bba1ef758f82353895b45efc6c4ce3e89d2,Merge_failed,9e5516f24d5c23a693382ff4965cfcec5b150608ecd5c665f10438d496cb5495,Merge_failed,707760ba86acaa44b5ffa856b4281f1cff6dd152f128e467a0e33d45478d539f,Merge_failed,dd40fa501018c10e5e31abc40f08ee448f08bc0be97cf756c346320ad8cc88b1,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,4500d7e2ed6a8c1c1cf74b3c5ae1bbffc3de913bd73b6a0f8df3a2768d073719,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,Merge_failed,8014905b9fb02fad52d829a5ff41c02aab5e3ceb2f3f3791acf45b30e48af653,0.050534725189208984,0.057645320892333984,0.05497908592224121,0.04358100891113281,0.03913569450378418,0.04951119422912598,0.05612611770629883,0.5427734851837158,0.4687974452972412,1.1047439575195312,0.32912755012512207,0.2619509696960449,0.1640644073486328,0.08101153373718262,0.08109879493713379,0.08335685729980469,0.08246207237243652,0.08155989646911621,0.20528769493103027,1.0684142112731934,0.08378744125366211,0.08208370208740234,0.08160161972045898,0.08366203308105469,0.08170390129089355 diff --git a/results/combined/merges_timed/ekryd/sortpom.csv b/results/combined/merges_timed/ekryd/sortpom.csv index 99f9d8a664..53cee96d0a 100644 --- a/results/combined/merges_timed/ekryd/sortpom.csv +++ b/results/combined/merges_timed/ekryd/sortpom.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 85,refs/heads/master,f19edf0092007b36d73316707be71448afdc40cf,65db6732963f71b39434913dd4015b9fd96e9a20,64311fe38c9acefaec6dcd3ae2428168c0cb0441,,True,True,True,11,16,102,2,True,11,Tests_passed,d548b7d60a51a877438902662082d6b568f9ad2cfe3b263786713b30a4ceff69,True,Tests_passed,4db3df2452de700e6b3009d88e249c8565c470c8f20fc92e260ce8282112f85d,True,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_failed,152c9f6a414e466fd36ef5aca7969edd77329873fbf03b6e01358f5194de5aad,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,0.046096086502075195,0.03253674507141113,0.03606820106506348,0.04497218132019043,0.03765535354614258,0.05329108238220215,0.050581932067871094,0.1691133975982666,0.12361860275268555,0.04256916046142578,0.2872440814971924,0.12041521072387695,0.19945287704467773,0.09200143814086914,0.04291415214538574,0.09450960159301758,0.04314231872558594,0.09073853492736816,0.1235198974609375,0.05397677421569824,0.08267021179199219,0.04149270057678223,0.0815737247467041,0.04174041748046875,0.07385754585266113 diff --git a/results/combined/merges_timed/ekt/biblio-transformation-engine.csv b/results/combined/merges_timed/ekt/biblio-transformation-engine.csv index 0fefdadc58..468b10c9bc 100644 --- a/results/combined/merges_timed/ekt/biblio-transformation-engine.csv +++ b/results/combined/merges_timed/ekt/biblio-transformation-engine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/version-0.10.0,e1a8fcececc66007b4a770ff37f17a5eafe79718,e2cac286ffa6742f7365f3cd58f83038c0986451,a01da4c16a61a3e9e1de11655011de6c1ca71a5d,,True,True,True,24,82,858,5,True,24,Tests_passed,487d31ee43db08b0917b31521a41d78f4394c1d23fbb64cb5db020086aa4c630,True,Tests_passed,a8d98f83950ad6acb0c5df1a951382458845fa670dc3a9dc5792d0253be1f3b5,True,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,0892aa8ea8e411a83ddac03c373bf07c2e1c7af4a41c965f308efbc42fb23aed,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,9fb627ac3b2d025075fabfa7e9b79c2d9e89bd37b2380ac52fd2b2beee4a4067,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,402606eccf1bc908020e22ae924dfd654732b702a551e2796957ca03e89e4ab5,Merge_failed,fbef72efdff05f86326dced689510e65abffe3e579335f72d19655de0ca1a484,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,0.011239767074584961,0.011061429977416992,0.012454509735107422,0.012644290924072266,0.01262974739074707,0.012313604354858398,0.012330293655395508,0.07276320457458496,0.23381328582763672,0.6087615489959717,0.5574827194213867,0.16469717025756836,0.14133381843566895,0.06046152114868164,0.06312894821166992,0.060709238052368164,0.062232255935668945,0.06197166442871094,0.14045166969299316,0.681769609451294,0.059343576431274414,0.05799508094787598,0.04978799819946289,0.05993533134460449,0.052483558654785156 diff --git a/results/combined/merges_timed/elasticjob/elastic-job-lite.csv b/results/combined/merges_timed/elasticjob/elastic-job-lite.csv index e5ae4b294d..d1982ece24 100644 --- a/results/combined/merges_timed/elasticjob/elastic-job-lite.csv +++ b/results/combined/merges_timed/elasticjob/elastic-job-lite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,True,True,True,27,93,380,2,True,27,Tests_passed,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,True,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,True,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_failed,5ee890331e8e255c162944d2208db2338f29849649649c226e8c2fbe59081bec,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,0.05277061462402344,0.051134347915649414,0.06899714469909668,0.05671429634094238,0.06684231758117676,0.049898386001586914,0.04941964149475098,0.1657397747039795,0.1069793701171875,1.0078010559082031,0.7306873798370361,0.08463501930236816,0.14288806915283203,0.05563640594482422,0.053816795349121094,0.05389046669006348,0.05405116081237793,0.053536176681518555,0.09259390830993652,0.9878365993499756,0.052141427993774414,0.05147671699523926,0.04131579399108887,0.05287671089172363,0.040875911712646484 diff --git a/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv b/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv index 7ac59fe9a4..29f2cc4e15 100644 --- a/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv +++ b/results/combined/merges_timed/electronicchartcentre/java-vector-tile.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,293520399db5206524d7695f666682cf60ddf05f,da7c0a0c0d0f7ffd2766dda1f15d147bd41b5a03,2e44156f767570103439d8b484fcca031790d28a,,True,True,True,6,26,154,2,True,6,Tests_passed,8b6a4e0cd1e494b230a33db9822d306e2e6b646db3c4e395b07ee348d3bac6b2,True,Tests_passed,4c45468c0045fce3d00a1f5759af9da8ec9b12ea7709a326e22a3ad8aeec4f46,True,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,0.03738808631896973,0.045957326889038086,0.07046294212341309,0.04748415946960449,0.047400712966918945,0.05252528190612793,0.051419734954833984,0.14908790588378906,0.09929585456848145,1.0610864162445068,0.5624740123748779,0.13059139251708984,0.19899225234985352,0.09842109680175781,0.09363079071044922,0.09422469139099121,0.0957496166229248,0.09492254257202148,0.1409909725189209,1.0352108478546143,0.08617973327636719,0.08029484748840332,0.08051562309265137,0.08654642105102539,0.07884478569030762 diff --git a/results/combined/merges_timed/elisarver/selophane.csv b/results/combined/merges_timed/elisarver/selophane.csv index 2fb9bd4901..dce36d4340 100644 --- a/results/combined/merges_timed/elisarver/selophane.csv +++ b/results/combined/merges_timed/elisarver/selophane.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,56eb40e68919920ba7f973b114536e4620788ed5,9bfa023e2de211afa8960e0d54108439a72c3379,95e696bedd0c7d5f5b183791800a3aa271eb232f,,True,True,Tests_passed,cef4989f2763609d5690282b0c2335cc2505a0ac36b81cefcb25a1bb2a09d0c0,True,4,6,19,2,True,Tests_passed,f54fed560023f8bd449a8d9c5010b8732c89e1e57aac2ad9207b7ee9ee93eaf3,True,4,True,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_failed,c2209098bd06d31f872d7b7d33bfffe6c24bfa4a7f679464216977a7c5267c0c,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,0.04115462303161621,0.03626418113708496,0.04663372039794922,0.042534828186035156,0.04269838333129883,0.04170703887939453,0.04449176788330078,0.16195106506347656,0.10846519470214844,0.6390337944030762,0.2675480842590332,0.07278656959533691,0.12214136123657227,0.03978776931762695,0.039482831954956055,0.039185523986816406,0.04012751579284668,0.03990578651428223,0.07068729400634766,0.6342289447784424,0.03783869743347168,0.038265228271484375,0.02804732322692871,0.0381472110748291,0.02830028533935547 diff --git a/results/combined/merges_timed/elunez/eladmin.csv b/results/combined/merges_timed/elunez/eladmin.csv index aba0de2335..842317cd62 100644 --- a/results/combined/merges_timed/elunez/eladmin.csv +++ b/results/combined/merges_timed/elunez/eladmin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,True,45,139,771.0,4,True,45,Tests_passed,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,True,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,True,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,fd1ca2df337a47240b9a5bc601b47b31d53946c97a2c304993c435a546b4df85,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,e1c74d2275975a3570bc6be7d75f10f1c313da6898928b1fa9774fc860843448,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,0.03778386116027832,0.043836116790771484,0.05174088478088379,0.03505659103393555,0.048101186752319336,0.05415701866149902,0.04845237731933594,0.266085147857666,0.17467880249023438,0.04268646240234375,0.7208957672119141,0.12351632118225098,0.13233447074890137,0.05921125411987305,0.05476975440979004,0.04798316955566406,0.058653831481933594,0.0595707893371582,0.10695362091064453,0.07421255111694336,0.059662818908691406,0.049701690673828125,0.05777239799499512,0.05833148956298828,0.047086238861083984 diff --git a/results/combined/merges_timed/emicklei/rendersnake.csv b/results/combined/merges_timed/emicklei/rendersnake.csv index 839bfb626c..a447e25786 100644 --- a/results/combined/merges_timed/emicklei/rendersnake.csv +++ b/results/combined/merges_timed/emicklei/rendersnake.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,9541c886359597f23b41f86c5f5ca95dc4d59a51,eddec186e79131f4569769a86a0f9d9aaf2344b9,d238d52e4129a95a4a3f9314c4eab95f008955de,,True,True,True,311,656,49552,2,True,311,Tests_passed,378531769f40766716ac1acb132c5927c194fbc2ec68458723cc569a9486a04c,True,Tests_passed,f3a7559545782aedd0cd3fa04210190213db3796a482964b15128c1a8c0b2fd6,True,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,0.0669562816619873,0.0765678882598877,0.08143997192382812,0.08855986595153809,0.07523989677429199,0.08072328567504883,0.07880496978759766,0.22412633895874023,0.11698412895202637,2.9076600074768066,1.3821003437042236,0.11469769477844238,0.21939301490783691,0.11214685440063477,0.1154627799987793,0.11229729652404785,0.11693954467773438,0.11117196083068848,0.16733813285827637,2.6877920627593994,0.1271982192993164,0.12092995643615723,0.11845254898071289,0.11790323257446289,0.11793994903564453 diff --git a/results/combined/merges_timed/engine-alpha/engine-alpha.csv b/results/combined/merges_timed/engine-alpha/engine-alpha.csv index 1b2fa18c35..6f4fb66e73 100644 --- a/results/combined/merges_timed/engine-alpha/engine-alpha.csv +++ b/results/combined/merges_timed/engine-alpha/engine-alpha.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 54,refs/remotes/origin/pull/46,ac8d5c637116ce3b88e46a1b0c30fb182d93e49b,a5fcdfef0794ea44d7094526279857f614784f3f,a959ad427a8b29c48f2d7b68e5fe32240a3b4413,,True,True,True,8,28,106.0,2,True,8,Tests_passed,00f2f2edaffc4af622c215fdf7bc3b8851d9be1bf38acda316222d9e3a90f5fa,True,Tests_passed,c960383e7a57030afff2d0ac1b8999f083a7187b4c80c274554600335a29ae62,True,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,0.05210590362548828,0.010829687118530273,0.0750577449798584,0.05397224426269531,0.07459902763366699,0.07420802116394043,0.07422351837158203,0.12136220932006836,0.10771298408508301,0.6795861721038818,0.3673839569091797,0.1837329864501953,0.2687699794769287,0.14821219444274902,0.14748501777648926,0.04314160346984863,0.14901304244995117,0.1485118865966797,0.20209765434265137,0.7596950531005859,0.04295682907104492,0.13121795654296875,0.12679100036621094,0.043767690658569336,0.12154841423034668 diff --git a/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv b/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv index 47f03c1d3d..ba59b69055 100644 --- a/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv +++ b/results/combined/merges_timed/englishtown/vertx-elasticsearch-service.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/heads/develop,93c7adc9b131682ead437c867f95a1fc354d3333,eccecd447573468cb83867a7c5406809de2693e5,24a5c26a6f40b32f5cf20211fb1d455e3b4653b1,,True,True,True,5,28,211,4,True,5,Tests_passed,a21eefb561e742d03b247b4615acf710d1682f58e717a30ea4582867de439653,True,Tests_passed,cb8916d8d080e09d6f8fd4a30789361c4b45076cb8d80f957ce88dd1c01ba711,True,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,e8d66bd8a9eef3f2c94342ea32d3657220b6bbe15dcc7c8dc55f362fa17a480d,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,2ec50b1c116d3ad08c3af6052f20d758f29cb6b2d36fc8daecbafdbfb6e13d64,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,dd1a5767a9152e7af2d46bed5522bd45113c0ef04ba0051395fa332d85e59eb6,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,0.008908271789550781,0.008632421493530273,0.008543014526367188,0.008413553237915039,0.008449316024780273,0.008656978607177734,0.008474349975585938,0.05517172813415527,0.17368555068969727,1.6673476696014404,0.6758959293365479,0.12747979164123535,0.1250135898590088,0.04804110527038574,0.04747748374938965,0.046607017517089844,0.046491146087646484,0.04783177375793457,0.11056017875671387,1.7323415279388428,0.04728364944458008,0.04864859580993652,0.03199458122253418,0.04823637008666992,0.031827688217163086 diff --git a/results/combined/merges_timed/entertailion/fling.csv b/results/combined/merges_timed/entertailion/fling.csv index 8c273f76f1..07f2256043 100644 --- a/results/combined/merges_timed/entertailion/fling.csv +++ b/results/combined/merges_timed/entertailion/fling.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,e008cc1cee6c339a24627ec7e00cc5be46f916ee,3704388c693a2a7cd10d61bb994c0874d003afcb,a4124a4ad635d102c78fcfce196713a40477586f,,True,True,True,5,73,394,3,True,5,Tests_passed,45da5b4c590a5bd7fee5cccca2d4dc1cef38870097cc473e0a841e0e45f1296f,True,Tests_passed,4ead57055be8e8c276029bd3541c33bcedb26fe32588dacbc5b49fffe1dc0ce1,True,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,1bd2fee6fb6cb8d155d14f04533f07ed4683a901d03820192e94a515414a7758,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,a00c977d01185d13230d2a2c8af05ad54cdb4065ffed5ce71dbd87cfc9b47497,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,0cc22e74004c23361c833fe5ff3d7f8b118d2f143f211b7db41ea6033f88443c,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,0.03547406196594238,0.037618398666381836,0.049985647201538086,0.04739117622375488,0.04063534736633301,0.04838275909423828,0.04060220718383789,0.2010505199432373,0.16841650009155273,2.0954716205596924,0.5666289329528809,0.15230321884155273,0.18190550804138184,0.08301210403442383,0.07862448692321777,0.0839684009552002,0.08482503890991211,0.07959532737731934,0.13440608978271484,2.046914577484131,0.0801401138305664,0.0741281509399414,0.07839274406433105,0.08021044731140137,0.08120894432067871 diff --git a/results/combined/merges_timed/erudika/para.csv b/results/combined/merges_timed/erudika/para.csv index d57b329355..6d83f19879 100644 --- a/results/combined/merges_timed/erudika/para.csv +++ b/results/combined/merges_timed/erudika/para.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,f23fd5855ed00257a78a115e484beec4b32bc3b5,5f848ab478afd2ee38622ecea00733f5dd70a1c8,ebb0518a083d5b7b53e8d1d86002c44f51a77fa2,,True,True,True,15,136,1141,2,True,15,Tests_passed,1a73eadb2df66b4bc004f3e0ba73027b5e977352eaaf7ec9fc5176838fb7d10b,True,Tests_passed,f90e628f0b86e045d6cdac71f155eeb351945fb2e67fa57e395e0c32daccb019,True,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_failed,89fdeecff3d137e710d0b60f6d6fdc50e7ba71ed6a8217d5df05b12ebdca53ff,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,0.020289897918701172,0.020859479904174805,0.025948524475097656,0.02567744255065918,0.025193214416503906,0.012307405471801758,0.025480985641479492,0.05709505081176758,0.07608604431152344,1.0855302810668945,0.8454701900482178,0.09559512138366699,0.15177583694458008,0.0504302978515625,0.07160568237304688,0.06767868995666504,0.06844878196716309,0.0686647891998291,0.11063408851623535,1.1073989868164062,0.046263694763183594,0.06035637855529785,0.056555986404418945,0.0590665340423584,0.06049346923828125 diff --git a/results/combined/merges_timed/esapi/esapi-java-legacy.csv b/results/combined/merges_timed/esapi/esapi-java-legacy.csv index af36cf713f..d2c9bc8dda 100644 --- a/results/combined/merges_timed/esapi/esapi-java-legacy.csv +++ b/results/combined/merges_timed/esapi/esapi-java-legacy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 30,refs/heads/develop,0b0da0ce6155e38a0e4fc469b6911107e399b60c,77c5f26cbbf28c6c963cbabd4b1163ebaeed3a70,6452cc9eb369a4b8068a1327632606a1343749d2,,True,True,True,19,106,607,6,True,19,Tests_passed,948738cf294ffc4276624b0a05a6d1e5fffc3b987c58b9b63fa5d829690d70f5,True,Tests_passed,83f61fce67d88c5b88d57799fdb0fd310e491f5e87792e568c956d0f376e8c8c,True,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,807b5a9b20265f3e7134aa64bce423b1f473da9c52bb350c65bdaa246c80f873,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df649ecf3a556fc3b5ca759601209cb429b37dcd0f43074c232591470b19f0ab,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,0.07089614868164062,0.058800458908081055,0.058240652084350586,0.06850051879882812,0.04885530471801758,0.06300234794616699,0.045317649841308594,0.4621601104736328,0.3727247714996338,0.047197580337524414,0.76316237449646,0.21774005889892578,0.1652538776397705,0.07658672332763672,0.07851362228393555,0.07504653930664062,0.07552242279052734,0.07966327667236328,0.1809711456298828,0.08846092224121094,0.07398653030395508,0.07616519927978516,0.051004886627197266,0.07416248321533203,0.05097150802612305 diff --git a/results/combined/merges_timed/eskatos/asadmin.csv b/results/combined/merges_timed/eskatos/asadmin.csv index fffc4a2f56..b922a22546 100644 --- a/results/combined/merges_timed/eskatos/asadmin.csv +++ b/results/combined/merges_timed/eskatos/asadmin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,6fb154963dfd021025038412792ef1dcc5399017,9c8a4553a27a6f727e039fbddd1cf9d32c173368,0383186b3106763ba62c548ef170fc26149839c4,,True,True,Tests_passed,1ac65393efa5367508a3c7738d8dd00f346a52724489864da6d80e2893f9b065,True,34,73,669,4,True,Tests_passed,14faa9c7f724b81054087c29a30b315459988d6c6c44d10079bd3a1c0d1dce4d,True,34,True,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,0d392409d46e8102560a03f2319a08e58a8eded186b836a18ba5553539888a6e,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_timedout,,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,1992e2bc12fb16b96b495a11fa86d0d094a9b781f2ff2f897cd6f0378681459c,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,0.010306835174560547,0.010768413543701172,0.010613441467285156,0.010736703872680664,0.010295391082763672,0.010524749755859375,0.010573863983154297,0.060010671615600586,0.17683839797973633,1.5466187000274658,-1.0,0.13429832458496094,0.12980985641479492,0.0507357120513916,0.052060842514038086,0.05070662498474121,0.04924440383911133,0.05201315879821777,0.11764931678771973,1.6320254802703857,0.05018949508666992,0.052100181579589844,0.03627443313598633,0.05208301544189453,0.03469371795654297 diff --git a/results/combined/merges_timed/esotericsoftware/kryo.csv b/results/combined/merges_timed/esotericsoftware/kryo.csv index 2d7cd8f7d4..d82ddb4334 100644 --- a/results/combined/merges_timed/esotericsoftware/kryo.csv +++ b/results/combined/merges_timed/esotericsoftware/kryo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,True,True,Tests_passed,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,True,18,54,1905,3,True,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,True,18,True,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,0.04732084274291992,0.05895113945007324,0.014632940292358398,0.0582273006439209,0.032381296157836914,0.014791727066040039,0.06124591827392578,0.2399277687072754,0.14506936073303223,3.589958667755127,0.797903299331665,0.2250831127166748,0.28850317001342773,0.15564513206481934,0.11891818046569824,0.15902280807495117,0.15054798126220703,0.15204834938049316,0.1795496940612793,3.399064779281616,0.1467585563659668,0.13325881958007812,0.1288444995880127,0.14927005767822266,0.13853001594543457 diff --git a/results/combined/merges_timed/evil-co/nbt-lib.csv b/results/combined/merges_timed/evil-co/nbt-lib.csv index 4cf04ac72c..c1308842ce 100644 --- a/results/combined/merges_timed/evil-co/nbt-lib.csv +++ b/results/combined/merges_timed/evil-co/nbt-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,637ae9e87d7feae16db8dcb39b5d40ada9950583,5114126caf920b3f91194892f3812cc1de4d71a7,06e34c4a95cf30b65feaaf9c3803a9071af42180,,True,True,Tests_passed,a6eccb8f88bbffcd341121c2fa8103534e9e9268e97a1b114ac1119fdc3a9cbd,True,8,11,341,2,True,Tests_passed,da025bd2ac4a52ad189aee1eeedb6c4573cc9f9808490d42f95f2aa37321e16e,True,8,True,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_failed,c71d20d10427343d5e5ebe6cca51e30234b820e6130fe44bbd586b7d26580a31,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,0.041155338287353516,0.04185056686401367,0.0459592342376709,0.04661083221435547,0.039780616760253906,0.04795503616333008,0.04665517807006836,0.1615607738494873,0.10815644264221191,0.6474430561065674,0.28359246253967285,0.06902813911437988,0.12292957305908203,0.03918743133544922,0.03931713104248047,0.03917074203491211,0.03879952430725098,0.03949904441833496,0.07168817520141602,0.6501724720001221,0.039066314697265625,0.03909134864807129,0.02869415283203125,0.038518667221069336,0.028110504150390625 diff --git a/results/combined/merges_timed/evolute-pt/dbtransfer.csv b/results/combined/merges_timed/evolute-pt/dbtransfer.csv index 885c2399c4..21bc6fcfdb 100644 --- a/results/combined/merges_timed/evolute-pt/dbtransfer.csv +++ b/results/combined/merges_timed/evolute-pt/dbtransfer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/remotes/origin/pull/14,4f86b711a6e540041abc183eabc4592e211cfcf8,b1a2e5cb5c94b95c6604d080ac3471fb15305b4a,b660bb89c629f2ece0737128ea94e140ec06fbc0,,True,False,True,4,7,21,2,True,4,Tests_passed,a71352f49d3419dab667d2e40e17c40a532d28f2e06bdd32bb17e824ef6caa3e,True,Tests_passed,184660a7f31b1e22fad3e93100deff29b2ed6a5a730cd29fbdd3eaf9c3875e26,True,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_failed,27200d30760a0b6929e7755315524627147a4e1c0b8eaaa560ce7e774c981cd0,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,0.03874540328979492,0.039444923400878906,0.04325580596923828,0.047277212142944336,0.04201626777648926,0.04303312301635742,0.053762197494506836,0.16734933853149414,0.11022281646728516,0.7466912269592285,0.3116888999938965,0.07781314849853516,0.13323259353637695,0.0457463264465332,0.0479273796081543,0.045128822326660156,0.04572033882141113,0.046355485916137695,0.07965397834777832,0.7518303394317627,0.043768882751464844,0.04362988471984863,0.03443551063537598,0.04501986503601074,0.034494876861572266 diff --git a/results/combined/merges_timed/facebook/jcommon.csv b/results/combined/merges_timed/facebook/jcommon.csv index 525b31d691..5649b0766f 100644 --- a/results/combined/merges_timed/facebook/jcommon.csv +++ b/results/combined/merges_timed/facebook/jcommon.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,a6c08d81e3186d83a020f84b01b134fc48f3822a,11b32f0c28057eedf224655fa2019b0c3fb19536,6ccd11e9354e9c0ea8f9f329e658a69f1af5a610,,True,False,True,2,1,15,56,True,56,Tests_passed,5468675109d3dfa10e88e500bc51a153c17161b39f5b41e9dbd65f2c606d8303,True,Tests_passed,384911a66b6903164e7bfc2476520ea51a4bcf77ac3e2b1cbb65bbbecd4a58a3,True,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,34b0252300999fa6857f47c7d59a966a031b61a8f9fbf03b9fc612aaadc3f9db,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,393c6952d1b8f7123bf8886830538d2d803ffbea86ca376ea51b75715e701853,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,9c50931100d9fa906210b5024fe4619638b5119368458a853b7275de0bdcc889,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,0.0442960262298584,0.0422205924987793,0.04870772361755371,0.04498291015625,0.04713320732116699,0.041602373123168945,0.04898428916931152,0.18981480598449707,0.11458325386047363,0.37732839584350586,0.4186391830444336,0.06814169883728027,0.11194920539855957,0.033196210861206055,0.032312870025634766,0.032112836837768555,0.03270578384399414,0.03299713134765625,0.06624794006347656,0.35484790802001953,0.03249406814575195,0.03278636932373047,0.031186342239379883,0.03203010559082031,0.030822038650512695 diff --git a/results/combined/merges_timed/farin/jcloisterzone.csv b/results/combined/merges_timed/farin/jcloisterzone.csv index afcff494e0..c772535335 100644 --- a/results/combined/merges_timed/farin/jcloisterzone.csv +++ b/results/combined/merges_timed/farin/jcloisterzone.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 162,refs/remotes/origin/pull/424,692611d036c53048b40f0ae2e2dfc355fc6857d5,f300fd0e0191b01f896285e63d3e2cb20365b462,7b111ccf25aec8ad2ffa2c9aa38e029afb307c67,,True,True,True,162,629,3476,7,True,162,Tests_passed,922784f72bcff874542607f5a4edfc07a3be2fa5541f0c6b5b5c6bae508dc338,True,Tests_passed,c41f92820892fd717eac1eb9a78e25cf063ef79c40a4b86980d2189f70a25940,True,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,654798721271c96a6790e9e71be8f11031403c1058bb4f4a23097e0502912c79,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,183febe649f23b8901fb4d8a8f0b7f966501ed4ca03edd2b4d7b2c5c27067541,Merge_failed,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,e01a0849c459a33108e4febafdae718dd421d6cafae5cedf7b69a1ecb0a5c5e6,Tests_failed,4e67774444d7d8766b648f66b9f952d503d901ef756efc840fb0c19f195b0c7d,Merge_failed,d77caf5d78ae728513560fb3846d0e7504aee147ffbf31533ce162a4b0d28c54,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,654798721271c96a6790e9e71be8f11031403c1058bb4f4a23097e0502912c79,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,cb84c151c24bb548b27a4ea3214d8fcaae4b46f2f660a014f3a27450eedf5888,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,fc69399050c86fe95eca7880dca26644055f92358d3f16915b9edf3461cba334,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,Merge_failed,08ab6ec33aa68fe4a22b6499c6a4400cc47c1e310fda7e59f9bb80e598dd65f7,0.03763532638549805,0.04555106163024902,0.0268862247467041,0.04899787902832031,0.03435039520263672,0.058196067810058594,0.040975332260131836,0.5269646644592285,0.3893575668334961,0.04566621780395508,3.462366819381714,0.2946324348449707,0.17682909965515137,0.0994269847869873,0.11222290992736816,0.11346983909606934,0.09358692169189453,0.0916438102722168,0.21201133728027344,0.10536766052246094,0.11244010925292969,0.10936546325683594,0.09695744514465332,0.09037303924560547,0.06767034530639648 diff --git a/results/combined/merges_timed/fasseg/exp4j.csv b/results/combined/merges_timed/fasseg/exp4j.csv index 2c59ecd3e5..cd1ab5d502 100644 --- a/results/combined/merges_timed/fasseg/exp4j.csv +++ b/results/combined/merges_timed/fasseg/exp4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,15b49d5d40377b24b54bee4a471f08c883e766d2,fbb3fbee150c17f024f199f5d9e2af4fa20703d4,3bada4e6c2bf4d0ebff48bfadd83af396b08696e,,True,True,Tests_passed,f590985f298f0dd963d16428e619bd365719c4c4cd11f5334a4b6be0614a206c,True,5,5,211,2,True,Tests_passed,f523669315bc819e4dc25fe4c1d51d9ada4748303b60a3ab186be5500748adb0,True,5,True,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_failed,6bf5f44a2d424d6ef00961200ea1c12b9dfed6d54aa2cbc5c0bccd6049c38cc6,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,0.03407907485961914,0.03773760795593262,0.041219472885131836,0.045870304107666016,0.04759716987609863,0.04812335968017578,0.04000091552734375,0.16980814933776855,0.1086575984954834,0.8141613006591797,0.6661968231201172,0.07283663749694824,0.12810945510864258,0.04151344299316406,0.04349803924560547,0.04214215278625488,0.04261374473571777,0.04275846481323242,0.07506847381591797,0.7955470085144043,0.040093183517456055,0.04096865653991699,0.03157305717468262,0.04166674613952637,0.031177997589111328 diff --git a/results/combined/merges_timed/fasterxml/aalto-xml.csv b/results/combined/merges_timed/fasterxml/aalto-xml.csv index 336e5b8d33..d30c37ab12 100644 --- a/results/combined/merges_timed/fasterxml/aalto-xml.csv +++ b/results/combined/merges_timed/fasterxml/aalto-xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,True,True,Tests_passed,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,True,58,697,15326,3,True,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,True,58,True,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_failed,5059c1ebe34124da36ed059290398228c9f4121027adda25c8bff0c219ebbb0f,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,0.052812814712524414,0.045949697494506836,0.04802393913269043,0.04325723648071289,0.05816173553466797,0.04066300392150879,0.0443880558013916,0.23908758163452148,0.17162108421325684,3.8509085178375244,3.677912473678589,0.15398287773132324,0.18669438362121582,0.07783794403076172,0.09073209762573242,0.09488248825073242,0.07847356796264648,0.09536457061767578,0.1592404842376709,3.521713972091675,0.08739709854125977,0.08204889297485352,0.04849576950073242,0.0805974006652832,0.05151844024658203 diff --git a/results/combined/merges_timed/fasterxml/jackson-annotations.csv b/results/combined/merges_timed/fasterxml/jackson-annotations.csv index d352df4dd9..31be9c2f1e 100644 --- a/results/combined/merges_timed/fasterxml/jackson-annotations.csv +++ b/results/combined/merges_timed/fasterxml/jackson-annotations.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,Tests_passed,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,True,6,21,194,3,True,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,True,6,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Merge_timedout,,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,0.010640382766723633,0.01096796989440918,0.011872529983520508,0.011841773986816406,0.011618614196777344,0.011550426483154297,0.011851072311401367,0.05150318145751953,0.1224527359008789,1.7738518714904785,-1.0,0.09926962852478027,0.1381702423095703,0.04951667785644531,0.0485076904296875,0.04868483543395996,0.04942464828491211,0.04872918128967285,0.09864592552185059,1.5884687900543213,0.04958462715148926,0.049788713455200195,0.030115127563476562,0.048790693283081055,0.029807567596435547 diff --git a/results/combined/merges_timed/fasterxml/jackson-core.csv b/results/combined/merges_timed/fasterxml/jackson-core.csv index d252048f30..091de88539 100644 --- a/results/combined/merges_timed/fasterxml/jackson-core.csv +++ b/results/combined/merges_timed/fasterxml/jackson-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 473,refs/remotes/origin/master,5b91c61a84864ef5e54e6143503fd85dad25a794,36dc9e8e50a91a37252dba924a1524a9bfee7418,d5673d2e9ffa1357bad7bc3665051245447a47ce,,True,True,Tests_passed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,True,398,5131,45831.0,2,True,Tests_passed,f77dd6121cd4fed9400db3247faa88a8d0ba19bee20f21e1387950cf257deab9,True,398,True,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,72225eaf690ef5b71ec92037d762110fa8acba957086028b7567648f7dea8893,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,Merge_failed,c9d6603f2a30deeae6b56fd7b1267f26bf97adac0275a5495baacd82c1063f83,0.05623579025268555,0.0497894287109375,0.11711692810058594,0.12558984756469727,0.1167449951171875,0.12534213066101074,0.11791825294494629,0.09070348739624023,0.05678963661193848,0.060007333755493164,10.814139366149902,0.16219091415405273,0.24884819984436035,0.21058940887451172,0.21073198318481445,0.21361637115478516,0.2052905559539795,0.2121436595916748,0.17541170120239258,0.17406773567199707,0.13942837715148926,0.14357781410217285,0.10826253890991211,0.1427757740020752,0.09793877601623535 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv index e501b02a6e..36ae975d68 100644 --- a/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv +++ b/results/combined/merges_timed/fasterxml/jackson-dataformat-avro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,8a73a14551e402c3993e2ecd2c690bf54c5e2134,a893c4c717b1e36e2d29ea61c96d8e7a159298bc,5ec8c0022a993aeaa66f992d59f7578225111410,,True,True,True,9,48,251,5,True,10,Tests_passed,9162c70845c55c9e4a78b2f48740e15cda68591c4ba2858dae89b731c87e16f1,True,Tests_passed,a94f18403d255016df80f52abb023e38b18deb3f07fcdee3a3608bc51353ffdb,True,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,f9d6021a68f179b99ab2ba6964576393b7350df48818911d477af5744e3f21d3,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,d44c7fc8b3cd2a645685592547c781a5f6cfa8954134e03b51ac5dd56bbad609,Merge_failed,33ee68a1168f928c7c5ed4cda524cd4a18ee1be7b640b27781c84a1ef5f5ce34,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,31405568cf0fa0931430f9c29fd495fceead39d0d3c1d68ddce8c7f614164f77,Merge_failed,d42eb8dc99b04544c26b423b00a7dabd49d62e0ade9d03570f06510902eaf63a,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,0.04259347915649414,0.04248166084289551,0.04180598258972168,0.04625368118286133,0.04710721969604492,0.04637885093688965,0.04692697525024414,0.2886543273925781,0.22918128967285156,0.5585448741912842,0.4887368679046631,0.12852954864501953,0.13081574440002441,0.04642796516418457,0.047812461853027344,0.04735136032104492,0.04684162139892578,0.04759788513183594,0.11008954048156738,0.5682041645050049,0.04750466346740723,0.047002553939819336,0.046929121017456055,0.04732012748718262,0.046215057373046875 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv index 868b8ab86e..27467b82bf 100644 --- a/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv +++ b/results/combined/merges_timed/fasterxml/jackson-dataformat-cbor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,a671acb0bbd66df72cb8acd9885801b47063dd75,c3979dd1f7ac324d66110da1447e9b27bc8b6ad6,0caaef68fc59d26cd32a6f4a2395f54f63630485,,True,True,Tests_passed,870c680dfaa9fdf6988d23aaf3ad22c63aab7cedefc74e2ae081a11c7b3b2519,True,3,5,92,2,True,Tests_passed,3f48bed992736c6a5c121660c706e069a230dcfa7def2eefa1f716b3af13aaab,True,3,True,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_failed,925e9998e376d8d51638c279317d7402f0a228dc3c8cd214729ea0376df950bb,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,0.046172380447387695,0.04979991912841797,0.030727386474609375,0.036096811294555664,0.06687474250793457,0.05330061912536621,0.03483128547668457,0.1909496784210205,0.09320974349975586,1.6412174701690674,0.49863290786743164,0.1012728214263916,0.16446280479431152,0.0700681209564209,0.07264399528503418,0.06943583488464355,0.0701756477355957,0.06723618507385254,0.10875177383422852,1.5058457851409912,0.06230735778808594,0.06757330894470215,0.0562443733215332,0.06110644340515137,0.054551124572753906 diff --git a/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv b/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv index c5908a9381..4618930b7f 100644 --- a/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv +++ b/results/combined/merges_timed/fasterxml/jackson-dataformat-xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 140,refs/heads/2.17,fc385bcdf62f4f3d6cd64470fad796be36bcd449,0d30430d78918a3e01bec62a5192a584cc56ce88,09db8e1ce1d2ecf0ad4ad4b0d8335999f42577be,,True,True,True,17.0,72,409.0,4,True,17,Tests_passed,3119c49e4ec878189770b999aa0bf5f6f53ba26b2dfcb0bce391d3538e69bf40,True,Tests_passed,9588420cd4abc570bec4f2c72bf54597076d6efa6c9c796e25f877ae5fec74ad,True,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4747bc5022457ea9769707ed4704badf2abae9f170fe5f1e1e12aff581a47bbf,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,cbfe6c457830cde5aeedf5e3febb39e789edaf8dbae26f906b9728b3adbec254,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,0.04932236671447754,0.03835940361022949,0.03412175178527832,0.05112648010253906,0.039725303649902344,0.021155834197998047,0.049341678619384766,0.2911391258239746,0.23578786849975586,0.04774022102355957,0.6128988265991211,0.13940930366516113,0.1377871036529541,0.05761289596557617,0.059275150299072266,0.058069705963134766,0.05763506889343262,0.05630850791931152,0.12506890296936035,0.0705251693725586,0.055852651596069336,0.05596280097961426,0.03999781608581543,0.05599498748779297,0.03923845291137695 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv index 44c0b45568..a01788a603 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-guava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,d99575655de8749879e2a231027eca2f15996bf4,3eb649f103eaa43cbb0428acb7bbf275f1207133,4399c5d04f3e301c1a48ddbd8ac54539b322ecf9,,True,True,True,21,108,643,4,True,21,Tests_passed,59893b28cfe4df29206b4679624a3fbfc8b0ddcdbf1c419be09eb1b78753de7d,True,Tests_passed,37f0be32b4edfd3256b3b82b6ee7d07ea1dcdd5056a62c6d9fef948b20e2bb74,True,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,ccc4c71e749ba0129762b534fbf79f0261569de63df8cb04b0d52ba045c19ea9,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,18c002ffca48c98d13402c43414730ef5509c3fc097bae1ca6fc2505d5a63f1b,Merge_failed,66d37469133934af734cb3a85f41f3a0febbc8a8a1d66c8c2602d8943ea65956,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,f371597b2d347c8d75d297f19720fc307866dd07a1bd1fc74e0f1b067556b5ce,Merge_failed,ff7695218b12a224217ab788b7fb0f2263da723390d742647324f9d28c5071e8,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,0.011081457138061523,0.011309623718261719,0.012115478515625,0.012458324432373047,0.01241302490234375,0.01369023323059082,0.015857458114624023,0.08232736587524414,0.18680524826049805,0.7247321605682373,0.5916352272033691,0.13385772705078125,0.13033723831176758,0.05027627944946289,0.0516963005065918,0.05244326591491699,0.051752328872680664,0.050873517990112305,0.11503481864929199,0.7082619667053223,0.050246238708496094,0.051732540130615234,0.0412752628326416,0.05155801773071289,0.0418543815612793 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv index 03f10a1af9..87270a326b 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-hibernate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 52,refs/heads/master,ec355d58fef047aba272302f7b8ed876a648c8d2,d2652d9386e6e9caddc4dda60c8334ebc17b8473,fc4ab3f3618c09dab8bd008eb50d867ebf565c64,,True,True,True,32,169,1289,9,True,32,Tests_passed,ef21352311ddeda5a68c679e599ee6558780a893cde3d21f70ee157f96323f2b,True,Tests_passed,8f3435e16361464351727dbfb96852c0f304aff3c363d5374463cd43a9a5b776,True,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,9d3ad5531196a295c127a27050e1e7f8d0dc714954d79f233f34a68ec133748e,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,79eb2a3f427305e7cd17f9f7ed5a9d4279e7f7a4c429e7e90caee1d9e628c3fc,Merge_failed,952bff311429b8e31991a9887a4d7d3009af781e4e79d6692a99b8eacf9f7022,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,19c2eaf92802bb3c65f37ef9177468e8490d28928a39c9a5898f845de32a0ce8,Merge_failed,7f1a99949247fb66ff50b71835ba7515a48f7d1802421f1afe5b7939c2c30ba1,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,0.04284214973449707,0.059844017028808594,0.046827077865600586,0.03822612762451172,0.03600645065307617,0.04337143898010254,0.05330395698547363,0.6151843070983887,0.537407398223877,1.913869857788086,0.5629863739013672,0.31697607040405273,0.1848297119140625,0.09581780433654785,0.09819722175598145,0.09617829322814941,0.09494900703430176,0.09702444076538086,0.23970437049865723,1.9394950866699219,0.09402656555175781,0.09859991073608398,0.08968782424926758,0.09617114067077637,0.08976435661315918 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv index 09da7c2008..4c3b4c267f 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-joda.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 59,refs/heads/2.17,f5cad0fe66ab6090c676f778acb305e8dd6e87ec,db7ba1a4007f49abe9c3675e2ad8c116380cd8af,88439bea90371817c81e9a0f4bb71e14f3366c3d,,True,True,True,18,20,70,3,True,18,Tests_passed,2b230a38089e5be4d7fe9122730070748e0c68c98ef8bedcc27c5dc41863c448,True,Tests_passed,1a8fb7623fb2a22ba8eb2e41bca5b5bc0e978d3a57fecedad02e27f108e5166f,True,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,5d9504509f2e11c35c8e0881e36b97488cf1eeea38948bd188999b9db790b5d6,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,33a66a6a8e65fe95658e32ae85c974e8e5cd7ad939727833470ce436d0f57b23,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,287af51b82e642ad9dcdfdddec7dc8fdbc40fa4314c4078f167ff68826733c0b,Merge_failed,418bc44f9419536545d1c598924055bd6f537374140f100c0b35e89dc2b3d888,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,0.031961679458618164,0.042923927307128906,0.03773808479309082,0.04298853874206543,0.039108991622924805,0.0396428108215332,0.032364845275878906,0.23830366134643555,0.16745233535766602,0.5437402725219727,0.3433964252471924,0.09742617607116699,0.12702655792236328,0.04371762275695801,0.043869972229003906,0.04171276092529297,0.042368412017822266,0.041733741760253906,0.09152030944824219,0.5608808994293213,0.04267287254333496,0.04253673553466797,0.034468889236450195,0.042092084884643555,0.034485816955566406 diff --git a/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv b/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv index eba8a290b7..29252d4466 100644 --- a/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv +++ b/results/combined/merges_timed/fasterxml/jackson-datatype-jsr310.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 33,refs/heads/master,dedccf4c3baa8d6d7aed9423504ca1087302483b,af5a5ba93758ff328e2c11f9712f40deff7eb095,bffc44b7f9a039fe2776850e320c8dcfe1ed1fd6,,True,True,True,46,92,2216,2,True,46,Tests_passed,9a1b4bff4524f1a5dccc4aa69745209770e73c621cc13e4196b9a93da7ef5d1a,True,Tests_passed,d866e15d67a3c0c158d2feb92399a64c99ce0897847ec56dc12cd641759f74be,True,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,d93823422600c76dcee87fab803749c20d32e334cd32eba0365000c4ab010c33,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,ad04c66d4229b25a90113729d9a43bf412995de2d0258c47574ac61180e72a5f,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,8934e39154ae9b6cbbaec1041df0d42e9d2d2e9b10bcb2520c40183e9ec7f15f,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,0.04118657112121582,0.04385638236999512,0.0443117618560791,0.04902958869934082,0.05324602127075195,0.047460079193115234,0.04049563407897949,0.17317843437194824,0.12331986427307129,0.7876060009002686,0.7045741081237793,0.07478046417236328,0.11710524559020996,0.03830695152282715,0.039501190185546875,0.037210702896118164,0.03938698768615723,0.03943061828613281,0.07153129577636719,0.7821269035339355,0.03947043418884277,0.03930091857910156,0.037026166915893555,0.03954815864562988,0.03815197944641113 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv b/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv index 962c2f2ac6..5a3b762e96 100644 --- a/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv +++ b/results/combined/merges_timed/fasterxml/jackson-module-afterburner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,cf754766cc0776745ea9bb9bd7fd5d18d58f67ce,bda2f9b194e7b5e0d1f001e1aaf951504f96f1c9,3f73cf73874dca6b827382c13078890bd0dd86c7,,True,True,True,46,239,1565,2,True,46,Tests_passed,2550d26473506dbecde5f79aff09f9a9d20b1391b6d9b7694137abca35877ea8,True,Tests_passed,cffbc0103e9800c62680ebd96f61171caeda23facbf7f4ad829dd781ad855458,True,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,0.026530027389526367,0.02797102928161621,0.047893524169921875,0.04306316375732422,0.026084184646606445,0.03822731971740723,0.033023834228515625,0.12133049964904785,0.09550786018371582,0.7614293098449707,-1.0,0.11097145080566406,0.17057347297668457,0.07312870025634766,0.07410907745361328,0.07380914688110352,0.07113456726074219,0.07270026206970215,0.11441707611083984,0.7373127937316895,0.06902408599853516,0.06494021415710449,0.06019711494445801,0.06662821769714355,0.05808377265930176 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv b/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv index d5a985e4ae..455da224bd 100644 --- a/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv +++ b/results/combined/merges_timed/fasterxml/jackson-module-jaxb-annotations.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/2.8,e6d155829ae3829ad4ab08939671bc78aed86db3,cf5a4220e89cde4b4a71f7431dc97a918c205654,be331f8e2a40e0aa5bb058e63a05fdddf4f88232,,True,True,True,7,25,187,4,True,7,Tests_passed,e5c740aca7bbabab5e43bc941179d316fd53a50764f491823344323d9bf2a58e,True,Tests_passed,0637219c19337a52f0d08bb3bfd4e0301d3221f981410f2b5840c4821184d610,True,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,477286331842ef19072a9ec478fc8f3f57263ceb43d3094d1093732d2492b31c,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,0f42a9ff32490c5fe6f04f1e18615a34a0a144faf1120666addacc55b293febc,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,0.04333186149597168,0.0390622615814209,0.043443918228149414,0.04792356491088867,0.05138134956359863,0.04775261878967285,0.04590249061584473,0.29018092155456543,0.23726630210876465,0.048056840896606445,0.4608650207519531,0.1388404369354248,0.14179587364196777,0.05132126808166504,0.05346250534057617,0.05358314514160156,0.051781415939331055,0.0524287223815918,0.11949491500854492,0.06525874137878418,0.0514681339263916,0.05201244354248047,0.035840511322021484,0.051882028579711914,0.03579425811767578 diff --git a/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv b/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv index 3f2e7315dc..52bd588fef 100644 --- a/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv +++ b/results/combined/merges_timed/fasterxml/jackson-module-mrbean.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,9e3869a0b016bf011f31ea195e628ae7e1223a1e,6479b6edc0b5a9633b4b811a4e44a9bb6dc6190d,8bb0db5f44968c24a61fbf7e2306daf15c2a990d,,True,True,True,5,10,97,2,True,5,Tests_passed,f2c40be298c72a6ed9ddc06f0497517212f20caf48b62e233318afac29106c07,True,Tests_passed,05e7a888ae08f5534a401210cd64c10e5776de1dabf7519b74d4f4e8a4b7cc4b,True,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_failed,ac31eb4d908ff4b5bbd1761719d9cf9233f416136a684e34da450ee6aff66be9,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,0.04042172431945801,0.04650521278381348,0.04604792594909668,0.04858827590942383,0.04598069190979004,0.03937888145446777,0.04473090171813965,0.16242265701293945,0.11161923408508301,0.9362280368804932,0.33698177337646484,0.07004070281982422,0.12212395668029785,0.039385080337524414,0.03959798812866211,0.0388340950012207,0.03929400444030762,0.03889727592468262,0.07092452049255371,0.9253361225128174,0.03856849670410156,0.03997993469238281,0.027518272399902344,0.03835725784301758,0.027328014373779297 diff --git a/results/combined/merges_timed/feedzai/pdb.csv b/results/combined/merges_timed/feedzai/pdb.csv index b10c7be1dd..a81d93dbca 100644 --- a/results/combined/merges_timed/feedzai/pdb.csv +++ b/results/combined/merges_timed/feedzai/pdb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,011ba2e9425f5451db1da70cccfba32722de0eac,d626297e911d4770e18d5cd19c8260edbe70d8a5,1f1c20edee25d2785f036d51720a028e3ec3b565,,True,True,True,15,43,360,2,True,15,Tests_passed,86cd9e7ac57139b7ba419f4718d7af7c7246cf17aa51dbf884b11043e7cc7c7c,True,Tests_passed,a34ef601f7600e32a81c7131b2d414fe0cb90b88c0301195d54a6b6478034227,True,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,0.02088475227355957,0.021579980850219727,0.02626633644104004,0.026671171188354492,0.026197433471679688,0.0256955623626709,0.026264667510986328,0.057654380798339844,0.07651853561401367,2.069310188293457,1.4340622425079346,0.10530591011047363,0.17057442665100098,0.0709981918334961,0.05115342140197754,0.0733191967010498,0.07283568382263184,0.0692758560180664,0.11472463607788086,2.1447908878326416,0.05262017250061035,0.06885218620300293,0.05781388282775879,0.06186270713806152,0.05816793441772461 diff --git a/results/combined/merges_timed/fenixedu/fenixedu-academic.csv b/results/combined/merges_timed/fenixedu/fenixedu-academic.csv index 2bb213d375..6d907e3bc1 100644 --- a/results/combined/merges_timed/fenixedu/fenixedu-academic.csv +++ b/results/combined/merges_timed/fenixedu/fenixedu-academic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,0ebb833b3f09a28a19b06f2f137a2cbbd6080b78,8e69c9359a86a8b672dc97e17b053c94468c2736,ba82fa2ef5b9423d11833443e683b92f581c5438,,True,True,True,5,20,97.0,2,True,5,Tests_passed,6327a726a6c9736e5e15c6f241b94b4f31a6e6f69a85463970ab45980c53f733,True,Tests_passed,afd04356df09ebd82258a1709999e03578a6288e09641bcb92a00f301d6dcb6a,True,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,8ac3798ecede997434565324d5072d90aad3bd0f090502ac3af58bda2bdc00a7,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,Tests_failed,977b2850c1d7b199c558eedee3557318001fdf55e71e1ff1cc5dfe1d36900127,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,2e3009a7c7553804e2f8a50bfa7b0db76e3279fdd4f8d2f005a0aaf82674c89f,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,0.03125,0.03168606758117676,0.03946065902709961,0.039426565170288086,0.038818359375,0.0392913818359375,0.039374589920043945,0.1738288402557373,0.09198904037475586,0.03481101989746094,0.4179673194885254,0.1152496337890625,0.16297411918640137,0.07512640953063965,0.07419586181640625,0.07579708099365234,0.07542657852172852,0.07231807708740234,0.12866640090942383,0.09096527099609375,0.06304192543029785,0.06746411323547363,0.0688943862915039,0.06764054298400879,0.06733512878417969 diff --git a/results/combined/merges_timed/fernandezpablo85/scribe-java.csv b/results/combined/merges_timed/fernandezpablo85/scribe-java.csv index 9d8266555c..70a39c4dca 100644 --- a/results/combined/merges_timed/fernandezpablo85/scribe-java.csv +++ b/results/combined/merges_timed/fernandezpablo85/scribe-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.01896524429321289,0.019338607788085938,0.017484426498413086,0.024312734603881836,0.01756596565246582,0.023865938186645508,0.02378225326538086,0.05283164978027344,0.07503724098205566,0.9588253498077393,1.1883037090301514,0.09663081169128418,0.14896941184997559,0.05573105812072754,0.05610179901123047,0.06544733047485352,0.053511619567871094,0.06568098068237305,0.09393906593322754,1.0133681297302246,0.06100106239318848,0.053301095962524414,0.042162418365478516,0.06154632568359375,0.043125152587890625 diff --git a/results/combined/merges_timed/feroult/yawp.csv b/results/combined/merges_timed/feroult/yawp.csv index 0796c5df0e..9a5bde0e62 100644 --- a/results/combined/merges_timed/feroult/yawp.csv +++ b/results/combined/merges_timed/feroult/yawp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 108,refs/heads/master,141f79a8e9268d471b022f45d5482d5da4e75da7,160c4dc583e83ddaa8da540d2c270e93ac271bcc,652d630fd7efd74fa37071bf7249e5eb79224799,,True,True,Tests_passed,98925fde50d3097bbe3f55b588b7d8cc5e63ff3f6a3f04e5894870d32ac7f972,True,16,36,545,2,True,Tests_passed,b19174fde44da4862c195c2eb7dcc46329f7ac17c7fca781479a9e2b50bef6eb,True,16,True,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,9b37eaa5bf9106592e7aa9580328679255ec5520030241281fac34ec8da95888,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,9b37eaa5bf9106592e7aa9580328679255ec5520030241281fac34ec8da95888,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,Tests_failed,d2637c912e0bd135197109ad93a703d4982fda902b0bac42bc87517fc0cbd61d,0.04282069206237793,0.0395660400390625,0.05755352973937988,0.042516231536865234,0.04799008369445801,0.05429220199584961,0.04327106475830078,0.16130471229553223,0.11756277084350586,0.6326107978820801,0.4458904266357422,0.07311034202575684,0.1325359344482422,0.04551291465759277,0.04330563545227051,0.04357409477233887,0.04447007179260254,0.043532371520996094,0.07975387573242188,0.6087486743927002,0.04231429100036621,0.04209089279174805,0.03165078163146973,0.04312777519226074,0.03194737434387207 diff --git a/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv b/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv index d7236dd18b..755f7c16ae 100644 --- a/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv +++ b/results/combined/merges_timed/feuyeux/jax-rs2-atup.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,b05c8c331560c1ab4be5c43c20912dbaa3d93839,7da8cbd0d675798ef263ae8655827bb2abd93ede,8776ddbbff972b7a828cf087b1e5089640f3d090,,True,True,Tests_passed,db8ca669464eb0ae2b24297266e483b4759e0f39b6dd265f997c2f2af75cadc3,True,61,248,1253,17,True,Tests_passed,1314c746cc3c6e983d8b017760da4d5b83b440e82acc9bbc0a39e59eac7f7286,True,71,True,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,4582f043c8ab0f51f6e8923cbdfaa827add918e4be843c66034bfd689f149742,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,e3a61eef8df016d4aee66cf062bd68aeed4ce799e9ca63f071aa05d8bde9f914,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,93533125dc55460fa046f3f06fe9ba6dde57ce015bfbcb37bafbd056e681aba3,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,0.014391899108886719,0.014487981796264648,0.014081478118896484,0.014106035232543945,0.013503074645996094,0.013714075088500977,0.013663530349731445,0.1165616512298584,0.4714796543121338,4.386509656906128,0.6877727508544922,0.36223411560058594,0.1854569911956787,0.09490847587585449,0.09510183334350586,0.09398865699768066,0.09680628776550293,0.09563827514648438,0.24883103370666504,5.644754886627197,0.09715652465820312,0.09737968444824219,0.09573006629943848,0.09710550308227539,0.09060096740722656 diff --git a/results/combined/merges_timed/fex-team/fis-velocity-tools.csv b/results/combined/merges_timed/fex-team/fis-velocity-tools.csv index 1913172996..4aec70c7d7 100644 --- a/results/combined/merges_timed/fex-team/fis-velocity-tools.csv +++ b/results/combined/merges_timed/fex-team/fis-velocity-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/remotes/origin/pull/25,203daa57c2464ed7b348cf79a71c4e18ad29610a,f6c512bcca04ce3c4805d6998f81599fd314d848,ad06e07408c1bc9b31f597320399d53c4077b92b,,True,True,True,6,10,67,3,True,6,Tests_passed,f01110f2675603fba17aa7473a5da69047c68d399535a3a3e2d43edc97f83285,True,Tests_passed,0dcaf2e0568bed6e479652e0a3efb4c64f931c8c738b6f2cfb9fff25346895cc,True,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,811cfce7dc9171c2720b046db6239f4388e7ee566f1a49570f480d0f39eb48ea,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,2672c2f254200054cf85be631b353e844c77eaef566ca5a7342c9855a6c513d7,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,dc5abf7b92c66c3e8295c2c4674c8b98b88ba517b400db035bf890207b327fbd,Merge_failed,3b76eba51de804fa8ab5c74720a5d3f0ef966512647613075882815fa70f0713,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,0.0431668758392334,0.03911328315734863,0.04666328430175781,0.040508270263671875,0.03505349159240723,0.03635692596435547,0.043898582458496094,0.24208831787109375,0.1673743724822998,1.4311058521270752,0.3392043113708496,0.09921789169311523,0.12177753448486328,0.04282021522521973,0.04287409782409668,0.04319119453430176,0.04216313362121582,0.04300951957702637,0.09178423881530762,1.316267490386963,0.042658090591430664,0.04281306266784668,0.03346753120422363,0.04147005081176758,0.03416299819946289 diff --git a/results/combined/merges_timed/ffay/lanproxy.csv b/results/combined/merges_timed/ffay/lanproxy.csv index 2e3da7110c..fb7f12d4b7 100644 --- a/results/combined/merges_timed/ffay/lanproxy.csv +++ b/results/combined/merges_timed/ffay/lanproxy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,True,True,Tests_passed,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,True,4,7,22.0,2,True,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,True,4,True,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a4ffd56c32fd83e35aab0adf73bb0055ded766f6ee4fe16fa000a4983ceebc6d,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,50c832a6472b6834724947aa37d92a47c356e84f438b5e9db569de5784fd45b6,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,0.03339529037475586,0.008914470672607422,0.0300753116607666,0.009929895401000977,0.030555248260498047,0.028418302536010742,0.028081893920898438,0.12920570373535156,0.11230325698852539,0.6508784294128418,0.3140547275543213,0.1473095417022705,0.15638065338134766,0.09632468223571777,0.09550833702087402,0.10138726234436035,0.09630894660949707,0.09733819961547852,0.14240264892578125,0.6231656074523926,0.08557510375976562,0.08596634864807129,0.10191845893859863,0.08878374099731445,0.0331878662109375 diff --git a/results/combined/merges_timed/fiji/trackmate.csv b/results/combined/merges_timed/fiji/trackmate.csv index a2be1cd75d..4f9450c5c3 100644 --- a/results/combined/merges_timed/fiji/trackmate.csv +++ b/results/combined/merges_timed/fiji/trackmate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 48,refs/heads/master,31e749c77fd17fb77bb36433506765f44784035d,f5291051efe7a525211ef3072fd924485a2e2793,2733e4e2236984e2eb9e14aff6a79fb858282958,,True,True,Tests_passed,cfec539e9b563f5ae03a4a5cbfc8ccd594257b58bab47e069240447a7eeba03d,True,34,80,1085.0,37,True,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,True,64,True,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,0b8af7826d26a19a6ab8cac21897eef18265b6f4cbd10aa2d4f6393eb4800052,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,10ad5fba9849379dfd4c2a2fa3dec2260c7167820388775b11bc87f61eb8c37e,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,eae7dce39debd7aabb677864cf7fed590e29e590a691654975739b6d1faf54a5,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,0.0162050724029541,0.03240799903869629,0.037017107009887695,0.01653599739074707,0.016564130783081055,0.03695940971374512,0.01646900177001953,0.113739013671875,0.3358147144317627,5.9245216846466064,1.4702343940734863,0.2384650707244873,0.1678328514099121,0.08530783653259277,0.08543729782104492,0.08186602592468262,0.08385562896728516,0.08201313018798828,0.20142674446105957,6.045505523681641,0.08371710777282715,0.08355164527893066,0.06060957908630371,0.08211421966552734,0.059368133544921875 diff --git a/results/combined/merges_timed/fiji/trainable_segmentation.csv b/results/combined/merges_timed/fiji/trainable_segmentation.csv index b446132ce2..94cc58ceb6 100644 --- a/results/combined/merges_timed/fiji/trainable_segmentation.csv +++ b/results/combined/merges_timed/fiji/trainable_segmentation.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,5d0af9b16565e370fe5f8f53577f8c9cdea8304d,0bc26fa993ddb0b234a47ab147f74d3c55e25889,c7fccb4aa5101ab3c68532df85888a87659266d1,,True,True,True,4,7,10.0,2,True,4,Tests_passed,6f77a735a2ecfbfcf601669602412bc9de61c7cf7ffb15859f79e8bb22a8e49e,True,Tests_passed,e2f2e7d0e792a06528581939dba6d38179af6f26f02fdf606160f94da9f124bb,True,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_failed,2cb63ce01d49707a07f2f4c2dfb07add135ab61640eb12fb9283ba36c99b0d7f,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,0.040007591247558594,0.043044090270996094,0.06203603744506836,0.03345489501953125,0.08842730522155762,0.04157304763793945,0.04644155502319336,0.1655900478363037,0.1105647087097168,2.788839817047119,0.7849266529083252,0.11180973052978516,0.18355107307434082,0.07845044136047363,0.07849907875061035,0.08131289482116699,0.0792689323425293,0.08014273643493652,0.12269306182861328,2.6928882598876953,0.07264089584350586,0.07058382034301758,0.06937861442565918,0.07044291496276855,0.061116695404052734 diff --git a/results/combined/merges_timed/fincatto/nfe.csv b/results/combined/merges_timed/fincatto/nfe.csv index 2fce8670d3..934eb7e5f7 100644 --- a/results/combined/merges_timed/fincatto/nfe.csv +++ b/results/combined/merges_timed/fincatto/nfe.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 835,refs/remotes/origin/pull/707,5e7de4528cb818ec7091faf2b0ecb3c2b5ce2fbc,2546be2a39c864dc2c3e943ca41dacb87c353dae,9ea3d957c2b490adf3c090118879b16dc0771ff4,,True,True,True,73,302,1061,3,True,73,Tests_passed,246a868ce80bbe7b6d29433fda56c0511e826871f08f32a1fba19d8421b4bf50,True,Tests_passed,d05337513dd4940ef9a686d903012fed339c5498230f53dca15eb5844d0005c0,True,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_failed,31674d3e7c070c8195635d3ef6292bb5e8920e8119a9165e6e5f4e26c6e4d05d,Tests_failed,c814a105483ba74f140ebfddf9846683eeedb77f06adaaea9b92545b8051f30b,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_failed,31674d3e7c070c8195635d3ef6292bb5e8920e8119a9165e6e5f4e26c6e4d05d,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,Tests_passed,f7240bdb620385c757d8b58680f2f5955beed15ef8fb5494e1fe25f9853c55b5,0.08133625984191895,0.07203006744384766,0.07176566123962402,0.0739433765411377,0.07157540321350098,0.08571648597717285,0.060602664947509766,0.27538561820983887,0.16923141479492188,2.3378236293792725,9.018836736679077,0.1733100414276123,0.2194056510925293,0.10858488082885742,0.11031866073608398,0.10861063003540039,0.10876584053039551,0.1114351749420166,0.19201898574829102,2.2236456871032715,0.10626721382141113,0.10425090789794922,0.09095907211303711,0.10271620750427246,0.09253454208374023 diff --git a/results/combined/merges_timed/findwise/hydra.csv b/results/combined/merges_timed/findwise/hydra.csv index 48c5afb0bc..42bed2344b 100644 --- a/results/combined/merges_timed/findwise/hydra.csv +++ b/results/combined/merges_timed/findwise/hydra.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 227,refs/remotes/origin/pull/260,df0e251a4325ded7eb9baef25fb1c5cfd1be3fa5,837f3bd1c230fb42327721f55818b0a9a722afad,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,,True,True,True,37,175,2858.0,4,True,37,Tests_passed,e74cb388ba7be6229d3ed2a38c9eef7430917042d9a099e7ef1df811123715ca,True,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,True,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,a2376caa4a260e03b9f6b94798ea81cbd9a7b18fd4d186f76815435da0745be7,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,d252f4d5259001a032861383675b3cf7b28ce44a8a8535c82da4bb6ff9cdd30e,Merge_failed,c7d91362ed2b6cf33f83b4ea9ec2388f5524845d959d5941be2a3282b017f20c,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,8f47e6e350fd90a28ed371faca38e6c6da7c7ebdd6e03869726b20c06389013e,Merge_failed,10d2dcd821e40f97e3c1534b3b3dd5f327f3d8de1b6fd01eec548889305ac2ec,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,0.01828479766845703,0.018651723861694336,0.020518779754638672,0.02053093910217285,0.020628690719604492,0.012771844863891602,0.020766019821166992,0.0773475170135498,0.18241477012634277,0.48815369606018066,0.7691125869750977,0.13474655151367188,0.1497666835784912,0.06240105628967285,0.058414459228515625,0.06355738639831543,0.06168365478515625,0.0662693977355957,0.1378777027130127,0.542107105255127,0.05884599685668945,0.06171417236328125,0.05625271797180176,0.06372690200805664,0.04494285583496094 diff --git a/results/combined/merges_timed/finraos/jtaf-xcore.csv b/results/combined/merges_timed/finraos/jtaf-xcore.csv index 8efdd1a9bb..1765293b38 100644 --- a/results/combined/merges_timed/finraos/jtaf-xcore.csv +++ b/results/combined/merges_timed/finraos/jtaf-xcore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,9165bd1b60aa447fe40c713040bab897a9b2af1b,b6653fad72ff311b1f98414c4cc547be0e908ea2,e3545e4d595e66e89cdb0fa1003a4580179a8062,,True,True,True,125,584,3062,7,True,125,Tests_passed,01ee66c96d1b5e793eafa82f3c2d4f47a00f98c722dd479a7575e769f5229682,True,Tests_passed,a23c571e24986e8041bcfbf3acbc3087095e1ef9d45f7985558dcd4e0c8dcf92,True,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e14683a7cdd27a98d3ae63d05b0dcd1bef3f04d1e2cd2841cd3fe426ded266fd,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,262a52cbdfeb5afc79716602d956d89bfc526f195e617149ac94c71bb747d85c,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e085e1642123b209de091cba8b1832dbb8c5a3b8a15e296417875431ac1ae549,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,0.057038307189941406,0.061199188232421875,0.05856466293334961,0.05172395706176758,0.055234670639038086,0.05297589302062988,0.06425642967224121,0.4574577808380127,0.4263279438018799,4.292613983154297,0.9370927810668945,0.25690293312072754,0.16884779930114746,0.08383011817932129,0.0830988883972168,0.0826866626739502,0.08569693565368652,0.08246374130249023,0.20213818550109863,4.144349575042725,0.07966375350952148,0.08034753799438477,0.06611418724060059,0.08445954322814941,0.06777071952819824 diff --git a/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv b/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv index 39c320f132..30b39f87ad 100644 --- a/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv +++ b/results/combined/merges_timed/fit2cloud/qingcloud-api-java-wrapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,995c25dc87eca84847991a1217944c665e69a7e8,90602c52df891bdf08c0679cc136d4eb55fc0416,3535f3bd940d81277f5f4f4c0677664370f0ea5c,,True,True,True,12,21,370,2,True,12,Tests_passed,2e0a5ff305606962941f26297bd7e52c44df441b71a370d21cf81559923c5c1e,True,Tests_passed,807337aed3817eebcaa308e4df75bedeb82a9f5c67c2590e56392762b74238dd,True,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_failed,b623cfc2d946b38ad3df6b7080dc3b777699993bca702b7a65e17525c4f09e63,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,0.04877042770385742,0.05369281768798828,0.056404829025268555,0.04442739486694336,0.06088900566101074,0.04734516143798828,0.051497459411621094,0.1793515682220459,0.11716341972351074,2.0340962409973145,0.5926804542541504,0.08792328834533691,0.1299598217010498,0.060709476470947266,0.06252765655517578,0.04621124267578125,0.045056819915771484,0.06064796447753906,0.09929347038269043,1.8971168994903564,0.05272960662841797,0.0570836067199707,0.032862186431884766,0.05613446235656738,0.04560708999633789 diff --git a/results/combined/merges_timed/flaptor/indextank-java.csv b/results/combined/merges_timed/flaptor/indextank-java.csv index ccf344cf32..21f14a3664 100644 --- a/results/combined/merges_timed/flaptor/indextank-java.csv +++ b/results/combined/merges_timed/flaptor/indextank-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,d850b46a2e92c56a63af99d7380b11e97c36e3eb,78aa405f383682e8c44a2071f95f0c59651fee89,315857eb3fb000eed355fcac261719f1d46901cc,,True,True,Tests_passed,aee0e6024df8606fec1a4cd9996240adaafac8195f5175e037633d19c2e4557b,True,7,28,128,3,True,Tests_passed,0fddcefa37afb2540571f98ef5380c2dd5f9114995e4b2f63c106542f40c67dd,True,7,True,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_failed,51866e7309dca25e3038479870bd8c1d49555600a779f8640b603ca9b03355d3,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,0.010250568389892578,0.01089024543762207,0.011067867279052734,0.01158595085144043,0.011332273483276367,0.011399984359741211,0.010960578918457031,0.049878835678100586,0.12013792991638184,2.3593969345092773,0.5538647174835205,0.1092367172241211,0.13225388526916504,0.048894643783569336,0.04948306083679199,0.04877185821533203,0.04749751091003418,0.04769468307495117,0.0990900993347168,2.181608200073242,0.04867291450500488,0.04898691177368164,0.029563188552856445,0.04737687110900879,0.02946162223815918 diff --git a/results/combined/merges_timed/flaxsearch/luwak.csv b/results/combined/merges_timed/flaxsearch/luwak.csv index f6dd678f8b..4f0e6e716e 100644 --- a/results/combined/merges_timed/flaxsearch/luwak.csv +++ b/results/combined/merges_timed/flaxsearch/luwak.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 39,refs/heads/master,e546d26294eb9218d5e78c16023f8260817c4354,e662f80a31e44120ec627a025c2ec0c61102d3dd,8e75374da7ac1ee4ec9d31ab411a734c57c7a76a,,True,True,True,3,20,111.0,2,True,3,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,True,Tests_passed,a665e84c59c5fbf5d69a3b14b0132dad242a55605f62dec93f0fd8a4bd987e8f,True,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,5733838ac5cff0f0f61d84521ea8a34d98f6851e05942b93737ab5dfd9331710,Tests_failed,2b1191c5cb5409ba23f7596a2265769d6bb14ca8937aa05905910b67eff5661b,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,5733838ac5cff0f0f61d84521ea8a34d98f6851e05942b93737ab5dfd9331710,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,Tests_passed,720ee17316a87371c462e3f02516a19d112e1093ea9c5d58a218012a784b10a0,0.05418062210083008,0.05561327934265137,0.058199167251586914,0.05835461616516113,0.05897259712219238,0.058873653411865234,0.056307077407836914,0.18501615524291992,0.12123322486877441,0.8357665538787842,0.5041313171386719,0.07665014266967773,0.1372668743133545,0.046486854553222656,0.04621291160583496,0.04503655433654785,0.046018362045288086,0.04685854911804199,0.08340835571289062,0.7719902992248535,0.045941829681396484,0.0454866886138916,0.03415513038635254,0.045693159103393555,0.03434181213378906 diff --git a/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv b/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv index cb3c5ab1dd..44848f9dfc 100644 --- a/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv +++ b/results/combined/merges_timed/flipkart-incubator/zjsonpatch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/master,3a4c27d3b02856e9dbcbf917a764336d78883c73,2fb50aea7397183773b990af9634d166c392013c,9f367408ddade0f2cbb1f562975941da12a66f9f,,True,True,True,9,40,141,2,True,9,Tests_passed,d2807689bd36eca627ebdd7f02ebeee1c698eaf338af8882be4486ab8ecf7afc,True,Tests_passed,f0c803aba2709414567dbb301a52f53280070459dd93d888db95ecf7b55fbac4,True,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,0.0439152717590332,0.045224905014038086,0.04270029067993164,0.045945167541503906,0.05086159706115723,0.03948616981506348,0.04899024963378906,0.17835140228271484,0.1178288459777832,0.900381326675415,0.47690415382385254,0.06925415992736816,0.12943696975708008,0.0426783561706543,0.04189324378967285,0.041071176528930664,0.04166460037231445,0.04219532012939453,0.07531428337097168,0.9086883068084717,0.0413515567779541,0.04078793525695801,0.030836105346679688,0.04105353355407715,0.030869007110595703 diff --git a/results/combined/merges_timed/fluentlenium/fluentlenium.csv b/results/combined/merges_timed/fluentlenium/fluentlenium.csv index 90b412ec9a..2e9c538907 100644 --- a/results/combined/merges_timed/fluentlenium/fluentlenium.csv +++ b/results/combined/merges_timed/fluentlenium/fluentlenium.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 387,refs/heads/develop,b281c70c5e8cacf65e8c1ed6c6b05f92c52c433a,9aef806a9dff96134457c7b41a73b0492a1feab2,2907aac3efbe0e4824819671ad9f78e055be0fe8,,True,True,True,9,65,147,2,True,9,Tests_passed,b1d81758717ee68644a31175021c5b7a7066e880f60707f34c423a566adda968,True,Tests_passed,91a8f2fab9e6532f76010c3956b1cedddb0ec1a68fe6d7d6c39cc66ebaf8e73e,True,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,c7931323af71b20949cecee630e310a96d4732d6cb00b92a4192c373846e8a2a,Tests_failed,fd537f9a17295ccf4e5c57ff7fa693808363dbf2c8e6d6538a72c484bca92221,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,c7931323af71b20949cecee630e310a96d4732d6cb00b92a4192c373846e8a2a,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,Tests_passed,034f1ce416b1f9850f7b541edfbc7809e3790028e8d92a8b7a9ccd6397793bbe,0.04832959175109863,0.04062151908874512,0.044783830642700195,0.044114112854003906,0.04824113845825195,0.03718137741088867,0.03391671180725098,0.17295002937316895,0.1110529899597168,1.1284830570220947,0.4474811553955078,0.07667088508605957,0.14997625350952148,0.05695533752441406,0.05268669128417969,0.05273866653442383,0.05215096473693848,0.05033373832702637,0.09058165550231934,1.033940076828003,0.051743507385253906,0.053865909576416016,0.04111766815185547,0.05248260498046875,0.04159235954284668 diff --git a/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv b/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv index de317eadd0..4a57534d34 100644 --- a/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv +++ b/results/combined/merges_timed/flyingsaucerproject/flyingsaucer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 154,refs/remotes/origin/openpdf,baf00eff9794d8d582f8368c62765e9b8ceba92f,12c333df32afd0ef607f57efcece59f486123e25,98ad9a169aaf4c090ccea1a3c855897c8a591580,,True,True,Tests_passed,104645c12b2e941cabd58ae9758eb4b57735c3664f5cd65238a30c5470a5cc65,True,482,7496,67285.0,5,True,Tests_passed,1675fcf5f88827ba501eb62468d9b1ca6194eff5f6496bbe662f79013f926fd4,True,482,True,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,a702ecf2907e8bd57e3fb2c3187e3db630a5548d9ff9dd776b90cf4c7ccd8248,Merge_failed,a90adf15247ed1ca1f4fe987ba8f038530203f73f746df0198227a61d3e997e6,Merge_failed,4b4c04a4b9863faa7ca8128965101e00f59809ce5d9eb7e87600088be4352098,Merge_failed,9bcfbcbb25a37da86410ad8632fc939fba8f4a16893638831afd948f85177416,Merge_failed,a90adf15247ed1ca1f4fe987ba8f038530203f73f746df0198227a61d3e997e6,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,f4be8ed5711e33d974a1988f943448d925c7095151096f9a5d1a986a1bbd6264,Merge_failed,4c1979d14088c3f9600af9ee605752a439c5d70ce327d20084909f67390d861a,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,d6ab16a88f3ab8633a5c78b77369d8b1f0d33d8027959df4b902ca01c00fe468,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,Merge_failed,fe48e8fbe4940ef118234c119a04a9c6ab9b8353a6325d90cc16c1a952c6f648,0.06560444831848145,0.06617379188537598,0.07358336448669434,0.07361435890197754,0.07346510887145996,0.07314848899841309,0.07358098030090332,0.1930859088897705,0.2844998836517334,0.5223782062530518,9.57976222038269,0.2595181465148926,0.2431182861328125,0.14180660247802734,0.14502406120300293,0.14431500434875488,0.13922739028930664,0.1449296474456787,0.25417375564575195,0.6313872337341309,0.13799452781677246,0.1385490894317627,0.12516069412231445,0.13518977165222168,0.13206768035888672 diff --git a/results/combined/merges_timed/fmcarvalho/htmlflow.csv b/results/combined/merges_timed/fmcarvalho/htmlflow.csv index 29fde54ee2..e75e7e2c27 100644 --- a/results/combined/merges_timed/fmcarvalho/htmlflow.csv +++ b/results/combined/merges_timed/fmcarvalho/htmlflow.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,a89a8fa0e3425befa5503896bca392ce1bac437e,d5ce30d0c44ba34fcb4846c193cd06320362516a,91c5c4b27e1d315ebdd7690049050e7fe79addc3,,True,True,True,51,239,3010,11,True,54,Tests_passed,858aded6720e1a3da234601906cc10bb95833c0c7520e26a847f1f14df0fc567,True,Tests_passed,ffa0a1a959ca0c5738576d4f617e728cd3c05208795cc0f2433903933568691c,True,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,b73e9cc4fa516c1dc9821a1fed589e12da3f825be2e7377c2c004930fde2692e,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,0.013247013092041016,0.013380765914916992,0.013893842697143555,0.013446331024169922,0.0134124755859375,0.013448953628540039,0.01350092887878418,0.0934901237487793,0.12539267539978027,1.759350061416626,5.827728033065796,0.14667248725891113,0.1709744930267334,0.0888054370880127,0.08797502517700195,0.0896921157836914,0.08797287940979004,0.08737850189208984,0.19774198532104492,1.8754918575286865,0.0876779556274414,0.08677506446838379,0.07882261276245117,0.08699727058410645,0.08031749725341797 diff --git a/results/combined/merges_timed/fommil/matrix-toolkits-java.csv b/results/combined/merges_timed/fommil/matrix-toolkits-java.csv index e66eeb66df..a05ce64ae3 100644 --- a/results/combined/merges_timed/fommil/matrix-toolkits-java.csv +++ b/results/combined/merges_timed/fommil/matrix-toolkits-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,affdb7b35e8a309c4691e94a9f265dcfa9f34094,52744544515f2b8b56cedc2901398610f08b235f,98234e974d0467722d7188001e704bfeb518d848,,True,True,True,17,72,383,4,True,17,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,True,Tests_passed,4ed79d826944a4fb6d09a63127fa6cda76769d97219f58c809f738be2040f0b3,True,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_failed,c2f4f3aac99754826962e420c427f4649b9b52f8011c572bbe7efaa27629f6d8,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,0.0549166202545166,0.04942011833190918,0.05257391929626465,0.04973793029785156,0.0419003963470459,0.03216123580932617,0.04369759559631348,0.3062717914581299,0.2349562644958496,2.7642922401428223,0.6158361434936523,0.15522027015686035,0.1642749309539795,0.0763847827911377,0.07589340209960938,0.07475686073303223,0.06711649894714355,0.07828092575073242,0.15124106407165527,2.6656486988067627,0.07182002067565918,0.07000207901000977,0.032775163650512695,0.07020401954650879,0.047608137130737305 diff --git a/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv b/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv index 9343060c9f..e6d96e0974 100644 --- a/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv +++ b/results/combined/merges_timed/forcedotcom/analytics-cloud-dataset-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/remotes/origin/pull/4,bb64fe4fe44310042573ff697a10286c76181f27,7f5853b50212f8f062a683dc590025d23e195449,5bfe592ac634bb45f48175f5c455b69568bfe54a,,True,True,True,9,33,128,2,True,9,Tests_passed,2d56ceca7685cd0d42383dffc1b8bc5b472c543fea43865ca8db7d668984d509,True,Tests_passed,0c0a3402ebd89cd9cf6f7f799c9bed85b79283578da63ff3c8c1c5565e8d9470,True,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,0.04339098930358887,0.05304718017578125,0.04604005813598633,0.03711652755737305,0.042528390884399414,0.038832664489746094,0.03623080253601074,0.17897248268127441,0.1161355972290039,0.6684248447418213,0.5547130107879639,0.09774041175842285,0.16660737991333008,0.0661308765411377,0.06785917282104492,0.06793856620788574,0.0689842700958252,0.06569981575012207,0.11078619956970215,0.6431469917297363,0.0594940185546875,0.06590986251831055,0.05478382110595703,0.06176328659057617,0.05700373649597168 diff --git a/results/combined/merges_timed/forcedotcom/sitecrawler.csv b/results/combined/merges_timed/forcedotcom/sitecrawler.csv index 885fbc32ec..2356785714 100644 --- a/results/combined/merges_timed/forcedotcom/sitecrawler.csv +++ b/results/combined/merges_timed/forcedotcom/sitecrawler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/remotes/origin/develop,bb56b3dd8e132d8d625dab3ee71ed828754cdde0,e581ac9a860103411577fc1e43f419202fc8d8ac,db6e75c0cf7dde53d208b30dfad7ca1eaf3e3896,,True,True,True,13,79,1175,3,True,13,Tests_passed,79fd9ded833ef95cff46349527c8002380321b3fa12371969023f7119fb65ecc,True,Tests_passed,64ab76e3afa4e811164c11715aaa520e84b189be22918dc67de3ffb6dbb0f930,True,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,198451b2a698f649956e8b1062a032242016267bd2cb4ff3b67440e370c7e0fd,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,235025f90acbeec11c19436916c6c1ebc5dda3205c079d8f2e6bffac774a4ec2,Merge_failed,5b383d513ee9800f18493e1c55d5c284d863fa835de27a92e53b578b3f2b8d0a,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,9a69a5806aa087385659401a15c759af2e62c8cab3beb5c8514719997024a943,Merge_failed,f94943e3c1f3a307e66290fda52d77e707fb7f53e91c7075bf9749434b75ad8d,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,0.029335498809814453,0.039617300033569336,0.0470273494720459,0.04454302787780762,0.041768550872802734,0.03925061225891113,0.043589115142822266,0.21124482154846191,0.17145514488220215,1.4854199886322021,1.4433419704437256,0.10436606407165527,0.12291169166564941,0.04234480857849121,0.04314923286437988,0.043431758880615234,0.043295860290527344,0.043118953704833984,0.08873963356018066,1.4179012775421143,0.043744802474975586,0.04359626770019531,0.042212486267089844,0.04296708106994629,0.041989803314208984 diff --git a/results/combined/merges_timed/forcedotcom/wsc.csv b/results/combined/merges_timed/forcedotcom/wsc.csv index 1d546e89f9..ed9ac9242d 100644 --- a/results/combined/merges_timed/forcedotcom/wsc.csv +++ b/results/combined/merges_timed/forcedotcom/wsc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 134,refs/heads/master,69d39ed6fe26f04b1132ff17984ae3c77ef7ed77,a0b230e5c07ce66c36d64a638227d33d67816a9c,bd5c0c1c03c5f26f32d35a1febe16979c797b1a4,,True,True,True,9.0,21,191.0,2,True,9,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,True,Tests_passed,5bcf3ea9f25ab6a08f5642e6472c7501bcc89809154b3281fb2634639c2b1eee,True,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,0.05475759506225586,0.03507852554321289,0.021309852600097656,0.04144454002380371,0.021625280380249023,0.048845767974853516,0.04659605026245117,0.17069244384765625,0.12500524520874023,1.5530390739440918,0.5248115062713623,0.09186816215515137,0.15647363662719727,0.0625753402709961,0.06019997596740723,0.058855533599853516,0.06322598457336426,0.06265902519226074,0.10150861740112305,1.4369025230407715,0.057860374450683594,0.05893826484680176,0.03258872032165527,0.05901765823364258,0.04837179183959961 diff --git a/results/combined/merges_timed/fordfrog/apgdiff.csv b/results/combined/merges_timed/fordfrog/apgdiff.csv index 143d6deed3..9ad2a9c8d8 100644 --- a/results/combined/merges_timed/fordfrog/apgdiff.csv +++ b/results/combined/merges_timed/fordfrog/apgdiff.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/develop,a42c3242b6e78aa612e362f409e373225a9c4a2e,6523c52d919cb5fd73af3ef718f691740b19db1b,6c6defaa50aad109de8a85b37202591c0b98f784,,True,True,Tests_passed,4e41691763649629f374a62af1412666df1a6255fccdcdc44d73f98c82dc74e1,True,50,103,1852,4,True,Tests_passed,f5df258ffb7207cf731fdafb93675b62bcc7601bd3f5da9051bba37f37784130,True,50,True,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,22243ee00dca01dda8337b1f988cc40435d63a4c06cc5ad9a49ab82037b8dc37,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6dca7c0f41be616b80403179230b371dcb790262dad5a6004d617eddb9007143,Merge_failed,30f1d33b7f3de209d5e8abbae5a3c970d13654070eff3587fd10f47aa422704b,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,7977690ebd5b042d236e43be39e34b866321121c3af6400990f587c6f0d9cd4e,Merge_failed,848305acd4c5249d542ca829e5a226bc2540f4ecf22e0fa52a18059d9f79d57d,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,0.04885697364807129,0.059472084045410156,0.049497127532958984,0.058461904525756836,0.05723285675048828,0.05181097984313965,0.05413675308227539,0.29584741592407227,0.24335217475891113,1.534956455230713,0.7804124355316162,0.1474449634552002,0.13578009605407715,0.056444644927978516,0.05698680877685547,0.05534768104553223,0.05737757682800293,0.0677480697631836,0.12004709243774414,1.516859769821167,0.05550837516784668,0.057535648345947266,0.05482029914855957,0.0661005973815918,0.053867340087890625 diff --git a/results/combined/merges_timed/frankbille/scoreboard.csv b/results/combined/merges_timed/frankbille/scoreboard.csv index 3b8faf280f..2e01d9d9bf 100644 --- a/results/combined/merges_timed/frankbille/scoreboard.csv +++ b/results/combined/merges_timed/frankbille/scoreboard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/master,579ea54251bad446fdac546dc20fa813a3525b46,6c9298023a14f62bd50384b4fdc49213749a315e,5b07cabc7b31fa27c7e862f86e7226a91117d4d4,,True,True,Tests_passed,bda8a39b930cf2440a92798e14de49522715efb16cc182a83b00107c88fd7631,True,21,58,530,4,True,Tests_passed,7bd91f92b03e3a34b367b9555fd2b2db9eb8841e0067703386f1f7215561209d,True,21,True,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,15701243fe47888c0094f83d53076858acbebeca79a8cb9a85563822452ba52a,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,69e8ee0532fe611dcdbcc03a168da87e62449ab8225674b2d0aa2fba84a35d74,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,27ce3628e99c90b91b5381c784f6fb6dee6f2555aa0ef85d1ce83fe4e6772a31,Merge_failed,7b7b379fe65284ee969e3715c020347d0c546e22922cd49c73531f70f0abca41,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,0.04317736625671387,0.0421910285949707,0.04440712928771973,0.05154824256896973,0.036414146423339844,0.04386019706726074,0.04506707191467285,0.2819328308105469,0.22227191925048828,0.6773483753204346,0.4195840358734131,0.13524127006530762,0.13162922859191895,0.05258750915527344,0.05197310447692871,0.051439762115478516,0.051824092864990234,0.052648305892944336,0.11656761169433594,0.6830122470855713,0.051183462142944336,0.05032801628112793,0.04307222366333008,0.0516505241394043,0.043372154235839844 diff --git a/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv b/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv index 7e15818787..d98fc3356b 100644 --- a/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv +++ b/results/combined/merges_timed/freehep/freehep-vectorgraphics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/remotes/origin/pull/50,5477c71d3adde8d7029035133d94c44e32eb9083,0c94a082a4516d72c89cf6a860096325f391ee13,176d281f6570afa2f72f50b692bcecd63edfc140,,True,False,True,4,15,97.0,2,True,4,Tests_passed,d83d176ae5862505c73da986a5bd6bc2b8003e0e16666832ac550998607c6899,True,Tests_passed,fccd14e100c3f44856fdc57b1b82e3d5204b6a404264f35733c3ac57369732ec,True,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,5119dd46dbff4b4503af306a540d71c19aeabbb4484ffbe43c8a7d2f68d035b9,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,9262832b8f77468e4b1253d3e4f81a453a639fca972d5310c2ee179819c665ee,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,97c9ca2e54923820f678069fb3c6283539af10db989df0671060ba40e3a2c487,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,0.014382600784301758,0.013904571533203125,0.01417231559753418,0.01528620719909668,0.017899513244628906,0.014735698699951172,0.014295816421508789,0.052956342697143555,0.0749657154083252,1.670215129852295,0.5028331279754639,0.0774843692779541,0.1199178695678711,0.0381467342376709,0.03896975517272949,0.04019451141357422,0.04044914245605469,0.039589643478393555,0.07413792610168457,1.4619975090026855,0.040747880935668945,0.03863692283630371,0.03746151924133301,0.03859400749206543,0.03827714920043945 diff --git a/results/combined/merges_timed/frizbog/gedcom4j.csv b/results/combined/merges_timed/frizbog/gedcom4j.csv index 2902e20f78..385dff3d7e 100644 --- a/results/combined/merges_timed/frizbog/gedcom4j.csv +++ b/results/combined/merges_timed/frizbog/gedcom4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,11c8b3f6955f298ade7583d2fa0d000b282e597f,cc87e520a8fb31791ef6f69c87ee6aba8247ccbd,7c93589357fcbf3c1e8dbfb7fd6ffc0158e94c04,,True,True,True,293,2906,38766,6,True,296,Tests_passed,c0289db9626674ba122dc0f9c353412e50329ef520fd84ea9f400c3a0b7dfbfc,True,Tests_passed,c08160c1250a318b3a848595a32f8b0c4fdd8309513fc7c40d815013d7ff920b,True,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,cb79a7cad84c59f537e0d35013388697fefccba1d6dd72a21178f119060c9139,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Tests_failed,22efdfa9c05eaeb1fb34d77cd8ec69021b7ff4e09ec1fcd7e98f33a6db0c3225,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,063fb33c54a4502f94b3f4fa3ba5739594e27458228258fb9f00448c4912b897,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,0.054558515548706055,0.05584383010864258,0.06137871742248535,0.05630064010620117,0.055321693420410156,0.040500640869140625,0.08191394805908203,0.21737909317016602,0.17885041236877441,4.072464466094971,21.103285789489746,0.15108895301818848,0.1766526699066162,0.08524465560913086,0.08462309837341309,0.08348512649536133,0.08444452285766602,0.1045222282409668,0.14261651039123535,3.9945406913757324,0.13274621963500977,0.14016509056091309,0.14101314544677734,0.12848901748657227,0.11798834800720215 diff --git a/results/combined/merges_timed/fusesource/hawtjni.csv b/results/combined/merges_timed/fusesource/hawtjni.csv index 1bdeeb1829..4aebe08ee3 100644 --- a/results/combined/merges_timed/fusesource/hawtjni.csv +++ b/results/combined/merges_timed/fusesource/hawtjni.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,8678713caf00652f4f7d52e36b8b384cf611dde5,d145a1dea37bbd8f98c9f1e6f21d756f849d7979,2c64ed4134de9b3cefd9423382a59f60c8f3ad25,,True,True,True,15,70,1139,2,True,15,Tests_passed,d1466a3d12f3064c8dd90f83120c547f0dc7aff845d8f8cbc2663e64511dbd8b,True,Tests_passed,b6fb7066bb00778949dff10fb3844eb8efd49a0bae9a4e6d3607d2a1044d0f81,True,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_failed,ce547a0cb8364caf47f370f7c636cf1195ed536e12ecb136d365ef25f3fec943,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,0.021950483322143555,0.02215123176574707,0.028789758682250977,0.028809547424316406,0.028893709182739258,0.02866816520690918,0.02871870994567871,0.06073617935180664,0.07700347900390625,1.0102307796478271,0.39148736000061035,0.10608458518981934,0.1760551929473877,0.07622361183166504,0.07541251182556152,0.07391190528869629,0.07627606391906738,0.07661938667297363,0.11520195007324219,1.0717620849609375,0.06866049766540527,0.07168817520141602,0.0620725154876709,0.06887507438659668,0.06193661689758301 diff --git a/results/combined/merges_timed/fusesource/jansi-native.csv b/results/combined/merges_timed/fusesource/jansi-native.csv index 2d03b9c9eb..ad572842b5 100644 --- a/results/combined/merges_timed/fusesource/jansi-native.csv +++ b/results/combined/merges_timed/fusesource/jansi-native.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,True,14,41,2080,2,True,14,Tests_passed,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,True,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,True,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,bcd03031a2f084a5e33a73be1d2d1f520d72df44aa9f3c1d485d042b76287df8,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Tests_failed,f82a6f26707e51ee65e5f267e9bfd72aa34c192d7af752a580c4c8ac4f7a39b1,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,57e270ad851e7142b3e5ed234ead3ede78785e0269153ca0b1e9a9b5aa914405,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,0.00982046127319336,0.01029658317565918,0.00962066650390625,0.011097431182861328,0.009675025939941406,0.009786605834960938,0.009704351425170898,0.034417152404785156,0.06694722175598145,0.6613233089447021,0.5117793083190918,0.07019829750061035,0.12231779098510742,0.03649163246154785,0.044428348541259766,0.0370943546295166,0.03606367111206055,0.03672337532043457,0.0678257942199707,0.7515623569488525,0.03604578971862793,0.04348897933959961,0.03439521789550781,0.03637886047363281,0.035271644592285156 diff --git a/results/combined/merges_timed/fusesource/jansi.csv b/results/combined/merges_timed/fusesource/jansi.csv index 02e0cbfc1e..99f2e77552 100644 --- a/results/combined/merges_timed/fusesource/jansi.csv +++ b/results/combined/merges_timed/fusesource/jansi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/master,eeda18cb05122abe48b284dca969e2c060a0c009,b84df55b6c6a0688cf8ad790d4a3ac952ea6b9d0,5a3a670c911e4491195b6d162d456dead1497824,,True,True,True,9,24,127,2,True,9,Tests_passed,7f122577588d32b76e3e566b52d4fc21d998de86bdf889f9a50d85f9a2cbc729,True,Tests_passed,c12ff958e6fd5092a2a7a12d26ba20de99771366aac098b4ff19173d624180a5,True,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,ac29640fb1e96782ca82c247d990e9ba922f931dd231c4c3b6c4b2d93867c583,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,0.04625892639160156,0.050188302993774414,0.04698324203491211,0.051941871643066406,0.04465293884277344,0.040238142013549805,0.04700493812561035,0.15979838371276855,0.10337424278259277,0.6057331562042236,0.3527083396911621,0.07743310928344727,0.13736724853515625,0.04597353935241699,0.04824519157409668,0.04731893539428711,0.04789257049560547,0.047309160232543945,0.08269786834716797,0.6056280136108398,0.04332613945007324,0.0458989143371582,0.035979270935058594,0.04492306709289551,0.035654544830322266 diff --git a/results/combined/merges_timed/galenframework/galen.csv b/results/combined/merges_timed/galenframework/galen.csv index 166275e4e3..22b8bfe2f4 100644 --- a/results/combined/merges_timed/galenframework/galen.csv +++ b/results/combined/merges_timed/galenframework/galen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,9f0a13079558fe495b6ea2a9b7f46e818639b4e1,807a06e637a1abf53be4575182fce01811c045e4,bf409f4ff5aa1ad3a51195230112967f38a5a5b3,,True,True,True,527,1096,33791,3,True,527,Tests_passed,0a7c40482c731031373bba526988e79a8c19193592fbeadfd4f83d0d41daae32,True,Tests_passed,195d52203e15eb03a676063ed8305852d13f390a953ac5053fabf21a8b3ffe8b,True,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,0.04467058181762695,0.04390144348144531,0.06894707679748535,0.06366181373596191,0.06309199333190918,0.06583046913146973,0.062491655349731445,0.2464447021484375,0.16417503356933594,1.2046692371368408,6.271050214767456,0.17055797576904297,0.21640968322753906,0.11682343482971191,0.11952590942382812,0.12338519096374512,0.12815499305725098,0.12491154670715332,0.1860806941986084,1.2495708465576172,0.1096334457397461,0.10821056365966797,0.08579397201538086,0.10391044616699219,0.08545565605163574 diff --git a/results/combined/merges_timed/garbagemule/mobarena.csv b/results/combined/merges_timed/garbagemule/mobarena.csv index 30d88cab80..cc43224c6b 100644 --- a/results/combined/merges_timed/garbagemule/mobarena.csv +++ b/results/combined/merges_timed/garbagemule/mobarena.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 77,refs/remotes/origin/pull/693,c0c07ed2230ad53326afe6a227c61ef7275a9cd9,5c8c1939640d29a1aff926a01d07ed59746d320f,6be130daf1af0f3fd0f9842177cc3ceac12f0fa5,,True,True,Tests_passed,6d6e5550abe40a46bd748cf20f4082f0f661eebb7edd7bcf872334bc77f55774,True,6,16,48.0,2,True,Tests_passed,bcb0a8938973b55d69531353df104c3a6f9716e3ff4431e5f37085ca9acf2719,True,6,True,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,31360513ad0b59eda1476cb95bd847df1d58553b11fa3398a84724adeedbd64c,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,d5af3729a299a3733aede7d597a283c465f703361504fbd0180682df8486da79,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,ad7bb65904f04e2eedd3bf5081f9d246a8241dfe1f44ad2475d0bb01280fe7d9,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,0.047921180725097656,0.04127955436706543,0.04158496856689453,0.045073509216308594,0.04485177993774414,0.04928755760192871,0.04156041145324707,0.16989493370056152,0.11901330947875977,0.9228169918060303,0.5442514419555664,0.08843183517456055,0.11629462242126465,0.036675453186035156,0.038222551345825195,0.04821324348449707,0.035501718521118164,0.05115914344787598,0.06851887702941895,0.8895971775054932,0.04985189437866211,0.0366206169128418,0.04975700378417969,0.03675985336303711,0.04765200614929199 diff --git a/results/combined/merges_timed/gatein/gatein-api-java.csv b/results/combined/merges_timed/gatein/gatein-api-java.csv index 20f3e34675..75a1ae2b03 100644 --- a/results/combined/merges_timed/gatein/gatein-api-java.csv +++ b/results/combined/merges_timed/gatein/gatein-api-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,1ae0553ab8dd0574e86a2b073e35f3a0331ada3c,8693b9e5c6ab2b2f04acc311a0bfa37ad157c391,dc25033b5792eb3b2692252bedb363bafb2a6ad3,,True,True,Tests_passed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,True,60,114,7232,8,True,Tests_passed,6312f583ebbaa3f8b7089e2ab24f513bb713c54a8f32df638ce77c6aa0b3fa68,True,63,True,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,40c6f8a01d5f775e60fdcb0c3059bb9d51a5f28d7348bf21a39227f1880ac561,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,0.046964168548583984,0.05846238136291504,0.06241106986999512,0.05993795394897461,0.05231428146362305,0.05549001693725586,0.049141883850097656,0.32676076889038086,0.2130107879638672,0.9639706611633301,1.190206527709961,0.11834955215454102,0.12238574028015137,0.04452705383300781,0.04534196853637695,0.04575920104980469,0.045134544372558594,0.04540824890136719,0.11333084106445312,0.9668657779693604,0.04442286491394043,0.04515242576599121,0.04461836814880371,0.04424715042114258,0.04466080665588379 diff --git a/results/combined/merges_timed/gbif/name-parser.csv b/results/combined/merges_timed/gbif/name-parser.csv index 45b86ac5bf..b17069b981 100644 --- a/results/combined/merges_timed/gbif/name-parser.csv +++ b/results/combined/merges_timed/gbif/name-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,d8417e10fb442f6cf0342569ee1de8cc5257facd,79712709a91e47093fde22401fcfb87290790597,b42bacaf155d146e60825185902d264d5981afa4,,True,True,True,19,58,2802,3,True,19,Tests_passed,8807934239dfe00ccc91427e0eceb97c944420517562c1fc306ef1969a00ff67,True,Tests_passed,b0a1ae7e75622b7ddbf87f39c53d8ebe7a7baaa893bd1e117e10d0bc0a712c86,True,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,0.021604299545288086,0.023651838302612305,0.026897668838500977,0.027187585830688477,0.026285648345947266,0.026378154754638672,0.02587294578552246,0.07102751731872559,0.13080310821533203,3.0228819847106934,1.123028039932251,0.12887859344482422,0.17624950408935547,0.07643675804138184,0.07852458953857422,0.08027434349060059,0.07729363441467285,0.0761415958404541,0.13772010803222656,3.0367777347564697,0.07487273216247559,0.07573413848876953,0.05889725685119629,0.07602334022521973,0.05713176727294922 diff --git a/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv b/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv index f71011b5bd..d689201e52 100644 --- a/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv +++ b/results/combined/merges_timed/geisbruch/hadoopcryptocompressor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,f98ce134b844a7864b43803c6e7ffc3f1b7d4e5c,9ca8d7782c731dda67fef1419c27b82e7e80617b,72132711af2ae9fbd4426f72c37afab61afa92a6,,True,True,Tests_passed,74efbe59af6439cd5139bbbee8aec9360084924944dd2737dd2e3a5c7a4c124b,True,16,52,863,16,True,Tests_passed,cfcdea3830c463505a71359096886b29a5f6aa119e1038e81291733961ffbf5d,True,27,True,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,bcd0042e77d9366f9b487ed4dfeffca59eb795f2168c464ee9c82f6d422e3f13,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,d7f22c7864302d4e697f8d933ec7b402b331d2ef3c9c351cf8a28d710ab2807b,Merge_failed,964bc66528ebb89c190d5a76fb277807adddda6a105d5a7e737231be90196450,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,274351c39d97c01a77168e57ed819dee72ba919148505e7e9ab82d2584ac9665,Merge_failed,517bcdbd3d68dd185d8a89982f625b3a443c00ab10220cbcd2e443155c2a6028,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,0.04081249237060547,0.0453946590423584,0.04455375671386719,0.043009281158447266,0.04331660270690918,0.0393366813659668,0.04028797149658203,0.35571956634521484,0.29741930961608887,1.413137674331665,0.4519481658935547,0.17259883880615234,0.13529562950134277,0.055739641189575195,0.05486011505126953,0.05533194541931152,0.054375648498535156,0.055408477783203125,0.13122081756591797,1.4349758625030518,0.05690622329711914,0.056922197341918945,0.05361366271972656,0.05685257911682129,0.052840232849121094 diff --git a/results/combined/merges_timed/geoffreywiseman/moo.csv b/results/combined/merges_timed/geoffreywiseman/moo.csv index d9a57eed47..73fb5e9c64 100644 --- a/results/combined/merges_timed/geoffreywiseman/moo.csv +++ b/results/combined/merges_timed/geoffreywiseman/moo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,c87b8cb339acf2e0e5d38ed55775bd9b6a3c3d1f,736976881b149b25ed7c051198933e47d3a99494,dfd80886d7f9acf8e4de719d2876e668dac92d1d,,True,True,True,18,90,428,3,True,18,Tests_passed,4f41e2065e911154cb29000823a47712b4316f475a3bcc2b6d32e1fcf0f1541f,True,Tests_passed,b29e2909ad9d5f27a7d9927a070901bb936df4cc568e1672a9e19996a1ff39c8,True,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,d154e8dfdce5acfd29d0157810b80d5b2235717f6695a391e123e4a92207c0c5,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,14be6ddc97fe0b86417f6c664aa6a07a1bb0845973d2cd2a447b76f4ae907c59,Merge_failed,ba8a69a5e10b5157ab281d5c4962aee263096d450d1dabec8d0244f9f5e4b788,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,0cfc7f7fefe6c07b16d6c763ac775f8518406401227d6223dc40ef722991cbf6,Merge_failed,669a31d4ee910ffccbebc8b0474bfc3342fd582fc9dd4db469d57e2ae0779913,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,0.022982358932495117,0.04178667068481445,0.03760051727294922,0.04234743118286133,0.04782748222351074,0.044286489486694336,0.04223132133483887,0.21901392936706543,0.19098854064941406,0.7496030330657959,0.5148992538452148,0.10381817817687988,0.12363815307617188,0.04255080223083496,0.04292130470275879,0.041387319564819336,0.04189252853393555,0.042719364166259766,0.08884000778198242,0.7359504699707031,0.042551517486572266,0.04246115684509277,0.041409969329833984,0.04149580001831055,0.04143333435058594 diff --git a/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv b/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv index 13f7cf57ec..12b06eab63 100644 --- a/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv +++ b/results/combined/merges_timed/geosolutions-it/geoserver-manager.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/heads/master,8073671631cb3f2be2ce5c96fbafe1c35d81b2bb,471c860007c6c0a9853ce3d3cd5e2dacdf97d18d,b7bef77052a50b347d59119b1c5b91d34c5bda73,,True,True,True,9,16,437,2,True,9,Tests_passed,9798888e4606350edbc1dc604512533f1afcd3d102315e815a89cc028c12699a,True,Tests_passed,28cd9894526d49360f3c978d4fc4869f4dca39c0b6377c35d38d5c46cc2265c9,True,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,0.02625417709350586,0.026995420455932617,0.03398561477661133,0.03500795364379883,0.034331560134887695,0.034569501876831055,0.034557342529296875,0.06989121437072754,0.08507347106933594,1.1393253803253174,0.3777151107788086,0.07142043113708496,0.18002772331237793,0.040575265884399414,0.07990288734436035,0.07747650146484375,0.08160400390625,0.07498717308044434,0.07366204261779785,1.0236320495605469,0.07200860977172852,0.06730341911315918,0.06461405754089355,0.07201528549194336,0.06623435020446777 diff --git a/results/combined/merges_timed/gephi/gephi.csv b/results/combined/merges_timed/gephi/gephi.csv index 6ee13a68f0..e7244385e7 100644 --- a/results/combined/merges_timed/gephi/gephi.csv +++ b/results/combined/merges_timed/gephi/gephi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,,True,246.0,632,,4,True,244,Tests_passed,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,True,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,0.06739616394042969,0.08657193183898926,0.06635451316833496,0.08040285110473633,0.07421159744262695,0.07885622978210449,0.07919144630432129,0.2551453113555908,0.22736668586730957,1.7211782932281494,-1.0,0.21698451042175293,0.2581932544708252,0.14090514183044434,0.14693164825439453,0.14171648025512695,0.14397740364074707,0.1424722671508789,0.23328113555908203,1.7119724750518799,0.13346624374389648,0.13521647453308105,0.1012887954711914,0.12728214263916016,0.1067953109741211 diff --git a/results/combined/merges_timed/getbridge/bridge-java.csv b/results/combined/merges_timed/getbridge/bridge-java.csv index c7ea5e581e..7d9199dc35 100644 --- a/results/combined/merges_timed/getbridge/bridge-java.csv +++ b/results/combined/merges_timed/getbridge/bridge-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,35d226d99b31bc824c3a3460ec0611c8572a081c,39385be68dcbf46eacf42c29320fa09a9c27a642,de36e6eace5a1de9121d9fdbb234ecd27efdfe7c,,True,True,True,12,40,942,3,True,12,Tests_passed,091b3765abe2aa56d7f5c1573af9354f930e9de2c7177c89868b711905761bae,True,Tests_passed,ca47144f2183cde325593f9303d1592b1ac5cd08e659f0e9cee28823d1bccecb,True,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,7c36de8f2681f99e91b43c5160b3d238ee7542eaa03f122405b303be8e2f6a4f,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,25d9988fac354423e5f8451b1174a5145a9670c259edf490a7be9cdd24bc13aa,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,cab497cd10a734c87c7961750f6a411cd83f96f44865b2bac08115cc3aedfa34,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,0.039006710052490234,0.04354596138000488,0.04274892807006836,0.04142308235168457,0.03576517105102539,0.045049428939819336,0.03934764862060547,0.22788643836975098,0.18034982681274414,1.5179078578948975,0.48279404640197754,0.10257983207702637,0.12048196792602539,0.042310237884521484,0.04120635986328125,0.04227852821350098,0.04116177558898926,0.04248309135437012,0.08859777450561523,1.4835288524627686,0.043061256408691406,0.041939496994018555,0.03277230262756348,0.04184770584106445,0.03257346153259277 diff --git a/results/combined/merges_timed/ghillairet/emfjson.csv b/results/combined/merges_timed/ghillairet/emfjson.csv index 0407f79f7f..a6876b1892 100644 --- a/results/combined/merges_timed/ghillairet/emfjson.csv +++ b/results/combined/merges_timed/ghillairet/emfjson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,7aebd6f36990fc52abeb4c10e24f8d987b5be744,e7d28b22ce7e16623e9950d7677c18282e71212b,5bad44904199431d01d5568985e8e28e01951ad1,,True,True,True,34,719,2696,3,True,34,Tests_passed,f19df67228bdc9287b0a7ac458d47f1ca553f3bde7e4c938429e94f304083360,True,Tests_passed,c14394d99e13a4ee10a4a19d6f93ec7ee9a74c8d3c5e9388ecd2b0b2decd0518,True,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,b9d7a70ce8896be7b942bcb4238f0c4871a45849e607a0fa7d23d8ece3c351b1,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,5ed38c52965c4a5bb89647375af1809e5726bd1ded03e025b3faaa1dc59f2372,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,3a8b37ad2b921966f8fbf053ef534e8a3dfff567cdbd5a45d96ae1d10dad583d,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,0.01703333854675293,0.017342805862426758,0.019044160842895508,0.018958568572998047,0.01949787139892578,0.019590139389038086,0.01914215087890625,0.06914091110229492,0.1309065818786621,1.545112133026123,-1.0,0.12552237510681152,0.1464691162109375,0.056134700775146484,0.05486273765563965,0.05963587760925293,0.05522513389587402,0.047940731048583984,0.11346626281738281,1.594597578048706,0.057340383529663086,0.05732846260070801,0.04630923271179199,0.05577278137207031,0.03859853744506836 diff --git a/results/combined/merges_timed/giltene/jhiccup.csv b/results/combined/merges_timed/giltene/jhiccup.csv index df71977f3d..1dbe5edf6d 100644 --- a/results/combined/merges_timed/giltene/jhiccup.csv +++ b/results/combined/merges_timed/giltene/jhiccup.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,d7891ccaab5a84dd05d0c5272609b89ebd1b0a22,cff9ba508b79a8ea7cb050c77e5d3b67a5e85ebf,04d63c4409f7fc55c85c4ed96274252b4613f0f8,,True,True,True,6,8,14,2,True,6,Tests_passed,0fdfad91f0832933588e70df22f37fc4f9ca0841640e1f006a0d742cec42d1da,True,Tests_passed,26f21b04480af7c661e3a78bbd4daa51958edb2a85d3c57b60141aa7893523e7,True,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,0.04380512237548828,0.04679250717163086,0.04210352897644043,0.035044193267822266,0.0547184944152832,0.050103187561035156,0.044306278228759766,0.17638349533081055,0.10360598564147949,0.5432846546173096,0.396148681640625,0.08051609992980957,0.1373429298400879,0.04853653907775879,0.047678232192993164,0.047804832458496094,0.0450899600982666,0.04481840133666992,0.08639097213745117,0.6618838310241699,0.04526805877685547,0.045812368392944336,0.034560203552246094,0.044473886489868164,0.03430962562561035 diff --git a/results/combined/merges_timed/gini/dropwizard-gelf.csv b/results/combined/merges_timed/gini/dropwizard-gelf.csv index fd7b3a2128..5137b51698 100644 --- a/results/combined/merges_timed/gini/dropwizard-gelf.csv +++ b/results/combined/merges_timed/gini/dropwizard-gelf.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,b1cd41cdb5bfe0b33d5db7718beaa984692e83ce,f6e7bbc12ed553c961d6500d003758b558eb2eb6,7bd73b3b895934e2745d4e86a224ee5de6cfe403,,True,True,Tests_passed,8acdc5b2078b573101ecca3d863d9838fdc65edb266090772b12cafedd52ecf6,True,9,20,57,4,True,Tests_passed,c445b3a0de324fdbf75ddcada0e1df47625412c029afc67ebde4c0afbbf4511a,True,9,True,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,7a93f13f1e4280edcbd8412cce3f92aaf82a9a5df884102a0ed302d64d4925bd,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,5d567941153a325083d50c3cd83b92f336177fc09ed043bfc88eb08eef0a6e41,Merge_failed,dfb2b1ba7d1f2183880da9c1640a5668df3af0ea1af23c0fed41c218c717ed6a,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,94f3a835bf9bb8601f7e7a2faec3870f347c7e9e1d24fd196e9ef1df8ccd845c,Merge_failed,9f140cc7f2258ce2969398904642668f60e503191ff338d2f19ada81fcb721ef,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,0.007695436477661133,0.007870674133300781,0.007933616638183594,0.007806539535522461,0.007956266403198242,0.008195638656616211,0.008347272872924805,0.05582594871520996,0.17441821098327637,0.7540080547332764,0.2860708236694336,0.13110136985778809,0.12697505950927734,0.0480954647064209,0.0478215217590332,0.047792911529541016,0.04786872863769531,0.04736518859863281,0.11084532737731934,0.7880003452301025,0.047453880310058594,0.04831671714782715,0.03820371627807617,0.047183990478515625,0.038507938385009766 diff --git a/results/combined/merges_timed/gitools/gitools.csv b/results/combined/merges_timed/gitools/gitools.csv index 64437ccc88..f88cf727cb 100644 --- a/results/combined/merges_timed/gitools/gitools.csv +++ b/results/combined/merges_timed/gitools/gitools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 67,refs/heads/develop,f3903af522feb02e11fd24b68fe5c1d56608aa60,a257a960764251de0a98fd364a0249f69e965901,92155a3fbda034802dc90b8c6f99933fc812d9f6,,True,True,Tests_passed,faa95e610ff712a31bb03f0ef96692efeca0545d9af00aac376264d1270ed459,True,16,27,333,2,True,Tests_passed,7798b09efc2001f0d641acf0875b043bef91c1906ea8ea849b0bfc1aed32dbec,True,16,True,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,f1366b3b81512cdbb3d536e2e350652877f92d0ca23cc89aa8e5efdc0d81e084,Tests_failed,abaf6b93ee547b76aea2f2e0d2d04baf49dfa7244e08433357d228b24cd8d2f4,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,f1366b3b81512cdbb3d536e2e350652877f92d0ca23cc89aa8e5efdc0d81e084,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,Tests_passed,cb8772f0d9fe75e3d246b4c2c8785b0a91c0e5b4e91a2b41bb68b6eb2ec67334,0.07227277755737305,0.06765937805175781,0.06451225280761719,0.07369160652160645,0.06283330917358398,0.04851126670837402,0.06457734107971191,0.18639564514160156,0.11374831199645996,0.8357946872711182,0.6838836669921875,0.08452320098876953,0.14708733558654785,0.05517220497131348,0.05450606346130371,0.05488014221191406,0.055975914001464844,0.05587196350097656,0.0941312313079834,0.8260304927825928,0.053672075271606445,0.054128170013427734,0.04379558563232422,0.05303692817687988,0.04398512840270996 diff --git a/results/combined/merges_timed/giusepperizzo/nerd4java.csv b/results/combined/merges_timed/giusepperizzo/nerd4java.csv index acb32a4b42..22a29ae03a 100644 --- a/results/combined/merges_timed/giusepperizzo/nerd4java.csv +++ b/results/combined/merges_timed/giusepperizzo/nerd4java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,2aadca9519e8fb2a4deeebc9b9ea84c80ea99bc6,601cd85d90c07c437fe308ece191569491a4bd60,7d6f9ef82321090583acc0f9df5d0fa8963f3ae0,,True,True,True,2,2,52,2,True,2,Tests_passed,cf61ee6aea03216e56e36dcd3383e236dff6bd0530d5132733d2f098179ac981,True,Tests_passed,b2ab4c6a026133cfba798cba574544d9beee86dd3a5b3d8e284b0e8de6800723,True,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,0.03541731834411621,0.04048347473144531,0.03926539421081543,0.04137825965881348,0.03510928153991699,0.03944277763366699,0.041933298110961914,0.16466879844665527,0.11331558227539062,0.4801347255706787,0.23084306716918945,0.0663299560546875,0.12096285820007324,0.03751635551452637,0.035834312438964844,0.036992549896240234,0.03649711608886719,0.036856889724731445,0.06800150871276855,0.4752967357635498,0.03640007972717285,0.036618709564208984,0.026171445846557617,0.03648829460144043,0.026242733001708984 diff --git a/results/combined/merges_timed/glamdring/aardwark.csv b/results/combined/merges_timed/glamdring/aardwark.csv index 303adf80a6..5c6753551f 100644 --- a/results/combined/merges_timed/glamdring/aardwark.csv +++ b/results/combined/merges_timed/glamdring/aardwark.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,8bab377cc754b72f9b0d1181a98227787b43758a,12af56162aaf2449a6fd642ba890112a38f4e7d0,4bdde8ed558c76923d845169a63b03ed35162761,,True,True,True,4,42,208,3,True,4,Tests_passed,7cf3e7509213b3a5efc6e8e5ce377cb7dd31333d087e92390d0555bf621b34e9,True,Tests_passed,b183aaa6130ecdc7cf137a384d50d096599a2374722fa163b181c20d20252c61,True,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,4f7241f3fd33c9fe3e20b08b277a43ecbf1a53196bf2b03be6e83a52e521de6e,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,ed3e0e1b261da130c758f645813f5862c012848b683eaec93aa6c00b9b0bb351,Merge_failed,a83acc620d07cf99c37263ace4b016e2f83ba3836545648d4b7b780fc6b2b206,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,2c86c694c76c565ab816b18f8616280cead675094b31c8d3f9a487dab4ff5cf2,Merge_failed,24fc2fbcced7c590d3a4937192d5dd08727295e70cdc7d752791fb63647d34d6,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,0.04043436050415039,0.0368497371673584,0.04034423828125,0.03921055793762207,0.039563894271850586,0.04023909568786621,0.04023480415344238,0.22007083892822266,0.16844654083251953,1.0568814277648926,0.4681994915008545,0.09863901138305664,0.11873936653137207,0.03918623924255371,0.03893327713012695,0.03946423530578613,0.03893876075744629,0.03940320014953613,0.08485198020935059,0.9906320571899414,0.04047417640686035,0.03991866111755371,0.03790616989135742,0.03990793228149414,0.03791332244873047 diff --git a/results/combined/merges_timed/glenkpeterson/fp4java7.csv b/results/combined/merges_timed/glenkpeterson/fp4java7.csv index 82aed21dd9..2ac7dff196 100644 --- a/results/combined/merges_timed/glenkpeterson/fp4java7.csv +++ b/results/combined/merges_timed/glenkpeterson/fp4java7.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,27ff032312795971580bf0955e9546a1d3671d5fb0908690dc0410dbb0e76168,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,0.0763552188873291,0.07716488838195801,0.09298086166381836,0.08633732795715332,0.08066844940185547,0.08858489990234375,0.08294558525085449,0.9754092693328857,0.8740217685699463,15.489113092422485,3.0375924110412598,0.6047217845916748,0.3452646732330322,0.2231142520904541,0.22653579711914062,0.22960829734802246,0.2347855567932129,0.22662115097045898,0.5475459098815918,14.653870105743408,0.22475314140319824,0.21852874755859375,0.1802217960357666,0.2140636444091797,0.1762843132019043 diff --git a/results/combined/merges_timed/glenkpeterson/j-cicle.csv b/results/combined/merges_timed/glenkpeterson/j-cicle.csv index 92b98ec632..1cb4031f85 100644 --- a/results/combined/merges_timed/glenkpeterson/j-cicle.csv +++ b/results/combined/merges_timed/glenkpeterson/j-cicle.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,3132a5d74058033d3effa9681735028eea63e64fed17dc7a7d0a0ba53bd231cb,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,0.06952524185180664,0.07091760635375977,0.08957076072692871,0.08635234832763672,0.07971477508544922,0.08589744567871094,0.08394312858581543,0.9148585796356201,0.8695683479309082,15.517658233642578,2.9059269428253174,0.6064612865447998,0.33980727195739746,0.23220252990722656,0.22811603546142578,0.23132681846618652,0.22000646591186523,0.22267627716064453,0.5357136726379395,14.698901414871216,0.21782660484313965,0.22008347511291504,0.17629241943359375,0.21889829635620117,0.1897261142730713 diff --git a/results/combined/merges_timed/glenkpeterson/j-sicle.csv b/results/combined/merges_timed/glenkpeterson/j-sicle.csv index dff5b00eaa..6a26f9c848 100644 --- a/results/combined/merges_timed/glenkpeterson/j-sicle.csv +++ b/results/combined/merges_timed/glenkpeterson/j-sicle.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,31e00884b3d9abcd9100d95c354e69464257469353db9f5c1b4fcda8641360b6,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,0.07547259330749512,0.07674622535705566,0.08587813377380371,0.08059549331665039,0.08372211456298828,0.0804588794708252,0.08191323280334473,0.9583835601806641,0.8713035583496094,15.763499736785889,2.842805862426758,0.5823137760162354,0.33028697967529297,0.2314012050628662,0.22493672370910645,0.2277984619140625,0.22697734832763672,0.22676610946655273,0.5066986083984375,14.71186900138855,0.2112107276916504,0.21642351150512695,0.1861894130706787,0.21913957595825195,0.18332862854003906 diff --git a/results/combined/merges_timed/glowroot/glowroot.csv b/results/combined/merges_timed/glowroot/glowroot.csv index a19cbd56f4..30ae23fa43 100644 --- a/results/combined/merges_timed/glowroot/glowroot.csv +++ b/results/combined/merges_timed/glowroot/glowroot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/remotes/origin/pull/724,5edc6961f8576c72256fe9d28b358dc6e35ff997,dbcbb453a0db7c77cf8cf7a43797d4b9e2d214f7,b65d9a9f8972dca4e392c61a329110a32d3826ce,,True,True,True,437,1583,8291,4,True,437,Tests_passed,29c8903501e26b98c7b7c54ee02b034c3c6bb59aa0fdb3b13ab5e21657d06a62,True,Tests_passed,1496169c6b0ff819f6c459675878b405b429592a0a7889bdf6fafa87a9f8683d,True,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,0.1112508773803711,0.11385107040405273,0.13102293014526367,0.133469820022583,0.1291975975036621,0.12977027893066406,0.13034915924072266,0.28981733322143555,0.2781994342803955,0.11524629592895508,13.31128478050232,0.37760400772094727,0.4582493305206299,0.2680082321166992,0.2629520893096924,0.27443456649780273,0.2673823833465576,0.26697778701782227,0.4499945640563965,0.2960643768310547,0.24557709693908691,0.24631738662719727,0.23720836639404297,0.25156354904174805,0.23787689208984375 diff --git a/results/combined/merges_timed/gooddata/gooddata-cl.csv b/results/combined/merges_timed/gooddata/gooddata-cl.csv index 44f3df65f9..757b3e008a 100644 --- a/results/combined/merges_timed/gooddata/gooddata-cl.csv +++ b/results/combined/merges_timed/gooddata/gooddata-cl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 101,refs/heads/master,18faa1c4c7f3b77e27be62e841e0f5959941334c,6a016ec9d17f2137a87b6eaa2d8d118238d66299,99e0c47c5fbfbcb85a06fb95003c32c1ada9a606,,True,True,Tests_passed,fd6e17a570774e974af64700645bfef8570d05f3f680b458fcc51e537571f62d,True,16,76,682.0,2,True,Tests_passed,ea47282fc6151656c888d2979883d9cbc9257fe57cc3f20f837db37db441b8cd,True,16,True,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,dd78e3bb4b717ce62861b5425855d77189385c341bdb496b7771028ed6fbdb03,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,dd78e3bb4b717ce62861b5425855d77189385c341bdb496b7771028ed6fbdb03,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,7b2773ba670fe95d5eb825697011b172019e1f02bb615f5cad836d5fcb191d9e,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,Tests_passed,401e40cceb83435daf2693f0b56573688afa6288d3faef1a19902ce117ad0790,0.01885533332824707,0.01935410499572754,0.024562835693359375,0.024289846420288086,0.024566173553466797,0.024010896682739258,0.024160146713256836,0.05366802215576172,0.07465958595275879,1.134699821472168,0.4466562271118164,0.1008760929107666,0.16412019729614258,0.06838607788085938,0.0691690444946289,0.06757235527038574,0.06757283210754395,0.06841731071472168,0.11028122901916504,1.1559741497039795,0.06456804275512695,0.06580901145935059,0.05657339096069336,0.06151533126831055,0.05247330665588379 diff --git a/results/combined/merges_timed/google/closure-stylesheets.csv b/results/combined/merges_timed/google/closure-stylesheets.csv index 7431469b2d..d252417b1a 100644 --- a/results/combined/merges_timed/google/closure-stylesheets.csv +++ b/results/combined/merges_timed/google/closure-stylesheets.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/remotes/origin/pull/79,db92c42dd890921c3f05b3a5ad70436b6d77f9b4,f7fe702fc889653584011e04580f2a17acfe3384,d2c0cce5c11891c086a3d055ec84e96d5b9cb559,,True,True,Tests_passed,d1cb7d86dc008c515bc6d50dad932d23ba24e7b120494ac95899a207fd332ce4,True,162,2577,11090,5,True,Tests_passed,a5fa43b88ad30c2a5aa421ca7c3bf481a28d6397e415a3fea44e55f0fe02d386,True,162,True,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_failed,971e253b4153e9f7cafa7e5672ad217affe6bd874e3877833344868e6f436f65,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,0.06411147117614746,0.06545090675354004,0.06354260444641113,0.08661222457885742,0.07178592681884766,0.08006119728088379,0.08917021751403809,0.38390326499938965,0.272322416305542,3.4496538639068604,2.322031259536743,0.20914077758789062,0.19641923904418945,0.11372613906860352,0.10167813301086426,0.11063385009765625,0.10680651664733887,0.11280059814453125,0.22272944450378418,3.412813186645508,0.11340475082397461,0.10075497627258301,0.07811474800109863,0.10052609443664551,0.07636404037475586 diff --git a/results/combined/merges_timed/google/compile-testing.csv b/results/combined/merges_timed/google/compile-testing.csv index 8bae61db45..088d562051 100644 --- a/results/combined/merges_timed/google/compile-testing.csv +++ b/results/combined/merges_timed/google/compile-testing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/heads/main,608e1cb92ab715862a2f545cf3c57e6d35ea8216,68793277942607913ed80406a80bc85e5f704d93,e4526c30efb60151257f09ebc7195b2c850acfbf,,True,True,True,14,64,548,2,True,14,Tests_passed,255f5503903ef25b5c4b1e70e49d93440bd497b95b73d207b44cc4e2a7c55e97,True,Tests_passed,6e32f9694974e9b09a3c3d28bcbb2a22632453716e92279cfb2dbb4170850915,True,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,fc29f1f7ea14f6d80b25f5d80bb72c8339f6dcb83a6734a2b561234b2a84c39b,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,2777ba35e93e405f30548acbe3e64e7d3c2aa7eefa15ae1e4f54f0669343be31,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,41a372faf0dfedbaf29f85ff72bcfc13d3a6e1c9ffe6d4e6d9f3e10f343b0f2f,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,0.0338749885559082,0.03620719909667969,0.040280818939208984,0.03146195411682129,0.04198789596557617,0.04385256767272949,0.036193132400512695,0.16551804542541504,0.11100387573242188,0.8191583156585693,2.758607864379883,0.06666851043701172,0.11149168014526367,0.033684492111206055,0.03412675857543945,0.03362250328063965,0.034230709075927734,0.03409075736999512,0.06426882743835449,0.7742624282836914,0.03460979461669922,0.03380608558654785,0.033066749572753906,0.0342557430267334,0.032731056213378906 diff --git a/results/combined/merges_timed/google/error-prone.csv b/results/combined/merges_timed/google/error-prone.csv index 44409b7053..72caa291fe 100644 --- a/results/combined/merges_timed/google/error-prone.csv +++ b/results/combined/merges_timed/google/error-prone.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 148,refs/remotes/origin/pull/3037,7c82fb57c57be56bc8276821c37372d1f2c3b8c0,67e44eb939e948219dbd6a44e80f1453bf64dd76,bc5c994d5cdbdd9e06afd636c21c99e82ff3246f,,True,True,True,5,11,47.0,3,True,5,Tests_passed,f6e7391365b398d6e0949117d67df87c22cced148659b875a80e83f5a8a9378f,True,Tests_passed,d23dbee252084f2200a601c21af777c87250b538b39c22f7c9bda9265453dce3,True,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,8c1c887aa3a90b51389033d85a621c235896337274fd0ab17dedd0f497b1fcdd,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,3a0f7882df8e4a3b69d1f683ec57ef3dd91f6f49736d96d3fc50918afc08cf7f,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,0.01760697364807129,0.018378257751464844,0.016532182693481445,0.016537904739379883,0.016633987426757812,0.017181873321533203,0.016862869262695312,0.1194908618927002,0.13504314422607422,0.021723508834838867,0.3389017581939697,0.13126516342163086,0.1427021026611328,0.053380489349365234,0.052465200424194336,0.05389118194580078,0.054439544677734375,0.054239511489868164,0.1073760986328125,0.06836628913879395,0.053231000900268555,0.055212974548339844,0.05285334587097168,0.055260419845581055,0.053360700607299805 diff --git a/results/combined/merges_timed/google/google-java-format.csv b/results/combined/merges_timed/google/google-java-format.csv index cfc761d863..3b10d5bcb7 100644 --- a/results/combined/merges_timed/google/google-java-format.csv +++ b/results/combined/merges_timed/google/google-java-format.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,True,8,26,91,3,True,8,Tests_passed,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,True,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,True,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,a2bf12c51e1298751cec7a732cb1040197b20263453e1380caa519e96100d774,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Tests_failed,dc9dfd5b92c0c56ce6537f6922a3ebb94a51ff5cf9e13941af84ddc60dcb8e53,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,f35c7e0c441e2597ff0129de7f72f046f02bf70ac2f4111b988fb3acedb13474,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,0.039758920669555664,0.044445037841796875,0.03286886215209961,0.0421757698059082,0.04684877395629883,0.04092741012573242,0.042246103286743164,0.25055360794067383,0.15688300132751465,1.8062303066253662,0.5100493431091309,0.10272669792175293,0.12395524978637695,0.043360233306884766,0.04427003860473633,0.042052507400512695,0.04303622245788574,0.04373288154602051,0.09337568283081055,1.7924234867095947,0.04277229309082031,0.04356241226196289,0.03438425064086914,0.04407095909118652,0.034586191177368164 diff --git a/results/combined/merges_timed/google/guice.csv b/results/combined/merges_timed/google/guice.csv index e229a7f96b..a021696d49 100644 --- a/results/combined/merges_timed/google/guice.csv +++ b/results/combined/merges_timed/google/guice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 107,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,True,106,455,5307,4,True,106,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,True,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,3a1f77ded00d278912d1bb29b2c00bc14142b278ab618eeb3e1ce926a7a48be9,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,0.05345892906188965,0.056970834732055664,0.05604887008666992,0.07629680633544922,0.06354379653930664,0.028115510940551758,0.03088545799255371,0.35352015495300293,0.15186333656311035,0.06041073799133301,2.5551888942718506,0.1319735050201416,0.16341662406921387,0.0727548599243164,0.07700419425964355,0.07728934288024902,0.07661724090576172,0.07865190505981445,0.13634467124938965,1.0803134441375732,0.07521867752075195,0.07487750053405762,0.07302474975585938,0.07414436340332031,0.07039141654968262 diff --git a/results/combined/merges_timed/google/gwtmockito.csv b/results/combined/merges_timed/google/gwtmockito.csv index 2c2f8d44c8..05167b9493 100644 --- a/results/combined/merges_timed/google/gwtmockito.csv +++ b/results/combined/merges_timed/google/gwtmockito.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,eec530f0d51313698a334c7dbf5906d950994698,3abecd684fe2109616c9cbf2e9c84c9ac962f129,392723cada499dd23b6808932e3007614dbef0e6,,True,True,True,5,8,125,2,True,5,Tests_passed,05172c84133878ea46ab524752cf6bf05b88f3a47c8313479d48f7b3717bbe4f,True,Tests_passed,b5fbabb3e1ecf8afa1b951f857fd02b4be01a0e14172382e845d35a259e75ae2,True,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,0.03579115867614746,0.04490041732788086,0.011561393737792969,0.037717580795288086,0.04535531997680664,0.04867100715637207,0.04729175567626953,0.16033220291137695,0.10518383979797363,0.9591810703277588,0.5035443305969238,0.07086586952209473,0.12699675559997559,0.04159903526306152,0.040953636169433594,0.040262460708618164,0.041053056716918945,0.03943586349487305,0.07371068000793457,0.9656333923339844,0.040282487869262695,0.040839195251464844,0.028847217559814453,0.04077768325805664,0.029489994049072266 diff --git a/results/combined/merges_timed/google/identity-toolkit-java-client.csv b/results/combined/merges_timed/google/identity-toolkit-java-client.csv index 70f28567a8..999b69fb2c 100644 --- a/results/combined/merges_timed/google/identity-toolkit-java-client.csv +++ b/results/combined/merges_timed/google/identity-toolkit-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/remotes/origin/pull/38,f6edc3c022d66b33913deaac59cb7f42ab46303a,b86a722430a5458bc1183b2133b55de75eb71c2e,7d39b4815e3aef9aa5944f44ce7a96fb4915a7ba,,True,False,True,3,4,14,7,True,8,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,0.044400930404663086,0.04256844520568848,0.04122185707092285,0.04743671417236328,0.0451812744140625,0.039623260498046875,0.043646812438964844,0.1410996913909912,0.10522770881652832,1.1406700611114502,0.4028971195220947,0.0711669921875,0.12417721748352051,0.04019665718078613,0.039405107498168945,0.03997063636779785,0.03942465782165527,0.04014396667480469,0.07130551338195801,1.062737226486206,0.0387117862701416,0.03869509696960449,0.02884387969970703,0.03928399085998535,0.0284883975982666 diff --git a/results/combined/merges_timed/google/truth.csv b/results/combined/merges_timed/google/truth.csv index 33e5db84fa..221be6bb93 100644 --- a/results/combined/merges_timed/google/truth.csv +++ b/results/combined/merges_timed/google/truth.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 110,refs/heads/master,9289ed34ae5c0561c9e33dbb7b7b7c6750e4a410,2bb82cafdf685242cf1cb0b915800f0bd2d6b0cc,2bd108d91dc1f0cdda8ef5767b0a10af40af7f57,,True,True,Tests_passed,65e865e9e9ccd9dccc0cdf0150df3b34a406dd47e8cf3b06dc5380009ea54141,True,10,73,344,3,True,Tests_passed,7f1db2e138c97832484c628f6bbb8a789bb7bb9e2232377758334faab73bf20f,True,10,True,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,f9978053fa38bfdff63f9f27a07046b2ace3167c8bf1073931026c25208098dc,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,f8281e339370b1a586d729ea7ffbd0e19c0e10197f8bd96b7e7d323176a11d86,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Tests_failed,a74d2c0d1ed40df295f4977d857bc033fc01618b3fb7ab444554a6acab88b442,Merge_failed,10c01c61475f0e77716d81ed505b88599c11e6ec5d481758d2deb8d37f437f43,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,f9978053fa38bfdff63f9f27a07046b2ace3167c8bf1073931026c25208098dc,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,3086048b47d2a50d92792a688bd0561b41f877145c06d2e0a2744e0d7af165db,Merge_failed,149990e34d9e1730d41f1032f27c190a072f6195b5e714e40d73e9dd91d4833d,Merge_failed,cc247b80711a9a16f4b8a637dad8342f2f066db25b5c8f0e577e9025a5906f09,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,adf536af9e86bceec78d7caec1e074ff79f393b1faf196343a5ac29479a11f3b,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,Merge_failed,70287bb49b28d481178c06a3de6bdcfd4ff73d4bee71962871099c92c738574e,0.010350465774536133,0.00928187370300293,0.009069681167602539,0.009403705596923828,0.009437322616577148,0.009463787078857422,0.009218692779541016,0.06131410598754883,0.12194585800170898,1.2289559841156006,0.7890748977661133,0.10015010833740234,0.11999201774597168,0.04242372512817383,0.042781829833984375,0.04219698905944824,0.04262065887451172,0.04207634925842285,0.08854866027832031,1.2036914825439453,0.04248547554016113,0.04187154769897461,0.041620731353759766,0.04244351387023926,0.041452884674072266 diff --git a/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv b/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv index b4f62f653e..51af0b908d 100644 --- a/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv +++ b/results/combined/merges_timed/googlecloudplatform/gcloud-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 955,refs/remotes/origin/Neenu1995-patch-3,1fa53a817ac6c3962ed89645b0ca86e276e73bdb,5d8d1237244e0c8b9a76dc66782d6c69cdd916ac,86065a7fc7d130977a40b99b2bf77d6889d84418,,True,True,True,9.0,26,503,2,True,9,Tests_passed,b16ac46f049d06e80e45614469dbf59bb2d368b58f4ce792b254fdc5d93449fb,True,Tests_passed,a4d336918f7ec4998f682688726e185c62d12c2a625ac21823c68101e574b9a2,,True,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_failed,585b43a98be190e944262efc2216f5397c62cf30efc88448f4602f9d1256382b,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,0.0189969539642334,0.01877140998840332,0.022920846939086914,0.023005962371826172,0.02284526824951172,0.023261547088623047,0.02339458465576172,0.05188441276550293,0.0745542049407959,1.4598751068115234,0.7324018478393555,0.09678792953491211,0.1332993507385254,0.062197208404541016,0.05146384239196777,0.06748437881469727,0.06528830528259277,0.06644821166992188,0.1023261547088623,1.482849359512329,0.046570777893066406,0.06123614311218262,0.033391714096069336,0.059433937072753906,0.034082651138305664 diff --git a/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv b/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv index c3c9988397..58a5af95fd 100644 --- a/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv +++ b/results/combined/merges_timed/googlecloudplatform/gcloud-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,8e04ccd0191c04aa74799a10ec32adefa0e1800a,cf3945112d4fb7b8d6907b6d801cd6f0ff33c1df,dc10b3241e4dcf41b74259f2bee758a776c3e4da,,True,True,True,10,54,371,2,True,10,Tests_passed,dca5e099a34494c2542109ed2f67e540e6b1a8cdfa9025a535d9508a4994ef55,True,Tests_passed,4d6107c7ac2a21b62880c061b98a066df5393838964f2947a295dddf5f3bb2c1,True,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_failed,44e51bf2c931f78cdf98afbc860646c3038d89a45dcbdad5c544f7974eef55aa,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,0.009694814682006836,0.009704351425170898,0.010267019271850586,0.010416507720947266,0.010201454162597656,0.010245800018310547,0.010239839553833008,0.034464120864868164,0.06564879417419434,0.8232579231262207,0.48569440841674805,0.07132577896118164,0.12999773025512695,0.040595293045043945,0.04201483726501465,0.04208636283874512,0.04225969314575195,0.04183697700500488,0.07593035697937012,0.8630671501159668,0.0407259464263916,0.04100823402404785,0.03135943412780762,0.04159212112426758,0.030443906784057617 diff --git a/results/combined/merges_timed/gpedro/slack-webhook.csv b/results/combined/merges_timed/gpedro/slack-webhook.csv index 0e61c79f14..fadb30157d 100644 --- a/results/combined/merges_timed/gpedro/slack-webhook.csv +++ b/results/combined/merges_timed/gpedro/slack-webhook.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/remotes/origin/pull/41,566974e6f460456d9dbd46a27b39d49b50964c67,66aa7d7688037883abc3af82259df71ffe030fba,bcb855e94165d363b7594ad88124ee4e3691dd55,,True,True,Tests_passed,3fbc2ea8ee1656d19e9b4eda46020ae9f7cb5d0e775bfbc3c361aa930890974e,True,11,97,1569,2,True,Tests_passed,b8cbd74e5aa723b4164bdc734ed836647972b3f2f5dd2e72f87c0945a726c25c,True,11,True,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,e55ef79de5e925f4d4a90a181b6ee9aa93cb7baa48fd12bc030d5a0a507d2847,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Tests_failed,80c0982c27dd5b27c6639d36d6b0b46b8a692f0369afa27050eccb8aecdd02a5,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,fd9182372c3b207e33fdf5a8456619a3d79cd0daba81be3f8f22ebcfa4a66a19,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,0.03994560241699219,0.04597592353820801,0.035974979400634766,0.04569435119628906,0.03873300552368164,0.03251242637634277,0.039237022399902344,0.16608262062072754,0.10605573654174805,0.6003727912902832,0.3472268581390381,0.0632181167602539,0.1130056381225586,0.03203010559082031,0.03767108917236328,0.03232169151306152,0.03182554244995117,0.032286643981933594,0.06289839744567871,0.5948684215545654,0.03266143798828125,0.03762698173522949,0.0305788516998291,0.03250598907470703,0.03123641014099121 diff --git a/results/combined/merges_timed/graphaware/neo4j-noderank.csv b/results/combined/merges_timed/graphaware/neo4j-noderank.csv index d6994e5fc2..f61baaed1c 100644 --- a/results/combined/merges_timed/graphaware/neo4j-noderank.csv +++ b/results/combined/merges_timed/graphaware/neo4j-noderank.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,01ca7a83cadb126fcef90405f4a8036ac2a22a02,b78badfb88462adb87978da091e7b7213e3aa6a1,19602ad06a849def37a2de307a320871c1328fa2,,True,True,True,13,34,289,3,True,13,Tests_passed,b739cf8e7d2ddc904d23ed4d66172c163ca413d14e78fe6d07f25048595de770,True,Tests_passed,76bc71509d3cb6f40997b441785bfd2d0a99c13d3ffaff70a495597d6db6eeae,True,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,a0b8645cbbfe24cecd504ca8de488be49dda1f96327e7a8fd7242a793a3ed225,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Tests_failed,e6e4833c9cb895916b90b152dabfe992e39d6d10805fb7bb6ae788b4a21d4aa5,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,c9d4a819d219de3f4df3de9195da68448aaea089677ab6ee7762eedf447a6d45,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,0.03881120681762695,0.010079145431518555,0.0406341552734375,0.04339456558227539,0.04344344139099121,0.0417025089263916,0.03421664237976074,0.2324082851409912,0.16808867454528809,0.6346402168273926,0.4796874523162842,0.09731388092041016,0.12054848670959473,0.04135942459106445,0.041808366775512695,0.04081416130065918,0.041787147521972656,0.04107999801635742,0.08909273147583008,0.6325182914733887,0.04144906997680664,0.039969682693481445,0.03249979019165039,0.04141712188720703,0.032262325286865234 diff --git a/results/combined/merges_timed/graphity/graphity-client.csv b/results/combined/merges_timed/graphity/graphity-client.csv index 242e57cb30..62b4a26b9a 100644 --- a/results/combined/merges_timed/graphity/graphity-client.csv +++ b/results/combined/merges_timed/graphity/graphity-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/heads/master,2a8e8c75e97d82b9c1bf5562af018b45f86d3120,4f9464b5b8eadf89842546b95f4c25f03d6de7a4,5d8fb283a53c4f40897bb50f7003c5453bb2d1df,,True,True,True,2,15,138,3,True,3,Tests_passed,bca72e5f7a121e2b7c9742dd6d912b8bb96c19728bfa385f97e30cda07bd9a5d,True,Tests_passed,e58d47f1eb3a9defe1a30ee25b100aaf65649fe7c9b820adb971c9b192f9c5fa,True,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,609096401f319af53729556d12df86a7ffa839aa409a7e7188eba9f92f672a7b,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,295dc05b06b9a474ae07c712784fd5605e6feaf3daa0158b4b822d0d6d35c607,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,4bb621c0f92fb8e448ad34d7ac4a4b4f441a816b7f4bd4cf381903fd10e5097c,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,0.04575514793395996,0.054825544357299805,0.032572269439697266,0.02664351463317871,0.047010183334350586,0.05107283592224121,0.05192232131958008,0.07908177375793457,0.11442303657531738,0.6508941650390625,0.37574219703674316,0.07887578010559082,0.12623906135559082,0.0469820499420166,0.045551300048828125,0.04627346992492676,0.04413127899169922,0.04531216621398926,0.07974648475646973,0.6202750205993652,0.043271541595458984,0.04450416564941406,0.04527544975280762,0.04436039924621582,0.04343008995056152 diff --git a/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv b/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv index b0a6792b50..583d578500 100644 --- a/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv +++ b/results/combined/merges_timed/graylog2/graylog2-alarmcallback-slack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,63afb94bcd157b7ffe10dcef43743a33946c65ff,3d1fd37c02b7c581c557a51b252d80769486b6bf,69d6d1cfd2703a67895e69a54b3fcb023486ceab,,True,True,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,True,17,80,544,3,True,Tests_passed,fd24f961bdb1aecd6946626939129009f14f5d0a88ed8a33f96958841217a762,True,17,True,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,60bfb63b214860f427d22fc3be2973563e6309b787ab9744312b3997658a06f9,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,2ce71682c30b454d6ceb2382b4ea0e12d76a7a0aa76aa540ca8be9f9e27b6d8a,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,2de73c0b0bb79e757a5839861d6206857043bffaa2ce7ae66a3686f400110242,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,0.062256574630737305,0.04365801811218262,0.06002449989318848,0.04974818229675293,0.054126739501953125,0.06640267372131348,0.06296443939208984,0.2233598232269287,0.16398215293884277,1.3605239391326904,0.5637493133544922,0.11699652671813965,0.13814115524291992,0.05097055435180664,0.0506587028503418,0.05076456069946289,0.050968170166015625,0.05162477493286133,0.09828519821166992,1.34417724609375,0.050675153732299805,0.05018806457519531,0.05018973350524902,0.04949188232421875,0.050597190856933594 diff --git a/results/combined/merges_timed/greenlaw110/rythm.csv b/results/combined/merges_timed/greenlaw110/rythm.csv index b07b4a4e17..b20f863b2e 100644 --- a/results/combined/merges_timed/greenlaw110/rythm.csv +++ b/results/combined/merges_timed/greenlaw110/rythm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,d9f68867177eb40765426874c583d9a70c5a4da8,e088577eb5a25ca06c9c4d9b55f90411af1fed87,7a55514a2ed5fbe7bc1b7a62b1ef8875acb5022e,,True,True,Tests_passed,0ab73f64daea558fd3c8b4439fce916828af4f6be054b5b414cbbf8e2224a00b,True,15,149,783,2,True,Tests_passed,44f6503cd197e144e642eb737680fb2579d2e56ed3f9f2b96d79fce244385aa1,True,15,True,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,0.021421194076538086,0.021729230880737305,0.02681565284729004,0.014297723770141602,0.0263979434967041,0.02720355987548828,0.02721881866455078,0.04649829864501953,0.07649898529052734,0.6062009334564209,0.9306957721710205,0.10350537300109863,0.17103862762451172,0.06845664978027344,0.04790997505187988,0.06484413146972656,0.0700523853302002,0.04870915412902832,0.08644628524780273,0.6615440845489502,0.0472872257232666,0.06334590911865234,0.05745220184326172,0.04820823669433594,0.0551304817199707 diff --git a/results/combined/merges_timed/greenmail-mail-test/greenmail.csv b/results/combined/merges_timed/greenmail-mail-test/greenmail.csv index 2822a55f89..0d84e2e841 100644 --- a/results/combined/merges_timed/greenmail-mail-test/greenmail.csv +++ b/results/combined/merges_timed/greenmail-mail-test/greenmail.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 57,refs/remotes/origin/pull/294,e152dc4b90c0ad478ee886f8b110c5b220d46b05,d3ea847b346eb8879c2509681601175362e98875,2029ffd8f633897fa35c933c3ef46f969664dafe,,True,True,True,33,79,507,4,True,35,Tests_passed,25c6de389e070410d9bd2baf703df18e116736f675d91bfce83fe2188f3c799a,True,Tests_passed,face7a5e90020187a96ed0a13ab332d8091de7f093cc0f42386589e7aaec5c8d,True,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,fcf3902c1881a2fbaabbb9ea6aafbc391dada549566c98750e95a21ee4d81031,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_timedout,,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,b26bc4b08d89123133c47fde0e3940da901c5905bd692d67f12ee7c86fca170b,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,0.020759105682373047,0.012636423110961914,0.023023605346679688,0.01642155647277832,0.02302718162536621,0.023311614990234375,0.022675514221191406,0.05486464500427246,0.07707500457763672,0.6110186576843262,-1.0,0.09076452255249023,0.12098836898803711,0.04010319709777832,0.057851552963256836,0.054496049880981445,0.05442380905151367,0.04067397117614746,0.07743310928344727,0.640434741973877,0.04108619689941406,0.05338931083679199,0.05295085906982422,0.049128055572509766,0.03907322883605957 diff --git a/results/combined/merges_timed/greese/dasein-cloud-core.csv b/results/combined/merges_timed/greese/dasein-cloud-core.csv index 1fd92d86fe..802bffbb80 100644 --- a/results/combined/merges_timed/greese/dasein-cloud-core.csv +++ b/results/combined/merges_timed/greese/dasein-cloud-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 219,refs/heads/master,841d623662ccc6ce6d67310f65a26c751ae02e0e,5290164d76259e90ccc744a4a51d7492a5ea2eb9,3be7127c3dd09899fa0a9f5058a8787245611f81,,True,True,Tests_passed,483a04f4ddb6cce3ab81233802959831f7890b7a483ff16e01f6441f8e5ec2f4,True,12,42,406,2,True,Tests_passed,7b3b7846b4ca1c82110f60d262f6a951adb29456a1009bd063d9c7306a53408a,True,12,True,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,596f696f4dac713da51c17fa04a736949dbf3766230c6733ced71e1acaa6ba60,Tests_failed,9306f6a29d92e68a28a94ef8ce13961017fa62a102e2042e891a0b91e38008a1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,596f696f4dac713da51c17fa04a736949dbf3766230c6733ced71e1acaa6ba60,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,d423e9e3d96c6dd2a976a5a8c88d4db7f88b11f055d084a461367161d63f27d1,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,Tests_passed,127c9224c939649ec9cdde298258d9b7edfd19740150bdaa8d84dcfb7bd165ca,0.012648344039916992,0.04090523719787598,0.04495859146118164,0.039872169494628906,0.02680802345275879,0.03631281852722168,0.026134729385375977,0.12583494186401367,0.07440733909606934,1.2853891849517822,0.4735300540924072,0.08116793632507324,0.17939138412475586,0.08279252052307129,0.08295726776123047,0.04492545127868652,0.08036208152770996,0.06562209129333496,0.0791463851928711,1.224287986755371,0.07392525672912598,0.04539656639099121,0.057265281677246094,0.06882309913635254,0.03381752967834473 diff --git a/results/combined/merges_timed/gridgain/yardstick.csv b/results/combined/merges_timed/gridgain/yardstick.csv index 741fc2b1ff..aad9d6ef2a 100644 --- a/results/combined/merges_timed/gridgain/yardstick.csv +++ b/results/combined/merges_timed/gridgain/yardstick.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,094b8c16a3d14302e26113a542cc760f07a36007,32183ef3c8feb4b54a40047ea9aa93e2de372abf,b112625effff3d71f6d013960afe1c39d433a923,,True,True,True,7,9,539,2,True,7,Tests_passed,036666862ab023d692f66b134b3ea54d0a1979a98b2692d6cc5a44f0b1b45373,True,Tests_passed,f1952b5c43a667a084ebf1d5680f6eaa5cad790b9f422d70248f23084d31ead4,True,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_failed,fccb598a3b4da346cc542606cb6961435458d510505d99717aad586e9ff323fb,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,0.043456077575683594,0.0452883243560791,0.05102872848510742,0.04962038993835449,0.04447031021118164,0.05230855941772461,0.05262422561645508,0.15249204635620117,0.10938072204589844,0.7755532264709473,0.3002188205718994,0.0741879940032959,0.12861251831054688,0.042397260665893555,0.04356551170349121,0.04151034355163574,0.04319500923156738,0.042519330978393555,0.07691168785095215,0.7865452766418457,0.041252851486206055,0.04305005073547363,0.03084421157836914,0.041954755783081055,0.032018184661865234 diff --git a/results/combined/merges_timed/grove/presto.csv b/results/combined/merges_timed/grove/presto.csv index 1ade7a5006..f9fe5bb030 100644 --- a/results/combined/merges_timed/grove/presto.csv +++ b/results/combined/merges_timed/grove/presto.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 64,refs/heads/develop,a5fd26fc395910e29b06fc2ecd2c1b73e23c5302,dea6844b19d27a50e13b38583b9725f0dafdee9e,574ca670a35f9747d61a248662614fdcdfc1a2c5,,True,True,True,13,72,531,2,True,13,Tests_passed,074f92109209ed78678deb35bcee52a7a6669a4096ae2372208cba8c64a7ef5d,True,Tests_passed,c3751098e5cf4e4b0d3708b9b539c9cf6016699fdb92310fe0c8aec276f9aee0,True,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,4df4b7068192a1f70a43fada3ea08714c75db3a0e7cb553f8ab7695e3ed9a485,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Tests_failed,0700a67a9ab05a621025a0dc2b31ecb1686d80b344d5f83ddacb40e862411e17,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,e4fb6ed16a336f5b06b7504fba5bc21ca59e29d5b65ababe8f473e99fe1f2e8e,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,0.040767669677734375,0.0500178337097168,0.05116987228393555,0.0509190559387207,0.061208248138427734,0.043459415435791016,0.04870963096618652,0.1896038055419922,0.13439011573791504,1.3830535411834717,1.1689856052398682,0.07992792129516602,0.11878275871276855,0.03968000411987305,0.03934979438781738,0.039585113525390625,0.03890252113342285,0.04041600227355957,0.07392120361328125,1.2948999404907227,0.04000663757324219,0.040318965911865234,0.038321733474731445,0.040611982345581055,0.0372157096862793 diff --git a/results/combined/merges_timed/grundid/nfctools.csv b/results/combined/merges_timed/grundid/nfctools.csv index ad70afec92..2eafae2d1a 100644 --- a/results/combined/merges_timed/grundid/nfctools.csv +++ b/results/combined/merges_timed/grundid/nfctools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,2c2a51262a91233576dbe1b94adf94d040103525,ac436f67afac76d8cfe416884952d513653d04a9,5f456359d7dc8abb41247de59caa2d896f5fbbc2,,True,True,Tests_passed,12149ef240e3568470e93a8efdfca36a4e284154bbc85b95d13a60cbc8e39c09,True,114.0,215,4751.0,2,True,Tests_passed,5f556d386d8daa754e9d75a00f96d9a6dacb73afafeb6b53b31dc78fc24a263a,True,118,True,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,3ca2f672944a5c869a19ce9253cc9decc71d846b4f7855cb8ede6408a759625c,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_timedout,,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,19516b29490f3054a0678386f17df7f49712f5cada3191bdd5a43ae300906565,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,0.060439109802246094,0.05879688262939453,0.05813765525817871,0.06513261795043945,0.060800790786743164,0.05149078369140625,0.053951263427734375,0.17128372192382812,0.13067150115966797,0.4301767349243164,-1.0,0.08722352981567383,0.12956666946411133,0.045625925064086914,0.07204222679138184,0.04532027244567871,0.05393719673156738,0.04269242286682129,0.0889580249786377,0.4482152462005615,0.043456315994262695,0.06444168090820312,0.04118537902832031,0.053717851638793945,0.03992319107055664 diff --git a/results/combined/merges_timed/grunka/fortuna.csv b/results/combined/merges_timed/grunka/fortuna.csv index 90d17bf066..fbd49352cc 100644 --- a/results/combined/merges_timed/grunka/fortuna.csv +++ b/results/combined/merges_timed/grunka/fortuna.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/remotes/origin/pull/1,b53b9078df7906fa163e52bf892e8f120c7784ca,e387b50474e7e19df4428a630dfa71e60c28824a,d038300dbf0151a6bde3a1c9dd77a7f7ac4df050,,True,True,True,42,104,906,3,True,43,Tests_passed,c2353a21c685c4fe46db4c570183b1b46cef1a2daacca8cf16f4ec0e6a8939ca,True,Tests_passed,8eddbe1d714bcb573edaa2f601f83af565afe376078aeee20611b344f2787f16,True,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,e39a8f0616da2f5097bde218baa825d7ffcc73cdd4fa7b2b76ca12bade4f0e7e,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,3a376f471ccbff178f421675e314ea71ba8aad4a4faabf558346f57521de2517,Merge_failed,23a05aa1f8ae94d72a505a8994de4733f0f5e067c2b8998e40bbfdd620c063b2,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,d79b73e0ec12721d6178da26a28d099f75cbbe004c1eab0ea4d2082f999605ef,Merge_failed,a48cd0f09d10e2419ecd0c848f5cae614d7e3bcf6a74d8b8da8c1fc8995f8554,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,0.04694247245788574,0.04844260215759277,0.05316162109375,0.05234932899475098,0.056101322174072266,0.022815942764282227,0.05246567726135254,0.24225831031799316,0.18371152877807617,0.5730974674224854,0.5252881050109863,0.09461688995361328,0.11972665786743164,0.040192365646362305,0.041210174560546875,0.04036116600036621,0.0405426025390625,0.040578365325927734,0.0893545150756836,0.58878493309021,0.03955888748168945,0.03927016258239746,0.03975081443786621,0.04022693634033203,0.03941941261291504 diff --git a/results/combined/merges_timed/guhilling/cdi-test.csv b/results/combined/merges_timed/guhilling/cdi-test.csv index 3962e5c329..34a17d047f 100644 --- a/results/combined/merges_timed/guhilling/cdi-test.csv +++ b/results/combined/merges_timed/guhilling/cdi-test.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/main,728b39ab384467c2a5bd8949528901cc9e532da6,558ef6bdc34c99dbbb3c1b43b683765af23b451e,e59f3187e74b6c45bced49be01756309a26daa31,,True,True,True,133,195,807,42,True,140,Tests_passed,2d495716ef5fe5cae34e639c6401f5a971c63f0f51b3920087919ef33ae24e8a,True,Tests_passed,23bd722855ff0f4a9b8ad8aa0a951ed06e32d99de77b09636f2f72f05da10065,True,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,d4b079d43144dd60f225f9326bb298255014464810c2073606bc51365d4457ac,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,078c5f4e4e8ddb47a4bd5e78feb2481b9fd80b071ff05dc5c711d84372395d45,Merge_failed,78ad8afe5e4bf5ff19e658e92be85fb2bf5ce0e2ac2a868b3415affbb86c4c95,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,77ac8a7ca9b9d8e649bf46096e88bab393c98a1df1f8f581bd598e147ebfb3b0,Merge_failed,937e757be7689bcc3aea2af11870b3a86e3e6ea1fc65a1780fe9c9a48d3cd100,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,0.06470561027526855,0.062088727951049805,0.06378483772277832,0.0635380744934082,0.07671999931335449,0.05745887756347656,0.05684351921081543,2.241236925125122,1.9729368686676025,10.513340473175049,0.8463308811187744,1.093693733215332,0.36476564407348633,0.26654481887817383,0.26776599884033203,0.2701573371887207,0.2689247131347656,0.2682831287384033,0.8447673320770264,10.673071384429932,0.2694547176361084,0.270571231842041,0.15549588203430176,0.27224040031433105,0.15496420860290527 diff --git a/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv b/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv index ff80831cab..5ebfeaa85c 100644 --- a/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv +++ b/results/combined/merges_timed/gwt-test-utils/gwt-test-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,e65277e5e16f96f58ece40a889b291953522193c,efff4f30629859a45cc06fcaec59a8e15a66756a,7f9f72c2ed3a2ca75cc4b124ded0be4fdb247b36,,True,True,True,177,522,3657.0,4,True,177,Tests_passed,efd41c8f4772cbe50b19df2233114f2f0652169b520c8a69a5801e1b8e7c36de,True,Tests_passed,5a180168eb246b2256e408e2b3520fd3b64f1bdde485d6ba6d6f0000a4bc123f,True,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_failed,3ab99c6b3085cd3e91565690395fa0e03827daf102b151ef73c11a4062d36cc7,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,0.06538867950439453,0.06130099296569824,0.05102229118347168,0.05135464668273926,0.05623626708984375,0.061049461364746094,0.06355857849121094,0.3112502098083496,0.22670650482177734,2.2529942989349365,1.894561529159546,0.15810513496398926,0.17590045928955078,0.08521699905395508,0.08475542068481445,0.08355116844177246,0.08542823791503906,0.08208990097045898,0.1564769744873047,2.1692028045654297,0.08027410507202148,0.07633161544799805,0.05013704299926758,0.0757288932800293,0.05055379867553711 diff --git a/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv b/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv index fb074b53d5..321498e9c5 100644 --- a/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv +++ b/results/combined/merges_timed/gwtbootstrap3/gwtbootstrap3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 273,refs/heads/master,4fc9137691f262d79c1f7844d85659dea906122c,2bf9681565c5afb56975302f7b43f0b1047bb7df,d88b69006707290f80fc2b2015248303168a9c22,,True,True,True,169,574,2953,51,True,174,Tests_passed,b7b26bc5205b94a2a0e2a37bb032595181f027649c9ce9b15cf7fb5eab498f8c,True,Tests_passed,8a7a2318b73299229541277f9b490ae8d01aef524eb3dfe5f6f6ceaf50fb2a7e,True,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,0aee480b98d6206990424557f1cf91a093bea7b63765e02ab8352b7870a15397,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,81a37314ffca041287d562de763ebef70b878c328d2e9e47fed760750ea1fe48,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,629ce5fa81bdc50fee15811c37e9f0028e74516aaa16af4c1123f3503d1f0ca1,Merge_failed,f8aef93575b24911ab30eed5932828fe0bdc02f31e5f767baaddce3bbf5e6ca5,Merge_failed,6d4b5e1d084c118e17cd6a1cc5dfdd5ec798af5f4490b148306a51896cf93807,Merge_failed,95fb3f2d279be0522f7ffbb3b996f1243adc38842592ac0322010543083e05a3,Merge_failed,f8aef93575b24911ab30eed5932828fe0bdc02f31e5f767baaddce3bbf5e6ca5,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,81a37314ffca041287d562de763ebef70b878c328d2e9e47fed760750ea1fe48,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,2a237a30c8392e07de17a4b5f9cd246af8d6cddaf8f97745749f1955df9348b7,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,ebc6236279a97fd3d508d3aa516545e92ae5e505d147a8fd19dba7ceb4631e36,Merge_failed,6d4b5e1d084c118e17cd6a1cc5dfdd5ec798af5f4490b148306a51896cf93807,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,0aee480b98d6206990424557f1cf91a093bea7b63765e02ab8352b7870a15397,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,Merge_failed,908bd42ff1cb4f6ae1398ef23215f20951f2b9982047396e2a6bbac855259230,0.03880167007446289,0.059484243392944336,0.06165170669555664,0.05971837043762207,0.061612844467163086,0.07290172576904297,0.04823184013366699,2.9213786125183105,2.663084030151367,19.77274489402771,1.016146183013916,1.506305456161499,0.4836609363555908,0.3888061046600342,0.3914477825164795,0.4080784320831299,0.40673279762268066,0.3909907341003418,1.215437412261963,20.091743230819702,0.39685964584350586,0.4046022891998291,0.07340645790100098,0.39327216148376465,0.0948948860168457 diff --git a/results/combined/merges_timed/hansolo/steelseries-swing.csv b/results/combined/merges_timed/hansolo/steelseries-swing.csv index 68809296ed..fcacc0eb59 100644 --- a/results/combined/merges_timed/hansolo/steelseries-swing.csv +++ b/results/combined/merges_timed/hansolo/steelseries-swing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,cedcf92cbdcad2cacbd5024e498fc27743b9a3bb,1dd3e17fce2fe179b87f09d05280cc060c1c2cd1,f8353e7a7fd40ef96510bb7c916c7d98c1be5dc7,,True,True,Tests_passed,c5ed1c77a88572d015ce9c1a57ffef874ff16034108983ad86af17e5441a9a34,True,31,244,576,3,True,Tests_passed,595be49e121f26a4ab8df4c3315ddf66690a84e1ca37af74df4858846c6325f1,True,31,True,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,0.0373377799987793,0.0379788875579834,0.06439423561096191,0.05734109878540039,0.032700300216674805,0.059618473052978516,0.0752251148223877,0.28786468505859375,0.16938161849975586,4.507865905761719,1.7933149337768555,0.15541815757751465,0.19593524932861328,0.09601950645446777,0.07859253883361816,0.09356331825256348,0.07166337966918945,0.09659671783447266,0.1649923324584961,4.175114870071411,0.06768608093261719,0.08406972885131836,0.06595110893249512,0.08980250358581543,0.06843876838684082 diff --git a/results/combined/merges_timed/haraldwalker/user-agent-utils.csv b/results/combined/merges_timed/haraldwalker/user-agent-utils.csv index f71929b7a9..21897c60ce 100644 --- a/results/combined/merges_timed/haraldwalker/user-agent-utils.csv +++ b/results/combined/merges_timed/haraldwalker/user-agent-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/trunk,97242682eae8013625be47c8c513432d99ed305b,3d692feb91e6438feed318bcfd0550f1cedad290,4f3f972165b6407adc775b763649ae1b7ddceb4b,,True,True,True,12,46,528.0,2,True,12,Tests_passed,600c3c40d5a655bc1d04abe0244a7d75ee41728152a9d319f59e9fcaa941f6e9,True,Tests_passed,b2d8f8478caeb7907d7b7843ad009c33d341e9646cc9b4b8b8f8c609795812e1,True,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,0.040015220642089844,0.04243612289428711,0.04230499267578125,0.034894466400146484,0.05065631866455078,0.04614138603210449,0.059865713119506836,0.177534818649292,0.11368346214294434,2.816448926925659,0.6438283920288086,0.0914011001586914,0.1511526107788086,0.05479311943054199,0.057004451751708984,0.056977033615112305,0.0565333366394043,0.05601644515991211,0.09556722640991211,2.6527884006500244,0.05409121513366699,0.05403280258178711,0.0457761287689209,0.05202150344848633,0.04482841491699219 diff --git a/results/combined/merges_timed/hdiv/hdiv.csv b/results/combined/merges_timed/hdiv/hdiv.csv index 4ce9fae91a..41b2eb1974 100644 --- a/results/combined/merges_timed/hdiv/hdiv.csv +++ b/results/combined/merges_timed/hdiv/hdiv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,3d002a41907d808d059bb7c1ff4aaf3a3a76f411,76f1f9fc5bf03cd2ff1696b65444189675b96ca2,50ed0486e9c518c3c9d3a6919e38effbe871f91f,,True,True,Tests_passed,033cccee63cc3f7670b7a9e770a5a1790ee7cd90008aba465cf22a22766136cf,True,22,43,191.0,40,True,Tests_passed,fa75224b7fda1adedf30ec0339207cb18df05c988621cd389b86b2bee35c2afd,True,50,True,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,395e9c222363a8b766325192303c6748463916af1004353f0c36ad014ff00b81,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,d1310bfda8547bd309eb384301584c124872d0b62c63fa251d1954008fb5021d,Merge_timedout,,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,50040c4538819702f7014e4f1bb47cbebeba2bffdbe3f131a6bd72df81ede795,Merge_failed,795505407e640377a2657707a80cbf9bd8debed66a5fe2fc159bf1e6b6345a0c,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,0.022853374481201172,0.0572504997253418,0.06012773513793945,0.04733562469482422,0.05400538444519043,0.04455971717834473,0.05291891098022461,0.8184812068939209,0.7011914253234863,1.4335262775421143,-1.0,0.428264856338501,0.19705867767333984,0.14587903022766113,0.11050987243652344,0.11127018928527832,0.10973715782165527,0.14407110214233398,0.2998313903808594,1.4603114128112793,0.10817694664001465,0.11134076118469238,0.14347243309020996,0.11072540283203125,0.10875511169433594 diff --git a/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv b/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv index 9ac689b43c..a44762ee22 100644 --- a/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv +++ b/results/combined/merges_timed/hdrhistogram/hdrhistogram.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 56,refs/heads/master,127046e0c90ca79a98b818067ca1d47c66e2745b,89c43df4fbd64c0deda228b3721eabb235eeeb6a,f6fa7fdfcebffbdecbc94dc5b858f53fc49226de,,True,True,True,184,520,15210,2,True,184,Tests_passed,fc92a264f353c9873cd991a7a4dcd9a1c317cad777364f71242b8ee72c44516f,True,Tests_passed,92399ca42febcac70dd802560350ef996dfe9ca2551e1255e8f4bd97ddc7bec4,True,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_failed,7634ad98d27076cd05ef04e6e98bbbce652e82eb12c3202bba4a34f5bc145454,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,c7e4ca3391f01dbb3e54cedcda92330bc0b163981a27cfb44f63f6ebfe3a7d8e,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,002a5c364b5ec1bccce17d2adabfaf4526948b6510c618a5b7e6a67f4d44ed16,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,Tests_passed,856c9f6b11eecb4d09bf0cfd07dbfdacaa35c6a3c2ac560c5db55dd1d1b9180c,0.02932906150817871,0.0518956184387207,0.0480799674987793,0.028234004974365234,0.028704404830932617,0.03468632698059082,0.051006317138671875,0.11425399780273438,0.08771491050720215,0.6546108722686768,1.484583854675293,0.08870434761047363,0.19862079620361328,0.09875869750976562,0.061380624771118164,0.0942995548248291,0.09588170051574707,0.05940985679626465,0.13959336280822754,0.6981587409973145,0.08002233505249023,0.08464574813842773,0.047789812088012695,0.0813295841217041,0.038652896881103516 diff --git a/results/combined/merges_timed/helpscout/helpscout-api-java.csv b/results/combined/merges_timed/helpscout/helpscout-api-java.csv index 278576fd70..0b53e02037 100644 --- a/results/combined/merges_timed/helpscout/helpscout-api-java.csv +++ b/results/combined/merges_timed/helpscout/helpscout-api-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,f606dc7048e32d8953594011ce7a80f8f325a5eb,f6b775455a0f59685e5a40fc597311bff6f01c7b,8f841dfa133c723515a234b19f123b8c5b2a4e83,,True,True,True,45,168,3089,7,True,45,Tests_passed,fa0d20130c3cff3b3b8f9913dc0afedd830cf8c8fcaa6fe22a50d77d09954e08,True,Tests_passed,32d1ec04af7938d97805196b6701280b7da35d683e3047b1ff26f679ca0ad17f,True,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,45fc83145ad2e907d40aa629e7c1202e987a6152850994d826a81a42132cf8f6,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,33d866029c769678c78bdccae388d87203c447ed2351d25c937d29d64df13474,Merge_failed,c8da6b370a1d00d54da443bb6c35e0a4532994cc63a7c0f65f5390480978eaf2,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,e46cd3e5fb199574407d13a52946aa3df90ea644d54e07b8fbf32a30aed85f6a,Merge_failed,12762ea42ec675743913e47ecb222b3a78940e777a7efd4d5ba82bf4805f25b1,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,0.04920697212219238,0.04857969284057617,0.015218496322631836,0.0266110897064209,0.020058631896972656,0.042943477630615234,0.038201332092285156,0.4205927848815918,0.4021458625793457,2.563270330429077,0.6437451839447021,0.24099302291870117,0.15129423141479492,0.07098174095153809,0.07035326957702637,0.06999373435974121,0.06994843482971191,0.07251977920532227,0.18118572235107422,2.397789716720581,0.07111907005310059,0.07001233100891113,0.06902503967285156,0.06988143920898438,0.06975436210632324 diff --git a/results/combined/merges_timed/helun/ektorp.csv b/results/combined/merges_timed/helun/ektorp.csv index 8f46f2728e..16058b6e53 100644 --- a/results/combined/merges_timed/helun/ektorp.csv +++ b/results/combined/merges_timed/helun/ektorp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 144,refs/remotes/origin/pull/271,12ee55cf7e9fb36f7a4c78d71271d0ed6030337c,147a38fd89a5f2cf0d6bc54fc538f1cb95031ee5,66abcdc152ce8f4d61d882958e42c88b59ade06b,,True,True,Tests_passed,442a9475b54cf8061d09c0d8ccce1cabbcc7709f559ebe3245b88194b34dde0d,True,13,32,272.0,3,True,Tests_passed,a55529ee7282f95d271c336ef0f35cd28cdaa358af48b5db6c5f664e9cac166f,True,13,True,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,99845334874e4acd9b786eb70980556a20cd26aa4309ee4e699aab74b515908c,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Tests_failed,84bbf3e0431288ab2a613710a82e665c63714e0ecc12a49a2239f64c2eb3f67e,Merge_failed,aa010016b6e98acbe62d9ac74973ed926e999b6d88e8520fabf72d3305c9e260,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,62047e655fc0c72138852fc45d0a390ede08e3d40e5a2e131215a4cb3fc82d1b,Merge_failed,bed19c3d97b2a25ae8e90d14b25fd5b97227d02d1e884e76c4221a1a892282d1,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,10b6186cb7a13800cb0ab8eb6c9f561a1dc34cef11aec2ca0be35953c352fc21,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,Merge_failed,6930e0fe7daedd3198b9929a3966ac4b9ff7858a8e50cc0ad213c96763dc196d,0.050550222396850586,0.02741837501525879,0.048993825912475586,0.04868769645690918,0.04401516914367676,0.03695392608642578,0.0450894832611084,0.23557376861572266,0.17823314666748047,2.308220386505127,0.49102258682250977,0.1232614517211914,0.12846970558166504,0.05683755874633789,0.05916905403137207,0.044696807861328125,0.056565284729003906,0.054364919662475586,0.09470391273498535,2.230593204498291,0.0445404052734375,0.05504775047302246,0.046767473220825195,0.045030832290649414,0.04686164855957031 diff --git a/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv b/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv index 46b1b6b45e..e5fb86ab50 100644 --- a/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv +++ b/results/combined/merges_timed/heroku/devcenter-embedded-tomcat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/remotes/origin/pull/7,c69377866c8614d5a1ef047d3061fcfed5203232,4f181be7c4b60cade09afd674ea02da5f593bade,5077d499c5c7be0952e9a191be47757df1096102,,True,,Tests_passed,aadb84a0424e3b658e3c90e517ae410accdf02cf55d7e5fe1eccce7f58794ce4,True,31,41,,2,True,Tests_passed,9b199fb6874ae2a58f6b7b2c55cd50157e2fab2047434ac13c7bb5d7e614f5a2,True,31,True,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_failed,aac3326a6bfc75590b4f34191dc95ce5169ef88eddd99fb0bac7d873e62a1551,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,0.009239435195922852,0.009822845458984375,0.009459972381591797,0.00951075553894043,0.00939798355102539,0.009392499923706055,0.009443044662475586,0.03319907188415527,0.06439757347106934,0.5781552791595459,0.30082154273986816,0.07067990303039551,0.12593984603881836,0.04060864448547363,0.04009366035461426,0.03888416290283203,0.03919792175292969,0.03975987434387207,0.0719904899597168,0.6237990856170654,0.038739919662475586,0.03993058204650879,0.029470443725585938,0.03865194320678711,0.02958822250366211 diff --git a/results/combined/merges_timed/heroku/heroku-maven-plugin.csv b/results/combined/merges_timed/heroku/heroku-maven-plugin.csv index 32cbd1b4ce..f38bfd82a1 100644 --- a/results/combined/merges_timed/heroku/heroku-maven-plugin.csv +++ b/results/combined/merges_timed/heroku/heroku-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 40,refs/heads/main,a935a91977e0132509028b7d13eb8c2f4e4a0f0e,0009fe317d0c15efa8520595eb84f566edfee509,09bd48fe1a79a07a35bae8f6b7d37e523f13c7a4,,True,True,True,16,39,774,2,True,16,Tests_passed,41e34e7e8fee4a46c65e09f28f464b64a1c76bf830b8374d72dafca32279ad1a,True,Tests_passed,f87d7b4a0f82994172506cc91bc4a890c62f4e65a0f7d8a4492069e063066f33,True,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,6f12e991325e753dfa8a5aad351c039e9f25468ec26458bb9c4ad4c9b6390cb6,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Tests_failed,38a8d2f5cee4a627fa3a095d0d588ca0f0ad55a308d16a6d8744946164fdac23,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,d0b8f8a5265a526c93a79b391d262692ea7d5d57c680864c48b96a410b46a37d,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,0.040528297424316406,0.04721426963806152,0.04238295555114746,0.037507057189941406,0.03429555892944336,0.04007554054260254,0.03531503677368164,0.13519573211669922,0.11083531379699707,0.4876837730407715,0.2619917392730713,0.07560467720031738,0.11325621604919434,0.03442645072937012,0.0419459342956543,0.03399515151977539,0.03469038009643555,0.034111738204956055,0.06629729270935059,0.49219417572021484,0.03457021713256836,0.04051613807678223,0.0325772762298584,0.034829139709472656,0.033225059509277344 diff --git a/results/combined/merges_timed/heroku/java-getting-started.csv b/results/combined/merges_timed/heroku/java-getting-started.csv index 899a20d3db..4c9cb9520e 100644 --- a/results/combined/merges_timed/heroku/java-getting-started.csv +++ b/results/combined/merges_timed/heroku/java-getting-started.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 52,refs/remotes/origin/pull/61,ada8e6776a47c7ddc9bf33aca353d2b895416c4f,c25acd5f8ed8ac7675266798fe99fcfee8912dcf,194c69c5fc86c19188504524cb1045ef8c57b1b5,,True,True,True,4,7,34.0,3,True,4,Tests_passed,b4e9fcbbce415f112c292035a9ba83b97842fa926d400f43ea1db91db5986ce1,True,Tests_passed,ded4a4908e9d74279b7347f449839a1f7f498dba88afa2ffbd1d79e720c7eb6d,True,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,b208f31f33d4982887fb8f8736c568dbab3e29fb2892122bc61620898e3391e2,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,a682a58c2a2d3a18d9e045d02fe5eee6f6301a2d1f5e3fb2929fbba7a3881899,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,0.04074239730834961,0.0419766902923584,0.0431210994720459,0.04227590560913086,0.04185891151428223,0.04547476768493652,0.037100791931152344,0.22896122932434082,0.1752490997314453,0.6425867080688477,0.22184228897094727,0.09569811820983887,0.12621808052062988,0.04205584526062012,0.042964935302734375,0.04224061965942383,0.04293942451477051,0.04207181930541992,0.08401250839233398,0.631359338760376,0.04208636283874512,0.04237699508666992,0.027294635772705078,0.04215741157531738,0.027367115020751953 diff --git a/results/combined/merges_timed/heronarts/lx.csv b/results/combined/merges_timed/heronarts/lx.csv index e61bebb185..46ec7a47e9 100644 --- a/results/combined/merges_timed/heronarts/lx.csv +++ b/results/combined/merges_timed/heronarts/lx.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,198881dec136d9149da48e998f9c96ff27ef87b5,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,09c8e07784d7a8f456737672eab034f162e7d45d,,True,True,Tests_passed,5c15c4056d6004c740f059cf48fcf5ea144337527d0c2a6c6bc33ef2045ea7d3,True,37,183,1980,3,True,Tests_passed,b947f69fa325ac688a4bd4a196bf7860985ed39b04694f9e144a4125c473dd0d,True,37,True,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_failed,25137a3530ea8aee407dffb843f5f4f5f4e9b672ebe817c487aadcfef71f0852,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,0.059096574783325195,0.04705357551574707,0.05054640769958496,0.029697418212890625,0.02400493621826172,0.06952977180480957,0.05446457862854004,0.24164867401123047,0.1755070686340332,2.5707600116729736,1.3119072914123535,0.12879157066345215,0.19503068923950195,0.06442809104919434,0.07560062408447266,0.0839996337890625,0.06527996063232422,0.08226537704467773,0.1463022232055664,2.433344841003418,0.06128263473510742,0.0625150203704834,0.06188011169433594,0.07738757133483887,0.05774641036987305 diff --git a/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv b/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv index 43c1aa3cf2..409fe18c37 100644 --- a/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv +++ b/results/combined/merges_timed/hmsonline/storm-cassandra-cql.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,756905cd9e592caaaa963739029bca5d46d20b77,4d30b5a9670b04b1b661eaaba70c10360f5514be,db445a4528d0f6b316777bc641344f1b97cfa8fd,,True,True,True,4,13,47,2,True,4,Tests_passed,2314ad7e11181c347e73430cf592faa500fecf58c475c744817ec356c172b6f0,True,Tests_passed,2afe07950097068c71b595917ee694ea81d121b400c610c828b923b5144d8ea3,True,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,fe9e3080e241e3fec03c35ac67d4e934f4da72d9e7d768797e6d6787e1537c5c,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,6df25d02d1136d58f63e25e456f39ac81b2bfd03e84f212ad6958ffe37dc9140,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,aaa7a0097ee57658cdb08199a088b3863c4c6d980bd64a656baf3e14f64bb85c,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,0.04495739936828613,0.04348397254943848,0.03450179100036621,0.039864540100097656,0.03551650047302246,0.03693079948425293,0.03876900672912598,0.16919445991516113,0.11597585678100586,0.7277114391326904,0.3586134910583496,0.07320070266723633,0.1148674488067627,0.03360939025878906,0.03422880172729492,0.03484225273132324,0.034235477447509766,0.03425168991088867,0.0662078857421875,0.7062568664550781,0.034694671630859375,0.034442901611328125,0.031909942626953125,0.03406500816345215,0.03300833702087402 diff --git a/results/combined/merges_timed/hoijui/javaosc.csv b/results/combined/merges_timed/hoijui/javaosc.csv index b66179276d..45b6e3b371 100644 --- a/results/combined/merges_timed/hoijui/javaosc.csv +++ b/results/combined/merges_timed/hoijui/javaosc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,f806396898fdfbf9533f2ff881b05ff5b6df5f6e,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,129ad0d5979f9de902186c1ff9914307a9291e73,,True,True,True,18,110,513,6,True,18,Tests_passed,d8a86f358399c05baefd8d244aece38be8c933fec24279dc6e76a2038371ad1c,True,Tests_passed,387fff3decdee2b6585d3d66363e05cb129d661e43fe06a7823ccd47cc684ff5,True,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,d8e2d38026b7501ecd5d8d7e27e01107c212742aade63f38165f778b72eea220,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Tests_failed,43c0ef8466b08b1999263cd456fff7102995abdc14ec8310e64fb4cdc5e7f90a,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,4bc60c8a1c35f152a36b3fb850664ebb6681646f50416fa7381f8ac381660eab,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,0.04349470138549805,0.046640872955322266,0.04426383972167969,0.04634904861450195,0.04656791687011719,0.0401616096496582,0.04564023017883301,0.18687915802001953,0.33893537521362305,2.9797465801239014,0.6300480365753174,0.19692349433898926,0.14236879348754883,0.06423807144165039,0.0635530948638916,0.06377124786376953,0.06339573860168457,0.06446361541748047,0.158644437789917,2.942966938018799,0.06503820419311523,0.06467843055725098,0.041558027267456055,0.06392049789428711,0.04123997688293457 diff --git a/results/combined/merges_timed/hoijui/jawk.csv b/results/combined/merges_timed/hoijui/jawk.csv index 9c25f7bf17..d856ec6019 100644 --- a/results/combined/merges_timed/hoijui/jawk.csv +++ b/results/combined/merges_timed/hoijui/jawk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/12,b60fdfaa97a9a12c8eda22d7707295bbd1ea90dd,a1523a0d3dad5590e8b75bd6252a788512406bf2,e5c8f2601b4e7af1b587c3677e464cc6c226d36c,,True,True,True,13,119,327,2,True,13,Tests_passed,8e6904b4360bf56eb3fad4272171b1fc4cdd37376620f4b0af8f2a1dc6a3b960,True,Tests_passed,dbf04cd3d1cfe48fabcd285561e49aadbae7e1a829fc2bf6b7cbe9ba3f4bb133,True,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,117a596f3b63779c3ce121036f850701f4b82a70fedeefbd5f2d5a1255e5041f,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,1812123933c7a87fb59d171934a0c260f2a0c69ee758777921ebaa11ed7df63d,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,b7cbdb07e1e5d083b5911f74da9cf7623426502dc4198e3f5aaacc6f2acaf9bd,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,0.04949831962585449,0.056296348571777344,0.053998470306396484,0.04153752326965332,0.04707217216491699,0.054868221282958984,0.06153273582458496,0.045694828033447266,0.13567352294921875,3.631941795349121,1.0658388137817383,0.08727288246154785,0.12564873695373535,0.04436349868774414,0.044296979904174805,0.043688297271728516,0.04287457466125488,0.04450225830078125,0.07796239852905273,3.3677589893341064,0.04425549507141113,0.043795108795166016,0.043912410736083984,0.04609060287475586,0.044356346130371094 diff --git a/results/combined/merges_timed/hoten/java-delaunay.csv b/results/combined/merges_timed/hoten/java-delaunay.csv index fca40e9fe1..c847afce60 100644 --- a/results/combined/merges_timed/hoten/java-delaunay.csv +++ b/results/combined/merges_timed/hoten/java-delaunay.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,bfbc8c5bb6efc4a6044df3c60d5e2fe8eeaaef60,a5dbe4c4472bb3da4ccdc9113bdf6c7681d68d60,5ed77e94f95e191e769255471ff01967cf606b96,,True,True,Tests_passed,666b875fd2076ef05b2e6ad421a39d36a9f0912601eba9de68effd13f3c2f5d1,True,10,30,417,2,True,Tests_passed,f9cf342dbc758e852e5fd8227393ceaaab341f7d8faedd0cb4f63a12e1a5a392,True,10,True,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,0.05173039436340332,0.05110502243041992,0.033560991287231445,0.04244494438171387,0.0540928840637207,0.04746675491333008,0.04892134666442871,0.15790843963623047,0.11661577224731445,0.038373708724975586,0.5960912704467773,0.07697057723999023,0.1334209442138672,0.044742584228515625,0.044855594635009766,0.04338550567626953,0.04481768608093262,0.04573464393615723,0.07946491241455078,0.05819106101989746,0.04313993453979492,0.04324793815612793,0.03398299217224121,0.04331564903259277,0.034285545349121094 diff --git a/results/combined/merges_timed/hoverruan/weiboclient4j.csv b/results/combined/merges_timed/hoverruan/weiboclient4j.csv index 2b98e8dfe3..ee09ac582d 100644 --- a/results/combined/merges_timed/hoverruan/weiboclient4j.csv +++ b/results/combined/merges_timed/hoverruan/weiboclient4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,62fb9296e8a8a0c3569630db86f72c4431a59af9,1d5f41e216cbd256148e0b617d4f9497ac1cbe81,cbb8c34c2182cd3c290acedb85cbd79a18da2f71,,True,True,True,59,152,3352,3,True,59,Tests_passed,3779289beac5d75a05e316c1f6bac5e4372eb5050efb56df8055012dd6cea8e4,True,Tests_passed,5a4668df1a151e1ec4ba95aa17d7c47ea86111da6c8d5793bf62e9cc8ddc6ad0,True,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,f29c7e7600d3cfd21c4feaa944e8e1b2018db220085b9f42f792896467f77d9a,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,9141cfea402f7c8e2213dec22aca0018467769b671f67230ec086103ed0e0644,Merge_failed,df28c98f5d44597d38b47c70001bfe6ea1c0124c4ce2b73d832a0aa5d845aaa6,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,16ae23ffe50c2c06d5545f7946b57153d5f4a3692c9d7aa775d0c993585feb1a,Merge_failed,a3cdc9200e3a496b5edc63843fe72af016b839f11ca9ddfb17f9cb476be2dffe,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,0.05129241943359375,0.013734817504882812,0.052590370178222656,0.056215763092041016,0.048041343688964844,0.05308055877685547,0.05303001403808594,0.23639893531799316,0.23688006401062012,1.5864169597625732,0.5796210765838623,0.12648701667785645,0.12698888778686523,0.048958539962768555,0.04619336128234863,0.04715085029602051,0.04788041114807129,0.0474848747253418,0.09339499473571777,1.4580838680267334,0.04687929153442383,0.04617500305175781,0.043623924255371094,0.044702768325805664,0.044381141662597656 diff --git a/results/combined/merges_timed/httpcache4j/httpcache4j.csv b/results/combined/merges_timed/httpcache4j/httpcache4j.csv index 09b880ec6a..59b3b66569 100644 --- a/results/combined/merges_timed/httpcache4j/httpcache4j.csv +++ b/results/combined/merges_timed/httpcache4j/httpcache4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 34,refs/heads/master,ccdc581f7f9d3b683b03af7c474160d3a3d1594f,b7a15c040c8b08b14e1f6434a73633c44381118e,24fa341f4fe3d819067b80de67bdf98e8861a8de,,True,True,True,10,21,324,9,True,17,Tests_passed,5ae13776c25399f7834d05f4603ad0221a6761b3e66e78b048c64550a3f7500a,True,Tests_passed,69cd33ab0d1b4602132d7d32d182fa177e41dfcc5940703ab8e76430173aa9ec,True,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,dc927934833f49dc701bfaaef25c108f22eab72ca7387e3c78ca56892b8183ad,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,68540763f9004a8f0b82269558d941b609166375f1a1277b97f309e34aec992f,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,85f53464843aaf18443dfd072fab1944a76e9d47ab89b6245b2d5cc994ef00f7,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,0.01340484619140625,0.014481067657470703,0.015108346939086914,0.01779031753540039,0.014899969100952148,0.014937639236450195,0.015304327011108398,0.043613433837890625,0.07039451599121094,0.8398621082305908,0.6000790596008301,0.07723879814147949,0.12911725044250488,0.04469466209411621,0.05810070037841797,0.03521990776062012,0.04527783393859863,0.044541120529174805,0.06792187690734863,0.8831398487091064,0.04354524612426758,0.05248093605041504,0.041992902755737305,0.044516563415527344,0.04345560073852539 diff --git a/results/combined/merges_timed/huaban/jieba-analysis.csv b/results/combined/merges_timed/huaban/jieba-analysis.csv index 029dc45f24..796c0374e5 100644 --- a/results/combined/merges_timed/huaban/jieba-analysis.csv +++ b/results/combined/merges_timed/huaban/jieba-analysis.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 28,refs/remotes/origin/pull/50,8eeea21716d2ea2563b92c0e3fd901ae715b1ea6,e657cd03e1bccbbd7b71981997e756699fe161b7,092dbedb1fbe0cf2172f8e10707f8b52764bda31,,True,True,True,5,10,608548,2,True,5,Tests_passed,168cf6b3515e4d6b88fac756675ea2b6db9ec3b9776ca33ce1a7d9801a6995a6,True,Tests_passed,0121015a37af6416d93feedc57de2c258686a7b824c850e17b1b5635339dc372,True,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_failed,17cb9784fe07197d226dc2e30b6ae904888757989cecc2ccae08accfba19e0e4,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,0.14224481582641602,0.1409595012664795,0.16299104690551758,0.16120457649230957,0.16520333290100098,0.16181135177612305,0.16455721855163574,0.22496676445007324,0.1977524757385254,0.9871673583984375,0.4976348876953125,0.29122209548950195,0.3119063377380371,0.25764012336730957,0.21559524536132812,0.24755311012268066,0.25696349143981934,0.2532505989074707,0.3281221389770508,1.0049917697906494,0.20037364959716797,0.23011183738708496,0.23849701881408691,0.23450231552124023,0.24673914909362793 diff --git a/results/combined/merges_timed/hudec/sql-processor.csv b/results/combined/merges_timed/hudec/sql-processor.csv index 7a9e1cd456..76339a1519 100644 --- a/results/combined/merges_timed/hudec/sql-processor.csv +++ b/results/combined/merges_timed/hudec/sql-processor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 41,refs/heads/master,e959d1d883ca62621d769bc918107d45c7d62edc,6e987e6a938bebf11be2ef9d5cd80a0b5f1584cc,82513015773e95f8a3345526c8aef447572d34f0,,True,True,Tests_passed,6eff6a41305cb9bcd1a5d4ba5d2c7fc7b560c7b17209cd69d6fc3c2ef6a7e77f,True,188,381,7901,9,True,Tests_passed,fb129caab03aefb955f65ca7b753eab985204ba65b4077f39b7334c6757b8713,True,188,True,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,7c7772f31766083f7cf4592fbffc1742b48308b0f8cb79c37f072c717ea8cf84,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,d9f9018ee2e21bf7755e93bb80467c464bdecbfa1d666aadc5e39b5f3b9b6d29,Merge_failed,64e01dd46198d1d6a7d3a358d6aa29e7605f849dac6badec7ae7171405942340,Merge_failed,3ce89f8e1b657fb96da654a2e4d476c9ca89caa7eb5e3b1f97d0a510ab162eab,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,a1e02b2c670579931d05626adf83d34c010802b2205e8f95b21508875df3067a,Merge_failed,c5b4e66ed1c8b97a3300d6db9f8140c4e868ec80f80c4ba394478785506c7b8f,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,Merge_failed,06e44a6091dba67e6f889fab33b3c93e20f2cf02bd74069f7a1b18d7d05673b7,0.08392119407653809,0.06131577491760254,0.07291841506958008,0.06399846076965332,0.07282400131225586,0.0626986026763916,0.08128499984741211,0.6850197315216064,0.5448276996612549,3.1803741455078125,1.2903051376342773,0.3300008773803711,0.20177030563354492,0.11545038223266602,0.11589622497558594,0.11677718162536621,0.11768269538879395,0.11722111701965332,0.2721884250640869,3.142549991607666,0.11519289016723633,0.11578702926635742,0.08154129981994629,0.111968994140625,0.08429789543151855 diff --git a/results/combined/merges_timed/hyphen-ated/djbot.csv b/results/combined/merges_timed/hyphen-ated/djbot.csv index b16e1fe1b2..ac80c35f6c 100644 --- a/results/combined/merges_timed/hyphen-ated/djbot.csv +++ b/results/combined/merges_timed/hyphen-ated/djbot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,74d4ec8c8eaf131d157dfac6a8e0a84c99720126,6299377a3edaf452b914d61a70d4fdd8afbe3be8,4bb2d7d65ad5f1dfe1e417e0febff7f9e60aa382,,True,False,True,4,8,33,2,True,4,Tests_passed,1eae806f6a437b529d62117e99611b9fb474c2920559ea56600358cc4c3e0c6d,True,Tests_passed,eab0b398b76132ae4e23ed8864d7abca07f9878addbae12bf779f479796e3aec,True,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,0.04813790321350098,0.0472414493560791,0.043335676193237305,0.03684496879577637,0.04809141159057617,0.048982858657836914,0.04153156280517578,0.1705930233001709,0.11888480186462402,1.7263095378875732,0.49511218070983887,0.0737907886505127,0.12409114837646484,0.04086947441101074,0.04146456718444824,0.041719675064086914,0.04106950759887695,0.0406644344329834,0.07489848136901855,1.628242015838623,0.04040670394897461,0.039844512939453125,0.02933216094970703,0.04005765914916992,0.02827620506286621 diff --git a/results/combined/merges_timed/icoloma/tldgen.csv b/results/combined/merges_timed/icoloma/tldgen.csv index afb66d03dd..99ebe8c1e3 100644 --- a/results/combined/merges_timed/icoloma/tldgen.csv +++ b/results/combined/merges_timed/icoloma/tldgen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,a124b6e2241bd4840a91df9a382fb8f702e76464,26e62ee81320302d85a92e2c112f3826fc25d604,001adfadb665abf8ae379febb1e494121b1d8827,,True,True,Tests_passed,59430136df62d87fddcdc0cd26200995a0f66e6b465fe03dca0461a5943ff288,True,18,53,441,4,True,Tests_passed,8d35eb54f2445ef698bc6fdd7955b9da2a9cdde8e6777c8faf59a49f54499079,True,18,True,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,4bc1272e39de57b0eae6eb60eac005386985f84603b9eadd30e9d90c794bc00b,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,70a63b5747472c1cef0816425fe81dd6ab2caeb04cd3d24dd185d80bff1080cd,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,834bcfd77524e5fa956164ab6b52bf5185ddcb0eb4ee2e1455e404f2ad3199f2,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,0.03592252731323242,0.04003334045410156,0.045203447341918945,0.03929448127746582,0.0391545295715332,0.04344630241394043,0.04012918472290039,0.2759730815887451,0.2071821689605713,1.329519271850586,0.3692893981933594,0.12764406204223633,0.13318920135498047,0.05103254318237305,0.05054616928100586,0.05042386054992676,0.05046868324279785,0.049231767654418945,0.11595892906188965,1.3103511333465576,0.04991412162780762,0.050620079040527344,0.034655094146728516,0.05009341239929199,0.0344233512878418 diff --git a/results/combined/merges_timed/idpf/epubcheck.csv b/results/combined/merges_timed/idpf/epubcheck.csv index acc534a8e2..e51da86115 100644 --- a/results/combined/merges_timed/idpf/epubcheck.csv +++ b/results/combined/merges_timed/idpf/epubcheck.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/main,23cee7b1b22510f633b006d5540c3a4198a3ccd7,c133d33a71a6e5aee8bcf8684deedc5655459fc5,d1cba214aba957b44052af0f509a98e3e0761ff8,,True,True,True,569,983,36392.0,13,True,593,Tests_passed,ae183d6ed5e5871e2441380a2991000c10fd195c5184eca890b83262d3448d5f,True,Tests_passed,4c9c65fa36d11b98e66e3b4eb8c471e4723310f787eae4e3877cec4ca4371c60,True,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,b0121cdcf1778d00696ffd0ac8470931bb9522c0ab46a6b993319fe74914a249,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,d77f44fa67f6e5d65c269ec3b81249029feb14c9cb18d79e2b92216f41b1f0c4,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,0.10576915740966797,0.10564422607421875,0.1366748809814453,0.13975286483764648,0.13801240921020508,0.13880634307861328,0.1388232707977295,0.8246855735778809,0.9045107364654541,0.12281370162963867,2.073773145675659,0.6926751136779785,0.4705393314361572,0.3234388828277588,0.32623863220214844,0.3217456340789795,0.3234727382659912,0.32297301292419434,0.7449216842651367,0.3497276306152344,0.2801051139831543,0.28113603591918945,0.3196876049041748,0.2843642234802246,0.3191688060760498 diff --git a/results/combined/merges_timed/idris-hackers/idris-java-rts.csv b/results/combined/merges_timed/idris-hackers/idris-java-rts.csv index 588e126aec..0f5fbcc66c 100644 --- a/results/combined/merges_timed/idris-hackers/idris-java-rts.csv +++ b/results/combined/merges_timed/idris-hackers/idris-java-rts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,c35f926f298bc670fa197ec7aee03aa74a1a3e13,b500f781a3204060f80fbc613b7e6669e3bca1c0,c4a734fa57af809cf249b389bbadbeeac2c32246,,True,False,Tests_passed,e0333570c8cd9ed805a94d3ecf0e08e411091df9c86e06fbaecb0d5f3e5637d2,True,3,14,197,2,True,Tests_passed,5aa12b1d82b44e7b43fc31a74c4f9d9628a26c650173972caaff8f7700a8437e,True,3,True,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,9d45e51eb47d71f11afc9a8dcddddcb4717bea558f60ad59c86e5727284a74db,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Tests_passed,0649e92f16ffc1b673eaed99e86938efdccfeee54be22244b62702b1536e8d57,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,cabb0c5e6aad04c2b11381c8cc19f98c21ffcbf1ce623a0f78ffd2f9f357ada4,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,0.04097628593444824,0.042078256607055664,0.010428190231323242,0.03914690017700195,0.03910565376281738,0.04004240036010742,0.03969454765319824,0.15774011611938477,0.18218755722045898,1.9066519737243652,0.6739308834075928,0.10454010963439941,0.1119391918182373,0.03315258026123047,0.03323793411254883,0.03298473358154297,0.03296327590942383,0.033049583435058594,0.0627739429473877,1.7795822620391846,0.033406734466552734,0.033299922943115234,0.03098154067993164,0.03352808952331543,0.031603336334228516 diff --git a/results/combined/merges_timed/igniterealtime/tinder.csv b/results/combined/merges_timed/igniterealtime/tinder.csv index 6fc8471aff..64971f46b0 100644 --- a/results/combined/merges_timed/igniterealtime/tinder.csv +++ b/results/combined/merges_timed/igniterealtime/tinder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,c99be3f06ec9c816c3416f2c1963d6b19cc412c9,d43b195d7ac6ed93cfc73635732a3fa3f26d42e8,4462390ee85eea8ea93c15a95d0c8c45b2f49dd1,,True,True,True,32,43,17892,2,True,32,Tests_passed,ae53a361c29ad082499147f51e47428fec3f4a5955a80e14d90876e705dcbdb1,True,Tests_passed,8d30990c278e62e26bf457b5b92c672a770a76a427b395340783f5140c47b04e,True,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,2819a2e403f2f5b3495b3b867e64f34c1743a4b6853ec0ccb0e4fa6274fb3af5,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,b1c783e3d8f6a0f39e78b4d25b75b87532740760689cbdf1dac26248f2162458,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,a9a96d571a713c1390958441c58f35f78c39f6a4ecce2813de93fa470cb50e21,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,0.043617963790893555,0.04713320732116699,0.03661394119262695,0.04151272773742676,0.04891824722290039,0.01510763168334961,0.04787945747375488,0.1809542179107666,0.12101268768310547,1.1847667694091797,0.6708464622497559,0.0767056941986084,0.12321829795837402,0.039888620376586914,0.04010725021362305,0.04239296913146973,0.0407102108001709,0.04039788246154785,0.07312297821044922,1.1613988876342773,0.040201663970947266,0.03997159004211426,0.03861117362976074,0.04218316078186035,0.039978742599487305 diff --git a/results/combined/merges_timed/ignorance77/transformiceapi.csv b/results/combined/merges_timed/ignorance77/transformiceapi.csv index f8f0c066e5..195c41c50e 100644 --- a/results/combined/merges_timed/ignorance77/transformiceapi.csv +++ b/results/combined/merges_timed/ignorance77/transformiceapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,07df219c63851a01a3ee6040ca0811d109544375,cd82b7006cc9fd7e7a1d1444575abf56683ac3c5,93d4346a4e4e0421081c5649f6d49f5fe1648464,,True,True,True,11,20,219.0,2,True,11,Tests_passed,f63d55ea93748022f84067fd5a65dc9e8119ffc876cdb5fb179eb4da9b834356,True,Tests_passed,467209e6fb7fb6c7eda2ed67d93054bdf6226a61d70ca41657752d8ca2ab77a2,True,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,f471e76f601c689ed985bf445f3f91fcae57f5edf77f91196deff4b070e756ea,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,0.04630923271179199,0.03925466537475586,0.042794227600097656,0.04417896270751953,0.03906536102294922,0.041838645935058594,0.03956198692321777,0.17013835906982422,0.11568880081176758,0.656104326248169,0.2990400791168213,0.07204604148864746,0.12707138061523438,0.0400242805480957,0.04001927375793457,0.03898262977600098,0.03957343101501465,0.03817892074584961,0.07256507873535156,0.6843388080596924,0.03945016860961914,0.03951454162597656,0.028264284133911133,0.03888821601867676,0.02827620506286621 diff --git a/results/combined/merges_timed/iipc/webarchive-commons.csv b/results/combined/merges_timed/iipc/webarchive-commons.csv index e4951f15a2..e35dae1068 100644 --- a/results/combined/merges_timed/iipc/webarchive-commons.csv +++ b/results/combined/merges_timed/iipc/webarchive-commons.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 70,refs/remotes/origin/2.0.0-DEV,6b33f9b79f1d3a913ca5e1952149a72ab1104a43,3ba7b47bd90a81ce0b0d4c5ba638c8a3d1d7d4f4,604f05959596128785028863dc72ffc7ccde6536,,True,True,True,25,312,1033.0,4,True,25,Tests_passed,a5d15cb5190e6d3a49e6646185430fad8df619fff0fe535099725c4b939c4ff8,True,Tests_passed,55a24d0e9afdc5e68707f30e56d5a5602a7a32085ad6785988f836071e8c74c4,True,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,0.059456586837768555,0.04550886154174805,0.07052230834960938,0.062201738357543945,0.047484397888183594,0.058524370193481445,0.04426097869873047,0.2897777557373047,0.23236751556396484,2.0303752422332764,0.7461948394775391,0.1569986343383789,0.16912579536437988,0.07857608795166016,0.07245612144470215,0.07483363151550293,0.07332992553710938,0.07401823997497559,0.1530473232269287,1.9545340538024902,0.07490015029907227,0.0710914134979248,0.04983353614807129,0.07379770278930664,0.046710968017578125 diff --git a/results/combined/merges_timed/imagej/imagej-ops.csv b/results/combined/merges_timed/imagej/imagej-ops.csv index dc8c61fbd0..72fce3c935 100644 --- a/results/combined/merges_timed/imagej/imagej-ops.csv +++ b/results/combined/merges_timed/imagej/imagej-ops.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,4a3b273c23ad343d026a0e4770cb755b81032f9d,eccaa9a1b5b85e931114872a1a0d47e81da9fbba,a2b49e2a77f37952520ea214fa21efa7838461b5,,True,True,Tests_passed,14cd3527a14f07111d833f4af1ac2192e2fe687280208f351b6e5497a6d01250,True,966,3076,16077,3,True,Tests_passed,bcca8620da4b5b3caba604ee11f285b3ea9cfe6e936111410168f268da1d2b1a,True,966,True,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,0.05912613868713379,0.06000947952270508,0.08201742172241211,0.08396387100219727,0.08181929588317871,0.08155989646911621,0.08225727081298828,0.14520978927612305,0.1675703525543213,1.5364396572113037,16.782801866531372,0.22821927070617676,0.2957038879394531,0.17948508262634277,0.17106962203979492,0.1353147029876709,0.16735625267028809,0.13290858268737793,0.2559165954589844,1.6039700508117676,0.1515486240386963,0.14768147468566895,0.14048433303833008,0.15439343452453613,0.1383209228515625 diff --git a/results/combined/merges_timed/imglib/imglib2.csv b/results/combined/merges_timed/imglib/imglib2.csv index 7be85a143c..232a297f13 100644 --- a/results/combined/merges_timed/imglib/imglib2.csv +++ b/results/combined/merges_timed/imglib/imglib2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 96,refs/heads/master,e9d10e6d0675c448d1b13f0af39f92bf384fb455,4d25ecee827a42416821dd3e3e14159ba2de4653,b78e84541f5efaee6c249670f15f4c4cb819a7ba,,True,True,True,463.0,636,8611.0,3,True,463,Tests_passed,def684d8490fff814658fe44d22a0f557383fd9ea3de7a4c00757e7566d54214,True,Tests_passed,621b8effb3dbb1340c9bd9a023aa4e979b272b16c4e52335914fe0118744544a,True,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,da9ce9bce8e3d0c41d6d56bcecc87336d29aa4d9964fcaba7301f6d426c6fd64,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,da9ce9bce8e3d0c41d6d56bcecc87336d29aa4d9964fcaba7301f6d426c6fd64,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,Tests_passed,ce9e5ec19e00b58e32a393d26afd55a27e790424f7df5d85240c142cef94f877,0.04379534721374512,0.038384199142456055,0.059427738189697266,0.06285762786865234,0.05996251106262207,0.06057858467102051,0.05639338493347168,0.21898436546325684,0.15988683700561523,1.2166314125061035,3.5694611072540283,0.16092824935913086,0.20577716827392578,0.1064600944519043,0.10651135444641113,0.10445094108581543,0.10433340072631836,0.10157608985900879,0.1670238971710205,1.2536954879760742,0.10031437873840332,0.10166668891906738,0.08320856094360352,0.09672713279724121,0.0812528133392334 diff --git a/results/combined/merges_timed/imixs/imixs-workflow.csv b/results/combined/merges_timed/imixs/imixs-workflow.csv index 16ca43aff8..69abf55f6d 100644 --- a/results/combined/merges_timed/imixs/imixs-workflow.csv +++ b/results/combined/merges_timed/imixs/imixs-workflow.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/master,f14cc658356312ecdf6111e1745d7d29957f7194,9e4f88bb06fb937ffd51c8875bbaaf364d404ec4,b8df0eb1ac52af8caaa7d7f66d41dcf8b4177842,,True,True,True,148,540,11969,15,True,149,Tests_passed,f114f281f48c0e044aaa244913c577eb07adf43cec9af32afe25da9428d6a67b,True,Tests_passed,4a8d02e85a4996768d0dfd70046d40ad7f95401580585cbab221525697b202ad,True,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,a8a03e2af72fb75ca49eb155ca5e76c1fddcfdc77e566b608896b27e493b6e68,Merge_failed,d6f0d082add4f40b38d44b7a928085a734291cc14ffd8d13ddd136b85fc10c65,Merge_failed,67aa636600a8f92a74746a8f7d94400f65ac450a3a1c39305631604db47a9306,Merge_timedout,,Merge_failed,d6f0d082add4f40b38d44b7a928085a734291cc14ffd8d13ddd136b85fc10c65,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,9fcca5350ef756d306cae7f65515fe4e435e678d2f8177bdbb4abc4c1df166eb,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,fae1a84baf44b98830b5e5cef567d6e6b84fb2322b597c7207facee8a2a6f8ca,Merge_failed,3bb7b37c5776753f805c81a2c676da1ad9281072bea200dbf88031266baaec4b,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,c346430499f9b1cc3ee8f80fa88807bddd30f1fa0785caa6865b249d85945e6a,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,Merge_failed,6bf3e644b663d0a331e79637b8fd37140451aea2d59e8363a1be3899f889a821,0.07269597053527832,0.05832242965698242,0.056973934173583984,0.06624484062194824,0.06996822357177734,0.056822776794433594,0.07461667060852051,1.0158157348632812,0.8047230243682861,5.574890851974487,-1.0,0.4958939552307129,0.23788118362426758,0.1526932716369629,0.1494431495666504,0.14983248710632324,0.14932799339294434,0.15007877349853516,0.39595675468444824,5.388617277145386,0.1499791145324707,0.14594197273254395,0.11155176162719727,0.14479637145996094,0.11051106452941895 diff --git a/results/combined/merges_timed/immobilienscout24/deadcode4j.csv b/results/combined/merges_timed/immobilienscout24/deadcode4j.csv index b9ff75cb53..62d82a38dc 100644 --- a/results/combined/merges_timed/immobilienscout24/deadcode4j.csv +++ b/results/combined/merges_timed/immobilienscout24/deadcode4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/heads/master,69518ebbfef40f661ff6ab30ea9ab758a81509c7,89708cc1c36090ba0d00f3f073d2cdf5f6704802,78d4b2bcfb7031e780bb8c612fa46916a19f02f3,,True,True,Tests_passed,3422aa2dce2dc2dd452361fac258e530461f98c09c7a85d1a75c9206c224c04e,True,32,122,467,6,True,Tests_passed,201d90b62862cfbbd85d5a9d194e0348ff2680348c36013e6306c91763511d29,True,34,True,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,465a5fd2c5d575e6467326bc2ad95b349a203237a3c3e9bdb51e31e97aa869d0,Merge_failed,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,12321cc8f950d9e0c5290a2b552293f2dc4a82627abdea249c9fa5c68f38d90c,Merge_failed,a4afb5dceea3293aae7a90d0a3cc2d96568b0c1c46ad99f572cf77c26e1f9b2c,Merge_failed,4473d1ae40d09079002cc923fa2a5f51b933186807aadb3dfb471bbb4c64e4e8,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,d2561a3cc49f38247cb3dff35e31aa98e78e4a80ca699d8f16eb7b6ea857ca94,Merge_failed,12321cc8f950d9e0c5290a2b552293f2dc4a82627abdea249c9fa5c68f38d90c,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,Merge_failed,2fc30f06fe4b5d41ba654a75acae1792b1b00bed365ed4270540057f1a434551,0.04839801788330078,0.042359352111816406,0.04795646667480469,0.05125737190246582,0.046495914459228516,0.046027183532714844,0.0283968448638916,0.37354063987731934,0.3595693111419678,2.8075954914093018,0.6324582099914551,0.20017766952514648,0.13509511947631836,0.055364131927490234,0.052582740783691406,0.05287361145019531,0.05441594123840332,0.05459237098693848,0.13444733619689941,2.8271028995513916,0.053063154220581055,0.05507063865661621,0.058045148849487305,0.053830862045288086,0.05665016174316406 diff --git a/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv b/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv index 1933f56948..9fc9c4ef9e 100644 --- a/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv +++ b/results/combined/merges_timed/in-the-keyhole/khs-spring-batch-report-writer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,93520a37d008510ab7d8b0c2f7c904c526c02296,6097377d96d0bbe4d8bcadf767d366c50c641ee3,bf21478ae52b4c81eca759aeadd89324986aa1a6,,True,True,Tests_passed,b6909260bf934db2d5aef36578b0fe3a78a6be02c57952f8a942d48c4f8a1f63,True,7,31,285,2,True,Tests_passed,35406290825cfe22742a72e9487d1fd4a4a52d1c4a037864df6b6ecbfedaa9fb,True,7,True,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,5aeb885ec033f26f1c5d862555309034aa6220d9c727608315a04a85ccec11c7,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,c48b9fa611a372870dcc944d5f50b9278c395fa5c4a2c9f0850c30b4ef0fd382,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12367e53b746318a109dcbcc57afe73927ea2484534f0969670b9284668e1f4f,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,0.008878231048583984,0.009877204895019531,0.008891105651855469,0.010205984115600586,0.008838415145874023,0.009113311767578125,0.009033918380737305,0.03432512283325195,0.06674766540527344,0.43909597396850586,0.42749810218811035,0.0632791519165039,0.10758185386657715,0.03020477294921875,0.03576827049255371,0.02978372573852539,0.030249834060668945,0.029801368713378906,0.062407493591308594,0.43109679222106934,0.03007364273071289,0.036222219467163086,0.028748035430908203,0.030208110809326172,0.028920888900756836 diff --git a/results/combined/merges_timed/inaiat/jqplot4java.csv b/results/combined/merges_timed/inaiat/jqplot4java.csv index 1552a7713c..8d8b6580d4 100644 --- a/results/combined/merges_timed/inaiat/jqplot4java.csv +++ b/results/combined/merges_timed/inaiat/jqplot4java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,6239c0dc07dc0d45ccf92b81ad4ba91d70137136,acee7209f0ba8e8ff196132182a77c7b620d8bb1,b7033b00afeca37605535cc7495bf9f6b112e5cc,,True,,Tests_passed,3338119461b87ef064f62bd8e152002ba2a6f4093b8628973c67ad671e23bd58,True,21,246,,4,True,Tests_passed,4889f248db533de82d6259abffd91a3da155dd7e5b7c2886f2c7812a6a83de69,True,21,True,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,6421e852240343f8a109b56296306376f32de369ff94e549debd31ce4d6e9177,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,d1e0dc2ec2ff6666897819f35f8b941bd961e4fdad58a578b0104c234c3b9ae4,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,0350813c054172d1547385c2e496248315989e80d5b974a990d50e953d583b82,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,0.010399818420410156,0.010516643524169922,0.011085748672485352,0.010303020477294922,0.010526418685913086,0.010440826416015625,0.010524988174438477,0.0598602294921875,0.20551323890686035,1.68141508102417,0.4889686107635498,0.16243553161621094,0.12843632698059082,0.047566890716552734,0.04825568199157715,0.04918408393859863,0.049030303955078125,0.04921698570251465,0.1133720874786377,1.7548513412475586,0.04913735389709473,0.050116539001464844,0.048018455505371094,0.048128366470336914,0.0478823184967041 diff --git a/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv b/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv index 458bf9d0af..5bb7a8aec6 100644 --- a/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv +++ b/results/combined/merges_timed/ingenieux/awseb-deployment-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,527e238ddf7b25402927371510f22e9a01ac8750,3d8ed54a7eb32de45b50b57cfe2975f58212f9ed,688514ce6ee363c40f3f7afd8946e6b84eb3ff5b,,True,False,Tests_passed,797e25d8ac159c1996acae92a69eb46b6f0ead3fe804f691d6b3b305e3b6ddad,True,2,3,15,2,True,Tests_passed,02b38fd2fadecdeee51c74fab5982924939ecddd2815a44d1e8331e9638832b0,True,2,True,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_failed,f5ed4d693e60707e5a519600ea6dc7bb034075511e01d058c0e73463d9bbd7fd,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,0.03470563888549805,0.045995473861694336,0.04021763801574707,0.043306589126586914,0.03767204284667969,0.043337345123291016,0.039282798767089844,0.17431092262268066,0.11005592346191406,0.7468447685241699,0.27713608741760254,0.0677487850189209,0.12254190444946289,0.03830242156982422,0.03867292404174805,0.039452552795410156,0.03926563262939453,0.03841662406921387,0.07219910621643066,0.7522332668304443,0.03922867774963379,0.038968563079833984,0.02812480926513672,0.039047956466674805,0.02745842933654785 diff --git a/results/combined/merges_timed/intcode/sweetie.csv b/results/combined/merges_timed/intcode/sweetie.csv index c42b72a1d5..2c77f2e45f 100644 --- a/results/combined/merges_timed/intcode/sweetie.csv +++ b/results/combined/merges_timed/intcode/sweetie.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,a9dd1a794eb1d4b3e7c9e26d4dd716df84189d88,3f18be686982e9c85e421ec672acc397e8296a97,001aeae00779c70a403f427ed33adf50ef85bfaf,,True,True,True,39,164,1595,3,True,39,Tests_passed,3dfaa9858762e1761a24f8fb6fb4fd11434d99dbf23df754d12276c1e26bfae5,True,Tests_passed,fe3fa22e6b0de4a57bd80e280fd82439ad791216e18b73c2a605a17c2d1f72ed,True,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,0849fb832b134a4036520f0777bdd77451d08481777788b0db5d513e77752d85,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,Tests_failed,fb10e31e247138acd3d0f9789a16a0ed2046caf31c5239e4a68847130712f26a,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,57b94158f2bbc74c1b982bb4d24636f3ed4c4d2e1ef7044c765286bda5571bf0,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,0.039609670639038086,0.04143881797790527,0.04576563835144043,0.03831815719604492,0.052899837493896484,0.033179521560668945,0.03999495506286621,0.24328184127807617,0.16951251029968262,0.04039454460144043,0.7548840045928955,0.10757780075073242,0.1351001262664795,0.05153393745422363,0.05218672752380371,0.05140376091003418,0.051848411560058594,0.05218100547790527,0.10415148735046387,0.06242847442626953,0.05037879943847656,0.04900503158569336,0.042578935623168945,0.04799318313598633,0.04390144348144531 diff --git a/results/combined/merges_timed/ipeirotis/get-another-label.csv b/results/combined/merges_timed/ipeirotis/get-another-label.csv index 9677a862b8..f2e6fded03 100644 --- a/results/combined/merges_timed/ipeirotis/get-another-label.csv +++ b/results/combined/merges_timed/ipeirotis/get-another-label.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,ac8fd271f85a8adee28bffb01bf892ddacbb66d3,0989f5097729cdfcfe91010095351bd233596880,e132f19c89ad735a3a75b173fb833acfdb6fbeb6,,True,True,True,7,32,147.0,2,True,7,Tests_passed,2909cf287f63c0e1df62669d37d30422c96b6574758b32e9c9a96bbad1b04a4f,True,Tests_passed,9e873c54ac25d1e2ba614103167e71cdc676332aba6e100b028805bef8921e64,True,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,0.014805793762207031,0.014671802520751953,0.01672530174255371,0.016510009765625,0.01696467399597168,0.01643991470336914,0.016450166702270508,0.04605889320373535,0.07242536544799805,1.2843737602233887,0.40102243423461914,0.08265876770019531,0.14052057266235352,0.04927492141723633,0.05201840400695801,0.048514604568481445,0.049959659576416016,0.0505979061126709,0.08627080917358398,1.120211124420166,0.04752469062805176,0.04850268363952637,0.039150238037109375,0.04935312271118164,0.038930416107177734 diff --git a/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv b/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv index f83c75e3c7..8096a1a1d1 100644 --- a/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv +++ b/results/combined/merges_timed/irobertson/jpa-annotation-processor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,7afb7f707acec7dedb8da5a37d80ce8b28a2ad5d,9945edc9998ecffa0b9796887a6b0309dcc3c0a9,36cba17aa2e95effcea8f835318559301e0471d6,,True,True,Tests_passed,0f39920997c185c204ab490e7745e00959f5a795f53feafcdd893faab75ac33e,True,4,26,95,2,True,Tests_passed,443572ca1c16e6e1e832edd1fb2f0cbee50fa3e91b720da5a45f583e636d6c28,True,4,True,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_failed,5c4aa6b961e7014fe586a892174fa0e202f0cda654d74e20b9dc7e1c7746097f,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,0.0382235050201416,0.041285037994384766,0.04309582710266113,0.04320955276489258,0.039926767349243164,0.04139566421508789,0.0397188663482666,0.1606442928314209,0.10721945762634277,0.8631172180175781,0.43057990074157715,0.06504058837890625,0.11996579170227051,0.036924123764038086,0.03721451759338379,0.03665804862976074,0.037038326263427734,0.037416696548461914,0.06834602355957031,0.7988097667694092,0.03748059272766113,0.03687167167663574,0.025787830352783203,0.0372614860534668,0.02628302574157715 diff --git a/results/combined/merges_timed/irstv/cts.csv b/results/combined/merges_timed/irstv/cts.csv index cdda935179..d89a1a47d7 100644 --- a/results/combined/merges_timed/irstv/cts.csv +++ b/results/combined/merges_timed/irstv/cts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 91,refs/heads/master,990cb24e63345f9ff473362e308283a626e72e17,698fc384861d109ed05aef930922fb80dfa124c1,4e207705ef95c228d5755933efb06bd7195a35c3,,True,True,True,26,84,1483.0,2,True,26,Tests_passed,206fec35ec358f81b818dae2f7d9fd260b5ea47263dd9cc746ac6a47d68a932e,True,Tests_passed,cd06b045e376b9d1b7d401da659105725d83c420ba2cacf90dbf2a0951619fd6,True,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,c8d6e13e779e8faf9ba5a814c1e697fa2d6952f3c2ea1a5ca132aebda370513f,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,c8d6e13e779e8faf9ba5a814c1e697fa2d6952f3c2ea1a5ca132aebda370513f,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,Tests_passed,a19ac51c25a131db46c4129eac2fb520fe49bf6477327223e31a72026a81a160,0.03200817108154297,0.05356478691101074,0.021581411361694336,0.04999256134033203,0.04062962532043457,0.040743350982666016,0.06790971755981445,0.17893743515014648,0.09584689140319824,1.1030759811401367,0.6985068321228027,0.11257147789001465,0.18561744689941406,0.08424019813537598,0.07927060127258301,0.08141565322875977,0.07875490188598633,0.058120012283325195,0.1229248046875,1.0895576477050781,0.04629325866699219,0.0756070613861084,0.06896328926086426,0.0768890380859375,0.05928349494934082 diff --git a/results/combined/merges_timed/iryndin/jdbf.csv b/results/combined/merges_timed/iryndin/jdbf.csv index f10f90e621..e8eb20d43e 100644 --- a/results/combined/merges_timed/iryndin/jdbf.csv +++ b/results/combined/merges_timed/iryndin/jdbf.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,9853124d737de64723a5fbdc879aed3b3d907656,6873736fe4071a4ab6e1cf0790f2c3eb252146ee,7855c84d1ca249ed60c5f43634036c6c34c334bc,,True,True,Tests_passed,decc28d7f0fc97bf55ee9c3becde0b585c246a4ad569ab3ef73e21162a80191f,True,10,41,365,2,True,Tests_passed,e6156306513b246fd88141be270e51fed49622d50b84271889eb80cc14b811d1,True,10,True,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,0.04611325263977051,0.03927135467529297,0.04302048683166504,0.040058135986328125,0.04095005989074707,0.037192344665527344,0.041379451751708984,0.16588687896728516,0.10371971130371094,0.7254738807678223,0.3385894298553467,0.06825542449951172,0.12468147277832031,0.039266347885131836,0.04039359092712402,0.03893613815307617,0.03944277763366699,0.039541006088256836,0.07234358787536621,0.7278892993927002,0.038167715072631836,0.039102792739868164,0.02875995635986328,0.03980898857116699,0.028915882110595703 diff --git a/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv b/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv index 31005c6ec8..f8ce8427cc 100644 --- a/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv +++ b/results/combined/merges_timed/iterate-ch/java-openstack-swift.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,8a6b85283157ee0e827e9f4b99848372bb20e770,45818c6defaaaf55e9973c210d069877ac708643,8d3f1c990fd8de009a13a9b67769c8c80ae5f7c8,,True,True,True,5,25,580,2,True,5,Tests_passed,492d0fb3ffa41989fa930aae319f5fb19bcd2c00a5fad6c03781efd0dd99c10d,True,Tests_passed,dcee5e5189caee7da235f3f57dcfd19e9c012a3bbd7dd5bb693ade1d60c49eb2,True,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,15ab040df872fb06c1ff4c90669754f28e3c9d2a5713b7bf94196a846dd208c6,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,aa768e2365a03b752ac98dcf3226a0889f47fb0618a48a5f94794b19a51d264e,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,6b14d809f56a3bbb58f806b0cea74dfd93f4115f115ff542adc3219244ca537a,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,0.027547597885131836,0.04075980186462402,0.020996570587158203,0.05262613296508789,0.044681549072265625,0.04189252853393555,0.04377317428588867,0.17786026000976562,0.11283636093139648,1.569786787033081,0.540041446685791,0.08309197425842285,0.11723470687866211,0.038683176040649414,0.0387270450592041,0.03875112533569336,0.038767337799072266,0.03917336463928223,0.07036590576171875,1.4140558242797852,0.037044525146484375,0.038834333419799805,0.037128448486328125,0.03762650489807129,0.03750443458557129 diff --git a/results/combined/merges_timed/j-easy/easy-rules.csv b/results/combined/merges_timed/j-easy/easy-rules.csv index a7ad6a8a7a..e7bb0989c6 100644 --- a/results/combined/merges_timed/j-easy/easy-rules.csv +++ b/results/combined/merges_timed/j-easy/easy-rules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,True,21,47,688,9,True,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,True,25,True,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,6fea9e71ad7bada002aba69b755bfa4b6f75b93bff15f16bf40f432b5986cafb,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,14e7694fb3206570917e6e747919adc676f7052e8e35fd41b12a73faca532956,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,0.034018754959106445,0.03992199897766113,0.04615473747253418,0.013575553894042969,0.04868292808532715,0.03273153305053711,0.040290117263793945,0.3376729488372803,0.28250789642333984,0.9429569244384766,0.47666096687316895,0.17634892463684082,0.14294719696044922,0.06110024452209473,0.06112837791442871,0.06131434440612793,0.06119251251220703,0.06137895584106445,0.1435692310333252,0.9263203144073486,0.060068368911743164,0.05970358848571777,0.03871965408325195,0.06074261665344238,0.03815007209777832 diff --git a/results/combined/merges_timed/j256/ormlite-core.csv b/results/combined/merges_timed/j256/ormlite-core.csv index 7af2d662bb..8770295a3f 100644 --- a/results/combined/merges_timed/j256/ormlite-core.csv +++ b/results/combined/merges_timed/j256/ormlite-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,606986f118bb8c4de534c102f93dcbdc1241abd7,f46f05f128a1bde083a51b6f6e9f8f4a0981d7e5,1b78b22f5834adc7b9c1d0d6f93bc818594bb4a0,,True,True,True,74,554,2219,2,True,74,Tests_passed,a972f400f6fcc6d9ee2ff909c932ddc26fe443160251f3c095bc5840d3501966,True,Tests_passed,12083c250dbd413849a212a432fe7c60ae3cfe4c4c126e7bb6021d51bb54aed1,True,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,20fc42555015c8eb603cfe7924a782cbed1844871b59c6457ba9b1d2f19c21a5,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,0.026480913162231445,0.05844736099243164,0.04557323455810547,0.0631110668182373,0.06304144859313965,0.04533743858337402,0.05710482597351074,0.12383866310119629,0.08004236221313477,1.6314959526062012,2.47906756401062,0.13147521018981934,0.1589069366455078,0.08718466758728027,0.09632158279418945,0.06460356712341309,0.09636735916137695,0.06256365776062012,0.1407616138458252,1.5547020435333252,0.05933523178100586,0.08462905883789062,0.05072355270385742,0.07478499412536621,0.06654620170593262 diff --git a/results/combined/merges_timed/j256/simplemagic.csv b/results/combined/merges_timed/j256/simplemagic.csv index 7ae53006b5..1d2eb49c31 100644 --- a/results/combined/merges_timed/j256/simplemagic.csv +++ b/results/combined/merges_timed/j256/simplemagic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/remotes/origin/pull/62,a2fee571fbe304efa8981457403471a2504062b4,be23be93333aeb434b823ec988702e9a782e0091,360362b52be76e31d01182abffe73f25e170221d,,True,True,True,26,83,226,3,True,26,Tests_passed,d03640f23aeba27e1e1897251a2c6aec7d0c8675284b845a9b3eb9a413eed29d,True,Tests_passed,0b1abe883085eb51e4bf3615986acb3cb28d1a78a5ad220644e3e714f293c907,True,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,bbf689443b2c45bb6447a04fabbe0b5cdc1f5bd959aa1fdb9c4ae59a4894df40,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Tests_failed,50f85f927c2b3eb03a25d83363bb9823636dbcf875d1e4adc520c1af3ff54cfb,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,e972762f15b11296a2fbd9114ffd8a0ba58a7a7092632c311968b726c4d90338,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,0.05699634552001953,0.05351710319519043,0.05451250076293945,0.06304740905761719,0.03970956802368164,0.03172779083251953,0.04961133003234863,0.21127533912658691,0.18195581436157227,1.95851469039917,0.6865603923797607,0.14787960052490234,0.14537286758422852,0.07041478157043457,0.05457043647766113,0.07065534591674805,0.07577133178710938,0.07313799858093262,0.13008356094360352,1.9213759899139404,0.0687723159790039,0.07043027877807617,0.06473636627197266,0.07108783721923828,0.04563498497009277 diff --git a/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv b/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv index 1b8555c346..c646ac24e1 100644 --- a/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv +++ b/results/combined/merges_timed/jacquesberger/jsonparsingexample.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,ac521954c2d20f93d597a8dfbeae1e3f008befda,09ff67b95c86658c563e180e2675768b845987d9,9b33d2d1e147bd014e2bb503ca0a38657876ce47,,True,False,Tests_passed,30b2ef34340761d99265a2fe661f6a3d29b66e4ae4883458cc38229a4aa68972,True,2,4,15,2,True,Tests_passed,c5f74055095f11a18db09272a291c7d5d9ac46a8b437ae1dc5cdeedce0173a68,True,2,True,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,9b4a2d8f81e91d2fcbae9134c5cbc551c0a4c717a8d2967931b95ccc9d22e314,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,817aabdc1c7c260b2b6640f8612a0c838ae9c30bb2d62a225fbdee9c58fbc6e2,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,4b12efad7f67d92f72aabea2c4df7cce7e052ef9c41a323cb69a393598218220,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,0.037369728088378906,0.03659868240356445,0.03562474250793457,0.03430461883544922,0.03455686569213867,0.035147666931152344,0.032985687255859375,0.14992022514343262,0.11929845809936523,0.5494441986083984,0.23946642875671387,0.06508469581604004,0.1116948127746582,0.03110527992248535,0.031119823455810547,0.03090071678161621,0.031017541885375977,0.0305635929107666,0.059648990631103516,0.5530569553375244,0.03169131278991699,0.03179502487182617,0.029385089874267578,0.031500816345214844,0.029768705368041992 diff --git a/results/combined/merges_timed/jadler-mocking/jadler.csv b/results/combined/merges_timed/jadler-mocking/jadler.csv index bd3176f2df..ffccd01cf1 100644 --- a/results/combined/merges_timed/jadler-mocking/jadler.csv +++ b/results/combined/merges_timed/jadler-mocking/jadler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 117,refs/heads/master,c022c949608a874cfc3c2a47cc18b3cf6ef0f161,3b24b879c4bde13d48c40c9afd91250aa5b18368,a29d0b7c2f1e21f1cbcf088c3bdf13640b569749,,True,True,True,17,103,249,3,True,17,Tests_passed,6c7ce2d9a83c0e602b91d8c1448f5d6bc2d59f42ceaa2495a9c8fe1c9e9f2fc2,True,Tests_passed,91390ac5fdfd0bf29cbc1e6bf3dba5332c215e20f2dd20fc7d0185d510e908a8,True,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,0.04296088218688965,0.048613786697387695,0.041870832443237305,0.042366981506347656,0.051183223724365234,0.05663657188415527,0.03187394142150879,0.23544764518737793,0.17304658889770508,2.0450124740600586,0.718571662902832,0.11156749725341797,0.1409456729888916,0.05362534523010254,0.05139756202697754,0.05165505409240723,0.053002357482910156,0.053931236267089844,0.10487866401672363,2.0164997577667236,0.05266523361206055,0.052150726318359375,0.034842491149902344,0.05179095268249512,0.03324389457702637 diff --git a/results/combined/merges_timed/jahia/jahiapp-newsletter.csv b/results/combined/merges_timed/jahia/jahiapp-newsletter.csv index d47adfc026..7a2a06a9f3 100644 --- a/results/combined/merges_timed/jahia/jahiapp-newsletter.csv +++ b/results/combined/merges_timed/jahia/jahiapp-newsletter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/remotes/origin/pull/1,1d8a06e1d3bf5116c4d900bc808170310aed675e,ad6e58fc6b376e34a9b05748a456db9a7a2b35e4,51a1b0ec89c37330997c4af05f0e85c02d0f0312,,True,,True,27,170,,5,True,27,Tests_passed,f7e61f2816286bc68da15c29011967ae5a420ea75589589d219ce2d85c4b7114,True,Tests_passed,2c71690a52ac6d921d3ed2af69eba36ffe6d2840c064b694b5e1576e16e47c53,True,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,f1edc6884f942d8fb4d69036a63e43683f09722f9c7c191b4d99daf73ea07d60,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,8c6f56fa334e7e6393f4e5e184c96037f25e09d434d710946e9a48a0090b973d,Merge_failed,d2cd9824dbd0da6e15afe313768b1ed925c4326d116d48ffd3a97650fd38fa84,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,6f8c1ddace43684942699ebc103ca7532525385f55b7f36b9818cd33c2d9152f,Merge_failed,d376e620767ec4e7dc952350734ed0995b4e28a49ed84f92b945633825495274,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,0.054849863052368164,0.059256553649902344,0.053967952728271484,0.051915645599365234,0.04831361770629883,0.044969797134399414,0.05103492736816406,0.38352465629577637,0.2885274887084961,2.4682652950286865,0.45784878730773926,0.17897272109985352,0.14141488075256348,0.06251239776611328,0.06367278099060059,0.06298542022705078,0.06291031837463379,0.061872243881225586,0.14493918418884277,2.474580764770508,0.06291818618774414,0.06175684928894043,0.039324045181274414,0.061575889587402344,0.0388493537902832 diff --git a/results/combined/merges_timed/jahia/ldap-provider.csv b/results/combined/merges_timed/jahia/ldap-provider.csv index bda8384ace..390e2a342f 100644 --- a/results/combined/merges_timed/jahia/ldap-provider.csv +++ b/results/combined/merges_timed/jahia/ldap-provider.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,6d1c8ec4b6fd4b940368f7290fd5ab315efd3240,fc5ec6dad13d304cdfd981ea9a300b005fac4bb6,9f02fba71d5f3bad70d553709d718db715276f48,,True,True,True,20,40,311.0,8,True,20,Tests_passed,165a535fcc358261b96ed31f503ec7c5e0699da0eb44a4dee7acf1a09832015a,True,Tests_passed,900b71294fa88c05a9c4354beeb2645da4428586bf5aa04085cea58e231e3e3c,True,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,0.05159449577331543,0.05508852005004883,0.052304983139038086,0.035942792892456055,0.05254006385803223,0.054680824279785156,0.03461956977844238,0.5817611217498779,0.44027137756347656,5.28517746925354,0.5296893119812012,0.2626931667327881,0.17015862464904785,0.08781909942626953,0.08783578872680664,0.08792424201965332,0.08852267265319824,0.08807730674743652,0.21862292289733887,5.122135400772095,0.08667230606079102,0.08912491798400879,0.03119516372680664,0.0856618881225586,0.031822919845581055 diff --git a/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv b/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv index a78f550283..a5163160e8 100644 --- a/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv +++ b/results/combined/merges_timed/jai-imageio/jai-imageio-jpeg2000.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,3db9087392f4de4fd2ac154c811678fa6d29465c,0bfd01b19961a6511f71d083a6bb45d76502f196,1ce5e4a41c1b229d07643e0746fdeb91841e7414,,True,False,Tests_passed,2ae40e4ccee6b5f7205b4bd5dcbb255df235604bb28e8df519d41e495299271b,True,5,16,137.0,2,True,Tests_passed,fed1d63258b2c38fb9a467c6182291bda1a3ad5cab91d063ba311ba09f434b1a,True,5,True,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_failed,8d6b8d7765f20bc196d84710ac0e4772db75ae99d8ae4813a8d2961f082e597c,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,0.014681816101074219,0.01370096206665039,0.0455479621887207,0.029508590698242188,0.05440044403076172,0.0403902530670166,0.04516720771789551,0.17305588722229004,0.11059308052062988,1.6621532440185547,0.4531722068786621,0.12098550796508789,0.17308259010314941,0.08301687240600586,0.08088970184326172,0.06832003593444824,0.08611917495727539,0.08234429359436035,0.07557272911071777,1.544740915298462,0.051197052001953125,0.07686662673950195,0.0751655101776123,0.04321765899658203,0.07228231430053711 diff --git a/results/combined/merges_timed/jakewharton/disklrucache.csv b/results/combined/merges_timed/jakewharton/disklrucache.csv index 0e9b3fa13d..022eeabbe8 100644 --- a/results/combined/merges_timed/jakewharton/disklrucache.csv +++ b/results/combined/merges_timed/jakewharton/disklrucache.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,Tests_passed,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,True,3,15,135,2,True,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,True,3,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,0.008766889572143555,0.009540319442749023,0.009119033813476562,0.009754657745361328,0.00928354263305664,0.009067296981811523,0.009298324584960938,0.03270697593688965,0.06444120407104492,1.2582242488861084,0.45715808868408203,0.07044148445129395,0.1242208480834961,0.03928399085998535,0.04041719436645508,0.038602590560913086,0.03952193260192871,0.03929591178894043,0.07300090789794922,1.2864294052124023,0.038889408111572266,0.03989148139953613,0.028932571411132812,0.03898882865905762,0.02843928337097168 diff --git a/results/combined/merges_timed/jalkanen/speed4j.csv b/results/combined/merges_timed/jalkanen/speed4j.csv index 8010f05611..0d93af1b77 100644 --- a/results/combined/merges_timed/jalkanen/speed4j.csv +++ b/results/combined/merges_timed/jalkanen/speed4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,18370b95449b0062c7f3286734bb393cf47e02a1,1f224d4a60b62e76f9cdc0893e477e85295c3f13,1164f50c09c8ea4be8d59bc8cb8f01e11180e3ad,,True,True,True,5,13,69,2,True,5,Tests_passed,2f02793aa0403b6d25b6dd70488e1d1c286d04a41899d5d93551163078660fba,True,Tests_passed,fda8748049efa14bd2fb5c8c12aaa8e4d9b692cccc4f9f19182769752afb977d,True,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_failed,be64fbedf45f373e7536fa4ecccd794b7ddcd51bf8c5b5bb3d8306cf9eeb8502,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,0.04560399055480957,0.03528952598571777,0.046416282653808594,0.0393526554107666,0.044886112213134766,0.0415501594543457,0.041994571685791016,0.15654754638671875,0.10333728790283203,0.9643926620483398,0.2996549606323242,0.06912899017333984,0.1217656135559082,0.03917717933654785,0.04036355018615723,0.03878903388977051,0.039621591567993164,0.03870654106140137,0.07203149795532227,0.9170348644256592,0.03873729705810547,0.03951764106750488,0.028094768524169922,0.038763999938964844,0.02803325653076172 diff --git a/results/combined/merges_timed/japgolly/svg-android.csv b/results/combined/merges_timed/japgolly/svg-android.csv index e96ba3160c..ebb32807bf 100644 --- a/results/combined/merges_timed/japgolly/svg-android.csv +++ b/results/combined/merges_timed/japgolly/svg-android.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,c92bb808ebdd240679593f352cb0ef139b43ec27,f62966b068bf8bb8e96d4592ad12275549a4f2ae,93c4a06d20ad8c29305cd5604a387bf37d5abcd4,,True,False,Tests_passed,c64d70b547edb86cf23ef9683c1c8ad0feef84b572951ed57de742b9bfef6a16,True,2,8,17,2,True,Tests_passed,46d4d1b2217297aee78e7f99cebcdf7e4c913a1f8db3e7e77d2656272008369d,True,2,True,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_failed,78cfb6d1db3c56fd82528683ca62605fd77390b92f9b4dcbe1ee1b44fb3acffe,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,0.038013458251953125,0.039113521575927734,0.04605889320373535,0.035288095474243164,0.04726696014404297,0.045317888259887695,0.048024892807006836,0.17112231254577637,0.11464619636535645,2.1485700607299805,0.4846351146697998,0.07351922988891602,0.12687230110168457,0.04371047019958496,0.0427858829498291,0.04334282875061035,0.04245805740356445,0.04226803779602051,0.07484579086303711,1.9659042358398438,0.04204916954040527,0.04167938232421875,0.03024435043334961,0.04188275337219238,0.03137373924255371 diff --git a/results/combined/merges_timed/jasig/java-cas-client.csv b/results/combined/merges_timed/jasig/java-cas-client.csv index a4b2604b2d..38c7be9899 100644 --- a/results/combined/merges_timed/jasig/java-cas-client.csv +++ b/results/combined/merges_timed/jasig/java-cas-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 625,refs/remotes/origin/pull/65,f9dba228c432bb86dec5f92f7ae748d86c69b380,632377865559774569a2b0360cf5049146484bdf,affe0d30f1ce16e15399f30f1e5faa6ea878094c,,True,True,True,3,14,89.0,2,True,3,Tests_passed,7448b189c00609ac5e1320f51ac9a7479f2ac5a6b67f6040598fe79ae4217039,True,Tests_passed,27abde5006d5f40fd0a3771a9de7f04f888cb1a3af8444917e79eee115092aa2,True,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,78845707c97e4bcc8c69be7182376d4b809c83f0c86caabb0ddd299e64c9a3ae,Merge_failed,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Tests_passed,53578ed8b63ce69f167fac7496e9556bbc973ed08e9ad4f767a086f8d52f9a5c,Merge_failed,17ac687484ea4941fc304aa82586e9a471758be1f7087f6e5abcb51b9bd367c8,Merge_failed,8371ae21cb527eae531d56a769a3ce664d266b6a11f703ccdaa06bf28298e16a,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,62d7940f1c89e07517924f272a2b510532585d88f7a03b7eb2cdb98aa1d81c84,Tests_passed,53578ed8b63ce69f167fac7496e9556bbc973ed08e9ad4f767a086f8d52f9a5c,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2a00602dfe3aa21a03f00c8103611c77c58799e4e2c5d98d527218ea43af5cdd,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,Merge_failed,2f2091f82e866d3a91f403819ebc1cf92049b155b092383dce17e3ba0b7d5152,0.03224921226501465,0.033394575119018555,0.02044200897216797,0.018996715545654297,0.013330936431884766,0.01345372200012207,0.017484664916992188,0.09514045715332031,0.09670042991638184,0.7725253105163574,0.30945444107055664,0.07723855972290039,0.12725043296813965,0.03238964080810547,0.04416465759277344,0.0435490608215332,0.04379129409790039,0.043349266052246094,0.06525039672851562,0.7518200874328613,0.03482675552368164,0.041728973388671875,0.04257512092590332,0.041529178619384766,0.04177427291870117 diff --git a/results/combined/merges_timed/jasig/jspc-maven-plugin.csv b/results/combined/merges_timed/jasig/jspc-maven-plugin.csv index e2b68bcfa2..4eac2cf830 100644 --- a/results/combined/merges_timed/jasig/jspc-maven-plugin.csv +++ b/results/combined/merges_timed/jasig/jspc-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,1ea62650f81dfb722f95c0878b8d49ed45e1149e,96e5b1d72738896df1e0a7c3d0c19e50e9d2026f,448cddfb8a0fdfa129f96247a4863d60ae70b648,,True,False,True,5,8,24,2,True,5,Tests_passed,a2cd8a1fbb8723186b1a57c1eff2346cf635be462eb45f53b90f49fe704e4ab3,True,Tests_passed,3c5cbcfdbda7dc0b5ffb709df3aed6315a34510bacf21844794227e72b075014,True,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_failed,907a965dee6c03aec73deb4d16d0a9aa6339681dbe85ce7b3e2b9ce8cc7a5082,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,0.04670357704162598,0.0517728328704834,0.04662728309631348,0.045806884765625,0.05329418182373047,0.04506230354309082,0.04481649398803711,0.17440128326416016,0.1082310676574707,1.1401293277740479,0.316866397857666,0.07610964775085449,0.13523030281066895,0.04580330848693848,0.04653024673461914,0.0439453125,0.045720815658569336,0.04597067832946777,0.08055496215820312,1.1457979679107666,0.0444636344909668,0.04472970962524414,0.03400087356567383,0.04491734504699707,0.03408932685852051 diff --git a/results/combined/merges_timed/jasig/webproxyportlet.csv b/results/combined/merges_timed/jasig/webproxyportlet.csv index c5541aabfa..6a1f297640 100644 --- a/results/combined/merges_timed/jasig/webproxyportlet.csv +++ b/results/combined/merges_timed/jasig/webproxyportlet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 141,refs/heads/master,aa92c74f5e24668cc8312270702585e14c649b11,b008613b5a9adf71e75776098ea5110b794170ef,11306f962cabe54ce892c328b432041dacbb83dc,,True,True,True,13,47,175,3,True,13,Tests_passed,694ad467e24df3ddcf2ff62e9be3d67bc584561f8aa89172c6075b7cce0b545f,True,Tests_passed,8f9bf557172eca435165112d4c29e1c511b6b503650a14e1e6f8a5bceb07116e,True,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_failed,5cec65c37b520ae6ebd76811f00131f9e7238b5367721765e5a6ad97ac796a6c,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,0.01503133773803711,0.015896320343017578,0.01881098747253418,0.018705129623413086,0.018970966339111328,0.01872706413269043,0.01799798011779785,0.05901050567626953,0.12258338928222656,0.7425084114074707,0.4026830196380615,0.11617469787597656,0.16104650497436523,0.06526303291320801,0.06507301330566406,0.06294655799865723,0.06500101089477539,0.06589984893798828,0.12356281280517578,0.788658857345581,0.06205916404724121,0.059927940368652344,0.04354667663574219,0.05950593948364258,0.04395341873168945 diff --git a/results/combined/merges_timed/javamoney/jsr354-api.csv b/results/combined/merges_timed/javamoney/jsr354-api.csv index a556190a03..8d82f0c2fb 100644 --- a/results/combined/merges_timed/javamoney/jsr354-api.csv +++ b/results/combined/merges_timed/javamoney/jsr354-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 142,refs/heads/master,7422197487f7fb1c43111c98d9859e9c05052566,668d6eb9dd831ffaa0a5f20dd9f34f6e54eb8a08,73a0bfe83fe56f264293476ce262a774c7b7fc1f,,True,True,True,31,144,1603,3,True,31,Tests_passed,6ab3a9b711d74ef199aa3f1233e5fe391abd67eb68b492cb73f83c29a476a9cb,True,Tests_passed,4630f11d26138b665e413ef8871fafadc2b6ecc7179c43278a1de0a05d709754,True,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,c8e2ea6aea0bcc16814521f4362c82585c78226dbcad18ae74ddb25a913f7e67,Merge_failed,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Tests_passed,b7f6c1f9fda12ddda1a89301abcc72cbb98684187daf5e76a5cdb77a631be000,Merge_failed,f349d2be4e2e7c61cfe9a842b02987df7a52cdf522a785fdb9de301bb617bca6,Merge_failed,49366f8dfc1003417374236aad4dd132efaa73607d10615784e74cb0666e56c6,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,348001878b76b74811c9146efd0127f10a90a8dad65adad1a176fe2fd053c134,Tests_passed,b7f6c1f9fda12ddda1a89301abcc72cbb98684187daf5e76a5cdb77a631be000,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Tests_passed,3167acaf3d30d2a9388d4699309d12285770150788ec3900f78b01314671642c,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,Merge_failed,d39192477912d496ae96333781e892d610af2a3dc6c19ec724f2045bc61de111,0.05078554153442383,0.03864741325378418,0.03853631019592285,0.04743671417236328,0.047943115234375,0.04834246635437012,0.04894566535949707,0.2437889575958252,0.16870665550231934,1.0454826354980469,-1.0,0.11060953140258789,0.13554096221923828,0.04566049575805664,0.06652617454528809,0.0537111759185791,0.04741525650024414,0.05557847023010254,0.10251402854919434,1.0757949352264404,0.04561448097229004,0.06414985656738281,0.05294942855834961,0.045209646224975586,0.051843881607055664 diff --git a/results/combined/merges_timed/javamoney/jsr354-ri.csv b/results/combined/merges_timed/javamoney/jsr354-ri.csv index fbe8b54ba9..52594fd033 100644 --- a/results/combined/merges_timed/javamoney/jsr354-ri.csv +++ b/results/combined/merges_timed/javamoney/jsr354-ri.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 124,refs/heads/master,bf07022ccddab3171412db1170d03ec24c77c41f,73024585e9348d07013a2cb4f10907f272638324,6ecd20662ad4ca485ca6f2b847c96be408866aeb,,True,False,Tests_passed,2cabcbda40f4b38bd5f07ff71e46daf13a82c59c7492a5dc47ff5a49b3038115,True,2,7,20,2,True,Tests_passed,17b3f856026a0b53aa106d36233b3ff01c7eb3c421c8d90b4fe5cbfbb26f2e4a,True,2,True,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,c54875644236b618258e3a223b4f9aff6e546c8143b5f7257a3ac0c944fdef6e,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,844eda3244d6700bc3d32655b3ff68b28efee1ce1e89438fd4549f95ce8c5c8e,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,6a0d2520999f43ec8d5aedc105799f158802f0362ea78024e3b0208436d5ef50,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,0.010616779327392578,0.030515193939208984,0.009700775146484375,0.03679060935974121,0.04014849662780762,0.009653806686401367,0.010231733322143555,0.10180521011352539,0.12202334403991699,0.7209763526916504,0.2947964668273926,0.07817316055297852,0.20398449897766113,0.03490805625915527,0.09079265594482422,0.05565643310546875,0.03384733200073242,0.09237098693847656,0.14051413536071777,0.7440280914306641,0.06596231460571289,0.033901214599609375,0.09833884239196777,0.062117576599121094,0.09237957000732422 diff --git a/results/combined/merges_timed/javaparser/javaparser.csv b/results/combined/merges_timed/javaparser/javaparser.csv index 946b4923e5..6c84ef99e5 100644 --- a/results/combined/merges_timed/javaparser/javaparser.csv +++ b/results/combined/merges_timed/javaparser/javaparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3206,refs/remotes/origin/pull/3114,9037e57c930136b82fb779e21beaabfaf0a9f124,d2894b00357c4cf196c4868a71ee76ac74e08569,008452082678aa5e21593eb4c2fccd745f610efb,,True,True,Tests_passed,129e930cc5d38fe894a1482585e8ba0b8de2b09dd08541cc4d08e767fe3b2525,True,342,2186,12572.0,3,True,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,True,342,True,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,041231272b5215e3fc9ce62c7be072d77218dae718b46e45890c9e4da4381bf8,Merge_failed,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Tests_failed,ef223416d8c6f4e51fd9454ccd0444011894c38d0b38c47b21832ff86d8b2a66,Merge_failed,a1b45e333d9ad5de16539956e3035fa704a1cad26d0f82bd5600028a92ff5670,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,e77452f76c47d4c931394ad83ab6785627bd413c85f4cba18c33130c09684ed5,Tests_passed,0648e6bdae51b980a44c431c6f2585e75d133aaa7fb58f3696eabdb4506bd78c,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,72f9e4b7f0d50a9235b92599da30fdedaeb863b3715feadc9a5df27d97474bae,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,Merge_failed,fb34b8d67fee08457a41c70e34250f225d1b6e10a18c0f44e5b4b7ec55c07403,0.059625864028930664,0.05851316452026367,0.06464624404907227,0.06537628173828125,0.06514167785644531,0.06690311431884766,0.0647580623626709,0.15731453895568848,0.1680011749267578,1.9098291397094727,7.089571952819824,0.17728853225708008,0.22844338417053223,0.11452794075012207,0.11525297164916992,0.11851644515991211,0.11691832542419434,0.11675000190734863,0.19083476066589355,2.022369384765625,0.1140739917755127,0.10734820365905762,0.10483908653259277,0.115386962890625,0.10691308975219727 diff --git a/results/combined/merges_timed/javasoze/clue.csv b/results/combined/merges_timed/javasoze/clue.csv index 23ace7d73f..fbf755565f 100644 --- a/results/combined/merges_timed/javasoze/clue.csv +++ b/results/combined/merges_timed/javasoze/clue.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,a0e4c4affb26558cd60574073c39681defdcf954,7a7a348040753f9ea915cb5a8f06e66fba1b9adc,d8ac1e2274071f67eb86643b71bc7704772a045e,,True,True,True,28,149,952,5,True,28,Tests_passed,16221b2b7a88556270dea2d1ce13961f7ac08814fc04e2774206107367c9ead8,True,Tests_passed,bd0e1cdfe3c8392f6b2b533b04ea4fae823450491407739a0be829c63d6d5b21,True,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,237ab2beb534d42a88ffb8435069e6272ce8bac21bee88457800f6685f2d927a,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,974e587e953802e68e0723eac5d8fa155ee3176ec3e7bcf8c976ad14867f941b,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,c3818ead7af5e2c7a3490fc74aa4888cc1ed863561f0674da72ea95012921fe5,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,0.04320573806762695,0.05829572677612305,0.04492664337158203,0.055115461349487305,0.03960061073303223,0.05060720443725586,0.06011557579040527,0.2890639305114746,0.2709975242614746,1.9891140460968018,0.6535544395446777,0.2102036476135254,0.1998894214630127,0.10688591003417969,0.10055923461914062,0.10241246223449707,0.1049489974975586,0.10199642181396484,0.21893954277038574,2.0775840282440186,0.09883952140808105,0.09700751304626465,0.07871246337890625,0.09667778015136719,0.07848429679870605 diff --git a/results/combined/merges_timed/javen205/ijpay.csv b/results/combined/merges_timed/javen205/ijpay.csv index d4c5b8ca7b..73cfa7db2a 100644 --- a/results/combined/merges_timed/javen205/ijpay.csv +++ b/results/combined/merges_timed/javen205/ijpay.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,True,True,True,136,274,10642,2,True,136,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,True,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_failed,fef54fb88648ec223b6dbf3d01bc06ceb8419acafe99490dbac92e212d48563c,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,0.06819415092468262,0.0421595573425293,0.05865836143493652,0.06672334671020508,0.07776737213134766,0.05490732192993164,0.07175993919372559,0.19119572639465332,0.0994865894317627,0.9691572189331055,1.4477860927581787,0.10266685485839844,0.16214489936828613,0.0687253475189209,0.06934237480163574,0.06793069839477539,0.07295823097229004,0.06902503967285156,0.10869359970092773,0.9326932430267334,0.061930179595947266,0.0641326904296875,0.05409812927246094,0.06312417984008789,0.053627967834472656 diff --git a/results/combined/merges_timed/jayway/awaitility.csv b/results/combined/merges_timed/jayway/awaitility.csv index b2a8afe4dd..1e5aa9e570 100644 --- a/results/combined/merges_timed/jayway/awaitility.csv +++ b/results/combined/merges_timed/jayway/awaitility.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,80be464e3838de7c9886959a4e9565453d52466b9851d2ca4502d7dc0bca255a,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,0.013469696044921875,0.012835502624511719,0.013617277145385742,0.013886451721191406,0.013714790344238281,0.013603687286376953,0.013615131378173828,0.05480360984802246,0.12537741661071777,1.1494598388671875,0.30326342582702637,0.1069033145904541,0.13242077827453613,0.04993271827697754,0.050315141677856445,0.050093889236450195,0.05038046836853027,0.048914194107055664,0.10062122344970703,1.2034311294555664,0.04931187629699707,0.04806852340698242,0.04082298278808594,0.0489957332611084,0.03858304023742676 diff --git a/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv b/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv index 321bdb6d91..ff209428b4 100644 --- a/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv +++ b/results/combined/merges_timed/jboss-logging/jboss-logging-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 54,refs/heads/main,83df5d49064f76824cf23bad4e7fcb8776af855e,818acf752e1230fa945be7a2ccab3ee88665a32c,f7c761bb675a4ef7a0b7b5e245ce030f478546d1,,True,True,True,4,9,32,2,True,4,Tests_passed,0fe51dc2c490d0382682c06a1b2bc93bf005e557d0f09443bdc71e4ec920637b,True,Tests_passed,d27cfeddb1cd3c49098d3b4a3b126fdd1c48d522cb2a19814f769842d1f8fa1c,True,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_failed,7f1126281e50cbaff1f800444f39e7a8acc04ee06066c88c4810a02a9b83087e,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,0.04142045974731445,0.04161572456359863,0.0398862361907959,0.043140411376953125,0.05437111854553223,0.04684734344482422,0.05645585060119629,0.1683802604675293,0.10407209396362305,1.1373326778411865,0.34421515464782715,0.08115291595458984,0.13681411743164062,0.04997754096984863,0.049646615982055664,0.05150938034057617,0.049724578857421875,0.0490717887878418,0.08473944664001465,1.0463948249816895,0.04709148406982422,0.04760909080505371,0.03786969184875488,0.04815840721130371,0.03522014617919922 diff --git a/results/combined/merges_timed/jboss-modules/jboss-modules.csv b/results/combined/merges_timed/jboss-modules/jboss-modules.csv index 7b84da864f..7ddefe146c 100644 --- a/results/combined/merges_timed/jboss-modules/jboss-modules.csv +++ b/results/combined/merges_timed/jboss-modules/jboss-modules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 156,refs/heads/2.x,5e3d058d3c58015f9f6c5801c52285761a76f01c,2772d3e079099f08b4bd32d81f26549bb3d6a88c,32ffe5d4942aea74307f6146613c19d7a086b7b3,,True,True,Tests_passed,fccd9de43811ced4c6b325316a39ade676de7b313ab3c9b8207426133f40c103,True,21,87,634,2,True,Tests_passed,677fa2a3b5ba4290f87612f943557e529f86d253eba5a712b1d8362d0a699c79,True,21,True,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_failed,4d1e2c482b3c1af903bdd6130c98a1395c9123864226c043a72d963f112903b2,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,0.04726243019104004,0.04599499702453613,0.05318498611450195,0.05481362342834473,0.05169391632080078,0.05576968193054199,0.04208040237426758,0.1630992889404297,0.11684799194335938,0.7817223072052002,0.6591777801513672,0.07858467102050781,0.13447022438049316,0.04912376403808594,0.0473480224609375,0.04987955093383789,0.04841256141662598,0.04835033416748047,0.08183908462524414,0.7570993900299072,0.04444265365600586,0.045642852783203125,0.0364832878112793,0.04661726951599121,0.03525424003601074 diff --git a/results/combined/merges_timed/jboss-msc/jboss-msc.csv b/results/combined/merges_timed/jboss-msc/jboss-msc.csv index b7675a1509..f31803915a 100644 --- a/results/combined/merges_timed/jboss-msc/jboss-msc.csv +++ b/results/combined/merges_timed/jboss-msc/jboss-msc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 44,refs/heads/main,2109ea6f82b5ab20a1a6b918654f7f0e990a5c06,98ab9419c2e91f16c31e50f5acf9b5f55a7da7ee,1a17f7befaa22cd08fe07c21033bc450bd09f5f7,,True,False,True,3,93,280,3,True,3,Tests_passed,13114c37ee83516642ac08e9fd85c70840d9ca7eafada24af9db523a7969475f,True,Tests_passed,35d503dbd81d2adeb3a10bd4c33c1c2d41556ade7ecf209397a6c4fbaa995e89,True,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,7846f6f0411e6dce3c20697a249505db79c8b66242344d4291e5f794e08feebb,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Tests_failed,4f7c57167caab4a1fbad985f6e7204e9d9528226f592cfe126022dc79854bd37,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,3449abc52b7f4b54087b54fa454e2626221b7b4caaf1783987f538cfd1ec5602,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,0.020793437957763672,0.021051883697509766,0.022742509841918945,0.022945165634155273,0.023035287857055664,0.02282261848449707,0.02260279655456543,0.06737852096557617,0.13423871994018555,4.043978691101074,0.7834274768829346,0.13450241088867188,0.1373767852783203,0.06285595893859863,0.053938865661621094,0.060517311096191406,0.06453990936279297,0.05872941017150879,0.12044358253479004,4.122619867324829,0.06061291694641113,0.05891108512878418,0.0544428825378418,0.059452056884765625,0.050904035568237305 diff --git a/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv b/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv index faf1e8baa4..63efb3fda7 100644 --- a/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv +++ b/results/combined/merges_timed/jboss-remoting/jboss-remoting.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 204,refs/remotes/origin/5.0,050c1fa2551eea88f7caf1f051ffea5b6fdfebf2,db1be1ce0c8c47cfc1fb32e1f9cefd47b4c96661,7ac33ddc3585b9685a6d7866c6b596389bb55110,,True,True,True,12,38,498,2,True,12,Tests_passed,37b6db33953d2a0ddde294da73adfa49e2d6335f8a14e3b06404fef1ec24b54d,True,Tests_passed,52a2db13cbf3c6cdb6916d09a47ffbb7907f2507da601405d68b4aa8306fe5ac,True,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,18d889f9229a8c1fd9709f4378e188a0e8c9240fdd88cb949a0143821a06a5fe,Tests_failed,31d8adff573a5c9cd295aa6bb05d02f343ea7a7ea0aeea163c1854faab54c36e,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,18d889f9229a8c1fd9709f4378e188a0e8c9240fdd88cb949a0143821a06a5fe,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,Tests_passed,43a8853122643da842442ee12978d238aa17777b77e7870743a75b0e65ad46f9,0.014517545700073242,0.015254974365234375,0.018163681030273438,0.017380952835083008,0.01770186424255371,0.017651081085205078,0.01753997802734375,0.04570174217224121,0.0704038143157959,1.0225939750671387,0.552126407623291,0.08556008338928223,0.14848756790161133,0.05442357063293457,0.057494163513183594,0.056025028228759766,0.055272817611694336,0.05277299880981445,0.09489583969116211,1.0853643417358398,0.0523829460144043,0.05357193946838379,0.0428004264831543,0.05223798751831055,0.04158449172973633 diff --git a/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv b/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv index 25e4bdd287..45889fc21c 100644 --- a/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv +++ b/results/combined/merges_timed/jboss/jboss-jacc-api_spec.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,c462f40aa4634e8f135b9c5231d3de797d3290b1,8a114ee6daebc64bf9fbd46e097d197f46946220,e534feedc32806baf77693c27558b17bb9023eaf,,True,False,Tests_passed,d7d73dff718cc5e2355b31660c858940ca925af56b2e841338ad742ac3fddb22,True,4,9,32,2,True,Tests_passed,566fce4c7484fd2b63f24635cd5dbfbf9216c1f7d7b449ebdc07f10b11121c82,True,4,True,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_failed,090f0bf65d1296e57b7438aa95d332f58b496fde89cb9473be700a77194f757b,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,0.041670799255371094,0.04214191436767578,0.04556107521057129,0.0452730655670166,0.03881359100341797,0.04252314567565918,0.04600977897644043,0.1659862995147705,0.09315776824951172,0.8557000160217285,0.3335587978363037,0.06937503814697266,0.12933564186096191,0.04027962684631348,0.04105424880981445,0.040862321853637695,0.03951001167297363,0.0402064323425293,0.07276010513305664,0.7940113544464111,0.03907275199890137,0.040631771087646484,0.028693675994873047,0.039919137954711914,0.029451608657836914 diff --git a/results/combined/merges_timed/jbossas/jboss-dmr.csv b/results/combined/merges_timed/jbossas/jboss-dmr.csv index f3692f4a29..5b5e349e32 100644 --- a/results/combined/merges_timed/jbossas/jboss-dmr.csv +++ b/results/combined/merges_timed/jbossas/jboss-dmr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/main,2a31e46d096142fa30d5ddcf584cd0c971ada12a,c0430fb6272c5beb96eeff49c0c7677f84be9665,1696eff49c95b72f32a68cfe701f67d4771e8592,,True,True,True,2,3,36,2,True,2,Tests_passed,0d8a983b2b6d09b2503f6192889ddadf7000165d821ef1e7f6548298a2f6df34,True,Tests_passed,f3cf155211d0182fcb9d3ee80f11a8a50ef0a8dc05cca58ee304a011be0e0343,True,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_failed,e1a36e8b4b81538d80ed2ad322adc415f856cf28a7eebc0e602a876ee110d2b0,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,0.0456387996673584,0.029156208038330078,0.04403281211853027,0.018634796142578125,0.0423736572265625,0.025338411331176758,0.0523381233215332,0.15220236778259277,0.09449577331542969,0.02856302261352539,0.4324002265930176,0.07300090789794922,0.1318504810333252,0.042163848876953125,0.04181718826293945,0.04193115234375,0.041274309158325195,0.041806697845458984,0.07507586479187012,0.05476236343383789,0.04233837127685547,0.042405128479003906,0.030463695526123047,0.041596412658691406,0.031017065048217773 diff --git a/results/combined/merges_timed/jbossas/remoting-jmx.csv b/results/combined/merges_timed/jbossas/remoting-jmx.csv index fd2fb6f196..cac13f9313 100644 --- a/results/combined/merges_timed/jbossas/remoting-jmx.csv +++ b/results/combined/merges_timed/jbossas/remoting-jmx.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/3.1.x,b9ca42ed29dac295c11413a095c7f20a4c818ac4,da141df9a273d361c2317364add9302e66b6ceb0,9dc2bb688ee3b5be65dac1bec419c816d734ead8,,True,True,True,72,314,3039,3,True,72,Tests_passed,fd315bafa64a993c9ce029667b7cc6f59f162d60ac2b6e8c4f2ff640348a9c1f,True,Tests_passed,091b3f0829802b885280dfd2f870688e02132fbdfed6a90f0d5bda35d162492a,True,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_failed,701bd556b407a533313375c99f08f230233f95528f94d9a2a2314727ff950185,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,0.019644498825073242,0.019719839096069336,0.021045446395874023,0.021237850189208984,0.02124190330505371,0.021291017532348633,0.020477771759033203,0.06156635284423828,0.12647604942321777,0.899738073348999,1.0550475120544434,0.11710143089294434,0.1537618637084961,0.06433391571044922,0.06376385688781738,0.06292319297790527,0.06298327445983887,0.0646660327911377,0.118927001953125,0.9122931957244873,0.06244492530822754,0.06241178512573242,0.04412221908569336,0.06268835067749023,0.04580283164978027 diff --git a/results/combined/merges_timed/jbossas/staxmapper.csv b/results/combined/merges_timed/jbossas/staxmapper.csv index f25a5785b8..ea57fc13d3 100644 --- a/results/combined/merges_timed/jbossas/staxmapper.csv +++ b/results/combined/merges_timed/jbossas/staxmapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/main,8df8c6aad07328ccec3c4326485074342d85673b,6c21060a407fa75ffb47a90b4aa8a3f929ea08db,625397a3c0056de4fbc20ddf6cddb8f47a00b695,,True,True,True,9,68,225,2,True,9,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,True,Tests_passed,877fbef5f9ac8b3cf678987c016f228ea215959a773fbd8c4e5d818f35e949b5,True,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,0.043792009353637695,0.043349266052246094,0.011822700500488281,0.04303693771362305,0.04403257369995117,0.04424643516540527,0.04686713218688965,0.16006827354431152,0.1146235466003418,1.0340924263000488,0.3548696041107178,0.06669735908508301,0.12310957908630371,0.0385739803314209,0.037996530532836914,0.03848552703857422,0.03684258460998535,0.0383455753326416,0.07030248641967773,1.0217769145965576,0.03848695755004883,0.03830981254577637,0.02746725082397461,0.038358449935913086,0.027211427688598633 diff --git a/results/combined/merges_timed/jcabi/jcabi-aspects.csv b/results/combined/merges_timed/jcabi/jcabi-aspects.csv index 42726439b0..3b5892b7ee 100644 --- a/results/combined/merges_timed/jcabi/jcabi-aspects.csv +++ b/results/combined/merges_timed/jcabi/jcabi-aspects.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/master,5780cbf85c5170db6de69ea735b8ccc73361b05f,bfd32ffe36542cfeb011e18f745c306e0cc59570,1d2552cb4cc1242e3c20432ffadb304808681d8e,,True,True,True,25,91,805,2,True,25,Tests_passed,a067de3f37170fe8342e109fdc0e2f97293756f8b5bf2569246227a2fe4e69c1,True,Tests_passed,dd5238278ff1088ec09a93db0f3313fd4ef1ef2b71b017bef5ae7f11c4bda8c0,True,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,0.06029176712036133,0.04261970520019531,0.04115581512451172,0.04136204719543457,0.06234288215637207,0.04661226272583008,0.05308413505554199,0.18850088119506836,0.11144304275512695,0.04622626304626465,0.6298410892486572,0.09805011749267578,0.1737384796142578,0.06755328178405762,0.06541776657104492,0.06685543060302734,0.06881904602050781,0.06771159172058105,0.10932588577270508,0.08032870292663574,0.06633567810058594,0.06412076950073242,0.05990958213806152,0.06558728218078613,0.05711078643798828 diff --git a/results/combined/merges_timed/jcabi/jcabi-dynamo.csv b/results/combined/merges_timed/jcabi/jcabi-dynamo.csv index 74fd257d34..4faf89d002 100644 --- a/results/combined/merges_timed/jcabi/jcabi-dynamo.csv +++ b/results/combined/merges_timed/jcabi/jcabi-dynamo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 29,refs/heads/master,06bfb00c7a266e151242c512dc82a81be6b92d76,1a80242486d7908971f3b156974f3f63c94bbda9,ea8513f79eb933f61166d8f83b52df386ff54a8c,,True,True,True,5,18,103,2,True,5,Tests_passed,17dc2c7d04982a7e8869aa0848337fc500b2fc6282eefeaef59058f281822914,True,Tests_passed,d2aa2c8f411d33b809f1460c91f99a8239c06539a84b61aef039e6a365118e39,True,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,ec408189b017722049068fe65dc20a5a9fa3bc67b14ee152f589be72f771d007,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d9a17efffc7bf285a420eefd33da231cf8d7b0d59e0eb852d87904531ae27f4d,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,0.01440882682800293,0.014430999755859375,0.014841556549072266,0.01434779167175293,0.014645814895629883,0.014591217041015625,0.014533519744873047,0.045729875564575195,0.07330751419067383,0.017394542694091797,0.33176660537719727,0.08231210708618164,0.12228202819824219,0.043854713439941406,0.04423975944519043,0.0422978401184082,0.045415401458740234,0.04348564147949219,0.07956552505493164,0.05794024467468262,0.0430295467376709,0.04339194297790527,0.043557167053222656,0.041906118392944336,0.043613433837890625 diff --git a/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv b/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv index 84b6a88bd2..423e80f09f 100644 --- a/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv +++ b/results/combined/merges_timed/jcabi/jcabi-dynamodb-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/heads/master,f338c10bd50912603f7c310831244485e9af2df3,1d7c27797979516e6ab4052e3aac3651378da823,2c1bb0dfdc2cb70fab5a08c25269727c6058f019,,True,True,True,11,15,304,2,True,11,Tests_passed,57d2272071c087975e1b6966f3eca7e31271f0fa0c51cbfb1f7366f494454baf,True,Tests_passed,dce284cf7b0a85d53b6982716e7a003920af2477db966b8d7f266026e0ee3440,True,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Merge_timedout,,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,0.011803388595581055,0.011474370956420898,0.012703657150268555,0.012378454208374023,0.01265716552734375,0.01243281364440918,0.01274561882019043,0.03861808776855469,0.06675982475280762,0.01475977897644043,-1.0,0.0765531063079834,0.1336517333984375,0.04649019241333008,0.04714179039001465,0.047514915466308594,0.04803347587585449,0.046648502349853516,0.08239173889160156,0.06046462059020996,0.043978214263916016,0.04686427116394043,0.03581666946411133,0.04586029052734375,0.0368344783782959 diff --git a/results/combined/merges_timed/jcabi/jcabi-github.csv b/results/combined/merges_timed/jcabi/jcabi-github.csv index b031e5c991..a2a5a0e6e8 100644 --- a/results/combined/merges_timed/jcabi/jcabi-github.csv +++ b/results/combined/merges_timed/jcabi/jcabi-github.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 834,refs/heads/master,3f10b3378f1939d1144bef90dfbad5e3c43071b5,880a05dd9f52b987255c6e012146fb31d69d3546,28426aeae14b3edc4fadf021501f8b4d6f98f66a,,True,True,True,60,88,8537.0,2,True,60,Tests_passed,2775dc74f5680ba237ac25aed61d18db659d7a6a7ffb284f44d37d4b189826b8,True,Tests_passed,7622bc13f9038a64ef459d326c811bf274dd0dea36af697dbb0d383eeed69e68,True,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,690ba674009119f1d6eeb976e2e00df804ead44e1ab587e6cf984fd10c9a5752,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Tests_passed,177f7bbde55cd639e68aa5e181054aa3434429dcb151b306564ad1d7bea25f8e,Tests_failed,adc5c7e057f67f1f5a432a52376b9bf7e9ce49579667830fb1e2d0df2bed26fa,Merge_failed,03ca1784da21ac353b7b4cf5922b44645193c32d2390ab01527f6f35e8052ed4,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,9719337aa620bb945d1d8011a7f0b54167f2e68f6bc2cb237483fcb91312116d,Tests_passed,177f7bbde55cd639e68aa5e181054aa3434429dcb151b306564ad1d7bea25f8e,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,Merge_failed,f55b6d2af546a375ce8769f946ae40efc41a0d9ec408e0d2ca5199a0acb016b8,0.0524444580078125,0.05043792724609375,0.05579018592834473,0.05707597732543945,0.05350208282470703,0.05733084678649902,0.0527186393737793,0.19909405708312988,0.11261892318725586,0.5503950119018555,0.5343282222747803,0.0804605484008789,0.13455986976623535,0.04494810104370117,0.04512214660644531,0.04099869728088379,0.04389047622680664,0.044934749603271484,0.07862496376037598,0.5465660095214844,0.04476308822631836,0.04545259475708008,0.04251456260681152,0.0434722900390625,0.038755178451538086 diff --git a/results/combined/merges_timed/jcabi/jcabi-http.csv b/results/combined/merges_timed/jcabi/jcabi-http.csv index e31257d7d9..9cdfe0d46d 100644 --- a/results/combined/merges_timed/jcabi/jcabi-http.csv +++ b/results/combined/merges_timed/jcabi/jcabi-http.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 81,refs/heads/master,0c63dd0c7521670361a6b8b54f23fc4efae247cb,6ce8a0910083d6f849d7802efe761cc792e0e002,e0aeb6b2fe7f76bbc7f9f1e31942882ff91ad79d,,True,True,True,5,19,147,2,True,5,Tests_passed,70decc44afc9f2545fa6c82bac15dcfe7c0b78e932ee38230dcaea7b9bdb2c3a,True,Tests_passed,5bb4614d01983011c60658d7ca972507fb1f2da46923b165e62075768f2de1e1,True,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,9902dbd55c865d6ee911acfbb00b2c4c7804bf24f149c8a761f71fcd42950ea0,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,0.035778045654296875,0.016675233840942383,0.027785778045654297,0.04454994201660156,0.05981755256652832,0.032016754150390625,0.047028541564941406,0.19626998901367188,0.10677933692932129,0.04112839698791504,0.26447010040283203,0.09798455238342285,0.16789841651916504,0.06995177268981934,0.07136321067810059,0.07001090049743652,0.06924128532409668,0.06826233863830566,0.11522507667541504,0.0825510025024414,0.06756114959716797,0.06444716453552246,0.05876803398132324,0.06794953346252441,0.05805516242980957 diff --git a/results/combined/merges_timed/jcabi/jcabi-jdbc.csv b/results/combined/merges_timed/jcabi/jcabi-jdbc.csv index 2e5ea224c3..8f84d5d9da 100644 --- a/results/combined/merges_timed/jcabi/jcabi-jdbc.csv +++ b/results/combined/merges_timed/jcabi/jcabi-jdbc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 80,refs/heads/master,40e95d792465ff63e698273a475a8b256cf11a5b,0955e011d84b9cb0365fb3d208c1ed279679e93e,4878681804738bae9a1f3140c5e5a67eeaa17bd5,,True,False,True,4,4,8,4,True,4,Tests_passed,a86414b4ca81197421bf87e8a766fd154cd787f735ba36f6e34e5b442f0b2fa4,True,Tests_passed,ea01f49037426a0c9c8e202564398b3ba587d7864410bbbac099e194d877419c,True,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,1da3a869425ebb4e7539347002f7912b4d963378289e6564e8841ebe191c6ba1,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Tests_failed,1818a6ee41f80ac8ccf2b3f0f375a848ba30dacb049d2471157516c10dbdfb9b,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,7a32390eac88ae039582543f31ef57e52585d085089b3eb58d88f1c197647e20,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,0.041512489318847656,0.0423121452331543,0.045001983642578125,0.04242086410522461,0.04012417793273926,0.03906106948852539,0.034204721450805664,0.29531407356262207,0.23877382278442383,1.9275801181793213,0.28118181228637695,0.13730382919311523,0.1286144256591797,0.04838371276855469,0.048282623291015625,0.04881763458251953,0.04929614067077637,0.04983115196228027,0.11132097244262695,1.9144268035888672,0.04960036277770996,0.050127267837524414,0.04619121551513672,0.04948544502258301,0.0469663143157959 diff --git a/results/combined/merges_timed/jcabi/jcabi-manifests.csv b/results/combined/merges_timed/jcabi/jcabi-manifests.csv index e0ac26805f..16d5a11f9b 100644 --- a/results/combined/merges_timed/jcabi/jcabi-manifests.csv +++ b/results/combined/merges_timed/jcabi/jcabi-manifests.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/remotes/origin/pull/45,84bccb34de372d8914bcc9c797705a155a71c516,6fab189edce64223226719803772cd8c9e98d0f6,feccf89447be6c4e13fc814d662d5d1b11f0c1c0,,True,True,True,23,92,816,3,True,23,Tests_passed,71528c2302785399766e84ca685268448f89ab87aa8e9c99ccb3fed9c096c311,True,Tests_passed,0e96359525af7d5c6d41b547e1248138efda706a9a658442dd57a8d1460c3e6b,True,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,9e85fef7ba0378babf6bfa1a4b110cddb7d9b2e6ae33c4b0c73e494c9dc2443d,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,Tests_failed,b7b8aefef5551d20ccc3b2fd26f1853e7900635bc0cd4cd2f90ad2d12333321d,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,7bf669f8db1d5073384d68f2ad34181ac078c28560ac5831afb8cb873bfdd50a,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,0.0432126522064209,0.05137968063354492,0.05076861381530762,0.04938364028930664,0.04836535453796387,0.05072188377380371,0.05404520034790039,0.24791812896728516,0.17858219146728516,0.03897666931152344,0.3206186294555664,0.10292315483093262,0.12710022926330566,0.04494357109069824,0.04650521278381348,0.04631400108337402,0.04535818099975586,0.045021772384643555,0.0948643684387207,0.05700397491455078,0.044266700744628906,0.044680118560791016,0.037268877029418945,0.04509687423706055,0.03705644607543945 diff --git a/results/combined/merges_timed/jcabi/jcabi-w3c.csv b/results/combined/merges_timed/jcabi/jcabi-w3c.csv index a3d7da86e4..59cc472db0 100644 --- a/results/combined/merges_timed/jcabi/jcabi-w3c.csv +++ b/results/combined/merges_timed/jcabi/jcabi-w3c.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,23fe00a21fa09bd2e74031f21bbe216fcce51734,c43bab15e5de136c1c5e2fa5e7754436ac481328,dceae84af1401fd04c808a779f322f31f7d1e543,,True,True,True,8,27,222,2,True,8,Tests_passed,9dbac1a006de34bda6583b276196754eb03bedf4c3638faf2ffcb9fa742531d8,True,Tests_passed,1c4495d4eec1ff55e7ec34fc6667cb0203635e076f710813a16f96e8f8e97116,True,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,4456d7797372795ef47cfb92ca0bbe94307fd733b353e69f84894fae9fa6cb03,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,91b66cf571216e2e917f6bfafb622f996e08c266a7e4c09ac7d649a941247ff7,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,0.05121588706970215,0.05019712448120117,0.044692277908325195,0.042111873626708984,0.0411219596862793,0.04586982727050781,0.04234743118286133,0.16963696479797363,0.11520838737487793,0.03979325294494629,0.2662227153778076,0.07122635841369629,0.11861228942871094,0.03673052787780762,0.03638887405395508,0.03643631935119629,0.0353085994720459,0.03568410873413086,0.06942415237426758,0.05077862739562988,0.03716897964477539,0.03608560562133789,0.03565835952758789,0.03594183921813965,0.03559732437133789 diff --git a/results/combined/merges_timed/jclawson/hazeltask.csv b/results/combined/merges_timed/jclawson/hazeltask.csv index 9f7cf7069e..cc591a39ca 100644 --- a/results/combined/merges_timed/jclawson/hazeltask.csv +++ b/results/combined/merges_timed/jclawson/hazeltask.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,9f9809f46cd73b80f333774d552565e5ca89f302,b2dd16e728a751889d4b24489c2dc3b0825b46ca,21c83e6c0520540de424bea4af4068826b6b447b,,True,True,Tests_passed,6863884ce35b3b3fcf6efd0bf8a3a3dbe06bae6ec921152119988287e7c27566,True,17,56,1153,2,True,Tests_passed,8a0b1d50a2aa45e693fd985c7df80f9938b47333a999a18f6fe5219fd71994a5,True,17,True,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,8b59e5d387cc6e32584e4d8e4559e16c7e91889e98d0bc3243f52227180059d4,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,36aef089a5fd613bc2a5ac5e756d57a67e8e9ccad7b762cfeeaaec4eaa82f4f5,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,a07ff57a37a98c2babfcc24ed40ae3180df0291ec38c89951746b6928d7fcd5e,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,0.010082244873046875,0.010142803192138672,0.010045289993286133,0.009909629821777344,0.010230541229248047,0.010212182998657227,0.010469675064086914,0.03547096252441406,0.06695151329040527,0.9874234199523926,0.398820161819458,0.06940793991088867,0.11504626274108887,0.036620140075683594,0.03745841979980469,0.03680682182312012,0.03547501564025879,0.0362851619720459,0.0681154727935791,1.0219528675079346,0.03681015968322754,0.03591752052307129,0.03448629379272461,0.03636765480041504,0.034247398376464844 diff --git a/results/combined/merges_timed/jdatepicker/jdatepicker.csv b/results/combined/merges_timed/jdatepicker/jdatepicker.csv index e33033e0a5..a5a460c045 100644 --- a/results/combined/merges_timed/jdatepicker/jdatepicker.csv +++ b/results/combined/merges_timed/jdatepicker/jdatepicker.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,cc74e94ac3eb76272cfa0a23481487e551c528e9,2984c3f9fe78688e6bf34b0b23f7017657a6d4cc,a36294b8dab9448757932c766c55e7fb93dfbc49,,True,False,True,5,17,84,3,True,5,Tests_passed,2a37c87a0c14fed8c73bffa0dd97349b5a5240f2e70e687c70e197e4139ab482,True,Tests_passed,34cdf839b21828034a12732d95cc568e2098da38fec394c0cb21cb82a4bfe7d0,True,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_failed,897a07c308bdebe9216af091174188483d589531d2b0397ed6b7f227a198a628,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,0.04346179962158203,0.03763771057128906,0.042702674865722656,0.042551279067993164,0.043234825134277344,0.055725812911987305,0.045609235763549805,0.24699902534484863,0.1636662483215332,2.1409525871276855,0.39520812034606934,0.10480308532714844,0.13806843757629395,0.051522254943847656,0.0519101619720459,0.05037689208984375,0.05147719383239746,0.052042484283447266,0.10121655464172363,2.080258369445801,0.05108833312988281,0.051164865493774414,0.031225919723510742,0.04959464073181152,0.03247475624084473 diff --git a/results/combined/merges_timed/jdeparser/jdeparser2.csv b/results/combined/merges_timed/jdeparser/jdeparser2.csv index 253036a83f..d1902a564f 100644 --- a/results/combined/merges_timed/jdeparser/jdeparser2.csv +++ b/results/combined/merges_timed/jdeparser/jdeparser2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/main,1da0e2349af32efeef7b5a1874bcc20c67c51fc1,3e7b519565d03b9d669338f591cb2deb0e33845d,8b187686848386bcbfc37c35c830ae50213c0120,,True,True,True,39,80,731,2,True,39,Tests_passed,c926970c508bc1f6f9b6bbc74f5b4491c644db587348e97016dd882ee3b9fc84,True,Tests_passed,f2c40051dea0b73f98eb69bb0335c4687c8c285053386a888f534aa7c4903db1,True,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,0.04601931571960449,0.03136038780212402,0.043140411376953125,0.05047607421875,0.05830645561218262,0.050133466720581055,0.04506707191467285,0.16785812377929688,0.10609745979309082,1.3957955837249756,0.6534874439239502,0.07805514335632324,0.1475086212158203,0.05456042289733887,0.05257129669189453,0.052770376205444336,0.05316948890686035,0.05337333679199219,0.08790421485900879,1.2993519306182861,0.04945111274719238,0.0502774715423584,0.03961515426635742,0.051122426986694336,0.033367156982421875 diff --git a/results/combined/merges_timed/jdkcn/jabberer.csv b/results/combined/merges_timed/jdkcn/jabberer.csv index c0923b5abb..f7be60d385 100644 --- a/results/combined/merges_timed/jdkcn/jabberer.csv +++ b/results/combined/merges_timed/jdkcn/jabberer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,5037a3d573c3e162e8de170b15258f76ea7aaca4,bcad97e1dce084756c25cf5b4f9bfba6e600408a,6ffe4e1c62789f14cf959876672e3d77b09699cc,,True,True,Tests_passed,73f44c203480ed18c03358e341da6cec5b87042ce96c1b72a79e9bc9de81dc0d,True,28,1523,28602,7,True,Tests_passed,1eaa3eaa12a543b88c9addeec39ea3e45e8c34662556ed533fa4d2565f7de5c9,True,32,True,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,42326de104e28ec37378ff5212c6c9af3f6d1ee328ffbd0b0e9d87b1cf14d107,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,1ba4589cc285be5f219cef0af049785d289cef3bf44391a32946a0f95cab29aa,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,f6b820dee8c6b484adb5571d530c614199ed64cdfe6c2f4a6d4e16fe03f63ba2,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,0.04365372657775879,0.053040504455566406,0.06354641914367676,0.053845882415771484,0.04703783988952637,0.04058098793029785,0.03015899658203125,0.24705886840820312,0.14580154418945312,0.7819328308105469,0.37699437141418457,0.10953235626220703,0.1373765468597412,0.057317256927490234,0.067840576171875,0.05874776840209961,0.05828380584716797,0.057356834411621094,0.1036684513092041,0.8017387390136719,0.05408787727355957,0.06128644943237305,0.0400393009185791,0.0523836612701416,0.04111313819885254 diff --git a/results/combined/merges_timed/jdupl/lancoder.csv b/results/combined/merges_timed/jdupl/lancoder.csv index 757c9e5ef0..294c59b8e6 100644 --- a/results/combined/merges_timed/jdupl/lancoder.csv +++ b/results/combined/merges_timed/jdupl/lancoder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,407742ea19966c62f0eeb9d47dce6afadf9f672b,1355727fd68e75d9e97387b2fb92355fd3cd1a92,80ee8865f90c66b4c90c833d5beab4943da35d3a,,True,True,True,24,58,548,3,True,24,Tests_passed,9a9b8b271a5a4d5bbcc627b7da9e738daf5a76dcbf483340eb27314d37063382,True,Tests_passed,1fd8f3ef0dd0e1591cf79eb252a18bf1e7c1cb904f9760b5e18a8e19d596b78a,True,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,2f7017498acb1c51f498ed3d952d3c19a0038f36fd55d790ab5193fc6baa6b5b,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,4bf8e2addeb1f4af1abab84ec12084c9964a30f3691cf6fcdc3b3c9565c05680,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,b0043f763d399a0464906737f3b859cfd0c6787324183c718f6f7079f054e63f,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,0.02175426483154297,0.031899213790893555,0.04398226737976074,0.04253530502319336,0.04331374168395996,0.04799675941467285,0.04114055633544922,0.2342205047607422,0.16415643692016602,1.267211675643921,0.528109073638916,0.10955333709716797,0.14120912551879883,0.054978370666503906,0.05603933334350586,0.05567216873168945,0.04263186454772949,0.05495953559875488,0.09244251251220703,1.2510907649993896,0.05399966239929199,0.05666685104370117,0.045196533203125,0.05347561836242676,0.03445553779602051 diff --git a/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv b/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv index 68cd384e3e..05b1aab476 100644 --- a/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv +++ b/results/combined/merges_timed/jeevatkm/digitalocean-api-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/remotes/origin/pull/99,997ce11f32044dd4702fdba7e1f4e5d60bae99f4,111275a7557b313dc7b0c1dee133b1e117b7d22c,780847a2b697201474857ecc249c40ca3251a4d7,,True,True,True,101,1900,7360,5,True,101,Tests_passed,ba8949bac9b136e076aa60eca3f3423420efb743b6da11fb7e3bb757dacc4ef3,True,Tests_passed,16739c8ccc9b5d92d986094217e30d32fb54fe5c0d500d8bcdade0074201b850,True,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,0a1933a6273f4a982e7f2c70d49a7d2734c835bd0dbf041578b18f5ac6d06805,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Tests_failed,467173f8a0db0890d219884a5f8554a0c6c1f97f63538761cb67eba2ab9a8530,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,ef1a273ddec911f4a80876a57d6f49ded5294ddaa8184631c388662c628a68de,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,0.0573430061340332,0.06896162033081055,0.05206155776977539,0.06782150268554688,0.05519223213195801,0.05531644821166992,0.04977297782897949,0.38999271392822266,0.2972872257232666,2.072251319885254,1.0458037853240967,0.18936586380004883,0.14610528945922852,0.06431102752685547,0.06611752510070801,0.06533598899841309,0.06348562240600586,0.06431841850280762,0.15016889572143555,2.051295280456543,0.06546258926391602,0.064788818359375,0.04975128173828125,0.06441283226013184,0.04957079887390137 diff --git a/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv b/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv index cb152703f6..e863576b65 100644 --- a/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv +++ b/results/combined/merges_timed/jeluard/maven-plantuml-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,571616267c56bdf33ea5eca14aec7f83d0355ae0,9f7e64cd7e24fb6ff8476e235d5839c553885ace,509cb7c52169df2b8c4d726d189474979b5a78d0,,True,False,Tests_passed,f5636c00094069e71499c5290d47d8aea35d45a913dc1720ac0e93123ab533be,True,7,17,239,4,True,Tests_passed,dca15947900abb12e8629399e881d43e7bda5686d4ab0d2f6f2ff83c9b762512,True,7,True,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,1e968b92e88920928ee826fd1b16d6f49a161c8e598072481d339c36c717d071,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,86b188848c437e0ae5556f45e4bffbd3744aecdd6d6922b78ed5749b6a18bd98,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,d944683d224eefc411ae6b649bb19d6d10596ea76553b20decc2ebd29afb21ec,Merge_failed,3805c213fe547e1ddfe8a47a6c324191ffc4c75279af940998061410baf4912e,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,0.03705930709838867,0.04033517837524414,0.0329892635345459,0.031841278076171875,0.036481618881225586,0.03766989707946777,0.037752628326416016,0.2504689693450928,0.17290091514587402,0.7454574108123779,0.2599930763244629,0.10555028915405273,0.11756515502929688,0.040886878967285156,0.040662288665771484,0.04035449028015137,0.04068589210510254,0.04105687141418457,0.09685277938842773,0.7317392826080322,0.04165196418762207,0.04207468032836914,0.03263044357299805,0.0415191650390625,0.03161001205444336 diff --git a/results/combined/merges_timed/jeluard/semantic-versioning.csv b/results/combined/merges_timed/jeluard/semantic-versioning.csv index 12f63beba5..7463af67d0 100644 --- a/results/combined/merges_timed/jeluard/semantic-versioning.csv +++ b/results/combined/merges_timed/jeluard/semantic-versioning.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,1130c9261b179f0efdf49badba9554d1c9d63822,37639815664ce78bb1d2c1f2240d133209ba1398,69909650ee34de32eceeee0b4dc6e0ab89f2a5b3,,True,True,True,23,77,819,2,True,23,Tests_passed,6e548b5daeca9c35e200cfc812d71b76fc5fbc59a34a18e2b3202fa542ba4369,True,Tests_passed,ca2c32fd8a7daee5a886c1ff4c8cfbda2f70e246d8bc4fb9aefa95d53ce94ef4,True,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_failed,e354c63339c54b523ea2b9a6152a02c314bb6cdde32de378695f442088e3343d,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,0.009948968887329102,0.010591983795166016,0.010876893997192383,0.011204242706298828,0.010801553726196289,0.010731220245361328,0.01082921028137207,0.03607058525085449,0.06501889228820801,0.9075784683227539,0.4800846576690674,0.0731666088104248,0.1332380771636963,0.04276323318481445,0.04394173622131348,0.04281258583068848,0.04233527183532715,0.041407108306884766,0.07584619522094727,0.9454576969146729,0.04277610778808594,0.04226326942443848,0.03085041046142578,0.04110908508300781,0.03201866149902344 diff --git a/results/combined/merges_timed/jenkins-infra/ircbot.csv b/results/combined/merges_timed/jenkins-infra/ircbot.csv index 1c58aa93b2..ac72435b79 100644 --- a/results/combined/merges_timed/jenkins-infra/ircbot.csv +++ b/results/combined/merges_timed/jenkins-infra/ircbot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/main,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,069e970815bea3760fa9dc6609c724f8635a7c10,0b27dd256a1ddf2d51e7f1a2f28ed8bfab3779f0,,True,True,Tests_passed,19b5730003060a87c66505944f3eb408773632f05bbfd422e79e0e350d81ca40,True,3,64,302,2,True,Tests_passed,d556a6dbb753e631aaaf6fc380a44cf8add0ab3fc7614bb4eae0f046132a607c,True,3,True,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,0.009571552276611328,0.009262323379516602,0.009617805480957031,0.010101318359375,0.01016855239868164,0.010085105895996094,0.009686470031738281,0.03406786918640137,0.06403183937072754,1.616903305053711,1.0165154933929443,0.06985092163085938,0.125823974609375,0.04010510444641113,0.040982961654663086,0.04093122482299805,0.040682315826416016,0.04120945930480957,0.07206964492797852,1.6903977394104004,0.039640188217163086,0.04032397270202637,0.029178857803344727,0.0394892692565918,0.02921128273010254 diff --git a/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv b/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv index d1e024f4bf..584f9d146a 100644 --- a/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/active-directory-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/heads/master,3f894f3216914f72244dd916e073fe7410530a0c,bdcfc6a63f73d344b500627f2db0d982aec7ba54,0530887ab2160489002c5e5866221abffbc0a0e5,,True,True,Tests_passed,2a0f9cf3207976dae038b21c883b540dc99088044a040169e8ec51c9c6b82e41,True,3,5,31,2,True,Tests_passed,4d3ecb248aab18399e1ead20dea5bafe49b2989bafd8830fe68ee1f84795078d,True,3,True,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_failed,d709efd627fdfc36c4ee64fd6f17fabdb63f09ab00b405acf2731096cc5c3b96,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,0.014284610748291016,0.014333486557006836,0.014715433120727539,0.014734745025634766,0.014504194259643555,0.015213489532470703,0.015857458114624023,0.04966163635253906,0.08252549171447754,1.2743773460388184,0.4124932289123535,0.07627725601196289,0.12841463088989258,0.043100833892822266,0.043317556381225586,0.04425954818725586,0.043433189392089844,0.04428887367248535,0.07816219329833984,1.312018871307373,0.04258441925048828,0.04293394088745117,0.03200793266296387,0.04201912879943848,0.0317378044128418 diff --git a/results/combined/merges_timed/jenkinsci/ant-plugin.csv b/results/combined/merges_timed/jenkinsci/ant-plugin.csv index f472465537..536526b4b5 100644 --- a/results/combined/merges_timed/jenkinsci/ant-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ant-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 53,refs/heads/master,7025e65f06ee3934db303960a74846cc52440a26,d1c5e13f88ac5ed82c12de0a5c41434c1e55cf42,c57e18f6ac9c01ccce927930aed0221853d38ff6,,True,True,True,3,11,69.0,3,True,3,Tests_passed,48ed5a84e692574544be1c42c8aa8ea51c0c3cb97216a21cd549995e1cd726c2,True,Tests_passed,ba7cde4d005aa3b0fd359698c19ad6cdd147849c304b5c63a20b68e866609461,True,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_failed,58bfd6c2f2a666a0a94bbc1e1c2464d2f94e626663290822ef8f039b5391ef82,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,0.009960412979125977,0.010604143142700195,0.01067352294921875,0.011070728302001953,0.010929346084594727,0.010802984237670898,0.01103520393371582,0.04788064956665039,0.11848020553588867,1.8841488361358643,0.3900763988494873,0.10362887382507324,0.1362307071685791,0.05073046684265137,0.05132722854614258,0.048415422439575195,0.050158023834228516,0.05006575584411621,0.10138869285583496,1.9079110622406006,0.049538612365722656,0.05009293556213379,0.03171682357788086,0.04806876182556152,0.03172445297241211 diff --git a/results/combined/merges_timed/jenkinsci/backend-update-center2.csv b/results/combined/merges_timed/jenkinsci/backend-update-center2.csv index dcf98c2cdb..0fe5fa4761 100644 --- a/results/combined/merges_timed/jenkinsci/backend-update-center2.csv +++ b/results/combined/merges_timed/jenkinsci/backend-update-center2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 75,refs/heads/master,ffe5590d446632dfa271013e842badbbb9b47170,3a70a66f43951d8f9dea0b83af1fa00a3ca84a71,a60eb5abdc8146a5003e4f5552625b88203bc1b5,,True,False,Tests_passed,e628f54f8738d68760abe1e703ebce7e4ce9ee5195f72a5cd2aa85069f564153,True,10,21,66,2,True,Tests_passed,95bd31aa354f9c9c32ee5e93fe625ddffe0333fe2d5a3f8b82fb3a1e39f09336,True,10,True,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_failed,cf2130329fde88c942563eb40fd51e68ec63bb86aa93def7bf62a13234d5b247,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,0.012677907943725586,0.013498783111572266,0.015375614166259766,0.015181303024291992,0.014791488647460938,0.01540231704711914,0.015249252319335938,0.040874481201171875,0.0667579174041748,0.8724172115325928,0.41084837913513184,0.08050203323364258,0.1372087001800537,0.04982423782348633,0.05152773857116699,0.049675703048706055,0.049312591552734375,0.0484616756439209,0.08551931381225586,0.9298911094665527,0.04814267158508301,0.04799485206604004,0.03836703300476074,0.04868483543395996,0.037189483642578125 diff --git a/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv b/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv index 9ccbb46557..83ffc4a897 100644 --- a/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/bitbucket-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,da518043f34583234ad250c82869d287b33ee483,b368656b472799b0ffb5f0617797040fa6335ad6,d29d40216fc8a16d2b79c9a4c9f3d8b5b3a37343,,True,True,True,8,20,104,2,True,8,Tests_passed,cbbed6c64cabad96cf0dfed829bdad8b969a6932d2f2fe0adfa87d6fdb46b0a7,True,Tests_passed,603d9bb311f51fd03cd49eddc4079769304681fae442acffcf6dd24675402893,True,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,0.056005239486694336,0.04514741897583008,0.046332597732543945,0.05890011787414551,0.054306745529174805,0.04079461097717285,0.043004751205444336,0.20070981979370117,0.1091008186340332,0.8492782115936279,0.41380763053894043,0.0902562141418457,0.14971590042114258,0.05979347229003906,0.06092429161071777,0.058666229248046875,0.05860400199890137,0.056236982345581055,0.09505295753479004,0.8246645927429199,0.056528329849243164,0.05550503730773926,0.044495344161987305,0.05377912521362305,0.045404911041259766 diff --git a/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv b/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv index 0a98baa9bd..b195777ff8 100644 --- a/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/build-timeout-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/master,00d3a7bbff50feb5bc56db4ea1160b58dcb39af0,c3361f79b73d6b3366bc66f9882a05792402f3c5,2633bd942947f365384d093a848750fcf973a860,,True,True,Tests_passed,7a087ff73e4bd078425f5aa63d3631ee4dc43c58c2f9ce8d81557506044c8643,True,12,49,164.0,3,True,Tests_passed,ef5f065bb77b54df5889b2c0fd419494db8c57c744a02a6884c3f55d5fcc5c8d,True,12,True,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Merge_timedout,,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,0.012008905410766602,0.011568069458007812,0.013265132904052734,0.013435125350952148,0.013039112091064453,0.012888669967651367,0.01353764533996582,0.05105161666870117,0.12022519111633301,1.0369830131530762,-1.0,0.10398125648498535,0.14291834831237793,0.05417013168334961,0.05577516555786133,0.05510902404785156,0.05332612991333008,0.05504631996154785,0.10450506210327148,1.0952811241149902,0.05350637435913086,0.053812265396118164,0.03628659248352051,0.05214667320251465,0.0353851318359375 diff --git a/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv b/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv index aaafa22b5d..0cc0a1e19c 100644 --- a/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/configurationslicing-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 66,refs/heads/master,55269af42ba6e2edd3b17cf20eabc76143d56208,b98750751ff6160add3a0a782bead42d06e3568f,2efc7be3a9ab350b884e202fe16e03166de7a126,,True,True,True,5,8,114,2,True,5,Tests_passed,01f79cca4b838b33ee97b13e7a3e78b1c21b493c4015fa7b57ec659ea42e7c45,True,Tests_passed,27411121b15b3b572ee8c41ced45c5a339934b820495741ea019085c58bedca7,True,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,31af740fc7a7ea1e44452c877d661a671f93ff37e86e6360caad338f2470a205,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,0.010685443878173828,0.010724782943725586,0.01171731948852539,0.011759281158447266,0.011965274810791016,0.011788368225097656,0.011227846145629883,0.03627657890319824,0.06620121002197266,0.6560940742492676,0.26814913749694824,0.07448959350585938,0.1310882568359375,0.04410839080810547,0.04475045204162598,0.04509544372558594,0.043936967849731445,0.044189453125,0.07943964004516602,0.7226839065551758,0.04270529747009277,0.04232287406921387,0.03361201286315918,0.04276871681213379,0.03269147872924805 diff --git a/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv b/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv index 33d3be441c..c57076cd4e 100644 --- a/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/copyartifact-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 124,refs/remotes/origin/pull/125,956cedccfa4eac549c80b15c1b4a7369618a4d39,7c5e9c0d73c1db329c9990f868f25f0637cfc862,9f6cf7bab6c7017ca16e9349d3cf754de4bc619c,,True,True,True,6,19,128,2,True,6,Tests_passed,9ee0084b5790365504f2c0a9dfe0e12e1cb5e3ec48f70ac23f0bfabeb230fb42,True,Tests_passed,76848720ec24edfa57ce4cf4efb47c4303b7d93f68279238d260d20b09bff186,True,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,151d651cf8e8730ef818d41eacb050bde94654cca15b8835f0df795b143bf84a,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Tests_failed,ff213464c2e0712a41f939541d450661ea00109ebeddcc27888515910f4d7662,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,12eca70cefa93fd8a3883a5e0407a515de4884ed9e41bc5d4e549196d1aa4308,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,0.017364978790283203,0.017603635787963867,0.019686460494995117,0.020004987716674805,0.02026653289794922,0.020314931869506836,0.020175457000732422,0.049180030822753906,0.07663393020629883,0.5442450046539307,0.29529690742492676,0.08767080307006836,0.13719558715820312,0.03505110740661621,0.05328726768493652,0.052278995513916016,0.04697561264038086,0.04943561553955078,0.0673055648803711,0.6130797863006592,0.03507089614868164,0.04763913154602051,0.05080223083496094,0.04955935478210449,0.04852581024169922 diff --git a/results/combined/merges_timed/jenkinsci/coverity-plugin.csv b/results/combined/merges_timed/jenkinsci/coverity-plugin.csv index c94bb7406a..87d8472030 100644 --- a/results/combined/merges_timed/jenkinsci/coverity-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/coverity-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 181,refs/heads/master,ab382ea7f87d69826dd1c5281156f1f250c49b44,726ec49044213fb73c4c20e770b1263ec9e2eafa,7fbeb1bfa427f969faf5a0a1bf30cdcf097b669e,,True,True,True,16,73,826,3,True,16,Tests_passed,b165e151199d2bf6b432b877e690983b244b6469e3e743b9e552b8b743062dda,True,Tests_passed,e635af35249f30bcbd9bc7e54b579ae245021b6f7f4f7d2fce1704cae271175e,True,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,a44eb0366dc314ede13ef7f8c9750bcfbce9fad69eeb93503199bc692e5e4b5d,Merge_failed,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Tests_passed,1f846dcdd0fb0ec117dde81a5dfb356a17de4a008f30fd25355adfa2e991f00a,Tests_failed,8cb60600ad9b8a16e0da75a9a76ac30a45b3c14d6c93280c566cfaff5710bc96,Merge_failed,d37623f0907a530af0595184986186066347f462094f94175f52a0cb50361663,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,c64a820c0ce480489366ad9a18378fe8a5f490258212dba784e0e66e4726671b,Tests_passed,1f846dcdd0fb0ec117dde81a5dfb356a17de4a008f30fd25355adfa2e991f00a,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,e9c55f40b0d8c6de7740ee1a9df626c500b88355d4b99206c700e69e0396820c,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,Merge_failed,bc778ac1afc25ffb1da8d4362a4f8bd3ff9e726375014960c0aa205191396ef5,0.048230648040771484,0.05576348304748535,0.05527782440185547,0.04704761505126953,0.05459094047546387,0.049707889556884766,0.05958104133605957,0.23306679725646973,0.17502689361572266,2.049198865890503,0.7906217575073242,0.10482215881347656,0.1280529499053955,0.0464937686920166,0.049407958984375,0.04806399345397949,0.04844188690185547,0.04810333251953125,0.1277456283569336,2.0195648670196533,0.06555438041687012,0.0632772445678711,0.03750205039978027,0.04738044738769531,0.03827834129333496 diff --git a/results/combined/merges_timed/jenkinsci/credentials-plugin.csv b/results/combined/merges_timed/jenkinsci/credentials-plugin.csv index 5fbf05269e..dc67d6028c 100644 --- a/results/combined/merges_timed/jenkinsci/credentials-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/credentials-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,ccd45a5263d0b9ffb20a66965a9124e15e2b8e03,d71602e7cc03a96bf876171da18a19d8dcb7efb9,ff276f7134736281d49e9ae9a8bad6b7d2a59587,,True,True,Tests_passed,487b7c31de55091409cca54f2edc43b5438e657ba0515be6bfd392245af7675e,True,10.0,29,223.0,2,True,Tests_passed,020414aa0adb6906f0cd225f64596900921863e6f11f42e7e00aad1c85f5c630,True,10,True,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,7f0cb8ce1c0dbf43ad3c07888cc080b653797724555886d06dbb76cd675ae2a8,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Tests_failed,d7b05d4cd3301b133e546fd831315495c61285dd8fcb56abcb1153f74a6e1303,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,bfc9eba2abb4b6d216353cf2c786d167b02b39f4d852b1259d99b0cf053c99c1,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,0.012730836868286133,0.012917280197143555,0.06587052345275879,0.06552743911743164,0.06578540802001953,0.06546568870544434,0.06564450263977051,0.08555984497070312,0.07306790351867676,1.112504243850708,0.5106027126312256,0.07219219207763672,0.1229093074798584,0.04020071029663086,0.040917158126831055,0.04085230827331543,0.040138959884643555,0.040317535400390625,0.07286858558654785,1.1663563251495361,0.04003334045410156,0.0424652099609375,0.03893446922302246,0.04047060012817383,0.04154777526855469 diff --git a/results/combined/merges_timed/jenkinsci/deploy-plugin.csv b/results/combined/merges_timed/jenkinsci/deploy-plugin.csv index fa527e30bf..931992216a 100644 --- a/results/combined/merges_timed/jenkinsci/deploy-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/deploy-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,True,28,103,571,15,True,34,Tests_passed,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,True,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,True,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,766113523606078212e8c9bfa18cc99f2ae044b72061cc7144332f649408622c,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,fd310d7dd2da56fb2142a587a0aec1f97985c39d92aa11bfd5feafef85b26abb,Merge_failed,8039bde4b63c8f50a419eada684945f9b568350c3bee1f0122c23c3229a63ddb,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,0.010303974151611328,0.010198116302490234,0.009979248046875,0.010348796844482422,0.010492801666259766,0.010199785232543945,0.010049819946289062,0.12209534645080566,0.4678025245666504,3.4567370414733887,0.4963538646697998,0.32648754119873047,0.16606521606445312,0.0866098403930664,0.08463716506958008,0.08684873580932617,0.08764910697937012,0.08600640296936035,0.2253575325012207,3.5576674938201904,0.08700728416442871,0.08741974830627441,0.0775601863861084,0.08684730529785156,0.07767152786254883 diff --git a/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv b/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv index 1ce00fa3da..bf7a343441 100644 --- a/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/disk-usage-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 34,refs/heads/master,f527c92357bed2cfa432c19b1673edd642ea49ad,43277872e6203cd15347adc35edc566d7df9de93,0dc146859f808c46831250519fe00eadf238e58d,,True,True,True,27,84,252,5,True,27,Tests_passed,e2a5e580e4e9c822bc6b0506a2849a5d08946b1de35523a81890db7c4af995c5,True,Tests_passed,de22ffec737eed49b98f57465f6c67e6954803c285ad0234b4b1a9c9ed991aa0,True,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_failed,7f3cbd6310fe9988343fba379b69435c728cc6714cc7db21c02ba2f46103236a,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,0.018248558044433594,0.018541812896728516,0.023703336715698242,0.023485183715820312,0.02346634864807129,0.023476600646972656,0.022852182388305664,0.09402203559875488,0.23214983940124512,3.619020700454712,0.7064347267150879,0.18675971031188965,0.1823749542236328,0.08719015121459961,0.083740234375,0.08684659004211426,0.08702325820922852,0.0858006477355957,0.186354398727417,3.7712385654449463,0.08318734169006348,0.08175134658813477,0.052690744400024414,0.0812673568725586,0.049839019775390625 diff --git a/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv b/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv index a38673b903..2ee456a06c 100644 --- a/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/docker-build-publish-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,9d4eb2caee75e0914e50d611c33ed709d11e2923,18b13198466216b6ad9ac577f1f3ef78e233452e,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,,True,False,True,12,34,158,2,True,12,Tests_passed,062155a0025a6c794e457b5a17c520169db88438833b440027576ffc77eb9914,True,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,True,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,0.03667402267456055,0.037560462951660156,0.04653191566467285,0.04507851600646973,0.0393064022064209,0.0572206974029541,0.048683881759643555,0.176513671875,0.10730195045471191,1.1228153705596924,0.35436153411865234,0.07176518440246582,0.13069868087768555,0.043814659118652344,0.04352879524230957,0.04257535934448242,0.04349565505981445,0.04302501678466797,0.0766148567199707,1.0737535953521729,0.04296135902404785,0.041736602783203125,0.03144025802612305,0.04242086410522461,0.03108358383178711 diff --git a/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv b/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv index e7e7da1dff..daeec97cc3 100644 --- a/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/email-ext-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 51,refs/heads/master,bbf162f5d50c3d37e3ee8940a0f13d3a4ce4ff59,312def504a573f3d4e5a80fe39fccff9e4a7a485,3fc56050feee5e84d074b7bfe11c15e22a15fd0b,,True,True,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,True,21,145,1700,4,True,Tests_passed,f35690ebea5ced8492cf7847eba831c71b721e898f3c7720d1664480528a8d5e,True,21,True,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,b1abf47a9ef7821afc644a69c839101fba92f78a1240ae3e06d0eb3fd69c01f2,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,3b1ed1a4f9029416cc3268d04d89d2e3a30c54935a38567d57d1e9b95a3ef03a,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,5d22edbe9f7b989116324a9cc642c9c1e81955fd984b37e496dd332d14be2c57,Merge_failed,a91409e53ece24a84c7081360108367301adddb1e023006acc15b194522ebce1,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,0.03819561004638672,0.05759453773498535,0.05283999443054199,0.05202746391296387,0.03683829307556152,0.02724432945251465,0.05631422996520996,0.3396117687225342,0.23930096626281738,1.307088851928711,0.6791543960571289,0.14054059982299805,0.13482069969177246,0.054746389389038086,0.06153392791748047,0.05303192138671875,0.05460619926452637,0.053685665130615234,0.1213521957397461,1.261030673980713,0.09297299385070801,0.11286425590515137,0.054622650146484375,0.07836675643920898,0.055059194564819336 diff --git a/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv b/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv index f69110c0bb..fdeb268934 100644 --- a/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/embeddable-build-status-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 74,refs/remotes/origin/pull/248,83edeb11f30652257c65d2df6292d608f8dabb1c,a26365da217d87b98b5c0cb01fdb16ae3e72a07e,b1e6224d7c9b0d2a4e61ea296f5ef975272e72cd,,True,True,True,14,26,387,3,True,15,Tests_passed,26ce1c1c330d68fd456c97d1d33391a1c0c0b6494e9843a16049eba523bdd4c0,True,Tests_passed,221f3d1e87f2d50f76f4c89a310e8f8594f91af1f6b26f939a57c6f5220d0c2a,True,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,e0e8d99415622abc47a1e5e69151562867d98d6ae15daf5c3d91c0ca74914e7b,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,1d9bceb00342f316c6ea1d8059a0b81b0a68d03a991113f9cdce7f356dd4ef43,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,3eafec2b18933b2c3a89903cba1515536f2f8023be50bfafb4bec18853874478,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,0.010234832763671875,0.010677814483642578,0.010470390319824219,0.010282516479492188,0.010415077209472656,0.0103912353515625,0.010629415512084961,0.03777790069580078,0.06633734703063965,0.46724987030029297,0.36759257316589355,0.06791210174560547,0.11602234840393066,0.03430891036987305,0.034311771392822266,0.03375053405761719,0.03338217735290527,0.033293724060058594,0.06713342666625977,0.5099773406982422,0.032935142517089844,0.033446550369262695,0.03353238105773926,0.034546613693237305,0.03304719924926758 diff --git a/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv b/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv index 87f8e695f3..7f8ed56cdd 100644 --- a/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/google-oauth-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/develop,94f08c7c32d576d99ddd3e215b67653fc99eaeca,b5ac60d0f624ffc26d9c4ac499219fccddb01520,f28bfdf65c3d9df5ecb00be60c44a38fa1c0a153,,True,True,True,10,55,158,10,True,11,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,True,Tests_passed,3ade099905f25d2168a71c56597f7df29b3b04a066fa144b1f4cf018265d088f,True,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_failed,5b2b2ef97c4658ce866b20b64cf8f1c4539fb8b2205053d7051d6bb96ce5fd03,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,0.046300649642944336,0.042428016662597656,0.03984546661376953,0.04796171188354492,0.027707576751708984,0.047507286071777344,0.042191505432128906,0.10279989242553711,0.041196346282958984,0.049513816833496094,0.528160810470581,0.10628890991210938,0.18817615509033203,0.09408044815063477,0.09512162208557129,0.09593391418457031,0.09502887725830078,0.09571504592895508,0.10968589782714844,0.10904049873352051,0.09463167190551758,0.09656620025634766,0.03518080711364746,0.09489607810974121,0.03427481651306152 diff --git a/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv b/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv index 4e763dc162..3a55bb02ce 100644 --- a/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/instant-messaging-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 111,refs/heads/master,4110663ba811f5ac1d99f3997dbd5513dcbe784d,a88f487a4e2095c2d2c55980c38e158217b3ec5b,5315aafdbe128c07fd15c4493cd6a275ac140119,,True,True,Tests_passed,7ac61f26f56e9a0dc0dd0701f8970d65d7255480da7aad88251b00714286f2d3,True,11,27,190,2,True,Tests_passed,64f9ca7519c2846d5e3acd4a3f7174e0bfe4ddc1d5024974fc02938a8a0d2bb6,True,11,True,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,0.047794342041015625,0.050707101821899414,0.04397988319396973,0.041318655014038086,0.033890485763549805,0.04804682731628418,0.04433393478393555,0.1749563217163086,0.11424827575683594,0.6564257144927979,0.4354219436645508,0.0732278823852539,0.12997937202453613,0.04555797576904297,0.04428839683532715,0.04338502883911133,0.04396462440490723,0.0445253849029541,0.0778954029083252,0.6730251312255859,0.042511701583862305,0.0416257381439209,0.03265690803527832,0.041937828063964844,0.033022165298461914 diff --git a/results/combined/merges_timed/jenkinsci/jira-plugin.csv b/results/combined/merges_timed/jenkinsci/jira-plugin.csv index 498ab20829..749da7f4d4 100644 --- a/results/combined/merges_timed/jenkinsci/jira-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/jira-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 162,refs/heads/master,6ad78581c99587e433715daa56d29b61201e5590,dee906a5f334519d178023f61cdb659473830721,cb12c4d50da9a33540830c117b398589f85d6239,,True,True,True,35,154,831.0,3,True,35,Tests_passed,5e51adb79fc8acb192b330dc2df954de3b3711e44b60fe08f71b634545c6149a,True,Tests_passed,e6d3a99d1509ae354d0d0abfcae9e6207b569d26f96aa38e96d01b01fad04bd8,True,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,0.014419317245483398,0.015277624130249023,0.016493558883666992,0.01668381690979004,0.015999794006347656,0.016013145446777344,0.0162353515625,0.05554032325744629,0.11978411674499512,1.7181119918823242,0.6004526615142822,0.11229395866394043,0.1515960693359375,0.06161665916442871,0.0596771240234375,0.06135201454162598,0.06328177452087402,0.05414605140686035,0.1129152774810791,1.7570440769195557,0.058929443359375,0.05374908447265625,0.03792309761047363,0.059095144271850586,0.034243106842041016 diff --git a/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv b/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv index ef8d19c289..5a35c378ac 100644 --- a/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/jobconfighistory-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 120,refs/remotes/origin/pull/79,7feab60b0e47b5866e16881a0e5c86e100fc54eb,fc25ab3f98aedadb6062db1035f66aa3d2b82c03,59e266729e67209ab31606ce161ad4e46bd0159d,,True,True,True,25,129,1307.0,3,True,25,Tests_passed,adaaa463bf65ff8412311a92c532464b3ce547cf70db04eece7153d91b1c4512,True,Tests_passed,fbe0375142d9ecf36171a214f10bbd015f52970d0de84edfe357e6aba091526b,True,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,7a1a9f66b22e0001e5c7a1bd0518b7697f44a82204a70652981b5747f5f1e18b,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,d33cd7f15e5fd927ec3c45d1b70e33703ff381e6d42b7981bc512f679a2cea56,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,30e417c6da820245b486b99bd78dd674c109b360548ff1d07afbd639c4f7f63c,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,0.07540559768676758,0.01395559310913086,0.0915689468383789,0.09177923202514648,0.09095644950866699,0.09123349189758301,0.09136009216308594,0.14117789268493652,0.18657612800598145,1.8643519878387451,-1.0,0.22574925422668457,0.20734906196594238,0.14765405654907227,0.14412474632263184,0.14630794525146484,0.15113115310668945,0.14659428596496582,0.2392573356628418,1.87215256690979,0.12958669662475586,0.1336832046508789,0.1417076587677002,0.1324923038482666,0.04004168510437012 diff --git a/results/combined/merges_timed/jenkinsci/junit-plugin.csv b/results/combined/merges_timed/jenkinsci/junit-plugin.csv index bce77c5639..455b6baf55 100644 --- a/results/combined/merges_timed/jenkinsci/junit-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/junit-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 33,refs/heads/master,2f4179baf22a128be210110ef0752c9a333e3a66,5d5a97fd1a1918a764a08653fc86d1e42d136c99,a70eb66a170d82beff6865a95891740c872daa5c,,True,True,Tests_passed,d58d201698df63328f9de94e1b844de17cc597ea8763a5c3efb7b514e43af744,True,17,143,534.0,2,True,Tests_passed,37546d70380f886331fd366e9cb5968d5aef5e6ef473a9fbbabe888f07f1b9b4,True,17,True,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Merge_timedout,,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,0.03512287139892578,0.014127492904663086,0.04641914367675781,0.01484060287475586,0.04647469520568848,0.014190196990966797,0.0465397834777832,0.06742024421691895,0.09061408042907715,1.0644755363464355,-1.0,0.0785069465637207,0.14059901237487793,0.049135684967041016,0.04863142967224121,0.04863381385803223,0.048026323318481445,0.04819345474243164,0.08623671531677246,1.1167340278625488,0.04794788360595703,0.049628257751464844,0.03706097602844238,0.04781484603881836,0.035572052001953125 diff --git a/results/combined/merges_timed/jenkinsci/ldap-plugin.csv b/results/combined/merges_timed/jenkinsci/ldap-plugin.csv index 7713638295..a590955b74 100644 --- a/results/combined/merges_timed/jenkinsci/ldap-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ldap-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 123,refs/remotes/origin/pull/221,fd4cb463ba89f3a6b95707c4cc713d02e45c96e7,7552866a43fa4194b33298c432a1df15bd2e4b34,8cabafe79fad1d461c2f337a9fbfe5046f151f31,,True,True,True,15,59,327.0,4,True,15,Tests_passed,c678ebd0a70f05c5dd7a9f6f67b4965483c1fb1c78174bea1d08fc78780033d3,True,Tests_passed,5accbeb4d91349d1cf8ae22b0e84fec8088e8eaa919462730e3cf3f09e3a7a54,True,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aee29310a316508899a263387ddac86e9a2029e06849906d1db6dfc3b5d5c174,Tests_failed,409b44576320bfce7736f21751fcb065feb92f02e8095d419b129829a6873150,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,aee29310a316508899a263387ddac86e9a2029e06849906d1db6dfc3b5d5c174,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,Tests_passed,93ddfc211701cb872528c9728b8e3041f50746ca3b10f99171d267f4a4d764e8,0.017994165420532227,0.01909661293029785,0.021667003631591797,0.021930694580078125,0.021820783615112305,0.022464275360107422,0.02187180519104004,0.0770258903503418,0.17847466468811035,3.612011194229126,0.7481083869934082,0.15346670150756836,0.1491851806640625,0.0765681266784668,0.07718086242675781,0.06504988670349121,0.0791480541229248,0.07431817054748535,0.1429905891418457,3.7649314403533936,0.07365107536315918,0.07308793067932129,0.05203890800476074,0.07260370254516602,0.049907684326171875 diff --git a/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv b/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv index 145cb1ac7c..4bc3ec5249 100644 --- a/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/log-parser-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/develop,a4d0e3ca611eef6567b9ac34a8b8453a35fb4fd8,b57168beaa534d38eb0fe3d14b5a647ea967e378,13dbf9ee6740a819a5fd36fb9d35601f690dc220,,True,True,True,15,73,291,4,True,15,Tests_passed,07648d91aee9d0f6e494194a78a97607be539191d4020ace934218fccd873032,True,Tests_passed,dc6f04a493944036cc570f7ba9b270645760c760cb0951b8834da36419cb86db,True,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,8497082d49ac979b18d77baa35fe16f401dd413db07b7ea62ead99f5216e5afc,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Tests_failed,4854fd361dd4337592a341e97f427ed13172da8b4710e1146c7c665479d88d0f,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,1d7e615078268d2e9b07088752c5df47b6c79ba89b02559556101dac6ee3e173,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,0.009721040725708008,0.009544849395751953,0.009685516357421875,0.009735584259033203,0.009557723999023438,0.01011037826538086,0.010057687759399414,0.06022191047668457,0.1729588508605957,2.170079469680786,0.5423581600189209,0.13011932373046875,0.1311802864074707,0.04962015151977539,0.0498654842376709,0.050144195556640625,0.0507044792175293,0.05003237724304199,0.11648440361022949,2.246037006378174,0.05102348327636719,0.050850629806518555,0.03374505043029785,0.05005145072937012,0.033331871032714844 diff --git a/results/combined/merges_timed/jenkinsci/mailer-plugin.csv b/results/combined/merges_timed/jenkinsci/mailer-plugin.csv index 007ecd216f..5b44d498e7 100644 --- a/results/combined/merges_timed/jenkinsci/mailer-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/mailer-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,06a11a1de909d15bacd04459d29807af9e0882d8,7deeda155287f04384088e250f40c59ef151d305,cc4c337146011301d9c6f4ab9269bad52a83f8e3,,True,True,Tests_passed,b7977e1d365e6a0d3243f110fd22a3593e3970de3d9085b28ba869648e1cb443,True,4,10,27.0,3,True,Tests_passed,d03eab9b6e7b54c9c752a738fa4147450f60425db3c9da196bef9f45f9f41074,True,4,True,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,6fe5e06a9fbf2177ec70c9b280f66c9989a72c2252bb7f8b4fe6af999ec4d90d,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,81b8dd259b81a17907dc8c6c6765a61f5f964cd70fb64bc88776818b595fd4b2,Merge_failed,c37a2489b6644311855de201a164a7ac8f50b45c7f5503a6802664e709566425,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,740dc7b2f94a22f18623aec60c94333d0985dc0f73a98475b4a81e0fecab9b44,Merge_failed,a555c00fe21a58aaa6c9bedfbfaaf6d8dc476c7d089e3734181c43c99c6dd603,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,0.011716604232788086,0.011257410049438477,0.011705875396728516,0.011518716812133789,0.011629819869995117,0.012204408645629883,0.012160539627075195,0.0511624813079834,0.12544035911560059,1.1870241165161133,0.3569762706756592,0.11271405220031738,0.12595343589782715,0.0481259822845459,0.047384023666381836,0.040488481521606445,0.04762744903564453,0.04706430435180664,0.08816099166870117,1.2797093391418457,0.04713010787963867,0.04737591743469238,0.046319007873535156,0.046103715896606445,0.04497385025024414 diff --git a/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv b/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv index 5d317fd62a..cdf57411f1 100644 --- a/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/maven-hpi-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 181,refs/remotes/origin/pull/323,67abe2c502f27a1b6676e7e5ffdc5f0544ab1f5f,a3302aa4a69f1db5f3a843fa2bf48eb0ea6d84de,f4e6886ff1d6eabff84a03b78f0e8a2aae9a0dee,,True,True,Tests_passed,903206fac46e8412fac58fda3ea664cffc390795edd477f4e133cc496dab4b8d,True,2,11,100,3,True,Tests_passed,b07f7512f3e2b0fd7c9b93a8b0c27ee475595e530cb40c14c8d9711895a32bc1,True,3,True,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,81b8afe0da8eeb63a69b81137ccb27eb97d8cc18dfcf838ced9b4c8b462eb6da,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,abc0d01c8d1a84ee4b463c584fac98bef753d7b813c9ef510318c710d2f6ddd0,Merge_failed,01bb8df73585c3e327e65fe5eb4331369e1c1180acf5f894a98ebc3304c40dd5,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,8268e9dc1b086d350adbd2d3a885190cdf4d11a0ffcda10ee8f509305d04c596,Merge_failed,04f92c355bde7e945be83c9a313d8868cee3e3c3123d80aff25b6468e0e38408,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,Merge_failed,5fa41ca13d3645204947f68ab8451b81b9533ba862f285a2151e4e9900c9b7da,0.012847661972045898,0.0126190185546875,0.013224363327026367,0.013382911682128906,0.01372528076171875,0.014285087585449219,0.014081716537475586,0.045313358306884766,0.07057023048400879,0.5301423072814941,0.24227356910705566,0.0696249008178711,0.11575841903686523,0.03730607032775879,0.03870654106140137,0.037590980529785156,0.035750389099121094,0.03909420967102051,0.07244157791137695,0.5164961814880371,0.034932851791381836,0.037081241607666016,0.03615832328796387,0.0366976261138916,0.03697705268859863 diff --git a/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv b/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv index 16a6163fbe..d1676ac5c7 100644 --- a/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/mercurial-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 41,refs/heads/master,442c688d35c5d22fd37822285b997c0addc5c3eb,7ad0c7ed48378c86e23c90fadc32e647bbcd45c0,2a6bc4be4425be43e355067e0c3bfc0c8db5ee76,,True,False,Tests_passed,9eac327212a73c1e75f93937810cb27ebc80878505ccdca34c96db826bded004,True,7,13,22,2,True,Tests_passed,82844bccf5727fd47ced32a688634253da9682292f5caca1946fe9e8c189c363,True,7,True,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_failed,7cbf0bde3fba0b3eaae6aa5816841ae432b9598b1e4262178a174ff6bfb3f2a7,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,0.012492179870605469,0.01269221305847168,0.015578985214233398,0.01525568962097168,0.015403509140014648,0.015561103820800781,0.015411138534545898,0.042191505432128906,0.06831741333007812,0.625678300857544,0.427431583404541,0.07952237129211426,0.14111709594726562,0.051181793212890625,0.05120253562927246,0.05191302299499512,0.0521082878112793,0.05175042152404785,0.08803081512451172,0.6940982341766357,0.04988980293273926,0.04804039001464844,0.03831815719604492,0.04943370819091797,0.03799891471862793 diff --git a/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv b/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv index 12522f7b7a..5015569670 100644 --- a/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/nested-view-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,94ea285c76a8bd6fec6c17193488009557d4ab2c,e8c66c2217dba216df05030200e0704684c1dda4,fd7070ab51330e9a4919a773408d927f43b6b6ec,,True,True,Tests_passed,0b8a32a4f448291b6a1d829f2cdb29c7b970b74b4a1886047fba917eb1d9f98b,True,6,10,59,3,True,Tests_passed,c45470d6a8e382d7af6526f9073a25f39ff27ddfd09883300b0ff85bf54b3141,True,6,True,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_failed,49eddc9338ae6376106f47c2ac52c666fdce0aa6be69b340b221af4aa50b7614,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,0.04579353332519531,0.04236292839050293,0.04701399803161621,0.04546761512756348,0.04216194152832031,0.04418683052062988,0.0454404354095459,0.23775672912597656,0.17183160781860352,1.830491542816162,0.3748478889465332,0.09769344329833984,0.12772250175476074,0.04654216766357422,0.047826290130615234,0.04651308059692383,0.04709362983703613,0.046099185943603516,0.0955040454864502,1.766007900238037,0.04537534713745117,0.046968936920166016,0.02731609344482422,0.045174360275268555,0.027789831161499023 diff --git a/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv b/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv index ba41377999..40b00fab34 100644 --- a/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/oki-docki-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/remotes/origin/pull/73,1b83e76b9746823f89b48506efbc043c0b42646f,e3731a6f6485dc93f46c48ddc81882b20bc54d5c,c3da4fa3e757e55ce78e3477d3e6f96b7ab865e2,,True,True,True,5,15,46,10,True,11,Tests_passed,8dbd36c05296e7bfe203e5c54f5eba61c2ceed9ba969bf390ec6830c98450004,True,Tests_passed,bb1debed5b38d446f4e05acb0a158cd995a3b386406ccfd93d10d9c381c59ca2,True,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,29e8f712f7498b4ce8934980ee5269722aa7bf91c67d95911d57f695b598b25d,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,0d177e124dcc4350398208b97f329c9d1eb6de5ec26cb9bf993c5fb90c2e99e7,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,eaa74fbad7ce8852c7c5d205a34c0b41b02c3f5b569ebdf0e5f1599d3f599151,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,0.037672996520996094,0.036737680435180664,0.03862285614013672,0.03915119171142578,0.04468488693237305,0.03654122352600098,0.041373252868652344,0.29058074951171875,0.24038410186767578,2.5889248847961426,0.5207059383392334,0.13644981384277344,0.13001275062561035,0.049137115478515625,0.0497746467590332,0.04901599884033203,0.04890322685241699,0.04915475845336914,0.11207723617553711,2.5022308826446533,0.050400733947753906,0.05041980743408203,0.041083335876464844,0.05042910575866699,0.04079794883728027 diff --git a/results/combined/merges_timed/jenkinsci/plot-plugin.csv b/results/combined/merges_timed/jenkinsci/plot-plugin.csv index d560dcf75e..e79dd0ebd3 100644 --- a/results/combined/merges_timed/jenkinsci/plot-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/plot-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 71,refs/remotes/origin/pull/71,047e97312d44206b7c8b3f19c46aea40cb65b22a,448c2265849e8ab8953aef9fc16c510c879450ea,3c1ac06b43dcc820faeca28b71922231e682d429,,True,True,True,33,89,640,3,True,33,Tests_passed,49e0cb0ef7afeded35b5996aea911f00758729e3eda26e8a7940029f126492f9,True,Tests_passed,23eb6d208ecc54e9c35c0b9f45b372253960606ce43e8a326beecf38fbc90bed,True,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,0.013599395751953125,0.01356816291809082,0.014861583709716797,0.01477813720703125,0.015224933624267578,0.014503002166748047,0.01479482650756836,0.053110361099243164,0.12256264686584473,2.021440267562866,0.6300594806671143,0.1172018051147461,0.14188671112060547,0.05770564079284668,0.058322906494140625,0.05588197708129883,0.05780172348022461,0.05887556076049805,0.10678553581237793,2.04086971282959,0.05499720573425293,0.05617237091064453,0.03845095634460449,0.05600571632385254,0.03779411315917969 diff --git a/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv b/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv index 2410400174..f0c3e13198 100644 --- a/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/promoted-builds-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 49,refs/heads/master,90cff675a1008c2167bd647a27a4c62f3b9a9c6a,af28c1241fac960920e8700cdde08c8f4d54414f,219727bd20bac7fad6f71fa77b33d192a36e72c6,,True,False,True,3,8,26.0,2,True,3,Tests_passed,e7ff9c59df7a232ff0c03172efcecf68ce81a3b7b9a8a4843edf911e4dd3fb62,True,Tests_passed,ea06d927f2569648bb447f8d065ec5e6d0fe724fb4e3beeb14829af3164e1c52,True,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,83cecea0eb6657d355449d158a277a7369da867da4f5930fb4cc907a69c99487,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Tests_failed,8bfb68208be97fb2b4bc4fe739872cfa42d8faf17fd77eef2a73fd4320aebe3b,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,72d62046038596ca0e325b22beae11089b9a0ae4115aa34e68f7f4b0a06abd97,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,0.04456949234008789,0.04310798645019531,0.04223942756652832,0.03923296928405762,0.03853011131286621,0.044621944427490234,0.033077239990234375,0.13556170463562012,0.11705183982849121,1.042269229888916,0.3640420436859131,0.07167220115661621,0.13403058052062988,0.03500056266784668,0.04712247848510742,0.04633665084838867,0.03438115119934082,0.035129547119140625,0.07864880561828613,1.0398802757263184,0.03587150573730469,0.03469276428222656,0.04510378837585449,0.04396343231201172,0.04632878303527832 diff --git a/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv b/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv index db73970d9b..d552805fb2 100644 --- a/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/rebuild-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 71,refs/remotes/origin/pull/64,fa2a472f46cbbfe1e0c7c4d0e3f0d40a1bb33a19,1adfe8fb9559836a45a99c86ad80605f2c30b1b4,fbf91ab63db56523914007976c7d2a369be08065,,True,True,True,14,33,240,2,True,14,Tests_passed,ba1dbb64f06280d9e24bfb04575fe72dc269545f18290c6fdf41d1b3c8e68baf,True,Tests_passed,4b277c7cd1ea44107ed47f25e7da9f7a2c4938e07ff7b0c06333fdf4411cec5a,True,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_failed,2a1d0455bddb945c4de9deabf8153abe34c9a4f502ab539371f06d5c3d29c3a4,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,0.010820150375366211,0.011069297790527344,0.012006521224975586,0.011275053024291992,0.011603355407714844,0.011385202407836914,0.011369705200195312,0.036032915115356445,0.06627774238586426,0.9948873519897461,0.47164249420166016,0.0749204158782959,0.12965822219848633,0.04533219337463379,0.04455971717834473,0.0448150634765625,0.04414963722229004,0.04437541961669922,0.07745814323425293,1.0241641998291016,0.04236960411071777,0.04442429542541504,0.0336606502532959,0.0420985221862793,0.03166532516479492 diff --git a/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv b/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv index d940aa6615..9a37226dfa 100644 --- a/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ruby-runtime-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/remotes/origin/pull/6,39375b570201fcf8b133343bea4d124bf7351210,92be9dc3bb9db0abf462653b236dd5ee69d21156,3d8ce2e3cb1e769fca79b0f08be9d449f83dea21,,True,True,True,10,21,100,6,True,10,Tests_passed,8fc2c75921936a7c2fc8979207818efe527e802b6f9ab513b8db0b1e85ccf78f,True,Tests_passed,010ab39676fafa2f98562da90f6b8b1b2f58d8d61fccae47c884f13f428a1ffa,True,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,4a99ebc6e6d72fc46608dc9b97e88820f08df5c89113ac4f6330e78a5a3ab031,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,c489a634b9d773226ee45f18c9be35e42e6bc866422607df51edf53e3000e756,Merge_failed,c4839ed75f4cbeb3965a407db6687138200d6e34cfa0e7090ccc5b95c6657bba,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,6c718065b8a254a4d55b7dca851982a44e35a86a5ab30f1ddcd62f0ee56154a3,Merge_failed,abcad57dc0e03effcda66c6a651bf016d78af653b031ebaeea7385e466a8147b,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,0.05094456672668457,0.05145668983459473,0.062398672103881836,0.062270164489746094,0.06225466728210449,0.0626833438873291,0.06206226348876953,0.16838884353637695,0.32964301109313965,1.5538756847381592,0.310117244720459,0.2892723083496094,0.23575878143310547,0.13458871841430664,0.13208937644958496,0.12964367866516113,0.1280512809753418,0.12679386138916016,0.2689974308013916,1.6426889896392822,0.11763501167297363,0.12463164329528809,0.11176490783691406,0.11727738380432129,0.1150507926940918 diff --git a/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv b/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv index 6bbfee6fc4..0eb473ee50 100644 --- a/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ssh-slaves-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 68,refs/remotes/origin/pull/260,67b86f05f7f5d4cce393b8a6eeda9ebf5af23307,6d732bfe8d1d195fead4b2c1753b4c79338f0d6d,4b3a02a729f7376a1794920af7d1b661b310339d,,True,True,Tests_passed,25a55b9dd6eb461129f7e7ae1b8fbec6b1b0ae381f310f046337cb96cca825a5,True,10,44,89.0,2,True,Tests_passed,a0c904e5f5a467c4a98640f4391c7ee1d6827367b32ddba1d3422345c372079a,True,10,True,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,55c797321bc21aafc117a253a72c7b26b721bf24a604bceff1e3f0619e2668b8,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Tests_failed,247c65ac07be30bbdcceb08b503ff2dff45fed1db4c534ad64c246e97b4262eb,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,877aaa3029535d58c3f197d3fb9856c03c6234ab8be6ff254af0c488a8e922f7,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,0.021859407424926758,0.010999679565429688,0.021836042404174805,0.011475086212158203,0.02257561683654785,0.010357141494750977,0.02172541618347168,0.055838823318481445,0.0786142349243164,0.7880175113677979,0.4765775203704834,0.0888223648071289,0.14037513732910156,0.03510713577270508,0.051557302474975586,0.05099296569824219,0.0510859489440918,0.04806399345397949,0.08583235740661621,0.7451508045196533,0.05046439170837402,0.048772573471069336,0.03459334373474121,0.052002906799316406,0.05014801025390625 diff --git a/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv b/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv index 976d5fa9ff..138f320fb3 100644 --- a/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/testng-plugin-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,2df4e9dca40488bdb4d10816d04c1f672de4d57c,cbbe722570d1bdd06267e642af03ddc32ff5f39d,a0d5f66521e3bc470047a0b683004ce8889d3369,,True,True,Tests_passed,5da7031c76120c5751f7cdada2178ba36af2c442ffa4c19590ffde5e18b6a861,True,24,60,471,3,True,Tests_passed,08ef0bc46c3164762ed860b24683da2aedf5ebdb899b56405be7c34fad3dc99d,True,24,True,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,34f8420a1988bf5a2ce07eb5ccc059ae141948afa9bdf469e754dec7fb76d221,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Tests_failed,2358ee24f1292b0cf125ef0b56ec8a93c392ecd55fbcd7d280ea8a49447a53ce,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,beee047f6718af217cde790aa28fa7340404c059f905aac92d616cfbf179ebac,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,0.01439666748046875,0.015810012817382812,0.015296459197998047,0.017889022827148438,0.014990806579589844,0.015125751495361328,0.015153884887695312,0.056555986404418945,0.12335944175720215,1.5844447612762451,0.43312644958496094,0.11045598983764648,0.13856148719787598,0.051865577697753906,0.0641639232635498,0.05066418647766113,0.055207252502441406,0.05094790458679199,0.10134172439575195,1.6851413249969482,0.04886651039123535,0.06177020072937012,0.04260873794555664,0.04985666275024414,0.04252886772155762 diff --git a/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv b/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv index 13e46fdd96..5b0c45e01a 100644 --- a/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/throttle-concurrent-builds-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 29,refs/heads/master,5032e15fb75155d73e9fd1bcccc64ce177fdd57b,4bfc64f6985f1303bbf23f9ec15dd1a952b8cae4,c31b212352d2ff3f87404cf546cf22e53a105269,,True,True,Tests_passed,732d9321738e21f9182beca1f01b6aa530ddece503824d8477b90e2feb71fcd9,True,3.0,7,57.0,2,True,Tests_passed,76f4d30888d5787bcf45fc7bb881cff5c277c96625b6dd93ae7f7099179be25a,True,3,True,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,0.010823965072631836,0.010698318481445312,0.01191258430480957,0.011263847351074219,0.011278390884399414,0.01170969009399414,0.0119476318359375,0.0362851619720459,0.0655522346496582,1.237520456314087,0.43161725997924805,0.07582259178161621,0.13427257537841797,0.044127464294433594,0.04439735412597656,0.04484081268310547,0.04470491409301758,0.045404672622680664,0.07891082763671875,1.2712147235870361,0.04359269142150879,0.04357790946960449,0.03260636329650879,0.042818546295166016,0.03319072723388672 diff --git a/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv b/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv index 5f82892385..53695697fd 100644 --- a/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/token-macro-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 61,refs/remotes/origin/pull/88,47d8b7d061275a8c961c9f0fd17bffcb2a656b89,7c063fb30ca13cca989b49f3834f86504995799b,b2ddd4c391c910628567cbba43e5e48fbd3e16b5,,True,True,True,7,73,963,3,True,7,Tests_passed,871803410282e8e4366c7f14398928a0a3e35656db91dd1f07c559ce97a46242,True,Tests_passed,4dae64f82b3a67fc14640f9845d7b7e2e6f488771ddfe642c11ed7ff6512f095,True,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bb353d80ff39078e74ca1328f8e9e92c84241964b06c4ed3003de465c68f1798,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Tests_failed,6b86ee49e56096a49df4a692ac2e035a59f30b9184980cdd81e0035152b9e16d,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bf655cc2312ade40baf005493dca60e12441c429e2c1825ad55ae8e2b42a6f08,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,0.04359030723571777,0.03660440444946289,0.03833913803100586,0.04634284973144531,0.04389691352844238,0.037693023681640625,0.03993344306945801,0.2400355339050293,0.16442227363586426,0.7402603626251221,1.2135686874389648,0.10203671455383301,0.1271648406982422,0.04590964317321777,0.04558920860290527,0.04714250564575195,0.04704689979553223,0.046880245208740234,0.09685039520263672,0.7186615467071533,0.04431319236755371,0.04562544822692871,0.03753805160522461,0.04280495643615723,0.03734636306762695 diff --git a/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv b/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv index 55e9941c40..1b2dda6cd5 100644 --- a/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/ui-samples-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 28,refs/remotes/origin/pull/14,179ee92cdf658ab0fefbb2e20d341443fbaf5ddd,cd322943dcc1363e90555c011d97ffde1807e6e3,d7e88884dd90310b67193b4aab8139998a107486,,True,True,True,32,50,240.0,2,True,32,Tests_passed,6761b9b89eb5f3b7e18758f9876712fdd0e1cd766d367e678a691197d01e6677,True,Tests_passed,015a7155f157be9f6ba6af0e0df998c3e6a140cf7d600492a1fb581b1f86e5c9,True,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_failed,a52259e58a8fe0d27ce1c9ad8a466249e03a5aa56ad09898260f67e08185b232,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,0.01176905632019043,0.01200103759765625,0.012701272964477539,0.012426376342773438,0.012407541275024414,0.01263570785522461,0.013041973114013672,0.03686356544494629,0.06705236434936523,0.5276811122894287,0.29108595848083496,0.07473206520080566,0.13181185722351074,0.04411649703979492,0.04533505439758301,0.0444178581237793,0.045562028884887695,0.045674800872802734,0.08064818382263184,0.5758674144744873,0.04442191123962402,0.044629812240600586,0.03450322151184082,0.04544806480407715,0.03412032127380371 diff --git a/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv b/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv index 7bc6310c02..f457fddcbc 100644 --- a/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/urltrigger-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/master,636236f91bcd67ba35a17a01f43f271fb6150021,52aed37f45183395978126b7b547cdc6372c0126,739387ce7f2b1b61231fb7f5c460ffefde4cfe02,,True,True,True,20,23,74,2,True,20,Tests_passed,082b0839f729d1ea6adba90dda0aa0bf06854764125346c6207b4a75e3ef4de9,True,Tests_passed,a89f5f20c1cd9c02cda65a4cec851eeae7faabd6653b32fc347f9046bb3fd1bf,True,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_failed,5ba725bbd793e70b3bc901061eed3c86b2d7491122535a555900193e95dbd6b3,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,0.046317338943481445,0.03866696357727051,0.05179309844970703,0.046936750411987305,0.04125332832336426,0.04193997383117676,0.04362773895263672,0.045658111572265625,0.12179350852966309,1.2615399360656738,0.4706707000732422,0.07626771926879883,0.13158917427062988,0.045354366302490234,0.046616315841674805,0.04561471939086914,0.046868324279785156,0.045493125915527344,0.08031082153320312,1.1816449165344238,0.045064449310302734,0.04487919807434082,0.034287452697753906,0.043250322341918945,0.03421521186828613 diff --git a/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv b/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv index 2ef9dccb24..dd8393902a 100644 --- a/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/vsphere-cloud-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 95,refs/remotes/origin/pull/112,9d608121dd2c89e1c5eadb6717ccfa7c412148f9,f5f88b588c8c76b53ca5a569b8f38084bb368c74,e81bbdb1045efc0513bef1271216bc624d375fb1,,True,True,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,True,28,31,751,3,True,Tests_passed,1d41135e87c8ab2c58592179fe5698e7397e6d6054ed65ca76547ef1943c90d0,True,28,True,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,968c1a920c711ae831b5432a59afb923651c20893966b873a8490546a5696c1c,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,Tests_passed,91952eeb51bd58c0bb4803229f4130c48dea1dd56bd61aef157d4ae67f4bbda6,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2c67cee965f401b3cdaf23cef6ddee45e6775f30a027af29eb172179cfd9ea6e,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,0.041115522384643555,0.037482500076293945,0.027384519577026367,0.023156166076660156,0.015912294387817383,0.04701805114746094,0.0159909725189209,0.22847580909729004,0.17321085929870605,0.025867938995361328,0.32926464080810547,0.11236763000488281,0.14453959465026855,0.0439605712890625,0.07571792602539062,0.05987048149108887,0.050431013107299805,0.05852627754211426,0.1132514476776123,1.1201720237731934,0.05802035331726074,0.07086515426635742,0.04758024215698242,0.05607461929321289,0.04306364059448242 diff --git a/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv b/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv index 82404950b0..a41c88b319 100644 --- a/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv +++ b/results/combined/merges_timed/jenkinsci/windows-azure-storage-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 70,refs/remotes/origin/pull/192,68f96cee84c20a9a94696b400e3a5231f0caae4f,40521b451ea70ac7055171aba07f761400fe4e0a,36c07129d7d345a276e8760e33a60e3b4c4f6b3a,,True,True,True,12,21,356,2,True,12,Tests_passed,1cab803bfe52b220bb4063ed752b3351f6117caaed56c5e93f14edf4a865ece2,True,Tests_passed,7c572faa50c82739fb4e5d45354fc7cdf2fb0d93ab7e330a9ad292c5e5e778dc,True,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_failed,4f33a4c98f46939d8495a078567b3439b2ac50e9f9119d1a727a8df7edce28d3,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,0.011737346649169922,0.012323856353759766,0.013914108276367188,0.013825178146362305,0.013606071472167969,0.01330709457397461,0.013443946838378906,0.0396425724029541,0.06792807579040527,1.1510636806488037,0.5863077640533447,0.07784199714660645,0.13656926155090332,0.04900336265563965,0.04847407341003418,0.04763054847717285,0.047860145568847656,0.04837775230407715,0.0826413631439209,1.1547515392303467,0.04697871208190918,0.0466160774230957,0.03688478469848633,0.04755091667175293,0.035474300384521484 diff --git a/results/combined/merges_timed/jexp/jpatterns.csv b/results/combined/merges_timed/jexp/jpatterns.csv index 428c160fd4..f49e3acd06 100644 --- a/results/combined/merges_timed/jexp/jpatterns.csv +++ b/results/combined/merges_timed/jexp/jpatterns.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/remotes/origin/pull/3,ef9f7d0e000c5af9d0a9e6843eed56e7b3450bc9,5305b3ebd8d787b57bf599118826be47097c6d22,14bb2740fde84b37d6f4a48f839c7a1eef194e97,,True,True,Tests_passed,4e3aec4b6a31cb1b0e2ec76ae1d1b2f4b82c333038cde5c33cca2c30bc04cf28,True,63,66,8849,6,True,Tests_passed,85c4ea1f34217247aae5eb9cc08d0a6fa80c466982644fcde419bb884009fbee,True,104,True,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,e6e75c9d6151d5b1f07bb79ada7fe44d47b5d015923a654c31908852e0c1a6e2,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,269e2f25b31869e45f5f1e203706cc2cc9bbd64f4aff0914cb0e510feb4c77ac,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,267cb360bca7e4a1199bd16d545e55827b8782f13f85d11cbcfef04713ff1dde,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,0.07150006294250488,0.059450387954711914,0.06499052047729492,0.06132674217224121,0.05617046356201172,0.06578302383422852,0.06175041198730469,1.9265525341033936,2.6424057483673096,21.234198808670044,-1.0,1.21006441116333,0.1625981330871582,0.08017468452453613,0.08859109878540039,0.08362650871276855,0.08192253112792969,0.08313679695129395,0.5583808422088623,20.920605897903442,0.07981705665588379,0.08605313301086426,0.24212408065795898,0.07936620712280273,0.23963403701782227 diff --git a/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv b/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv index b39230bf00..c4d5ac8b96 100644 --- a/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv +++ b/results/combined/merges_timed/jexp/neo4j-rdbms-import.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,True,True,Tests_passed,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,True,19,20,982,2,True,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,True,19,True,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,0.013459205627441406,0.01370859146118164,0.016000986099243164,0.015800952911376953,0.015899658203125,0.0160677433013916,0.01641559600830078,0.04207181930541992,0.0690617561340332,0.4411039352416992,0.38605499267578125,0.08505487442016602,0.14152193069458008,0.04934835433959961,0.050604820251464844,0.05195140838623047,0.05223417282104492,0.05057859420776367,0.08993363380432129,0.4794316291809082,0.04918074607849121,0.04948139190673828,0.04208016395568848,0.050045013427734375,0.04054832458496094 diff --git a/results/combined/merges_timed/jfaster/mango.csv b/results/combined/merges_timed/jfaster/mango.csv index 10a9c62844..0eff52718b 100644 --- a/results/combined/merges_timed/jfaster/mango.csv +++ b/results/combined/merges_timed/jfaster/mango.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/remotes/origin/pull/26,6c28ffc629752987623e939e30b2ae66e1952a2f,ff1a792c607c318590ec447591691a91cedf8875,65c5d160cef1cd5ae01144d6bb809033aba61078,,True,True,True,138,471,5334,3,True,138,Tests_passed,33a81092f3a084163e7257a6b2bebbff7deaf9f8694b5879f16dfe4693069bef,True,Tests_passed,6491b1030229b60f98251a9878b6750e9b2eb812890d0c1b4122812e28f2a940,True,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,55a922a05927fb321ef0a8c689fac3465578f09e09b997d5d13fd42e368b5923,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,ecb245518a89ee6711c0d7daeb1d6307510a48e34745fbc8d7ad982eceb70a9d,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,ee25e02a03afcd6b5253748020548d4b135f2ed269f706c8089e82c81f6d866b,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,0.06231975555419922,0.05386066436767578,0.04415321350097656,0.0385289192199707,0.05516314506530762,0.05315041542053223,0.0686805248260498,0.1176762580871582,0.17880630493164062,1.3427941799163818,1.5766997337341309,0.11278247833251953,0.1407639980316162,0.0584259033203125,0.058156490325927734,0.056131839752197266,0.058646202087402344,0.058509111404418945,0.10641860961914062,1.2812280654907227,0.05604434013366699,0.05753207206726074,0.04523587226867676,0.0561060905456543,0.046151161193847656 diff --git a/results/combined/merges_timed/jfinal/jfinal.csv b/results/combined/merges_timed/jfinal/jfinal.csv index dedaed3b89..cad56802c3 100644 --- a/results/combined/merges_timed/jfinal/jfinal.csv +++ b/results/combined/merges_timed/jfinal/jfinal.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 59,refs/remotes/origin/jfinal-java8,0c6e8ea6cab44a710a87e6168ef10784130e9a7d,e5587b08619f7800a99cde0b8d54b47413009b1d,bf183262ac9b54efd32a258c3263810e9f2c397d,,True,True,True,150,488,6664,3,True,154,Tests_passed,7e29d89d38eb0e7b9324c586b3e47a519614e7f739f5d98ae10f670159cf6439,True,Tests_passed,a20f75e73c999c4d5fa53174f6e9d82fc2f3990dda28e94bd755013db5034ed7,True,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_failed,d81b04d32a20fc098ed5153dcb9939ddd21b5f5aabdc138cec87707c46c3dd21,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,6f9185baa7138bf9d37bb64f01aa93022a67c9eec3cc036b3ea699f009b7ae2c,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,Tests_passed,2843432408a104e127d8fe1c9c8df360d454387357041b357dbfc169fae3661d,0.029575109481811523,0.029511213302612305,0.026318788528442383,0.034606218338012695,0.0353085994720459,0.03537702560424805,0.03512930870056152,0.08303642272949219,0.13912129402160645,0.7708566188812256,1.8648455142974854,0.13093876838684082,0.16747808456420898,0.07422709465026855,0.08834528923034668,0.09140634536743164,0.07772994041442871,0.07519078254699707,0.133711576461792,0.8250558376312256,0.07981562614440918,0.08641457557678223,0.058290719985961914,0.07338809967041016,0.05843210220336914 diff --git a/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv b/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv index c2dad3f232..5060a67854 100644 --- a/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv +++ b/results/combined/merges_timed/jfrogdev/teamcity-artifactory-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 47,refs/remotes/origin/pull/115,08f8573776df392bef2843094930ed26e1a39b54,527b02fa114cc6bf196e842ff2301208ce9335c2,5510a3f02afa1a68943069423d710049a50234cf,,True,True,True,61,358,1651,6,True,61,Tests_passed,4da1b8e223e67844e679b74f20c0123922c940e9d92c540bba32cb4671fa83e7,True,Tests_passed,0c72927c38c151d3160f04415aa9f504d5180c2a6e3fdd02e13283eef62bd0b9,True,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,9397b0c41f68b6d50f5c3b55d00052dc39744dc800968c126b72ac0d55994f48,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,6ee99094ae1b0358e8153656469736f477a5f4146b03ed34d0b16e66bd0d493d,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,592c15b122fd399969323dcb104357e1d3624078e0ba48bddfa2ac884570482c,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,0.017512798309326172,0.017928361892700195,0.019116640090942383,0.018454790115356445,0.018294572830200195,0.018285036087036133,0.018404006958007812,0.09440159797668457,0.29701733589172363,3.993100166320801,1.9504830837249756,0.21271586418151855,0.15976262092590332,0.07306075096130371,0.07488036155700684,0.07375669479370117,0.07452964782714844,0.07756304740905762,0.1777200698852539,4.096109867095947,0.07636213302612305,0.0739290714263916,0.06992554664611816,0.07796669006347656,0.0704033374786377 diff --git a/results/combined/merges_timed/jgralab/jgralab.csv b/results/combined/merges_timed/jgralab/jgralab.csv index 0e0aeefe27..f2379f3736 100644 --- a/results/combined/merges_timed/jgralab/jgralab.csv +++ b/results/combined/merges_timed/jgralab/jgralab.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 374,refs/remotes/origin/disk-store,fbd9a0ffd885f02b80fbd72715848d2f0d5c0bc9,e1661886641270fc867fc80e971ccb21bdda20e8,0282b628a97a63728ab36d1837234aa998fbe6f2,,True,True,True,47,354,3563.0,41,True,82,Tests_passed,4e94f6f784c015b60f537cd47d3ff5b6d1794d110ad63a73f030b32ade165c5e,True,Tests_passed,85847ada20a0be7cf15901e6c180538d8accdff44402fb808c74cc2d360f8adb,True,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,6ad35ef2ce3fcbfc347e37b56fbe3ef573771d59a171ee9cb9d2f87031eeac5e,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,0bbfd03e84bc1b72771fd4b487a8d479e071fba59f2e0b370192934d44215e08,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,6ad35ef2ce3fcbfc347e37b56fbe3ef573771d59a171ee9cb9d2f87031eeac5e,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Merge_failed,0bbfd03e84bc1b72771fd4b487a8d479e071fba59f2e0b370192934d44215e08,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,Tests_passed,9b0cc00dd63c510a2aaba4417980feca18d3b5c08675a4d2a66fe7c76a16be25,0.019261598587036133,0.019805192947387695,0.023595571517944336,0.02446436882019043,0.023405075073242188,0.023762226104736328,0.02151632308959961,0.11314225196838379,0.293903112411499,5.831105470657349,2.0081536769866943,0.22287940979003906,0.18520617485046387,0.09141731262207031,0.09384894371032715,0.09287786483764648,0.09242081642150879,0.0820157527923584,0.20793485641479492,5.176968097686768,0.09119844436645508,0.09109950065612793,0.051363468170166016,0.0887899398803711,0.050484418869018555 diff --git a/results/combined/merges_timed/jgrapht/jgrapht.csv b/results/combined/merges_timed/jgrapht/jgrapht.csv index a9b85a6621..9849921fd6 100644 --- a/results/combined/merges_timed/jgrapht/jgrapht.csv +++ b/results/combined/merges_timed/jgrapht/jgrapht.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 61,refs/heads/master,8f3dfa07cf62a9032f18a22f8022b3480dfbf1c7,bb5bf7b4680787e3f4ce8f19a19576c53a5a3427,e76f73409146e565f36021cef9a755d4d12c0f53,,True,True,Tests_passed,7f5790db42cf8cea7e23583e65dac8b823fba71eb4ce07c8e61bbe3b34fd874a,True,534,3910,18401.0,8,True,Tests_passed,d0c851fb09c381d0ba8c9b1bde8ad65746a1bb0c6d7b28777de882ff2223d16a,True,534,True,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,ade1058762dcc162cb0056f43b57e2e43fc45daccadc9d7b2e8c57987ed0b4ac,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_timedout,,Merge_failed,655af229e325403c961cedf07b7da92f8245ae46360717dcddaec516668929a7,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,4a57e4ca35f2a3c8f93e4101e73a89c7fc7085f0a8092dbe90a2bab4d1fa71c1,Merge_failed,9eb2f48f8a51ffb3e75a8106c31abe2204176f344d2095e923d7a59a793a0358,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,57a078e03563bf0b3f3af8209cae614a9bff990962c2a2a4f62fe4477cb8b327,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,Merge_failed,834b6ee2eb66c5a95e4c8846cc8b66ad9af8816f1a06a1e0145a54eda95e69bd,0.08601260185241699,0.09016299247741699,0.09491539001464844,0.09223270416259766,0.09329414367675781,0.09366631507873535,0.09295320510864258,0.6092128753662109,0.5247592926025391,4.734174489974976,-1.0,0.37528252601623535,0.2716958522796631,0.16942262649536133,0.17463231086730957,0.17438101768493652,0.18216967582702637,0.1735846996307373,0.3276193141937256,4.583126783370972,0.16596031188964844,0.16649770736694336,0.17188215255737305,0.16482210159301758,0.16916656494140625 diff --git a/results/combined/merges_timed/jhalterman/concurrentunit.csv b/results/combined/merges_timed/jhalterman/concurrentunit.csv index 3b69215593..8886a33e9d 100644 --- a/results/combined/merges_timed/jhalterman/concurrentunit.csv +++ b/results/combined/merges_timed/jhalterman/concurrentunit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,ff9794f7485bb6455f5360b989c22f3173b679a6,e0a180ded55fff37fc7e0801d416b02b3019f194,21cab232bc4e99b4b9d9250d84c833f4e01ad894,,True,True,Tests_passed,a45de44d2cc427bcd14e936631f7ad73f6e6ec99868dca53b4394fda7935ce7b,True,8,7,1331,6,True,Tests_passed,ab7027ce12ea65b1337952fd4befdbfb9be95fa1ad03f22288cce803d094f0ac,True,8,True,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,dfbb7b6173b9d1783584f440052e21480980778ef3a6457138b23f691b991bf7,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,93e9a53a5918d72cbf316a3bc461c5e51a0ad82333b97688fc63f51b8660dbb1,Merge_failed,4cd63c695ec8e7bea17dbaf0119414a2c2dd7aadf4a3048c9b1c170145523365,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,fc1143e296bbe86d86453d574830166171703e422e258f8009c216740e92fb59,Merge_failed,f2a5bea1cbf9dfb2bb29a5dd8c2bfb71cf4ef0ca047d460154e053a2a06b7cc8,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,0.036554813385009766,0.04093503952026367,0.010076522827148438,0.009281396865844727,0.009896039962768555,0.04133415222167969,0.024639129638671875,0.40541863441467285,0.3318352699279785,1.6225087642669678,0.3725278377532959,0.18593287467956543,0.13582444190979004,0.05921602249145508,0.058210134506225586,0.05891013145446777,0.05820441246032715,0.05800580978393555,0.14968085289001465,1.61411452293396,0.0593724250793457,0.05868220329284668,0.05769205093383789,0.05950140953063965,0.05730247497558594 diff --git a/results/combined/merges_timed/jhalterman/expiringmap.csv b/results/combined/merges_timed/jhalterman/expiringmap.csv index ca9971294f..4fec8d0643 100644 --- a/results/combined/merges_timed/jhalterman/expiringmap.csv +++ b/results/combined/merges_timed/jhalterman/expiringmap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/remotes/origin/pull/62,a0c2e3e6a0995582ef1199db7c250f9883b075ea,6cb40a4752c7391c5a4d308d5737639e26dc1815,b6a544d640196f96fc91e21c8227735781a1a0f2,,True,True,True,9,23,212,2,True,9,Tests_passed,7a9c35ea159f49c724359e863eb1ab029d2a0dd2d4db7f4712bd8f1e51c503d9,True,Tests_passed,f0233b79d474b97e985835d8a8942615107ba2fb96eae333d6021525f364c73e,True,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,328f7ff681f29f55824e86fbeb1c3ab468da0dcff7829b65eafd4165b56a8d54,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_timedout,,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,e032053eb977f90401b5ec7e60d8995eea63cbdda93e2a15543f8ac201aba718,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,0.0465540885925293,0.04394102096557617,0.04411005973815918,0.04365277290344238,0.0460050106048584,0.04077935218811035,0.0419464111328125,0.17460870742797852,0.12178659439086914,1.8704066276550293,-1.0,0.06861639022827148,0.11514878273010254,0.035013437271118164,0.03511381149291992,0.03543806076049805,0.035352468490600586,0.03568124771118164,0.06639981269836426,1.7082276344299316,0.03557157516479492,0.03499102592468262,0.03445935249328613,0.03580975532531738,0.032938480377197266 diff --git a/results/combined/merges_timed/jhalterman/failsafe.csv b/results/combined/merges_timed/jhalterman/failsafe.csv index 24c66541dd..2b5077d9b5 100644 --- a/results/combined/merges_timed/jhalterman/failsafe.csv +++ b/results/combined/merges_timed/jhalterman/failsafe.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,True,True,True,7,11,109,3,True,7,Tests_passed,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,True,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,True,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_failed,f067ae368a63233b8eb581e0f942b4838873d286cd6aee6bb965514fc4774bf1,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,0.03919172286987305,0.03924965858459473,0.047580718994140625,0.03768420219421387,0.03964662551879883,0.04326152801513672,0.04137730598449707,0.22632622718811035,0.1583564281463623,0.656266450881958,0.42878198623657227,0.10040497779846191,0.14151573181152344,0.046518564224243164,0.04721689224243164,0.04700112342834473,0.04733419418334961,0.04735302925109863,0.09750556945800781,0.6382112503051758,0.045762062072753906,0.04639148712158203,0.028074264526367188,0.04621386528015137,0.028355121612548828 diff --git a/results/combined/merges_timed/jiaqi/jmxterm.csv b/results/combined/merges_timed/jiaqi/jmxterm.csv index 6ce26b2534..5d8d617b86 100644 --- a/results/combined/merges_timed/jiaqi/jmxterm.csv +++ b/results/combined/merges_timed/jiaqi/jmxterm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/main,eb38f4012dacafe4b4e876004ccf09080bde4e8a,32cf434df4d70cd02503e60d3be65b9156e2f7d7,211a81796b512118b338f16231de0cf748e0b673,,True,True,True,3,6,12,18,True,18,Tests_passed,25afcf9a4d83300c0e1502b5a7ce34f163f7c7e1e011553961a716e2ec4ac222,True,Tests_passed,feaf8dc103ef91d74e3d22fd1ad24e6ee3db2d94ee248f23c517c912bda1ca88,True,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,794ddcf62288d3dbea5548ae8d5986cf49fd68044fe635ddb14d5648c92185d4,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,7f5102f3fa6b5e01de6f09416320e56de99e81e838dd74ec4dfc7881cd7f2a10,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,3e785dc8807cebed30c8132f36ca82d654e3f18db04c01d7a7d5ed6cb44fa052,Merge_failed,cd623b37f7f424845aebfcd943b46a241b71b44ec62101f9ee3da5b84313bcab,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,0.039209842681884766,0.05180096626281738,0.04096364974975586,0.044327735900878906,0.0431060791015625,0.03855276107788086,0.04003620147705078,0.21147823333740234,0.16685247421264648,0.7971315383911133,0.38584399223327637,0.10627555847167969,0.12901639938354492,0.04799842834472656,0.05446934700012207,0.045932769775390625,0.046593666076660156,0.04630541801452637,0.0982367992401123,0.7826001644134521,0.045183420181274414,0.05209994316101074,0.038425445556640625,0.047072649002075195,0.03885507583618164 diff --git a/results/combined/merges_timed/jinahya/bit-io.csv b/results/combined/merges_timed/jinahya/bit-io.csv index d2f85f1c25..99bededde8 100644 --- a/results/combined/merges_timed/jinahya/bit-io.csv +++ b/results/combined/merges_timed/jinahya/bit-io.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/heads/develop,a3ad5c4ce8fe0b5633b4aa90cccc0e73d774247d,b1642eefdabeb4b1b09e329f82882eed1909acc1,292af81fc26154d3707be9e83cbf8b3b8a526474,,True,True,True,11,46,256,18,True,26,Tests_passed,0455c6c56a5c273fb4ed01800d7e226b42695080bb7aa78da7260ce7f4fe0266,True,Tests_passed,7afb2a8aa488f16b0c53927630708680535b8d831d7b509ce47439bb0cd653e4,True,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,724214221e0e4ce23bdc5c8575d34c4c68762b0c40f463ae21e04bd46b2cb90a,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,6b7dd207b91aa8e61e519f944c297c8d8dd71e895edf7ce1d2655bde97e26878,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,e3a9399c4a42109d43024977d1aafaabe8041bb4562b5ec081c3f7a754d7d7ac,Merge_failed,5efbdc50ff2f6f04eb3b91e7001ef7ffb89cd68ffa0d36679c9859620155f9f5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,0.008577346801757812,0.008734941482543945,0.008577585220336914,0.00867009162902832,0.008471488952636719,0.008391380310058594,0.008445024490356445,0.08540940284729004,0.12073898315429688,0.5287883281707764,0.5459766387939453,0.10415911674499512,0.11838412284851074,0.04105043411254883,0.042461395263671875,0.042005062103271484,0.04183650016784668,0.04184317588806152,0.09003591537475586,0.5694789886474609,0.04158186912536621,0.041823387145996094,0.03226161003112793,0.04213428497314453,0.033357858657836914 diff --git a/results/combined/merges_timed/jingwei/krati.csv b/results/combined/merges_timed/jingwei/krati.csv index 29aa968b02..35a06c01f0 100644 --- a/results/combined/merges_timed/jingwei/krati.csv +++ b/results/combined/merges_timed/jingwei/krati.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,1781566efcd25979a849227f0d90ecc108e25342,d65fdedc86f39b553f6f5b717177fa4130dea9bd,c0d6e5e6baf21463785bdfec285c5178734753ce,,True,True,True,19,70,389,2,True,19,Tests_passed,be3c3ca22673b3593cdecd577ae8c8b3066c2fc8049c4f42840c4911d53c4596,True,Tests_passed,70ba88d87f91a874aefe681846e6aec86ee936fd396d25cbab90dfae78fc5680,True,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,6284918bb801520170ef7cbf3b857932dbe0c41066d4c06070548164ea5e7492,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Tests_failed,b0334dbf1fda9a5098ad4fcc266b6acb8999a037444f663114500cb175737132,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,11ff2c87e5e5a6d3a0fee607445596ee12a708947cf384342a84adb29ca62e28,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,0.028177261352539062,0.010645389556884766,0.032659292221069336,0.010593891143798828,0.03278040885925293,0.02961421012878418,0.0332338809967041,0.07159614562988281,0.06957435607910156,0.5070490837097168,0.5608255863189697,0.07081985473632812,0.12211132049560547,0.037160634994506836,0.03747200965881348,0.0385134220123291,0.0536344051361084,0.03767967224121094,0.11628007888793945,0.5362026691436768,0.06221961975097656,0.037476539611816406,0.036080360412597656,0.062744140625,0.036324501037597656 diff --git a/results/combined/merges_timed/jitsi/dnssecjava.csv b/results/combined/merges_timed/jitsi/dnssecjava.csv index b007a0f2a6..11dcb44dca 100644 --- a/results/combined/merges_timed/jitsi/dnssecjava.csv +++ b/results/combined/merges_timed/jitsi/dnssecjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,05cb5d378fe90768618ce158335fbcb564274790,c3843fa5766a7e1f7f02362e7e413282dc3e061e,72b617fe945d40563b1d0577d42258b4b7eb1cf4,,True,True,Tests_passed,61b329bd8c8fba5a72e08ce2c04532c9a66b1dbb11af4c270c1e69a5ad40d0c9,True,152,348,2197,6,True,Tests_passed,86dd535427e6efdb5b7012875f6222ebb1ecd07e19b97f91707b596ee9c1fc5d,True,152,True,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_failed,efcdf43a5de380b6597e6195df7470430b7fa42c170774ac0b827260e15f974d,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,0.07851672172546387,0.07200288772583008,0.06151771545410156,0.053415536880493164,0.045073509216308594,0.05920863151550293,0.07761311531066895,0.49457454681396484,0.3729708194732666,4.702235698699951,0.7967817783355713,0.2263786792755127,0.23795700073242188,0.12538504600524902,0.1264200210571289,0.12420105934143066,0.0987401008605957,0.09711170196533203,0.21847224235534668,4.513629198074341,0.09600329399108887,0.11490631103515625,0.0843360424041748,0.09539008140563965,0.059151649475097656 diff --git a/results/combined/merges_timed/jkotlinski/lsdpatch.csv b/results/combined/merges_timed/jkotlinski/lsdpatch.csv index c791e96803..43ac10af36 100644 --- a/results/combined/merges_timed/jkotlinski/lsdpatch.csv +++ b/results/combined/merges_timed/jkotlinski/lsdpatch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/remotes/origin/pull/83,6a4e1c82830d6579ddf349bea58a67acbdb29320,7d2dabf069cf7a85bdd91465673b185621237e57,ce522dbe7c021ffbfdc790e0c984df28e144932b,,True,False,Tests_passed,eda8b13df9368694b3691f5595464a07bb8638c278c9fdc1cd4d2d9fd6c021c0,True,2,13,33,2,True,Tests_passed,1ebdf987b44770a653955c7f07921fce00dde2fde938785d4a4e044dfa45ca45,True,2,True,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,ad3540ff4728bd1f0a550eafc6207dfd49a1d3577188b61bdf9d0b9fe475a679,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,Tests_failed,948fd9fe7b1411e079926f23fb395683d4670bf52fbbd6432bc91e3f5c56a98f,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,e415296baa559cfcb907a73c6998c3e68bace96f44f559f07ad169f6c0376797,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,0.034659385681152344,0.02092289924621582,0.036170244216918945,0.04937148094177246,0.036908864974975586,0.02235555648803711,0.026747465133666992,0.18806815147399902,0.12509679794311523,0.04550933837890625,0.4368457794189453,0.09303951263427734,0.13888263702392578,0.05114579200744629,0.050151824951171875,0.04900050163269043,0.04735088348388672,0.0513763427734375,0.0867619514465332,0.06660962104797363,0.049768686294555664,0.04633665084838867,0.05111217498779297,0.04767560958862305,0.05097317695617676 diff --git a/results/combined/merges_timed/jline/jline2.csv b/results/combined/merges_timed/jline/jline2.csv index 71224506ec..0dabae3356 100644 --- a/results/combined/merges_timed/jline/jline2.csv +++ b/results/combined/merges_timed/jline/jline2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,89539d94808bd1b79e1e37c099111ba33365812d,ae3a537dcfa86bd9a0588732b7f344b3f3ee7462,4bd5ac04c8303b2225e4bbf4d11a10f50cddd2a3,,True,True,True,16,65,307,3,True,16,Tests_passed,bc94147925eda7622aa08984f41eeeb6b245c558bbbd21f8f8a9be7fcd43058f,True,Tests_passed,1009e9d4366b1fe1aeddf2d15b04cc9dba85c073a7365f863bbb052715018492,True,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_failed,464fea628ff0cf35f81750b4263ecd94e1a3145941c65c005e6f3271fba5babd,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,0.01579594612121582,0.015341043472290039,0.018152952194213867,0.019664764404296875,0.018912076950073242,0.018461942672729492,0.01755070686340332,0.07026958465576172,0.15241646766662598,1.1427643299102783,0.7470171451568604,0.1064918041229248,0.14539670944213867,0.05548381805419922,0.0561823844909668,0.05467581748962402,0.057172536849975586,0.054558515548706055,0.10579776763916016,1.1637985706329346,0.05403614044189453,0.05295443534851074,0.036598920822143555,0.05441403388977051,0.03625845909118652 diff --git a/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv b/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv index f5699bf6d3..301d3ac757 100644 --- a/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv +++ b/results/combined/merges_timed/jlinn/quartz-redis-jobstore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/remotes/origin/pull/67,8b87e2b2c3427b604f42bb48d3c06843b6ed77d0,8319caab3c74065fcd1e0cf10c206f829aa6b650,a4693da53065f64bf9164e41c4db2f137cb0654a,,True,True,Tests_passed,5bce0b2309a52ff1040ebbd5f73cb49698a2a7428dca680892af250f38919ab1,True,10,21,258,2,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,True,10,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_failed,0e4bf847551a36ddfa8e378b24c4c6086f5b6ebdc824e0bed3b3b9cb43519c7c,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,0.04502224922180176,0.05085611343383789,0.052910566329956055,0.0509793758392334,0.05642390251159668,0.014815330505371094,0.06270527839660645,0.17273974418640137,0.13174843788146973,1.3170785903930664,0.6235964298248291,0.07943558692932129,0.13051271438598633,0.04688215255737305,0.047658681869506836,0.04644513130187988,0.047126054763793945,0.04512310028076172,0.08196115493774414,1.250931739807129,0.04706311225891113,0.047357797622680664,0.03534197807312012,0.04524064064025879,0.03494405746459961 diff --git a/results/combined/merges_timed/jmacglashan/burlap.csv b/results/combined/merges_timed/jmacglashan/burlap.csv index aec3d4e9db..7828bd4068 100644 --- a/results/combined/merges_timed/jmacglashan/burlap.csv +++ b/results/combined/merges_timed/jmacglashan/burlap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,4e8800b6680f46064862f5b9c28ca5499203ddbd,3b1917000b96d9fe9cba84db6ae8cbd3143dad2f,f4bc6379d047c30d86fc62227c55e5a7b09b5a35,,True,True,True,46,65,175.0,4,True,46,Tests_passed,23fa978adb1b61e4ffa7be83aa8f83aa8d39a796ed4e9ce5d4b43ddbd90be278,True,Tests_passed,43a9728a1d77cac8cfe3fd1c5c3bc70274727ae2a60193bc0d0ea0311a39bd11,True,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,0.05646061897277832,0.04650282859802246,0.022189855575561523,0.05553460121154785,0.04914116859436035,0.06977987289428711,0.06025576591491699,0.3118295669555664,0.2185671329498291,2.793132781982422,1.1658377647399902,0.15026378631591797,0.16466093063354492,0.07625746726989746,0.0756993293762207,0.073394775390625,0.07758402824401855,0.07722806930541992,0.15325331687927246,2.792576313018799,0.07037639617919922,0.07338523864746094,0.05131888389587402,0.07100105285644531,0.049199581146240234 diff --git a/results/combined/merges_timed/jmetal/jmetal.csv b/results/combined/merges_timed/jmetal/jmetal.csv index b7163d4958..3b96d9ee49 100644 --- a/results/combined/merges_timed/jmetal/jmetal.csv +++ b/results/combined/merges_timed/jmetal/jmetal.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 194,refs/heads/main,b4630972a8b9aebfc552e9782906bf084249fcf0,7c8c5a6039da2ea3dfc881dad1291f8246162a39,c83f2e8205bdc51687bf4740add46d495117ecc7,,True,True,True,60,124,1249.0,2,True,61,Tests_passed,ae4a3dc358e64d3098dc3c432a4fc6bae135dfae72465defeb76e50b051f282d,True,Tests_passed,881c02dc2deed33ed76364343076d24893438e237345431d336b7853feebc53c,True,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,ce1d667c1e805465778f39f67183f122efafeeb56747dc0c60c023757d9c177b,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Tests_failed,341ea30b2b1286e568cc9f4ff99c97150fbd991708cf33b7cdaa0343e94318cd,Merge_failed,70ef3369c01ed96b348ef412e7049812f85a0d0bac6c3073a7957e4f81e2acbc,Tests_failed,d7a046bbf6a54657d4d629470ca485c4fb44e4b5e7fe904c7ad377460175cc50,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,35b7675c56e40eed1f8d4839b8d504c5c754187dd904cb967fb08f9cb33ec0cd,Tests_failed,341ea30b2b1286e568cc9f4ff99c97150fbd991708cf33b7cdaa0343e94318cd,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,68672d7775a153218f5a9257b3b3b7170a0d3b884a87be558ebae6fb558b104f,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,Merge_failed,736c5aae31d5b320a8cfda76e13ed5ab6d487423ce50bf5607dd320cc837c02c,0.07122683525085449,0.07567906379699707,0.07891654968261719,0.08118152618408203,0.07793331146240234,0.07143020629882812,0.08107233047485352,0.32357120513916016,0.21947026252746582,1.5080265998840332,1.5677173137664795,0.1271975040435791,0.1392819881439209,0.053853750228881836,0.05308341979980469,0.053594350814819336,0.05481314659118652,0.05435776710510254,0.09839797019958496,1.4930336475372314,0.05049324035644531,0.050699710845947266,0.04868721961975098,0.05022931098937988,0.04709625244140625 diff --git a/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv b/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv index fde1866ee9..1d2b24cd7d 100644 --- a/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv +++ b/results/combined/merges_timed/jmeter-maven-plugin/jmeter-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/main,efc1712ae3cf864ff9e552c855f79ec5617dba34,bf8b0b908c2115a4e6a89172df35ba44e9e78703,8d2d280c9edccd06633c5a08af53a5a02b3695b2,,True,True,Tests_passed,852319d1cc6497dabf78b628d68ee3987d280c672c12647b717fe17c3cf02766,True,17,73,618,3,True,Tests_passed,2e75242bb607218708415c75eee0ecefb0af740899a29fdead2c8287d6939e75,True,17,True,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,2a6e321d3c114486298d32d628595c7b8ccd46a6c55cb3318711cd941bdb1d98,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Tests_failed,ee55120005b5d0e1fecd11fab09fe6d819c41fa4a7a308f825182ce752a7cfbf,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,aa5976bfc2f47289ac65580d0e4a4adc318ee14284c56b713ec83994710d685e,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,0.04708504676818848,0.04547834396362305,0.04378914833068848,0.04325127601623535,0.04729509353637695,0.042407989501953125,0.04461860656738281,0.21392178535461426,0.18015265464782715,1.2906816005706787,0.4850177764892578,0.10541534423828125,0.1218719482421875,0.0431060791015625,0.0433351993560791,0.04211688041687012,0.04307818412780762,0.04278969764709473,0.08932161331176758,1.2961325645446777,0.04298758506774902,0.044022560119628906,0.04101419448852539,0.04287981986999512,0.04145503044128418 diff --git a/results/combined/merges_timed/jmrozanec/cron-utils.csv b/results/combined/merges_timed/jmrozanec/cron-utils.csv index 12a60f6672..91952f233b 100644 --- a/results/combined/merges_timed/jmrozanec/cron-utils.csv +++ b/results/combined/merges_timed/jmrozanec/cron-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 47,refs/heads/master,56a9faab1c79a0118677324ad31878e8bba372f9,be40542c2c55cd1d0a4c59374e508955200714ae,55f277f1ee25ce954d82c79af23f0633ef55b361,,True,True,True,8,21,315.0,2,True,8,Tests_passed,83826e842e905a6dcaf76f7cd95eb254f19b4c9100edcd2a203135a9d2df0162,True,Tests_passed,c78ba8d1e823d5f0eca39d0a0de135c8c471425422247d4d76582538ab924e4f,True,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,bcf1ba49553e2cf8576d28854a3bf70b373807525662c3da37a92d2c8d482f24,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,0.0156862735748291,0.01611948013305664,0.01943373680114746,0.01987004280090332,0.020124435424804688,0.020251989364624023,0.019536495208740234,0.04855060577392578,0.07240056991577148,0.5316851139068604,0.31516122817993164,0.09195685386657715,0.13215184211730957,0.05830979347229004,0.061629533767700195,0.06024360656738281,0.040477752685546875,0.058814048767089844,0.09456062316894531,0.5840516090393066,0.0569760799407959,0.05483889579772949,0.04648542404174805,0.04225969314575195,0.04665112495422363 diff --git a/results/combined/merges_timed/jmurty/java-xmlbuilder.csv b/results/combined/merges_timed/jmurty/java-xmlbuilder.csv index 0e215d4015..1526562ecf 100644 --- a/results/combined/merges_timed/jmurty/java-xmlbuilder.csv +++ b/results/combined/merges_timed/jmurty/java-xmlbuilder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,4ee5f60778e25cc1f762eb5c6f6747ea15354931,de0c78aa839dda06bdfc92fa0eb7aa8af3d8104c,6483a913a5ee3561e8ebe0b23e5716f96eb447fb,,True,False,True,7,55,204,2,True,7,Tests_passed,d04f0ec5d99017403ed35fd42761441d2abbcabd333a4b8f80afdd7e1a34154d,True,Tests_passed,cce0483f078c4fe02f23db8cab1e9b0e2fef8f7fb90d8585dad4b2aba264366f,True,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,0.011434555053710938,0.02182602882385254,0.04998421669006348,0.031247377395629883,0.051496267318725586,0.04898691177368164,0.04977273941040039,0.17703986167907715,0.11590433120727539,0.8774635791778564,0.6688826084136963,0.07091784477233887,0.12587594985961914,0.04062080383300781,0.039900779724121094,0.04033613204956055,0.04051828384399414,0.04054760932922363,0.07282781600952148,0.8559138774871826,0.040067434310913086,0.040657758712768555,0.029649972915649414,0.03987550735473633,0.02998065948486328 diff --git a/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv b/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv index c7d5d80989..692220e93b 100644 --- a/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv +++ b/results/combined/merges_timed/jmxtrans/embedded-jmxtrans.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,2266cfcadd9491cea8c5eea1d7c08116ce35471d,4148ed2bc9f8fe8ea4b1595b905669d39b4dfa40,524b8648461b933e02d7e2a8e7f3cd91f9cc0da5,,True,True,True,5,29,210,2,True,5,Tests_passed,fcaa257aca4e29b23958701e9570b2078ebdafa2a4d44423a64642742a312257,True,Tests_passed,c8c9734bdea9c1796f2906014144d0e6d76f6fd044b8aec1515b9e8c42d04e05,True,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_failed,807f0e99c840638f9687e0fba1f5f56fdb97a6a4992165137f3aa50ba6d015a4,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,0.04684591293334961,0.050606489181518555,0.042392730712890625,0.03792929649353027,0.03833436965942383,0.04034256935119629,0.04842567443847656,0.18633222579956055,0.11317563056945801,1.8918898105621338,0.41409850120544434,0.08523321151733398,0.14931297302246094,0.05200076103210449,0.0510096549987793,0.05370521545410156,0.05269169807434082,0.0534975528717041,0.09040379524230957,1.8122174739837646,0.049657344818115234,0.0511631965637207,0.040770530700683594,0.04945635795593262,0.039229393005371094 diff --git a/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv b/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv index cd25e07a97..eeaddf5e18 100644 --- a/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv +++ b/results/combined/merges_timed/jmxtrans/jmxtrans-agent.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/master,60e40f2ad4d067e75c9433b56c139e15ba4642f5,50eaacd59890332041d69ac0ede573d96329ed95,59e060ee6566654261084e583b34b0dc1194a6ec,,True,True,True,31,119,1957,4,True,33,Tests_passed,9788efbefcfb3a717e7e765c416dbf05e672d61c3c763e01cda3422676025e6b,True,Tests_passed,fe6fb2c3b34875510b4f9e5057dea4e97995649ec570b5bf00acf0d12e4c0fa6,True,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,5f4f21b4eb3f7d47129a4695ff631f7f17002741b7062b8d48df1016aa747b67,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,808984bd76f665bd17544d1eaca764b2362ea730ef354b05d042b20ad8f58fd6,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,ddc8626547c8dbe75bc49b1b4231f85a2ee75cb930597d67746fc7e2d0726e81,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,0.0497128963470459,0.05024909973144531,0.05640745162963867,0.05954241752624512,0.06285500526428223,0.0525968074798584,0.048598289489746094,0.3167283535003662,0.22979474067687988,2.571502685546875,1.2599132061004639,0.15446829795837402,0.14348840713500977,0.06020760536193848,0.06129789352416992,0.05788826942443848,0.05994606018066406,0.05910634994506836,0.12817049026489258,2.5233154296875,0.057793378829956055,0.05925798416137695,0.06087350845336914,0.05909442901611328,0.061017513275146484 diff --git a/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv b/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv index f3a5c00876..5a0d5d2abf 100644 --- a/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv +++ b/results/combined/merges_timed/jnasmartcardio/jnasmartcardio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/remotes/origin/pull/2,d2203a3c4b2373e013348cd1f2c167a8343ee344,2eb297e73a9bfb689da7571f0d5d0dd5fdb0f079,ca033c9d60c34680cf208f7c6eb4cdc59d62eea4,,True,True,Tests_passed,fe86e67eefc50de41a818b5c41ed4bc5cbc7b4317b56d242c678fa24d7c379a2,True,6,50,623,2,True,Tests_passed,24db2423433b76a5166a57598ed69cd1e94d5f6cf314afbee317035000dff892,True,6,True,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,17658ca5ec7d843c7863e5f4c92fc64378540f5b81039c9bcd65abb29e591eb7,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Tests_failed,fea9b7034322e784a7c5263f8086101613ceb89a6c133e5a89adaafd3ea4ade3,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,be4b31cc3dfc9c151d5ada07ad8ccb6571b195f1251a0e1fb3ab491c49b25d6f,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,0.04593968391418457,0.044380903244018555,0.03961348533630371,0.041805267333984375,0.04321622848510742,0.043566226959228516,0.04289984703063965,0.16353154182434082,0.1208658218383789,1.7341010570526123,0.589043378829956,0.07184958457946777,0.11477184295654297,0.0350492000579834,0.034969329833984375,0.035451650619506836,0.035140275955200195,0.033180952072143555,0.06610798835754395,1.6521689891815186,0.03572273254394531,0.035408735275268555,0.033663034439086914,0.03532576560974121,0.033067941665649414 diff --git a/results/combined/merges_timed/jnr/jnr-enxio.csv b/results/combined/merges_timed/jnr/jnr-enxio.csv index 1dd0eb2c9e..cfb9094787 100644 --- a/results/combined/merges_timed/jnr/jnr-enxio.csv +++ b/results/combined/merges_timed/jnr/jnr-enxio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,06504df5c5e789b3ae946cb938e00c2aa2e78072,c23148ed63fe76f01f16e74720adecc69981f803,7a3a45805cd2b44414df118fd8d21a9606fad2d9,,True,True,True,2,11,61,2,True,2,Tests_passed,a78e5a501c75c5b9a06f5562475d74e5c40a5bb8df8c85e333c4a86352952fb5,True,Tests_passed,e3768f8888ccce91518edf8ea78139163681ff2d99fda57841fe82a1b02fb442,True,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,0.04137611389160156,0.03892040252685547,0.023033857345581055,0.04365849494934082,0.04348587989807129,0.04316258430480957,0.045990705490112305,0.15509414672851562,0.11496925354003906,1.0193750858306885,0.32720947265625,0.06777787208557129,0.11987161636352539,0.037668704986572266,0.037485599517822266,0.038001060485839844,0.037880659103393555,0.0379641056060791,0.06900596618652344,0.9854991436004639,0.038378000259399414,0.03718447685241699,0.026561737060546875,0.03803682327270508,0.02713489532470703 diff --git a/results/combined/merges_timed/jnr/jnr-unixsocket.csv b/results/combined/merges_timed/jnr/jnr-unixsocket.csv index 7d30b0c343..03462cda48 100644 --- a/results/combined/merges_timed/jnr/jnr-unixsocket.csv +++ b/results/combined/merges_timed/jnr/jnr-unixsocket.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/heads/master,1a75fb81ead63de73cb637dca45353706395fb2f,b13d7e769dc494756ae27c9763530590636ec630,47c0a2aa49646012285b43f87e2ddb02dbe26947,,True,True,True,16,47,1947,3,True,16,Tests_passed,f6a48e08cfbdffaac34c12958f297e5a01309138adbc1b14d1b90b4e1cccf988,True,Tests_passed,e5e9a8041c228a125ed2a30755ab53485bf9f840508695866b5a4182b12e97be,True,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,fee0305723caed464b14ce9a1e6729cdd9500d63df0e3da068e9242782d559dd,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,a53c3f8d3d3352b2215263c988e77250139f75875def88ebb142f5071d7c8b35,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,29585878e74243d3a6f8e4a74753246bdc8d8c71c269e0c582f19614a1fe33fc,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,0.044419288635253906,0.041289329528808594,0.037514686584472656,0.04025006294250488,0.04430818557739258,0.04515695571899414,0.045497894287109375,0.23205280303955078,0.15510869026184082,0.8724830150604248,0.5421192646026611,0.09630846977233887,0.12011122703552246,0.04162287712097168,0.04165983200073242,0.041776418685913086,0.04223012924194336,0.04241204261779785,0.08936738967895508,0.8506512641906738,0.041440486907958984,0.04237818717956543,0.03257155418395996,0.04160046577453613,0.03348588943481445 diff --git a/results/combined/merges_timed/joaoarthurbm/designwizard.csv b/results/combined/merges_timed/joaoarthurbm/designwizard.csv index 2583f700ae..0bf00a5b76 100644 --- a/results/combined/merges_timed/joaoarthurbm/designwizard.csv +++ b/results/combined/merges_timed/joaoarthurbm/designwizard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,58fcd555cc6909bb7ca3df27d277600d8c871a81,dc838e11ebd5703f3b6f9506291d6f8f7f2e1f48,1cad83c5ea89ea295fcd6b3019bf095f05dea38c,,True,True,True,32,682,2444.0,6,True,33,Tests_passed,2cc66e406f85207dfb76a2b85fff5474fe37b2330c35f99b0b479e28b9866701,True,Tests_passed,b64c099bef0bed2dd66aea9472ad9a462f4e580cd526cbae3b31fe9543d3c781,True,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,238b73373d281b1a2b1328af800a414dfbad7d08419b0863178608d02f9a9a2b,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,21679d53d2ef46adf438acb79fc7b47162ede579b05778f1253a20c0ccf40eee,Merge_failed,b8d84e4711cbab02bca054b3d3c5f6f896da49ea1a8a4a9386bafc6e0d0d9cf2,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,625488361164c108b584102b6e9fb9f70c26fded33286b7eda63c25fd28e03ae,Merge_failed,818b36bb19a588e61e0301801dfdf668c5f22cc0048c0b091663350aa24f29d5,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,0.030118465423583984,0.024637699127197266,0.03443408012390137,0.0342259407043457,0.05332374572753906,0.042693376541137695,0.030167341232299805,0.2801034450531006,0.286210298538208,3.597059488296509,0.5866398811340332,0.18716764450073242,0.14815402030944824,0.0649561882019043,0.06438946723937988,0.06440114974975586,0.06412029266357422,0.06561160087585449,0.14687848091125488,3.331653118133545,0.06397747993469238,0.06389641761779785,0.05456089973449707,0.06305742263793945,0.05675673484802246 diff --git a/results/combined/merges_timed/jodaorg/joda-beans.csv b/results/combined/merges_timed/jodaorg/joda-beans.csv index ab066a70d8..11295e4665 100644 --- a/results/combined/merges_timed/jodaorg/joda-beans.csv +++ b/results/combined/merges_timed/jodaorg/joda-beans.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/remotes/origin/pull/212,dec9b88627fa8e7ff0b7804a22cb5cf594dbe7df,dc23f43d5e28cfe4ea9acd7e45e2bdb85556d4c4,5f44ff767131606cda6135a13f25c4816623a558,,True,True,Tests_passed,364df857cee01a24477a12059a69b1f0ba58b4d25dc681b790083baf82decf67,True,51,124,3308,5,True,Tests_passed,270a8129d623eb08b47281cded7e46d7b9751d44418092bb6802da065b2603a0,True,51,True,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_failed,044b6a17158f239f9fa88cf6fa2a81c3c14ff677b7ad0d55eabd345a6b73cf2e,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,0.021939754486083984,0.035685062408447266,0.04360556602478027,0.04532051086425781,0.023697614669799805,0.044596195220947266,0.04378795623779297,0.13222670555114746,0.24751067161560059,3.194833278656006,1.6609091758728027,0.20812487602233887,0.19513320922851562,0.1207423210144043,0.12779951095581055,0.08408617973327637,0.11635088920593262,0.12155866622924805,0.18782639503479004,3.2779269218444824,0.11431264877319336,0.08378028869628906,0.06296205520629883,0.11098957061767578,0.05332660675048828 diff --git a/results/combined/merges_timed/jodastephen/property-alliance.csv b/results/combined/merges_timed/jodastephen/property-alliance.csv index cc7fce2e78..941fad05fb 100644 --- a/results/combined/merges_timed/jodastephen/property-alliance.csv +++ b/results/combined/merges_timed/jodastephen/property-alliance.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,13848ab05df1997879b886e6488fba6265cc8233,5d2861df97016960d3c2ec09bbde50a30cc2e0c0,7d9b6dd776dd981d0d7dcba883e40358b860b85c,,True,True,True,11,21,1025,3,True,11,Tests_passed,c3df6d211dddacb99be8f62152b6adcc5e1d76d73a9207a2fdc958da99129880,True,Tests_passed,a70f0d0b3c55fda89f2d14f11dd80ff1732c8e957fd7be4ce92abf056509920c,True,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,548004e55d23183642065b03309a94c8e7c00dbdf0e130440b27b6d58f284da2,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,0.04447579383850098,0.0353853702545166,0.04542422294616699,0.04469180107116699,0.04566454887390137,0.043085575103759766,0.045067787170410156,0.23141860961914062,0.17456340789794922,1.0964851379394531,0.3824172019958496,0.10546445846557617,0.13135480880737305,0.04633593559265137,0.044495344161987305,0.045404672622680664,0.04652070999145508,0.044878244400024414,0.09403371810913086,1.0705440044403076,0.04511523246765137,0.04554343223571777,0.027866840362548828,0.04494333267211914,0.02827739715576172 diff --git a/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv b/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv index 47fba497f8..6419539f57 100644 --- a/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv +++ b/results/combined/merges_timed/joel-costigliola/assertj-assertions-generator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/main,e9c59be58d0f5f8598375f4031f5f06ac0f1cdcc,110502e40c6e85333a4c6e5161f35f0757e8c493,535559c9286c16ac8f356676bcecf8a3392f9022,,True,True,Tests_passed,c2206d168feee7de6ad83adfe0ed8d09893fa9d9f3c4d2fac4b6f6c6c47c4f0a,True,45,217,1683,9,True,Tests_passed,64d33d228f278c8174aaf4b491d897899d579952a0c1fe5b95bc96c52630bd64,True,45,True,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,7fb5dd686136165029f9a0e90ebe613e176283615077cf03b245ca3038ee364f,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,70aac63c47daf47648143432243c279abc30e2d8d8bcd576385b55e17aae0534,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,137a949ec8361fca3c6eab637e16c540ef09f7d978bde9eb1490321b2b58e3f1,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,0.0594935417175293,0.05236530303955078,0.051554203033447266,0.05587482452392578,0.049386024475097656,0.05462050437927246,0.060712337493896484,0.6363668441772461,0.5410242080688477,6.6980626583099365,1.3578929901123047,0.3132941722869873,0.17910313606262207,0.09207749366760254,0.09165096282958984,0.09154939651489258,0.0928659439086914,0.08994007110595703,0.23704934120178223,6.656394958496094,0.09348845481872559,0.09229755401611328,0.061592817306518555,0.09285187721252441,0.06282186508178711 diff --git a/results/combined/merges_timed/joel-costigliola/assertj-core.csv b/results/combined/merges_timed/joel-costigliola/assertj-core.csv index 1abaf4ef79..ea2b5479a0 100644 --- a/results/combined/merges_timed/joel-costigliola/assertj-core.csv +++ b/results/combined/merges_timed/joel-costigliola/assertj-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 52,refs/heads/main,01799c8c9011d8695ba0a97ff7b659e5ce879d11,5f77a95ba5277ac3648f805f96d4692edd6ac9f3,9bf86bc554b5cf3bd9ff5f541fbee4adf2a811cf,,True,True,Tests_passed,32455f4c599a798753c1eefb3c0e1720ae98d051ea16b5b61b2d759cd672c1fc,True,415,1159,31277,10,True,Tests_passed,a79bef6baf9c3bc084de56d80c1bf0b5835a1d9983e635878e0792174aaa0cbb,True,420,True,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Merge_failed,d6255fd2cf7a2918146a697bdc2b891589bc58d472e904fed9f90d3960905ef0,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_failed,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Merge_failed,d6255fd2cf7a2918146a697bdc2b891589bc58d472e904fed9f90d3960905ef0,Tests_failed,5965f9e98f97f528237051135b3681518a4707330ce837e8588f14f7db43e4ad,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,35ee3cc70114b61272bab77af201bf694d47b9d8911c95454f38f9d2a47ab179,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,Tests_passed,e6a1116b34b3af768ba695428b4ccd49715bacfea5cd2c44dc30a9146f3add00,0.07190561294555664,0.07251882553100586,0.08411836624145508,0.08067631721496582,0.08944988250732422,0.08176183700561523,0.0756533145904541,0.6391732692718506,0.5138726234436035,7.798923969268799,5.721296548843384,0.38065266609191895,0.2903878688812256,0.18248653411865234,0.17612671852111816,0.1781156063079834,0.15777254104614258,0.18372702598571777,0.34331846237182617,7.502943754196167,0.17092323303222656,0.17195415496826172,0.10771870613098145,0.16555500030517578,0.10659432411193848 diff --git a/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv b/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv index 768d791f3d..1dc9024046 100644 --- a/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv +++ b/results/combined/merges_timed/joelittlejohn/embedmongo-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,e407eb6955fe9325b7b0c2ce4069e7d640c1cf81,f451b3a5c0d067c8341ca9d73d9c38c45a457cf9,d596ee43d3f18a8b46fa38218a9d2592e606c265,,True,True,True,20,58,1402,4,True,20,Tests_passed,d358cb0059aab155c1bb2cf22761b4f139c0434b4a44d61a541024f259994a06,True,Tests_passed,9babcde81773aa2f18c88f90dca876bb0816b1fb74e3d55d1018b39e0b4d4bdd,True,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,0e17d920d4ba2e00fa22b61f44dab5b0f3f79155b18969f5bdae927e08828ce8,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,478477a436f10235c2726ad7129569b6c2658644824786b712f3a2351bc6b364,Merge_failed,3b5d398417141e86619ab7b8f2e1a136c9f7598460b9411c9a942014b9f89bf6,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,fe3981f9b3044013f2c7a6db2a30136857dfe8b5ae64f474fe665c840d944914,Merge_failed,c3d9e9552e39f01471eee66043c11af46cfc6f508af5b4fed147f891c238a31d,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,0.03798937797546387,0.03644275665283203,0.04597640037536621,0.039075374603271484,0.044461965560913086,0.045563697814941406,0.04413175582885742,0.224684476852417,0.21860432624816895,0.806220293045044,0.4913954734802246,0.12639546394348145,0.13129448890686035,0.048024654388427734,0.0490415096282959,0.048774003982543945,0.0490570068359375,0.04972410202026367,0.11226797103881836,0.822007417678833,0.04917550086975098,0.0500645637512207,0.040193796157836914,0.05053830146789551,0.040395498275756836 diff --git a/results/combined/merges_timed/johncarl81/parceler.csv b/results/combined/merges_timed/johncarl81/parceler.csv index 4d2d8e08bb..135a84645c 100644 --- a/results/combined/merges_timed/johncarl81/parceler.csv +++ b/results/combined/merges_timed/johncarl81/parceler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,True,13,54,251,3,True,14,Tests_passed,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,True,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,0.01697397232055664,0.017736434936523438,0.022325515747070312,0.022197484970092773,0.02158522605895996,0.022143125534057617,0.02219414710998535,0.05076146125793457,0.07213878631591797,1.0636169910430908,-1.0,0.09411191940307617,0.13526129722595215,0.06417489051818848,0.06442022323608398,0.04760909080505371,0.06408429145812988,0.043114423751831055,0.10221695899963379,1.0977373123168945,0.042062997817993164,0.059305667877197266,0.031178712844848633,0.05736804008483887,0.031023502349853516 diff --git a/results/combined/merges_timed/johnnei/javatorrent.csv b/results/combined/merges_timed/johnnei/javatorrent.csv index 35435c429b..326d0037fa 100644 --- a/results/combined/merges_timed/johnnei/javatorrent.csv +++ b/results/combined/merges_timed/johnnei/javatorrent.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/develop,3e2e076b0d94417e7a92f6e1f861ab06696dbaba,2fbad48779e19f1ce23c2d60097cdb2fed19ac89,effadbf711ec7d523c87d62deca64528d61c0fc8,,True,True,True,95,181,8627,2,True,95,Tests_passed,3e2e08cebda51e66bb9f926d48ba36fbf4e02cabf33b513bc07fa050393f495e,True,Tests_passed,ef0432d0e74301e6e414e666645e9bd449e9bbbd8285c883ee16eba53c4bc7c5,True,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_failed,d94eebf7d1ceca05b3c930321c6286b01ffbc1623cda7537ac8e00e0ddcff48f,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,0.15433049201965332,0.14623260498046875,0.12893891334533691,0.16030430793762207,0.1604595184326172,0.14382433891296387,0.13800787925720215,0.2703728675842285,0.17521333694458008,0.09856295585632324,0.7229018211364746,0.12034487724304199,0.18545985221862793,0.0992746353149414,0.10389947891235352,0.08102941513061523,0.07992291450500488,0.09906840324401855,0.1382312774658203,0.1002359390258789,0.07645344734191895,0.09124946594238281,0.07832050323486328,0.07501077651977539,0.08148598670959473 diff --git a/results/combined/merges_timed/jooq/jooq.csv b/results/combined/merges_timed/jooq/jooq.csv index 316b329374..591620ae64 100644 --- a/results/combined/merges_timed/jooq/jooq.csv +++ b/results/combined/merges_timed/jooq/jooq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,True,116,417,3453,3,True,116,Tests_passed,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,True,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,0.05702948570251465,0.05356884002685547,0.0689246654510498,0.0749216079711914,0.0643165111541748,0.07329773902893066,0.05992484092712402,0.2512493133544922,0.17312407493591309,8.96409797668457,14.130894660949707,0.19485974311828613,0.24814796447753906,0.1383070945739746,0.14186882972717285,0.1391139030456543,0.14293432235717773,0.13898086547851562,0.2124471664428711,8.194209098815918,0.129105806350708,0.12552571296691895,0.10855913162231445,0.1248469352722168,0.1068263053894043 diff --git a/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv b/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv index 4c16750595..90d3d57a27 100644 --- a/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv +++ b/results/combined/merges_timed/joschi/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,True,13,58,227,5,True,13,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,8729ab01b1e90354062f83345c81759c7f3964f739d46f873bc093fc3c310041,Merge_failed,b5bec5ff58eaf8910fef70949a53df1a55bb44112fa4f0ac6a6f83700add1cda,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,0.04706239700317383,0.04752039909362793,0.03997945785522461,0.03621697425842285,0.009907007217407227,0.009777545928955078,0.010146617889404297,0.3724863529205322,0.2910497188568115,1.1195287704467773,0.37695765495300293,0.17345213890075684,0.13866114616394043,0.056081533432006836,0.05625128746032715,0.0559391975402832,0.05712080001831055,0.05644822120666504,0.1348567008972168,1.1356828212738037,0.05717945098876953,0.05639481544494629,0.05501699447631836,0.05662727355957031,0.05400705337524414 diff --git a/results/combined/merges_timed/joschi/dropwizard-flyway.csv b/results/combined/merges_timed/joschi/dropwizard-flyway.csv index 5160a4c9a2..f3ab79522d 100644 --- a/results/combined/merges_timed/joschi/dropwizard-flyway.csv +++ b/results/combined/merges_timed/joschi/dropwizard-flyway.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,True,8,90,644,2,True,8,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,dc4bb85afa09aeafe1c3af45d21d3a270f4a97526f6440c05ee2444355c4e8aa,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,0.03916025161743164,0.04445385932922363,0.039504051208496094,0.04703092575073242,0.04264521598815918,0.03714466094970703,0.04491162300109863,0.17237281799316406,0.11269545555114746,0.9853577613830566,0.41072559356689453,0.06397652626037598,0.11318850517272949,0.03398323059082031,0.04139518737792969,0.03415966033935547,0.03338456153869629,0.03480243682861328,0.06416463851928711,0.9609165191650391,0.03416752815246582,0.040694236755371094,0.03335213661193848,0.034052133560180664,0.032912254333496094 diff --git a/results/combined/merges_timed/joshlong/spring-birt.csv b/results/combined/merges_timed/joshlong/spring-birt.csv index 20a51fb7c3..def86d0087 100644 --- a/results/combined/merges_timed/joshlong/spring-birt.csv +++ b/results/combined/merges_timed/joshlong/spring-birt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,f38e819c4a81bcc9f55b6496c7c9a8728d550694,e674445485360c05639371647a788352f3eaa9bc,dfe261e1b7b69475d706f5e0a6a56a50dc8856b8,,True,True,Tests_passed,7d079ce21ab7fae3260104e45fcd5daf8b0e974d9a22dd26ff5331319f9dfdf2,True,19,228,1143,2,True,Tests_passed,2bf2e5ac6c9cd6c29d2ae9d1e8d3d76a3b9c3631e40d2739bc6f4ff3fd7a4e0b,True,19,True,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,a2ee21b8abdbcd112f92e9324654b06d78ae5581f26f35162f7bcf71e6e9c49f,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,69fdb942705e10523af4b0415a584d6cb8f0139d0e916f6ef460b5474f1dbfb4,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,3a36802c3206a1cb1d2ba0c8c45a124afffda2ae8755771b2ced5ab6bb23876a,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,0.036927223205566406,0.017066478729248047,0.05132865905761719,0.05055427551269531,0.03971219062805176,0.03368043899536133,0.034694671630859375,0.17089390754699707,0.12137079238891602,0.5011632442474365,0.4978673458099365,0.08321213722229004,0.12357354164123535,0.04448652267456055,0.05407357215881348,0.0435185432434082,0.04254031181335449,0.04204726219177246,0.0760648250579834,0.5245823860168457,0.04270315170288086,0.05002307891845703,0.04183316230773926,0.04362010955810547,0.04128122329711914 diff --git a/results/combined/merges_timed/joyent/java-manta.csv b/results/combined/merges_timed/joyent/java-manta.csv index 91a9b7b18a..3943ff4873 100644 --- a/results/combined/merges_timed/joyent/java-manta.csv +++ b/results/combined/merges_timed/joyent/java-manta.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 123,refs/remotes/origin/buckets-m1,5fb0fe7ba2f3107ca1ed1b26c8e6f2d30262db6d,aad00fd5b8d53dc9c75ab14c35067898922c6215,0a0df02b8f5f8e0e90623f67d6e4ddd529fea956,,True,True,True,83.0,572,6907.0,13,True,83,Tests_passed,b33aac36e6a95ae891f9dd786b45ba17f1c83db4f20c60c78c8a0dc71acd6597,True,Tests_passed,346752f3d97f0de6b2e8fd5842337fe16436d2eac969f7e9c16677c2008cfe5c,True,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e8bac93b0192172ccaff252b5961ad5dd92c29847191182a4680a8a5a9d6354a,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,1ab0ead4f0882c48f6ff51d6eba116c40173e242237e592e28965b35c66a38c6,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,8a2264bbd82536471540d0444ecc58d33813e9f23954b1c74a2379245e6bfd5e,Tests_failed,e70922ff76b2a665d01de9572e846807dbdc7a88b55934c9dcd3d47db3c677cc,Merge_failed,61ac56f1ab937fbdca10f266e6dc5d0f32087123808e359be3f98bcd7cbe6b32,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e8bac93b0192172ccaff252b5961ad5dd92c29847191182a4680a8a5a9d6354a,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,f9804aeb1d506b42d4fd5a76aee195e773649610d277460291b42ab42ae5d6f1,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,c3bfa97a10310d25caed90bf4d1f69ddc9a80cbd15707333add1a4b7deb8c675,Merge_failed,8a2264bbd82536471540d0444ecc58d33813e9f23954b1c74a2379245e6bfd5e,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,e12eb00253ad02a9357906374f68b2b40b6c01abec37d1c0461c6e13d41df284,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,Merge_failed,2a0c465c88b3b6f4dca75c48cda787a9b37aad456fbca9cfeeddb216069f31aa,0.04119515419006348,0.042608022689819336,0.02714395523071289,0.028490543365478516,0.04684615135192871,0.04653310775756836,0.027832746505737305,0.2538325786590576,0.6859967708587646,10.505682229995728,2.643084764480591,0.458937406539917,0.22606968879699707,0.14029240608215332,0.1422274112701416,0.14229822158813477,0.13891029357910156,0.14403319358825684,0.3973872661590576,10.62065076828003,0.16215014457702637,0.15969347953796387,0.10135221481323242,0.14441561698913574,0.10429239273071289 diff --git a/results/combined/merges_timed/jparsec/jparsec.csv b/results/combined/merges_timed/jparsec/jparsec.csv index e987427bab..eac7ebdfb5 100644 --- a/results/combined/merges_timed/jparsec/jparsec.csv +++ b/results/combined/merges_timed/jparsec/jparsec.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 39,refs/remotes/origin/5-locatable,ef02642abd641e654abd504ed36a5eb1571ec40c,9b2be3d78619d74c8a1fd38c4b28b8fc775fcef5,b534848cf79d4a1341deb27d25fc3ce48670c806,,True,True,True,8,7,361,2,True,8,Tests_passed,051cb138152af5d962dd02d6ecc3ed55b4e8d41868f57c000bf9154ae716a9d2,True,Tests_passed,7d65e9fd34405cb14c1788039c0b3075397de4e484096d9a1f801878d34c8025,True,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,d25febc0f0d9f4e8ac50f7f84d312a3d97a0086622c9c91be37f4d24a1a9d589,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,93591f74d0167cdf2b24adedb6cd85b23084eb3178dcb3096ca253ae9ae90524,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,8f246a1130d75852297bf4695b7e03f852ab0ad6af8747dcbb3f0da4035d9d08,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,0.04513430595397949,0.017541170120239258,0.012710809707641602,0.03601884841918945,0.04246854782104492,0.02685713768005371,0.02537679672241211,0.15541720390319824,0.0939328670501709,0.9674105644226074,0.33223557472229004,0.08031606674194336,0.13788962364196777,0.034735918045043945,0.04959845542907715,0.034990549087524414,0.05152130126953125,0.05275607109069824,0.08792662620544434,0.9108209609985352,0.049330711364746094,0.0474696159362793,0.033554792404174805,0.05280256271362305,0.033899545669555664 diff --git a/results/combined/merges_timed/jpmml/openscoring.csv b/results/combined/merges_timed/jpmml/openscoring.csv index 8555c26bf8..53f6961690 100644 --- a/results/combined/merges_timed/jpmml/openscoring.csv +++ b/results/combined/merges_timed/jpmml/openscoring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,9aca0c7a8409f3888295b16cc03a74d8def3ed21,f48b5593a16f6a011c30dbf61f9c083482ffe87e,6342ffd5c7e700aa10844e929e6a3c09f4f38a52,,True,True,True,57,379,3131,8,True,57,Tests_passed,637eed99e1949b6725d40fa7360000b465447614bebdf565dbb6a509560e1e45,True,Tests_passed,3d2386a845e132073aa35bbc589bc23f557f62b4a3f753c8ab3746cdc8325ed0,True,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,07c7b44947fe22b137a6090a70c4510439cfb6da1dd0965ec8abb25675224b75,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,21b45635b8f292576b725e53ea4b7ea7d856bb5508ce09ca56810d981aaeb962,Merge_timedout,,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,b319f9fc46ae7554ba667350227b2a00e864affb278eaa3c3ecc523969f12b2a,Merge_failed,2d5cee7f0bd78d1d054121f48489834f873329eed903e650e70edf1e542f9499,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,0.012881755828857422,0.013143539428710938,0.01459646224975586,0.01443791389465332,0.014513969421386719,0.014598846435546875,0.014631509780883789,0.10987305641174316,0.41577792167663574,2.680182695388794,-1.0,0.28348469734191895,0.16915321350097656,0.0857231616973877,0.08709263801574707,0.08667778968811035,0.08628082275390625,0.0857553482055664,0.21230530738830566,2.7882862091064453,0.08511996269226074,0.0842905044555664,0.07531237602233887,0.08544373512268066,0.07649421691894531 diff --git a/results/combined/merges_timed/jprante/elasticsearch-csv.csv b/results/combined/merges_timed/jprante/elasticsearch-csv.csv index 3197f7ebdb..44839a1f63 100644 --- a/results/combined/merges_timed/jprante/elasticsearch-csv.csv +++ b/results/combined/merges_timed/jprante/elasticsearch-csv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,a9ee7a06511f64b14b8c6dee08fe5f5849907926,f3ac07cb6f993e56be141dee1ee46036b7413b1e,e3eda9922e5f1698c37829530ca39e151c98f76c,,True,False,Tests_passed,4467b8d3d7eb88bce8a1391a53d70e1fb90d9e258eb03605d7762a7532ded7eb,True,5,7,11,3,True,Tests_passed,2315f7074a9a080560e77d53988006bb2f4ee1755762ab80e883725dff41725d,True,5,True,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,243ccd4aa5a664da7b80424fe45c0414097e06098e6f18dda0a9c595c711de67,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Tests_failed,0cd9aa627b1e691826f26d76de5f034861bf05785b427d1642a08b15b20565e9,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,e6f73d65451368d2b91af83b4e8c36dbbaf9c524190863d37b493c00d318731b,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,0.038675785064697266,0.036476850509643555,0.036406517028808594,0.03425908088684082,0.03826618194580078,0.03657817840576172,0.03289532661437988,0.22499799728393555,0.17392182350158691,0.5016427040100098,0.3531956672668457,0.10095763206481934,0.12012124061584473,0.040210723876953125,0.0396575927734375,0.03940939903259277,0.038141727447509766,0.039438724517822266,0.08722519874572754,0.5069682598114014,0.0386502742767334,0.040003299713134766,0.03051900863647461,0.04027056694030762,0.03065013885498047 diff --git a/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv b/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv index 652d3b8bd8..308ab3b1f7 100644 --- a/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv +++ b/results/combined/merges_timed/jqm4gwt/jqm4gwt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,284907eaffb2061f44cdc7ec3be5cb05209850c9,1b17ddfa476505081e744f1cb1f78cda70c9ceeb,2a44c1c8135d26511a30a1dab51c8c3d3d60a02d,,True,True,True,61,147,8302,2,True,61,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,True,Tests_passed,db043c9457a77ff6b119ec2cd8fc9c489df94721c82d8d0744fe28c460914676,True,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,d41468b842f272e98d531c973579f559f4e609f03f101eee874e398fb32750af,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_timedout,,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,661d83f1316957b4afed90c460475a9e4a012c483bfb9724823f2920ee90c83c,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,0.03400158882141113,0.037180423736572266,0.03887605667114258,0.05488181114196777,0.03706693649291992,0.0538640022277832,0.045958757400512695,0.160170316696167,0.11691474914550781,0.9762022495269775,-1.0,0.09636545181274414,0.1305382251739502,0.04836273193359375,0.05095529556274414,0.0494389533996582,0.038970947265625,0.048509836196899414,0.07221508026123047,0.982466459274292,0.04777693748474121,0.04024863243103027,0.04868364334106445,0.046654462814331055,0.0486910343170166 diff --git a/results/combined/merges_timed/jqno/equalsverifier.csv b/results/combined/merges_timed/jqno/equalsverifier.csv index 9b41a2eeee..1da69c91c8 100644 --- a/results/combined/merges_timed/jqno/equalsverifier.csv +++ b/results/combined/merges_timed/jqno/equalsverifier.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 173,refs/heads/main,df016c4c5b205bf4bf04d73a41a0e51adeff84b3,164ae921af8c96fb85642317a081b4c6552e0e75,6d6383193921b3deda63c5c8430b59dcdc6a5f54,,True,True,True,21,43,101,2,True,21,Tests_passed,71c6914be3e3140555433ca2d0acf85270cdb46fe6a7f41df206d87c8ecee5b8,True,Tests_passed,99921378ea305b2a22258bc89d12a83a2c2984224acc545ec253da48ee250312,True,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,77a46c3a55f273abc1a78abc5a4ff00149026987565e7b55bba8e5d7e72a03a5,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Tests_failed,e2869bcc2d62dd9a2840f62982c7ff5fe5f02a974c6fefb6a1757dfdab4a242e,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,3a717ec242511e46c27618c68d02dd37872c328e1e05ca69a00b0f3d2b38abf1,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,0.04820656776428223,0.04416179656982422,0.04273176193237305,0.0409541130065918,0.0398404598236084,0.049901723861694336,0.04004788398742676,0.2083449363708496,0.13154053688049316,0.4497849941253662,0.5039238929748535,0.12305688858032227,0.11980438232421875,0.03821301460266113,0.03869032859802246,0.03869009017944336,0.038431406021118164,0.0381467342376709,0.07121396064758301,0.4694337844848633,0.059725284576416016,0.06077933311462402,0.0644073486328125,0.059537649154663086,0.03690361976623535 diff --git a/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv b/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv index facf94553a..5dcbbd41aa 100644 --- a/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv +++ b/results/combined/merges_timed/jreijn/spring-comparing-template-engines.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 111,refs/remotes/origin/pull/64,89bd8bbc91c308af280811d25d63e2bfed0d2532,06eb1edc6811e45008478a8e30067f6e81621117,19ddeaa2c9d11e77d34ec03a255d8c3ae5c8697f,,True,True,True,17,51,368,9,True,19,Tests_passed,795512627562890affefee1d5722c1225b1dbe335e8787f4b328e1e61abe56a4,True,Tests_passed,cef906cd3b5033d6a8e803861d5d6282e3aaa188d35b66b5a3d6cb3de15b9c47,True,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,71aa85f2bb4bf235192ebd84e02448092005e519fb1396cf2fe03b120d2bb52f,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,c7c0c985c420e2d01590fcac07b00379fee2d05b51cb9b38b69b49593b2a4566,Merge_failed,4d64ef7697294fec60e297873d3ba98d92498e99a63f6eb04ed94b051b015066,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,e59f12226223423f0a09de72ab65bc1bf488f983979b4829664254d768809d82,Merge_failed,6831fd12a89ebbf97fcb963b845f0a713d0a12094d366bc86396644b4880e22b,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,0.010405302047729492,0.011107444763183594,0.010685920715332031,0.010344266891479492,0.011071443557739258,0.010680675506591797,0.010993719100952148,0.0959007740020752,0.3494868278503418,1.6301817893981934,0.2941310405731201,0.2285621166229248,0.14980101585388184,0.0643160343170166,0.06313705444335938,0.06480884552001953,0.06584858894348145,0.06398630142211914,0.17379260063171387,1.6682496070861816,0.0644221305847168,0.06459426879882812,0.0640115737915039,0.06496310234069824,0.06301259994506836 diff --git a/results/combined/merges_timed/jri/deepamehta.csv b/results/combined/merges_timed/jri/deepamehta.csv index 0e7ffea1ea..780e290096 100644 --- a/results/combined/merges_timed/jri/deepamehta.csv +++ b/results/combined/merges_timed/jri/deepamehta.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 146,refs/heads/master,8e1c2670375d00738f024274b7273c52ec05c81b,081caa387b5a62846c86ba006c384b5038d3df2e,6857101de9d5664d8ed44d682a083a6024b4961c,,True,True,True,124,280,5221,8,True,124,Tests_passed,e40e9f7721447e8fe18c7966e43127a17de520b10b36b8f779bd3bedf6c93068,True,Tests_passed,6145db7ebc4f6801ae76498d47ef2990563431fdcadacc6c38b064f02a6627ed,True,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,138847d9f2859546cf7ff5f11f5753c4c5f0f18aa5a51e970f825601c89303d5,Merge_failed,9fb5909a659f88b6c40044e51c15cf86d9e3d3c66175d57066f12817aa484003,Merge_failed,c4cc5696333344f15ff74329963f7923afd987edd8a2e76df889871042535964,Merge_failed,25fc0e6ceb7bc80a63a6483e739bc7a8d3c8037fd2bb52070304c1afc6e0dc96,Merge_failed,9fb5909a659f88b6c40044e51c15cf86d9e3d3c66175d57066f12817aa484003,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,164dbcd6bf314372386dea76772a2de4836235ca41ba4694b09a7728eb3f26e8,Merge_failed,5f3ed2d2c82b5f00529e5d3ffb896559c7612f3add791430df000e98731a8498,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,a328f98308f68a7d7b82214f89e3dcf342d96ef3c611298bd2dac98f9b1fbcf9,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,Merge_failed,c15660c48734eadaaa702af8eb668549554f963d8fab202614ea8dfb1247de36,0.04775428771972656,0.05586743354797363,0.06080126762390137,0.03938150405883789,0.04080510139465332,0.0436406135559082,0.0660088062286377,0.5792105197906494,0.4381988048553467,2.4923312664031982,1.3971412181854248,0.2820472717285156,0.18277382850646973,0.11130499839782715,0.11728811264038086,0.10066676139831543,0.09903573989868164,0.11974525451660156,0.24216842651367188,2.415858268737793,0.0978384017944336,0.0960080623626709,0.08785176277160645,0.114990234375,0.06847715377807617 diff --git a/results/combined/merges_timed/jruby/bytelist.csv b/results/combined/merges_timed/jruby/bytelist.csv index 47204525b2..d487bc991f 100644 --- a/results/combined/merges_timed/jruby/bytelist.csv +++ b/results/combined/merges_timed/jruby/bytelist.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,989a36efd082324597ae190e1be02e9c837967e3,df4f174f506935be80d1bc15c984ab09d011e6cd,eaf546b696f5fb1a31584305e7da2e9a9b683bf4,,True,False,Tests_passed,a1fd5a0ff5ccbf1339ab26a2440bec50e0e8fd8aeaf96159f9af84ac9198b135,True,3,12,106,3,True,Tests_passed,402174b94029655e07ba85f2ddd4c625384a6025571a187bb2482b128b02ab0d,True,3,True,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,0.04558539390563965,0.05162453651428223,0.05025839805603027,0.04525876045227051,0.052640676498413086,0.017968416213989258,0.017399072647094727,0.23881816864013672,0.16987347602844238,2.4577646255493164,0.4827122688293457,0.10397648811340332,0.13271212577819824,0.04818534851074219,0.048783302307128906,0.04834175109863281,0.04787421226501465,0.048992156982421875,0.09865212440490723,2.3456950187683105,0.04847359657287598,0.04833054542541504,0.029279708862304688,0.047667503356933594,0.030048847198486328 diff --git a/results/combined/merges_timed/jruby/jruby-parser.csv b/results/combined/merges_timed/jruby/jruby-parser.csv index 2a5279f0a1..217f2e7fb2 100644 --- a/results/combined/merges_timed/jruby/jruby-parser.csv +++ b/results/combined/merges_timed/jruby/jruby-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,e6dae92cd4c87841431cbdfeffa34a4e05f3a2d9,d4c91601649b26088348218596017088bd8f2c5e,9a27caa9a5e5d5075b0559e2b91a138dfcd941f9,,True,True,True,21.0,1295,20385.0,4,True,21,Tests_passed,846f17401eeb20b1d6f452673bf0951d791de9a16c7202ba3162259b93bb2b54,True,Tests_passed,eefd921b5a64084a7e2d5a003b87067fc7a1f9824536e01ff83ae4b6e487ee4d,True,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,9ecf08fc82252653f585599969c047199e75f0c030eb839c9b6633b80ef6d474,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,d658300fc7b58bdf1d633c5cdedaf15f02cd1bf830d2de170ef9ee3dd59a8c05,Merge_failed,91c0dbecd0ed90cec97b9dc113b377145e48dba8998df2d88a69e7fb245aadaf,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,52937b12238179b6b859e16db2810a3c5269d748373c3a8282011fc56869892d,Merge_failed,93e92c5d1dc136c8495be5464d26c3da89b0128dea619a1d8df5b316fac0b9bf,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,0.03134274482727051,0.020692825317382812,0.0355219841003418,0.020848751068115234,0.03538823127746582,0.02114105224609375,0.03534054756164551,0.09032940864562988,0.20423102378845215,2.8125481605529785,4.077862024307251,0.16275286674499512,0.1822514533996582,0.06943917274475098,0.084228515625,0.07960176467895508,0.06985974311828613,0.08945655822753906,0.1328420639038086,2.9500622749328613,0.07839536666870117,0.08375382423400879,0.0698401927947998,0.08358168601989746,0.08044695854187012 diff --git a/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv b/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv index 53d51b1c58..43bbdbfbce 100644 --- a/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv +++ b/results/combined/merges_timed/jsamoocha/linksalienceclassification.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,7aff5753c70fc8c52cdc949c2a2712dd90bdc30c,c57810b5c2d6e64a483f71582aa75ebbdc808ee7,a30776ffccfaeae3ea3e92cd1e85b030304a4b89,,True,True,Tests_passed,65eeae439dd016b1e096416d37fef772dd9363c89b646b61dfc70ecf31a6f429,True,9,42,789,6,True,Tests_passed,0e646ce98ce0f8d059d21cb0609a0324e76acf1cfc0cf1fe5538d6dd47849ab9,True,9,True,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,71f500592d2b0a929b651e826f89c8af3080cd4a54052ef183d232eab1fa45d1,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Tests_failed,c9075f80d2b6cee4662a56b4b321a8b122466e94d15c0ba577d6e652d1cad57a,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,292e03c09ae1f197b391dcd221859758bae1bbd0080d9804c0699af7b5076f4d,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,0.04422640800476074,0.009732961654663086,0.04170942306518555,0.04268765449523926,0.042290687561035156,0.04277753829956055,0.04006481170654297,0.4219505786895752,0.3519744873046875,3.425719976425171,1.1271915435791016,0.18804168701171875,0.13922381401062012,0.06091737747192383,0.06087899208068848,0.060669660568237305,0.06126880645751953,0.0613863468170166,0.15455055236816406,3.349485397338867,0.06140589714050293,0.06106901168823242,0.05363154411315918,0.06236863136291504,0.05337047576904297 diff --git a/results/combined/merges_timed/jsevellec/cassandra-unit.csv b/results/combined/merges_timed/jsevellec/cassandra-unit.csv index d66928a7cf..04a4d1a7bc 100644 --- a/results/combined/merges_timed/jsevellec/cassandra-unit.csv +++ b/results/combined/merges_timed/jsevellec/cassandra-unit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,4e87b46fe206e0acf5cdbd1e8c396be97410a5e4,21dc8a443a78021e0f1afebd4712cfed6ed3fce0,5ffd14659e8a2eee622f785997e0d00f7d7e318f,,True,True,True,16,36,204,5,True,18,Tests_passed,cbf4ccd08becc192d1154c54b7cb6f4e2e21b3afa66d6516f70dd17608f8c506,True,Tests_passed,60609d824ecb7c1930d6b261a2aff92dddd323a9c89ea03134b55fec87066322,True,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,517120c2e25693075c1e82c3826d85bf9d7951eac716b14b683ac7a54f9c39d3,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Tests_failed,31287108455bc5efe8dc3deed33f513b16f1186d18f9d117be7063516bdc9af0,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,b2291e333cd972e3a4ce68941df782b352d66dfe0b4c5f89b97976f579fde846,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,0.01556849479675293,0.015508890151977539,0.016070842742919922,0.016599655151367188,0.01655101776123047,0.016603946685791016,0.016771554946899414,0.056877851486206055,0.13570380210876465,1.480252742767334,0.49051833152770996,0.1231222152709961,0.14014101028442383,0.05207467079162598,0.05381655693054199,0.0542755126953125,0.0439760684967041,0.052516937255859375,0.1024482250213623,1.5250499248504639,0.05310201644897461,0.050733089447021484,0.05217933654785156,0.044277191162109375,0.0516815185546875 diff --git a/results/combined/merges_timed/jsimone/webapp-runner.csv b/results/combined/merges_timed/jsimone/webapp-runner.csv index 84f6587592..5e6bfa5750 100644 --- a/results/combined/merges_timed/jsimone/webapp-runner.csv +++ b/results/combined/merges_timed/jsimone/webapp-runner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 120,refs/remotes/origin/pull/231,42bbf1f732331ba7731f6916a307666cef6855b6,0d080041b57c0e9bcf13c4b62291f32390fcf3e1,d9b047d5fb94f24dbefaebb8e79f5deb50fbf87c,,True,True,True,11,17,45,2,True,11,Tests_passed,932d81d4482640dffe55460c32a434e9013a6d06dac447c426d575a40651e895,True,Tests_passed,0bcc2ec94937f427a6e88bdd758610d739c7a97898281593e3fd25d940c7b668,True,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,0.010222196578979492,0.01038503646850586,0.01084446907043457,0.01065206527709961,0.010523796081542969,0.010411500930786133,0.010351419448852539,0.0345308780670166,0.06463837623596191,0.6002953052520752,0.31702756881713867,0.07282829284667969,0.13392400741577148,0.04286003112792969,0.042896270751953125,0.04327893257141113,0.04206681251525879,0.04299283027648926,0.07491254806518555,0.648017406463623,0.04122805595397949,0.04262685775756836,0.031198501586914062,0.04137706756591797,0.03133678436279297 diff --git a/results/combined/merges_timed/jsprit/jsprit.csv b/results/combined/merges_timed/jsprit/jsprit.csv index 63dabde429..f9586ff022 100644 --- a/results/combined/merges_timed/jsprit/jsprit.csv +++ b/results/combined/merges_timed/jsprit/jsprit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 197,refs/heads/master,b37ab653e14739da40750049dc273e58dc19214b,1563610bb01dc5bb2df8d3e6ab0d58042c83a459,e8d3bd03ea9bb5464c7a2fecb6cd634994216861,,True,True,True,19,53,616,2,True,19,Tests_passed,15d346de70e16c72312acb27a84f0a81ffe8dd5d066f08bcfdcdb890b981f2aa,True,Tests_passed,493f96a63746e68da33e93521ace9eea7ed25c1808b608a7a2657d42cc83e810,True,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,d17a80a2596c4e3a1793d634dc5ced71437b6f6c2a432d84f072bae0f74722e7,Tests_passed,7834a9970414b72bf3e01c199b828f8a5f3cd020e8b991f4dab3409d654a9a6f,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,d17a80a2596c4e3a1793d634dc5ced71437b6f6c2a432d84f072bae0f74722e7,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,c73f5adad61f322ae680876ea1219b39dc3f6e6ac68e11a5f0203904ffe3b0fc,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,Tests_passed,493e30f3bf533c0a66fb8fff6400ac02b5fa38b31d9a48c3d1c51b650f856746,0.012320518493652344,0.013096332550048828,0.012836933135986328,0.013158798217773438,0.01344442367553711,0.013296127319335938,0.012860774993896484,0.05891251564025879,0.06827139854431152,1.3614187240600586,1.2351739406585693,0.08129429817199707,0.134674072265625,0.04709792137145996,0.04864358901977539,0.0460965633392334,0.04745674133300781,0.047261714935302734,0.08350610733032227,1.389918327331543,0.046957969665527344,0.04680895805358887,0.03482317924499512,0.04537534713745117,0.03466486930847168 diff --git a/results/combined/merges_timed/jtablesaw/tablesaw.csv b/results/combined/merges_timed/jtablesaw/tablesaw.csv index 896a6fb050..4ca57bc084 100644 --- a/results/combined/merges_timed/jtablesaw/tablesaw.csv +++ b/results/combined/merges_timed/jtablesaw/tablesaw.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,9a8d74b1e71927ad96aa3252b792349a2133ea9d7be46479383901610470d286,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,994ba1d592b833cab4ff219b3d1b9073dcfe2162f48c9a414ee984319d96f02b,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,0.047406911849975586,0.04673051834106445,0.059993743896484375,0.04569530487060547,0.05324506759643555,0.041567325592041016,0.046312570571899414,0.28206706047058105,0.18375468254089355,1.5412635803222656,0.7304198741912842,0.10719704627990723,0.12874579429626465,0.0538020133972168,0.052847862243652344,0.052941083908081055,0.05270504951477051,0.05241084098815918,0.10173511505126953,1.4857761859893799,0.04794931411743164,0.05220794677734375,0.044225215911865234,0.052091121673583984,0.043421268463134766 diff --git a/results/combined/merges_timed/julianhyde/linq4j.csv b/results/combined/merges_timed/julianhyde/linq4j.csv index ca082a8d88..28fa69fffc 100644 --- a/results/combined/merges_timed/julianhyde/linq4j.csv +++ b/results/combined/merges_timed/julianhyde/linq4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/remotes/origin/pull/26,1f0e4d05f133cbc901e299ae795a86ed47f2425e,a73878006c809f7313e7767d24de9c6cc5ad3102,bd8899bc2485e6fb666ec9bf23c892898e523e2d,,True,False,Tests_passed,0b0419eceb563e5df39abfbdfb2c43c7855b8079fb926f52359bea37803eb7cd,True,3,3,44,2,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,True,3,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_failed,6ee28f8c010b3b77f16cf166c190281cfaca1659bcf29682dae865340366b6e7,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,0.038027286529541016,0.04677748680114746,0.04836750030517578,0.02844548225402832,0.02777886390686035,0.031162500381469727,0.028319358825683594,0.058786630630493164,0.07910275459289551,0.02991199493408203,0.6774258613586426,0.1056058406829834,0.15523481369018555,0.07185506820678711,0.0722799301147461,0.07371950149536133,0.07407474517822266,0.07296514511108398,0.1160423755645752,0.08517718315124512,0.06786131858825684,0.06449341773986816,0.0606689453125,0.04188680648803711,0.05704236030578613 diff --git a/results/combined/merges_timed/julianhyde/sqlline.csv b/results/combined/merges_timed/julianhyde/sqlline.csv index 5fd336b523..e5a7032918 100644 --- a/results/combined/merges_timed/julianhyde/sqlline.csv +++ b/results/combined/merges_timed/julianhyde/sqlline.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/main,e9e0b9762242feacadca1c39e4d933b69ff39431,9ba222142dfd5bbbf5b051e69f6bc8a779b66d39,52d0509ec2f68c2bef42e4241cd43075dc95e900,,True,True,Tests_passed,a7360af2df7f3c7706cbaa67897145f1aefa1f30b3ad36854cbdce95b4b1b4f9,True,12,306,1318,4,True,Tests_passed,4cda574ad110b9c9eeaf097ac7c28d131488af3fd1cd2243f5a85c759eac682d,True,12,True,Tests_timedout,3ac5aeb226ee01352f3d759e9afade5000c250213581b6767fe19cca8896b60e,0.05740642547607422,0.054050445556640625,0.04953336715698242,0.05985116958618164,0.06862950325012207,0.04510927200317383,0.05371665954589844,0.3268303871154785,0.2314438819885254,5.872184991836548,3.863356590270996,0.13971662521362305,0.15267610549926758,0.06347846984863281,0.0667717456817627,0.06349444389343262,0.06415796279907227,0.0626065731048584,0.1338059902191162,5.796978235244751,0.06194615364074707,0.0617985725402832,0.036394596099853516,0.06311917304992676,0.0362696647644043 diff --git a/results/combined/merges_timed/julietkilo/canbabel.csv b/results/combined/merges_timed/julietkilo/canbabel.csv index aae8bfaa27..bfe4ae38cd 100644 --- a/results/combined/merges_timed/julietkilo/canbabel.csv +++ b/results/combined/merges_timed/julietkilo/canbabel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,a2e8646cdce41a58d12879911e6ea6a836dfe7dd,c83fd7d51d708756fcad1c9f80b1cc9546d89a9d,e18507fe9f70894cfd25ee4a4f71fbd6b94a3e4e,,True,True,True,2,32,88,2,True,2,Tests_passed,cd40bf207daab30f267b0725bb715567c796ae040fdee3260ad0c97f9e719f12,True,Tests_passed,c0e502b69441fc741592da3227fbeafebfdb0f0b67a064ff4104aa7bb2ec2b64,True,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,15ff0358b749231b7c077c1cfb879a8dcee9dffa6219b9f09edf6b73e9180e56,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,ea991f55ba8102f24fa1b50be19ee86e1be259510bbd5d9c5a7b552e6828b4b3,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,a0eb64c72254a063765ee60191d7e0032a57b972664cd3d19988bbc700d13a88,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,0.03681063652038574,0.05355405807495117,0.03107619285583496,0.050905704498291016,0.03315472602844238,0.03805351257324219,0.046813011169433594,0.142195463180542,0.12589597702026367,1.6158621311187744,0.3885471820831299,0.07906365394592285,0.11341023445129395,0.03543710708618164,0.04316210746765137,0.03610348701477051,0.03582620620727539,0.036331892013549805,0.06675434112548828,1.497016429901123,0.038202762603759766,0.04236793518066406,0.034525156021118164,0.03631091117858887,0.03398537635803223 diff --git a/results/combined/merges_timed/juniper/netconf-java.csv b/results/combined/merges_timed/juniper/netconf-java.csv index 449f1ac8d1..420a67b0d5 100644 --- a/results/combined/merges_timed/juniper/netconf-java.csv +++ b/results/combined/merges_timed/juniper/netconf-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,5720d527507c33e5fede2e542dc3d892eb780b5d,0e040c0dd0dde2bc26652a774d965e515f83ff08,ce3d27ffc4c1ad65dae9805d471e1af785361e6a,,True,True,Tests_passed,2357e7e485918b27fd314cf0c1b36bffbb75b2c7a987a2c8e11a6ae0d59d1409,True,23,133,2132,7,True,Tests_passed,44ddf35bea8f92693dd7c85b73685001755c0815a964b89dd7faa7a1bb424291,True,24,True,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,a4fc21cf1377b6a54c1fc9d7f2ba7fc8e0518eba9772ec10d8c10e67db3439b1,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,9e03107636458ee4f883af10d169404b3da58853a5102231da0bcf9ad01fb294,Merge_failed,24340c82ffb0826329c89e1d9b9d1cfdcdddb51e1f847d5c92f57a930fd79e00,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,ae56b065f2dcb5d4e63cc02cf1f98e0f405605b88623fba7a6e7d9df2a738ec1,Merge_failed,c89731a101e850349cec848f2d4bd8b3707ead477052478a94ee9a37f6b34cb5,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,0.044814109802246094,0.0532529354095459,0.0481724739074707,0.04156160354614258,0.02827596664428711,0.048272132873535156,0.042092323303222656,0.41298985481262207,0.36112213134765625,1.79482102394104,0.758887767791748,0.20316386222839355,0.15376925468444824,0.07350587844848633,0.0732259750366211,0.07447290420532227,0.07214474678039551,0.07149672508239746,0.17054390907287598,1.764528751373291,0.072174072265625,0.07249045372009277,0.0646827220916748,0.07407307624816895,0.06508421897888184 diff --git a/results/combined/merges_timed/junit-team/junit.csv b/results/combined/merges_timed/junit-team/junit.csv index f9fade7ca3..96ad7693fb 100644 --- a/results/combined/merges_timed/junit-team/junit.csv +++ b/results/combined/merges_timed/junit-team/junit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,True,True,True,161.0,760,7530.0,2,True,161,Tests_passed,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,True,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,True,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,0.021502017974853516,0.032659292221069336,0.027190685272216797,0.044492483139038086,0.026671409606933594,0.04411482810974121,0.02713179588317871,0.07972455024719238,0.08781552314758301,0.03519558906555176,2.123708724975586,0.10152649879455566,0.16776299476623535,0.07145404815673828,0.07579421997070312,0.07304930686950684,0.07320737838745117,0.07600665092468262,0.1117854118347168,0.0835576057434082,0.06432771682739258,0.06777071952819824,0.060115814208984375,0.06473445892333984,0.06049537658691406 diff --git a/results/combined/merges_timed/junit-team/junit4.csv b/results/combined/merges_timed/junit-team/junit4.csv index deb9b2de66..43f7b2408e 100644 --- a/results/combined/merges_timed/junit-team/junit4.csv +++ b/results/combined/merges_timed/junit-team/junit4.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 420,refs/remotes/origin/pull/1130,6e38776326e9a68beb47e8ea491eef4761be511f,8390bc7383758ba04c35477b8bff540d9a2880ca,c85c6147ada5ad1afdd3be10769670d309730132,,True,True,Tests_passed,d3d2adef032447722ac12f07f92c3767ca561adb93c61d0211416357a9400b32,True,196,721,5889.0,7,True,Tests_passed,2825855b413abffc23aefafbd4c1d047e7b3034d6513be71af4cd6168acf35e3,True,197,True,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,580f0af905537304534237c259d7a9430e823490d63c21b57f497035286a86c2,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,e1f8ff23eebc1c8fa30e798ddc39a61ed9c0713888085a4f6b4193f567f5b5f0,Tests_failed,2d0532130c50c50dec9453bdf10b5846b26d6d01ea2410050d983ceadea7e221,Merge_failed,90e94c37b9df9ecade856a94915094a5be184b647f925e48880b0ff5ea529171,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,0ed8167ffc5211cadc0fb693d4a2f18a995f3a7aa27ffa82283e1ce202a53db7,Tests_passed,d13426bb01dacb71c8125726e5f80873eb582cf85843a65bc676447d2b0ff92d,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,Merge_failed,bbb3319ab75f49dc5520086bafbef72bd6979dc2e011a6c848e6a6ce906e59e5,0.04582786560058594,0.05977988243103027,0.05821967124938965,0.0646817684173584,0.058869361877441406,0.0662686824798584,0.06243443489074707,0.41800689697265625,0.3407559394836426,0.05164170265197754,1.7677335739135742,0.25486254692077637,0.19221735000610352,0.10485243797302246,0.10423707962036133,0.10125946998596191,0.10348010063171387,0.1027684211730957,0.2102348804473877,3.1645026206970215,0.10013341903686523,0.09559035301208496,0.07131099700927734,0.09394359588623047,0.07262635231018066 diff --git a/results/combined/merges_timed/jutzig/github-release-plugin.csv b/results/combined/merges_timed/jutzig/github-release-plugin.csv index 4666af3443..8fa108cb73 100644 --- a/results/combined/merges_timed/jutzig/github-release-plugin.csv +++ b/results/combined/merges_timed/jutzig/github-release-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,e68bccd8f307a6abd453e6de7be20c006516a3f4,8293177f3f8591785bf72e75cd78cfe38c84b8e4,b1a086f4016d3c53737122237c5def5c8982d518,,True,True,Tests_passed,b689f7ad5a0f965a97609704c06c2f1c7fe3e819716ddac4adc7f190041a3e86,True,14,66,371,2,True,Tests_passed,5a68158ee371555777cb33529794e2d724df9113d1584bd5b13540daea9160e7,True,14,True,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,0.04489016532897949,0.04491686820983887,0.04454350471496582,0.03685283660888672,0.04581022262573242,0.04670882225036621,0.04024147987365723,0.1550288200378418,0.10662531852722168,0.9208190441131592,0.28969407081604004,0.06852269172668457,0.1244504451751709,0.03975248336791992,0.039810895919799805,0.03940558433532715,0.038603782653808594,0.03907895088195801,0.0714728832244873,0.888843297958374,0.039467811584472656,0.039250850677490234,0.028474807739257812,0.039183616638183594,0.027907371520996094 diff --git a/results/combined/merges_timed/jvirtanen/nassau.csv b/results/combined/merges_timed/jvirtanen/nassau.csv index 5187903363..8595708231 100644 --- a/results/combined/merges_timed/jvirtanen/nassau.csv +++ b/results/combined/merges_timed/jvirtanen/nassau.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 97,refs/heads/main,77574c064155c1f9245f5dda74c0531bedc81c9e,622becedb08bc5254885f3738ca1914afee77fb6,741fae1ea49f571984a43ba789d66ba24995834d,,True,False,True,8,38,153,2,True,8,Tests_passed,d53abedc98a5c4cb6acea97901c01ede9ec78765668036290e705297b0d98326,True,Tests_passed,c8a5f4251ebbf76c089fd51678952e14f8df02fb5045e980e3738b14cc8557fa,True,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,0.011818885803222656,0.04788398742675781,0.013486146926879883,0.03867053985595703,0.04151511192321777,0.04494619369506836,0.046680450439453125,0.17043089866638184,0.10784029960632324,0.8042066097259521,0.47995853424072266,0.07657432556152344,0.1321706771850586,0.04535222053527832,0.04569721221923828,0.04393315315246582,0.044490814208984375,0.04550981521606445,0.07847309112548828,0.7645916938781738,0.04313182830810547,0.04366421699523926,0.03376436233520508,0.044526100158691406,0.03398013114929199 diff --git a/results/combined/merges_timed/jvirtanen/parity.csv b/results/combined/merges_timed/jvirtanen/parity.csv index 025ca76bf8..576e6ff177 100644 --- a/results/combined/merges_timed/jvirtanen/parity.csv +++ b/results/combined/merges_timed/jvirtanen/parity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,a3aaadfbec54010fd2916804a872f09579f7b0fb,672528d11cccbec6b2a28efb6c8c8d14a1dd0c4f,07a94a059dc097c54a3b78bbfc97fba33c3aeda9,,True,True,True,7,8,20,2,True,7,Tests_passed,4520e13fefbf1431ffa2f3d753542e19277f1c1b216b07636f947cb76f1f24c2,True,Tests_passed,fb40cce2a40a80875af2797b4d65399d10b4410faa8bc89a49513f83b67af023,True,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,0.044388532638549805,0.05256080627441406,0.04267406463623047,0.039830684661865234,0.04100441932678223,0.04860520362854004,0.0402677059173584,0.18320155143737793,0.10764193534851074,0.6150739192962646,0.36090946197509766,0.07979893684387207,0.13935351371765137,0.051666975021362305,0.04958987236022949,0.05077004432678223,0.05113625526428223,0.04994344711303711,0.08295750617980957,0.625629186630249,0.04914498329162598,0.04701375961303711,0.03822779655456543,0.0477142333984375,0.038669586181640625 diff --git a/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv b/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv index a2d28db9a7..eadde6e77e 100644 --- a/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv +++ b/results/combined/merges_timed/jvm-profiling-tools/async-profiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,True,49,237,1437,3,True,49,Tests_passed,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,True,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,True,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,8ddbcc49be31a669686a507c73d8af1cbf9185f76e2798a8941c1f98fd97df01,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Tests_passed,bb5b17759acc5b57443340fcefa6fab2840a0f0c560772f245f2b2053d1c2a5a,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,772b8aab8c53f5cb9fce9e9dc14ee210e72bcd20fbab81789b9280a4b3b24474,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,0.054670095443725586,0.07010650634765625,0.041452646255493164,0.07022666931152344,0.04964423179626465,0.044382572174072266,0.07164216041564941,0.228529691696167,0.19338178634643555,0.07060837745666504,0.5496666431427002,0.11322927474975586,0.1471118927001953,0.0584416389465332,0.05875253677368164,0.05917096138000488,0.05619025230407715,0.05706954002380371,0.10494089126586914,0.07248544692993164,0.058641672134399414,0.05687355995178223,0.04880952835083008,0.0565335750579834,0.05016040802001953 diff --git a/results/combined/merges_timed/jwcarman/wicketopia.csv b/results/combined/merges_timed/jwcarman/wicketopia.csv index 275f95fafe..ee705ab8b7 100644 --- a/results/combined/merges_timed/jwcarman/wicketopia.csv +++ b/results/combined/merges_timed/jwcarman/wicketopia.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,65dc57a69735d064d0c1c05fa67493b94c05b159,e32b5746cff9606ca0d26560dc48dddbadcf797f,e03bd261c14b567655c0408f25e9849ba93d7126,,True,True,True,101,223,2678,10,True,101,Tests_passed,c6a9890728b360c23a505bcede16723ffefb09dc4b37f50d64d1aa03387ec971,True,Tests_passed,49252840affa51ac739ae2f9abaf66f7e1c8aaf9e8e1737d7d102ac4c3ed8dc7,True,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,a50b36544c14718be3a34fa83ed28eccc09b3baf298153f90ee6f03db453c4ea,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Tests_failed,8d49a54e1c831f1338344ec1982aee661b6d5b60dd2f5261a374bc488e097918,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ede69e17cbe41cbe98a308e59b9a1bd6630e2ddefb99a7458b43d2977eb0579d,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,0.01935744285583496,0.019680023193359375,0.021474838256835938,0.021548986434936523,0.02164316177368164,0.021464824676513672,0.021564960479736328,0.15068888664245605,0.5140745639801025,3.9403882026672363,0.7985849380493164,0.33025646209716797,0.19733786582946777,0.10956740379333496,0.10761499404907227,0.11004972457885742,0.10825514793395996,0.1107492446899414,0.2652299404144287,4.148350954055786,0.10770773887634277,0.107666015625,0.07015371322631836,0.10670065879821777,0.06968498229980469 diff --git a/results/combined/merges_timed/jwtk/jjwt.csv b/results/combined/merges_timed/jwtk/jjwt.csv index c1178c97a2..4c4f601f03 100644 --- a/results/combined/merges_timed/jwtk/jjwt.csv +++ b/results/combined/merges_timed/jwtk/jjwt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 142,refs/remotes/origin/pull/293,b864f8820383baf76060579d3a2e9087ecc6eee3,b54c0904f3051c8c6729dd051a7d38ad35fa8e7b,44faaca42205b99503e3d500a7ce3a82d4115819,,True,True,Tests_passed,07589569207f93e850db0472a25d3d4e84b4e424a820c9ccbbf79452faef8548,True,15,38,127,3,True,Tests_passed,ff0addc40e3f4c1f7aece1a35011b8880f11e3128e7f817f131549fa7e939d0b,True,15,True,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,a47bf405109441487a736cd5f2e327f39304e016d6ac9e12763718722cb1d948,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Tests_failed,749ae8e0a2744e51acf85359d1c53f4dda810039fdc0f73f97952396cff2ebf4,Tests_passed,69bf0e81402f39527431499dbd9ac22b8472c1f22de9d0ec6fe528d8ced53d90,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,a95cb5598b3b18d1a77f63290a230580205b9c5c1a0e313ab7d369c98ea4c044,Merge_failed,18abc0cbefa19b15b688df2b1b4530c46cae0b15284546ea49d15b481a498951,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,Merge_failed,99c03178fa6357543ee7ce37b2e7dafcbc3b2cd222f4e29d25e9b5090b2b3651,0.0465388298034668,0.045534372329711914,0.03653836250305176,0.05128359794616699,0.04006600379943848,0.04875946044921875,0.05227494239807129,0.23126626014709473,0.17490625381469727,1.0916435718536377,0.4346957206726074,0.1157064437866211,0.1328725814819336,0.050894737243652344,0.04872870445251465,0.050455331802368164,0.051389217376708984,0.04977822303771973,0.1011667251586914,1.0632314682006836,0.04974222183227539,0.048769235610961914,0.04218554496765137,0.04909539222717285,0.04094862937927246 diff --git a/results/combined/merges_timed/k3po/k3po.csv b/results/combined/merges_timed/k3po/k3po.csv index 27629e30e1..b848dba431 100644 --- a/results/combined/merges_timed/k3po/k3po.csv +++ b/results/combined/merges_timed/k3po/k3po.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,True,302,462,6610.0,4,True,303,Tests_passed,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,True,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,True,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,409a1af93b7cc0f1cdf3651589770c65bb4097eb4326129f67cf63714b586317,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,db872b74bd57ccaf2aa4cc40fd12f11025fec968836318b5265ebf08c0ea9a2a,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,4980dea20993db9ef39accb3edb80ac7ffabddba2472205805ab442a4d32e5ea,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,0.032744646072387695,0.0330965518951416,0.038622379302978516,0.03900408744812012,0.038626670837402344,0.040332794189453125,0.04014086723327637,0.10226273536682129,0.1527552604675293,2.2722971439361572,1.5751469135284424,0.14409852027893066,0.1707758903503418,0.08220219612121582,0.08136129379272461,0.08395624160766602,0.0845181941986084,0.08436846733093262,0.14106249809265137,2.0339956283569336,0.07744026184082031,0.0775899887084961,0.06624603271484375,0.07769441604614258,0.06685805320739746 diff --git a/results/combined/merges_timed/kaazing/k3po.csv b/results/combined/merges_timed/kaazing/k3po.csv index 2224979c44..2b69149477 100644 --- a/results/combined/merges_timed/kaazing/k3po.csv +++ b/results/combined/merges_timed/kaazing/k3po.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,0.07533717155456543,0.06656217575073242,0.05661273002624512,0.08838915824890137,0.0826873779296875,0.0925440788269043,0.07110738754272461,0.2123734951019287,0.13862895965576172,1.2090485095977783,0.7092869281768799,0.10667276382446289,0.17907309532165527,0.07657456398010254,0.07952761650085449,0.07433533668518066,0.07656645774841309,0.07607460021972656,0.12350916862487793,1.1490552425384521,0.06989574432373047,0.07321476936340332,0.06104850769042969,0.07089948654174805,0.0630643367767334 diff --git a/results/combined/merges_timed/kaazing/robot.csv b/results/combined/merges_timed/kaazing/robot.csv index cb4febd2e6..1f8e2bedd8 100644 --- a/results/combined/merges_timed/kaazing/robot.csv +++ b/results/combined/merges_timed/kaazing/robot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 505,refs/heads/develop,808d53cfd9e2f32e8383d4fe75f1d318792e8946,f54336847d0ba80550133d5a8b52c9e9d76cba1a,89d18e796820e9dcfe222a71694b350a4faf984a,,True,True,True,302,462,6610.0,4,True,303,Tests_passed,2bd0a9318af86957f77ab187774f8d7c9c8193f8f291019ca94ffa1922ea0939,True,Tests_passed,11a0d3a1c3f8a019e803d5b454d53d983ef8a77e869176a3b80a48a0b6fc0688,True,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,409a1af93b7cc0f1cdf3651589770c65bb4097eb4326129f67cf63714b586317,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Tests_failed,0fb827ac8933363744779dd6ad1c4ff37ffbc5cd305640e7d3919667e8063d92,Merge_failed,01f1e9c971195e91aec9421d444a58579e3179bb93f3954a5552ba6af58e18b3,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,658e327ace98a285aa720a979a70a7e82b58ae19a422e66dd252cbe30d338c33,Merge_failed,8374dcc5b817903f9315f75fe45d29c32f59c64338a0623ceca2c568ce9fb5cc,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,Merge_failed,1afb7c8c84dbb034e4282e2d764c8cf82bd88b6b7f6368bfe0b9102f12249e26,0.06378507614135742,0.07155227661132812,0.06244325637817383,0.07710433006286621,0.07654452323913574,0.0789484977722168,0.06476449966430664,0.2720298767089844,0.20291852951049805,2.176095962524414,1.6082603931427002,0.14006280899047852,0.16248512268066406,0.08161187171936035,0.08301854133605957,0.08407282829284668,0.08345174789428711,0.08333563804626465,0.14081907272338867,2.0611956119537354,0.07931971549987793,0.07932901382446289,0.06725001335144043,0.07624316215515137,0.06467199325561523 diff --git a/results/combined/merges_timed/kamranzafar/jtar.csv b/results/combined/merges_timed/kamranzafar/jtar.csv index 8b28488889..dc0da81a4a 100644 --- a/results/combined/merges_timed/kamranzafar/jtar.csv +++ b/results/combined/merges_timed/kamranzafar/jtar.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,8f25838636b85d3c504ec732e04258c61682b3cd,59e3f7a525ada0fc1e62e05de795e57762bcf5fb,46a20204bcb3c16a94371f21f919c2717274cc61,,True,True,Tests_passed,a841de0c6da0effa57a921b792091f28f9e794e2e69bf3d2b078269544f9dacd,True,8,15,145,2,True,Tests_passed,90c835d4115c583e0e1ddd6615c5f7adb16378073f8a5272fbbbbee1fd0017bf,True,8,True,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_failed,4971d188b11a7f8b78810fef00298f252bf844006055565f1c50c661f1c480cd,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,0.043473243713378906,0.039542198181152344,0.04155421257019043,0.03724074363708496,0.04285478591918945,0.040624380111694336,0.043633460998535156,0.16862058639526367,0.10727953910827637,0.7597222328186035,0.4405651092529297,0.0683741569519043,0.12292718887329102,0.03732466697692871,0.037682294845581055,0.03665733337402344,0.038064002990722656,0.036850690841674805,0.06921005249023438,0.7390258312225342,0.03784966468811035,0.037180185317993164,0.026882410049438477,0.03689432144165039,0.025989055633544922 diff --git a/results/combined/merges_timed/kantega/pdf-converter.csv b/results/combined/merges_timed/kantega/pdf-converter.csv index 61880e76a6..69e8a43c5f 100644 --- a/results/combined/merges_timed/kantega/pdf-converter.csv +++ b/results/combined/merges_timed/kantega/pdf-converter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,True,36,44,655,2,True,36,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,0.014321565628051758,0.08748602867126465,0.12498259544372559,0.12481904029846191,0.11461663246154785,0.10553407669067383,0.12337636947631836,0.18778014183044434,0.14156818389892578,0.6311066150665283,0.4703812599182129,0.26078248023986816,0.234022855758667,0.21128463745117188,0.22806358337402344,0.2318868637084961,0.22811079025268555,0.23124098777770996,0.2395164966583252,0.741722583770752,0.05276155471801758,0.18879055976867676,0.20306682586669922,0.20418000221252441,0.2085413932800293 diff --git a/results/combined/merges_timed/kawasima/websocket-classloader.csv b/results/combined/merges_timed/kawasima/websocket-classloader.csv index 602f1dbbec..a3c57b0400 100644 --- a/results/combined/merges_timed/kawasima/websocket-classloader.csv +++ b/results/combined/merges_timed/kawasima/websocket-classloader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,88366037a581c46cd8de7463b50d29713e2e5c5b,f482eb2bfc2a6a85243adf7e4eaa77d918493868,685399d19d8c960926a6518f0fa8f76091034add,,True,True,True,23,92,1005,2,True,23,Tests_passed,a8a898766af5f842af256558889e192aeee5b0c52bb571507bd3ba056d1df960,True,Tests_passed,f277f6168d47d1e1f8565f5be25621c158b26d37927dbda02d25ce03e84b74f1,True,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,0.008466005325317383,0.008407354354858398,0.009088993072509766,0.00881338119506836,0.008812189102172852,0.009439945220947266,0.009013652801513672,0.03141355514526367,0.06344866752624512,0.6032860279083252,0.4755721092224121,0.0695493221282959,0.11994624137878418,0.03870201110839844,0.03883957862854004,0.037689208984375,0.038973331451416016,0.038263797760009766,0.06937742233276367,0.5986514091491699,0.03740811347961426,0.03840351104736328,0.02722477912902832,0.03862595558166504,0.02729201316833496 diff --git a/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv b/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv index d7dacfce78..bad1cfc88a 100644 --- a/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv +++ b/results/combined/merges_timed/kbnlresearch/europeananp-ner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,62d7c2a50fc75040d093e8f6ecc592fce3988da8,43a2d582de17af1c2e128a66ef40cb346e70ce9d,bab2b3182532ccf3cc63df5a00b6bdf47a72b630,,True,True,Tests_passed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,True,27,52,1060,2,True,Tests_passed,43bd862d980231f4c820a811ee7bc2ad999cb13a1a3fbe6555255bc0dbc58975,True,27,True,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,0.04481172561645508,0.0436863899230957,0.04800128936767578,0.04707765579223633,0.049552202224731445,0.0534818172454834,0.04863238334655762,0.13271784782409668,0.044382333755493164,0.04457688331604004,0.7037014961242676,0.0370023250579834,0.10999774932861328,0.0315854549407959,0.03252077102661133,0.03287315368652344,0.03235054016113281,0.03208279609680176,0.054624080657958984,0.04200148582458496,0.030462980270385742,0.02992081642150879,0.026892423629760742,0.029638051986694336,0.027337312698364258 diff --git a/results/combined/merges_timed/keedio/flume-ftp-source.csv b/results/combined/merges_timed/keedio/flume-ftp-source.csv index 23a669256b..8b9bb4c687 100644 --- a/results/combined/merges_timed/keedio/flume-ftp-source.csv +++ b/results/combined/merges_timed/keedio/flume-ftp-source.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,c42d3461244d422f2622e4ab91f6af09ac6c03a71711a25f488113e365d06619,Merge_failed,f4a5f74be4c1c3d51605f780b6600b6a31eb91a0cd2e8c30b08b92b7f5d13275,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,0.010106325149536133,0.010611772537231445,0.010630130767822266,0.010610103607177734,0.010619401931762695,0.010767221450805664,0.010831832885742188,0.08529043197631836,0.2842390537261963,3.167464256286621,0.5664248466491699,0.1977541446685791,0.14720988273620605,0.0651707649230957,0.06385278701782227,0.06647038459777832,0.06555724143981934,0.066986083984375,0.1625223159790039,3.201240301132202,0.06718063354492188,0.06687092781066895,0.042812347412109375,0.06551933288574219,0.04409480094909668 diff --git a/results/combined/merges_timed/keedio/flume-ng-sql-source.csv b/results/combined/merges_timed/keedio/flume-ng-sql-source.csv index 9fc96bcbc2..83dbe44c3a 100644 --- a/results/combined/merges_timed/keedio/flume-ng-sql-source.csv +++ b/results/combined/merges_timed/keedio/flume-ng-sql-source.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 53,refs/remotes/origin/master,2ce9f4bbde8a973ec095ac8a1d3a99dd37e0f58a,8e2e2fb3e09fc90c302c592550aca122d3b9ee90,c0d4caab50a88ef5b0f47b67a4034eca9e7bc3a9,,True,True,True,17,57,1734,3,True,17,Tests_passed,0980a9957ce3a31af9c761620dbbffbf34aadfeb87d459f70738753b14ab8a3b,True,Tests_passed,00ee085c342a24f217d2e13c8316e5a9563132fdb20f9798021d007255d65728,True,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,e64a155e66bc3e874be3056c17db68b17454621149b404e0ba04f605f664d237,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,ae364a7f8d6efe795b8c26a1f2f48fbd5a79d25700daccf3e35e2a7621dcaa1f,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,0.009160518646240234,0.008647441864013672,0.008586406707763672,0.008344888687133789,0.008712530136108398,0.008571624755859375,0.008608341217041016,0.03859663009643555,0.0681757926940918,0.012252330780029297,0.8178412914276123,0.07778096199035645,0.12126755714416504,0.04198026657104492,0.04168367385864258,0.04169297218322754,0.04149818420410156,0.0419468879699707,0.08210039138793945,0.05363607406616211,0.04144024848937988,0.04278278350830078,0.04032731056213379,0.04268503189086914,0.04014325141906738 diff --git a/results/combined/merges_timed/kevin-wayne/algs4.csv b/results/combined/merges_timed/kevin-wayne/algs4.csv index 11f002119a..3ccf7b9d66 100644 --- a/results/combined/merges_timed/kevin-wayne/algs4.csv +++ b/results/combined/merges_timed/kevin-wayne/algs4.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,False,True,4,4,13,2,True,4,Tests_passed,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,True,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,True,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f6a22db34ee0065c3a466ea39ecfed63d6499a9d6d1728d44ea3f7f3cfda6492,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f880f0dbc6b9491ecc3acc784ec8d91673ea0015065fc60e786c885e7e4c8061,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,0.023292064666748047,0.02749013900756836,0.013513803482055664,0.01665973663330078,0.02262258529663086,0.017772912979125977,0.04252147674560547,0.14713239669799805,0.08227896690368652,0.8448219299316406,0.4309382438659668,0.07196211814880371,0.15316271781921387,0.05433917045593262,0.0348658561706543,0.05341935157775879,0.055081844329833984,0.053200483322143555,0.09078526496887207,0.8400042057037354,0.035918235778808594,0.05292344093322754,0.05639171600341797,0.05431795120239258,0.05708956718444824 diff --git a/results/combined/merges_timed/kevinbayes/vest.csv b/results/combined/merges_timed/kevinbayes/vest.csv index 26e6969ca3..319cf8d2da 100644 --- a/results/combined/merges_timed/kevinbayes/vest.csv +++ b/results/combined/merges_timed/kevinbayes/vest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/18,3209c8480f0f7a364ff86db4fa1c5762026347a9,0e314832855cbd12a9989ae2d01d27ea825b4c6f,c2c2bbd61ea75d1802b45fa0aba03c8dabfcac5f,,True,True,Tests_passed,71aed7b4c882099618f2b1d575069985ea520c9dbb6f3dc7e7a7e91aaea1cccd,True,6,14,284,3,True,Tests_passed,73cf9cf91b2db95a30166e86a88c21aa43526465e238963bce11362932a31e2e,True,6,True,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,0.039591073989868164,0.047817230224609375,0.044217824935913086,0.04669189453125,0.05090689659118652,0.04570651054382324,0.03459501266479492,0.22847366333007812,0.1700584888458252,0.9378302097320557,0.3059368133544922,0.10029983520507812,0.13314604759216309,0.04928469657897949,0.049071550369262695,0.047812461853027344,0.04944348335266113,0.04854154586791992,0.09864592552185059,0.9325852394104004,0.04809165000915527,0.049449920654296875,0.030948877334594727,0.04779863357543945,0.029847383499145508 diff --git a/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv b/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv index e513200ffb..6885bd1b5d 100644 --- a/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv +++ b/results/combined/merges_timed/khmarbaise/iterator-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,99d1681276cd909ef4061373c1584c047d898356,380156fe641eb5b936b5becd9e031c268a12db17,5e50ad9cdac0106e3b43f3172c3b8f97da1dcb9d,,True,True,True,4,18,115,2,True,4,Tests_passed,6cc03b238709c2c719e13e7d2f1aa91ad30e8d8a44ba9be58733c7ffa0031515,True,Tests_passed,15c9b37931bca59af69ce54b24423e71651be937d5863e0717fac9c7875e36e1,True,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_failed,f0b8e6eddd1f7d8ffdcb17983e8de50ea5efd01fdf37304133cd8271c4d68ec1,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,0.05265021324157715,0.040640830993652344,0.03937268257141113,0.04071998596191406,0.05964469909667969,0.02935791015625,0.04581284523010254,0.18584394454956055,0.12288475036621094,0.8444564342498779,0.48285603523254395,0.08203291893005371,0.13638687133789062,0.05157661437988281,0.050276994705200195,0.04592776298522949,0.0484926700592041,0.05127596855163574,0.08354544639587402,0.869941234588623,0.046903133392333984,0.04677891731262207,0.038964033126831055,0.04655742645263672,0.036057233810424805 diff --git a/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv b/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv index 473a3d8ba9..835622faa5 100644 --- a/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv +++ b/results/combined/merges_timed/khmarbaise/maven-license-verifier-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,0329bcf4b7d1b8077d22fe8580d37ea103328e79,ce8439dc6634eb06f4cd61edfbff3428375b2bf5,74d5f5be15757b3a648c9ce5242e2e65268f3aa1,,True,True,True,16,58,693,4,True,16,Tests_passed,23d664a3f5daa87048857f20e1128b8c2efe3fc5db64fb2e149e4978e04eece1,True,Tests_passed,b2ee79543a5df69c698faeb7b18aff30ce87a04ef953bd01c3702312c3ba61c1,True,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,fa27f025d59f74c522bdb23880b526ceaf45cdb0df3e878868e5476fae509f8a,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_timedout,,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,d0c2a0df3aeb58cc0de4d0d61805ed8763110d1a96ba8de7b725e85cc3c21c2e,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,0.02451634407043457,0.04433774948120117,0.04238486289978027,0.040831565856933594,0.049483537673950195,0.044190406799316406,0.036701202392578125,0.29456472396850586,0.22649478912353516,2.20139479637146,-1.0,0.1391301155090332,0.1360940933227539,0.05443167686462402,0.05478215217590332,0.05414223670959473,0.053261756896972656,0.055455684661865234,0.12107110023498535,2.138725996017456,0.052468061447143555,0.05485248565673828,0.03818082809448242,0.05481386184692383,0.0382685661315918 diff --git a/results/combined/merges_timed/khuxtable/wagon-gitsite.csv b/results/combined/merges_timed/khuxtable/wagon-gitsite.csv index 33251b0d9f..d22abbbde7 100644 --- a/results/combined/merges_timed/khuxtable/wagon-gitsite.csv +++ b/results/combined/merges_timed/khuxtable/wagon-gitsite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/18,c94bcd0245b4844ab11ed21275f886cbbf21c9e4,d5aa326489bb43f65303736331247706d7dba123,c24ca067a932b0342131923e2eaa7680368233cc,,True,True,Tests_passed,b00bf9e8e4dda305f8491325ee402aa038e852ac6b620b96127fa932548916a4,True,3,37,137,3,True,Tests_passed,8202568122501c76010d3a16a78213fce4e5351878d736f1e27fe6f54f4926c9,True,3,True,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_failed,2fd4f317ccf3a02add05336d33872cba3d2b21307a02716635481e1136a41ef8,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,0.04582381248474121,0.04940962791442871,0.047598838806152344,0.045180320739746094,0.05278778076171875,0.04723978042602539,0.056243181228637695,0.23434042930603027,0.15840721130371094,1.0551486015319824,0.3432295322418213,0.10727715492248535,0.13307476043701172,0.04864382743835449,0.049816131591796875,0.049123525619506836,0.04955410957336426,0.049254417419433594,0.09775137901306152,1.0756800174713135,0.048584938049316406,0.048998117446899414,0.03122568130493164,0.04878354072570801,0.031157255172729492 diff --git a/results/combined/merges_timed/kifj/jboss-syslog.csv b/results/combined/merges_timed/kifj/jboss-syslog.csv index a839be642c..8cbc07d983 100644 --- a/results/combined/merges_timed/kifj/jboss-syslog.csv +++ b/results/combined/merges_timed/kifj/jboss-syslog.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,b0a5f59bc365dda96b4051495d15fbc46f36cd27,ebedeeed422121087bc3be855ec363c8c0213601,bb26bd84f7ec09f94959c87d4a4fd43af6b3994a,,True,True,True,2,3,10,4,True,4,Tests_passed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,True,Tests_passed,521cec31d4f89b12dc48e058eca3cfcc81f6bf21d96a916dc3810218ccc1c868,True,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,3e40f5541299ccf0385e14249ce8b7c0ea9aeaa508530e2cf99a092fe1127c2e,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,0.036710500717163086,0.03805375099182129,0.035662174224853516,0.03448343276977539,0.03706836700439453,0.03135251998901367,0.03580498695373535,0.12230610847473145,0.10551786422729492,0.5099656581878662,0.25098729133605957,0.05790114402770996,0.10814595222473145,0.028221607208251953,0.028820514678955078,0.02809762954711914,0.028537511825561523,0.02831864356994629,0.05950450897216797,0.49723196029663086,0.029207706451416016,0.0289762020111084,0.027376651763916016,0.029244184494018555,0.027597904205322266 diff --git a/results/combined/merges_timed/killbilling/recurly-java-library.csv b/results/combined/merges_timed/killbilling/recurly-java-library.csv index 5aa964525d..2f860ed5f7 100644 --- a/results/combined/merges_timed/killbilling/recurly-java-library.csv +++ b/results/combined/merges_timed/killbilling/recurly-java-library.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 222,refs/heads/master,c978e4add5640a493a55339972b2cd4363d42957,af7d25dff245056f1fc458c7b39f29e2de44d533,dcbfbb986a19c58efe3bc0b284724741ee71dc26,,True,True,Tests_passed,c250916aaa0801116200b7d417fa4fee4da50ec915837160b4f5e333d51a7198,True,74,422,3915,2,True,Tests_passed,49432ab9f96b0cc95b26258d7f928fdfd967df3d5030021d8cff6d6d28459bd3,True,74,True,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,68f617d91329ecd7ddfeb8f8c86bb9b9e4c9d7ead3a43370257c55f96c6f139f,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Tests_passed,a0605aca09a37e936f90477593f744e8605b1bd882bc0dd0d5b5a766316c1cd1,Tests_failed,26752c0af28aedb3eacd286965ee3478c448e464f45e2f46009d60809dcfa70c,Merge_failed,271ec15f6cf7a88667ab956c0e62dbf7f7afa5994d45d1f83f16470a5fe97ea7,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,c73fe83619feeea407b1e5427f9b364dce4db612d3f3886bfe478532b61cc764,Tests_passed,a0605aca09a37e936f90477593f744e8605b1bd882bc0dd0d5b5a766316c1cd1,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,Merge_failed,12266e770c5dd3872c25326b74ee088db913da4b810a77d58c985e9e1620a45c,0.06166362762451172,0.06327080726623535,0.05523419380187988,0.023288488388061523,0.05037117004394531,0.046871185302734375,0.05251312255859375,0.16933393478393555,0.1109170913696289,0.9718263149261475,1.363452434539795,0.07872819900512695,0.12711477279663086,0.04466438293457031,0.04606986045837402,0.04485321044921875,0.04533648490905762,0.0451815128326416,0.07776427268981934,0.9422008991241455,0.04419755935668945,0.044008493423461914,0.044861555099487305,0.044805288314819336,0.04475235939025879 diff --git a/results/combined/merges_timed/killme2008/aviator.csv b/results/combined/merges_timed/killme2008/aviator.csv index ebfe6286a8..c1a0afa94f 100644 --- a/results/combined/merges_timed/killme2008/aviator.csv +++ b/results/combined/merges_timed/killme2008/aviator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,True,72,169,1913,2,True,72,Tests_passed,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,True,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,0.04927468299865723,0.05126309394836426,0.06519412994384766,0.05892634391784668,0.07357287406921387,0.05908322334289551,0.06565332412719727,0.20274853706359863,0.11348104476928711,1.1442959308624268,1.4122865200042725,0.11026167869567871,0.1745154857635498,0.07410693168640137,0.07897615432739258,0.07829165458679199,0.07266855239868164,0.0753629207611084,0.11991500854492188,1.0566813945770264,0.06833505630493164,0.07005071640014648,0.05902695655822754,0.06869244575500488,0.06557297706604004 diff --git a/results/combined/merges_timed/killme2008/xmemcached.csv b/results/combined/merges_timed/killme2008/xmemcached.csv index 9952017eb9..0dab2cfb25 100644 --- a/results/combined/merges_timed/killme2008/xmemcached.csv +++ b/results/combined/merges_timed/killme2008/xmemcached.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,b9e0c0c8b216855a15478361d5528b62688b9f4b,9f108c974c8bcc1f17ed0b202df0ea0a669ec65e,eef7bcbe4341da1a9bad3e5b30781bf1e381ec90,,True,True,True,22,69,1208.0,2,True,22,Tests_passed,78f5fd833ef4083e296242256078379e4ce043dd2e5f6f2f9e0f07ec5c937e8d,True,Tests_passed,911ed6fe66d5c9ff285ab292254578c250115a8fe9eca28f75942eaec65fb2e4,True,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,0.05722308158874512,0.045677900314331055,0.049793243408203125,0.0566408634185791,0.05126309394836426,0.04123353958129883,0.0630636215209961,0.18315792083740234,0.11241269111633301,1.2416026592254639,0.8587315082550049,0.1441957950592041,0.15045762062072754,0.0471651554107666,0.04935026168823242,0.048501014709472656,0.04839920997619629,0.04708242416381836,0.08510255813598633,1.1618773937225342,0.046317100524902344,0.04898214340209961,0.03626441955566406,0.04735302925109863,0.03626728057861328 diff --git a/results/combined/merges_timed/kimshen/sissi.csv b/results/combined/merges_timed/kimshen/sissi.csv index 4f48f02fc0..bc775015bc 100644 --- a/results/combined/merges_timed/kimshen/sissi.csv +++ b/results/combined/merges_timed/kimshen/sissi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,c00c2e6554f121dc4bbb4fb2549738e1b1ec639f,73d171b086455c3d56fb7554ef823f875663b4e0,eb55eb9b6f00bc2435d9d65b521ca592f9138e01,,True,True,True,14,48,242,15,True,23,Tests_passed,290830813490792a7cf33b82a6df8bdecc6d7cd87d92cf87918f9b5e8e19221c,True,Tests_passed,3225e85c3d0c3c718f84e1ebb2469ce0deed53e245e01c8161c47842796f0eaf,True,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,53d123afb24f47d961ea8942afd8fc2c33be2e18cfc47ae8edda13882fc9769f,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,f759f8150b16fff45b8fad620444707010efb021440b02254f025e2fe2539cca,Merge_failed,e19034a478da432bfa81f19fbd63a2e00b0453c1a74fe2aa72f4ff079518914a,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,b861bb35c904e4e253b1285732a05f8926c834fdb9ea56be18898bb813159f86,Merge_failed,be6f8d1ddb5d0cb5299502a6267c2f943ef235cf228a9c9cf962c0a076a9f14e,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,0.04781651496887207,0.05108022689819336,0.0421292781829834,0.04125404357910156,0.011893272399902344,0.04361081123352051,0.04788994789123535,0.43448400497436523,0.36437153816223145,1.86000394821167,0.5096244812011719,0.28228235244750977,0.19375276565551758,0.0846855640411377,0.08953380584716797,0.08657646179199219,0.08268451690673828,0.08447790145874023,0.2069556713104248,2.3417177200317383,0.07875466346740723,0.07733345031738281,0.07552218437194824,0.07719135284423828,0.07594704627990723 diff --git a/results/combined/merges_timed/kinow/testlink-java-api.csv b/results/combined/merges_timed/kinow/testlink-java-api.csv index 426f4d230b..c4b5cc524b 100644 --- a/results/combined/merges_timed/kinow/testlink-java-api.csv +++ b/results/combined/merges_timed/kinow/testlink-java-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/master,c8219ee401dd1f5feac814af4f6294e7d57abe2b,eb9ac19efb822f141aa71fbe3495f428a889ae55,8aeca53cc5da2e39fcd102387343c5d6b40f0213,,True,True,Tests_passed,c75efdd969445a5e814073b74bb4b2806bf1d2c9c3c29451bbe5c17babc5d863,True,18,114,635,2,True,Tests_passed,bc57d9d0286bb6c4014169bc7bc51d76cafa243431b1ea2ec64543bf9c1693c0,True,18,True,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,0.016411781311035156,0.0167083740234375,0.019654512405395508,0.019991397857666016,0.019420862197875977,0.019756793975830078,0.018632888793945312,0.04755210876464844,0.07191228866577148,1.0424895286560059,0.7360870838165283,0.08820486068725586,0.14826107025146484,0.05704188346862793,0.043811798095703125,0.05905008316040039,0.04450106620788574,0.059659719467163086,0.07881021499633789,1.1037046909332275,0.04428815841674805,0.05792999267578125,0.03226470947265625,0.05628347396850586,0.032886505126953125 diff --git a/results/combined/merges_timed/kohsuke/access-modifier.csv b/results/combined/merges_timed/kohsuke/access-modifier.csv index f12d91061d..bb2ba9aff1 100644 --- a/results/combined/merges_timed/kohsuke/access-modifier.csv +++ b/results/combined/merges_timed/kohsuke/access-modifier.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/remotes/origin/pull/52,38876ed95a6d2e7c44d433fd0cc347ba6131907a,dc8ec3bf1c16e3ffeb9909f74fc56a124a76ee82,0d849fdb7804e5fdbe23c73fdfedab89c9ca4aa0,,True,True,True,32,124,574,4,True,32,Tests_passed,1bf7715248dbf26db4ce507496002d27d4a403eb73736847e082cf4a386ee068,True,Tests_passed,57eadde338c7c5b167b02b0571cb005cb8f935462f4fe09edba18d179487510f,True,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,b0a5a231cc11a944ac3b4c50bbf2bbb685398bf4600f99bf6c0578443cf24547,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,f28cccb04b6c10bded8dc449c399f994256fbcd102360c7385394d58075a1476,Merge_failed,6c365e1a7378ebb22328ff93bb668b421b6567e7c8f6fc20d2469bf7a04a6c73,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,6df49e0a9f6d1e61fe7de9ea6d5541e4c889dc5fae444e5ce89c8a4be796d4fc,Merge_failed,f5595b23d881ec0b72d84e581a2098f1e821f520e0bd44f749b59ac471b6bfbb,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,0.054320335388183594,0.045144081115722656,0.052400827407836914,0.04250025749206543,0.0480961799621582,0.046134233474731445,0.04922771453857422,0.3003063201904297,0.2335798740386963,1.7428174018859863,0.46889400482177734,0.13997173309326172,0.13755393028259277,0.053850650787353516,0.0539395809173584,0.05511140823364258,0.054335594177246094,0.054615020751953125,0.11787724494934082,1.6949093341827393,0.05348062515258789,0.05524492263793945,0.04636430740356445,0.05469059944152832,0.04552865028381348 diff --git a/results/combined/merges_timed/kohsuke/file-leak-detector.csv b/results/combined/merges_timed/kohsuke/file-leak-detector.csv index d00548856f..19fd4d3e4e 100644 --- a/results/combined/merges_timed/kohsuke/file-leak-detector.csv +++ b/results/combined/merges_timed/kohsuke/file-leak-detector.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,d76ad63466cf23012237a78f23d30f6885072c4e,d2c1e07c9626c495fea7c7c9aaee7aa30c2e96d2,24f774257f6c21a70b3ed0d0cb28970370149aa9,,True,True,Tests_passed,a653ee396855d20affe93ff72068e8c5f3cf09fbf855a7721888ffd492913a3d,True,15,56,446,4,True,Tests_passed,d13c3ebc8f84e90a432b0d7aa35f6159adc45a29efbe3e510b7529055b51ae36,True,15,True,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,24e0f2653fe1fdbcdc7f63d5f736d942c0185eb9d549a878c5eed7b03ea73587,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,16a206466ea98bd84d957ccec31a41f40b07a9b70bcc9785c329873ba4a68525,Merge_failed,d815cc8544166c5f21d97e070672de3439a71a3c2b0eeb3097dae3922acbf427,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,12422377752b721c04ed3126d1cca66899b77251bea2ac40596bf58e56060117,Merge_failed,9dfb719b3cc8a3dbda3f1e5fc5928fe6b5390ff6e7d81fa8584a4a046445d584,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,0.04591536521911621,0.04432392120361328,0.04338550567626953,0.038152217864990234,0.03096747398376465,0.043947458267211914,0.04537844657897949,0.28107142448425293,0.22930526733398438,1.6485943794250488,0.3666653633117676,0.13189148902893066,0.1279127597808838,0.0479741096496582,0.04847884178161621,0.04811429977416992,0.047966718673706055,0.04916810989379883,0.11260223388671875,1.6113123893737793,0.04978466033935547,0.04973912239074707,0.04044628143310547,0.04933309555053711,0.039450883865356445 diff --git a/results/combined/merges_timed/kohsuke/github-api.csv b/results/combined/merges_timed/kohsuke/github-api.csv index 32d3debf59..7b24a2cfc1 100644 --- a/results/combined/merges_timed/kohsuke/github-api.csv +++ b/results/combined/merges_timed/kohsuke/github-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/main,ea17ade038c1d67b617afe3943ebf62f22bc08fb,dc0a8fa788f6858f2b04eaf5659ae9124e59ef27,38baf5df845a1397522e1e953b84a80fb57a8799,,True,True,True,150.0,181,11496.0,4,True,151,Tests_passed,467cf4caf9ae4d4d49ebf23339d479dc2e92116fa2a92aeddd501361bc0af8ef,True,Tests_passed,3a597c16e497798b3f9729c32f4a3a693476bef980ae96e9b9ca9d0f89264f3a,True,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,0.039922475814819336,0.04012465476989746,0.05130577087402344,0.051682233810424805,0.05168867111206055,0.05164790153503418,0.051000118255615234,0.11913061141967773,0.15013384819030762,0.04344534873962402,1.1502768993377686,0.17944025993347168,0.23682880401611328,0.13536381721496582,0.1290431022644043,0.13025617599487305,0.12521696090698242,0.13511133193969727,0.21628880500793457,0.13638067245483398,0.11887836456298828,0.11718297004699707,0.0941774845123291,0.11696076393127441,0.0965723991394043 diff --git a/results/combined/merges_timed/kohsuke/groovy-sandbox.csv b/results/combined/merges_timed/kohsuke/groovy-sandbox.csv index 0264fef8ee..d4bca25c91 100644 --- a/results/combined/merges_timed/kohsuke/groovy-sandbox.csv +++ b/results/combined/merges_timed/kohsuke/groovy-sandbox.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,6c8ab911380474724b7b1649c644e02ac55bf599,017bd009294c4fcb56474260f6c0358bbad252e7,b84b9562056b0feec65db9a5201403ea3a4da459,,True,True,Tests_passed,0ae83806fa3cad134491cb38880b788ae90d1f11d5db56f676ec4dd447257d5e,True,4,17,138,2,True,Tests_passed,06a143fef81af841cb8430dcce5bd698373848e343d104c8578a0158f6f78cd2,True,4,True,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,cb31b0652a5429e41ec8866b05c346bb8b81635b1d71891ec60c5f52755f5691,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,1bdb73d44389acc51c5b13cd87d75f0412e10c1d2c6133832477dd1d5b498c67,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,d0a150beb1e77731fad4cc17a9a5681b62ca8e64c02ee9c18ef47e14e52b2ec9,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,0.010083198547363281,0.010113239288330078,0.01108694076538086,0.010507583618164062,0.01047062873840332,0.01032257080078125,0.0107879638671875,0.03603506088256836,0.06712484359741211,1.4739878177642822,0.5356340408325195,0.07293057441711426,0.1232144832611084,0.037629127502441406,0.03690767288208008,0.03648710250854492,0.03710150718688965,0.0373997688293457,0.06816649436950684,1.483736515045166,0.03687477111816406,0.0365595817565918,0.03426241874694824,0.037895917892456055,0.035150766372680664 diff --git a/results/combined/merges_timed/kohsuke/libpam4j.csv b/results/combined/merges_timed/kohsuke/libpam4j.csv index 32248a99f4..b681f86987 100644 --- a/results/combined/merges_timed/kohsuke/libpam4j.csv +++ b/results/combined/merges_timed/kohsuke/libpam4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,43d35c217451951500d0cb1246602c42494f7a28,02ffdff218283629ba4a902e7fe2fd44646abc21,ef7b1229da5f41c7119e50dcef04befac3e7104f,,True,True,Tests_passed,81c7b7e54b68fb0dc7b5cad970618eda54cbfb1d543f16a4b509ac894fec1729,True,10,23,114,3,True,Tests_passed,de6b809ef9ff0c032039c7920ef1579b17afd63e0cc2bb58cb1590b2df7b53e9,True,10,True,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,097475a253454f650502dcae3858f4f94003d9c493589516a53c27c26c6045eb,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,4227177f380a169dd0a2e1b54131f2838fdaa13bd90b2f1b4bb5e19ab9f4882e,Merge_failed,663cb42656fcca760ed7ffd19d5d029a2a80ede6ab0bf66facfa2262a3eee5ca,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,43dba62ad666d92c85366a9c380af58c5874a33fec3163b4fa7ffffd6562227b,Merge_failed,9ebe843b9c76911d1d343a8b4cd30a5e666a2f0df0a270fb80b36a5a3a39661e,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,0.03841137886047363,0.04195261001586914,0.036437273025512695,0.03880620002746582,0.038878679275512695,0.04119539260864258,0.035227298736572266,0.2265949249267578,0.1753983497619629,0.6626889705657959,0.294339656829834,0.1013786792755127,0.11844372749328613,0.03977322578430176,0.03900885581970215,0.03948330879211426,0.039380788803100586,0.03963422775268555,0.08648300170898438,0.6689596176147461,0.03943920135498047,0.04007744789123535,0.03848123550415039,0.04012346267700195,0.03819847106933594 diff --git a/results/combined/merges_timed/kohsuke/winp.csv b/results/combined/merges_timed/kohsuke/winp.csv index d185f679c8..9ade59eae3 100644 --- a/results/combined/merges_timed/kohsuke/winp.csv +++ b/results/combined/merges_timed/kohsuke/winp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,a9e44d3094143e4bf8e892f3d5e4fa5a12dc6016,a95c8dba746547b90c2a273de5d0355624db521e,7a3043b5436d2208b75c64757085397834da92b3,,True,True,Tests_passed,72aaa5f2cc0212835074c0d5d2f25bd9cf6354040970a5d06884d3535fd4777a,True,9.0,23,102.0,4,True,Tests_passed,e3ef25d1eae44c12f5ce1f0591a95dc739af299d75340f1deaa30982d1054fdd,True,9,True,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_failed,12aceac0f491bd0a6d513aa051b4a51197c10197d4adc57f66352e9cee634edc,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,0.04798579216003418,0.049063682556152344,0.04556083679199219,0.05375337600708008,0.042247772216796875,0.04674720764160156,0.044332265853881836,0.29398608207702637,0.2271261215209961,1.5001187324523926,0.3368387222290039,0.13442611694335938,0.14839458465576172,0.05967521667480469,0.059070587158203125,0.059830665588378906,0.05972862243652344,0.059757232666015625,0.12812352180480957,1.488081455230713,0.05847883224487305,0.05937480926513672,0.032942771911621094,0.05769681930541992,0.033217430114746094 diff --git a/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv b/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv index 73e1ef4369..1beeca1cd0 100644 --- a/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv +++ b/results/combined/merges_timed/kolorobot/spring-mvc-quickstart-archetype.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,78c6fba5414281cddde8139a83318aeb0a6dc9ec,d806f03e7a360c67e709c49706911c7dfca7ab98,60c85b75e09af9ef6ba466f20117cb88755bc234,,True,True,True,16,36,346,6,True,16,Tests_passed,7311fcb93550e1e073ea621985d3777de76dc658ad5d91abfd3d0ec5e23bdb0f,True,Tests_passed,7a4fd0a7abc0e491bb865f0686176b40d2b9f9079fd08e4b0f787e3ee4660503,True,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,30dfdd0e4dd032b1b2b0d5e1c8b3c806f58e9b6aee223f7206c1153f82313721,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,8f9fc3c1cc81a45b91cde1057a3ad68622f5f78c283bf3c318af772d4c3081ea,Merge_failed,351c29d4f4053c3e0ede98aeca5d64a87b28d83dc2962a734447ae00912afb2d,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,488386b42e4a1e675e3b3724aa046a8c51bd7a4e2cb359dade66b35a8d009225,Merge_failed,d69c3044418460c9aec3dd9cabcd9382a8444d3a9622e807e8b8b4ea7f37f368,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,0.036749839782714844,0.03270149230957031,0.03316831588745117,0.022630691528320312,0.039559125900268555,0.027948617935180664,0.03374981880187988,0.309201717376709,0.2893192768096924,0.5068464279174805,0.21179795265197754,0.17061233520507812,0.13866710662841797,0.05959653854370117,0.05942106246948242,0.06046295166015625,0.06008553504943848,0.059947967529296875,0.14684486389160156,0.5161781311035156,0.05949974060058594,0.060010433197021484,0.058130502700805664,0.06000542640686035,0.05849933624267578 diff --git a/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv b/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv index ebda301a5f..49fddde376 100644 --- a/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv +++ b/results/combined/merges_timed/komamitsu/jackson-dataformat-msgpack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,b536174c01bb4f98681e9cc8940e0be97436b00a,7d4d9b6378fe436d8a68540cd75c811bc3220392,5a222d4b2483d5ed946d6cc34db5f8aedf15ebc7,,True,True,True,7,26,140,2,True,7,Tests_passed,ce7ddf26a009ac69110f813c2ca8911a1c19a9a26c58a7d0525bf66660e47e46,True,Tests_passed,ffe71aec2cc0ebd6fa9539eb48341e6480545d1880180937f0276d7aae6068ea,True,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_failed,24988907656df9b7f4a959dd00ac4fe7da5084d46c704edcbb01f3f133b73fce,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,0.04315304756164551,0.04300189018249512,0.04588913917541504,0.043981313705444336,0.04311037063598633,0.03789401054382324,0.043642520904541016,0.1701362133026123,0.11525964736938477,0.9798083305358887,0.37235355377197266,0.0677332878112793,0.12297821044921875,0.037841796875,0.0372159481048584,0.03746175765991211,0.037724971771240234,0.03812980651855469,0.07076764106750488,0.9589419364929199,0.03763580322265625,0.03779458999633789,0.026656150817871094,0.037786245346069336,0.026928424835205078 diff --git a/results/combined/merges_timed/komoot/photon.csv b/results/combined/merges_timed/komoot/photon.csv index 8d3b336aec..dcaefa595b 100644 --- a/results/combined/merges_timed/komoot/photon.csv +++ b/results/combined/merges_timed/komoot/photon.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 57,refs/heads/master,e278ace2cb84789adb9af30d186f0f123170901b,e4a024eee0e4f0e9c610a786258a2ad45c1773ec,4c417c57120553f5ec0e0ef18440e80fac0f1d79,,True,True,Tests_passed,ccae829e89e397eec0f774bc8ad65456d564cf6fd326ad5f71eb0b1988a27d7e,True,6,19,128,2,True,Tests_passed,137899cd882d0ae5aa68dc9449e0e49328abbc8a6c0875413c2d4a81a0b9a74e,True,6,True,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_failed,60eb5227ccc1a4555f7839a838eb086096af40f35780e1ed0f269551b9ae3583,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,0.03969693183898926,0.044770002365112305,0.04146122932434082,0.012295007705688477,0.04219794273376465,0.0485837459564209,0.031783342361450195,0.17185330390930176,0.12437248229980469,0.961965799331665,0.3727238178253174,0.0753779411315918,0.14889931678771973,0.04462170600891113,0.06085324287414551,0.06020092964172363,0.044805288314819336,0.044734954833984375,0.0973198413848877,0.9499814510345459,0.04284071922302246,0.0439906120300293,0.049663543701171875,0.0564570426940918,0.03383159637451172 diff --git a/results/combined/merges_timed/kong/unirest-java.csv b/results/combined/merges_timed/kong/unirest-java.csv index 7ca77b643b..3067163a3e 100644 --- a/results/combined/merges_timed/kong/unirest-java.csv +++ b/results/combined/merges_timed/kong/unirest-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,True,6,25,79.0,2,True,6,Tests_passed,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,True,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_failed,31aa4f379c9a09b9c2b39ea0e857f5745089ebd170926e430ad8ad20a2a3ff71,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.037122249603271484,0.043419837951660156,0.04746103286743164,0.05024886131286621,0.04902911186218262,0.04300355911254883,0.04208111763000488,0.16981816291809082,0.10572075843811035,1.1297626495361328,0.4058341979980469,0.07056522369384766,0.12597990036010742,0.041047096252441406,0.040967702865600586,0.04119229316711426,0.04041647911071777,0.04109621047973633,0.07399439811706543,1.0422954559326172,0.03941965103149414,0.03983712196350098,0.028996706008911133,0.040648460388183594,0.029162883758544922 diff --git a/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv b/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv index b95c6bdff1..22fa3837d0 100644 --- a/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv +++ b/results/combined/merges_timed/kongchen/swagger-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 33,refs/heads/master,abb6c10117c59ea83b2d7849e8eb5fb70911becf,1958cf3cf1e2a3ec66ba20305e0e4104c4cf2ed6,d1ab7fd4787d13f546875df05ec4d9e7ab1bfc2f,,True,True,True,10,28,456,2,True,10,Tests_passed,277a17114171978f1a320623f6fd11f93433e465639c009256f8bcd2bc207dbf,True,Tests_passed,bc87f38447c5ac7d8a1b2673da5123c919300a888d349dae986ed9ffbfbda660,True,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,50cbe12da9dfe96f2069f4836a7ea7ad1e3362eb915615f14fdb6d2d8d9ac7f4,Tests_failed,61b0bd4017880910c27a740014998e2d58d5955de023156b2970106822b2f054,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,50cbe12da9dfe96f2069f4836a7ea7ad1e3362eb915615f14fdb6d2d8d9ac7f4,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,Tests_passed,78b4da3b3b536e503fe4ebd902f89dd36f5fd1de09d6146affd7fe063c1cef2a,0.02168440818786621,0.0191957950592041,0.024072647094726562,0.024835824966430664,0.0278167724609375,0.024244308471679688,0.024448394775390625,0.06445980072021484,0.08956003189086914,0.8517715930938721,0.3888216018676758,0.09447598457336426,0.14447617530822754,0.06045103073120117,0.05741405487060547,0.0606076717376709,0.06043076515197754,0.05715203285217285,0.09737586975097656,0.8768835067749023,0.05668973922729492,0.05320620536804199,0.04708290100097656,0.05555438995361328,0.04488229751586914 diff --git a/results/combined/merges_timed/konloch/bytecode-viewer.csv b/results/combined/merges_timed/konloch/bytecode-viewer.csv index 7f97d3e939..903eddabc5 100644 --- a/results/combined/merges_timed/konloch/bytecode-viewer.csv +++ b/results/combined/merges_timed/konloch/bytecode-viewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,True,22,89,828,2,True,22,Tests_passed,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,True,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,0.06708502769470215,0.07103109359741211,0.09766840934753418,0.11073470115661621,0.09166812896728516,0.11584758758544922,0.11857247352600098,0.17255091667175293,0.14069533348083496,1.034867286682129,0.8988618850708008,0.2584972381591797,0.2359774112701416,0.191849946975708,0.16374826431274414,0.19240713119506836,0.18410992622375488,0.18676018714904785,0.22921037673950195,1.0518755912780762,0.13052582740783691,0.12734317779541016,0.0975956916809082,0.1319732666015625,0.09136462211608887 diff --git a/results/combined/merges_timed/koraktor/mavanagaiata.csv b/results/combined/merges_timed/koraktor/mavanagaiata.csv index 0e49bf3d4d..361d0e90a9 100644 --- a/results/combined/merges_timed/koraktor/mavanagaiata.csv +++ b/results/combined/merges_timed/koraktor/mavanagaiata.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 302,refs/heads/master,3db986aced967917053dd5fad68a469976a6b27a,f563642bf7a24d3986336b775b25f974f2feb668,f40e69b670f030e802a393d7b4fe433bef727048,,True,True,True,11,45,215,4,True,11,Tests_passed,9c44ab4b04d70ae7b0b220c250f3ec3ac8bb2200b7a18d149ec99996b1a48bbf,True,Tests_passed,90bdfb521679d1c76f68d7af3154fb6ae3a44deb8ba3bb2bb2d8c8eabf44018f,True,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,a9fb09ca234ec6bcd8ba2ad5471ec78f1961302d5182307ab650d50943ab066f,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,43f782019eb2d119ae7055076acefdda0f09965be69a43826bf1d4b5129224b9,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,03b74519a9caa74a08df6fd1bf2fd5c5f21c1244f5b25f7749044172705cd934,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,0.04230332374572754,0.04645514488220215,0.043282270431518555,0.041069746017456055,0.04003119468688965,0.042981863021850586,0.04601168632507324,0.30267786979675293,0.22935795783996582,2.206728219985962,0.47675466537475586,0.13691473007202148,0.13093113899230957,0.04869222640991211,0.04970836639404297,0.048207998275756836,0.049782752990722656,0.04981708526611328,0.11392784118652344,2.1090621948242188,0.04945206642150879,0.049692630767822266,0.03414154052734375,0.04972076416015625,0.033896684646606445 diff --git a/results/combined/merges_timed/koraktor/steam-condenser-java.csv b/results/combined/merges_timed/koraktor/steam-condenser-java.csv index bf7a08d123..2b5d0de2a3 100644 --- a/results/combined/merges_timed/koraktor/steam-condenser-java.csv +++ b/results/combined/merges_timed/koraktor/steam-condenser-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,7845353108a43162e5ead8a94fdebc8c21cfa0d4,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,8b8e64b32595b92b41e81ebd8cdbb7ea27e62744,,True,True,Tests_passed,62971e708638bb2214a743cc3d10735353583d37c43950d42d2a0a6f2bd2c809,True,26,89,1344,3,True,Tests_passed,080569ab758b6e35afe3b1a657f05814af2837487a611712681ed03e44c77b47,True,26,True,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,ab95fe99158922fc148375eba73e706b4ecdd4846ccab19a596367e758106e39,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Tests_failed,a57d83c35ec2218c81bcbeb33bd3d1aae8acbef309da4f528d68ed7e105fa8d9,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,b24ae9bbf5105d1edbd6e143289062d873e8a7e7a7286598b6fc6b5b6ef5e323,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,0.03427696228027344,0.04236006736755371,0.04978036880493164,0.046817779541015625,0.048789024353027344,0.04136252403259277,0.06044602394104004,0.23542380332946777,0.16191315650939941,1.1355955600738525,0.5214192867279053,0.11330986022949219,0.14264607429504395,0.0533595085144043,0.056053876876831055,0.0538637638092041,0.055593013763427734,0.05416750907897949,0.10891270637512207,1.102900743484497,0.05525040626525879,0.053589582443237305,0.04445910453796387,0.05132865905761719,0.045740604400634766 diff --git a/results/combined/merges_timed/kpelykh/docker-java.csv b/results/combined/merges_timed/kpelykh/docker-java.csv index 5c11a00521..b2df93f560 100644 --- a/results/combined/merges_timed/kpelykh/docker-java.csv +++ b/results/combined/merges_timed/kpelykh/docker-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,44aa4b057604562f10220734507928a05a315526,00ff6ec25af073b30377cb1a860d45f228de3a2e,9cf0799d1aa8c5de44aa7fe8b5336f5b494a9e64,,True,True,Tests_passed,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,True,12.0,49,346.0,2,True,Tests_passed,43966615d8feb6d07e6d7f9d119fa1ff45ff0669a9c91f1565d1fb10557c2fa6,True,12,True,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,5ae1006a8900bec815c112e6beeaa94c4478d75dec6dd5872cecce159e6daeb4,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,2470e1b524fa4909cc0e5341dde9fa5123fed31e699ae1c5eaf225257072d9d2,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,d0d0b857f94066b725be9bb88168a02c414d8eca09de3294bbfed3696bc6ae7e,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,0.009765386581420898,0.009929418563842773,0.010329008102416992,0.009897947311401367,0.00985574722290039,0.00986170768737793,0.009916543960571289,0.03456592559814453,0.06860971450805664,1.3784468173980713,0.5393168926239014,0.07109522819519043,0.11628007888793945,0.03581047058105469,0.03690624237060547,0.03754377365112305,0.03676128387451172,0.03708028793334961,0.06885600090026855,1.4170949459075928,0.03708767890930176,0.036390066146850586,0.03456592559814453,0.036715030670166016,0.035859107971191406 diff --git a/results/combined/merges_timed/krilivye/jocco.csv b/results/combined/merges_timed/krilivye/jocco.csv index 3c9878cab7..97e967c081 100644 --- a/results/combined/merges_timed/krilivye/jocco.csv +++ b/results/combined/merges_timed/krilivye/jocco.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,5994a8ffa7adc1fbe2157b96436ba57f24aa2fa6,60ffba89d1314e432830b72f4e2317437e026a53,a4f324fc56908cce4b83fe50c3c9a873c65f6ea8,,True,True,Tests_passed,a07bf68c4d038e584872ca8801d93f18d01537ef3223e04bdaccd669ed7b2f02,True,5,24,71,3,True,Tests_passed,48b5eb51e22d9f48cc08f24cee8f8c64813bd909cee17d02615a147878c7ad46,True,6,True,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b7318799ca878001b3b293d664c33b7acdb2bc846f770dbbd5a4f195edefec66,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,3c6fcb0da2ce2f7a305ce892c27df90994aea950a4f27803e66c77637ee51c3f,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,787ea05d67913386d7b5bc9cea079b1b8b1081d675ded34b792523da8dbe7822,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,0.044194698333740234,0.03874039649963379,0.03793692588806152,0.03533434867858887,0.04479837417602539,0.03694295883178711,0.043160438537597656,0.14337539672851562,0.12082862854003906,0.7116079330444336,0.2922368049621582,0.07309484481811523,0.11404633522033691,0.03546905517578125,0.034195899963378906,0.035019636154174805,0.034891605377197266,0.03519916534423828,0.0657491683959961,0.6947131156921387,0.03401827812194824,0.03363609313964844,0.032958030700683594,0.0346379280090332,0.03287196159362793 diff --git a/results/combined/merges_timed/kroimon/bukkit-alphachest.csv b/results/combined/merges_timed/kroimon/bukkit-alphachest.csv index e88d121acf..00bb6538da 100644 --- a/results/combined/merges_timed/kroimon/bukkit-alphachest.csv +++ b/results/combined/merges_timed/kroimon/bukkit-alphachest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,1c06bbbbf3fc168448554fcc274249946e51fd94,efc79103f615ba17590bf69792d62db71cf80945,81fe6cc2b3eecbe7b7bc7fb684f3c24deac0ed5d,,True,False,True,2,1,2,10,True,10,Tests_passed,b3cab0f3dab361400360bfbb00798655603527825cd80f920b7ab13fa0767b02,True,Tests_passed,0a5facf58326e07d308b75cbb24c1b42b5ef8ff54b7df8b177e94af9d52b47a2,True,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,f0cd2f6f73fb9713e884714accf96c7d669cccb2754cf4d9189fafdfeb721868,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Tests_failed,e7586ac7542ea1cae017075d16e9a0d722792480ec5165be6a0f8ed573a4a71d,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,42477ef138c7015069eb347704427bc8f5e478b39dc622337e372e6339996022,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,0.03632855415344238,0.036281585693359375,0.03887033462524414,0.03686881065368652,0.03792929649353027,0.03360795974731445,0.008396387100219727,0.15924739837646484,0.10961008071899414,0.6278622150421143,0.43663763999938965,0.06595563888549805,0.11078739166259766,0.031876564025878906,0.03196096420288086,0.031568288803100586,0.032305240631103516,0.03133893013000488,0.062322139739990234,0.6102666854858398,0.031969547271728516,0.032025814056396484,0.03056502342224121,0.03205537796020508,0.030562400817871094 diff --git a/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv b/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv index 2cae46c9ff..ee1ee15145 100644 --- a/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv +++ b/results/combined/merges_timed/kshchepanovskyi/zkcopy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,31218157e3efd720cd9fc792af1027a6e129dabb,55fa8bff2a05f6bdc8f7d555c566af41d8f7f1e7,c6ec352c54ca0c92a31a0a82805f3feb6e9d8633,,True,True,Tests_passed,19892ad83d2c86e6fc7caaab7e509cf0279c7ef34cebf16957714717d24922d0,True,13,54,784,2,True,Tests_passed,f95b97f48a36e71c1bb228030ae14a73f07e75d82fc2e94acc247d4cd73b9625,True,13,True,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,d62424b6fabf4ff0d08c441860c72564129add062d159f25738d345149a9e927,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,3dba44ca9ac461b520a81b19b24ca339b1db1b56d33bbf96786648650f57314b,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,741fd3e1cac2190aa03a653098633e528958d560e4c0ea7febc7a6bd9cd97d81,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,0.008119821548461914,0.00794363021850586,0.007814884185791016,0.007878541946411133,0.0077211856842041016,0.0075681209564208984,0.00789189338684082,0.03163576126098633,0.06493091583251953,0.6726126670837402,0.45885562896728516,0.06563186645507812,0.11797904968261719,0.03330588340759277,0.033481597900390625,0.03269505500793457,0.03271961212158203,0.03303813934326172,0.06295490264892578,0.7105774879455566,0.032683610916137695,0.03325700759887695,0.031816720962524414,0.03347897529602051,0.03132033348083496 diff --git a/results/combined/merges_timed/kstyrc/embedded-redis.csv b/results/combined/merges_timed/kstyrc/embedded-redis.csv index 3d94436f2c..eb0be1f995 100644 --- a/results/combined/merges_timed/kstyrc/embedded-redis.csv +++ b/results/combined/merges_timed/kstyrc/embedded-redis.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/master,378e7f02666fb1f92c9dd6c75945cec047d22e71,25ab5d2c2c9bf9a8c9986da2418c0a250278facd,84fc8f866cc3231f2f470c7b692f420ff2e8b2a9,,True,False,True,4,5,29,2,True,4,Tests_passed,ff1d5ad2a84fdac8e1cde6917b859eee9f2f0293f27da445c630733854631e63,True,Tests_passed,b813737b3a3e4451e7a3a14f01079878f40c36beaae1748ebb6b22a8bbefe450,True,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,0.05459928512573242,0.055043697357177734,0.0786890983581543,0.07867932319641113,0.07903099060058594,0.07799029350280762,0.07839345932006836,0.12685441970825195,0.11151480674743652,0.6164476871490479,0.29617953300476074,0.18588995933532715,0.2821509838104248,0.14905548095703125,0.150421142578125,0.15638422966003418,0.1488475799560547,0.1494896411895752,0.21387195587158203,0.7298767566680908,0.12982606887817383,0.12942957878112793,0.1341099739074707,0.12751483917236328,0.12425446510314941 diff --git a/results/combined/merges_timed/kungfoo/geohash-java.csv b/results/combined/merges_timed/kungfoo/geohash-java.csv index acbbea3b67..f38f676626 100644 --- a/results/combined/merges_timed/kungfoo/geohash-java.csv +++ b/results/combined/merges_timed/kungfoo/geohash-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,029fd4411871b99cef71407c432752c570fcfaa2,21ff41630c9dbd40e4674604d8e502b3c58937f1,90a2570b49e559dbe5f96308ae166bca5b3bf78c,,True,True,True,5,19,77,3,True,5,Tests_passed,f650c796a626ec4620a628f8c6ed258b5b390b36e12ade5ee7ea9572119486ab,True,Tests_passed,c007ff42eb0485334cb1d01ab28248e5973757159bd28d8b33f2513cdaca0f83,True,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,f9de71c4340538eccf9726aef84b126d7688fcaa1d79efe649fe00e6d75aa219,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Tests_failed,c3d3fa98a454a374a6288d6e326c7cbefcbf5421d68b8be21cc0a5660a8af9fc,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,b821e3536c92fb7927c1b5a490e912a7f80e62adcadf6b6c5d7e64be38cdaa6e,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,0.04041004180908203,0.03872227668762207,0.03928565979003906,0.037358760833740234,0.04120993614196777,0.0361475944519043,0.032424211502075195,0.21016883850097656,0.17875409126281738,2.020763635635376,0.38866186141967773,0.10485672950744629,0.12036991119384766,0.041905879974365234,0.04211091995239258,0.04223799705505371,0.04137778282165527,0.04159140586853027,0.08924365043640137,1.9324376583099365,0.042032718658447266,0.04149436950683594,0.03219437599182129,0.04259371757507324,0.032666921615600586 diff --git a/results/combined/merges_timed/kurbatov/firmata4j.csv b/results/combined/merges_timed/kurbatov/firmata4j.csv index bfdc60efac..cc94dbe5e8 100644 --- a/results/combined/merges_timed/kurbatov/firmata4j.csv +++ b/results/combined/merges_timed/kurbatov/firmata4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,9722516afce5dc1ea008fb69943435452f0d9711,6dca46a44bcb5e68cd4ed5bdbc7c038a945f8090,8347b46f3a7e5f193fb8204f132edcec14c08759,,True,True,True,5,12,71,2,True,5,Tests_passed,719c27ce57dcf4ec985bc8ee5d7cb8cc24c1096f7e65e547d4f9639941bcf0f6,True,Tests_passed,0ca0c3883e02c1d044e2b8751c87d26971af452f4c5c97765a04bfcec6a91a31,True,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,0.043005943298339844,0.04506993293762207,0.013389348983764648,0.04519367218017578,0.0523984432220459,0.011439800262451172,0.03736376762390137,0.04983234405517578,0.09946441650390625,1.0930955410003662,0.35974550247192383,0.07407546043395996,0.1259145736694336,0.04177212715148926,0.04206514358520508,0.04183602333068848,0.042315006256103516,0.041991233825683594,0.0752248764038086,1.043837308883667,0.04070734977722168,0.040994882583618164,0.030730247497558594,0.04089856147766113,0.02990412712097168 diff --git a/results/combined/merges_timed/kvladislav/ticketmanager.csv b/results/combined/merges_timed/kvladislav/ticketmanager.csv index 4b8212c0e8..9dca68b73f 100644 --- a/results/combined/merges_timed/kvladislav/ticketmanager.csv +++ b/results/combined/merges_timed/kvladislav/ticketmanager.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,0ffb612f18bf32b1151d82c321219aa31f901d08,75222d1bfa744f59f417a16bd670579a413b68fd,cc5170a2a39c7439223a358ea30fd1c0136006e6,,True,True,True,82,3355,35182,2,True,82,Tests_passed,f81997b3a344059a697dc172bcf17edb0405b61aa82cf6076895d88325df6d68,True,Tests_passed,fc2a4e15996e4f0fb8f610209a90c23c51225563c2a2dee8c5b80b3a731a9933,True,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_failed,ab4714c2dcea43bdc3dca6e38893c469faba838cf3b23a8e7c646ae896ae096f,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,0.08465003967285156,0.061246633529663086,0.054303646087646484,0.05151104927062988,0.07663774490356445,0.04426455497741699,0.05216169357299805,0.18009352684020996,0.12606573104858398,1.503511667251587,1.8277027606964111,0.15245294570922852,0.25128698348999023,0.1355292797088623,0.0798943042755127,0.13708114624023438,0.07990550994873047,0.1396169662475586,0.12590694427490234,1.5392355918884277,0.12847495079040527,0.07627558708190918,0.12842655181884766,0.07667684555053711,0.12001729011535645 diff --git a/results/combined/merges_timed/laforge49/jactor.csv b/results/combined/merges_timed/laforge49/jactor.csv index 501a194f64..c1c6f73167 100644 --- a/results/combined/merges_timed/laforge49/jactor.csv +++ b/results/combined/merges_timed/laforge49/jactor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,7d728819f4ae8ab3ba288ae10ee8ad69f01cdaa1,075f7d10416824c72519888c61a3488aa5be63b4,c032bd44475cfff2133dbb0ffea73d3ac7dda205,,True,True,Tests_passed,82c4064bcf7988ff7dcadf04b037899afa99121bf0a1bd201e2d52588b4208ae,True,8,25,234,2,True,Tests_passed,245bf5ad7dfefbcd1b67487c1a6e5ad4caf53e55f1d56a253aafd58d19df63b3,True,8,True,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,0.04442334175109863,0.043888092041015625,0.045567989349365234,0.04126119613647461,0.04208946228027344,0.03536367416381836,0.04481196403503418,0.1636219024658203,0.1097872257232666,0.621612548828125,0.28032422065734863,0.08396506309509277,0.1444101333618164,0.040996551513671875,0.05277228355407715,0.053522348403930664,0.045709848403930664,0.05526137351989746,0.09062361717224121,0.6492676734924316,0.04886770248413086,0.05096030235290527,0.029364585876464844,0.05229353904724121,0.040189266204833984 diff --git a/results/combined/merges_timed/laforge49/jactor2.csv b/results/combined/merges_timed/laforge49/jactor2.csv index 6a0fd9ce14..f7af9735a1 100644 --- a/results/combined/merges_timed/laforge49/jactor2.csv +++ b/results/combined/merges_timed/laforge49/jactor2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,3b4eebb16635f02dd3048051e26438d9071c7b92,fec3b93dd0e680380bc11bb029d868e1e2fefde9,9792bcf3370f0b667a09ab6b9bd84e82219738c0,,True,True,True,11,29,314,3,True,11,Tests_passed,6901f8f781ab4dc57d6b2f7f5d29ba23bbc2605c8169c6dc50b72014ae3fbcdc,True,Tests_passed,869af00b45054df1121746fcf16412c02c214cbcb51eac2729a1d862e78771f4,True,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,79a5a46da309f0c2302bb4307ad4667339bb35aacd9fa645ba0a011dcb9e591a,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_timedout,,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,d29ecaadfcced3a8ecc0d5eeb6f8694308a907c12164593eaf986716ae51b8c5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,0.03725004196166992,0.04851984977722168,0.038925886154174805,0.044777631759643555,0.032631635665893555,0.03399348258972168,0.04030346870422363,0.25691699981689453,0.17222166061401367,1.1422743797302246,-1.0,0.10190749168395996,0.1200718879699707,0.040940046310424805,0.04632282257080078,0.04103803634643555,0.04054069519042969,0.04052400588989258,0.08844614028930664,1.1549291610717773,0.041620731353759766,0.04703783988952637,0.03190279006958008,0.04183316230773926,0.03195810317993164 diff --git a/results/combined/merges_timed/larsga/duke.csv b/results/combined/merges_timed/larsga/duke.csv index 566510dda8..7aa67101f2 100644 --- a/results/combined/merges_timed/larsga/duke.csv +++ b/results/combined/merges_timed/larsga/duke.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,b5def8195d1e36fabcf3159c29a05b8998c2edf2,99eddc63255db9ad74aaff0a0a08174a950c9175,1ba93c26741ec856fc2304c722f8fc6c3c949040,,True,True,Tests_passed,aaad12b3d4ff0c0c7a8c7ac3032557079ae70a00b62321e0308e1d975d96d09d,True,16,55,299,2,True,Tests_passed,8b20d1c6e073cbad254f36d0b963b48faf273070ed6bae38c61442013dcc3f94,True,16,True,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,0.04549241065979004,0.04026079177856445,0.046247243881225586,0.03186345100402832,0.01846456527709961,0.04452395439147949,0.04460310935974121,0.17837119102478027,0.1130075454711914,0.6915702819824219,0.541269063949585,0.07263684272766113,0.26970911026000977,0.04528236389160156,0.144212007522583,0.06403088569641113,0.04151296615600586,0.14682435989379883,0.19536423683166504,0.7884743213653564,0.1232004165649414,0.04246997833251953,0.031087875366210938,0.12172317504882812,0.11867880821228027 diff --git a/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv b/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv index a423f3215a..bc33fe2916 100644 --- a/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv +++ b/results/combined/merges_timed/lazaromedina/flume-ftp-source.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,True,17,104,572,6,True,17,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,73eed9e18c29076acc150004b0c6a97762c8101939281a5f801de0c80f1e715c,Merge_failed,f4a5f74be4c1c3d51605f780b6600b6a31eb91a0cd2e8c30b08b92b7f5d13275,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,0.04962968826293945,0.03596329689025879,0.04900050163269043,0.04125809669494629,0.03921031951904297,0.040515899658203125,0.04734969139099121,0.4349236488342285,0.35172319412231445,3.3680779933929443,0.595412015914917,0.1954648494720459,0.14682531356811523,0.0660092830657959,0.06625652313232422,0.06701183319091797,0.06765365600585938,0.06640148162841797,0.16187572479248047,3.2047922611236572,0.0662994384765625,0.06545281410217285,0.042403221130371094,0.06709957122802734,0.04324793815612793 diff --git a/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv b/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv index 73e5e8f188..6a58a7a877 100644 --- a/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv +++ b/results/combined/merges_timed/lbehnke/hierarchical-clustering-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,147fc13e7c56047ffba691a9f7cb157c3b37e835,fff2a86e05b3bff17289ca2980394033d15f3afd,79b889c0a0e43e47e79f4dcc7468a479d9b5b209,,True,True,True,17,58,290,3,True,17,Tests_passed,568ee0ffea1a6ae7efab3ca3968e0b991bf811e1ed61d97147c2ee614962544e,True,Tests_passed,652309c7bf4d663792082ff894d0b047a9261769f56ec7478d637a095fd6832a,True,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,4fb5341de5a0ce773736d5841f3ff20c88c8fbe5ee27461fffe6826f486cc9ed,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Tests_failed,0bbd1f7406a01938032409a1688c8d30c3e72bc3d7089d001a97c06fa26e5432,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,a11ba454b9e92815268c98b3e132ec1d786ba1e4c232330889dd8759a168ee58,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,0.03850531578063965,0.03855276107788086,0.043771982192993164,0.03499412536621094,0.04559803009033203,0.03747677803039551,0.04018449783325195,0.2372589111328125,0.17659735679626465,1.0992512702941895,0.5370993614196777,0.10635733604431152,0.12096762657165527,0.041471242904663086,0.04617476463317871,0.040813446044921875,0.040361881256103516,0.04102897644042969,0.08914899826049805,1.1308605670928955,0.04186534881591797,0.04674792289733887,0.032070159912109375,0.04162907600402832,0.03222465515136719 diff --git a/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv b/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv index d98b3840ac..7c6a25aa16 100644 --- a/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv +++ b/results/combined/merges_timed/lbroudoux/es-amazon-s3-river.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,2aa45336dcc877155d7df5063071f37a86368271,41e6ad6850eeab69700979c1b972f8bd771aba67,b36560bc1985367325345e5244383c223b948a38,,True,True,True,11,79,525,3,True,11,Tests_passed,70a4b2be6ec8bcade189d2322ab21a7703c0f32c82c0797d5e41eb656809a15f,True,Tests_passed,48af516ec7212a877ccf2a5ee2d6216d03fd3342a7d8f7d18693276ac9487431,True,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e916a1a1f66febc4c200c730083c9c9fb53d468f8ac0d61c23d2e8c919f14ae5,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,adea0ce69921bf6c5f6a3f41b8515eea1b1cbb9bf07f54ed8aa127c9b53cfa10,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,bac4c5a3e88eeb5b33c1ecd3ba60b7e321472c8d160008b4c5ed6e0c922a4f6a,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,0.010426521301269531,0.03499627113342285,0.009773492813110352,0.01041722297668457,0.0433506965637207,0.034964561462402344,0.03647470474243164,0.04981350898742676,0.16113877296447754,1.3190176486968994,0.4812631607055664,0.09983658790588379,0.12241554260253906,0.04261922836303711,0.04248046875,0.04201793670654297,0.04260611534118652,0.04162931442260742,0.0893864631652832,1.2143361568450928,0.0428926944732666,0.04212450981140137,0.03420448303222656,0.04321002960205078,0.03409314155578613 diff --git a/results/combined/merges_timed/learning-layers/socialsemanticserver.csv b/results/combined/merges_timed/learning-layers/socialsemanticserver.csv index 3546be7457..c5737cd2a3 100644 --- a/results/combined/merges_timed/learning-layers/socialsemanticserver.csv +++ b/results/combined/merges_timed/learning-layers/socialsemanticserver.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,6a7dca76f4993e256c13ab95b0e38d9b40847fe1,e157f975436908a1549d415cd3c0737252a6a3ca,6fd7ecaee5436da1772a43577ddf209a559c638b,,True,True,True,160,550,7743.0,2,True,160,Tests_passed,0fdc2b5d64148e7e627ce70acdfdf13af73f96400765e5de21553aead1bf5d22,True,Tests_passed,a88d0f618915901dcf0fd5eacaf320a2f63319ecda72842120da3730ed9e6d3b,True,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,c95f77a7c28b27adcc4def2562aeb16c5efefa325b4883a89be21b4512744efc,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,c6948269d794d25fa289b9538f7e6542859ef77cc9a195f70af0f1a7f92fba55,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,aff13ee4d360b93ce8cdd0a5e2d36b0dce14b65d487cd7eb7a5c3625b672ad05,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,0.04172086715698242,0.04273509979248047,0.04770517349243164,0.0470278263092041,0.047437191009521484,0.047283172607421875,0.04734349250793457,0.12096071243286133,0.0985260009765625,0.5605406761169434,2.9497411251068115,0.12112021446228027,0.17191362380981445,0.08597826957702637,0.08748674392700195,0.08638906478881836,0.0844106674194336,0.08314204216003418,0.13115262985229492,0.6510739326477051,0.0791785717010498,0.0782785415649414,0.07890820503234863,0.07885980606079102,0.0789024829864502 diff --git a/results/combined/merges_timed/learnlib/learnlib.csv b/results/combined/merges_timed/learnlib/learnlib.csv index d80cb3a1e1..ce11328ae0 100644 --- a/results/combined/merges_timed/learnlib/learnlib.csv +++ b/results/combined/merges_timed/learnlib/learnlib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/develop,cd89d29fb60db46bc9908025a3bac8a4f253646c,d930e2c5a91eabccee450f80485b4c3c1c842b96,162dc4f957254055b04003d39af4a20dee5de8e3,,True,True,True,53,70,166,2,True,53,Tests_passed,9a85af09753d9a59b787eb63d093f7c121e4d67ae2751f95b33445f9b394cfb4,True,Tests_passed,9ae2202e3577e34c5824e90d9490186d713606d17d761778c2144ff5ffb6c6fe,True,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_failed,4d5bec1bdb37ff0d93fdd03cee480eac051ac262e7b8df59e8924af5563dd7aa,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,0.07172513008117676,0.049697160720825195,0.0421295166015625,0.06614875793457031,0.06630849838256836,0.05513882637023926,0.050566673278808594,0.19201254844665527,0.13240408897399902,1.030048131942749,0.5859131813049316,0.10671830177307129,0.14719533920288086,0.0721278190612793,0.055689334869384766,0.07073712348937988,0.06103801727294922,0.05649447441101074,0.11686992645263672,1.0040481090545654,0.07013845443725586,0.05765652656555176,0.04449939727783203,0.06577920913696289,0.04304313659667969 diff --git a/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv b/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv index bf6304f8a5..f9297e5156 100644 --- a/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv +++ b/results/combined/merges_timed/leeadkins/elasticsearch-redis-river.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,0fe21428a65e166b0f69d4c533427043a443ead3,989b186f8f1eb0f34a44e9531131055a7956b253,2bf2964b787ca526f0271c387286bbc59d806fd6,,True,True,Tests_passed,c80191169baa07a1484204f4390111c23128862ad134644336cc5aac07910a2f,True,5,33,64,2,True,Tests_passed,56c598b4bafaeed4da68944dd3eddf97ac676f67e5afaebd999f804708743b5f,True,5,True,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_failed,86c99fd9f3ee3830ffc2a80c9e205f8a48b204ae67237c9f5f395f773df83ec0,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,0.04007863998413086,0.04116630554199219,0.041780948638916016,0.03985929489135742,0.0411226749420166,0.04192066192626953,0.043111324310302734,0.16118335723876953,0.11271953582763672,0.8872554302215576,0.3512580394744873,0.06830906867980957,0.11935162544250488,0.03743553161621094,0.03768038749694824,0.03726959228515625,0.036907196044921875,0.03713583946228027,0.06863045692443848,0.8654673099517822,0.037034034729003906,0.03673100471496582,0.025676727294921875,0.03710508346557617,0.025769948959350586 diff --git a/results/combined/merges_timed/lemire/externalsortinginjava.csv b/results/combined/merges_timed/lemire/externalsortinginjava.csv index 9b62dfe898..5c4b5714f7 100644 --- a/results/combined/merges_timed/lemire/externalsortinginjava.csv +++ b/results/combined/merges_timed/lemire/externalsortinginjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,f6d54664fa3728e2303749b4e09fbca4d362b339,689d56f5f24b0a6a00f3fbdab2c96424f4c25c15,90587af600670f741c1a38134dee2ea7f6598743,,True,False,Tests_passed,08e4d523f5eb4a03a50a26328af879917d4146b903676db7376d61c590c3aebc,True,5,53,313,2,True,Tests_passed,0c6e9b82836630a7c2e3bb545824d65f828770f1d0f49e34739a40e3d36398fa,True,5,True,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,fdcfda25c94e8c9e3fd8f447611a2946612a428774c11493ca1b21b42c65141e,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,527ab42c4e8e805b425643bef30b5308e021483c3d8cd6981a96b86a39302a48,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,d963b45b548ddfa273d092e60c29854d6d88a79a967e3eb9dbc21e6e715feb41,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,0.0433504581451416,0.04420757293701172,0.03700423240661621,0.04413866996765137,0.040822744369506836,0.0417475700378418,0.03659772872924805,0.1664748191833496,0.10921001434326172,1.2440025806427002,0.39176392555236816,0.07589197158813477,0.11124944686889648,0.03300213813781738,0.039957523345947266,0.033522844314575195,0.03327751159667969,0.03419303894042969,0.06327199935913086,1.144697904586792,0.03399300575256348,0.03877735137939453,0.03250837326049805,0.03414630889892578,0.03230452537536621 diff --git a/results/combined/merges_timed/lemire/javaewah.csv b/results/combined/merges_timed/lemire/javaewah.csv index 30829fc693..0913587f4b 100644 --- a/results/combined/merges_timed/lemire/javaewah.csv +++ b/results/combined/merges_timed/lemire/javaewah.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 60,refs/heads/master,5829fc009b15699da618ec8fb4db9fe1662f20bd,b3d4c01db3a3f995dbe891cd8b1cb7b7ca518f49,735652d1068fa30e634d80de86ac9617f6182a57,,True,True,Tests_passed,388ace8eeeebd3061aa3153722574954a9895660b77076e729f3bc167370a1aa,True,20,107,2721,2,True,Tests_passed,79ff8ac147b42b8fb5ec46d79cce9e471854fc3797fceb73c290052607ad667e,True,20,True,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,4d5e86e6da2f9f9c641a94e6769762fb5c66bb38b19b44c021f504f5fac45dcd,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,4d5e86e6da2f9f9c641a94e6769762fb5c66bb38b19b44c021f504f5fac45dcd,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,Tests_passed,fbc8aa46eb24fc8ff11058bf432c26804deb5814485bbb6cf7439bdd4364c0e0,0.047254323959350586,0.0487518310546875,0.044136762619018555,0.04156136512756348,0.06313037872314453,0.058278799057006836,0.05597209930419922,0.19536614418029785,0.10270237922668457,0.967036247253418,0.7352776527404785,0.07557010650634766,0.1328880786895752,0.04751253128051758,0.0466158390045166,0.04640674591064453,0.04668998718261719,0.043210744857788086,0.08014822006225586,0.9723725318908691,0.045728206634521484,0.04411053657531738,0.03544473648071289,0.046071529388427734,0.035008907318115234 diff --git a/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv b/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv index 842e840d5e..765114d3c2 100644 --- a/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv +++ b/results/combined/merges_timed/leonlee/flume-ng-mongodb-sink.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,6e95fc2cbcb962d885349d74fdc5a51bab767964,c7bbbbc61771590b83a5fd19fec74a6f917404ab,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,,True,False,Tests_passed,19990caf97b5a366543e127703f1c1358d8c24d85dc6b3636ac49ea570fe0ffd,True,3,26,68,2,True,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,True,3,True,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,657082fb3e14a125d948a56f4ddf0da5cda5a98d1aa3ef0f849409b1067e494d,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,2b3464f870314f0c389773a4f4a1d37adf87ab26f51631a6751a76770c57e354,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,d9c3c8da799b13c7551bea82bb4c4e8b9e49522a42a1a1e4d5d96e37ae525976,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,0.008632183074951172,0.008667945861816406,0.008685111999511719,0.008541584014892578,0.00852513313293457,0.008783340454101562,0.008538246154785156,0.036141395568847656,0.07352519035339355,1.2483654022216797,0.3712320327758789,0.0745096206665039,0.11324310302734375,0.03214883804321289,0.032742977142333984,0.03300642967224121,0.032820940017700195,0.03284454345703125,0.062384843826293945,1.1199307441711426,0.03283429145812988,0.032595157623291016,0.03063821792602539,0.03281807899475098,0.0303189754486084 diff --git a/results/combined/merges_timed/lettuce-io/lettuce-core.csv b/results/combined/merges_timed/lettuce-io/lettuce-core.csv index 0b3fb496ad..967464eca5 100644 --- a/results/combined/merges_timed/lettuce-io/lettuce-core.csv +++ b/results/combined/merges_timed/lettuce-io/lettuce-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/main,dd997ac4b36fbe5b5cc6c3fe693ba9c524960d05,ace28afc371c993d35b471c2277ab522ceb7b631,caa06f44929bf41a1f73bdcf09eb8db5885c7001,,True,True,True,68,300,2787,2,True,68,Tests_passed,28fd8f90c6636b22add23662e41398c474584baf86bab9a316408247dd46689d,True,Tests_passed,6918532642f8665614890dbde4286a829c797c39916a82c902261f8e634b0af6,True,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_failed,f1c94e0dce32d814d39244c46b06552251b45728c48df3e5122649385f77261c,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,b9f51d66b985046efc15b5696da644209f02572033695c3bef55b046a79aca75,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,Tests_passed,be320115e4933f0f3f8d74bc1602c9c0491e4d99e8b2f00660fec29793504295,0.05300426483154297,0.049329280853271484,0.036774635314941406,0.053617000579833984,0.047768354415893555,0.05322599411010742,0.03701353073120117,0.1949765682220459,0.12177395820617676,1.007312536239624,1.097792387008667,0.09766697883605957,0.1397871971130371,0.06352353096008301,0.06354308128356934,0.05188584327697754,0.06522107124328613,0.06625604629516602,0.1028280258178711,0.9729197025299072,0.05749773979187012,0.06013226509094238,0.0525662899017334,0.05715179443359375,0.04886913299560547 diff --git a/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv b/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv index 2f7f87eef1..a4fddab8bb 100644 --- a/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv +++ b/results/combined/merges_timed/leveluplunch/levelup-java-examples.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,db0acd81d124fd8af863c20728e0afcf3adbbb0e,cd0b409006035fcb9e48bb075b58aac1cf6d4192,d6723a2397460e5ba08e2d9ee45bb78a816100ae,,True,True,True,9,10,631,65,True,72,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,True,Tests_passed,f2491f5f279546d648cbdffe352a5249c60d8d923f52b0a3a31c79ade7207d5a,True,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,c62ea37ac6c9e2743cb490b52b1850626cb7d0b181e29c538dd548ede7a8e2ff,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,f3803935988be5db69ca9e3a96bb4f11796d95e61290b2ca345bb0c3420681c4,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,caa4326dae64dffadc952180558d17fb7550ae1fd9b4e377eed762970ced741c,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,0.04309582710266113,0.05026364326477051,0.04044079780578613,0.03849482536315918,0.04684710502624512,0.03870201110839844,0.041641950607299805,0.16371655464172363,0.1273632049560547,0.6868512630462646,0.7015149593353271,0.08025169372558594,0.11858797073364258,0.03735709190368652,0.03688693046569824,0.0383298397064209,0.03741884231567383,0.03728628158569336,0.06928300857543945,0.6996924877166748,0.03761124610900879,0.037816524505615234,0.03556537628173828,0.03807568550109863,0.03516578674316406 diff --git a/results/combined/merges_timed/librato/metrics-librato.csv b/results/combined/merges_timed/librato/metrics-librato.csv index 2c2d0f0721..561a8b0245 100644 --- a/results/combined/merges_timed/librato/metrics-librato.csv +++ b/results/combined/merges_timed/librato/metrics-librato.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,0720f6dce4f8da338bbfcfa9e2c0009de7772709,a0891f0785d08d8abaaf3dc84009bd8769d4ca8a,5afe7a103adde58eab777f26fcc616f06601207d,,True,True,Tests_passed,8bfc3fd9e58392e008801f2a7ecac6df5095545d1b829d0d16b0c289206194a4,True,6,32,159,2,True,Tests_passed,8e27d6b8f17a98c1b5d2dc4ea8e66e06e99ffd05081dcd909ca669c52d342b37,True,6,True,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,0.04018378257751465,0.04546380043029785,0.04538583755493164,0.045890092849731445,0.015216350555419922,0.011353492736816406,0.011136054992675781,0.16006040573120117,0.11980175971984863,0.9072237014770508,0.4135127067565918,0.06792140007019043,0.12114667892456055,0.03869271278381348,0.0384368896484375,0.03845858573913574,0.0385584831237793,0.038132429122924805,0.0702822208404541,0.8907525539398193,0.038587093353271484,0.03829598426818848,0.027317523956298828,0.03747200965881348,0.027623653411865234 diff --git a/results/combined/merges_timed/linkedin/camus.csv b/results/combined/merges_timed/linkedin/camus.csv index 606bd2681e..673441e0a5 100644 --- a/results/combined/merges_timed/linkedin/camus.csv +++ b/results/combined/merges_timed/linkedin/camus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,05c0ceebfa45c20f5e1b584888fa5a9a5ae8c6d2,3f3ab0a3888ab9bbde8670a15f81404b5094ad91,e5694615ec635a2a10b6b8e52045b461ed9838b6,,True,False,True,5,6,34,2,True,5,Tests_passed,b87be47c4b81bebdaeb7e1e19e0d1a498723b7cd3a05e3e73d0a19f3aed47b28,True,Tests_passed,67e6913684581a54b4e6d211718756324deaff08231c368e10ae9db988045c02,True,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_failed,1d627577bc898fe14d16939dff010cfc65fe62fb1bb8dd11833b0bc440624ee4,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,0.03269696235656738,0.033345937728881836,0.04568600654602051,0.04501152038574219,0.04571127891540527,0.04559636116027832,0.04497075080871582,0.08199763298034668,0.08738255500793457,1.317577600479126,0.601356029510498,0.0717461109161377,0.2104353904724121,0.10486054420471191,0.07624459266662598,0.10554647445678711,0.0830695629119873,0.10278081893920898,0.10906243324279785,1.353156328201294,0.09283328056335449,0.041658878326416016,0.08869028091430664,0.08652091026306152,0.08746743202209473 diff --git a/results/combined/merges_timed/linlinjava/litemall.csv b/results/combined/merges_timed/linlinjava/litemall.csv index b37582b1c8..f08f598d96 100644 --- a/results/combined/merges_timed/linlinjava/litemall.csv +++ b/results/combined/merges_timed/linlinjava/litemall.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 123,refs/remotes/origin/pull/101,2623ec262305e76dc212afd10d0311cbc85fe81b,794aa4273eb6b746255b75a5e98805f57b5aea9c,570fff521b73bcdd0d4ec16906f7fc55e385946d,,True,True,True,79,193,16277,7,True,80,Tests_passed,4f50ed8b3507b9acccc1d2d02a3da27311ca04f4f278a345b1d55e2cc6e0b708,True,Tests_passed,e814eb628324b4f1e56b351940fa93219f1a7d6eed29913d539fd83086689a5b,True,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,c462aaac5034e7d1e65aab8a1cef70594ab62879059558f117a2404f6372b555,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,4c526b0e2f6ce764e882e57e8be261f65328c15c3373a2d04d3f85d3fa205b60,Merge_failed,b7dc61bfdd826e75b7b3c3c3da1b389c6d68a3cb43635cb50eda2c56ac334c35,Merge_failed,c13bf330d70872f29a71d8cb393fcb376b1cf8ec0eb59ae142b82305d98938a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,b1fc726b80f3f62562f39760b08b8cffcbc1f0f152f9e24083523e2cd5248921,Merge_failed,3c9c4a48ee7330bc2216d6863a765a50356d7b3a2e91dce9311d2e0956d6da98,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,6e3a526f8fb29d9927f171b1a4239582bf499b8e307c0651f8cbd788401fd8a5,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,Merge_failed,e8a65d9cc31574c8bcee1dbcb03f21682dbbdfbe629f61fefcb61faabc6721d1,0.11330986022949219,0.1005549430847168,0.09755229949951172,0.11331534385681152,0.11189818382263184,0.10906863212585449,0.0946352481842041,0.4250493049621582,0.4702432155609131,0.7077407836914062,0.9391429424285889,0.39247822761535645,0.3003826141357422,0.21164608001708984,0.20803260803222656,0.21150779724121094,0.20634198188781738,0.20531630516052246,0.3424856662750244,0.7950103282928467,0.20097780227661133,0.2017822265625,0.1908857822418213,0.2019975185394287,0.195051908493042 diff --git a/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv b/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv index 0616931dc4..2874cc88a4 100644 --- a/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv +++ b/results/combined/merges_timed/linsolas/casperjs-runner-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,98fccc0f940917225388733e66237404f374cdfc,bc49d4bec72a513a71898b54a82f7b58fd31bd75,3596606660beafd4e9f86deefb33adc264146b1c,,True,True,True,13,35,151,2,True,15,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,True,Tests_passed,97cbd5b06e0dde7adff256e50dbd2bc99fb11308c11727d7e7ddb8f7a32ae6f1,True,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_failed,9a7c3dd7c8697f8b2aad685923434c8b7d0dc4db2fb4a750fdcd7a2ba9b13d9e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,0.04230976104736328,0.049169301986694336,0.041414737701416016,0.04933023452758789,0.04165315628051758,0.0445706844329834,0.046222686767578125,0.1654796600341797,0.1234736442565918,1.0100643634796143,0.3309004306793213,0.08251452445983887,0.1484663486480713,0.04584503173828125,0.048233747482299805,0.046506404876708984,0.046958208084106445,0.04642200469970703,0.08214545249938965,0.9815413951873779,0.04590559005737305,0.04622220993041992,0.0341649055480957,0.04537153244018555,0.03403067588806152 diff --git a/results/combined/merges_timed/lintool/clueweb.csv b/results/combined/merges_timed/lintool/clueweb.csv index e024a21558..9cc1a40309 100644 --- a/results/combined/merges_timed/lintool/clueweb.csv +++ b/results/combined/merges_timed/lintool/clueweb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/pull/2,f9181ca9b2aaa753c6ad6682c104ff86b3ad61ca,aa26f1b3650bb1f473ce4f7da5ead01e6a3b7a6e,9903285c0c486d0cb92e662a16fb338061c32cd7,,True,True,Tests_passed,36b130f3322f6322729db4e99b129b597027e4a340248c309d581a485da296e4,True,58,130,14456,10,True,Tests_passed,dfe00cde5ee8a26404891cf942f4796a75fe1098c4c6921a5078bb128a39bdac,True,62,True,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,097874d253ae2b46505cd6f042772daede1177c0e71ae2bc5949293daef62a6f,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,11b4a6ab6c9ae9f3d6b25238f22a45ea88a6f0a5ba88eaddb60b3298959eaa0f,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,18341545050199f835edbab9762059e94498543564c2cacde95bbdc24824bc8f,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,0.04852461814880371,0.05529189109802246,0.06383395195007324,0.05458569526672363,0.06364154815673828,0.06183457374572754,0.06898283958435059,0.3765068054199219,0.28128528594970703,3.8125829696655273,-1.0,0.23246526718139648,0.23732233047485352,0.13410282135009766,0.13300657272338867,0.13248968124389648,0.13143324851989746,0.13022708892822266,0.26193952560424805,3.7940468788146973,0.11610651016235352,0.12625670433044434,0.12438416481018066,0.12219429016113281,0.11300182342529297 diff --git a/results/combined/merges_timed/lionsoul2014/jcseg.csv b/results/combined/merges_timed/lionsoul2014/jcseg.csv index 2952e5b3de..ffefc88d18 100644 --- a/results/combined/merges_timed/lionsoul2014/jcseg.csv +++ b/results/combined/merges_timed/lionsoul2014/jcseg.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/heads/master,a86200ceb8b239ff7c3dfbceb5bcd4df8ea0cf96,0e7ba00efa11c9a060b19f9951bdc6daadd6049c,1dec9143e14c98f774d64cb71c7f63938d420d28,,True,True,True,28,156,577,4,True,28,Tests_passed,f6188fd8729fb13be98adf439de0fcc58537c479e00fd3a37cf05c8c2358e5fe,True,Tests_passed,a906d0492828079b957e3a285c5b3799cf2c4043f56784c9af9f85d7f8852f4b,True,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,0.04664802551269531,0.046477317810058594,0.06439399719238281,0.06397366523742676,0.06470799446105957,0.05585670471191406,0.06449246406555176,0.15077662467956543,0.20714783668518066,2.0143930912017822,0.5909550189971924,0.22037911415100098,0.2631645202636719,0.06044292449951172,0.1509561538696289,0.14609718322753906,0.14317083358764648,0.14799904823303223,0.2079331874847412,2.08050799369812,0.05825495719909668,0.12132525444030762,0.11049151420593262,0.12390398979187012,0.03230428695678711 diff --git a/results/combined/merges_timed/liyiorg/weixin-popular.csv b/results/combined/merges_timed/liyiorg/weixin-popular.csv index 9efa7f6d3c..a0b616e952 100644 --- a/results/combined/merges_timed/liyiorg/weixin-popular.csv +++ b/results/combined/merges_timed/liyiorg/weixin-popular.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,True,34,89,3176,2,True,34,Tests_passed,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,True,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,True,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,b02773877527717f1e1d5e7e89860278c7e9f623d3bb3a7ab758c2f5febec25e,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Tests_failed,b2518a1af05242bb1e273519d62bb0e8c7dcd4f59821c7d42dc68f66e7156692,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,3ec29058271afd3a63e24cea7057fdc83ea347a1f09f47610bd5f9d942ddc065,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,0.04822850227355957,0.04094409942626953,0.0430302619934082,0.04453873634338379,0.050733327865600586,0.05132246017456055,0.05858111381530762,0.17635488510131836,0.12128210067749023,0.45008349418640137,0.6279382705688477,0.0766143798828125,0.11929059028625488,0.03945350646972656,0.038834333419799805,0.0402531623840332,0.04185342788696289,0.04069948196411133,0.07318115234375,0.4600670337677002,0.04086947441101074,0.038990020751953125,0.04813408851623535,0.03977084159851074,0.04023385047912598 diff --git a/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv b/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv index 4f8684043d..10a375e8ea 100644 --- a/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv +++ b/results/combined/merges_timed/logstash/log4j-jsonevent-layout.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/remotes/origin/fasterxml,ee90110799a7b6f905dbda921690e43cdb8b7b08,dd57077b747f5e849172d48e96a48fe6fc538e0a,f84aca0ec9e49f60c64d7fde80f8d8b1acc3847a,,True,True,True,6,55,210,4,True,6,Tests_passed,cb3f99299108e0a3a01edeef8f27e66587f470dd039275ecfe0f386d2ae464c7,True,Tests_passed,4060031dbf743f20d701089480376adcdfcf4c437d24e0b0f34ad46f165e6e0d,True,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,637e5ac5dbba75574bf5f9e33434d92ac8fa499178f41c695d3df3c858e0ede8,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,c9ab9521ec5af787988c4b30b5b3658798fa043742fec6c1b12e7ff816dbb4de,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,01da2a68ed6fd0a77a71cf69496cff5f627411b81b231c75c506084a7f921f5a,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,0.0380861759185791,0.041742563247680664,0.0353083610534668,0.036516427993774414,0.04074859619140625,0.04034876823425293,0.039720773696899414,0.2871897220611572,0.2534513473510742,1.4109880924224854,0.3136770725250244,0.1452019214630127,0.12746977806091309,0.047720909118652344,0.046224355697631836,0.0460050106048584,0.04642987251281738,0.04700446128845215,0.10973620414733887,1.4458885192871094,0.04809427261352539,0.04629683494567871,0.03813052177429199,0.04743766784667969,0.0389552116394043 diff --git a/results/combined/merges_timed/logstash/logstash-logback-encoder.csv b/results/combined/merges_timed/logstash/logstash-logback-encoder.csv index 2d064b002a..1c5c1c9c1e 100644 --- a/results/combined/merges_timed/logstash/logstash-logback-encoder.csv +++ b/results/combined/merges_timed/logstash/logstash-logback-encoder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 253,refs/remotes/origin/pull/649,e8d87859b576c378a49d72d807bc5b0a96c44bc9,69ab39bb3d358438cb047fdd10f9ff440f840609,c87a732681f82eae948ff0d62d9df91087a875fe,,True,True,True,64,331,2882,3,True,64,Tests_passed,ba5edbc5e2848f3b7a4d73e2fe6d8921808b7daa07c0edc566416e623e581cbe,True,Tests_passed,29993c5f9a7b1e3b343d3539ac066104f4ef0bf3a97c937ea9442cd16249d027,True,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,7831f4637b8307a9ca88209009e2db03b66c8ba6bafd4f04b0dc331addcce594,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,Tests_failed,d871a2fac3f848b05945b268c080d089f5258d579564058974ea679ae033939e,0.0427398681640625,0.04806017875671387,0.05511617660522461,0.0682518482208252,0.06818628311157227,0.0661153793334961,0.06399106979370117,0.2393791675567627,0.1630089282989502,0.05350661277770996,1.6563451290130615,0.14899110794067383,0.2001962661743164,0.09748196601867676,0.07586836814880371,0.09212756156921387,0.09139680862426758,0.09875345230102539,0.14301300048828125,0.09425711631774902,0.08943867683410645,0.08689093589782715,0.05934453010559082,0.09047675132751465,0.07083392143249512 diff --git a/results/combined/merges_timed/lookfirst/sardine.csv b/results/combined/merges_timed/lookfirst/sardine.csv index d36beb038f..78fcfe47b8 100644 --- a/results/combined/merges_timed/lookfirst/sardine.csv +++ b/results/combined/merges_timed/lookfirst/sardine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 50,refs/heads/master,d8abcbba75a4c96f3cca249d3c06d9818030318c,8d256c63babee5c3117fe1535d39035d0eafc68b,243b88556f5fb3aa45cc5ea6d00e2dce6e61c862,,True,True,True,2,7,15,2,True,2,Tests_passed,60ed52e2b39693e5369478b5f540c0d9f31814727d200b4703625bc8225ebc80,True,Tests_passed,10dafbeb5a38be85664c5aa6fc08a7cb5699e7c0e78c896a83a5a265545ad133,True,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_failed,effb3a4b39cfa0d232b78403259ba14ceab13a7820652585ae920263367f6c59,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,0.04456901550292969,0.04390263557434082,0.04284381866455078,0.04481697082519531,0.0423581600189209,0.04619121551513672,0.04362297058105469,0.16859650611877441,0.09911894798278809,1.536536455154419,0.4199850559234619,0.08181262016296387,0.13701224327087402,0.04889488220214844,0.05009126663208008,0.04943370819091797,0.04951810836791992,0.048562049865722656,0.07242536544799805,1.462967872619629,0.04744744300842285,0.04722166061401367,0.03717470169067383,0.04805493354797363,0.03817391395568848 diff --git a/results/combined/merges_timed/lukas-krecan/json2xml.csv b/results/combined/merges_timed/lukas-krecan/json2xml.csv index 168823465e..18f2f7df5d 100644 --- a/results/combined/merges_timed/lukas-krecan/json2xml.csv +++ b/results/combined/merges_timed/lukas-krecan/json2xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 50,refs/heads/master,3716f42238f1a1f0754f1ec2755b4a88cbdecb4b,dbe1af5e3aa815d9ffb8a0154ae5da21703c102d,c0dd9688d2e602d50ef4183e6d7a55f71cada211,,True,True,True,11,19,254,3,True,11,Tests_passed,5802cfbdbe4e38451e00a5db2afd2d1291deaf773e1b6270b1c6fb6cf15ac9ba,True,Tests_passed,a031b8e7f38d59255e43ba27c63f546cea243ac055be580b7289b80988b06338,True,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_failed,2f35ea7dac667abd88db40dc058659210799ef2ad08dcc408bb4a4ed79730de9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,0.04297327995300293,0.03908562660217285,0.04451870918273926,0.04285860061645508,0.041947126388549805,0.039423227310180664,0.03841066360473633,0.23326611518859863,0.1629347801208496,1.2023577690124512,0.42671990394592285,0.0972437858581543,0.12747955322265625,0.045865774154663086,0.04563426971435547,0.04552173614501953,0.04512143135070801,0.044725894927978516,0.09306812286376953,1.1493232250213623,0.044378042221069336,0.04492449760437012,0.02689385414123535,0.04466414451599121,0.02751326560974121 diff --git a/results/combined/merges_timed/lukas-krecan/jsonunit.csv b/results/combined/merges_timed/lukas-krecan/jsonunit.csv index 627b4c9e73..ac90686c17 100644 --- a/results/combined/merges_timed/lukas-krecan/jsonunit.csv +++ b/results/combined/merges_timed/lukas-krecan/jsonunit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 376,refs/remotes/origin/jackson-1.x,7a61777fca87b6c906be80940781f2ae80f36d82,c90ae65409409c029aed9a4f95969dbc2e41ea84,eda93eaa04a531de2708c32ce2c63e1a66754685,,True,True,True,13,27,110,7,True,13,Tests_passed,d8a6c5da9f1d2830cffa9690d70a91d3c93dc83aa91a106dd889ace4098f36bb,True,Tests_passed,1d552a224c717e6295cfed4d78ae6dcca290dbe0908144f6b94c531f55c4069f,True,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,ddc993693d98f2fc4f81f907d0e2f51e47e1eda6566f676688978f150f3b5219,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,62bc03afb42bea8ac00e8e2163d494c1771e09bd3def111b1fdc17201ae4f3e1,Merge_failed,ccfb789367ed0885d5249d98f5b42ab79634ea88c770454c78a49a4ca5902734,Tests_passed,773fb305d89906a431249b11848e306626316b2349359b6a0f4427410dcdd881,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,b0ac8fc2f0a1019c93d9cd14d8e25726d4086d030ef06cf2c4235a03258927db,Merge_failed,c36523581fb0a7bbd80985d49a87b8ba95a255a648ffc7a0168f305f1080be22,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,970b74605e4902a6223f7a406e60cafeb563609ab64e3229e4963e12b2c20c8b,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,Merge_failed,7d6c4ff4a9b17d5b8b387c20d67dda0d1bc858e7a911aa5a01152eda734d91e5,0.03705763816833496,0.04350924491882324,0.043884992599487305,0.04209494590759277,0.04614448547363281,0.04389238357543945,0.04522132873535156,0.4717438220977783,0.40268921852111816,1.801511287689209,0.3860924243927002,0.23445796966552734,0.15039515495300293,0.07160139083862305,0.07027149200439453,0.07111549377441406,0.07120227813720703,0.07054924964904785,0.18163347244262695,1.711390495300293,0.07039022445678711,0.07139110565185547,0.05458474159240723,0.07102370262145996,0.05338549613952637 diff --git a/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv b/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv index f84483171f..adaf07c3fa 100644 --- a/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv +++ b/results/combined/merges_timed/lukaszlenart/launch4j-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 48,refs/heads/master,a9c285647e87efe1b79f807945bddb313ec48dff,66147fee70536c1f3b85c8842345e6558a3e6013,9ddf13a742aac251f4ad6357ca06155db7e54d14,,True,True,True,5,24,94.0,3,True,5,Tests_passed,84ebe7b9d66b61849e42e9170a4108b55a340be9c488e34e70a2f0872f03f67a,True,Tests_passed,90e5a10938146e86bdd3f55e737668ff046d0bfacaa707156b1fdf9201d4daaa,True,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,0.04282855987548828,0.04440593719482422,0.04861021041870117,0.0491178035736084,0.05360674858093262,0.035639286041259766,0.04233098030090332,0.23371100425720215,0.16594266891479492,1.4362125396728516,0.36072230339050293,0.10110950469970703,0.13431811332702637,0.050298213958740234,0.05181145668029785,0.050488948822021484,0.05061221122741699,0.05097389221191406,0.10006570816040039,1.311905860900879,0.04851889610290527,0.04974627494812012,0.031644582748413086,0.049508094787597656,0.029554367065429688 diff --git a/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv b/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv index 874df6b5d3..d38814a37c 100644 --- a/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv +++ b/results/combined/merges_timed/lukegb/gitdescribe-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,8537d4687a51ced12400731b2a25204cfaa349ab,e4f609de937186203eb1d108ac03d1c39f7b99da,77325e31358997b2687f8cdc8e2e2c5f56907315,,True,True,Tests_passed,f7f179000ead4f09c3205ceaf768a90bc0b37ebf229afbea63a1568ac476f0a9,True,4,21,144,2,True,Tests_passed,be2ac16673efd736957fc0a4881271162f1918837aa44e03c7d56348bc1ff04c,True,4,True,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,d46f38fcad435aea72f776ab4f1ba9a6ac7af29f8035dcab21fa75c489691f23,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,c7b9fc1e03c65f37aed369876617b7243275c214b3eef7c281bdd9c932bc1f39,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,00aa5eb71b5f177721b5823537c72e7fdbd808ab03880e2053023468db4e17f5,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,0.03909707069396973,0.03859543800354004,0.03127169609069824,0.03438711166381836,0.03657698631286621,0.03479456901550293,0.0355374813079834,0.1611189842224121,0.08686661720275879,0.6514694690704346,0.2524383068084717,0.06649374961853027,0.10957670211791992,0.0315554141998291,0.0321197509765625,0.0310819149017334,0.0313568115234375,0.031167030334472656,0.06139707565307617,0.634387731552124,0.03190326690673828,0.03233075141906738,0.03033161163330078,0.03185844421386719,0.030321121215820312 diff --git a/results/combined/merges_timed/lusito/gamedevweek.csv b/results/combined/merges_timed/lusito/gamedevweek.csv index 1a46cecd94..c9fffd82de 100644 --- a/results/combined/merges_timed/lusito/gamedevweek.csv +++ b/results/combined/merges_timed/lusito/gamedevweek.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1268,refs/remotes/origin/pull/11,bb4703104114664a8800674df2159429666c1863,ff80b1ebcd9bc61ee238da107f7baf770bca5251,8e399ff6a7b196f84ba3781b7d691eb5aaeba6d9,,True,True,True,26,88,1055.0,2,True,26,Tests_passed,accfbb20f0bf76789a82cca2a9556f1b625794272ebb0068fca02cc3b1fcc5ea,True,Tests_passed,18c5d3fe8edbba0e1dd4d46954a106f566e251c803ee17cf3f6f19a2e048aea1,True,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,b7e1351df49a1459205627a905173fa09cc735e5dca2418fcf50b0f210de0396,Merge_failed,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Merge_failed,40a1a65ce77b46d6708153dbff4dd4479b0b3888ae61a2038887b651903720bd,Merge_failed,d440b5099d6add98b9ad9b6359428d35e3223a47b44f7a1af24ec2b76fc616b8,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,625b83a6e2acd69ba4c3b0f03b7da214f562da63e73e328877e0c70906c06a18,Merge_failed,61f99111cf0f1d1cfebbdcb009d05e4db7a142889033a3dbcc09c639a2b0a0f0,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,Merge_failed,af933ec17f753173d0ba13430244f831b01a92bdd35e567aa6bbbfe0e7c08a06,0.05675959587097168,0.06282329559326172,0.06595087051391602,0.07547116279602051,0.05982851982116699,0.0624842643737793,0.06011247634887695,0.18968749046325684,0.1399698257446289,0.6380906105041504,0.56534743309021,0.11539673805236816,0.15926146507263184,0.05875802040100098,0.06664609909057617,0.0598301887512207,0.06482386589050293,0.05811142921447754,0.10141515731811523,0.6506698131561279,0.05909323692321777,0.05829596519470215,0.05972599983215332,0.05868339538574219,0.060558319091796875 diff --git a/results/combined/merges_timed/lwhite1/tablesaw.csv b/results/combined/merges_timed/lwhite1/tablesaw.csv index bcd1651e63..f1c0c3cbaf 100644 --- a/results/combined/merges_timed/lwhite1/tablesaw.csv +++ b/results/combined/merges_timed/lwhite1/tablesaw.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,7fc754b5f625d3078e0bd8b165686f94da41c781623cdd925c22fe66901b791a,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,0.048371315002441406,0.04628753662109375,0.05490756034851074,0.05130600929260254,0.05663299560546875,0.056870222091674805,0.03991222381591797,0.29100465774536133,0.17363810539245605,1.5877776145935059,0.7871668338775635,0.11252832412719727,0.12748265266418457,0.05096840858459473,0.051371097564697266,0.05184054374694824,0.05281352996826172,0.05245566368103027,0.10164165496826172,1.4512310028076172,0.04806351661682129,0.051889657974243164,0.04438138008117676,0.051872968673706055,0.044049739837646484 diff --git a/results/combined/merges_timed/lyncode/xoai.csv b/results/combined/merges_timed/lyncode/xoai.csv index 09b81a9867..fe6e88c24e 100644 --- a/results/combined/merges_timed/lyncode/xoai.csv +++ b/results/combined/merges_timed/lyncode/xoai.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/3.x,5679c2e9385c07c78a5b50d34c0ddab31a0e1745,37472820e6a9725ac72f2c0df6fd161f16729f8a,2c79b4b8d3f8975b7a222d0205c681425cda22ad,,True,True,True,39,102,801,3,True,39,Tests_passed,5bb6e28c6bc1669d13a397a4a88a9f68b2fee28ca6264c70503d926199e77f6f,True,Tests_passed,d398acea29e7643af903b975a94bcfc3af663d939072ac52b0945b61d02bc56e,True,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,0.018093585968017578,0.04619288444519043,0.05799221992492676,0.05537748336791992,0.04969906806945801,0.03796195983886719,0.06113314628601074,0.25501251220703125,0.18203163146972656,0.04405951499938965,0.596013069152832,0.10979461669921875,0.19579720497131348,0.09022879600524902,0.09280157089233398,0.058371782302856445,0.09680485725402832,0.05788254737854004,0.16106224060058594,0.06884574890136719,0.08516597747802734,0.06923723220825195,0.03827977180480957,0.08478045463562012,0.03929734230041504 diff --git a/results/combined/merges_timed/lyogavin/pistachio.csv b/results/combined/merges_timed/lyogavin/pistachio.csv index b18e39aac8..1ce01f84bf 100644 --- a/results/combined/merges_timed/lyogavin/pistachio.csv +++ b/results/combined/merges_timed/lyogavin/pistachio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,ff601b3619a0dbfb8867aba4b4c27227bef5bbf9,f4e73ff847ae74d7b17e0968adf729b348fce8e7,a5d70922b6c8a43679c3212b3d77ceaccb96a919,,True,True,Tests_passed,5ae694e25384883aaf6d256385e99ee2082d2a0e1698a921d2e48199fa45e110,True,7,29,200,2,True,Tests_passed,dc468c3da8474229fb8662de79441d1437e60bfe1eb6b8aa57908f3d54eb7d68,True,7,True,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,0.03882908821105957,0.035115957260131836,0.04642009735107422,0.07220911979675293,0.04412984848022461,0.04879045486450195,0.04467344284057617,0.15660738945007324,0.11403727531433105,1.228060245513916,0.44251346588134766,0.13011837005615234,0.2031691074371338,0.10015439987182617,0.10393881797790527,0.09942817687988281,0.09520387649536133,0.09832167625427246,0.1444246768951416,1.1363275051116943,0.08816814422607422,0.08899497985839844,0.08232951164245605,0.08522915840148926,0.08937931060791016 diff --git a/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv b/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv index 5d93bf484d..2113331477 100644 --- a/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv +++ b/results/combined/merges_timed/maciejwalkowiak/java-plist-serializer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3,fbfede3054cf04fc2c68df1c62bdab45d7139a35,29577ff717de7ddd32a8b667cdd9631d82bdf0f3,,True,True,True,8,17,89,2,True,10,Tests_passed,1220db2ce7dc885dce822850a05ddac790457ae1430ad6ebda964631a889145b,True,Tests_passed,9a970b129d3266cf25c0b67681d0e5b188b40e4701ac7f461047e7470587ee15,True,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,f0af379c54456d89cbcf1d5e44f545ddc905761a9a5a0b58525353c484d6302e,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,90a5ec1048759e6537807a01fe4793b678c1a56b7348e1d82f96f34fec7ac575,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,da712a63044eda832c8ab1240f86f193d5431e8428c90da994a57b6b2bf32b62,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,0.04538273811340332,0.04154062271118164,0.040235280990600586,0.0338749885559082,0.037619590759277344,0.04114222526550293,0.04457736015319824,0.15456867218017578,0.11895298957824707,0.688096284866333,0.28806519508361816,0.06688117980957031,0.12047290802001953,0.03361153602600098,0.0339663028717041,0.034960031509399414,0.03435397148132324,0.03382611274719238,0.06464910507202148,0.646308183670044,0.03506588935852051,0.03412961959838867,0.0333561897277832,0.0347437858581543,0.03287458419799805 diff --git a/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv b/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv index 608cb69b55..485e08a4a9 100644 --- a/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv +++ b/results/combined/merges_timed/maciejzaleski/jmeter-websocketsampler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,bb5c4358ae5fc9c767cc7fe32e99969126f1e5df,928fbabd7c7292ea41610b9df0b96bb56eff82a6,5039fb9c869e1e2eb7aee718d786ab54763e44bd,,True,True,True,6,40,179,3,True,6,Tests_passed,5d078a1abb2dc38b5eac03cd51e092eb0f497b7364c198e22f8ff0eef4c1a703,True,Tests_passed,e159b749eb7574aee691b271ab55ff23196d4677dc2beeaf6f7da32eb649bb89,True,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_failed,e242ecd152695d791b1abaaf59271d973e89c12e095616a6f757e0d6f680acdd,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,0.04467344284057617,0.04408454895019531,0.046869754791259766,0.04674220085144043,0.049620628356933594,0.048217058181762695,0.04172515869140625,0.22690582275390625,0.17677879333496094,1.977637529373169,0.5699880123138428,0.09900045394897461,0.13322210311889648,0.04915618896484375,0.04974699020385742,0.048909664154052734,0.048858642578125,0.04966998100280762,0.0979146957397461,1.8616104125976562,0.0490260124206543,0.04914259910583496,0.03029942512512207,0.04770302772521973,0.03089737892150879 diff --git a/results/combined/merges_timed/magro/kryo-serializers.csv b/results/combined/merges_timed/magro/kryo-serializers.csv index f1025533b1..d87e4bd707 100644 --- a/results/combined/merges_timed/magro/kryo-serializers.csv +++ b/results/combined/merges_timed/magro/kryo-serializers.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,a2d16aa4330cc067402178119dfb967842efc17a,c29d105ef21670d59450c0709d3f8e190dc4c5c8,eeb8393425b557c013719052fad3b842db850835,,True,True,True,5,29,199,2,True,5,Tests_passed,c1bd50dced53135fb544c76a2bfd574a7137495513da023867db3a1afc3c9a5b,True,Tests_passed,72034e238a12007f7d4e8e32a2140d41345f3f5322c1409491980d255f4523ec,True,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,0.05600309371948242,0.04401969909667969,0.03910112380981445,0.06347823143005371,0.046304941177368164,0.06713700294494629,0.049036264419555664,0.17649102210998535,0.12017488479614258,0.6558918952941895,0.4716911315917969,0.08164167404174805,0.14103126525878906,0.04932379722595215,0.048108577728271484,0.0503847599029541,0.049619197845458984,0.04728865623474121,0.08469414710998535,0.6773974895477295,0.04842948913574219,0.04816007614135742,0.03705191612243652,0.04703998565673828,0.037291765213012695 diff --git a/results/combined/merges_timed/mahoney/slf4j-test.csv b/results/combined/merges_timed/mahoney/slf4j-test.csv index 0a17c491e0..48a8094c97 100644 --- a/results/combined/merges_timed/mahoney/slf4j-test.csv +++ b/results/combined/merges_timed/mahoney/slf4j-test.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/1.0-RELEASE-jdk1.6,896b4a6a0d490aae9515e449244d1012bfb3d87b,f2858da07e04c8bbcad4183c7e003c192ce9f625,29d7e6d843162d4c522e532cfd6b9cc68906d17c,,True,True,Tests_passed,77681d7b3da4e5404bfded7729664f2e6d32174b3a8d49edb5deaa76c5bc8bc0,True,15,54,140,6,True,Tests_passed,e4f1320f6625ac0e6284253164dd55970eb397b857b1cc6ad9c616e558d30f95,True,15,True,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,a7c39fe3968efb7db6a971303cccae58e940d785f4b055781c545638908473ca,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,697eb084212e80dddcbb61dddeb2e8423f3a044bfe4ed01d22ca993a0d448d30,Merge_failed,99eb509fe3f066a575cef7183da71aa2aec19728483b8ab0ed75e735c20592ec,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,586aef7b6d92c4e143c01f7992384aca4b3f3016464451211d4746b12cbacee5,Merge_failed,fe4c5a226dbd7f904cf1260d6e8f27b2677d379d34d947bd5c6215959b785e8b,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,0.04391622543334961,0.02944159507751465,0.02807784080505371,0.0276639461517334,0.026648283004760742,0.03947257995605469,0.03449368476867676,0.315645694732666,0.33276987075805664,5.046327829360962,0.5025222301483154,0.19742584228515625,0.14419937133789062,0.06495881080627441,0.06347036361694336,0.0634007453918457,0.06303191184997559,0.06527066230773926,0.16220498085021973,4.5430684089660645,0.0635371208190918,0.06319308280944824,0.032984256744384766,0.06430888175964355,0.032973527908325195 diff --git a/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv b/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv index 667f9bd5cc..014311d77c 100644 --- a/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv +++ b/results/combined/merges_timed/mambu-gmbh/mambu-apis-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,1da0e26ad55b2f4a1738ef3e7f57ac5ca6ca0ae7,a14a20e30055f71086d497513af21f5f5d6f6f2d,c6afe3ed0a26ebb6bab9a5ccd81a9990902c894e,,True,True,True,9,61,240.0,2,True,9,Tests_passed,a4edd5760c2b7ead9d4c555095d228c14e51c5ca2c6893690bd98a29ff9bba27,True,Tests_passed,4b8e90f869382c8db30e32d7a928d36d6d8c29c46607f723f951d7ba1688448b,True,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,da4ef095da5cb6a90fb300009d8e80593fabfc75182cfaac04691cb31df34149,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Tests_failed,e0b0f548d1f3094dff7b9ee253a94b42bc9f38915a649a0fe19dcf2aed11b955,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,b1dc1b14da9f47f0c9509d31d7069243dbb049bfb2ee207bf5ce170915f63ce6,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,0.0607905387878418,0.05879640579223633,0.07421278953552246,0.04468727111816406,0.012754440307617188,0.06969380378723145,0.0705568790435791,0.21179986000061035,0.08249711990356445,1.3066048622131348,0.7160389423370361,0.15914011001586914,0.21569132804870605,0.035842180252075195,0.10649871826171875,0.035629987716674805,0.12082719802856445,0.03565335273742676,0.1596815586090088,1.3409712314605713,0.09979128837585449,0.03601694107055664,0.10468816757202148,0.03550839424133301,0.1089026927947998 diff --git a/results/combined/merges_timed/mangstadt/ez-vcard.csv b/results/combined/merges_timed/mangstadt/ez-vcard.csv index 86a9a2755d..876609639d 100644 --- a/results/combined/merges_timed/mangstadt/ez-vcard.csv +++ b/results/combined/merges_timed/mangstadt/ez-vcard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,True,342,2526,16131,10,True,342,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,35753c04e2f61a849e386fbd4572bb82a26a3f151f3c20ca1be138e938ac502d,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,0.04158449172973633,0.04814767837524414,0.05866360664367676,0.04657316207885742,0.0658559799194336,0.07129144668579102,0.07176733016967773,0.7076160907745361,0.541736364364624,6.070753812789917,6.007279634475708,0.3576626777648926,0.24979543685913086,0.14819049835205078,0.1555337905883789,0.14632654190063477,0.14957404136657715,0.1459338665008545,0.3593437671661377,5.80984902381897,0.1338052749633789,0.13884234428405762,0.07507443428039551,0.14208674430847168,0.07281637191772461 diff --git a/results/combined/merges_timed/maoo/maven-tiles.csv b/results/combined/merges_timed/maoo/maven-tiles.csv index 00dd230ea9..1f82c7459c 100644 --- a/results/combined/merges_timed/maoo/maven-tiles.csv +++ b/results/combined/merges_timed/maoo/maven-tiles.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,515cbbb77720e2ad118b4ab9017a3e99e8fcb885,01ee12244e800c1980b5811f1abdabc19496c256,680ba8647d6b9c9a604064543b5d3aeff2bcabda,,True,True,True,27,48,1000,2,True,27,Tests_passed,f4f39390b1c4f6a4bf7c7e30bcae46481f75f7e0b1232f6212edfb64fefd60a7,True,Tests_passed,2d4c0f3a7a5f305a980070e31838f46fb1e0f2d33b32a7fe20506071d217407d,True,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,0.010893106460571289,0.010938882827758789,0.01184701919555664,0.011476516723632812,0.011806249618530273,0.011827707290649414,0.011629819869995117,0.036752939224243164,0.0689089298248291,0.6472947597503662,0.3796358108520508,0.07047533988952637,0.12597060203552246,0.040877580642700195,0.040368080139160156,0.041048526763916016,0.04073286056518555,0.04058432579040527,0.07253074645996094,0.6151614189147949,0.03963875770568848,0.039766788482666016,0.029047727584838867,0.03995919227600098,0.027973413467407227 diff --git a/results/combined/merges_timed/marginallyclever/makelangelo.csv b/results/combined/merges_timed/marginallyclever/makelangelo.csv index 87d668cacb..20ec264660 100644 --- a/results/combined/merges_timed/marginallyclever/makelangelo.csv +++ b/results/combined/merges_timed/marginallyclever/makelangelo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,f96ea74ffaf63c820dae4ed5e33941dfd9230a7c,8c91c249baee9d3a72e876c42f3dc387953e9bff,f8be12ef2f4810fbebac0340bd28cf2443980e6b,,True,True,True,51.0,270,2034.0,4,True,52,Tests_passed,fe6f454312255f2c40449c6c91317b1d27d621779beb3f250545457e00e3b85f,True,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,True,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,d219c0315a713ec6178cda2b7e6e0a5dabd9aef83234afadb299b8b8ddcc311e,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,00e0c7897ac8d2811a214705f791c1d58ca76b527532302274eab29511f25d45,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,0.16118693351745605,0.16203022003173828,0.19755220413208008,0.19390344619750977,0.19617056846618652,0.19744300842285156,0.19742035865783691,0.38646984100341797,0.3678762912750244,0.16341614723205566,2.758863925933838,0.5353341102600098,0.37419605255126953,0.2870159149169922,0.28341007232666016,0.28899216651916504,0.28450679779052734,0.2896883487701416,0.43242883682250977,0.34001684188842773,0.24920248985290527,0.24712896347045898,0.27976417541503906,0.24550509452819824,0.2812621593475342 diff --git a/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv b/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv index aa0faac2c9..2e51daa637 100644 --- a/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv +++ b/results/combined/merges_timed/marloncarvalho/aliendroid-activerecord.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,66fd6488824b7aa0f15b7172466d4f9f465db644,13915de94d70a4d8e53cba4c0056c5b4af2cdfde,,True,False,Tests_passed,d714b13ae10bb963007331bf6b5e6c553b23d5a883702289c777437cb4bcdbd1,True,3,20,55.0,2,True,Tests_passed,4c40dc2ebac3ed9ef5cdd75797c83c666a75c998b4597e3ef6892bced615acc0,True,3,True,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_failed,5f5699f5e99a94fb6d0618adbc252e8dedb8fff836b21955dedf4684e4389d7f,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,0.013731718063354492,0.038069725036621094,0.04551553726196289,0.03260302543640137,0.018593549728393555,0.014763116836547852,0.05637550354003906,0.1608738899230957,0.11301279067993164,0.756047248840332,0.3085160255432129,0.0753180980682373,0.13402414321899414,0.046658992767333984,0.04541444778442383,0.04648733139038086,0.04563164710998535,0.04667377471923828,0.07888436317443848,0.7529721260070801,0.04269051551818848,0.04279661178588867,0.03391528129577637,0.042931556701660156,0.03348040580749512 diff --git a/results/combined/merges_timed/marschall/memoryfilesystem.csv b/results/combined/merges_timed/marschall/memoryfilesystem.csv index c51323c54c..315dc6bd76 100644 --- a/results/combined/merges_timed/marschall/memoryfilesystem.csv +++ b/results/combined/merges_timed/marschall/memoryfilesystem.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/heads/master,fda60ab1b9a42f2e4ab6249852b3d2f0a40c9b56,f63459184f11f1681a38d7f0dccc30426ded34ae,0f2c367a1172610941024e8fcc319242db890219,,True,True,True,8,15,363,3,True,8,Tests_passed,96271c10f4d01634504f284e3581f37a0917ed3cb463d6d9113db50c18b4490a,True,Tests_passed,470dabe5eb8b75e6601bc8d346ad3ccd4bd539c44059938f18837837ba0a19e0,True,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_failed,72dec9b6f0d3e184419295013d8c7a6cbf9108abe22d638bf869da682d574a41,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,0.014387130737304688,0.014564275741577148,0.016237735748291016,0.016002178192138672,0.016165494918823242,0.016065597534179688,0.01610541343688965,0.054817914962768555,0.12262868881225586,4.513042211532593,0.8215842247009277,0.11792635917663574,0.15463876724243164,0.05892443656921387,0.06199955940246582,0.06057405471801758,0.06138157844543457,0.06344985961914062,0.1107795238494873,4.63324761390686,0.05839824676513672,0.0587923526763916,0.04108238220214844,0.058716773986816406,0.041770219802856445 diff --git a/results/combined/merges_timed/martinpaljak/globalplatformpro.csv b/results/combined/merges_timed/martinpaljak/globalplatformpro.csv index ed30812bb8..4dc4d4192d 100644 --- a/results/combined/merges_timed/martinpaljak/globalplatformpro.csv +++ b/results/combined/merges_timed/martinpaljak/globalplatformpro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/remotes/origin/pull/264,6a5d74685625e3deb07447a3b4bf29d01ef17d6f,678b25980013b7708e9ccf155939016ee027c00e,a0096642ac72a49d487e9a4b69169d95b2b0c87b,,True,True,Tests_passed,02ce8c12a7b4e2a5efc2cca4994a8d81e04fe6785fab859a47b5364638ebc046,True,21,90,390,3,True,Tests_passed,f68f35521db577d4ab64fe41097904360b45d4feb76b687d179521b01060fd5c,True,21,True,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,11c2dd09feb0e4df6e22e74a3da9c36598ef1842cdcf8667218c50ac5d200faf,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Tests_failed,790e32dce17baa1c71a568689ccd34a20ecb938f7c2b4cabcf17171d7a235ebe,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,d1922fe5a9d0f3477d89426ae9bd0860c2408588561687716f1fe4a00250e058,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,0.0726621150970459,0.0724024772644043,0.08779096603393555,0.0876626968383789,0.08854389190673828,0.08743143081665039,0.08709883689880371,0.16604161262512207,0.18637633323669434,2.2943496704101562,0.8747918605804443,0.22741031646728516,0.19055557250976562,0.14493799209594727,0.15047502517700195,0.14113354682922363,0.14161205291748047,0.14652013778686523,0.1775355339050293,2.320711612701416,0.0858755111694336,0.12828874588012695,0.13607025146484375,0.13570189476013184,0.10194206237792969 diff --git a/results/combined/merges_timed/martylamb/nailgun.csv b/results/combined/merges_timed/martylamb/nailgun.csv index 06ddcd9630..99b2be6d92 100644 --- a/results/combined/merges_timed/martylamb/nailgun.csv +++ b/results/combined/merges_timed/martylamb/nailgun.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 60,refs/heads/main,7f1e1bc712bec6ad375f7d0e6cdc46323126b448,6f39efa91e60c1e0aa9ae11477c27e3b5f90c5a0,e20aaa3618f88209f1c343233c0fcf5c15ecef70,,True,False,True,3,17,202,2,True,3,Tests_passed,14ca52e6a17a9dc27808e6ad7f46e234a43897759abae64b71a546e10f74d67f,True,Tests_passed,40a35cfa263bfbf52b96fe83ad80c91531b344aa526dd13c41ada070cfb3c8ba,True,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,a87e3c24dd2ee949dbafbf7ae79fe0d81a495bef068ded21fefa97096ed8ce4b,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,0.04232430458068848,0.04249167442321777,0.0425877571105957,0.041326045989990234,0.042207956314086914,0.03857088088989258,0.044997453689575195,0.16165518760681152,0.10852479934692383,0.8570370674133301,0.3142726421356201,0.07011747360229492,0.12835121154785156,0.040549278259277344,0.04056215286254883,0.04047226905822754,0.041338443756103516,0.041372060775756836,0.0751948356628418,0.8534936904907227,0.040117502212524414,0.04067707061767578,0.029344558715820312,0.039969682693481445,0.03027510643005371 diff --git a/results/combined/merges_timed/mashape/unirest-java.csv b/results/combined/merges_timed/mashape/unirest-java.csv index 1c094f6916..05089f72f6 100644 --- a/results/combined/merges_timed/mashape/unirest-java.csv +++ b/results/combined/merges_timed/mashape/unirest-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 79,refs/heads/main,a354dd6248987d23dfa416f5c1e4d0e2ddbee799,60a75cc40396eba2b089166f499a5e63871dbf4c,314944c8df1806b481aa3f8615cbab2eea547ae7,,True,True,True,6,25,79.0,2,True,6,Tests_passed,865baa45986783b3f46667ebec3cb8bb5d2c0be52988c010f0153797065bcca9,True,Tests_passed,b205400a0c948daa2673d453b6d081a6afc98a682f626ae2b992d508de582d57,True,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,94188ac198910327cd5b5800ed307c6a4cde30a583bacc1f54f5617e7a5165bf,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,c89683fd5da27e54f29b39bb031d2cc689599fce47a5d47495f7e01fb6705846,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,Tests_passed,6c705d0a15f7a15c5a1de542d907cc9a7dffcd4c3c6e00eaef60f8ed07fcf267,0.04461789131164551,0.04957842826843262,0.04445624351501465,0.0460667610168457,0.04918169975280762,0.046738624572753906,0.04153919219970703,0.17164087295532227,0.11038875579833984,1.0721900463104248,0.3944985866546631,0.07068896293640137,0.12514424324035645,0.040776968002319336,0.04167747497558594,0.04015207290649414,0.040771484375,0.04027915000915527,0.07364368438720703,1.0691754817962646,0.03921222686767578,0.041559457778930664,0.02933669090270996,0.0402989387512207,0.0296018123626709 diff --git a/results/combined/merges_timed/masterthought/cucumber-reporting.csv b/results/combined/merges_timed/masterthought/cucumber-reporting.csv index dadca0bb43..770f647a3a 100644 --- a/results/combined/merges_timed/masterthought/cucumber-reporting.csv +++ b/results/combined/merges_timed/masterthought/cucumber-reporting.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 87,refs/heads/master,c802cd0adbaa29205317b5c2ee784fc4d4370eee,a84fba80c5118fe61c391a8a1c54443384c9c41e,c0cb60d570e3ca1f07fbf85c7c24ec78be48c3af,,True,True,Tests_passed,8e1d308464d6073c7af06f0a916c3c166651d129ace0778805ef75f32bd71223,True,65,212,3842,3,True,Tests_passed,4d372614fccdfb19ae68845434319419fa14d443d9e4fc4e05f52ba8182214a1,True,65,True,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,0.01889801025390625,0.020113229751586914,0.0406343936920166,0.02993941307067871,0.05425572395324707,0.02560877799987793,0.03447985649108887,0.1975998878479004,0.16142559051513672,1.2479982376098633,0.7950639724731445,0.13554096221923828,0.1812303066253662,0.0889735221862793,0.056420087814331055,0.08832240104675293,0.08021020889282227,0.08512568473815918,0.15132761001586914,1.2495193481445312,0.07956933975219727,0.07255935668945312,0.05982661247253418,0.05275464057922363,0.059339284896850586 diff --git a/results/combined/merges_timed/matthias247/jawampa.csv b/results/combined/merges_timed/matthias247/jawampa.csv index 09d78f9cd7..0df5ad5ee4 100644 --- a/results/combined/merges_timed/matthias247/jawampa.csv +++ b/results/combined/merges_timed/matthias247/jawampa.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/heads/master,f956e0584ab3323680744ef58438b1b09f11846a,cdb22b91593b13b98b53ca21965c6cbfd58a3954,90ac8af923bd105c3defbcdd74aa0e9679f06447,,True,True,Tests_passed,98a6f144331eebf5bd1ce2b27e90201da3ef8bbaf9c7fc14fe552d713fc56cfb,True,8,65,255,3,True,Tests_passed,7d5a8debb7a164133a61ce384ec695eea2888e55479f2b55b0da11acff07a70e,True,8,True,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86d51c9a1077cfba5defabd94c5193d87e9bccd633d18a8e8d40c6aa468381b0,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Tests_failed,1f4bc73f672108eb4eae934ec7afc657d2722d7ff121065258c7564f06e9e95c,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86feca9d3296419489a720afbfe47dea4cba2c16ba43cf6ce8789b00f1712e5a,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,0.04606318473815918,0.012862682342529297,0.051427364349365234,0.05177474021911621,0.04097270965576172,0.04440164566040039,0.053426265716552734,0.24523472785949707,0.1783289909362793,3.3546664714813232,0.634577751159668,0.10416436195373535,0.1262061595916748,0.04361224174499512,0.04597663879394531,0.04609036445617676,0.04493451118469238,0.045340538024902344,0.09401702880859375,3.0845046043395996,0.04617166519165039,0.0457916259765625,0.03606367111206055,0.044618844985961914,0.036951541900634766 diff --git a/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv b/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv index c1707f9759..1d745208c0 100644 --- a/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv +++ b/results/combined/merges_timed/mattinsler/com.lowereast.guiceymongo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,60813c8d71e04f2555a87814ad47ad8cdb621195,a3fa868fcd9f197799f27e01b7bda7b1cb22f768,0bb0300e17dbc35c25316126bbc9daeabf9dbbe3,,True,True,Tests_passed,b6de22d76c34c6ce1a6c4b73b0728effc45b957d9716d1b719d5f9d4ee7da92d,True,48,45,9471,5,True,Tests_passed,37e6b8386d7e743eae1f995f53cc0c233200fdaf6c6478d9aac8190d2b93fe20,True,50,True,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,ac23b23f6a27ae5625e3cca17ac4aab4c25bb6a82d5cf075edf767100a067156,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,7391bfddf057d54b7031ada9942cb7a08d239a8b5be68d9910ee496f556ee87c,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,7d2002faef4e44b16a38573adae70d850a86f796020e037135a6acd098240f18,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,0.08026385307312012,0.06920313835144043,0.0844724178314209,0.08867764472961426,0.0913548469543457,0.07898855209350586,0.07948088645935059,0.36171483993530273,0.19008755683898926,5.288080453872681,1.1177008152008057,0.17153382301330566,0.1933760643005371,0.0985255241394043,0.09885525703430176,0.09795641899108887,0.09777712821960449,0.09916305541992188,0.18363118171691895,5.058048486709595,0.0909266471862793,0.0932466983795166,0.09699320793151855,0.09140372276306152,0.09582710266113281 diff --git a/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv b/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv index 81dd9d9f5d..2b9ee44ff2 100644 --- a/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv +++ b/results/combined/merges_timed/maven-nar/cpptasks-parallel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,9cd3413080406cb66aa9a23998081e9ef757fe0a,8fafc6ee5cc901b301baee9760c6744be3816d29,4b91fee5ea7faa7a6cf5a6bc64ebc052f41018b8,,True,True,True,5,8,43.0,2,True,5,Tests_passed,4334654c4fec4cf5cd0edda031569c8528e4d2f931b919cf1bc9c30ce1d75d5b,True,Tests_passed,bd5b75a8905214677a2a4813b9f5e78279ff68057a41f767a3764fdebebb178e,True,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_failed,c063188a85c38ea577cd0f6312b861f1aecb1f0849fc7506b5fbad60266d5aad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,0.06163668632507324,0.05650138854980469,0.06691169738769531,0.052506208419799805,0.06556940078735352,0.06675314903259277,0.06267762184143066,0.1832571029663086,0.12274503707885742,1.6245324611663818,0.5328538417816162,0.08165121078491211,0.1392505168914795,0.05106759071350098,0.04905891418457031,0.04926323890686035,0.05008387565612793,0.048749446868896484,0.0865488052368164,1.4934265613555908,0.049005746841430664,0.048975467681884766,0.038054704666137695,0.04843473434448242,0.03818202018737793 diff --git a/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv b/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv index d27525eb7b..adc712a40f 100644 --- a/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv +++ b/results/combined/merges_timed/maven-nar/nar-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 33,refs/heads/master,40aa7bb76590d0d32ac1029e9054d37d6f26fdfa,615542e05da885afe07c39474cd4fc02d3dd1199,cd23bdea336fef4ee347b713cbef09ec75f5ae49,,True,True,True,14,27,395.0,2,True,14,Tests_passed,039f42ec3166b1bc22d3adc959ecd0e83af41af06af760c8600573b42df5e08e,True,Tests_passed,7c70ac6e3a7bd04e65f7ca0551737d1f3fd288f284541d0ea98781020825b0a8,True,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,0.04130244255065918,0.061505794525146484,0.06556916236877441,0.044561147689819336,0.06110334396362305,0.04724931716918945,0.061189889907836914,0.1894514560699463,0.11645293235778809,0.041143178939819336,0.5982513427734375,0.08230400085449219,0.14631199836730957,0.053583383560180664,0.05299806594848633,0.052995920181274414,0.05462026596069336,0.049941062927246094,0.08911418914794922,0.06341195106506348,0.05117225646972656,0.05003857612609863,0.039168357849121094,0.051627159118652344,0.04089951515197754 diff --git a/results/combined/merges_timed/mavocz/smscsim.csv b/results/combined/merges_timed/mavocz/smscsim.csv index 317eec1f16..68457e8500 100644 --- a/results/combined/merges_timed/mavocz/smscsim.csv +++ b/results/combined/merges_timed/mavocz/smscsim.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/pull/5,8bfb11d2761aacc461674c06d3df511961252c0b,9b60d4b015a6db7f9d9f2bf9eb6083fcf3dad959,c299c6bf1fdfb1a8fe954b93ed2682bdbb0150f5,,True,True,True,4,14,146,5,True,6,Tests_passed,4530709389bff72c74c2dd79ec52aad8e75d9c5c1902a32b8be9b4ee30cd2b86,True,Tests_passed,a11239d4bdeaab1c33f9aced952bd4cc56c271013765b6dd80b65b33d3860382,True,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,d9235f7714e96af4e1063fc2fdcdec40de03f5ad1a6ade10252dc6f8325c9f29,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Tests_failed,509d46f6232d2468f194b7bc60032bdebb3c17e75440f32db3fc87ad2a9ffa10,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,725f49994c6e1b0d716c3e3d2c5ef5d65fa668a07c558874459ab722e6f6ccf6,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,0.043807268142700195,0.03814411163330078,0.03700423240661621,0.04291176795959473,0.03444814682006836,0.0338134765625,0.03259015083312988,0.22870159149169922,0.17954540252685547,1.4502811431884766,0.39189934730529785,0.10227012634277344,0.12335610389709473,0.0420076847076416,0.0412137508392334,0.04116988182067871,0.041406869888305664,0.041448354721069336,0.08795952796936035,1.3720345497131348,0.04254460334777832,0.042143821716308594,0.03977227210998535,0.04188227653503418,0.04017210006713867 diff --git a/results/combined/merges_timed/maxmind/geoip-api-java.csv b/results/combined/merges_timed/maxmind/geoip-api-java.csv index 7de201e7a9..62d95720d1 100644 --- a/results/combined/merges_timed/maxmind/geoip-api-java.csv +++ b/results/combined/merges_timed/maxmind/geoip-api-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 53,refs/heads/main,49ecb07cc82f13aa1a25857de424be43c88368c1,41ccd2de77d3495a43edcef222564924cbb53740,5eef24504c348cb6880642ae3eb6443f40e3b8a7,,True,False,True,2,2,4,2,True,2,Tests_passed,486fb2319bf0044a951c20cf592d5aa2ab6f0f7e8e106fd734201741b56a1745,True,Tests_passed,17920ca2ec398d8c5120df1721bd16938a965ded154e41d9cd83bb00f03b52fd,True,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f98110b8e0f539e457cde5f88c30a70f6d52351ac1a8a7ea776420022b2fe6b1,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Tests_failed,2a949e2920a7cffbe0923489a566ee082c9c7e424db870257cf86a98183412ff,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,d37b3fefc04e10bc370de5ffef19c4292671b92ede2808100bd2305f745e6149,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,0.04997992515563965,0.06135845184326172,0.06118297576904297,0.05652356147766113,0.06328344345092773,0.05200505256652832,0.04701733589172363,0.19075632095336914,0.14584589004516602,83.58075499534607,1.1943440437316895,0.09771275520324707,0.1325218677520752,0.05122113227844238,0.04959368705749512,0.05163383483886719,0.052323341369628906,0.05454254150390625,0.08293867111206055,78.13471817970276,0.0518488883972168,0.04810285568237305,0.049165964126586914,0.05056452751159668,0.04886746406555176 diff --git a/results/combined/merges_timed/mbaechler/proxy-servlet.csv b/results/combined/merges_timed/mbaechler/proxy-servlet.csv index 2128ae1ed1..e84c6259a3 100644 --- a/results/combined/merges_timed/mbaechler/proxy-servlet.csv +++ b/results/combined/merges_timed/mbaechler/proxy-servlet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/remotes/origin/pull/6,456846e2b56eb09964f65677180bd70ee107d33e,db267681433444c8f171d2cc31286f5b9da437bf,a03279659c46dda30accad5f0b06b8eda491ccc4,,True,True,True,5,18,69,6,True,8,Tests_passed,29056de4ed7e265465fdc8ca4787a81ff7d451d69d853241b2b7f2696b47a1f8,True,Tests_passed,df6c2a427c019fb49bbe937666286a792eb7afa7fca0ddc3e7fbffe823036358,True,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,f3744895bb7a1a087f19c59148a13267726168aa4cb94dfe01d47490689158c8,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Tests_failed,b4101b8d6aca4685409f6aafa0be8f1e94d2925a7c3b5e56bb2fd9925154b486,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,5eeaa984e8e1ec11aebd21a11db5e49c50acfb81ac8a060284b64eb4cae3ce19,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,0.04161524772644043,0.04479193687438965,0.03497123718261719,0.03698396682739258,0.0402982234954834,0.042790889739990234,0.039598703384399414,0.04715085029602051,0.176605224609375,1.332712173461914,0.45008158683776855,0.10814213752746582,0.11998939514160156,0.04033684730529785,0.04015231132507324,0.04124593734741211,0.04136228561401367,0.04133105278015137,0.08735346794128418,1.345010757446289,0.04083609580993652,0.04133462905883789,0.039408206939697266,0.04051852226257324,0.039141178131103516 diff --git a/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv b/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv index 55f95f6c07..b2f999e343 100644 --- a/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv +++ b/results/combined/merges_timed/mbknor/dropwizard-activemq-bundle.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,12e472f3dd612c31bfc713248ffd0389e0dd2e8b,1d1aad7523ab4c4304e5766700e0038f75ac7dba,5a53776d9e4be3785c6643ff650370633c2b78e1,,True,True,Tests_passed,f4f04dc211305042b26b920328fe40bd4af73cd38a6df25f9f1c59d34c12ae58,True,13,47,448,3,True,Tests_passed,6c46c80017aa1a8afd66b39eb24808ac6f96a6b4f016b5beb68ac21ff4147939,True,13,True,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,81b2b38eac8749b184050871883bbaffff505fefee4490c1b15cf607813f112f,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Tests_failed,13838d3a26e2a7b9af7cbf0c1f7c6e745e66505cc534f02a5a2ea8427bda352b,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,c5b2a07bb75b0120d2076bc69a95ffbfe0c8afe207fedb77b40f742b4b66823c,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,0.00812983512878418,0.008117914199829102,0.008208513259887695,0.008020401000976562,0.008204936981201172,0.008028268814086914,0.007982730865478516,0.04277849197387695,0.11900544166564941,1.2941620349884033,0.3989291191101074,0.09982585906982422,0.11991691589355469,0.04013967514038086,0.03985023498535156,0.03938865661621094,0.04013347625732422,0.039855241775512695,0.08794522285461426,1.354222059249878,0.03990817070007324,0.0398862361907959,0.03152942657470703,0.04026293754577637,0.031865835189819336 diff --git a/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv b/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv index fd02cb26a6..bab4827ba5 100644 --- a/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv +++ b/results/combined/merges_timed/mblanchette/maven-java-formatter-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 369,refs/remotes/origin/pull/733,2249c09bd7b1684c81588494daf9353f94323bbe,e1789bf6546cfd122d84c6aff3c6a10f00a2e427,c3607a1d7f7422a7860f1a31e60484c743ef3f6b,,True,True,True,11,50,98,10,True,17,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,True,Tests_passed,feb8259999683cbc1455ed285c446393c984c315ea0ab011aa96565eea2a90f7,True,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_failed,0b1d6961207999bb7fea918755920a1a2b61ae9e997f5a9d675fca445adae92f,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,0.021429777145385742,0.021065235137939453,0.02538156509399414,0.02605724334716797,0.02598404884338379,0.02580857276916504,0.02571272850036621,0.09370636940002441,0.022217750549316406,0.03741455078125,0.37189412117004395,0.09313702583312988,0.1824028491973877,0.08476829528808594,0.08388853073120117,0.08435893058776855,0.08118343353271484,0.08161401748657227,0.16617274284362793,0.09432864189147949,0.07543039321899414,0.07875680923461914,0.05950140953063965,0.07813429832458496,0.059679508209228516 diff --git a/results/combined/merges_timed/mbosecke/pebble.csv b/results/combined/merges_timed/mbosecke/pebble.csv index a9cfe45e3e..bf3f93ff45 100644 --- a/results/combined/merges_timed/mbosecke/pebble.csv +++ b/results/combined/merges_timed/mbosecke/pebble.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 123,refs/heads/master,7b6bd591f14f5092a01f747e779f21acafa6959e,8bcaf4e262c09d73f043c5d5cbfd881dcf417c05,968a083e1012ad3b024324df36d00fe1e0c5f872,,True,True,True,49,516,2942.0,2,True,49,Tests_passed,d07e723fc6841045faa12bc7ea657f370fe4248659e73c574a4492c36a695748,True,Tests_passed,d5d09f2ff5aed8e7089dd759466fe3d39511e589715486ecf3f9c7c8fc40e3d8,True,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,Tests_passed,8362ce5698dafe6df36ade8e714a913fe5950dddc332366f5ad7f02728f2ca99,0.023484230041503906,0.04045915603637695,0.0447843074798584,0.06199383735656738,0.044142961502075195,0.04870796203613281,0.04265546798706055,0.20682072639465332,0.0801699161529541,0.03541207313537598,1.018111228942871,0.11371803283691406,0.18030214309692383,0.07670354843139648,0.07838034629821777,0.05484318733215332,0.05612587928771973,0.07871341705322266,0.09425997734069824,0.09015369415283203,0.07233548164367676,0.0674748420715332,0.06873607635498047,0.05241727828979492,0.06488466262817383 diff --git a/results/combined/merges_timed/mboudreau/alternator.csv b/results/combined/merges_timed/mboudreau/alternator.csv index 4f463885d1..03accda429 100644 --- a/results/combined/merges_timed/mboudreau/alternator.csv +++ b/results/combined/merges_timed/mboudreau/alternator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/master,e98877f87081708e446b278c812eb504565ff5f9,e5ccfab1da7432b380d0af5e0f86b83894b4eab2,91954b46b0bb37bca9388c3812763f3d24a8aaaa,,True,True,True,19,136,1158,9,True,20,Tests_passed,32297fe2fb78354de541330818f8cf10feff1841ed8c9ac9b71167b79caf693b,True,Tests_passed,dfd7622acf5850de28d3b231d046bc9d0e2bef5a4d6c56d1fe8f610d7340459f,True,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,cd152448e5cd1e5c7a1dc2ef3e4882769124cd3572c972faa0bc7e152d0ccd54,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,3a3ae5be878854cd15fbd0e086ea31cdf82dc0c294b1d0da5e9cb8c4f0dc3629,Merge_timedout,,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,66df26661f5ee0e2ebf43b1be3ef16525e53ddc47e5b3981e544128bed90fe7e,Merge_failed,45b61ee2a588fea033a62052056d88200e9c797dedf143cc0384af76d63520b7,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,0.01330423355102539,0.013509035110473633,0.01360321044921875,0.013476848602294922,0.013683080673217773,0.01313924789428711,0.013546228408813477,0.11070823669433594,0.3956267833709717,4.919229030609131,-1.0,0.2725996971130371,0.16620683670043945,0.08588504791259766,0.08641290664672852,0.08449029922485352,0.08500170707702637,0.08501911163330078,0.2162773609161377,4.969007730484009,0.08505964279174805,0.08488345146179199,0.0635385513305664,0.08466958999633789,0.06316304206848145 diff --git a/results/combined/merges_timed/mcmmo-dev/mcmmo.csv b/results/combined/merges_timed/mcmmo-dev/mcmmo.csv index c6dc370dab..12c18e6290 100644 --- a/results/combined/merges_timed/mcmmo-dev/mcmmo.csv +++ b/results/combined/merges_timed/mcmmo-dev/mcmmo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,81ac48904ce1c187c6177ad5282575a7c2d28907,ed8c8107f990a68111cce560f0a020c7401902c4,2594dc1bca27548e560cf514aa9285e925d1a612,,True,True,True,143,712,5593.0,6,True,143,Tests_passed,8e77e05911abcabe3a0626b50847bf5f50a46a62b2d06fa98224315eebf65aed,True,Tests_passed,ccf00edc4bbb59f98bad23de096117c3446b8db7d39b6d375760f98fb0fcc349,True,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,faa840119d3406991f8b1ebc639702db6686edaadb7b6e5b71b9dc1cb37abe29,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,b00d02b6a8ab595917b37ee1c6a4125e8cfb628c8311193419d30367e9dad44b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,0.04716682434082031,0.06215238571166992,0.06283879280090332,0.05692481994628906,0.05555081367492676,0.05546975135803223,0.05506396293640137,0.1840202808380127,0.3217172622680664,0.10974335670471191,2.39266300201416,0.2921116352081299,0.2434835433959961,0.13862109184265137,0.13897418975830078,0.13974261283874512,0.14141464233398438,0.13532090187072754,0.29152488708496094,0.16002488136291504,0.13294410705566406,0.13290834426879883,0.11639547348022461,0.13246822357177734,0.11622881889343262 diff --git a/results/combined/merges_timed/mcupak/beacon-of-beacons.csv b/results/combined/merges_timed/mcupak/beacon-of-beacons.csv index d4c29cab64..afa096de60 100644 --- a/results/combined/merges_timed/mcupak/beacon-of-beacons.csv +++ b/results/combined/merges_timed/mcupak/beacon-of-beacons.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/develop,3723d0f4d5cf51fd3b5bf5c15529463550918e1f,49e4e1cdb8643f276703f5f7761f0cb6c3d836c7,9dd448552f4610d7c651eddacd82fddf7ad48aa1,,True,True,True,159,521,9036,27,True,162,Tests_passed,d532a309964d4290c1776c1951480911b52c979f60f9844efedf86be7d7fe1be,True,Tests_passed,7b484fadc10b7e9c97f9059129e501f30c9b3af803c18127bcc4ec81c51da9a5,True,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,d9da87ceab2710b63992ea86f5e94dad2ce869ee33f40a77ba53c9b90f5b0ce5,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,2aa5152032f8c9c631b74110e02b097431625928af615feb7f6130355262d7ff,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,778bc56db82b30622c2b97843f53aafcf911939b68803ef92681509b9f1a9f38,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,0.05915546417236328,0.06881499290466309,0.04349851608276367,0.03867840766906738,0.03338336944580078,0.08196592330932617,0.06272006034851074,1.5589404106140137,1.4809317588806152,18.022812366485596,0.9399077892303467,0.8761229515075684,0.32773661613464355,0.24581265449523926,0.23191571235656738,0.2488548755645752,0.24978280067443848,0.24526119232177734,0.675527811050415,17.213672876358032,0.23709607124328613,0.24364185333251953,0.14043974876403809,0.23908662796020508,0.13492321968078613 diff --git a/results/combined/merges_timed/mdeanda/lorem.csv b/results/combined/merges_timed/mdeanda/lorem.csv index 5f7f398a42..4be27f5e08 100644 --- a/results/combined/merges_timed/mdeanda/lorem.csv +++ b/results/combined/merges_timed/mdeanda/lorem.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,b340dfb840716f7eb60f9febd104087913f2beae,066a95129ded0423403c5d7f48d90aebef73d278,96c00aa7b9415de0effec3d78dafbf3b722c168f,,True,True,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,True,4,10,29,2,True,Tests_passed,75b49c8a194bd79d752d4a07f3988a840d91eda770ec5931715322f4cfd524b8,True,4,True,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,0.02725839614868164,0.029724836349487305,0.018395662307739258,0.026168107986450195,0.03344321250915527,0.026098012924194336,0.024306774139404297,0.11062049865722656,0.0910646915435791,0.9256606101989746,0.3083310127258301,0.06955599784851074,0.12234830856323242,0.03771018981933594,0.03690981864929199,0.03711891174316406,0.03743457794189453,0.03766298294067383,0.06869149208068848,0.8629791736602783,0.0372467041015625,0.03735637664794922,0.02678966522216797,0.03691267967224121,0.0264437198638916 diff --git a/results/combined/merges_timed/mdeinum/spring-batch-excel.csv b/results/combined/merges_timed/mdeinum/spring-batch-excel.csv index dcac7de6d2..12bb39a1ff 100644 --- a/results/combined/merges_timed/mdeinum/spring-batch-excel.csv +++ b/results/combined/merges_timed/mdeinum/spring-batch-excel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,f1109bad1d0f6b5178b84a59be3e59e18442d127,e7fcf225aef0ccdd6d9c972a07104d4fbe87043a,e732239774881d118a937a636bbd7942bcfa6966,,True,True,Tests_passed,92b6ff26ab94cad5fa3c278f77751bbe5abea735e14350df36a9b31125a0d65d,True,9,17,434,45,True,Tests_passed,b9a87b24f91328d70b6bd43ad3c6b8bad8a595e9ca31ac5a51f0140171520108,True,49,True,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,0.031099796295166016,0.03827333450317383,0.0673370361328125,0.0689854621887207,0.03540992736816406,0.052695274353027344,0.05703377723693848,0.32517290115356445,0.3049352169036865,2.5501067638397217,0.4303133487701416,0.17773890495300293,0.1736774444580078,0.07574343681335449,0.08288884162902832,0.08012533187866211,0.07930564880371094,0.0802004337310791,0.14702296257019043,2.544557571411133,0.0754537582397461,0.0760049819946289,0.0541532039642334,0.07283353805541992,0.05678963661193848 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv index df8e7c3bf2..85dd042f29 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-analysis-ik.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,True,7,32,229,2,True,7,Tests_passed,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,True,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,0.056929826736450195,0.05699658393859863,0.08025383949279785,0.08061790466308594,0.08028316497802734,0.08058309555053711,0.08079028129577637,0.13065838813781738,0.1122901439666748,1.1493992805480957,0.37911033630371094,0.19536781311035156,0.2765624523162842,0.15561437606811523,0.1584925651550293,0.16592764854431152,0.15346169471740723,0.1573474407196045,0.218977689743042,1.1674602031707764,0.1290428638458252,0.1311969757080078,0.13293004035949707,0.1302657127380371,0.13402318954467773 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv index 7a5c34903b..14db7937a9 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-analysis-pinyin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,True,17,77,537,2,True,17,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,True,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,True,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,8fa34c129004d802cb04c57d5947e7f850d11698b13811c5a68d5bd438811c51,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Tests_failed,4f01496661bfa41d51f6e10349cecad4e67b4aea18f2270639e461b1143ab8c0,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,a4033a649f8decfa9c69affabb84ead4bd9f19ec8cf83dbf18eb2d6e4bb446e0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,0.04614877700805664,0.045648813247680664,0.04175305366516113,0.03212332725524902,0.040902137756347656,0.03508758544921875,0.035361528396606445,0.1217963695526123,0.11369752883911133,0.6239135265350342,0.46440696716308594,0.06840252876281738,0.11550283432006836,0.03522157669067383,0.03413701057434082,0.03566789627075195,0.03529834747314453,0.03542637825012207,0.06729578971862793,0.6316845417022705,0.03513503074645996,0.03521251678466797,0.03393292427062988,0.03428173065185547,0.033840179443359375 diff --git a/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv b/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv index 9005180e75..d2d56b60a7 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-analysis-stconvert.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,a3748c08e9c5c50e0f8e439ccb9b9017606e4c65,,True,True,True,12,71,184,2,True,12,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,True,Tests_passed,77cceb256ad43eb8042b0f3d10d3ebeee1a6f96d1569b16369e7ab63c10bf440,True,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_failed,ba42aa5791225c644e9fa65283e12210f68a603bfb4b59a57ec2c0d865d171c2,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,0.053955793380737305,0.043679237365722656,0.05874180793762207,0.05532526969909668,0.062160491943359375,0.054827213287353516,0.04497504234313965,0.1820988655090332,0.11847281455993652,0.6454041004180908,0.3482959270477295,0.07575035095214844,0.13191747665405273,0.044225215911865234,0.04278755187988281,0.045590877532958984,0.04513859748840332,0.04312396049499512,0.07884621620178223,0.6546916961669922,0.04304790496826172,0.04299211502075195,0.03286409378051758,0.043116092681884766,0.03364729881286621 diff --git a/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv b/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv index e589412d60..7a90ebd0a0 100644 --- a/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv +++ b/results/combined/merges_timed/medcl/elasticsearch-partialupdate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,2cffb48e7b98f31e05feb82b21bb15e46b28493b,29be22f2982ec1d94929b4222e10d9a11bfa67c7,bfface3561126d5db1d340a8298e862bc3a8dd49,,True,True,Tests_passed,76241a787d3f93343b49562e74f00c70514451cd102aae740d65d00a7b558f9d,True,8,50,1239,4,True,Tests_passed,015633cb1c997465cdfdf7eed82105b59841252fe67eba77f3b5b8d3a2d238d0,True,8,True,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,fa5517c168d95feeabb2077254466d1b7f487964fd512f1b0dc1cb141ad082cd,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,7d39a9b8996cba2d0a74b19136b46e4c23a81bb78a66729964d4a33f8b8e0ab8,Merge_failed,b135f7cbfe42a8158a7f96630afbda5b3aee67ef875b978fa129b7dc7652e012,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,14314e8deff41b96d67744457bfe6accc20eee3f74e667b0deefbebec83c7728,Merge_failed,6945d95e8a8d9e5bc3609ca5754c9581e2c8785cde399d479e468804c8f56d8a,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,0.03800463676452637,0.041405439376831055,0.03808093070983887,0.040266990661621094,0.04142427444458008,0.042165517807006836,0.03974604606628418,0.2946512699127197,0.2369093894958496,0.8701612949371338,0.411038875579834,0.14202284812927246,0.12607288360595703,0.04699587821960449,0.046472787857055664,0.04642629623413086,0.04692363739013672,0.04716849327087402,0.10874032974243164,0.8500664234161377,0.046685218811035156,0.04793596267700195,0.03828787803649902,0.046922922134399414,0.038796424865722656 diff --git a/results/combined/merges_timed/mercadopago/sdk-java.csv b/results/combined/merges_timed/mercadopago/sdk-java.csv index c820c431cf..0041cd3212 100644 --- a/results/combined/merges_timed/mercadopago/sdk-java.csv +++ b/results/combined/merges_timed/mercadopago/sdk-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 50,refs/heads/master,f60681aae04e2986541668b836247750833f4147,31885f3c5c4908aec7e7c1249dc024d64a623418,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,6,11,673,3,True,6,Tests_passed,f210e064229ce2f0391424a2c8ea155f49f4e6a83bc73544d0128bacf1b35af9,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,969d1c19cf4fccc8e137ff299f2a630189159b4cf48e1972db1df7494d9668cc,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Tests_failed,43b27133e46c1b5b0559aadfe5e78648b255e59edac201f885a589574f2b50a9,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,7e19be33a57271c9194387b0cd6e98dcbf1af77c2a6751f7e4ffac127dd48852,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,0.04569125175476074,0.044678688049316406,0.04433941841125488,0.047359466552734375,0.050307512283325195,0.048393964767456055,0.02684926986694336,0.24739694595336914,0.16317081451416016,1.0416319370269775,0.4034247398376465,0.09952259063720703,0.12409257888793945,0.04535865783691406,0.04481172561645508,0.04422330856323242,0.04482769966125488,0.04438662528991699,0.0963587760925293,1.0379350185394287,0.04450249671936035,0.043892860412597656,0.03506660461425781,0.04473567008972168,0.03533506393432617 diff --git a/results/combined/merges_timed/metamx/extendedset.csv b/results/combined/merges_timed/metamx/extendedset.csv index 823828bfb8..15526dc2bb 100644 --- a/results/combined/merges_timed/metamx/extendedset.csv +++ b/results/combined/merges_timed/metamx/extendedset.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,7531f1e53c2080be0e20f1eabbbbd4e2ed3fd6fb,5521a5634e996bce73b45152db87141fb4d01c5f,523b72d6b645a4d92dfb6547332976daadfe23bd,,True,True,Tests_passed,a43c93fecc32649e98815a7234eadc7a814ed68a7b32ade72a2aa82bb9482197,True,3,12,51,2,True,Tests_passed,7910215742467bade0b9141025859e1c8c58120301fdd645ce7c096686cd3663,True,3,True,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_failed,af71a47697954474bb70b9e7f00e35fdc35a7f08caac3618889e735eb3b4b7bc,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,0.045398712158203125,0.05454850196838379,0.04793524742126465,0.04169058799743652,0.047647714614868164,0.06568527221679688,0.04534792900085449,0.16797327995300293,0.10195803642272949,1.4990735054016113,0.4115917682647705,0.0851283073425293,0.14326953887939453,0.050202369689941406,0.05147552490234375,0.050139665603637695,0.05241560935974121,0.05181241035461426,0.08656525611877441,1.411651611328125,0.04767966270446777,0.05016922950744629,0.039159536361694336,0.049920082092285156,0.03861546516418457 diff --git a/results/combined/merges_timed/meyerjp3/psychometrics.csv b/results/combined/merges_timed/meyerjp3/psychometrics.csv index c6468be51e..8a5f43b079 100644 --- a/results/combined/merges_timed/meyerjp3/psychometrics.csv +++ b/results/combined/merges_timed/meyerjp3/psychometrics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,f90c2bd3c3407128d60612613daa8b5e6c509fc7,0a883ddd4ebcc56a9028663e1273b0d50fab85db,06a7ae98fadbd19b1f49de3b6b209e4b556ce4ec,,True,True,Tests_passed,85d40de620f73882f0bbbdee3fd7ac87e2a188c4dab59b2386ee2b30a0b239e4,True,16,35,339,2,True,Tests_passed,64c27e5d6d67399c27f40815856fe49be9054640815f0b5995c8b8c45a23d0e0,True,16,True,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_failed,9abba648278b024d95629a69612fddf4c9f8bd572b454af3b5fadd5536a34838,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,0.04250335693359375,0.05360150337219238,0.03544044494628906,0.06034445762634277,0.04923415184020996,0.015531539916992188,0.04295086860656738,0.1409282684326172,0.11105179786682129,0.8189957141876221,0.7580039501190186,0.07736802101135254,0.1319265365600586,0.04550004005432129,0.04510354995727539,0.04724383354187012,0.046594858169555664,0.0470888614654541,0.08043909072875977,0.7926590442657471,0.049690961837768555,0.04566836357116699,0.036130428314208984,0.04489469528198242,0.035012245178222656 diff --git a/results/combined/merges_timed/mh4j/metaheuristics4java.csv b/results/combined/merges_timed/mh4j/metaheuristics4java.csv index 20500d2703..6946a7116f 100644 --- a/results/combined/merges_timed/mh4j/metaheuristics4java.csv +++ b/results/combined/merges_timed/mh4j/metaheuristics4java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/develop,78b481eb40f47dee1a6999abd42abf74ce1bba9e,ff1db58980b33481f6e04b8b9dcaeca2acf9e264,0d540432feceb6995da964618a4a4d016a753608,,True,True,True,50,68,2151,3,True,50,Tests_passed,67fd92182d5b04492c24c62c766ae39a1139ea86d33472123430b7e25ea71f6f,True,Tests_passed,a5d727838d8c45ebda211b42d1227cf322a76a39b303160f95ad3d040d16f74f,True,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,92b845cefd5171f8dc139ad9ebf5c78538adf463d9a6fd9d8df3248be76355bf,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_timedout,,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,c9123521e1265766c6960cb962f076cb19adcad47512664dc3995d57652df3bb,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,0.04704713821411133,0.03520917892456055,0.046874046325683594,0.03844881057739258,0.04611849784851074,0.04626655578613281,0.04785275459289551,0.23510241508483887,0.181441068649292,1.304821252822876,-1.0,0.10508012771606445,0.13354754447937012,0.043968915939331055,0.04462289810180664,0.04298067092895508,0.04393315315246582,0.04404330253601074,0.09043240547180176,1.3051671981811523,0.04484248161315918,0.04442620277404785,0.04210352897644043,0.04368853569030762,0.042209625244140625 diff --git a/results/combined/merges_timed/michaelwittig/java-q.csv b/results/combined/merges_timed/michaelwittig/java-q.csv index fe1336f2aa..26b9c4e847 100644 --- a/results/combined/merges_timed/michaelwittig/java-q.csv +++ b/results/combined/merges_timed/michaelwittig/java-q.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,f40f420b416029849a73c6af3de3644db2011af5,b8a193e57a80d4a35b734d7a1500cd4387cc5c6c,0498df2c05d977eb0f376bf12f6b95d93efd1d53,,True,True,True,119,345,770,2,True,119,Tests_passed,2d2a612628096e5db1f58f5060eaecb56bd0f02c1f54d8ba5389dfd7b46ba1f9,True,Tests_passed,a6436b451d43e9d1e64cd89a22e4217b8a0466ccaa78c0fd2a45636d618ed5a4,True,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,0.05081367492675781,0.03737044334411621,0.03430676460266113,0.032337188720703125,0.05768013000488281,0.03908133506774902,0.057528018951416016,0.1667041778564453,0.12297964096069336,0.5518209934234619,0.6454501152038574,0.07436871528625488,0.13249874114990234,0.04569196701049805,0.04550886154174805,0.04691910743713379,0.04488229751586914,0.04547405242919922,0.08097314834594727,0.5262553691864014,0.0449831485748291,0.04650616645812988,0.0335085391998291,0.044660329818725586,0.03460073471069336 diff --git a/results/combined/merges_timed/micromata/javaapiforkml.csv b/results/combined/merges_timed/micromata/javaapiforkml.csv index 4b8e34774b..8af60f4048 100644 --- a/results/combined/merges_timed/micromata/javaapiforkml.csv +++ b/results/combined/merges_timed/micromata/javaapiforkml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/pull/37,524dc619303f36bb3d0d04d8b4ea0bf72ad81cee,f31e4d3136564156e62a7adf65198fe1cb678237,aab2ba2cac18ef91bb8b3ddb1caed32339ef927c,,True,True,True,134,4063,10473,3,True,134,Tests_passed,799345aba19456eef37aa4a28d93dac4046a2b3b1e5fddf970f1b0d0c6b8299f,True,Tests_passed,c51fb7814584d0ec77c4666e8b3ea5df58d88432b987da64c88d20593ce53ad0,True,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f20e3708f15fabafa3cf02e6e2bf45b200057caee616a729caaae0ab14909dbd,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,22b5a83225ee024cc0529509022950ff97511baf54ef58dec35afe2f5c6afce1,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,c2cba1e383912c391d8923c0b2cdac70bfeb658f38412e23a816e980134ba048,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,0.039652109146118164,0.03619670867919922,0.05529141426086426,0.05777120590209961,0.053450584411621094,0.04528522491455078,0.05464363098144531,0.18065834045410156,0.16994929313659668,1.1968464851379395,-1.0,0.14519858360290527,0.17675280570983887,0.08547854423522949,0.07294797897338867,0.0807504653930664,0.08362627029418945,0.07213854789733887,0.13956594467163086,1.2129156589508057,0.07550716400146484,0.07020998001098633,0.07670998573303223,0.07964777946472168,0.06220841407775879 diff --git a/results/combined/merges_timed/mikaelhg/openblocks.csv b/results/combined/merges_timed/mikaelhg/openblocks.csv index 626ff9458f..1abce94a12 100644 --- a/results/combined/merges_timed/mikaelhg/openblocks.csv +++ b/results/combined/merges_timed/mikaelhg/openblocks.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/remotes/origin/pull/16,fed14c0074c778058c5c6407c0d3851a48745643,3d42bdb33d25151c7eb51be29b54cd79f18cbea6,76f96715817507d662dba476143d4a55649d8eae,,True,True,True,66,512,1962,20,True,66,Tests_passed,f8e6b84c9aaa9bc92ea713cbb039114bff61a8586664a092462e9fd04cbd63b5,True,Tests_passed,278b9ba2cf765408c336b00d7fd29b42564ebfc9a2d2fb55023a0122cebb3bd3,True,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Tests_failed,61b1d0e5f7ce0b98342c75f7b0369a23127f0778f16f09e3943333f648804074,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,0.03145408630371094,0.03414130210876465,0.034848690032958984,0.040778398513793945,0.03923964500427246,0.03901243209838867,0.03962349891662598,0.3562040328979492,1.072967767715454,22.9702308177948,2.0268309116363525,0.6730687618255615,0.27446866035461426,0.19717764854431152,0.21545886993408203,0.21547579765319824,0.19480228424072266,0.21674013137817383,0.5944569110870361,19.859194040298462,0.1938769817352295,0.19754576683044434,0.06505465507507324,0.1898820400238037,0.06535911560058594 diff --git a/results/combined/merges_timed/mikera/vectorz.csv b/results/combined/merges_timed/mikera/vectorz.csv index dca42515e5..4bfc8073d8 100644 --- a/results/combined/merges_timed/mikera/vectorz.csv +++ b/results/combined/merges_timed/mikera/vectorz.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 82,refs/heads/develop,38479c7a71896eeae10016b9816c3adfd10677c7,aa4246cef8d514c5ba431760237a475f2bc93a6f,5ce3d141304790445a47f3ba853f1b458f3416a2,,True,True,Tests_passed,8a82f846364a62b45072b39c550008088bcb6d5e89a38e0460f20e8714f16d9d,True,23,77,695,2,True,Tests_passed,ba9b49be5b7ad61f7f291f8f750bd331aa7e945cf42e82e09404246ca0d51da2,True,23,True,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,e8771aa43e0d88cc2249eefbe62fee5f2d326aecaeeb7d1d229dda7cd5339a4d,Merge_failed,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Tests_failed,34f975b00e43a3bf1100ba8aef6c85e1848c695589489ed0b9784cb1e6e518e5,Tests_failed,3c44c5924494f230ce235aae07e1af240373c5d5601cd3fd0319e8cbd400212a,Merge_failed,4a2f4f42bfab39cc91a1860db983aec7bb1524c2f85cae0d2e6383335933e90f,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,a57b41fa35f739c841832d7a679a8635ec0bcb9348558641329986cf3f6d9cbf,Tests_failed,34f975b00e43a3bf1100ba8aef6c85e1848c695589489ed0b9784cb1e6e518e5,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,bc84a65b8177f22b8f8f0662d1855aea990a4523c17767fceb7ea70e0f672f12,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,Merge_failed,50ba22fc8677bc00c705e314bd5d9ee3e559526181c5dd00c24e8eab22416115,0.02031993865966797,0.020007848739624023,0.023253679275512695,0.02318596839904785,0.014026165008544922,0.031684160232543945,0.02433633804321289,0.05715537071228027,0.08564901351928711,0.47980713844299316,0.866703987121582,0.0992283821105957,0.14016938209533691,0.038381338119506836,0.054608821868896484,0.038394927978515625,0.03789925575256348,0.05066061019897461,0.07329297065734863,0.4803175926208496,0.044904232025146484,0.037213802337646484,0.052277326583862305,0.05068087577819824,0.03564596176147461 diff --git a/results/combined/merges_timed/mikvor/money-conversion.csv b/results/combined/merges_timed/mikvor/money-conversion.csv index 6bdf04db0c..77e1702f84 100644 --- a/results/combined/merges_timed/mikvor/money-conversion.csv +++ b/results/combined/merges_timed/mikvor/money-conversion.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/remotes/origin/pull/18,7fd58e662fac159f87c3d1f8980001c7570e615d,f4b08d593619144bcf293727980ac768eef70459,9e6bdb77d6178f61a8e12141628076ff289c5f6a,,True,False,Tests_passed,0506d34bfb48f879bfe0438a51539ff0345f9ad7bf8bc7061fe1a47acbf66908,True,6,7,97,3,True,Tests_passed,9a88b5c690992e2343df2bb870cf213ea8beb199e3805c8c03a38ff37e50f203,True,6,True,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,99e456e0c5c4c36f64a184a7e0834585836fc191dddf6e2824ac92994c96c2f4,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,be003950ff9086d7218f1e0679ab5347e3e13f6091af1e2265f1c8b78c681e32,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,491c1677bc4f3d05c70de902eecd405caa58c158f64e7c17c61eafe3205e135e,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,0.04006242752075195,0.040935516357421875,0.042252540588378906,0.03882193565368652,0.04263019561767578,0.04160499572753906,0.03755354881286621,0.23112034797668457,0.16553616523742676,1.625643014907837,0.339066743850708,0.09837865829467773,0.12174034118652344,0.04075908660888672,0.04006505012512207,0.040292978286743164,0.0413358211517334,0.04117536544799805,0.08744573593139648,1.625838041305542,0.04108476638793945,0.04175209999084473,0.03265523910522461,0.0409696102142334,0.03136038780212402 diff --git a/results/combined/merges_timed/milkbowl/vaultapi.csv b/results/combined/merges_timed/milkbowl/vaultapi.csv index d684c320a2..186acb20da 100644 --- a/results/combined/merges_timed/milkbowl/vaultapi.csv +++ b/results/combined/merges_timed/milkbowl/vaultapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/remotes/origin/pull/152,513fa83f0bb1da4b5a94904ddf3b65fa2dff631e,9520d8847e2b31f4a9d2cb5f7831c38877cd0ce9,7c7d0abcc2a89011a5bd44f67088d6446c7cd676,,True,True,True,12,23,2253,2,True,12,Tests_passed,a2c14020634374718d5b0c0f7d5da4fa70eea8d3dba2fbb9971d4642c39c94a3,True,Tests_passed,86e383c6710dd7bfc11604d004af9dce50edf16bcc0325d8a0a4cc354835216d,True,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,0.009462594985961914,0.009325027465820312,0.009758949279785156,0.009682893753051758,0.009789705276489258,0.010204076766967773,0.010285615921020508,0.033596038818359375,0.06456995010375977,0.4638633728027344,0.40111279487609863,0.0756995677947998,0.12444210052490234,0.03949880599975586,0.04072713851928711,0.04059934616088867,0.04040884971618652,0.03968000411987305,0.07311439514160156,0.5102260112762451,0.04033350944519043,0.03944993019104004,0.02964186668395996,0.03973555564880371,0.029959678649902344 diff --git a/results/combined/merges_timed/mimno/mallet.csv b/results/combined/merges_timed/mimno/mallet.csv index ac38fa7753..0a93a82752 100644 --- a/results/combined/merges_timed/mimno/mallet.csv +++ b/results/combined/merges_timed/mimno/mallet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 88,refs/remotes/origin/pull/174,a1f4c0a32d1da92d486d022bd1b860cac1285580,808668f25eab6bbd1282e1cff5c0594c8673b070,12487de1aa6433bdcf5af0ee0a17b368e64c7acf,,True,True,Tests_passed,e7509a93067c48b052332a33a4def32a041597470d2282c4f84a53b52158fabe,True,129,1280,4680,4,True,Tests_passed,f4b5a13b324f0d007132c101e5ca95e9bde8a5db2ba00edc1bc6810990ec4cd4,True,129,True,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,8a4509d7fe7397f9dde0f0ad3679d6779e7037af6538e0d011eb60ef97bbb613,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,0bfa52ac424b4f8da70eba90a2850c59aef193e5fdd9576b2fdf2d35b649811b,Merge_failed,3c31a28e159f073ee34822b81f9298650fed7bfa4ef3df42b0734860508c9d73,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,c8485b163beb8f521e935d4e8855e758e6ecb5a77fdcdacd7d491822f2aad190,Merge_failed,fe4f37ff30d613cf4916498122d991938ecf2c30fdb56bc0df33fb69ee152a01,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,0.0603785514831543,0.05301380157470703,0.058934926986694336,0.06537127494812012,0.05718708038330078,0.06647109985351562,0.06812286376953125,0.25701904296875,0.24288105964660645,2.016625165939331,2.346097230911255,0.1684887409210205,0.17344307899475098,0.08255934715270996,0.08270740509033203,0.08407187461853027,0.08420324325561523,0.08453702926635742,0.15535950660705566,1.9348323345184326,0.08039402961730957,0.08333039283752441,0.07338309288024902,0.08038187026977539,0.0747981071472168 diff --git a/results/combined/merges_timed/minecrafter/bungeejson.csv b/results/combined/merges_timed/minecrafter/bungeejson.csv index 1ccd1fce21..12665ad461 100644 --- a/results/combined/merges_timed/minecrafter/bungeejson.csv +++ b/results/combined/merges_timed/minecrafter/bungeejson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/remotes/origin/restful-api,0b724f363a57d505cd080c459b42edd48cf57891,9a86a05971b5552c08194dfedaa054d5eac16d8b,80ff9723e4368f5bf84b14dce399d7912d6abce0,,True,True,Tests_passed,4e43cfb1aa9cec3de65d3a1d1dd9389e296fef1299599c7ef39367fa616d2594,True,19,38,171,2,True,Tests_passed,2fb281682c5cd6c7a0ff5628c1b18a580c7658b6c73edaaf1d7934d1eb91eac2,True,19,True,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,0.008375406265258789,0.00892186164855957,0.008960247039794922,0.00937032699584961,0.008941650390625,0.009052753448486328,0.009173393249511719,0.03178715705871582,0.06315112113952637,0.6489460468292236,0.400162935256958,0.06980013847351074,0.12931203842163086,0.03917527198791504,0.039838314056396484,0.03861880302429199,0.03902149200439453,0.03953075408935547,0.06988096237182617,0.6873154640197754,0.038260698318481445,0.039047956466674805,0.027604103088378906,0.03899383544921875,0.028216838836669922 diff --git a/results/combined/merges_timed/mitre/http-proxy-servlet.csv b/results/combined/merges_timed/mitre/http-proxy-servlet.csv index 8f4401d34e..a8378d235d 100644 --- a/results/combined/merges_timed/mitre/http-proxy-servlet.csv +++ b/results/combined/merges_timed/mitre/http-proxy-servlet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,73da1ecb003abb248aae7b00fa554801baff1418,89f7168fa870d7f726185136517c5d52467d73d3,41a79b08bc07511f7f68b193054b19360fd48838,,True,True,True,6,37,204,2,True,6,Tests_passed,0c3a39385c0cc620f4f2fb45aa41bc487862513285efbcfee1272d528fd79bbc,True,Tests_passed,25eb1363d17ad1f68bb841db44f81929ae6cd281015ba990ea9f87329a762b8c,True,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,0.04258990287780762,0.043234825134277344,0.04316592216491699,0.04578876495361328,0.04329991340637207,0.04605603218078613,0.045240163803100586,0.17613959312438965,0.11720490455627441,1.0983514785766602,0.5278782844543457,0.06981253623962402,0.12197399139404297,0.03887629508972168,0.039435386657714844,0.03966522216796875,0.03959155082702637,0.03963184356689453,0.07190418243408203,1.0865743160247803,0.03915286064147949,0.03947639465332031,0.028386592864990234,0.03863835334777832,0.027820110321044922 diff --git a/results/combined/merges_timed/mixpanel/mixpanel-java.csv b/results/combined/merges_timed/mixpanel/mixpanel-java.csv index f0dbe9ea60..9f48e14a69 100644 --- a/results/combined/merges_timed/mixpanel/mixpanel-java.csv +++ b/results/combined/merges_timed/mixpanel/mixpanel-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,bcdd1ed28f9b69aa8baa6d7d44e292f4d8e8a236,7cc869766660614944e59e0f153f3fac91e654af,dcd372da803eba5bf6ec38189647f005634b922a,,True,True,True,7,24,77,2,True,7,Tests_passed,8c5a9a45a6651722aff61e1c8d82077152d3103ee3f03856178a7c1ff4a23777,True,Tests_passed,e70b6084c60ad9db77a6c5d49ffce05898631fbfde7f7918f1a827665883e10d,True,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,2779da433461a80abd106d1cca374ba1b1c45c822fbf59660cb1fb0f95b6dd1d,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Tests_failed,582ac54c96f77e8814ab0eabc18295fc08fc84ded7d2a2d305873343eebd879d,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,42607504ec4a0ebe1ca3dc2f057c4365ec54944b04a9b657d32926868d677364,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,0.03998756408691406,0.03754281997680664,0.038186073303222656,0.04003453254699707,0.04013991355895996,0.030269145965576172,0.04058241844177246,0.1567070484161377,0.1077876091003418,0.6788811683654785,0.36244678497314453,0.0662071704864502,0.11425900459289551,0.032622575759887695,0.03288435935974121,0.03197288513183594,0.03267335891723633,0.032678842544555664,0.06302094459533691,0.6749067306518555,0.033162593841552734,0.033153533935546875,0.03161883354187012,0.03233003616333008,0.0315861701965332 diff --git a/results/combined/merges_timed/mjsalerno/unobot.csv b/results/combined/merges_timed/mjsalerno/unobot.csv index 03fe7128ce..340bf53a46 100644 --- a/results/combined/merges_timed/mjsalerno/unobot.csv +++ b/results/combined/merges_timed/mjsalerno/unobot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/remotes/origin/pull/42,5c68b52897a24a9aa71f0ee807a37f04c1f997f3,7c9a626e059d1f481130d6de69cdeb79243d8ffc,50f00c42a551b152e5945adda21c0a9580734ca8,,True,False,True,3,26,53,2,True,3,Tests_passed,da5d9cb924c723c919a0805ef1b79ce0b170172cc44217e4b40a9c6de8211a3a,True,Tests_passed,07125af5f670ab7ae858ddcfc5fa6ec59148472bc595e74a13c501ba831efaa5,True,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,f140daa966c14fb71a3217da340aae01f338f821681ddebd34a036d0eab9739a,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Tests_failed,1983e3d49975e2204e5df53a46173847589452e350a92b295adcc240fb50cb61,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,7ddd313659c7647087532aed2268414baa83ca52c1c49ba1f4f95026ed97833f,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,0.04147982597351074,0.041783809661865234,0.048081159591674805,0.04715538024902344,0.04252123832702637,0.04236173629760742,0.043619632720947266,0.17548418045043945,0.1245729923248291,2.058908700942993,0.4557759761810303,0.07597494125366211,0.11413002014160156,0.03315854072570801,0.035093069076538086,0.03544187545776367,0.03511452674865723,0.03525972366333008,0.06665372848510742,1.887638807296753,0.035356998443603516,0.036063194274902344,0.0329747200012207,0.035073280334472656,0.033014535903930664 diff --git a/results/combined/merges_timed/mjsax/aeolus.csv b/results/combined/merges_timed/mjsax/aeolus.csv index 1b32a84b44..d30da53bad 100644 --- a/results/combined/merges_timed/mjsax/aeolus.csv +++ b/results/combined/merges_timed/mjsax/aeolus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,85127f4c5b94cc63493a78baf3bcb0f703a4bca5,9863d87774e76990b823efb0c6dbef3132084438,71bbc8afc3cd487cf847377e54251c8416cc1e49,,True,True,True,52,160,1472,92,True,115,Tests_passed,a5049851dccb1faab38ce136e46912bfad21b98691e4d74f903a71f5985a9e33,True,Tests_passed,4aa0e05f3da13b5a1f192fbccec0b9d0f53fc6b7d359ef49feea494f51bb7689,True,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,50e627507ef4e7321302b898913e7674875934dd3412fd99a40efc515837c97e,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,02a2bdcb26285c666c17f15947dac5b4dc202113b542b348442014380fa8904b,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,cea2095df91dadf8506402663ee6557f8ee46b9638b637020029f31c25952337,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,0.02788090705871582,0.02758193016052246,0.029208660125732422,0.029335975646972656,0.02885270118713379,0.029081344604492188,0.0302121639251709,0.3760702610015869,1.5559630393981934,18.570883750915527,2.3339905738830566,0.9011447429656982,0.2887258529663086,0.19926142692565918,0.20115399360656738,0.19890761375427246,0.19972014427185059,0.19899582862854004,0.6725094318389893,18.65644907951355,0.1972196102142334,0.1969285011291504,0.16129159927368164,0.1916062831878662,0.16000986099243164 diff --git a/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv b/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv index fca3b35b07..9bda483ad1 100644 --- a/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv +++ b/results/combined/merges_timed/mklemm/jaxb2-rich-contract-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,0a55df3366207b1d38e81e468181949e1d53881c,e1a4d4058ac0a67fe00970ba020d205f7bb068d9,dd7ada0dbd4efe4681fb530d9ab1273cd5ef5910,,True,True,True,2,15,167.0,2,True,2,Tests_passed,a931f70215bee43c3256dbeb50fdebc91f64a34bd7c010172141d8a677f1f5f3,True,Tests_passed,547099c7078cf1dbcb3272f1cb561a14c534e50dd7c437d61fdd7a71fdfe60b2,True,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,0.0421299934387207,0.04828619956970215,0.04642963409423828,0.042122602462768555,0.03888130187988281,0.049185752868652344,0.05240631103515625,0.16346192359924316,0.1122121810913086,2.5456600189208984,1.419679880142212,0.08892631530761719,0.13541102409362793,0.0587460994720459,0.05910634994506836,0.05482983589172363,0.0577235221862793,0.05569052696228027,0.09412169456481934,2.303605556488037,0.05587124824523926,0.054735660552978516,0.045804500579833984,0.05686593055725098,0.04297590255737305 diff --git a/results/combined/merges_timed/mlaccetti/javapns.csv b/results/combined/merges_timed/mlaccetti/javapns.csv index 871972cfb7..dd8358f0d9 100644 --- a/results/combined/merges_timed/mlaccetti/javapns.csv +++ b/results/combined/merges_timed/mlaccetti/javapns.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/develop,413b36b2eb8345ba9226bb29894aa908b78e1f23,2d5ef5447267fb2b50ebf753103505f84605ea6c,f7ebeb852ee61b50638d120d44b4e10507ae553e,,True,True,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,True,22,116,350.0,11,True,Tests_passed,910b3f21713eafbd9023948b36bf28d21ff51d6c062b4fd0060d67acf576392c,True,22,True,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_failed,43d99a960e82c4fb71338ac1bc4287f59e1163d22a690bc8c4f3a80e42f959d7,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,0.060803890228271484,0.058637380599975586,0.05446338653564453,0.054657936096191406,0.05191993713378906,0.0514528751373291,0.05894207954406738,0.7803995609283447,0.5950798988342285,7.25321888923645,0.5274960994720459,0.36797642707824707,0.20551562309265137,0.11155271530151367,0.11455225944519043,0.11062955856323242,0.11125683784484863,0.1154642105102539,0.30023932456970215,7.181211709976196,0.11257481575012207,0.11414718627929688,0.035947561264038086,0.11222648620605469,0.03601646423339844 diff --git a/results/combined/merges_timed/mmastrac/nanojson.csv b/results/combined/merges_timed/mmastrac/nanojson.csv index 921268f843..bec9570a97 100644 --- a/results/combined/merges_timed/mmastrac/nanojson.csv +++ b/results/combined/merges_timed/mmastrac/nanojson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,82385874bb4125a795bc67c7094df60367c096e9,9b02f0ed8d95b7aac915f3fa01632feb862c4751,c9523fac6ebac74f194ccae4aa151736d5c1385d,,True,True,True,21,29,190,3,True,21,Tests_passed,87de4b28745d7d06b89476de36e3a00891cf749a6af641094d0a0b42060dd23d,True,Tests_passed,dff4712663b33cd2a973726ca9a50144a76e05b16790b328c9448c3067a5a0ff,True,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_failed,796ea8d7be73534da3ae8ea253e24cf3f60033dd1c72ec9239992ad7fc7c0aac,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,0.031897544860839844,0.04731917381286621,0.06467366218566895,0.047614097595214844,0.06380677223205566,0.0484166145324707,0.07474446296691895,0.238722562789917,0.1561431884765625,1.4107248783111572,0.603752613067627,0.11543965339660645,0.15957045555114746,0.06584525108337402,0.06500840187072754,0.06612968444824219,0.0644690990447998,0.06408238410949707,0.12089872360229492,1.408226728439331,0.06247735023498535,0.06079912185668945,0.048356056213378906,0.059941768646240234,0.04563117027282715 diff --git a/results/combined/merges_timed/mmazi/rescu.csv b/results/combined/merges_timed/mmazi/rescu.csv index 81b6fc7b25..581bb2fcee 100644 --- a/results/combined/merges_timed/mmazi/rescu.csv +++ b/results/combined/merges_timed/mmazi/rescu.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 35,refs/remotes/origin/pull/100,efdd938e7a692b6e6f5cc759202a445f8c1d58e6,74f37e6c3fdaf31c8ffcb7562dea81b6cf48ef66,5b9ff524c314835010d92e74200a4f2f66377d3f,,True,True,Tests_passed,c82ab7e00366a2f9d675099d7d0af778474a762c96e95ac74c3b75684f8f38b8,True,11,41,176,3,True,Tests_passed,0fcfb9942c9e8f8509892a7db28250ad676b82fbf2727bda4785cb1f7ef402a8,True,11,True,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,0.04961872100830078,0.04176068305969238,0.04710125923156738,0.04992198944091797,0.047080278396606445,0.051339149475097656,0.03697347640991211,0.23429322242736816,0.17016339302062988,1.253561019897461,0.39400672912597656,0.10685992240905762,0.13980579376220703,0.05228114128112793,0.05274534225463867,0.05207633972167969,0.053267717361450195,0.05263566970825195,0.10274624824523926,1.230285406112671,0.050992727279663086,0.05116605758666992,0.03260540962219238,0.052007436752319336,0.03339982032775879 diff --git a/results/combined/merges_timed/mmlab/rmlprocessor.csv b/results/combined/merges_timed/mmlab/rmlprocessor.csv index 0a77cdc687..38f1a72cfa 100644 --- a/results/combined/merges_timed/mmlab/rmlprocessor.csv +++ b/results/combined/merges_timed/mmlab/rmlprocessor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,707510e3a9c3a799e38a2933cd54e4688c0ad7aa,e011318d42cff62d34c224ad889163c38254cb5b,7fc95258a1ce664d978c90ea375c9ee0d76546ca,,True,True,Tests_passed,ff38e94a8726322f71be194cc8a46873dcedb18403a1a57a57cf1c70704a8712,True,43,245,942,5,True,Tests_passed,cef6c32a7d620ba45c9847b3b61719e9fc33db4993de3802e44f9678f4a705c2,True,43,True,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,a400a60516a7ee15ff9dc020de6f16ec79f219bbb9e0c72fc690e3c2faf137fc,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,6956031f2ef21c6cdef5265bcefd7d0f91f75ee96d1718dbad4da46574594a22,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,add68a5c71131c004e4c51921e931f11ef2f0696ce526d8cbc77588a05fc3e32,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,0.04576897621154785,0.06780242919921875,0.05227470397949219,0.035822391510009766,0.06319379806518555,0.048416852951049805,0.03875303268432617,0.388427734375,0.2899017333984375,3.721930503845215,-1.0,0.19066548347473145,0.15361642837524414,0.06723499298095703,0.06783294677734375,0.06915903091430664,0.06739950180053711,0.06596970558166504,0.15490198135375977,3.517223358154297,0.06655740737915039,0.06742000579833984,0.04477357864379883,0.06777453422546387,0.04346489906311035 diff --git a/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv b/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv index d902d48782..678578ff1d 100644 --- a/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv +++ b/results/combined/merges_timed/mojohaus/exec-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 43,refs/remotes/origin/pull/44,4c831013aa8566249aae635880e414012ded48ee,885f2f42706c637b79aebc3d6ea45b68394c9301,79ffadef8f9200893a5df55480b8cc920e77a394,,True,True,True,4,20,106,2,True,4,Tests_passed,56102c0f0170020a033681690e9cb0174cdf5be753f59b8fbfcc4c31094eb98f,True,Tests_passed,f6ccc78e0da0f85a5fb0feeb6ed94f5da145f7625d30eceb39383711122a33f9,True,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,3bce6b104624ccaf12f48d575be76a8d4202a528df2423f7a20cf6d21132c359,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_timedout,,Merge_failed,ea3ff6a1304fbb7983b75122dfe8b1d5ad4e5d734a98673813951b06b65ae67a,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,25e0c5a20b071b2764645044c96a064556a00b7b422e37525a4909de84ed7932,Tests_passed,8540e33851275d5356cc248ac3cd4a514c69fb4c87ef2bfee857d3d799a713c1,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,Merge_failed,5763210d62b9a001f52af7f0446cb4f2c4569a8b7e973aebbbc8489ded8f2713,0.0350947380065918,0.04623556137084961,0.05068206787109375,0.046700239181518555,0.044840097427368164,0.04007720947265625,0.04721212387084961,0.1716630458831787,0.12360334396362305,1.5209083557128906,-1.0,0.07094120979309082,0.12527775764465332,0.04214644432067871,0.04022407531738281,0.04237675666809082,0.04208827018737793,0.04055666923522949,0.07624220848083496,1.408355474472046,0.03996562957763672,0.041202545166015625,0.04115772247314453,0.038184404373168945,0.0413053035736084 diff --git a/results/combined/merges_timed/mongobee/mongobee.csv b/results/combined/merges_timed/mongobee/mongobee.csv index 36ddaaeca7..d5c48db922 100644 --- a/results/combined/merges_timed/mongobee/mongobee.csv +++ b/results/combined/merges_timed/mongobee/mongobee.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,abf507930c55a2a4d918d70d5c3ff852fb5cbf5e,81176bcbef3ba6fa4bfb006ba4571a33c71bdbc2,f73e3dc7807a7a4daafde4fa720b6f4246670978,,True,True,True,11,64,592,3,True,11,Tests_passed,2c1a5f276ab626eba7700c2ad8e3724e568a77586b80c21a1614d9bde703dbf1,True,Tests_passed,9e00b2d19b8f69e948b4291cba5261ea6dcad756e554a824442f59e591e24e48,True,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,73db6dce3f4fe4840a549ed22ff1354966d58a311716ff5c4be5ea84c5b8aaad,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Tests_failed,7ca05e650490dddc4d2fae05c41677fedfc29748fbf0837522051458a1d4fb9d,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,6c97950040f402d72271451644d91316f743d6196867e6095434321ae23b7077,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,0.04684329032897949,0.045816898345947266,0.040709495544433594,0.04358530044555664,0.0359959602355957,0.040045738220214844,0.044884681701660156,0.23576140403747559,0.1766963005065918,1.3892931938171387,0.37219691276550293,0.11107182502746582,0.13689470291137695,0.04981684684753418,0.04973149299621582,0.04975080490112305,0.050612688064575195,0.04828596115112305,0.09962892532348633,1.360567569732666,0.049509286880493164,0.04793500900268555,0.04793357849121094,0.04867911338806152,0.048197269439697266 diff --git a/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv b/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv index 9473ea528f..46ce3e9a1a 100644 --- a/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv +++ b/results/combined/merges_timed/monitorjbl/excel-streaming-reader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 47,refs/heads/master,0ddd3bd015cc0a792db62c6a5988844478e7d388,8a016a98cd4c187894853bfcefb543dd43277519,f44c06b09b95cdd8c943957fa81e46aaf8feb552,,True,True,Tests_passed,ea23a0b0bfe6a0c4fdfb0191726b93d411ebf26f98c077e7520bb92f107b90cb,True,5,10,70,3,True,Tests_passed,cc7214658eb15b1919ae7460e98fb19dc3a1b929346bbcc8517b2f6c08b398ab,True,5,True,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,7d222e4ecd626a077f1a37c7522e7b736ff39547333b6fdfc85b4d5908994b4f,Tests_failed,98c146fe06d7f1797b889b3a9d4f0adba932b58c4d7be28e02565fb81ec4f35c,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,7d222e4ecd626a077f1a37c7522e7b736ff39547333b6fdfc85b4d5908994b4f,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,Tests_passed,35f284f57292b4ff3ffd9d3cee5ae02e80e7df65b92872cdd295a84696312995,0.013883829116821289,0.014308452606201172,0.016765594482421875,0.015892505645751953,0.01636481285095215,0.016234159469604492,0.016750097274780273,0.060468196868896484,0.12865805625915527,2.324634313583374,0.3955812454223633,0.11528491973876953,0.14704489707946777,0.05732131004333496,0.055988311767578125,0.05730462074279785,0.056896209716796875,0.05921173095703125,0.11191272735595703,2.006739616394043,0.054189205169677734,0.055057525634765625,0.03903985023498535,0.05324053764343262,0.03980684280395508 diff --git a/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv b/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv index aca9b10028..177a420e08 100644 --- a/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv +++ b/results/combined/merges_timed/monterail/elasticsearch-analysis-morfologik.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,6024cb183c93a9bcde34205c97b4a1dfb3694ac5,6c0272594c958b201b17fd354e8b06b3f8008cef,e6694bb0f8433e24d3bed2c2a2c10e16b6b53eb4,,True,False,Tests_passed,0bad627e56221cdf7b5054b87bab687cd870efe747d1b9fc07527c8b64bf2e74,True,4,8,58,7,True,Tests_passed,c48d3da379b47b59f3ce0583e029d3557b679af0c333d74137f31bbaa524be71,True,8,True,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_failed,a1502ef1788d13bfeab8ddc7c01115025d96cf49468f9b6996910bc7e38868eb,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,0.03983640670776367,0.04173541069030762,0.04349946975708008,0.04386186599731445,0.042281389236450195,0.04378938674926758,0.039635658264160156,0.2342386245727539,0.16608190536499023,0.4651765823364258,0.3682553768157959,0.09870147705078125,0.1303408145904541,0.04488682746887207,0.04528379440307617,0.04486989974975586,0.044855594635009766,0.044768571853637695,0.09351325035095215,0.48292016983032227,0.043538808822631836,0.043711185455322266,0.026349782943725586,0.044860124588012695,0.026720762252807617 diff --git a/results/combined/merges_timed/mooso/azure-tables-hadoop.csv b/results/combined/merges_timed/mooso/azure-tables-hadoop.csv index ebbe18d223..625d00bcf0 100644 --- a/results/combined/merges_timed/mooso/azure-tables-hadoop.csv +++ b/results/combined/merges_timed/mooso/azure-tables-hadoop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,f5ae55a8d5024fba05bd9a188ae18116b624a69d,8dfebe85856c3c8b151ef6c125269f017e4ff3c8,2d39177520998c04d9ae22cfe33364183a368d84,,True,True,Tests_passed,9e4249278bd982e5cf0c0fd85a3f35ec70961e9d195585c572a71834917564fd,True,15,52,251,20,True,Tests_passed,61bae1ae8066aca05420353b193b18f6b6a44366dbd625f0f341c69d1b411ea7,True,24,True,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,f1006de1c2c8ec5ac47f3e180e3985bf486bb53e2c869baf6e5752f15321e7a0,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_timedout,,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,2dd963750de0fa32ace1a65f5254f3f69547bf5da69647aa14e57621bcddc279,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,0.041785478591918945,0.04632234573364258,0.03166317939758301,0.04515409469604492,0.03222918510437012,0.038799285888671875,0.04024386405944824,0.7250766754150391,0.6221773624420166,4.528571844100952,-1.0,0.3477654457092285,0.17578625679016113,0.09765887260437012,0.09667611122131348,0.0984642505645752,0.09791803359985352,0.09869647026062012,0.2687532901763916,4.593824863433838,0.09897708892822266,0.0985867977142334,0.0687708854675293,0.09805679321289062,0.06810712814331055 diff --git a/results/combined/merges_timed/moquette-io/moquette.csv b/results/combined/merges_timed/moquette-io/moquette.csv index d640408c70..a4d5a40d1d 100644 --- a/results/combined/merges_timed/moquette-io/moquette.csv +++ b/results/combined/merges_timed/moquette-io/moquette.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,True,20,45,219,2,True,20,Tests_passed,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,True,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,True,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,0.05082535743713379,0.04283881187438965,0.05010581016540527,0.03232002258300781,0.03838062286376953,0.04252433776855469,0.04762005805969238,0.17762446403503418,0.10495758056640625,0.9524059295654297,0.559014081954956,0.09274649620056152,0.15125679969787598,0.045467376708984375,0.055527687072753906,0.059472084045410156,0.05713629722595215,0.05780029296875,0.09476661682128906,0.9211010932922363,0.04495501518249512,0.05322003364562988,0.04846501350402832,0.04816484451293945,0.04726839065551758 diff --git a/results/combined/merges_timed/morfologik/morfologik-stemming.csv b/results/combined/merges_timed/morfologik/morfologik-stemming.csv index fafa427632..4842bbfbe7 100644 --- a/results/combined/merges_timed/morfologik/morfologik-stemming.csv +++ b/results/combined/merges_timed/morfologik/morfologik-stemming.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,ff3dde628c969e0d31cd9c0f3d845320e626545d,1a27128d9e6104f726032168c4b31e39d0d8556b,8c46349590627e869e00b42681c9c1ff5e79c4f1,,True,True,True,3,35,260,2,True,3,Tests_passed,9e6d8183cb58a04ac6efef887389378960a7eeb4a0165ad934bb84252f09dc36,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,0.01014399528503418,0.04837512969970703,0.01155543327331543,0.06827163696289062,0.06724739074707031,0.06992793083190918,0.029551267623901367,0.13885116577148438,0.10812973976135254,1.372253656387329,1.1862690448760986,0.07323074340820312,0.25539064407348633,0.12685227394104004,0.08852982521057129,0.1406106948852539,0.0610499382019043,0.1307680606842041,0.10422921180725098,1.3933086395263672,0.11656332015991211,0.11643004417419434,0.10023736953735352,0.11569023132324219,0.09973788261413574 diff --git a/results/combined/merges_timed/moritanosuke/glacieruploader.csv b/results/combined/merges_timed/moritanosuke/glacieruploader.csv index e50ffc809a..005371d2b4 100644 --- a/results/combined/merges_timed/moritanosuke/glacieruploader.csv +++ b/results/combined/merges_timed/moritanosuke/glacieruploader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,cfeacbf6ce259d925301898491500214446bfa79,c1decd8574b90ca049cc3c1cdf35f71d9fbc270b,daa8e1c90e68ae8d880c1cd587e5536bf18d1dfa,,True,True,Tests_passed,ffe1246fbc2c46d1e69a57d15ea6d56e371ad45c6054b2e8777088e59d8b01e5,True,7,20,78.0,3,True,Tests_passed,8cb2c6858c9c1d7e891945e10645769cfa0c3d96f14877bdea2396720ffc63df,True,7,True,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,50726c021ef6f531a32297a28e443f3ea503f5e438438358031914093cdb69e8,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Tests_failed,e5bff27185dd5b53d61637e7cf77b071c6d291a7cfb9096a17fc9f871e81b39f,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,7b06c6aaccb5728d5e242cbc2a73b27832316c9b5a2b6fa6ca4cd3a84af9e732,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,0.03562283515930176,0.042084693908691406,0.036934852600097656,0.039595603942871094,0.011941671371459961,0.037325382232666016,0.035614013671875,0.23298859596252441,0.17133188247680664,1.0644934177398682,0.25279736518859863,0.09706616401672363,0.12418937683105469,0.040819644927978516,0.04032135009765625,0.04006457328796387,0.03931379318237305,0.03950786590576172,0.0876924991607666,1.0566797256469727,0.040427207946777344,0.04118680953979492,0.03136086463928223,0.04089093208312988,0.03079366683959961 diff --git a/results/combined/merges_timed/motown-io/motown.csv b/results/combined/merges_timed/motown-io/motown.csv index 6176d382ba..77d8082be2 100644 --- a/results/combined/merges_timed/motown-io/motown.csv +++ b/results/combined/merges_timed/motown-io/motown.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/develop,0208735508218488254ec01471e5025b1c2f97cc,f48ce44e8435ebb642994c7795002d01d4ea87c5,789dded2d8f15fbdd4d2955d662359327b773e59,,True,True,True,59,192,731,2,True,59,Tests_passed,23f1f47f71cb0373d0e0af67412dac4bace21b6f5b0d8f30b0e9a8af04324fdb,True,Tests_passed,464511e1c2853954081c786c2e930137c1b6bd0db74b2b1d25f445640358f892,True,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_failed,7ab40fbf4129d3e0f7f33e25592f37a7da439fde04fefef9c49f7bcefc3c1f3a,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,0.07253742218017578,0.08007264137268066,0.07462525367736816,0.08373236656188965,0.08158636093139648,0.07148861885070801,0.07883977890014648,0.22618317604064941,0.1502077579498291,0.6540679931640625,1.2994506359100342,0.10781097412109375,0.16401076316833496,0.06751561164855957,0.07020735740661621,0.06652140617370605,0.06644392013549805,0.06770968437194824,0.11076903343200684,0.6676509380340576,0.06607174873352051,0.06495928764343262,0.05398440361022949,0.06661295890808105,0.05622673034667969 diff --git a/results/combined/merges_timed/movsim/movsim.csv b/results/combined/merges_timed/movsim/movsim.csv index fd50b89864..58b5727c66 100644 --- a/results/combined/merges_timed/movsim/movsim.csv +++ b/results/combined/merges_timed/movsim/movsim.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 194,refs/heads/develop,f65dfc825dcaa8a267f5fba4694b112528f3189c,11f108e83b85fd4f50a883fcdda9110f0d334146,54ff56818521387e816bae3400d078cdda1968e3,,True,True,True,2,3,20,22,True,22,Tests_passed,364de8ef6f4805b6c793d210d2447e0c3455f830342ece8e72b6162611b8d669,True,Tests_passed,b1ea70fe76e2c6d08d006b4179f5f2381f2234f3c1ab09ed2d2b1ccd5108f700,True,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,1c795d7e3ea13e659bb3a58c39cba8df6151b5dcfd83d0eba7b4ea37185d28b4,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,0c1b0f1cc992f4d90e5fd8b3e8b342bbca86e5df2e2e0268278e57a612b9a266,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Merge_failed,18f8f09ef7c4a519ec67d0fb20b46ce52e6ce5d1c93ef4674e593351dca53040,Merge_failed,a8dfd69fcc948632a302ea182e859041ecbf52133a823eb2dc6693855073dae0,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,1c795d7e3ea13e659bb3a58c39cba8df6151b5dcfd83d0eba7b4ea37185d28b4,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,508703f265c4d053f29a393fdebe69fce9c5ed5e485292fbe5511572b1ae3786,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,c819b63071a3ff707188c70c549045f70a6083d98801f06465bd7929a00a2ac9,Merge_failed,3fb5aee21332904efc7edf84a8bb71ef19a7ad7ebc2e2e0c53e7f702a52df03c,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,Merge_failed,e499c4275f80491d12facabdfd957c9a0d8bd35eb8515a7047726d59eaabc8d6,0.04309225082397461,0.04737401008605957,0.048781633377075195,0.0463719367980957,0.049712419509887695,0.046521663665771484,0.04688882827758789,0.21288394927978516,0.12060189247131348,0.761162519454956,0.3404996395111084,0.07172679901123047,0.1169428825378418,0.03471994400024414,0.0364835262298584,0.035517215728759766,0.035637855529785156,0.03563427925109863,0.06948709487915039,0.7591614723205566,0.03612089157104492,0.03653883934020996,0.03467559814453125,0.03663039207458496,0.03513288497924805 diff --git a/results/combined/merges_timed/mpatric/mp3agic.csv b/results/combined/merges_timed/mpatric/mp3agic.csv index 3bdf27a74b..3ae977034a 100644 --- a/results/combined/merges_timed/mpatric/mp3agic.csv +++ b/results/combined/merges_timed/mpatric/mp3agic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,446353b8eebf05bb653a17e1d326a2f0d2ba82a4,b8f18ab448b131ef01eb7a23e9d078ef594218ae,ff596131531ae8cebadbf1c827a1bd4f449888ce,,True,True,Tests_passed,b3024ec13bedc96ae0b33c4ecd79a18151e09c50687fae1f0d26b43e0fc60448,True,8,85,437,2,True,Tests_passed,8b46d1842e4d7a58a7c53b1dcefb183cd7d50b9dc4e1bda69d385d78bb29522e,True,8,True,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,0.013562679290771484,0.01330876350402832,0.0158233642578125,0.01610565185546875,0.015661239624023438,0.015368461608886719,0.016190290451049805,0.04239988327026367,0.06810164451599121,1.453890085220337,0.607781171798706,0.07938599586486816,0.13983750343322754,0.05398726463317871,0.05226302146911621,0.05106663703918457,0.051506757736206055,0.05042076110839844,0.08786439895629883,1.5029850006103516,0.050229549407958984,0.04743385314941406,0.03782486915588379,0.0494534969329834,0.04032635688781738 diff --git a/results/combined/merges_timed/mpusher/mpush.csv b/results/combined/merges_timed/mpusher/mpush.csv index 4e1143f296..667626418f 100644 --- a/results/combined/merges_timed/mpusher/mpush.csv +++ b/results/combined/merges_timed/mpusher/mpush.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,True,155,580,6042.0,14,True,158,Tests_passed,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,True,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,True,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,368a9aca43a4d3394a97290dc99d9c9849ff8ee326ade7aa49d897ff7175d56a,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,f546853e6867d5c80c380fa86e49f3154eaf9379de386ecf352fcb41e6fadb34,Merge_failed,973d7cd413cd19c967ffb6e3dd6d4469893b6450eb78bbc84e27d81c8f46660d,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,0.05559968948364258,0.07389974594116211,0.06519770622253418,0.07088470458984375,0.0642862319946289,0.06090831756591797,0.06240391731262207,0.8698749542236328,0.6969237327575684,5.425331354141235,1.2977619171142578,0.42971324920654297,0.22697186470031738,0.1356523036956787,0.1376175880432129,0.14686131477355957,0.14824795722961426,0.13715767860412598,0.35534238815307617,5.24191689491272,0.14282584190368652,0.1460869312286377,0.08452725410461426,0.14185523986816406,0.09518647193908691 diff --git a/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv b/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv index ed2be06ac9..ca3b26fe8a 100644 --- a/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv +++ b/results/combined/merges_timed/mrcookieslime/slimefun-3.0.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 95,refs/heads/master,affa3af06c5f08748b89a2b739cd0ffa4c22ffa0,5f525fbf748f920ca1f2260a4501daee22c7aa31,58fde5cbdf8d5b83f692893081f7c476b34f60bd,,True,False,Tests_passed,9bfad9bd915b5d2c182b82535d36d6770a8ba1a81f136a1b179b811e3a6441c2,True,24,40,113,8,True,Tests_passed,c75056464942075194dac961defd6b49323ce5c1b4a132056eb8e2f3de00fb23,True,30,True,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,b4e52e4d6aaf244a86ab7d4d1f28ccbc01c06082e824a5481c9a9e3ff60e2fb1,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_failed,4e77b8ec5f234ee8a6291db3175551a8147c3f81d30ac06fe732440f7b5db7fe,Tests_passed,8137b3fb9bc659f3c50a0e14bf1b7e056d578f19749ed2badc369f607e1c0e4c,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Merge_failed,5a43fcc434a8300223b60d4052d636f44292cbc588b7e60d1076979381684c1e,Tests_failed,4e77b8ec5f234ee8a6291db3175551a8147c3f81d30ac06fe732440f7b5db7fe,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,Tests_passed,544eaabf40396201d44d8fcc6af03b91ea82b9a31281652018301016566364bd,0.016453981399536133,0.01661849021911621,0.019764184951782227,0.0196077823638916,0.01908135414123535,0.019076824188232422,0.019489526748657227,0.08489012718200684,0.0710153579711914,2.894188404083252,0.6295294761657715,0.08636069297790527,0.14339566230773926,0.057376861572265625,0.056899070739746094,0.05704617500305176,0.05661821365356445,0.05741691589355469,0.09453773498535156,2.978548526763916,0.05306243896484375,0.05286288261413574,0.042856454849243164,0.054807424545288086,0.0441744327545166 diff --git a/results/combined/merges_timed/mrice/license-check.csv b/results/combined/merges_timed/mrice/license-check.csv index 5d8acc83a0..ed5c282b55 100644 --- a/results/combined/merges_timed/mrice/license-check.csv +++ b/results/combined/merges_timed/mrice/license-check.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/remotes/origin/pull/28,df4be32c0a82130293069c4cb3c69fa9f176241d,6f1e7823726ea7d7b3113f534fa01982984ccc16,373dd8516ce2531960cd609ee036b038c16d6daa,,True,True,True,9,61,1247,5,True,9,Tests_passed,7d8a2df5668fdd55bb7f28f3e1471ce43c384034864632c694995ddfea24dac0,True,Tests_passed,42aaa63971641451dfc7fa4cb319e2ae3d76bd21be83b5d7b3650d53750e9f3d,True,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,e9ebdb3e3b7750d9a8ccf4e7ac566f3f673633a662dc86abbcb800bb95c86651,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,74d7bfcf570b980f4dac61b819ee9913b80d467906982b0406929aae58b9c055,Merge_failed,9abbf9542a2dc59f0c384dda028bd06b2ea651e4b1e7e5c528492a59d2c134a0,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,a5e435b61f1a4a6583a29d5e94223e89db33279fd5ed730f84a684ccfbc2f1a0,Merge_failed,d40d99548df6d3983bb807922e572dde5fac64a4ed15d975363fccfb4b08e992,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,0.009112834930419922,0.00920557975769043,0.009064912796020508,0.008753299713134766,0.00896453857421875,0.008858680725097656,0.009211301803588867,0.06258416175842285,0.1844344139099121,1.0618185997009277,0.4611384868621826,0.1415243148803711,0.13025856018066406,0.05208539962768555,0.051671743392944336,0.05111861228942871,0.0509798526763916,0.05058574676513672,0.12218976020812988,1.0865328311920166,0.05218148231506348,0.052057743072509766,0.050162553787231445,0.05124545097351074,0.05017995834350586 diff --git a/results/combined/merges_timed/mrpdaemon/encfs-java.csv b/results/combined/merges_timed/mrpdaemon/encfs-java.csv index 534d3f85d9..b25460067d 100644 --- a/results/combined/merges_timed/mrpdaemon/encfs-java.csv +++ b/results/combined/merges_timed/mrpdaemon/encfs-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,bdee7ef4faeae5943a8d25ed9eb48be4d97f7cae,31a551c0db99c6797ccbc368f8a81ae7b63d61c9,bf71a245940d69cf408659e03d9ec701ac0d686e,,True,,True,13,48,,9,True,17,Tests_passed,d74264bc6dc3c1f7c4552000544703d378a029b2bbf5bc4946126886445d47a3,True,Tests_passed,f020afa7d60ba22abce5393485170f63c7145c8a7df5165648498db762cf012c,True,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,612e6bed8c44147eacee0a89ec1517bda81bce9cbe74c22c2069adaf4ed3bee8,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,ce51a5946f02c5f94bd533c1999f568c7715e878feb349fb46a0ff8124d68d29,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,7bdacfb14847a54a0d6e6c503f2cf7748f4bbb005875b692c3ea65fa90ca2997,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,0.05002546310424805,0.043054819107055664,0.053536415100097656,0.044072866439819336,0.050383567810058594,0.053037166595458984,0.04908275604248047,0.3576362133026123,0.28838372230529785,2.8846359252929688,0.7883889675140381,0.16253161430358887,0.12984991073608398,0.05195188522338867,0.0525813102722168,0.05118370056152344,0.05309343338012695,0.052889108657836914,0.13152718544006348,2.8328731060028076,0.05274605751037598,0.052591562271118164,0.050547122955322266,0.05213308334350586,0.050286293029785156 diff --git a/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv b/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv index 15444385f2..9984f82936 100644 --- a/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv +++ b/results/combined/merges_timed/msopentech/azure-activedirectory-library-for-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 106,refs/remotes/origin/pull/185,53e9d401e409ac8f9b99d475acb008450857b31f,d01281f86b40190d142afd8f62d839eabfd12111,3141f3a9bb4d8ff5402fcf055ed6f0cbe5fc9c66,,True,True,Tests_passed,77e7f5afd859171ad6b9c66c640c6167652fe127ea9ce3a63c5c3474142fc1bc,True,74,94,2828,5,True,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,True,74,True,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,f5e95bda8d9ede9a02117b8aea97356ed98f344330a30a3e82e601d028ee90b1,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,f5e95bda8d9ede9a02117b8aea97356ed98f344330a30a3e82e601d028ee90b1,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,Tests_passed,8a9402ef19f746097a26524744a318d5aed9f10f2920e80a7ded058afd7cbff4,0.0698404312133789,0.06516599655151367,0.06358194351196289,0.06502842903137207,0.02820563316345215,0.0569002628326416,0.06377005577087402,0.38855695724487305,0.29111695289611816,2.0749354362487793,-1.0,0.17404937744140625,0.16859889030456543,0.07576870918273926,0.07669997215270996,0.07563972473144531,0.07539534568786621,0.07420587539672852,0.16341829299926758,2.1524295806884766,0.07313799858093262,0.07227373123168945,0.041590213775634766,0.07590651512145996,0.042427778244018555 diff --git a/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv b/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv index fb52b4f4a4..2266bf2524 100644 --- a/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv +++ b/results/combined/merges_timed/msukmanowsky/omnituredatafileinputformat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,44aa839e687eccffddf79772f186de581646b9f5,ba3fb170040f29dc002f5b7e4f393b106358c404,dd40c2076fbf3a7fd6f3d732ba864b09b58b1b46,,True,True,True,7,20,39,2,True,7,Tests_passed,68ebeae518531d431c7f3ce6d9a22bce14196b040e0785c32ed7d0a1cac9f134,True,Tests_passed,7a098a87b1757f98ae3d2774e65a801f5f365b303836841954ce1cd66166748d,True,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_failed,67fc18cc829410a28a6f21774e7ad77c7ed4e8de61c35d07034f7f5d04eae926,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,0.04567670822143555,0.044271230697631836,0.04662370681762695,0.045546770095825195,0.04420590400695801,0.051384687423706055,0.051363229751586914,0.1692967414855957,0.12308073043823242,0.6090657711029053,0.33091139793395996,0.06901240348815918,0.12669038772583008,0.04161643981933594,0.04099535942077637,0.04033923149108887,0.04038286209106445,0.04027581214904785,0.07379698753356934,0.6041767597198486,0.04100370407104492,0.03962564468383789,0.030216455459594727,0.040016889572143555,0.030034780502319336 diff --git a/results/combined/merges_timed/mtedone/podam.csv b/results/combined/merges_timed/mtedone/podam.csv index 727b30550f..d3a85181b4 100644 --- a/results/combined/merges_timed/mtedone/podam.csv +++ b/results/combined/merges_timed/mtedone/podam.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 84,refs/heads/develop,58364a4c12addbed1a1ccc5415e07aadbe49012a,006dbd635f0eb2dbb1318e9d895fdaaf282f548d,d51460bf0a0b1bdee87973c01cf2241f508c7cfc,,True,True,True,10,22,632,5,True,17,Tests_passed,5395de2cea89ae1148b3a16f7db53f14e9e76551374b03809c3c2775e5127f80,True,Tests_passed,2798891134cb3857ed16c7ba9a2483ad766ad96da62711861250013b2a87ec5f,True,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,9a359973e1c4c8c3fdecf6b13250b6061b2df18dda69e838c8f62321c588c159,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,ef6ada9551489c5a996211a3b40aa0a1046ffc57ab2199e742c0c8c8c6360ea6,Merge_failed,1fb74bf3210f779bb89c1cac4e9531716fa4aee2fe49acdc14db1f1aba62b6a1,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,a54c365e6a8500ae3e4bdbd8a92278aaafe3fb99c3e8f2c5cd09f03dd414cddf,Tests_passed,31d359acdf76260ed47659eb6597a25ce591e9c26c27eade678ee66c292bcd3f,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,Merge_failed,8c2e6fa1cf894815273cb828abfb9d2682c4c2cb62c40a4c86c8046db4b1f780,0.04536604881286621,0.03962397575378418,0.04255843162536621,0.040636301040649414,0.04938769340515137,0.026918888092041016,0.024749755859375,0.18945956230163574,0.11489152908325195,0.4544212818145752,3.0719423294067383,0.10034775733947754,0.11371016502380371,0.06361269950866699,0.05847334861755371,0.05885958671569824,0.06147193908691406,0.06291651725769043,0.09764909744262695,0.489849328994751,0.05718541145324707,0.032169342041015625,0.059217214584350586,0.05677056312561035,0.06263184547424316 diff --git a/results/combined/merges_timed/mttkay/signpost.csv b/results/combined/merges_timed/mttkay/signpost.csv index ff4ee72468..5557c1124b 100644 --- a/results/combined/merges_timed/mttkay/signpost.csv +++ b/results/combined/merges_timed/mttkay/signpost.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,3db54f4931b3d3afcf7b7400426614c40e58ec4c,0e81fbde2863d3aeab9a2cfb3bad75f48a1686f5,f6f8b4904baf3f335abd3428216c364999ea82cf,,True,True,True,17,51,381,6,True,17,Tests_passed,f9f3a4d35b2d77cbf9b186932e0f8bf47f07b8c8fa31e457efbe77ae2a28bcd8,True,Tests_passed,27746c62cf63d432a3c57d0cade969e5d1c64f6b6bfb99838f215020afe28bdc,True,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c83358a5470cce98cabbfb8217fcbb0e24613e9b42fe2813054fa971eb2517be,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c176630f4289e6d1d18cd519b933b7e2da3380a264b724f40da5e4c551f0dbfc,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,0aff3abebbd22bcb515ea093475300437f564fcf01051b174965cb06b2c651a7,Merge_failed,6c18aab44777f615a41cb75d5bcf18261f6d69d75308597b56b4373dc7974bf1,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,0.04544353485107422,0.043966054916381836,0.046237945556640625,0.04079437255859375,0.03739428520202637,0.04694652557373047,0.04892253875732422,0.38678789138793945,0.34802770614624023,0.7837331295013428,0.5008981227874756,0.2041027545928955,0.14629125595092773,0.06619453430175781,0.06590795516967773,0.06629490852355957,0.0660867691040039,0.06510663032531738,0.15974068641662598,0.7988905906677246,0.06563544273376465,0.06471443176269531,0.05845475196838379,0.06538128852844238,0.057097673416137695 diff --git a/results/combined/merges_timed/mwanji/toml4j.csv b/results/combined/merges_timed/mwanji/toml4j.csv index 9aff8fa9d9..d7a4e80338 100644 --- a/results/combined/merges_timed/mwanji/toml4j.csv +++ b/results/combined/merges_timed/mwanji/toml4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,f8f55a6f16602fb21f3d44c45744e719ec808e2f,e7d7de7ae5d5a0b7e6d59e095d4ee9bae829ad68,8571d258cafb004ddb73ea22ae9d620b7310f20b,,True,True,True,27,59,1234,3,True,27,Tests_passed,53009c36ff12b528f2d397f15d0c3e574d09557685bc4131ae3f74b16b0c2d9a,True,Tests_passed,993b37a673e4fa19f2752d54fcc7c2ea74cdbca098b2c80b5eb7d4e1a26f7424,True,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,2c017bcc7eb08fd78fec779fcd957f1eb7465812698d1f78c2bdafee0a8b11f8,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,2b56c54259855b4ccbb5dddb5eeb92d1e688447dd7d1bf75e7309fac444ea4e5,Merge_failed,6bcba85ea79a8eb5fc9d5c67a294f1f219ea4b96994cf305daaaebeb8ec57a92,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,4267ae59207d42c3a6ca2e5eaa7cc03677135068fd2a02a4768317244d0e37a0,Merge_failed,a0a01c2d95e6f5803686f28b3c8b539e0f94a60d222cad153c102d551bf0d1c4,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,0.04077887535095215,0.04664325714111328,0.04082942008972168,0.04146933555603027,0.034862518310546875,0.045696258544921875,0.0393366813659668,0.22713828086853027,0.168900728225708,0.8746564388275146,0.3396124839782715,0.10076022148132324,0.12325072288513184,0.04495072364807129,0.046506404876708984,0.04541492462158203,0.04654717445373535,0.04400014877319336,0.09300804138183594,0.8645942211151123,0.0437924861907959,0.04700732231140137,0.04536175727844238,0.04465961456298828,0.04486393928527832 diff --git a/results/combined/merges_timed/mybatis/jpetstore-6.csv b/results/combined/merges_timed/mybatis/jpetstore-6.csv index c59d2f5661..c5352130d5 100644 --- a/results/combined/merges_timed/mybatis/jpetstore-6.csv +++ b/results/combined/merges_timed/mybatis/jpetstore-6.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 548,refs/remotes/origin/pull/637,b26b0c87017c0f2ec431ee0a1425910b9a9fff00,3c5d4b04254c9c898b2831b458a02b6f8c277def,f3362fe251b6fb468e0159bad8c36f1fd5798a3b,,True,True,True,16,42,323,3,True,16,Tests_passed,e2df62e1bcac35ae7304c1745b17150b6ac2d9c1be03ff5bf22873ec52943079,True,Tests_passed,136cac0b81ce395b9a3937d4ee18a60e4a8928044a6c8cb32d4b44508fd3b882,True,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,09e940465b2e40279da13647c02056a37d2aa82c65200b4fc4805e9f69250102,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,58df953bc4f7dd167ec48054a4ab145202415f6e369492dace40e9c16cfb10fe,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,0.0409848690032959,0.023320913314819336,0.04799818992614746,0.02449178695678711,0.0418245792388916,0.038591861724853516,0.0467681884765625,0.22784948348999023,0.1524183750152588,0.04544329643249512,0.4148712158203125,0.1335310935974121,0.15312743186950684,0.04384922981262207,0.06700754165649414,0.0661611557006836,0.06424140930175781,0.06578755378723145,0.09053230285644531,0.08449506759643555,0.04412078857421875,0.05838894844055176,0.06480813026428223,0.06256318092346191,0.06534862518310547 diff --git a/results/combined/merges_timed/mybatis/mybatis-3.csv b/results/combined/merges_timed/mybatis/mybatis-3.csv index eaab098610..8c41b9f7c7 100644 --- a/results/combined/merges_timed/mybatis/mybatis-3.csv +++ b/results/combined/merges_timed/mybatis/mybatis-3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 172,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,True,1979.0,7357,48734.0,2,True,1977,Tests_passed,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,True,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,0.13586640357971191,0.13757586479187012,0.2539541721343994,0.25399351119995117,0.2552957534790039,0.2543463706970215,0.2550218105316162,0.29887986183166504,0.19056057929992676,0.14876532554626465,17.35877227783203,0.4607713222503662,0.6431229114532471,0.3732011318206787,0.47737979888916016,0.3679816722869873,0.47150325775146484,0.35749387741088867,0.538827657699585,0.43711423873901367,0.3682863712310791,0.36539244651794434,0.32351016998291016,0.3594789505004883,0.32205772399902344 diff --git a/results/combined/merges_timed/mybatis/spring.csv b/results/combined/merges_timed/mybatis/spring.csv index e9a923272e..57e3e6e791 100644 --- a/results/combined/merges_timed/mybatis/spring.csv +++ b/results/combined/merges_timed/mybatis/spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,True,248.0,448,16217.0,3,True,248,Tests_passed,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,True,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,0.03406405448913574,0.043744802474975586,0.05973958969116211,0.05338478088378906,0.05395650863647461,0.06111645698547363,0.0741415023803711,0.2666006088256836,0.15196585655212402,0.05642056465148926,-1.0,0.16230988502502441,0.2079486846923828,0.10695266723632812,0.11289715766906738,0.11151981353759766,0.10712671279907227,0.10863137245178223,0.17258286476135254,0.11263728141784668,0.09165835380554199,0.09160876274108887,0.07141900062561035,0.09215021133422852,0.07492756843566895 diff --git a/results/combined/merges_timed/mycila/license-maven-plugin.csv b/results/combined/merges_timed/mycila/license-maven-plugin.csv index 8ce54816dc..7f96733e1a 100644 --- a/results/combined/merges_timed/mycila/license-maven-plugin.csv +++ b/results/combined/merges_timed/mycila/license-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 173,refs/remotes/origin/pull/197,756e4d52b940fb8911942ebc2e5654e7cefe1597,39991e5512483613ab0c8d5cf2c21bde1f52ad5d,a6e528cee7fe56b9f310c77bc00eee0850ad0c36,,True,True,True,45,50,153,10,True,53,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,True,Tests_passed,53d0802c8bed7db42a799bd948cf65a2654a2618a48bd3bc8a028c3d1473618c,True,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,Tests_passed,ff3e0a786bb0cc0d1bfa646282bee331b6cbd65b1d9f9872cf7e251c86e9fa48,0.06648063659667969,0.028137683868408203,0.02762293815612793,0.02886962890625,0.03677940368652344,0.027880191802978516,0.025053739547729492,0.10411477088928223,0.07923579216003418,0.033995866775512695,0.6582760810852051,0.11103248596191406,0.1845855712890625,0.05820512771606445,0.0691220760345459,0.07813501358032227,0.05793499946594238,0.07452011108398438,0.11887645721435547,0.08890891075134277,0.06821703910827637,0.054605960845947266,0.06475949287414551,0.06933069229125977,0.04375934600830078 diff --git a/results/combined/merges_timed/mygrid/rightfield.csv b/results/combined/merges_timed/mygrid/rightfield.csv index 2a54a129e8..da1535f4e8 100644 --- a/results/combined/merges_timed/mygrid/rightfield.csv +++ b/results/combined/merges_timed/mygrid/rightfield.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 44,refs/heads/main,d34df55c7357f0aa5556d42703f3cbcc6c3d0389,6b372f7d40a40ff21d06aadc40e92cbaef78b958,e75a3a2b73de9706282f7e991088d0f82f831b85,,True,True,True,13,23,130,17,True,28,Tests_passed,99760028def508e4b875110f567997b11d507752e40f53e56ffed27a73a978c6,True,Tests_passed,6380bf6a0caca244fa2ec924181696460a9e9260d18a4f9ac5008255e3918fdf,True,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_failed,3882a4b1a86e85648d98296a313e68dd565998438d9361a54a6abb555a6cc5d7,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,0.03649735450744629,0.0400083065032959,0.017648935317993164,0.013461828231811523,0.04796934127807617,0.042380332946777344,0.029506206512451172,0.15703296661376953,0.09833168983459473,0.7682085037231445,0.7031228542327881,0.16322970390319824,0.246826171875,0.12033843994140625,0.13625168800354004,0.04251265525817871,0.12297320365905762,0.1260542869567871,0.17156291007995605,0.7891364097595215,0.06975293159484863,0.1129159927368164,0.11071419715881348,0.041519880294799805,0.10526299476623535 diff --git a/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv b/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv index 37db3dd94c..739e556a13 100644 --- a/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv +++ b/results/combined/merges_timed/mypurecloud/elasticsearch-lambda.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/remotes/origin/5.1.1-dev,9ad6ef3cc4463ad5e7c71ae057264ad3ba7b2f86,4d58e53b86ac42a8ed6d8a66f14a09f356ce119f,a591b944acfe10d8889b1554d1cb335853268272,,True,True,True,29,135,1610,7,True,29,Tests_passed,8d90decbf47edf1cf55e9af45b19204deecf1c7e9cc5b7cc04b85000c603c1b1,True,Tests_passed,10b35739e282c49fbacc1766c18807c0bc5b69268e86a1578c5a16d89a6f2636,True,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,9ffa7b6c4a4f032635e9d9d9e2e7e6eb6a841d8aef1015aae095ba9f0f2e1e8c,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,11b2253cd118bf5a8693bb0d6f706771dfeaeb67146fed260fcadc93ae748ae4,Merge_failed,656490d1eff78b7d1909b4071b506c2153562fd7c7cd7c22491d2ae8b8bacf74,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,a9b2ce8aa62b61efce8b1ce3404b8730bc5c8baa1444e4f1884f66c9121acd74,Merge_failed,ed2d666a47fdd4314407f2f121641eca034e0e29e6ca78db5eaf4ff0f67cbbc6,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,0.016804933547973633,0.01663351058959961,0.017778396606445312,0.017528295516967773,0.018414020538330078,0.017870664596557617,0.017925739288330078,0.10605192184448242,0.35230207443237305,3.6707022190093994,0.5802688598632812,0.25050997734069824,0.1685161590576172,0.08052182197570801,0.08249616622924805,0.08206844329833984,0.08306169509887695,0.08368062973022461,0.1976780891418457,3.793036699295044,0.08116292953491211,0.08078432083129883,0.07428216934204102,0.08211469650268555,0.07497096061706543 diff --git a/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv b/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv index c5e199cbd5..1125c24ce5 100644 --- a/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv +++ b/results/combined/merges_timed/n0rad/jstest-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,1842e580665903b7192e06575679fb39870601b5,ff683a4d4ac09672f45d47252cf5d366f17c3a61,6c30f8927d85bfedc3bdca89dcf753a0074f0f4a,,True,False,True,4,6,17,2,True,4,Tests_passed,e8c6e9255ca001e7c13d41b00bd947d30fd4ea8618dd6684611662d37e2113dd,True,Tests_passed,2296fda8c17bed3d5a9cc407311a097fea5f7d6b215d6610f31eb9b52940cc38,True,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,0.036630868911743164,0.04319190979003906,0.045736074447631836,0.03963780403137207,0.04138493537902832,0.03898024559020996,0.03660988807678223,0.14175701141357422,0.10963249206542969,0.5799272060394287,0.29059720039367676,0.08479762077331543,0.1430680751800537,0.054399728775024414,0.051481008529663086,0.05277204513549805,0.041205406188964844,0.0514674186706543,0.08864188194274902,0.5898551940917969,0.05153918266296387,0.05127716064453125,0.0403897762298584,0.05013585090637207,0.04019355773925781 diff --git a/results/combined/merges_timed/nabedge/mixer2.csv b/results/combined/merges_timed/nabedge/mixer2.csv index d6550bfc50..da2dcc97d5 100644 --- a/results/combined/merges_timed/nabedge/mixer2.csv +++ b/results/combined/merges_timed/nabedge/mixer2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,e8a1930e8dc2367176464e888888ac1645bb9eee,b7f31d46bb5fe9ceb54490c49483081ca0bd854d,82a9bb4a4bd8b2a4c705a47a1b8325e2a492f950,,True,True,True,148,173,533732,2,True,148,Tests_passed,ce14e4e4da5260130f5d137d049257acf929e6c886b0243264e5e0e5f2835805,True,Tests_passed,92886eaeaa78cbd79977557e7e6832e4c6ade83201fd4f6596f54f15cb64efaa,True,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,86156d1ad2d3f050bd1118f67f70482b80616ccf14a4cc914fd7505128eacf94,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Tests_failed,20e0a272527a12f4b8f842187158c2729ee88facc95145a6700bbaae8cd68aff,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,c680efc91218e0496fd384cb964b83d8c2b61d0ab6fd942e66cec6be47bfcd20,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,0.0118408203125,0.012058019638061523,0.012236595153808594,0.011841297149658203,0.011817216873168945,0.012737751007080078,0.012202739715576172,0.04940462112426758,0.07339310646057129,0.8504440784454346,0.3625528812408447,0.11284303665161133,0.12088561058044434,0.0716090202331543,0.07332134246826172,0.03978371620178223,0.07694530487060547,0.06684017181396484,0.07099413871765137,0.8260512351989746,0.04001283645629883,0.06684517860412598,0.04206037521362305,0.04689431190490723,0.06917381286621094 diff --git a/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv b/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv index b1ff7419ea..b2b3662378 100644 --- a/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv +++ b/results/combined/merges_timed/nabeelmukhtar/github-java-sdk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,539b0183d88f09003733316cbe25ccb3c952d024,e30d4dba438a58d625b740c0cf388bb8efacf02f,6434435f5c4da9f3c8b9b4112f34237bdcef10e3,,True,True,Tests_passed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,True,4,91,930,11,True,Tests_passed,82589bba1cc439b911c77fa5792386700d6de74a4a0a1a3ddca9d41611dfc89a,True,11,True,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,89b9d92d10d9d8a53d83d25cbf2a8c1f9c43a8d3936e7bb4ed10e52c0d23f9fb,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,0.016828298568725586,0.01681065559387207,0.018436908721923828,0.01785564422607422,0.016943693161010742,0.01726555824279785,0.01728081703186035,0.07274246215820312,0.18922805786132812,1.7167747020721436,0.36734437942504883,0.13570165634155273,0.13506603240966797,0.052416324615478516,0.04987525939941406,0.05080771446228027,0.0532987117767334,0.04877448081970215,0.11896610260009766,1.6268839836120605,0.050557851791381836,0.05079150199890137,0.05084490776062012,0.05102276802062988,0.05077695846557617 diff --git a/results/combined/merges_timed/named-data/jndn.csv b/results/combined/merges_timed/named-data/jndn.csv index 65c31e1592..3e1c5f5ed1 100644 --- a/results/combined/merges_timed/named-data/jndn.csv +++ b/results/combined/merges_timed/named-data/jndn.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 100,refs/heads/master,62f89871b57a8bc206428dacff6bde4e6fd305c3,318bd51335506f9a12790dfb69b85fec27ff4152,796ba6f83f0440eeacc27fb47ac57f1423a7c5a1,,True,True,Tests_passed,dfe712b9849913b23258387bdbbdf0edfa57f2ad61e282f5acf102c43e230518,True,12,114,616,2,True,Tests_passed,149e60c28d446efb0d8b557368e599a3895c40482931ca0543ce350ac96f4f57,True,12,True,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,f745ec18d5b5faabba378f9831bb65c26bb7d3c8b45073cb53a04bb3ba190236,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,f745ec18d5b5faabba378f9831bb65c26bb7d3c8b45073cb53a04bb3ba190236,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,Tests_passed,ccf772a0d7beaa874cdff69fded31593cd430d304d1634fed5db27e54dc9bc34,0.0163266658782959,0.058823347091674805,0.0834050178527832,0.0846855640411377,0.0260622501373291,0.0827627182006836,0.08559918403625488,0.14271879196166992,0.13721203804016113,1.824767827987671,0.8572084903717041,0.1823430061340332,0.2898879051208496,0.14492249488830566,0.14457201957702637,0.1508016586303711,0.15134859085083008,0.1488494873046875,0.20102429389953613,1.7497880458831787,0.11788296699523926,0.12967634201049805,0.13449692726135254,0.1306924819946289,0.1338808536529541 diff --git a/results/combined/merges_timed/nanohttpd/nanohttpd.csv b/results/combined/merges_timed/nanohttpd/nanohttpd.csv index 47e8e949ae..e84e89e206 100644 --- a/results/combined/merges_timed/nanohttpd/nanohttpd.csv +++ b/results/combined/merges_timed/nanohttpd/nanohttpd.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 63,refs/heads/master,60b7e9249246749a16bf8bc29aa117e4201eae8b,9f38ca21e99986290bf65a8fec17d2592d98d744,f3b51b6d9e8b24f2f2e021465b0f5972ad12892d,,True,True,Tests_passed,87b6eab2757739ab17836dd16e1ff7a1fd446cadd5f0d20f465d3ef35a1eef88,True,37,85,2192,7,True,Tests_passed,99696991e38a87f16c5765f471b83689f42a5162b27fd9d76adad8326cbbf526,True,37,True,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,ba398f1fb8807bb5ad68610a18fe4e55a5bad223cb6b85a225fe9955ef5c0377,Tests_failed,f9dbe05a44ea7bc625bd690091487dd9cceb9a8e528e92747582d6c7610309a1,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,ba398f1fb8807bb5ad68610a18fe4e55a5bad223cb6b85a225fe9955ef5c0377,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,Tests_failed,37a7c6e2fe83ca633e57fea00f0474477cfe43be1e0a12b1503d7a81cdd0e259,0.022409677505493164,0.021352767944335938,0.025658130645751953,0.022418498992919922,0.02237248420715332,0.02210402488708496,0.021994590759277344,0.14631056785583496,0.4307694435119629,2.793992280960083,0.9518370628356934,0.23654961585998535,0.18418669700622559,0.08995366096496582,0.09191679954528809,0.09024620056152344,0.09068822860717773,0.09035253524780273,0.21819090843200684,2.851374626159668,0.0877845287322998,0.09059977531433105,0.0405125617980957,0.08986425399780273,0.042119503021240234 diff --git a/results/combined/merges_timed/nastel/tnt4j.csv b/results/combined/merges_timed/nastel/tnt4j.csv index 633ac84cde..c8854fb71e 100644 --- a/results/combined/merges_timed/nastel/tnt4j.csv +++ b/results/combined/merges_timed/nastel/tnt4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,627930d2b4765450617ae73f3c5d4a7af62b97c2,90ce78c0eba903759538d042760362497ca10b56,2d191958a7ab53e2ba0d37d112f2386a24e63c8e,,True,True,True,13,52,307,14,True,19,Tests_passed,8b99c52e2c24a34537e4d34808dee8da1482de5cf9c4872d16dc3e7d8cb2cf0a,True,Tests_passed,1e13ff31c149b138b0d4fd8d49ac48b9d9ca85c81d8982e744f92bad97e8c466,True,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,a057bc5a8236b65ac225532c1b44e440d7908b85d2f962fa9c133461d0750b38,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,2fd262f62748d7a3caa76f5b459226d185b43949fd8d2b9eeedd72f6d1dd7f66,Merge_failed,b7954486a5556b5fe146d1e5031c084b1f051ac053f6373e0d59fa6995f0b446,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,7ff24a67548e83e2646e57451fa6d0b9d24d9e36330190590c68715c43447428,Merge_failed,82bb44884475530383e7d853bfa5a725b9672feaf3809e81af9a267ac7475825,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,0.03827500343322754,0.03664875030517578,0.029434919357299805,0.042395591735839844,0.024693012237548828,0.01836228370666504,0.04832005500793457,0.5296530723571777,0.46618151664733887,2.3889567852020264,0.7263278961181641,0.27979183197021484,0.1779770851135254,0.09305477142333984,0.09268546104431152,0.0951533317565918,0.08225870132446289,0.0942373275756836,0.21668553352355957,2.3472845554351807,0.09171175956726074,0.09045648574829102,0.07812666893005371,0.09248757362365723,0.06531143188476562 diff --git a/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv b/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv index c3168418c2..9145c22898 100644 --- a/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv +++ b/results/combined/merges_timed/nea/vertx-mod-cassandra-persistor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,5f849c44ac7fa15876145c056ba40871f94afeb1,fa8733a59151272f42eb183d907ca866dda4fc02,274f625caff7e956fde0784982f279a69328a99c,,True,True,True,8,32,530,4,True,8,Tests_passed,3a97a7e1d982df6a8806a0c5c6ba7af25065a0e7b5f723df724b5410678f539b,True,Tests_passed,53ff524ad4faf8e4bb54b559a74b17b8b21c604f12cdd931ab4efbd18d94e743,True,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,34f3e25d7a1721860a0be42da4fc9d0ee86e9693a479d161aac08dc03a9e479c,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,a0cc89969823093ad786f8941ab57c6f0cacc0425aad40300a578b63362e2476,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,0.009414196014404297,0.010398387908935547,0.009886026382446289,0.010500907897949219,0.010094165802001953,0.010105609893798828,0.010064363479614258,0.05822896957397461,0.17987728118896484,0.013338088989257812,0.4115166664123535,0.14021539688110352,0.13022494316101074,0.050896406173706055,0.05152606964111328,0.05114579200744629,0.05040121078491211,0.05066370964050293,0.11301350593566895,0.06262016296386719,0.0497891902923584,0.05115485191345215,0.04199647903442383,0.05016756057739258,0.041577816009521484 diff --git a/results/combined/merges_timed/needle4j/needle4j.csv b/results/combined/merges_timed/needle4j/needle4j.csv index dc810b8a8b..2af88bcd2a 100644 --- a/results/combined/merges_timed/needle4j/needle4j.csv +++ b/results/combined/merges_timed/needle4j/needle4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,93f886c3493bba1e2bc216c583c83bee71c6c747,d247514a07b785bd923d201ce11bf88d3972afd5,81ca0c3cf142efb24091bc993a6ed13d091835b6,,True,True,Tests_passed,be9360c550c3cf09e7f0027ff9299d4d405aa4927b2e8385f33623c6eaa898f2,True,31,116,1541,4,True,Tests_passed,cc4a937c431587dfc2e0f013bb0804cb50e608dc3da1f756441d1fcdbb0448c3,True,31,True,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,a91581ef4185b031f9b86e27d68bdea3076fe43885545702f83412ec86f1f96c,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Tests_failed,1bf712f64938ccb4e00e2342c7557e74e5a4d81ba0a8e6034cc23c419510e935,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,51867c73e25fdd0d57c3c15e3bac0304a48fa7f450e333443b05e565fb13f994,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,0.05286741256713867,0.04703927040100098,0.022038936614990234,0.038706064224243164,0.04700660705566406,0.03243708610534668,0.032337188720703125,0.3109431266784668,0.25876545906066895,2.3697664737701416,0.7016875743865967,0.1482846736907959,0.14492201805114746,0.05839896202087402,0.05918741226196289,0.05921769142150879,0.052552223205566406,0.061235666275024414,0.12836408615112305,2.3432483673095703,0.057921648025512695,0.0573575496673584,0.055220603942871094,0.052655696868896484,0.052854061126708984 diff --git a/results/combined/merges_timed/nepxion/discovery.csv b/results/combined/merges_timed/nepxion/discovery.csv index 62b0281d14..484c60aa46 100644 --- a/results/combined/merges_timed/nepxion/discovery.csv +++ b/results/combined/merges_timed/nepxion/discovery.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,True,9,64,377.0,3,True,9,Tests_passed,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,True,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,True,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9f12e440b5fef3fb34930f9ee4f9a94d8cdfe5b03b91e127d8ea5348a29cadd9,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Tests_failed,cd4a0ddb5320b575bf6d983d5ee5b1e69e24655376fee5113ba549cfe931ea5a,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9bf14e494e151ca06d135e78d7ea0fd58ea9b06ca628180fbae6160feaa92f89,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,0.0481562614440918,0.031149625778198242,0.05950450897216797,0.025644302368164062,0.05263781547546387,0.05614781379699707,0.04702305793762207,0.3046746253967285,0.18300557136535645,0.03519845008850098,1.3279144763946533,0.11194753646850586,0.13698697090148926,0.049340248107910156,0.04919719696044922,0.04902911186218262,0.04949593544006348,0.049370527267456055,0.10272645950317383,0.060399532318115234,0.0484468936920166,0.04877662658691406,0.04117870330810547,0.04824185371398926,0.03900432586669922 diff --git a/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv b/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv index ed11c4c024..bdc58714af 100644 --- a/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv +++ b/results/combined/merges_timed/nerdwin15/stash-jenkins-postreceive-webhook.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/master,8860ab3c4ed4b40a174411ac0b97af4d2ffcd4cf,48490bd6058369d762091369ef73d5144f194f05,e9b8f2006b0f21d93d0a3818ea5105919123a493,,True,False,True,6,17,112,2,True,6,Tests_passed,508df40e55546af80f2a1412bcd69eed9fc49242fedd7d2e67693fb8898f7e52,True,Tests_passed,709947285e823acfe6fc6d38da2b50be4cb9595e24cf66b20946ed5c14f93fa8,True,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_failed,7f69e2a6264006f131dd865893142c1c319cd86e443b48250de89769e5d9588a,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,0.044162750244140625,0.0438687801361084,0.039580345153808594,0.0440216064453125,0.05344510078430176,0.04492044448852539,0.036200523376464844,0.17362117767333984,0.11258077621459961,0.787304162979126,0.5721790790557861,0.07129549980163574,0.12713360786437988,0.04175424575805664,0.04160809516906738,0.041977643966674805,0.04158592224121094,0.04229021072387695,0.0749819278717041,0.7842609882354736,0.04125547409057617,0.04098773002624512,0.0309603214263916,0.040616750717163086,0.030863046646118164 diff --git a/results/combined/merges_timed/netflix/rxjava.csv b/results/combined/merges_timed/netflix/rxjava.csv index 9f7b806e7e..cfb51bf740 100644 --- a/results/combined/merges_timed/netflix/rxjava.csv +++ b/results/combined/merges_timed/netflix/rxjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1661,refs/remotes/origin/pull/7148,8ac9df9b2e145914d91007ebe3fc7ba0606c6751,ec96e6a73c7b55f8f41654ff97dd7ef189a43560,54850d0d344434022070fb034cdb7bda59b17b2b,,True,True,True,15,158,516,9,True,18,Tests_passed,efed346b5213b3f7d41c04dbf3b3d6aae051762dee43954d9c5ea31a2e1e6b5c,True,Tests_passed,57d2334564d46196bf26d6048d852522d8af994c9f1ff9d11304c8b63862e2dc,True,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,451cc1e312fde5ead95caa2d55612fd1146ef9cd9f5ed8dbad9c131062d66bb8,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,5eb30b2fb50cd965513a8b57adfa956b15f9cd33012540bb3d7a7feea0910235,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,0.08119463920593262,0.0754086971282959,0.0734105110168457,0.08338809013366699,0.07433390617370605,0.10346055030822754,0.08720111846923828,0.5075204372406006,0.3640933036804199,0.09866189956665039,8.091000318527222,0.26299381256103516,0.2128748893737793,0.12321257591247559,0.1260843276977539,0.12333536148071289,0.11951303482055664,0.12023639678955078,0.2340238094329834,0.14260053634643555,0.11486935615539551,0.11822676658630371,0.11999320983886719,0.11391472816467285,0.11903667449951172 diff --git a/results/combined/merges_timed/newbee-ltd/newbee-mall.csv b/results/combined/merges_timed/newbee-ltd/newbee-mall.csv index 29e171fc25..a5ce041dfa 100644 --- a/results/combined/merges_timed/newbee-ltd/newbee-mall.csv +++ b/results/combined/merges_timed/newbee-ltd/newbee-mall.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,True,495,413,314313,5,True,495,Tests_passed,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,True,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,True,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,70b40ecd186f3475b61f24bbd55e10f6393e3bc8d19c9f0729100a3229ffb72c,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,d966c397a573179589fcc759fb5e1112fc8a1c5f0d8b8b6a5d93263893ffc5ac,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,0.11765217781066895,0.11958527565002441,0.14587926864624023,0.1566603183746338,0.14646315574645996,0.14771580696105957,0.15063238143920898,0.36700987815856934,0.3409719467163086,0.13479018211364746,0.8255622386932373,0.35286426544189453,0.3840608596801758,0.23560404777526855,0.22771191596984863,0.2259078025817871,0.23267436027526855,0.23843836784362793,0.28209424018859863,0.2708137035369873,0.1975107192993164,0.19762706756591797,0.2154381275177002,0.20156431198120117,0.22973370552062988 diff --git a/results/combined/merges_timed/nhl/link-etl.csv b/results/combined/merges_timed/nhl/link-etl.csv index ac8b89569c..1f195c83de 100644 --- a/results/combined/merges_timed/nhl/link-etl.csv +++ b/results/combined/merges_timed/nhl/link-etl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,5809ccc76269b6a862d5670835367f18ad2061ae,33baf16591242cead99d984a2d1f4c0d747989e4,0593efe9ae3fb77d9ac067420e2ca07b0600ccc9,,True,True,True,113,566,4607,4,True,113,Tests_passed,a3d3b344798a3390d4c5ad3aaefc15420eeb7ab2cb150b5aed609cedc5b651b5,True,Tests_passed,5b8354b4a36983f6480e12595ab97547febf13bd57ebf86976e39523db126b3d,True,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,d9c98d63d668556f054d9b94bf35f0950d86d371eae63f58374c7212d71fc0f5,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,41c3cf69e96f05b06c3e7e41a8f5b6b290e607f2401c4f1d8ac3bafa833b3474,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,da9dca15fe65ffefeb5ccb48b03eeabac493f775497cc6bdfa56021fe7777eb2,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,0.05789780616760254,0.059975385665893555,0.05385112762451172,0.042388916015625,0.061199188232421875,0.06631803512573242,0.06209206581115723,0.2973804473876953,0.25168275833129883,1.5359086990356445,2.76947283744812,0.15674495697021484,0.15111923217773438,0.059969186782836914,0.058647871017456055,0.05939340591430664,0.06386494636535645,0.06543970108032227,0.12908244132995605,1.5209097862243652,0.06280255317687988,0.058698177337646484,0.04799222946166992,0.05865931510925293,0.047582149505615234 diff --git a/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv b/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv index 82a3e94fb9..47ba60d254 100644 --- a/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv +++ b/results/combined/merges_timed/nicoulaj/checksum-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/heads/master,837c34617a6123ead3cc374d0a1afef4f0232ffa,cec0366866143849da17a6a0e2917736c53cba07,084cbfda8cf2ecb83cf81e8bb6802db18a6e8aa1,,True,True,True,15,67,518,3,True,15,Tests_passed,0ec14b7cff841a219998c9a4df9660a906d6e1ba9255fa9c3906e0689cd77595,True,Tests_passed,7f92c9e1d16c78b0634ba1a08ec8e9caa1acf9368077f7dca8a39e37054b4bf1,True,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,0.01255345344543457,0.012227535247802734,0.014419794082641602,0.013695240020751953,0.013825178146362305,0.01383209228515625,0.01384115219116211,0.05324268341064453,0.11973714828491211,1.2554724216461182,-1.0,0.11514472961425781,0.14459514617919922,0.05701041221618652,0.054289817810058594,0.054526329040527344,0.05570340156555176,0.055071353912353516,0.11014056205749512,1.3221971988677979,0.055635929107666016,0.05531787872314453,0.03580427169799805,0.053441762924194336,0.03888559341430664 diff --git a/results/combined/merges_timed/ning/compress.csv b/results/combined/merges_timed/ning/compress.csv index 1c639c4cdc..16b6e83cd2 100644 --- a/results/combined/merges_timed/ning/compress.csv +++ b/results/combined/merges_timed/ning/compress.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,aa9cf28d6f6a6c4aa88c4ab77bfb5b9a1a43b16f,6752dba1ae0535d0c279326d247e6a10d4f51608,01ea96f50f6e82de9a0436e403afd975be90920c,,True,True,Tests_passed,ea6b050c5a70e5bef4d20e3665d3465e7050a2244744fea0ebdd577c09e6b169,True,25,122,807,3,True,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,True,25,True,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,b8463a6e5f0d2feab7f831b99a1c19c7765a19b0a50a269de1cd61269a581703,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Tests_failed,afa44658f1c8df749150363300e6869e52f756f62c54048cbd3a0322521b1e35,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,23b9eff166e3cf820f5180bf2a249b6cd592c9625ae37be6a2e6ba88471cc7e0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,0.06889677047729492,0.07657957077026367,0.08522439002990723,0.09874153137207031,0.06861019134521484,0.08226394653320312,0.09406089782714844,0.1736316680908203,0.17258286476135254,1.2790298461914062,0.5993554592132568,0.2553226947784424,0.20795726776123047,0.14051413536071777,0.17894268035888672,0.11805558204650879,0.13345074653625488,0.134749174118042,0.18806743621826172,1.3428301811218262,0.11536645889282227,0.14908289909362793,0.12426090240478516,0.11601424217224121,0.12324190139770508 diff --git a/results/combined/merges_timed/ninjaframework/ninja.csv b/results/combined/merges_timed/ninjaframework/ninja.csv index 5078a0a8f3..9c0c64e31a 100644 --- a/results/combined/merges_timed/ninjaframework/ninja.csv +++ b/results/combined/merges_timed/ninjaframework/ninja.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 480,refs/heads/develop,851c45513b188851e66868f1fdd0d80a1ed7344c,6a57f076f80dfeeb316a40fb134711b9388bc32c,cd3d0d8b56760edf71bddc2c6b1b4f00aa3a3b30,,True,True,Tests_passed,3def925c02143a1c3a406890fff77012f7d1504aa3bf86ebd07df7e4e9b1994f,True,25,77,459,2,True,Tests_passed,d534b4720cb943c07b998ccd6572246a84b3fb11153dcbe1fa0db94a2bee06af,True,25,True,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_failed,d5281e578570fc68c03403ee5ccd0b9159c97dfcfe34dfe4d8f73684c0e2a684,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,f487c028fd9017264f2f2db0bfc2fe20207b7b2bbf02a6d352883daf89ccf869,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,10a738691663773b07a067595002d899dd31ffa9fdd631816565d96a31c169dc,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,Tests_passed,21fcdff93e79ecb1ea0f00ded05049e94007d2ad1c66c82e2887d74a427954aa,0.019037246704101562,0.018578529357910156,0.023587942123413086,0.023169517517089844,0.023734331130981445,0.02359771728515625,0.023306846618652344,0.053696632385253906,0.0736551284790039,0.49148130416870117,0.5479385852813721,0.10013723373413086,0.1606132984161377,0.06882119178771973,0.04422140121459961,0.06572270393371582,0.0656743049621582,0.043509483337402344,0.1055452823638916,0.5537199974060059,0.06066107749938965,0.060654401779174805,0.05397367477416992,0.06027483940124512,0.03190803527832031 diff --git a/results/combined/merges_timed/ninjudd/drip.csv b/results/combined/merges_timed/ninjudd/drip.csv index 56c323812e..9d41b68ac9 100644 --- a/results/combined/merges_timed/ninjudd/drip.csv +++ b/results/combined/merges_timed/ninjudd/drip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,True,True,Tests_passed,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,True,8,11,216,2,True,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,True,8,True,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,0.03739500045776367,0.03791236877441406,0.03908228874206543,0.038495540618896484,0.037780046463012695,0.03877425193786621,0.03641557693481445,0.15652179718017578,0.10643959045410156,0.7693829536437988,0.25475192070007324,0.06390905380249023,0.11896038055419922,0.03599905967712402,0.03584742546081543,0.03610539436340332,0.03591132164001465,0.03613877296447754,0.06760573387145996,0.7568304538726807,0.036095380783081055,0.035718441009521484,0.024981260299682617,0.0361325740814209,0.025568723678588867 diff --git a/results/combined/merges_timed/nitnelave/creeperheal.csv b/results/combined/merges_timed/nitnelave/creeperheal.csv index 45a72427f6..d94e12550f 100644 --- a/results/combined/merges_timed/nitnelave/creeperheal.csv +++ b/results/combined/merges_timed/nitnelave/creeperheal.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/remotes/origin/pull/60,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,f3b468bd793ea17c8393ccde13effe27c8dfc544,4efd54689557c48ab4dc71c35cefe358127914bf,,True,True,True,62,285,2122,26,True,68,Tests_passed,4d9b55d86bc14154db3ec7c0006899830e401cdb41f3ed6f3467f4f58a2c1f89,True,Tests_passed,6d0a1b20623d5fd7fc273379f9bc436315679b245b715efe9ba0c02c3e8a0766,True,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,0034daea793d632a8d5d1d5215c02f1561c9672279d452edb542c0cf6f9b7df8,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,3e21a0439d58be5d9688befbbdfcaf2463befc233eec2b0197f83fad33ed6244,Merge_failed,f42a9f16171c8b4c8424de409ddb29590fa0b284c69c9d5f98b57d177b39aae1,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,8a166cf0a32e4321d815a52320a253c916c8940a6f4747c097e1931a56892fcb,Merge_failed,3516549bee188cd178adf8f613e2f20ca0194202644bb2614399f9c8e92369df,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,0.027543306350708008,0.027852535247802734,0.03082895278930664,0.03122687339782715,0.031462907791137695,0.03153514862060547,0.031139135360717773,0.2797353267669678,0.8721339702606201,6.757500886917114,1.0430614948272705,0.5602447986602783,0.24874639511108398,0.16039705276489258,0.16135120391845703,0.1612246036529541,0.16042685508728027,0.15984201431274414,0.46131134033203125,6.951872110366821,0.1577901840209961,0.15592288970947266,0.1468508243560791,0.15628814697265625,0.14204120635986328 diff --git a/results/combined/merges_timed/nlpchina/nlp-lang.csv b/results/combined/merges_timed/nlpchina/nlp-lang.csv index 46566de8d6..eed282afa0 100644 --- a/results/combined/merges_timed/nlpchina/nlp-lang.csv +++ b/results/combined/merges_timed/nlpchina/nlp-lang.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,cec0dd677bf90156ba3adaea1ffd6c69f64df9a1,08aa1059f93618cc7c59624d5df0157ae691cef1,20cc939c8bce1777f8e750c83154a0e1fb373406,,True,True,True,11,25,298,3,True,11,Tests_passed,70df7518916170212cab9406318f082d665458bc3df72963690c84581bd56a2f,True,Tests_passed,688f7a4088aefbf02ccb2cb5f5c7840365e6ecc4d6b6244d2149694b727507ad,True,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,f8718862436cf450d7ff2c0b871e492c19997344ad47498a4a3b9b19e279f452,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,28de242da21c4e2eeedebe22db487124df36f1eb557cd288dd5614177e220aaa,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,bc74266f9d2e866781c1fc8e7a4f6a93a161a7cf4e0cf9f3f9dfb232a6681009,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,0.04969644546508789,0.0429387092590332,0.05030632019042969,0.03953361511230469,0.05286073684692383,0.04962468147277832,0.06367015838623047,0.17739295959472656,0.16393637657165527,0.9382648468017578,0.3409416675567627,0.15933918952941895,0.1732492446899414,0.09580469131469727,0.09492135047912598,0.09844970703125,0.09060955047607422,0.09475064277648926,0.08833146095275879,0.9933738708496094,0.08412504196166992,0.08786416053771973,0.09070611000061035,0.09050250053405762,0.08727836608886719 diff --git a/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv b/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv index 706205fd41..b3b2b918d5 100644 --- a/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv +++ b/results/combined/merges_timed/nmdp-bioinformatics/ngs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 52,refs/heads/master,4b26663ea1d58a3deaad68a2da6b674b055b291a,43943849a35b943ec203c0d39583a9c5fcec4675,5101b8a038c57c34faa31f05a3a1da4a50cd091f,,True,True,True,6,10,292,2,True,6,Tests_passed,abd2fadb2826104a244981a79c491d2f7deb794cb335766e36276e16a06de96e,True,Tests_passed,76d2806e6c21bbfc46c261ee7b68e6e82116316827ee84dd22ef3a51ee2773f0,True,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,710cdeddfaa1c2a234689cd475cde53229627fb2beaf5bc5064d3c1b580af5fd,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,3f10c3355fc9a0653f2c4ab0f8c2ea391ee574cc52741fa15487e7fadbcd0374,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c1f7c2f785eb4ba0b6dd09c73186bbe4970da4a619e83ea6c87e53ad32e920d1,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,0.04317355155944824,0.04027056694030762,0.04572701454162598,0.0385892391204834,0.04216766357421875,0.018129348754882812,0.04470467567443848,0.1794588565826416,0.1035761833190918,1.1465511322021484,0.3630499839782715,0.06608295440673828,0.14392876625061035,0.06951737403869629,0.03521394729614258,0.06452178955078125,0.03640913963317871,0.06494522094726562,0.10349822044372559,1.071683406829834,0.06012439727783203,0.03547787666320801,0.03501629829406738,0.058907508850097656,0.03464961051940918 diff --git a/results/combined/merges_timed/northconcepts/event-bus.csv b/results/combined/merges_timed/northconcepts/event-bus.csv index e08dc33c0c..f2f3a8d8cc 100644 --- a/results/combined/merges_timed/northconcepts/event-bus.csv +++ b/results/combined/merges_timed/northconcepts/event-bus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,c878f8d9161df6ab27628108df79d54bf354cc60,d188a72f4990b2d3b0931c43028727ca22cf1895,19adeecc8b4edb32f39fc8308321459ca481046b,,True,True,Tests_passed,0673cf54a98166adfb7fcdf423843d0ab105bba55e00e228dfa89378a6eb428c,True,30,29,2638,25,True,Tests_passed,efa9ff4d8416969bdc52ffc16b4eb3a2484109770f1a533cad2b993b47ef0a75,True,30,True,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,41b4ffd7f4f9c95ce10ebd2304e24aa595687c02d3df284652ea840166a16f00,Merge_failed,645e5ade7499f8bd5d0c09698d18237b36206cd34651cf048b84fd6e028687cc,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,28030c4fd07f6720c4327b8cabdc937631909a2e08013c80d6a7547e78bf1e33,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,0.04859781265258789,0.04040837287902832,0.047167301177978516,0.04072928428649902,0.04579353332519531,0.04448342323303223,0.051868438720703125,1.5791490077972412,1.3922944068908691,9.710896968841553,0.29674696922302246,0.7264044284820557,0.20819735527038574,0.12557363510131836,0.12548422813415527,0.12650179862976074,0.12747550010681152,0.12713217735290527,0.5252981185913086,9.50848913192749,0.12780380249023438,0.12595248222351074,0.12705755233764648,0.12725567817687988,0.12578582763671875 diff --git a/results/combined/merges_timed/northlander/a.csv b/results/combined/merges_timed/northlander/a.csv index 7bc7b5c477..1fd0838932 100644 --- a/results/combined/merges_timed/northlander/a.csv +++ b/results/combined/merges_timed/northlander/a.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 68,refs/heads/master,3497235f96c45ea39d2be68ded078b07a4d1a17c,eb5566450e3912f14b2ac5bb5848f9c6c585d10f,9f94bd9bee386305f046787bbdfb507c9616eb82,,True,False,True,8,37,127,2,True,8,Tests_passed,4482a10f20e79bfdc93bab61f0b9f3faa0aa23c8bc8b9b2dcec74b363eb94ba9,True,Tests_passed,edc6e9998423a77284e60ca64ccc20ed5ba09ce964236f045bdd8efec148e91d,True,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_failed,f252b767bfde817a78d2fb0061d030cc8c9c4f493372bd849764913ba247e66d,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,0.045340538024902344,0.05103445053100586,0.04937148094177246,0.058156728744506836,0.04775071144104004,0.05816221237182617,0.04204130172729492,0.1711881160736084,0.1081082820892334,1.9339265823364258,0.6627664566040039,0.07848763465881348,0.13560914993286133,0.04759526252746582,0.048923492431640625,0.047371864318847656,0.04673171043395996,0.046678781509399414,0.08315515518188477,1.8657424449920654,0.04627180099487305,0.04629158973693848,0.03497195243835449,0.04525446891784668,0.03451395034790039 diff --git a/results/combined/merges_timed/nuodb/migration-tools.csv b/results/combined/merges_timed/nuodb/migration-tools.csv index 9108680287..0d5a5ef447 100644 --- a/results/combined/merges_timed/nuodb/migration-tools.csv +++ b/results/combined/merges_timed/nuodb/migration-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 64,refs/heads/master,2e1f6973c44144fa9b61715b1a4f0b9491d71572,65659386ae60f9c71c6a89e597e767666a523ad1,55d9255f2ba08e2abc92de5754a08c6f5a0cd1e7,,True,True,True,62,200,905.0,2,True,62,Tests_passed,158571a9755868f3fe875257efe38e9f3e1d83b5b6a6fd4fa909d8cff69dac96,True,Tests_passed,dbbdbf3b4f9a7b799f469a25fc52ce5ee7af35ec94ec9fcb8ce438a5a61b194a,True,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,85b988e0a208a56d489aa8679412167c1f5da8a1d4ee761924620c992ddc904b,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Tests_failed,abea25f98fa16f6e0efa7e75cd5c7e9a82b792d2c342d7ca08e48c952dae9bc9,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,90c24808c98230039a93bc99ca051f2d503ebfbdfc4d2e1bd48765c58a15942d,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,0.014458179473876953,0.0141143798828125,0.01933431625366211,0.018604278564453125,0.018814563751220703,0.019374847412109375,0.018883943557739258,0.05360579490661621,0.07284140586853027,0.6310319900512695,0.8571913242340088,0.07642626762390137,0.12604546546936035,0.049926042556762695,0.0493161678314209,0.0514984130859375,0.05044913291931152,0.05026578903198242,0.07408761978149414,0.6858389377593994,0.04501914978027344,0.04488348960876465,0.04089856147766113,0.04115939140319824,0.04296112060546875 diff --git a/results/combined/merges_timed/nurkiewicz/async-retry.csv b/results/combined/merges_timed/nurkiewicz/async-retry.csv index f0825fee26..1ee812080d 100644 --- a/results/combined/merges_timed/nurkiewicz/async-retry.csv +++ b/results/combined/merges_timed/nurkiewicz/async-retry.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/java7,27316bb87f8ad572d714cb0907a04ed67cc92d7f,3b3d7b88f079004c1861d67951d154179c545a6c,f573ece398890ae0f53eb29e35ebd3af1e9f70ee,,True,True,Tests_passed,9b669603feb41bf23ee55817d437ae34fa148d5f751dfe2df0f06ec55e1a9700,True,31,182,1051,3,True,Tests_passed,a1c52b0e89e2bca25f8f9c39d50cc88f401fa64464bac6851e060efc693a8394,True,31,True,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,8a17901df483804459d318ec045e6b11402ae49a76b49ff35d7333ff83f78a76,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Tests_failed,c25e1281413859123cc4268dc26e8e5a885283b3de749af7329d140b3dcbcb2b,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,5feb07254bf4f56301491946ede5c077ac5b0049b9d9502309ec972e2d5663c0,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,0.03711652755737305,0.030425071716308594,0.042678117752075195,0.04455828666687012,0.03984880447387695,0.042803049087524414,0.03744173049926758,0.23548436164855957,0.16401362419128418,1.2028391361236572,0.6140575408935547,0.10036039352416992,0.1240091323852539,0.0425724983215332,0.04191279411315918,0.04187417030334473,0.04164910316467285,0.041068077087402344,0.0891427993774414,1.1950492858886719,0.04233288764953613,0.041982412338256836,0.03319430351257324,0.04232358932495117,0.03285789489746094 diff --git a/results/combined/merges_timed/nurkiewicz/java8-workshop.csv b/results/combined/merges_timed/nurkiewicz/java8-workshop.csv index e677197242..5a1da0be69 100644 --- a/results/combined/merges_timed/nurkiewicz/java8-workshop.csv +++ b/results/combined/merges_timed/nurkiewicz/java8-workshop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/pull/5,f5918aa79c6e08def4de82ff69f94733e71f7fcd,22ce75de37ea170342618aaacf1bfd7ca9bf31d2,15d67e90921769a92e3e1b597e056f6aa29020b7,,True,True,True,52,259,1045,2,True,52,Tests_passed,3b30774e8709a9b0326a72e21d6a72e7c565014cbbe9454bc380283698277226,True,Tests_passed,7e432992c0e01c3b4cbadfff20a0df4f022d2c33094c967f37a3a05b63f25e31,True,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,0.047316789627075195,0.04183363914489746,0.05511879920959473,0.0494382381439209,0.053025007247924805,0.04347085952758789,0.04852414131164551,0.197113037109375,0.12619829177856445,0.591372013092041,0.6620934009552002,0.08172750473022461,0.1426234245300293,0.050965309143066406,0.05185651779174805,0.050611019134521484,0.0499417781829834,0.05134081840515137,0.08691978454589844,0.6012334823608398,0.050260066986083984,0.05008077621459961,0.03924202919006348,0.04861903190612793,0.04014754295349121 diff --git a/results/combined/merges_timed/nutzam/nutzwx.csv b/results/combined/merges_timed/nutzam/nutzwx.csv index 9f6144f68c..db92293424 100644 --- a/results/combined/merges_timed/nutzam/nutzwx.csv +++ b/results/combined/merges_timed/nutzam/nutzwx.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,fec5c5fa38c02162bb262432e6a8b72c281cbfff,845ebabe3c5df9bc20043dd1d1f4c36cd96e92ba,ebecc6c4425f4affd450866dc0e68fa0b6ba2e5b,,True,True,True,8,34,257,3,True,8,Tests_passed,14ac71be239824d618fd35a278df1aa95ba7449d077584f4b6fe2ab6dd2826b1,True,Tests_passed,b8a1f772d567a34e48c799fe531d7688511a26f39b3b8c4aa8ba000d651fe29a,True,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,8250332f29c286f124766cb6d6191e144325b2a92ee9e49370dd9f7d8e498c1a,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d5c347bc8090ad22d63e7da5b88f6deb089b91c2c8c6a87a102b83509e79dfa0,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,96b6aa66bcfb530cbfadfcfaef4fb091013a3955e46d050931ed5ff121bba03b,Merge_failed,f1b306e92a12434720ffe3f5e1fc783490e0701247ac3c8e4b985ad0f88854cc,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,0.009784460067749023,0.009897470474243164,0.010537147521972656,0.010378122329711914,0.010214090347290039,0.010202884674072266,0.009931087493896484,0.048341989517211914,0.12211942672729492,0.8560028076171875,0.4585001468658447,0.1057577133178711,0.1266326904296875,0.044567108154296875,0.044519662857055664,0.04460644721984863,0.0437777042388916,0.04293680191040039,0.09201645851135254,0.8949105739593506,0.04271960258483887,0.043617963790893555,0.035677194595336914,0.04380440711975098,0.03507733345031738 diff --git a/results/combined/merges_timed/nysenate/openlegislation.csv b/results/combined/merges_timed/nysenate/openlegislation.csv index edf3e8e0d6..bf2f03184e 100644 --- a/results/combined/merges_timed/nysenate/openlegislation.csv +++ b/results/combined/merges_timed/nysenate/openlegislation.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 152,refs/heads/dev,617199a3390afb9c4607d24820940d0d544d2bb6,3924b1c2492cd9047f0d09368d1d3cefee9d1e9b,844efdd518e615a3e1d6ec15f8df1b12fb875a48,,True,,True,336,763,,3,True,336,Tests_passed,f5282d765df57026df2e93e623d0677a09c7c2daea635653064412da4f62e8df,True,Tests_passed,30cda5931c2fa46f5de116170aef7d2f850bf96ab807cb53df0ecfc3b5e67024,True,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,7c73da45ff9619618f3798b48efd20f956ad3dc539de49ed02c36c3b143ac8d4,Tests_failed,2b991da308946cab04186d8cda4f69ab478df53101f6d32e7d0fc963f6ed4e6d,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,7c73da45ff9619618f3798b48efd20f956ad3dc539de49ed02c36c3b143ac8d4,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,Tests_passed,5f54621131f4e960bb57552b8aa46b311899fe7c6965c3a21070e147a2ea1dcb,0.06009316444396973,0.06657958030700684,0.09014725685119629,0.08741950988769531,0.09430885314941406,0.09638261795043945,0.09883522987365723,0.24809694290161133,0.1816878318786621,0.9772994518280029,3.4585764408111572,0.20753264427185059,0.274141788482666,0.1583881378173828,0.16341924667358398,0.16141271591186523,0.16065454483032227,0.15596938133239746,0.23092269897460938,1.0064270496368408,0.1383957862854004,0.14083027839660645,0.11755084991455078,0.13154387474060059,0.11593270301818848 diff --git a/results/combined/merges_timed/oaqa/baseqa.csv b/results/combined/merges_timed/oaqa/baseqa.csv index 2e853ceb03..48ab43c2ee 100644 --- a/results/combined/merges_timed/oaqa/baseqa.csv +++ b/results/combined/merges_timed/oaqa/baseqa.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/remotes/origin/rankqa_multisource_search,1e0462637505b3a15f7975cf771777118990ce06,8d4a0f584520ba18644bacf34b2726a069664e0c,2ffc27e45b778c9570d9d701f625259945ee05f0,,True,True,Tests_passed,bd56363e9a95d4c288404ae8e3014c437323d061f27ddaaf78aec3bbcc2e3680,True,86,229,1433,2,True,Tests_passed,3d2f4a5b99ffa2582a8310240a50713ded64cffa2604eb1c7900a8f6106b74b9,True,86,True,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Merge_timedout,,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,0.05147099494934082,0.039757490158081055,0.06374859809875488,0.05336594581604004,0.06072831153869629,0.049942731857299805,0.05056405067443848,0.1877901554107666,0.11146020889282227,0.7615728378295898,-1.0,0.07954072952270508,0.13991165161132812,0.049732208251953125,0.05129384994506836,0.051557302474975586,0.05096840858459473,0.04858803749084473,0.08790230751037598,0.7341659069061279,0.048876047134399414,0.04841494560241699,0.038141727447509766,0.04864931106567383,0.03837132453918457 diff --git a/results/combined/merges_timed/oauth-apis/apis.csv b/results/combined/merges_timed/oauth-apis/apis.csv index 156514313c..3351f9442c 100644 --- a/results/combined/merges_timed/oauth-apis/apis.csv +++ b/results/combined/merges_timed/oauth-apis/apis.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,b7324372f050116584267f8d3b14da65d67e74e9,4d29337d5e240051ca530e49b7c85c425ef490ec,0a7301608cc377bc36922ae25f352ad7aab2cc05,,True,True,Tests_passed,1471a3157ec98d83fe69633e621bd309761d39e4ad7ed94e6bd4801e15e51f48,True,40,116,1688,4,True,Tests_passed,32b5269124bbbb956ad0dad71826e168a13abfe1b8fae3c74d0f3c0def5aee8a,True,40,True,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Merge_timedout,,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,0.013796329498291016,0.05196690559387207,0.058976173400878906,0.02263927459716797,0.023813247680664062,0.05260205268859863,0.027321815490722656,0.2602975368499756,0.23450231552124023,0.6113884449005127,-1.0,0.1754286289215088,0.14867162704467773,0.10772037506103516,0.10624003410339355,0.09965276718139648,0.10338425636291504,0.1052248477935791,0.1327214241027832,0.6444323062896729,0.06162214279174805,0.09268498420715332,0.06995153427124023,0.07185864448547363,0.036407470703125 diff --git a/results/combined/merges_timed/obourgain/elasticsearch-http.csv b/results/combined/merges_timed/obourgain/elasticsearch-http.csv index 35103eab15..08787169fd 100644 --- a/results/combined/merges_timed/obourgain/elasticsearch-http.csv +++ b/results/combined/merges_timed/obourgain/elasticsearch-http.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,37df8773d873cc3155de5231165beff1a7564b99,59f9745528d2834c08fc9eaac05be5ead6698bfb,12b0ce30efc69082dca4af70d660cbbefb1522b1,,True,True,True,9,20,53,2,True,9,Tests_passed,4a2bc4687b7476b7e88ff3b6bf2a0a915aa739de07a35f35294eaf5ba8ceb8b3,True,Tests_passed,434259f3dd81d9b54f8b3a8af0ed2285ab29672a735f4de7f2cd73b12dfc2447,True,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,a7b36daab93353f94813e49672053cea75710eb85b971877d82010064be6d3f2,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Tests_failed,1352dcaf5a2bb6be2e8025e58e1e0a690043efa420b99a633ea1eb08cc25a132,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,67aad3a2ee90592205af84e05144349a9b26aedcb902fbe0eb7f7a873aad4dca,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,0.038735389709472656,0.03929400444030762,0.04864645004272461,0.0405275821685791,0.03846907615661621,0.04492497444152832,0.050650835037231445,0.17865633964538574,0.12567925453186035,0.6965408325195312,0.3751680850982666,0.0729978084564209,0.12210345268249512,0.04998517036437988,0.03643178939819336,0.03647589683532715,0.049141883850097656,0.03562021255493164,0.06984615325927734,0.7078266143798828,0.0374600887298584,0.0363161563873291,0.05136609077453613,0.03605508804321289,0.035131216049194336 diff --git a/results/combined/merges_timed/octo-technology/sonar-objective-c.csv b/results/combined/merges_timed/octo-technology/sonar-objective-c.csv index 19471bdff5..74235e2d08 100644 --- a/results/combined/merges_timed/octo-technology/sonar-objective-c.csv +++ b/results/combined/merges_timed/octo-technology/sonar-objective-c.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/remotes/origin/pull/104,b836820b107cd3bc5b7501fbccec5233804e39fb,96d4fdd2284122f3b9019d0d02b81ae3793d0d55,e8b0e178bcb565ef6356f732f33c1c9ea5991c3b,,True,False,True,6,8,15,2,True,6,Tests_passed,a36f03aef9a42aa4327b69c98c1cee4d0cc5341f763bad51cb8f3517057d75db,True,Tests_passed,b13a644ba693a782e0d8983d7f8abfd00d4d8d9fcc42118c9186b837425cc3f3,True,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,d873e576732256913858e84ee1c3f8737ec71d85e125ba6a38d12ac1f19de53a,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Tests_failed,fb2dcb2fa7933ea808916c04cd904356ea33c2e848c350bd77b1487c24cfefd9,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,13674a7f66adff1191c1504e45f6ca2b26b8e10b6b40f0b12e08b9b9c94b6a3f,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,0.03889012336730957,0.037157535552978516,0.03292274475097656,0.035321712493896484,0.04157662391662598,0.05319952964782715,0.02937030792236328,0.17003321647644043,0.09879469871520996,0.8279085159301758,0.3351433277130127,0.08476090431213379,0.12660503387451172,0.04243612289428711,0.043120384216308594,0.04194235801696777,0.044193267822265625,0.043866634368896484,0.07576775550842285,0.8268356323242188,0.041753292083740234,0.043081045150756836,0.04137897491455078,0.04363441467285156,0.04080677032470703 diff --git a/results/combined/merges_timed/okjsp/okmakeover.csv b/results/combined/merges_timed/okjsp/okmakeover.csv index 55557b77f2..38579daaa9 100644 --- a/results/combined/merges_timed/okjsp/okmakeover.csv +++ b/results/combined/merges_timed/okjsp/okmakeover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,db184c42795a9a70b512cda17c9aef80783a12e3,24eb1f27424244ea4f537876612bc369fcca500d,14679576b6f0c1f47bad5b7f82cc7d34933dfe43,,True,True,True,13,23,375.0,8,True,17,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,True,Tests_passed,4709a0746e4093f15459ef6186bf9ba67141041c827cecd0ec2782421794791f,True,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_failed,ccd80a69a80ccd3bc1c2ef46e6ceb433a4f22f704a8cbcf42149171149a2a1bb,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,0.014624357223510742,0.03885507583618164,0.03925061225891113,0.0400390625,0.04259133338928223,0.01197195053100586,0.04102969169616699,0.09719228744506836,0.047421932220458984,0.05131864547729492,0.35125279426574707,0.17177867889404297,0.14391398429870605,0.05713653564453125,0.05697154998779297,0.05752706527709961,0.056688547134399414,0.05693960189819336,0.0709693431854248,0.07124829292297363,0.05642342567443848,0.05586504936218262,0.03026747703552246,0.057068586349487305,0.030322790145874023 diff --git a/results/combined/merges_timed/okleine/ncoap.csv b/results/combined/merges_timed/okleine/ncoap.csv index d1f5b255fb..c9ce2f3410 100644 --- a/results/combined/merges_timed/okleine/ncoap.csv +++ b/results/combined/merges_timed/okleine/ncoap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,c30070ba7131b8a69119638d8e1109f140d22e85,6bcb914a5723ca8d94947558039072f2d3c517b7,ad88f96ad06b9e2856a91bc9ff316b37df250f78,,True,True,Tests_passed,4f67feea8f5fd0d410dd3d602b35610ccc2cdbd628236a6e0f160d823e1d4bb4,True,32,154,772,14,True,Tests_passed,5eb1bc97eb07f240ee71e8096f1e0797c16be3bf77a24e49b3625d24fc453068,True,32,True,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,3f1bbb7d40e039866900ae39cce5b55e736c4f6494cc733f5e27574e559e5962,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,5db9ba647dfa2649b69b402db43226e5c22215d73d8b73b1e2d16c566bb1ecd4,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,4749b0fabaebdc60f572865db9a85f9eca82c8909b38993373b1d424ca7dbfb8,Merge_failed,c3774edc122c9c17679c34aad3b3403944f6beb9cd1bcaa00500a396a271de9b,Merge_failed,1888df0d24a75df17364335e9996b78c517e8987ab7196dcdd9519f594559e2b,Merge_failed,5988a57483643869e4170bab755b553bc8f9167c6f20a6943785f6f9626da6a9,Merge_failed,c3774edc122c9c17679c34aad3b3403944f6beb9cd1bcaa00500a396a271de9b,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,5db9ba647dfa2649b69b402db43226e5c22215d73d8b73b1e2d16c566bb1ecd4,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,3a8a8932e33ed8d5a9faf1f5e2022c21680608b4273c649264013bac6943c302,Merge_failed,1888df0d24a75df17364335e9996b78c517e8987ab7196dcdd9519f594559e2b,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,3f1bbb7d40e039866900ae39cce5b55e736c4f6494cc733f5e27574e559e5962,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,Merge_failed,323c8721efda63ba6cd2705bd5be041dde672fbf50a29cafcc0c289845eb587e,0.03443169593811035,0.05168962478637695,0.026373624801635742,0.03701472282409668,0.014947652816772461,0.02424001693725586,0.034313201904296875,0.2811319828033447,0.7209959030151367,9.971847295761108,0.6172811985015869,0.4361908435821533,0.2141273021697998,0.12566781044006348,0.12701654434204102,0.1257927417755127,0.12580275535583496,0.12332844734191895,0.3515896797180176,9.191210269927979,0.12441182136535645,0.125352144241333,0.06031537055969238,0.1258242130279541,0.060163021087646484 diff --git a/results/combined/merges_timed/oldhu/suunto2nike.csv b/results/combined/merges_timed/oldhu/suunto2nike.csv index 7085b391d1..382debd2ff 100644 --- a/results/combined/merges_timed/oldhu/suunto2nike.csv +++ b/results/combined/merges_timed/oldhu/suunto2nike.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,171bc13151de4b6d205f809d0be56662b49a4920,c2f7c5f4361999291a95718ad44880dff02b2e8a,14135273289c531d1aba5d9299f21daa9fbc89ea,,True,True,True,25,24,4021,3,True,25,Tests_passed,2731ff566036bd25b66b4ec890c2fca70b35f2a7636bc13537c1e1ee5ddb689d,True,Tests_passed,ade76afd7b1e3017c23d1cc8b44dbbfda4b8156fe4a9a3f5dd0d65779e2c7361,True,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,ce6e9ca927262fc8f21cd845a3b0f87356b6f9c8ca4a1de4e8b959055bd45ff6,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,6461fcfdbe7ef8c12b960a147dfd07deeb801948984a3f4836b8d6f5635160e6,Merge_timedout,,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,9e3fd792c94c23e4663b311ba7f1af2f7182855576cc1fcf7055c84102066ba4,Merge_failed,375dc12d936de6306c22b765cd5bf575abb5aab8d6b2f600ce5b6e33c43bd69b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,0.043988943099975586,0.04529237747192383,0.03787636756896973,0.04805946350097656,0.04005908966064453,0.03855752944946289,0.03802132606506348,0.22986125946044922,0.17063236236572266,0.7147586345672607,-1.0,0.10244584083557129,0.1224813461303711,0.04179954528808594,0.04816389083862305,0.04236555099487305,0.041661739349365234,0.04162025451660156,0.08770346641540527,0.7486648559570312,0.04214286804199219,0.04689645767211914,0.04163956642150879,0.04186654090881348,0.04012560844421387 diff --git a/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv b/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv index 7e4fc8520e..da99a140f0 100644 --- a/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv +++ b/results/combined/merges_timed/oldmanpushcart/greys-anatomy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,,True,41,259,,67,True,69,Tests_passed,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,True,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,True,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,7d51c2d40d30035684c07dea82694954ae38646f72823094b67f10e60e9b5168,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,085365cbeadfd7c0b17d4d2b4215948c7971b32b0cb80062fb2400d5b5af9892,Merge_failed,a057e93029d1bba19ea80b4c8f3347b310a7ff8de85f97dba4a033e6ac8ede38,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,0.05584526062011719,0.06443357467651367,0.06381487846374512,0.061077117919921875,0.0633094310760498,0.06451773643493652,0.05006241798400879,2.2430131435394287,1.9398653507232666,19.027888774871826,2.521711587905884,1.1102287769317627,0.3750495910644531,0.2902653217315674,0.2868664264678955,0.28525257110595703,0.2928130626678467,0.29276084899902344,0.8691990375518799,18.345829010009766,0.28749632835388184,0.28670525550842285,0.2869901657104492,0.2904965877532959,0.2889857292175293 diff --git a/results/combined/merges_timed/olibye/guvna.csv b/results/combined/merges_timed/olibye/guvna.csv index 3f42e01113..36f017f538 100644 --- a/results/combined/merges_timed/olibye/guvna.csv +++ b/results/combined/merges_timed/olibye/guvna.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,34cd63519389f9e2fc0f1a8ec79f770a764e5e69,02579881c322e91d755fb2583d8da6d89c863f70,f8f105277f09d628ecd30871532eb411c2d90103,,True,True,True,8,39,368,12,True,14,Tests_passed,11168fe7094d8567e21bed0a2a82b3fd62ab741d8466b1c2cd0fa13dd70a6fba,True,Tests_passed,e8a4f3bdc315ef90ef73b6eb2f8626f9e8e60e37309aeda5de0d7a0d6a028bb5,True,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,255e318c777ea96ccc4672fdc4bba304df0e12e97f7587fb7bd37e2854cc650b,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,228a289486df7d87857c83a942405c7209f19da2e3800c8c61912c52af89c88c,Merge_failed,f49199fc88d2740574e4b9b685a773940c513c63fa19f5d14d5128c498db63bf,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,39bc3acf0fe33f11b9c8e81c3aae0a3cd777ee180cf41abe3868fb7ffcb8076f,Merge_failed,fdfb23c25efc4771dad31621283bf4d48a0e1d5de834957905777ff367891b0b,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,0.041321754455566406,0.0423276424407959,0.03586220741271973,0.010725975036621094,0.03398013114929199,0.0406496524810791,0.041594505310058594,0.26343798637390137,0.3589797019958496,1.4761738777160645,0.4797399044036865,0.19430756568908691,0.13659262657165527,0.05820631980895996,0.05688047409057617,0.05809974670410156,0.05751776695251465,0.05816340446472168,0.1516282558441162,1.5338554382324219,0.05827760696411133,0.05908679962158203,0.05691862106323242,0.05863547325134277,0.05675768852233887 diff --git a/results/combined/merges_timed/oltpbenchmark/oltpbench.csv b/results/combined/merges_timed/oltpbenchmark/oltpbench.csv index 22d1b2aff3..7c3648fe4d 100644 --- a/results/combined/merges_timed/oltpbenchmark/oltpbench.csv +++ b/results/combined/merges_timed/oltpbenchmark/oltpbench.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 160,refs/remotes/origin/oltpbench_tim,61fcfc2877ed46a1d8b36faae932fbb557081511,b61f29da1c16ed829c0dbeee66498adb07692a3c,0af97771b02e48284db1130f2c0aafbd822ccd30,,True,,True,1308,3597,,139,True,1367,Tests_passed,2ca09b4a834d6b2256898efbd077928fad232d0d28c9a673c9b2e34d449b4c15,True,Tests_passed,bb9717489bce87787580043b3d2a32e58bda0b359858f18614879c3c8c726c8e,True,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,8187fa98e68a15e2044b13115cd3f5c2d74045d5e3051be7b2a03869ec44143b,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,cefedd83547fc4fda65ae3f9a8e2fe3b021975b21988414e7f75fe2ad0f889b8,Merge_failed,954eb93b00a610e853b51763593e918549f56be730e2c57a51671880aa8aed47,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,2e1f24fff9d52ec4e2abca34a96fd2d1b2b298567541b5a89a0d746a8106cbf5,Merge_failed,042e97e12d816f90e916182635fda912628a8a0ccedfeb8e29b1df661684f1ee,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,1.0552210807800293,1.0621581077575684,1.3386516571044922,1.3309190273284912,1.3351428508758545,1.3272712230682373,1.3289313316345215,4.3607823848724365,2.579437732696533,12.972614288330078,18.55408811569214,3.361497640609741,3.2755074501037598,2.6772332191467285,2.7766547203063965,2.7448625564575195,2.936190366744995,2.6715075969696045,3.574917793273926,14.123119831085205,2.6317615509033203,2.6401169300079346,2.463228940963745,2.6290056705474854,2.432023525238037 diff --git a/results/combined/merges_timed/omnifaces/omnifaces.csv b/results/combined/merges_timed/omnifaces/omnifaces.csv index c5e651260c..f3919a3680 100644 --- a/results/combined/merges_timed/omnifaces/omnifaces.csv +++ b/results/combined/merges_timed/omnifaces/omnifaces.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 503,refs/heads/4.x,ccb06f87538a97e3bd9a8e73095a978efcafb7eb,9deef84288b08938b16b9ddd0ef0699dde8027e0,2b3b15be92a78784a06fc942214a202316c36a42,,True,True,Tests_passed,e84b0004155b3617a28d0425a5e5ba86afb87e6fa0271d7da11a45131b1b0ae8,True,9,27,146,2,True,Tests_passed,f0ec9e7775299ebf5531f6b5e1db33ae9a36c115ada5f0c788491ef57169c958,True,9,True,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,aaf5970a94c9f73b9f07d3a5e46ccf3d36c83d2714c843b7e831093f15e0afd5,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,f2502026f9efe655e2a554a315b0bf758d1088dfaef8c525da0118bdbf4bd953,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,8fce2bc8dc29309b0d9f876e70d86d8961ce9efa9fd194c64e9decd1be0ae7c1,Tests_failed,c18a756ab796b59643ab57fc4aa80e211c0ad88d282598e2b1e4133182bc797e,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,f2502026f9efe655e2a554a315b0bf758d1088dfaef8c525da0118bdbf4bd953,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,8fce2bc8dc29309b0d9f876e70d86d8961ce9efa9fd194c64e9decd1be0ae7c1,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,aaf5970a94c9f73b9f07d3a5e46ccf3d36c83d2714c843b7e831093f15e0afd5,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,Tests_passed,4610d5bf71ec76e740fea8354715b4a4a534ec276a1c9b444cdc165777f1b460,0.02371072769165039,0.05839896202087402,0.05513429641723633,0.04377436637878418,0.048812150955200195,0.04569864273071289,0.03294658660888672,0.18584656715393066,0.11171364784240723,0.5955595970153809,0.37861013412475586,0.10017085075378418,0.14011192321777344,0.07142233848571777,0.07145857810974121,0.07247209548950195,0.07212018966674805,0.06990289688110352,0.10573005676269531,0.6113402843475342,0.0649573802947998,0.06575536727905273,0.060331106185913086,0.06452083587646484,0.05643725395202637 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv b/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv index acbd3ced75..b0afd7f1d5 100644 --- a/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv +++ b/results/combined/merges_timed/onebusaway/onebusaway-application-modules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 66,refs/heads/master,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,True,True,True,71,111,964.0,2,True,71,Tests_passed,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,True,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,True,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,0.04436802864074707,0.05559659004211426,0.06967949867248535,0.038366079330444336,0.062482357025146484,0.09878873825073242,0.0744774341583252,0.20567059516906738,0.1406726837158203,0.7359962463378906,1.134589433670044,0.11426210403442383,0.19034457206726074,0.09108805656433105,0.08683133125305176,0.0840916633605957,0.08579802513122559,0.08693957328796387,0.13715410232543945,0.7444062232971191,0.07857179641723633,0.07938432693481445,0.07233500480651855,0.07575392723083496,0.06620931625366211 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv index 0b31891c17..cd9af24480 100644 --- a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv +++ b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-modules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/heads/master,0dfc36d5c8bb5baea8656f9c4ea68983a8e0070d,5e20b0ca0ea45255157403cb84b356ea248a5b69,cee1328fa50808ec510d4c1dbc1f8be3ef59beea,,True,True,True,171,723,10984,16,True,172,Tests_passed,2cb3bd75e78404454c91415f3cf4782822aa59c55e49be2f795acc0c8b3c891c,True,Tests_passed,1dd80eb012f77a6d8275b7830b8f13f052764dadb032f8e2beef6b4c84f7bb96,True,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,298132f484081963456b2d3e967641a4f3483faf59957fb4a91e0807fe131156,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a07261ef575584a18c6d29496642063286f995865a9887c06e2f642e9f3613d5,Merge_failed,1ff28b5cbda4f305f6dfcc74be04317ed6561dae49be6904ef90f1124fe90004,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,5270cbb4ce3b85349fdef7cf7ccb6d9610f453c355ab86c2fb5dc86a8cbdc469,Merge_failed,10256d2e29c89a4146e74abe67ce1deca631c28276355375e517be0ef9c2a8c1,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,0.053713321685791016,0.059839487075805664,0.06987595558166504,0.0689079761505127,0.05685877799987793,0.06803083419799805,0.052118778228759766,1.0805659294128418,0.9564487934112549,5.525013208389282,4.1083900928497314,0.5688440799713135,0.2570939064025879,0.16330218315124512,0.1655280590057373,0.18212008476257324,0.1629626750946045,0.1645805835723877,0.42465829849243164,5.291011095046997,0.176893949508667,0.1648256778717041,0.13686895370483398,0.16344928741455078,0.15476107597351074 diff --git a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv index b420643fc8..3ca687d926 100644 --- a/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv +++ b/results/combined/merges_timed/onebusaway/onebusaway-gtfs-realtime-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,96a36bebafe864cf710f1c7d4fb59d6b0f6be102,30c97f6c6318d2c2b21af4b037379a4fc4066005,9cef141e244263ee6b29f6de503c0047573d5933,,True,True,Tests_passed,1303a1d689098aaaef350c57cea697928222435bcd0f7f0306f552b840685cb5,True,7,263,6254,2,True,Tests_passed,910e326a92598a4aab534d07b2f80bf0d4cd63b3a4ad319ade3b7807a6813e66,True,7,True,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,04875702851856d6b96dd33324f25fac2cbce0743668234dac27a73a10f3d70e,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Tests_failed,63055549bfb530abd2fe7148475ef8d0cbb4605abc0e36072a74266295073cd8,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,ad6e693b568ad23006ef922b03938b5855ec2f403dc170a6403110461e1ccde6,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,0.05508112907409668,0.049601078033447266,0.05783891677856445,0.04913330078125,0.035987138748168945,0.05079936981201172,0.04881930351257324,0.17983222007751465,0.11239027976989746,0.47074341773986816,1.2465903759002686,0.07398080825805664,0.1217508316040039,0.03925061225891113,0.039640188217163086,0.04021620750427246,0.03785109519958496,0.03871297836303711,0.0705575942993164,0.46329212188720703,0.0382084846496582,0.03936266899108887,0.038396596908569336,0.03865647315979004,0.039037466049194336 diff --git a/results/combined/merges_timed/onyxbits/raccoon.csv b/results/combined/merges_timed/onyxbits/raccoon.csv index d6d304b777..e3ee0ecae4 100644 --- a/results/combined/merges_timed/onyxbits/raccoon.csv +++ b/results/combined/merges_timed/onyxbits/raccoon.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,242b60f26dd4783edf092061d17369b2dbad9ac5,1e372cfd6d21de6e607b6354c38788a9619ffecd,73ed5dcb5cfdb1caa59abaa09bd729b68eaec141,,True,True,True,11,56,1512,2,True,11,Tests_passed,cfe23c22c36420f01626e8c847674c9c0297dc31ad6ecaf03b458107087cee0b,True,Tests_passed,a27f8624e3cdfe7167828887807bcf3fa3c4b5462deefebe16646cee2b73496e,True,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_failed,d336ce1ed1c7c0db7f88f57e1a73a472a1995c5e3f1746f75f56b53ff85e5d45,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,0.09423017501831055,0.09484696388244629,0.12771892547607422,0.05026125907897949,0.1287825107574463,0.01283884048461914,0.12877130508422852,0.17831015586853027,0.12904644012451172,0.11092948913574219,0.4698493480682373,0.2641875743865967,0.21517324447631836,0.22745108604431152,0.22959423065185547,0.228759765625,0.2302567958831787,0.22894883155822754,0.3189659118652344,0.2289421558380127,0.2000739574432373,0.19537687301635742,0.20523381233215332,0.19237327575683594,0.20785784721374512 diff --git a/results/combined/merges_timed/openapitools/openapi-generator.csv b/results/combined/merges_timed/openapitools/openapi-generator.csv index dd600eaf6c..00b7fd4d5e 100644 --- a/results/combined/merges_timed/openapitools/openapi-generator.csv +++ b/results/combined/merges_timed/openapitools/openapi-generator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3558,refs/remotes/origin/pull/1014,297029e1bd2112e6fbeef1efde0778141a2cdf9c,205fa699e300a47b643ac786334930777c0a37a9,35c3be83f85b36d40d92d2cf6c5d78edf96d1980,,True,True,True,93.0,164,3174.0,2,True,93,Tests_passed,f535c18b0acb6787bb89ef1a1fe9e8160020b4f0237a4a4675a6649de2fb4ab9,True,Tests_passed,55355a47d45942c494d2873eff0c94b8208e31fbf15ca3f215dde9b1be8d4686,True,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_failed,238b86d117337357ef985f03d3ab403369ea3dabc554f9e707b54d3b5d0378cf,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,10d569eed06d987261631ae742c8ae2efdacae977edcefe4b57bbe14aaaedbb6,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,Tests_passed,fe784b59d0c6bfe44dec5463bc91744ff9626d45e9eab66cd770da1ba62644ea,0.044916629791259766,0.05884194374084473,0.0490260124206543,0.05456686019897461,0.05364537239074707,0.05592966079711914,0.0525360107421875,0.1893613338470459,0.11614823341369629,2.380113363265991,1.2890796661376953,0.12178349494934082,0.18576431274414062,0.09045124053955078,0.09264779090881348,0.09315633773803711,0.0919501781463623,0.09090757369995117,0.14594030380249023,2.155945062637329,0.0843353271484375,0.08540964126586914,0.06815195083618164,0.08431315422058105,0.0691828727722168 diff --git a/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv b/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv index 94480e3d4d..87d5e080c7 100644 --- a/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv +++ b/results/combined/merges_timed/opendatalab-de/geojson-jackson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,894661ba0d4f40c02ea56ed56abab760fb13444b,8c4446a91079a1170b5bffd0f3fe9ada035c2b42,8d47769f37e6b4aa01ef3bb9d52aff0da27fb228,,True,True,True,18,58,270,3,True,18,Tests_passed,e6588ca086257abfc5e05b878405eb5ea21b65cf09e92c6caae473f2b37ffae5,True,Tests_passed,1f4ddf696ac6a2b785eb936ee298d703aab992316a367d0e68761de9b2e87d91,True,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,665da34ddaf56f970b89d5baf38b6afcbf4e45f8f3364fc3b7754a702b002d12,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Tests_failed,3060d3d1793b8fa8a4f8fd4669abf07166f5823c99e659224039da94e74a2419,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,d89c5c88d106ab93a562a171c3acee7d993f70dba6aa91fdc181e2b157470285,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,0.04179716110229492,0.04239606857299805,0.009165048599243164,0.03601479530334473,0.03812813758850098,0.040461063385009766,0.032958984375,0.21674275398254395,0.15745091438293457,1.1854372024536133,0.3899686336517334,0.10226225852966309,0.11841487884521484,0.03969860076904297,0.040009260177612305,0.040952444076538086,0.03971982002258301,0.040265798568725586,0.08729052543640137,1.2068042755126953,0.04127812385559082,0.0411069393157959,0.037920236587524414,0.04072880744934082,0.03829765319824219 diff --git a/results/combined/merges_timed/openhab/jmdns.csv b/results/combined/merges_timed/openhab/jmdns.csv index 96e94fafec..f06614d411 100644 --- a/results/combined/merges_timed/openhab/jmdns.csv +++ b/results/combined/merges_timed/openhab/jmdns.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 23,refs/remotes/origin/pull/142,2c7d1a7405d9d43873f3a78f5373648ef759207e,27329d1d263060bbd6ef18bde3b7620e5edb572f,96a96e12ed57c536cdd105e508188f95fe68fc59,,True,True,True,24,105,684,80,True,90,Tests_passed,c2d276adbb95455f5b89f9e1147069ae8daef8f069d3b37f77ff1479553bc028,True,Tests_passed,e9b352a0d6f4d105e720e51c3ad42894d85df86bc0507e66a73787cad30c0af0,True,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,21b12506ca022a09c217c02d9f1824db5c12c37b09754426a64b257686ebe173,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,8153d64eb2429b26bdcd3e71f025c0d5487938c2a5c67355d23e6f74cb9879b0,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,764c29d1094e0fc8af2f3a755d99a3913840dac450d847e9025ddc620e757a75,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,0.06467890739440918,0.05191206932067871,0.06504368782043457,0.06923484802246094,0.04583430290222168,0.08580374717712402,0.0714712142944336,0.9633195400238037,0.8730738162994385,12.172288417816162,1.43453049659729,0.5621225833892822,0.2887897491455078,0.22130703926086426,0.1737048625946045,0.21635961532592773,0.21539878845214844,0.21110129356384277,0.36548304557800293,11.844820976257324,0.19543838500976562,0.1969776153564453,0.1617588996887207,0.17322468757629395,0.1620340347290039 diff --git a/results/combined/merges_timed/openhft/chronicle-bytes.csv b/results/combined/merges_timed/openhft/chronicle-bytes.csv index 9390a68623..d35c0be568 100644 --- a/results/combined/merges_timed/openhft/chronicle-bytes.csv +++ b/results/combined/merges_timed/openhft/chronicle-bytes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,True,67,250,5935,3,True,67,Tests_passed,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,True,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_failed,4e5636abe784f3bcf0eaa39b13272c1519117a0115a2c9e24680606e23e712c3,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,0.029448270797729492,0.028345823287963867,0.03327131271362305,0.028581619262695312,0.0331418514251709,0.0329279899597168,0.032402753829956055,0.08248543739318848,0.1366715431213379,2.045332908630371,1.8859405517578125,0.14666295051574707,0.18446731567382812,0.07356023788452148,0.08285832405090332,0.08757257461547852,0.08744406700134277,0.08722996711730957,0.15455222129821777,2.032801866531372,0.0804600715637207,0.08254337310791016,0.06636309623718262,0.08098125457763672,0.07204461097717285 diff --git a/results/combined/merges_timed/openhft/chronicle-network.csv b/results/combined/merges_timed/openhft/chronicle-network.csv index 2abc65ecf2..7e2d5e636c 100644 --- a/results/combined/merges_timed/openhft/chronicle-network.csv +++ b/results/combined/merges_timed/openhft/chronicle-network.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/ea,297f43b8f8860335c79d857e7bdddc0ac9f8f0da,705e1e7a01074bdaf1668d53d6974ee1288692d3,17b56d9342ca579875930b1652336638a0f00ab1,,True,True,True,56,315,1682,3,True,56,Tests_passed,fa9b1521ed0d9c14b01f3e38a9976c0d31e5ddc91ba5add96afe1c399be683d2,True,Tests_passed,805787c1835f0a9a943d0d5db2d089205b40ffcc43d5636fbf02231155f6af53,True,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,0.021095991134643555,0.022266149520874023,0.023018836975097656,0.02345895767211914,0.02350306510925293,0.02289891242980957,0.0227813720703125,0.06618690490722656,0.12950968742370605,1.2508831024169922,1.0093505382537842,0.12152552604675293,0.16272282600402832,0.07196664810180664,0.07095909118652344,0.07138252258300781,0.06595325469970703,0.07164430618286133,0.12262845039367676,1.2865791320800781,0.0677633285522461,0.06786823272705078,0.04959893226623535,0.06556820869445801,0.04727816581726074 diff --git a/results/combined/merges_timed/openhft/chronicle-threads.csv b/results/combined/merges_timed/openhft/chronicle-threads.csv index 3f3f67b844..f1fdf930f4 100644 --- a/results/combined/merges_timed/openhft/chronicle-threads.csv +++ b/results/combined/merges_timed/openhft/chronicle-threads.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/heads/ea,c79efe704817535cbb84891bb2048cea21e926a0,a354c888e4c0174d631ffb8934299161055c5b3e,58ac76a7fe6dc52a74258985f9d2bca00c80aa73,,True,True,True,34,57,268,2,True,34,Tests_passed,3bbeb351de56d4020efba79d9b680025a67964cdad15106e90e77683a4d1857a,True,Tests_passed,1891de40f58767f5a6e308e86d17ef85ce3542f293a4c2b8f138d368e3a61416,True,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_failed,0338368d37856f33107abd24d0deec3384e0f2146075d1b9d38ae453f752b8ed,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,0.011560916900634766,0.011725425720214844,0.011933565139770508,0.011911869049072266,0.011925458908081055,0.01192617416381836,0.01172780990600586,0.037741661071777344,0.06698322296142578,0.8426735401153564,0.6530659198760986,0.07343292236328125,0.13092494010925293,0.04356980323791504,0.044980764389038086,0.04392075538635254,0.04442858695983887,0.0436553955078125,0.07873320579528809,0.8740849494934082,0.04264402389526367,0.04460930824279785,0.03243374824523926,0.04366874694824219,0.03241443634033203 diff --git a/results/combined/merges_timed/openhft/zero-allocation-hashing.csv b/results/combined/merges_timed/openhft/zero-allocation-hashing.csv index 1624f86643..7882d1b986 100644 --- a/results/combined/merges_timed/openhft/zero-allocation-hashing.csv +++ b/results/combined/merges_timed/openhft/zero-allocation-hashing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/remotes/origin/pull/32,0d095dacc71fdff39d82d11674d410941d909e6a,a84b73119da25af70fa05889ff5d2298568ed57b,6daf738c303d538031d65815eebf24ad649c6abb,,True,True,True,6,23,140,6,True,9,Tests_passed,b2014e8890eacfbad9e7b8a2cf09add99c2da49ad21a20a79c40d6a821f79358,True,Tests_passed,e47a0ead91c88744a4375b6b069bf958dd4d89dca67ecf6e4a62a6cbd9646851,True,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,d1617d29d5df73973e2536488f8be522fc5cc459e41829b2c92f3414a375b489,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,deadb20374b4a01dd7109d120e966a87369800c65c4472f77d1b24b1f404ecff,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,5bd88cc6ac276d5e35a2de68486bb3aa617fb45fbd77a0ead470853f2ac65a68,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,0.012487411499023438,0.012239217758178711,0.012381315231323242,0.012618303298950195,0.012759923934936523,0.012563705444335938,0.012338876724243164,0.05225539207458496,0.12961888313293457,1.8859987258911133,0.4694325923919678,0.10411572456359863,0.12407946586608887,0.04240751266479492,0.04364752769470215,0.04172253608703613,0.04319906234741211,0.04254865646362305,0.09237194061279297,1.7083005905151367,0.0428004264831543,0.04379987716674805,0.04152250289916992,0.04252743721008301,0.04077291488647461 diff --git a/results/combined/merges_timed/openmicroscopy/bioformats.csv b/results/combined/merges_timed/openmicroscopy/bioformats.csv index 333c41fdad..55380898e5 100644 --- a/results/combined/merges_timed/openmicroscopy/bioformats.csv +++ b/results/combined/merges_timed/openmicroscopy/bioformats.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3992,refs/remotes/origin/pull/3032,93f990104b3c1fb1ee1ab2a26a0f078c09b5822a,aeb68fb7f320c6f1ca9d0fafac2e6ebfc86f0a64,07b804962bea206361e1ab1a8e56874cf8c68496,,True,True,True,126,758,6919.0,2,True,126,Tests_passed,fc672c93bcc8a2117ac0f906dbf9f2595ee7809f9530400311470d22d7589c26,True,Tests_passed,01bf3aad3d4d9de585e7a55113b203c837083af67645fdbc3da03627df38cc04,True,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,92b8a30f89f0f002b02d43194fc208332d87498427c17c8e4afbe29535e2b7a2,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,Tests_passed,d44b94c3a61542f4f09425da1d146800f9984f643106c1e46d13fe0438cfa3cb,0.04167342185974121,0.0418848991394043,0.05496978759765625,0.05627608299255371,0.05386519432067871,0.05509042739868164,0.05464887619018555,0.09476923942565918,0.09656882286071777,0.04604172706604004,5.009494066238403,0.14666271209716797,0.2290937900543213,0.11826229095458984,0.12055468559265137,0.11846733093261719,0.1190643310546875,0.11751174926757812,0.16576075553894043,0.1264643669128418,0.10966110229492188,0.10399556159973145,0.09647297859191895,0.10671377182006836,0.10087323188781738 diff --git a/results/combined/merges_timed/openpnp/openpnp.csv b/results/combined/merges_timed/openpnp/openpnp.csv index 3d36807289..2cc33f3f88 100644 --- a/results/combined/merges_timed/openpnp/openpnp.csv +++ b/results/combined/merges_timed/openpnp/openpnp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 468,refs/heads/develop,3cc5b458a4a78bb580e90cd510be43c69f79226e,f2af033914781f4b84f6c13c5d8c6ddfcdb24a29,5cd215a0aa1117758f13e7f850a12c6e648eef37,,True,False,Tests_passed,1a299c2cc11e553239f49380cd306b18668691dea04a96961404fe237a06a275,True,2,2,4.0,2,True,Tests_passed,58972a804488066374207fe385820067eae6c0ae39f15cb1383fe0ff7b10d3ab,True,2,True,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,10f474965d3cc515a6bd2a8cda4d29cdd27f376840677d0d11d3f74a54885bb3,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,10f474965d3cc515a6bd2a8cda4d29cdd27f376840677d0d11d3f74a54885bb3,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,Tests_passed,0ade896fc1f1c73f4cc3aa2b73efb3e2b9f3081bdd38f2c8b9ea16789150049d,0.04652905464172363,0.038138389587402344,0.04893016815185547,0.04948782920837402,0.041185617446899414,0.026285648345947266,0.0523221492767334,0.17014122009277344,0.11679816246032715,1.2760038375854492,0.37665438652038574,0.08076286315917969,0.13895559310913086,0.04457259178161621,0.048653364181518555,0.04733705520629883,0.044411659240722656,0.04655289649963379,0.08356070518493652,1.2282326221466064,0.047104835510253906,0.045949459075927734,0.03228449821472168,0.04482674598693848,0.03310370445251465 diff --git a/results/combined/merges_timed/openrefine/openrefine.csv b/results/combined/merges_timed/openrefine/openrefine.csv index 2b37ed93ff..1a9476ed8d 100644 --- a/results/combined/merges_timed/openrefine/openrefine.csv +++ b/results/combined/merges_timed/openrefine/openrefine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,True,78.0,219,871.0,2,True,78,Tests_passed,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,True,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,0.049082040786743164,0.06729316711425781,0.06582522392272949,0.05254507064819336,0.05135035514831543,0.06628179550170898,0.05425310134887695,0.16430902481079102,0.10298490524291992,0.07673406600952148,9.559029340744019,0.1104121208190918,0.18228387832641602,0.08063364028930664,0.08321094512939453,0.08320975303649902,0.0798501968383789,0.0814809799194336,0.12914514541625977,0.09247899055480957,0.07346868515014648,0.0747685432434082,0.0673363208770752,0.07613039016723633,0.06622648239135742 diff --git a/results/combined/merges_timed/openskynetwork/java-adsb.csv b/results/combined/merges_timed/openskynetwork/java-adsb.csv index 810b909a82..0db0247c7e 100644 --- a/results/combined/merges_timed/openskynetwork/java-adsb.csv +++ b/results/combined/merges_timed/openskynetwork/java-adsb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/master,14f216cddfb325156ee31a3fdebdeadf3e6944fb,85a0255b0de8eb3eaecf8058c285313af1886256,7c4f90789ede736fdbd1161f70f46cdc273a7c89,,True,True,Tests_passed,5b84b99a1e9525efb6e40415bccafa20284cf7a1fe4598af00333746305f9577,True,11,43,355,2,True,Tests_passed,dbdfe4bf301423794f02465c1e7385409e31266d796b0d961234afd94721643d,True,12,True,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_failed,44f063fb6bca23734a967888a5c4a45d823bac13b138f8f2da529ea3dcc33a69,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,0.04639935493469238,0.039641618728637695,0.05052590370178223,0.03740406036376953,0.0517575740814209,0.04867887496948242,0.04800248146057129,0.2120685577392578,0.17331218719482422,1.058089256286621,0.5118160247802734,0.09289002418518066,0.12435245513916016,0.039864540100097656,0.04060673713684082,0.04105567932128906,0.04082989692687988,0.04176211357116699,0.07494163513183594,1.0382230281829834,0.0392916202545166,0.03905487060546875,0.028056859970092773,0.03969264030456543,0.027852773666381836 diff --git a/results/combined/merges_timed/opentosca/container.csv b/results/combined/merges_timed/opentosca/container.csv index 079c31b38c..e29d06a4fa 100644 --- a/results/combined/merges_timed/opentosca/container.csv +++ b/results/combined/merges_timed/opentosca/container.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 255,refs/remotes/origin/pull/252,294305d0a87dbda54b1dca1962fe45988851a096,bd7ecb1c7af4d5bfbbc825493497fb6885f8eca1,e3e986b86de0061e502da0c5e31b645386f3d813,,True,True,Tests_passed,90c0f8554c337383b6dc066894b5b73fbfe9272ca56ae84e4f7d756557554a27,True,270,1324,22262,3,True,Tests_passed,3f5f3a7741e5cc1116ce0ec0c40ca45df77af9c46f7967d357a78a9fc376dcc9,True,270,True,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,Tests_passed,80d9118d10595a609a74c59a8c4a2f210a5df12ef928afc1767e78b54eaae35b,0.07596325874328613,0.06953811645507812,0.09201359748840332,0.08049774169921875,0.08815169334411621,0.08267688751220703,0.09023332595825195,0.2190854549407959,0.20937061309814453,0.09394526481628418,-1.0,0.20908451080322266,0.26054859161376953,0.1495344638824463,0.15358805656433105,0.1468970775604248,0.15232205390930176,0.14714789390563965,0.23220300674438477,0.16167640686035156,0.1336972713470459,0.13440346717834473,0.12908434867858887,0.1366710662841797,0.1212148666381836 diff --git a/results/combined/merges_timed/openzipkin/zipkin.csv b/results/combined/merges_timed/openzipkin/zipkin.csv index 598a24dbed..ffdbd8012c 100644 --- a/results/combined/merges_timed/openzipkin/zipkin.csv +++ b/results/combined/merges_timed/openzipkin/zipkin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,False,Tests_passed,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,True,2,2,3,3,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,True,3,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_failed,99f26f67a1cbcce83749566d43867139517c147b462c626fc2712986e43a2b35,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,0.0516207218170166,0.04362034797668457,0.013971090316772461,0.013147592544555664,0.013854503631591797,0.013248205184936523,0.01787114143371582,0.17997264862060547,0.07423019409179688,0.028954744338989258,0.3449990749359131,0.07825922966003418,0.13944292068481445,0.05059337615966797,0.0507049560546875,0.05037236213684082,0.04983949661254883,0.047983407974243164,0.08366751670837402,0.06319355964660645,0.05027437210083008,0.048308610916137695,0.03487372398376465,0.04534626007080078,0.035565853118896484 diff --git a/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv b/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv index eb8a42f244..35c4b72149 100644 --- a/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv +++ b/results/combined/merges_timed/ops4j/org.ops4j.pax.swissbox.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,22aec8b7af2d3e207cd3db06e71a7ed130c1ab49,a4a563b9b8227e617f88e56fd9219562caf81d70,916b285f03483c22cf58b7efaffac807259bfaf8,,True,False,True,2,2,4,2,True,2,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,True,Tests_passed,ba04c9d476f7f588f34a228312991b3c38ba4d1fb01fb50b5a9c6117bcc959ba,True,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,1ffbdd50a6bd0e42dc6937192d055a0b09fb70b2cfb1ad6cc52e7a69ae5eebaa,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,dd6ac8bdd3e3f7f959a372421c972a664fcf0072b03605799779d6f4cc345f17,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,24646093a47b9021c9974ebd29f8440855f8f21a913b87f18030c6050c7cde15,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,0.036847591400146484,0.037848472595214844,0.039073944091796875,0.03537940979003906,0.05757331848144531,0.0389862060546875,0.03901195526123047,0.15761876106262207,0.11438775062561035,0.7093546390533447,0.27552056312561035,0.08576774597167969,0.11800050735473633,0.039081573486328125,0.046630859375,0.038574934005737305,0.03856682777404785,0.038376808166503906,0.07110714912414551,0.6720685958862305,0.03844261169433594,0.04560136795043945,0.038091182708740234,0.03836774826049805,0.03696560859680176 diff --git a/results/combined/merges_timed/optimaize/language-detector.csv b/results/combined/merges_timed/optimaize/language-detector.csv index b8d602f13c..3e310e80f1 100644 --- a/results/combined/merges_timed/optimaize/language-detector.csv +++ b/results/combined/merges_timed/optimaize/language-detector.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,3420609a2503b56ec82d0ef6fa3b3b642111b55f,a588b7fbac2d321697f16815c2dd4fc6f1d686e4,cbecb11909365f6e999af39554e7af855d2bd1db,,True,True,True,3,7,21,2,True,3,Tests_passed,ce93c25b2e4b3f8d75011a0bef34e185a07a33c3bd2e8db5b78d7d80db5eea1e,True,Tests_passed,184934be0ba8bc2c54ef413acece0a5ff82ba2413cb2ec7c4301a14d897f732b,True,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_failed,9e78fa51a76d364e5ddfe3ee0377575ebb3cd7681192aa7174c75ed7a3e085ac,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,0.044165849685668945,0.02484130859375,0.010926485061645508,0.046509742736816406,0.03673148155212402,0.01009368896484375,0.009894847869873047,0.14533305168151855,0.09202194213867188,0.8287889957427979,0.3229939937591553,0.13967132568359375,0.14999628067016602,0.11116981506347656,0.11310553550720215,0.038857460021972656,0.10453915596008301,0.03904390335083008,0.15364885330200195,0.8608224391937256,0.04062509536743164,0.09610962867736816,0.027683019638061523,0.09551429748535156,0.02750229835510254 diff --git a/results/combined/merges_timed/orctom/was-maven-plugin.csv b/results/combined/merges_timed/orctom/was-maven-plugin.csv index 5cff6fe872..d8b6a96c34 100644 --- a/results/combined/merges_timed/orctom/was-maven-plugin.csv +++ b/results/combined/merges_timed/orctom/was-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,98acec132ed7b3670db4c82820dcf584e9f83354,b3267ad21ed199e657a05671480240e748357c36,81477d902b56176c611dadb875ce5da8c01fdad6,,True,True,True,6,10,46,3,True,7,Tests_passed,29ef75aca47fe40811cd701b950dbf21975fdf682988feed5df5e90df1da8ec9,True,Tests_passed,3c3fe5a0e154f90251e15a2ac8600ce8fa979ff2a18f54bd6a5f2e15d3a6b7e2,True,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_failed,3f7c5b3d05cc5d98abbaa1c5e1e35887b2114eea80f040f771dad6de7b342f66,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,0.042169809341430664,0.037450313568115234,0.04598641395568848,0.03565073013305664,0.042571067810058594,0.044773101806640625,0.04275798797607422,0.16681814193725586,0.11370038986206055,0.6157257556915283,0.28648829460144043,0.07160186767578125,0.12364840507507324,0.040381431579589844,0.040717124938964844,0.040895938873291016,0.039934635162353516,0.039835453033447266,0.0715029239654541,0.6263422966003418,0.039429426193237305,0.03891730308532715,0.02881765365600586,0.03980231285095215,0.028965473175048828 diff --git a/results/combined/merges_timed/orien/bean-matchers.csv b/results/combined/merges_timed/orien/bean-matchers.csv index 781fca159b..d9b2233a93 100644 --- a/results/combined/merges_timed/orien/bean-matchers.csv +++ b/results/combined/merges_timed/orien/bean-matchers.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/main,258563a1b3e3ecac55c4d8c38742eaa1c019b7db,2eb1107603f2ee1ed902aa2874df09d30758f908,4280131224e1d2701288f3ca59413a17731fe2b4,,True,True,Tests_passed,44c4c4811c450da3b46bcc1e8b8251da13e9f5ddb4c445f410023130bc1c5584,True,104,531,7572,2,True,Tests_passed,b074acc1c25939184f4f865ca7f56e59e25cefeda93d825ba58594e10fcc6867,True,104,True,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,82ade3854741c5793fe8855d75445b78b7e86663824889fa0a976033690a71a8,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Tests_failed,5a9d0ab01fb697985acb74aad9aef48106a294a310e1ac8e37b90c59aecaa1f5,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,a7901b74b8ce22beda8e51ce19c00978ddbde32fd4ef1dedac2bfdace48952a9,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,0.05687856674194336,0.05084562301635742,0.05061745643615723,0.05538797378540039,0.056932687759399414,0.05561542510986328,0.049146413803100586,0.17970681190490723,0.12222504615783691,0.6077532768249512,0.6399979591369629,0.07777976989746094,0.12033915519714355,0.0412907600402832,0.040528059005737305,0.03892970085144043,0.03952813148498535,0.03955340385437012,0.07296490669250488,0.621530294418335,0.041025400161743164,0.04041743278503418,0.039389610290527344,0.04071784019470215,0.03862762451171875 diff --git a/results/combined/merges_timed/orientechnologies/orientdb-etl.csv b/results/combined/merges_timed/orientechnologies/orientdb-etl.csv index 61834b67d5..a04e0de741 100644 --- a/results/combined/merges_timed/orientechnologies/orientdb-etl.csv +++ b/results/combined/merges_timed/orientechnologies/orientdb-etl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,889e65b57d07559f507bcef0e966f6f0612ae9dd,976e3dfeee348acdffb27f3ff0f405aa4aa91891,9a1e630ba893b0fdbe95839bda9238cd89bd2183,,True,True,True,54,239,1446,6,True,54,Tests_passed,41176f373379e6bb5255cc76c94cc131f7189ac76923a9f81418c20c784c3554,True,Tests_passed,106bf5a5477aa831b6d33829c9d4386da75f4959f2b72ff88ac2dda1c8042091,True,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,84259afd6e1fcf518889a029081782fef076cc82dd3ef04413266db1dae47516,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,2d04a3d9f05acb902530173e5d110e1c1a4fcc5d8c38576d39d483b80f60a979,Merge_failed,7bf27dddb965a28a12db02a0d512c9c7ade248c8264cea9e7968c6564d40af93,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,bb7b9af8104df1f26d1a84433a71505eeca7148598f922e1838de9cc74c10f7a,Merge_failed,dee094f30cc43cdf7d91b03865d5ed6fd94a6bdc7dc936e579f03fe248f57fbd,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,0.013128280639648438,0.013209342956542969,0.012944221496582031,0.013256072998046875,0.013128042221069336,0.013079404830932617,0.013139963150024414,0.08809709548950195,0.30446934700012207,3.7994775772094727,3.797261953353882,0.21216034889221191,0.1470038890838623,0.0688779354095459,0.06825041770935059,0.0676875114440918,0.069305419921875,0.06862568855285645,0.16513609886169434,4.019200801849365,0.06789016723632812,0.06820869445800781,0.05295372009277344,0.06847929954528809,0.05226778984069824 diff --git a/results/combined/merges_timed/oripa/oripa.csv b/results/combined/merges_timed/oripa/oripa.csv index d03ad63a61..48521f2b2d 100644 --- a/results/combined/merges_timed/oripa/oripa.csv +++ b/results/combined/merges_timed/oripa/oripa.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 53,refs/heads/master,25e1fea57c97de9aa64f142cda6b22ed297dbc41,930f2deaaafe7efcf267b3f7e852b6d5ac1bbf7f,82115e639094e2344560ce153a01db190704cc2e,,True,True,True,18,39,428,2,True,18,Tests_passed,c6e140ef4dd3f47fbc5c3996d529e906ab6026b45e597f582094faaf6af31e9b,True,Tests_passed,d4e91e2455f29039364addf890e824c193b4044c28826cef1a358adf584867cd,True,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_failed,56f0eab00643b7e552219250878f7b0e27f083619719c9d7c3aefee17e7a935c,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,0.03892326354980469,0.05414319038391113,0.062259674072265625,0.05934023857116699,0.05315566062927246,0.05780172348022461,0.053087711334228516,0.20013022422790527,0.12045001983642578,1.87746000289917,0.7705116271972656,0.08486700057983398,0.1395399570465088,0.053282737731933594,0.048364877700805664,0.04767203330993652,0.05372762680053711,0.049249887466430664,0.09075570106506348,1.7832667827606201,0.048015594482421875,0.04897499084472656,0.04351687431335449,0.04789137840270996,0.04232311248779297 diff --git a/results/combined/merges_timed/oskopek/javaanpr.csv b/results/combined/merges_timed/oskopek/javaanpr.csv index 9e2eaf33f8..21bc8c6ac8 100644 --- a/results/combined/merges_timed/oskopek/javaanpr.csv +++ b/results/combined/merges_timed/oskopek/javaanpr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,d8e3efe215d03370603b5f74c2cde7761bda9eec,8738dcd19876a92ef2f84746471bd9df055ed0c8,6f1735d0c9d701c91cbf76ced9f2ebdd211ab8ed,,True,True,True,14,89,663,2,True,14,Tests_passed,2ebc928da4059bbb6123846d0c5a53eb9a351bcbe3a3c275da92b883bf88450b,True,Tests_passed,5d84845fc36fb3b254ef9317230a76e3260857a09fbd8f445e49ec9b5e3b40f1,True,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,de677c57f8faedfa60a9c8c5c1009a1b0cd7c65d0bc7bbf5f4977d77a31af2df,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,Tests_failed,77f501577b0edd36e02bbd6de7238883e7db3a3827eacc620903daa5ca71afe8,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,a93ead2adbd6e5d6fbde24cb9e0abbc8f70d1d0d0519afd2897e111a2938536f,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,0.05127120018005371,0.051033735275268555,0.061676025390625,0.010232686996459961,0.06185483932495117,0.06167292594909668,0.06154346466064453,0.10267281532287598,0.11104345321655273,0.05410504341125488,0.5808568000793457,0.0970454216003418,0.19487476348876953,0.10921859741210938,0.03609347343444824,0.1045522689819336,0.10423541069030762,0.036808013916015625,0.14897775650024414,0.12622928619384766,0.036330461502075195,0.0930473804473877,0.03470277786254883,0.09340906143188477,0.034712791442871094 diff --git a/results/combined/merges_timed/outbrain/ob1k.csv b/results/combined/merges_timed/outbrain/ob1k.csv index 22f2ff27fe..98b4715692 100644 --- a/results/combined/merges_timed/outbrain/ob1k.csv +++ b/results/combined/merges_timed/outbrain/ob1k.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 65,refs/heads/master,8b2c257efe1aa01d49cc595d4af6f8d386d9b535,95c48c0fde2cbf37c4f074a0f38201acd2c7eae2,59da0517716f701678301ecb4cdb88f7046c8d26,,True,True,True,78,128,1869,2,True,78,Tests_passed,f145b2ae80a7ea5341bcb8457cd401440a0ff2199a11922d2a1341dcb7cd270d,True,Tests_passed,a6a20fdb76c4dd47788113f767bd7d533858319364d44fda4211f89eca78d96d,True,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,460c06e1d80c310d8283982ab2e16bcdbe37306d56ab7682870a5938fad5d53b,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,4d69243853cd7bb4a39daa9eed68b1dec4c9b7e4e3dfc5541fe8ea0111c142d1,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,671f7d6437a497c032f83eb4ef323b572bd56c875af67d57659bfc9a22e8f74c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,0.02040243148803711,0.020055532455444336,0.013815879821777344,0.022133588790893555,0.02260112762451172,0.014535903930664062,0.02242302894592285,0.05239534378051758,0.08128786087036133,0.504547119140625,0.799095630645752,0.11019492149353027,0.14114093780517578,0.04293251037597656,0.053046464920043945,0.04324698448181152,0.05596661567687988,0.05600690841674805,0.07568740844726562,0.550368070602417,0.051874637603759766,0.04095625877380371,0.054410696029663086,0.04366731643676758,0.053328514099121094 diff --git a/results/combined/merges_timed/overturetool/overture.csv b/results/combined/merges_timed/overturetool/overture.csv index e96c0d46eb..b44a18e0f2 100644 --- a/results/combined/merges_timed/overturetool/overture.csv +++ b/results/combined/merges_timed/overturetool/overture.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 28,refs/heads/development,183044a608970fa550c097fdd98216a182cc895d,e26838e2314cf90205c0a7ce585ff32e36e094c7,b74341db16ec8531f59a05cf585979e5fee8787f,,True,True,True,158,1228,4154.0,11,True,158,Tests_passed,d858bc6f5d2452adc0be0ae78cde16890176b452dd14798e88f6cb5f6c4de24f,True,Tests_passed,45a87b3dfd9994dafc029a2f3e20f0f9042725ff9f06e5d3b283fb6260ff2feb,True,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_failed,93de5cf77822d18faeaec1579494ef7bc9d4c588bd999f4fc2b9b6588b43d4af,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,0.09988856315612793,0.10146570205688477,0.12189722061157227,0.12436246871948242,0.12240982055664062,0.1214902400970459,0.1262073516845703,0.40166163444519043,0.6319694519042969,0.10422801971435547,11.3321852684021,0.5168366432189941,0.3262338638305664,0.28468918800354004,0.2888925075531006,0.2759866714477539,0.2810633182525635,0.2852210998535156,0.6160380840301514,0.2970864772796631,0.2599601745605469,0.26644277572631836,0.18201565742492676,0.2549777030944824,0.18173599243164062 diff --git a/results/combined/merges_timed/oxo42/stateless4j.csv b/results/combined/merges_timed/oxo42/stateless4j.csv index 8e6d59de3c..4f9aae91db 100644 --- a/results/combined/merges_timed/oxo42/stateless4j.csv +++ b/results/combined/merges_timed/oxo42/stateless4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,7024c77da6e879210442dfc38327f1aac8d00916,57c2134c01d9d66e19410f0322c8ca9a9f362ca5,6b6dd4a788a4eb9d3e0542634cf1fc587d1fb58b,,True,True,Tests_passed,c892f00d53dd4912601be5883ccc7fe003935a44842ff932d18d3dc04e919c09,True,26,95,1316,3,True,Tests_passed,5f23ce7410ccecc5c86db3beee1764ef814b107abe899af96c8e446eb23d936f,True,26,True,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,f27ed3b1992c9fdcb18968c4516d883587373285982a64d1058e357b00ca6727,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,0808ce0f2744120173ffb2a40826bb334aa123c2fb6adc4f797a4ae3694d5d7f,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,4a728de94f2a14c774db4bb052385064201d6b58a5bdbc75a676d962c4d0e52f,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,0.013473033905029297,0.03914332389831543,0.011664390563964844,0.047911882400512695,0.04710578918457031,0.04133200645446777,0.04819345474243164,0.0589754581451416,0.15472054481506348,1.7773280143737793,0.6486520767211914,0.10590696334838867,0.12322616577148438,0.04292893409729004,0.044232845306396484,0.04389190673828125,0.04394698143005371,0.0436248779296875,0.0926976203918457,1.7579154968261719,0.043407440185546875,0.044411420822143555,0.034532785415649414,0.0430598258972168,0.03459358215332031 diff --git a/results/combined/merges_timed/pablissimo/sonartsplugin.csv b/results/combined/merges_timed/pablissimo/sonartsplugin.csv index 2efe180045..6c5e9523ad 100644 --- a/results/combined/merges_timed/pablissimo/sonartsplugin.csv +++ b/results/combined/merges_timed/pablissimo/sonartsplugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,21c5ac9cfd807b5575685ea58ea31f243afeb018,83fb48d7c14e86b310a38ae7b59201678db9583a,63c9fea3fce9e42d6c1303ee4cd1e05ea53fe9ba,,True,True,True,47,306,3724,5,True,47,Tests_passed,272cf78fa4a833425a7668420e3a1393a4a21114b99b4b15b8641947d840e296,True,Tests_passed,05e66d8eeae44e91d5493390c40e15d5df73852c230dbbdd2d7a6b59f72eba1e,True,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,f8011f3261e21fe035c7449dac46cd0fef389a7e7b1eea43c33229d8afe33c1c,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,e9ff7611659e133b1730900363aff4d8335067e2096cc1410b822b1fabec200a,Merge_failed,a06c3af1448702c4f4c88b072cd3014d952b276cf62029d4715fc96216d869de,Merge_failed,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Tests_failed,886646bf8a6d0aa492a5c533919b4e5d75e9d8f016f389a38370e6ffe38b9828,Merge_failed,66aff4927abec456854ded97b6a517f572837b04bf6b258de05ac5e20ab240c9,Merge_failed,6c57d66728ef2eea131c2abf90e90c740dcac5c31ebc54b728387ebdb3d9041b,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,f8011f3261e21fe035c7449dac46cd0fef389a7e7b1eea43c33229d8afe33c1c,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,71a6118fa9009b8581aedbbee80f54ba3491ce422b1fc512d52d405faaee44b1,Merge_failed,e9ff7611659e133b1730900363aff4d8335067e2096cc1410b822b1fabec200a,Merge_failed,318ec80872b5be9922ea208edd5ebf364285e2d17682852e46ed39f27fc197c3,Tests_failed,886646bf8a6d0aa492a5c533919b4e5d75e9d8f016f389a38370e6ffe38b9828,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,efb52d48a397f7bc67edd1c1a64449a409d7c75ac321a581299e62b24fbcba31,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,Merge_failed,55959401ea2a338613b4d788d8c2343d9c79cfb089ce93e3451249ca0619845e,0.01019597053527832,0.01032876968383789,0.01031041145324707,0.01037740707397461,0.010779380798339844,0.010555505752563477,0.010591268539428711,0.07050776481628418,0.2378370761871338,3.1889634132385254,-1.0,0.17546677589416504,0.14345049858093262,0.06066179275512695,0.0592343807220459,0.058439016342163086,0.05910611152648926,0.059021711349487305,0.13857746124267578,3.256157398223877,0.058589935302734375,0.05916094779968262,0.04203343391418457,0.05898857116699219,0.042310476303100586 diff --git a/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv b/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv index 940a0c7dc4..aa5b6c454f 100644 --- a/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv +++ b/results/combined/merges_timed/pagehelper/mybatis-pagehelper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,True,213,457,2960,2,True,213,Tests_passed,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,True,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,True,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,0.040831804275512695,0.041558265686035156,0.05763840675354004,0.02368450164794922,0.05775141716003418,0.02333521842956543,0.05723166465759277,0.05316472053527832,0.07686138153076172,0.9904115200042725,1.532193899154663,0.10200023651123047,0.16491293907165527,0.11238527297973633,0.11168980598449707,0.11004948616027832,0.11413979530334473,0.11573171615600586,0.16322994232177734,0.904000997543335,0.06218242645263672,0.08013582229614258,0.06222796440124512,0.07680082321166992,0.0912930965423584 diff --git a/results/combined/merges_timed/pandcorps/pandam.csv b/results/combined/merges_timed/pandcorps/pandam.csv index f2309b2181..e11fc8edc7 100644 --- a/results/combined/merges_timed/pandcorps/pandam.csv +++ b/results/combined/merges_timed/pandcorps/pandam.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/remotes/origin/pull/4,e736609b61dd04e3f96861471d01ae60cc1a2a17,30964f94cc1b51cbcce298f904db4b8ffe4e4b92,75dbac355e592d1e833162770e5a10dcd855a6f7,,True,True,True,32,101,751,2,True,32,Tests_passed,4163be707dba47263e222b36826e25c78ec7591130d0e139cc7b76c376f2b871,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,0.04679727554321289,0.050315141677856445,0.06716060638427734,0.06342411041259766,0.06045174598693848,0.04166388511657715,0.0744321346282959,0.20893239974975586,0.12561917304992676,2.8711061477661133,1.7033941745758057,0.0968170166015625,0.15695595741271973,0.061821937561035156,0.06128239631652832,0.06178140640258789,0.06421613693237305,0.0629572868347168,0.10592365264892578,2.6309397220611572,0.062044382095336914,0.06247377395629883,0.05321073532104492,0.06196236610412598,0.05065608024597168 diff --git a/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv b/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv index d858b7058c..9d12062362 100644 --- a/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv +++ b/results/combined/merges_timed/pauloricardomg/cassandra-list-subranges.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,3ce571f04ef9f3edd662c1de88ce5031fe700fd5,6d92e44549d058b29ab9d5364655d07ed522cbe1,0229efddf3f332210b4ca3f071e3d0d0160ba39a,,True,True,Tests_passed,28c8f53d23357fbb6114098f4789b14497f750ef57c8e179ffe9ff98c44e1961,True,2,9,26,2,True,Tests_passed,24b23da3ffa9aaca3c8f982daf70d7b1babe0d27de17607e60c692f678e2bd3f,True,2,True,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,0.03734540939331055,0.03682994842529297,0.03758955001831055,0.03486919403076172,0.04068350791931152,0.03925800323486328,0.036895036697387695,0.10448431968688965,0.11121034622192383,0.7201402187347412,0.34188389778137207,0.06489920616149902,0.11954665184020996,0.035587310791015625,0.035875797271728516,0.03560948371887207,0.03536033630371094,0.03555917739868164,0.06647992134094238,0.6859316825866699,0.03604769706726074,0.03563952445983887,0.025110960006713867,0.035871267318725586,0.025246858596801758 diff --git a/results/combined/merges_timed/paulosuzart/jtornado.csv b/results/combined/merges_timed/paulosuzart/jtornado.csv index 4528b76721..32a810a443 100644 --- a/results/combined/merges_timed/paulosuzart/jtornado.csv +++ b/results/combined/merges_timed/paulosuzart/jtornado.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,9422d8460228615b9a4e005a44ee70d022eab1e4,cf843699996539a0fc61bdaa6854ff4f65ffabff,e6790e95d502a20445aad19b2770ff36ea365932,,True,False,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,True,4,18,74,2,True,Tests_passed,5d294e257ae9233daf5b86ddcae1d21da2ff5f30a14d8e0ac82af6b70328c26d,True,4,True,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,152a1d15a19594fc1752345a6912ab253d866815521d8a04586581eb62a3c5ae,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Tests_failed,243ec1745f6f7b66095c5d4bb23ebc3bfef88f519d3aa5ded383291d2938a942,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,d52f9cf5e948fe68f2b69efdca9505249236f1a6b1f0a61b1b88d785470ca287,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,0.039136409759521484,0.042028188705444336,0.037821054458618164,0.043111324310302734,0.03915047645568848,0.03924441337585449,0.031238317489624023,0.16216182708740234,0.1154944896697998,1.0975360870361328,0.3451094627380371,0.07145285606384277,0.11102056503295898,0.032265424728393555,0.03773069381713867,0.03220176696777344,0.03218793869018555,0.032657623291015625,0.06351232528686523,1.0717182159423828,0.032532453536987305,0.036660194396972656,0.03049159049987793,0.033098697662353516,0.03143763542175293 diff --git a/results/combined/merges_timed/pax95/camel-ironmq.csv b/results/combined/merges_timed/pax95/camel-ironmq.csv index a248aa5bf8..afc22947ce 100644 --- a/results/combined/merges_timed/pax95/camel-ironmq.csv +++ b/results/combined/merges_timed/pax95/camel-ironmq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,7b8e755aa410ddd2841a5471f78bf5256a647b76,99829bacd2e267749b108a0f43d791aff9c73961,2f1b5ad99c6b72f8e20e336c7d3dd2dc1b65abf2,,True,True,Tests_passed,e4f3b91ad8e832a90f5c2b0148860f7e21b51b0706800fc2741d9a5baaecdd36,True,22,111,665,8,True,Tests_passed,98bcac037fb4c79e39fa1777ec31e445378cbff424321345108d18c5f41bd722,True,24,True,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,52b5479eb7acce0e533ee45008c2270ae29371f4e989d8348f7b6a6a61a3dbf5,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,e058ee915396897c34c409293d8be54f2f52936fd2925fc9fd348f30f3660bfd,Merge_failed,8e5c76fd46add4ac468e9323562bcb40462ba2485ffb92079649c0bdf1a30df1,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,ed5b500682aabf20c025abe3b9971ba489058ea9f2a8a3d476f842cc1aebf25d,Merge_failed,b0a1e42726088f33da5d8a94e97ea89f889a48ca3bd0851589f7c63ecfec8d4c,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,0.009878158569335938,0.0095977783203125,0.009421110153198242,0.00876307487487793,0.008942127227783203,0.008879661560058594,0.008962154388427734,0.07873725891113281,0.2902796268463135,2.179783344268799,0.5658431053161621,0.2089555263519287,0.14153766632080078,0.05948996543884277,0.06052803993225098,0.06012129783630371,0.060521841049194336,0.06049346923828125,0.15516233444213867,2.3030459880828857,0.061739206314086914,0.0619206428527832,0.05240893363952637,0.05989670753479004,0.053086280822753906 diff --git a/results/combined/merges_timed/pedrovgs/algorithms.csv b/results/combined/merges_timed/pedrovgs/algorithms.csv index 9b2248747b..f82d888816 100644 --- a/results/combined/merges_timed/pedrovgs/algorithms.csv +++ b/results/combined/merges_timed/pedrovgs/algorithms.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,True,3,10,78,4,True,4,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,0f989663818299a0c7aa64adc393891dae1962999465d1cf62fc88d3ba0b1cec,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,0.03966784477233887,0.045026302337646484,0.026703596115112305,0.030169010162353516,0.03470635414123535,0.014301300048828125,0.04409193992614746,0.2263469696044922,0.16540098190307617,0.8052289485931396,0.2341928482055664,0.09201836585998535,0.12483525276184082,0.03558635711669922,0.04189109802246094,0.04307746887207031,0.03494858741760254,0.04503607749938965,0.09232854843139648,0.7968060970306396,0.04318428039550781,0.04020857810974121,0.04391765594482422,0.04008841514587402,0.04198503494262695 diff --git a/results/combined/merges_timed/peterisp/morphology.csv b/results/combined/merges_timed/peterisp/morphology.csv index 7977beb641..84be331a85 100644 --- a/results/combined/merges_timed/peterisp/morphology.csv +++ b/results/combined/merges_timed/peterisp/morphology.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,a6926c1c59e119a57a1b37a5a896bddb02cd5ef9,fc238776a6699ed0e57b7a2660b05020c80fb170,100aa04cee519d67271e308427467c03d852ad8c,,True,True,True,43,54928,556327,2,True,43,Tests_passed,86456b028f28be961d7e6ebeb547e6b33ffdf27b7d2f02f080b813d071368865,True,Tests_passed,11a7cb449fc3a5d86fc81f324fca40bef6f0fb929604e610fe2901494bd30dc8,True,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,916a4be8953444f0729c45dca965019d62680d6dbdc9352d3a1654092bc94c8d,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Tests_failed,294dcdd0ea20ee90f6227445b6b7f6127abbe02fcc3ca58106c7864b39b3387f,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,b5bb26ae93ba80cda112e7679e3da9000c8ad97a316596995b550be82dad685a,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,0.414808988571167,0.4120800495147705,0.47051215171813965,0.4759857654571533,0.48722004890441895,0.48494553565979004,0.47371888160705566,0.6412079334259033,0.469799280166626,3.270989418029785,3.2965145111083984,0.7065112590789795,0.7399227619171143,0.5904204845428467,0.5884301662445068,0.5872130393981934,0.5815868377685547,0.586737871170044,0.6941652297973633,3.155036687850952,0.5276594161987305,0.5237932205200195,0.5992381572723389,0.5268032550811768,0.598452091217041 diff --git a/results/combined/merges_timed/petitparser/java-petitparser.csv b/results/combined/merges_timed/petitparser/java-petitparser.csv index 9a3087d12d..cd75aae67a 100644 --- a/results/combined/merges_timed/petitparser/java-petitparser.csv +++ b/results/combined/merges_timed/petitparser/java-petitparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,18,89,800,5,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,19,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Tests_passed,6a90f4b7bc33e9f919ad85773990cabe2c91b61e9782786d2d7907fb2178e652,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7cb2ad7d0c4d0af9ef25a73048ab02b57b1fd70ae9f71c206f2d870e15bf7cf3,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,0.039159297943115234,0.04037356376647949,0.04064679145812988,0.015861988067626953,0.04466891288757324,0.033734798431396484,0.01953268051147461,0.30957603454589844,0.22362327575683594,1.4305689334869385,1.1271014213562012,0.13272571563720703,0.13357901573181152,0.05190587043762207,0.05352473258972168,0.051404714584350586,0.051839351654052734,0.051689863204956055,0.12022209167480469,1.3915505409240723,0.05194234848022461,0.051473140716552734,0.03716754913330078,0.05209183692932129,0.03651905059814453 diff --git a/results/combined/merges_timed/phaed420/simpleclans.csv b/results/combined/merges_timed/phaed420/simpleclans.csv index f449d236e2..50e31c1757 100644 --- a/results/combined/merges_timed/phaed420/simpleclans.csv +++ b/results/combined/merges_timed/phaed420/simpleclans.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 111,refs/remotes/origin/pull/578,a30dbb49985fd1da095e49ef9afe95b8857d0377,b331e2c236735dc0d9497d8214b16debd4fd1b14,baf71a449293a07b34179e49ee0de1bc9e7c7928,,True,True,True,47,111,5000.0,8,True,47,Tests_passed,762fe5002aa077cfcf3f7780ff3f95ed590c0badd0f944b35f16f72f73de587b,True,Tests_passed,8406011eca89cd6e530fdc63cbf413e753335818655784ac102c4c6b3f2ff0c1,True,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,3af903d5c239a61ee36f060ede655ae558e8d2ddbc41abcdd24c3270bb79a3e3,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,141949ab537fc49e25b64d8a57da96a142796467dfe693500c4ceb91886279bd,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,7870fe3eb1156afc583bb9e6c173f59563ef47ba8648b431b9045ad036eb7a14,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,0.016922712326049805,0.017435550689697266,0.018819808959960938,0.018440961837768555,0.01875925064086914,0.018866777420043945,0.018762826919555664,0.11476302146911621,0.3520810604095459,3.8980796337127686,0.9054200649261475,0.2522697448730469,0.16586804389953613,0.0882420539855957,0.08763480186462402,0.08834528923034668,0.08729863166809082,0.08679962158203125,0.2131030559539795,3.9660868644714355,0.08515095710754395,0.08484053611755371,0.061843156814575195,0.08546638488769531,0.0610201358795166 diff --git a/results/combined/merges_timed/phantomydn/wicket-orientdb.csv b/results/combined/merges_timed/phantomydn/wicket-orientdb.csv index e28256edd9..198427ac6f 100644 --- a/results/combined/merges_timed/phantomydn/wicket-orientdb.csv +++ b/results/combined/merges_timed/phantomydn/wicket-orientdb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/heads/master,19e9f8c8ff01f4ef6b39006032470baa83079eff,b7ebfd2dd8fc973b786f7c9222ab16a02db04750,ffa22e555317de565ad621df69faad83764e6d45,,True,True,True,6,9,116,2,True,6,Tests_passed,b2122492e7f0bc3e18ed7ce1df53cd90bb523f70c9186a3cdadadd949ddd6799,True,Tests_passed,e08cff51a5db84e0837c335f6c5cb3e9dd96d2ad114d121f2cb2d56ba23c34ec,True,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,ccac1cf65d870a8b3eb46ac0209a83b7372bfc1bd45e52c477967123013b800e,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Tests_failed,3dd8c7c6eadbdb193c8556b5812fa50c109d8d5ffd905b499cff64040217b872,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,fb821cc8ae6f44cd37f178f69b8c0c67e1c762d17f03e9287b2259b09cbb54ff,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,0.011815786361694336,0.011629819869995117,0.012526750564575195,0.01177215576171875,0.012380123138427734,0.012618303298950195,0.012526750564575195,0.038996219635009766,0.07094645500183105,0.7312419414520264,0.2877776622772217,0.07514452934265137,0.12259840965270996,0.04116678237915039,0.040285348892211914,0.04012012481689453,0.04103899002075195,0.03914141654968262,0.07333087921142578,0.7764565944671631,0.03872275352478027,0.039689064025878906,0.036923885345458984,0.04034781455993652,0.038787841796875 diff --git a/results/combined/merges_timed/phax/jcodemodel.csv b/results/combined/merges_timed/phax/jcodemodel.csv index 237d5bf2e4..f5273e7f97 100644 --- a/results/combined/merges_timed/phax/jcodemodel.csv +++ b/results/combined/merges_timed/phax/jcodemodel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,32486470c55c2a6b332600c7c693c47c9a91e7d5,3c1f47480aa985b1082bcc745d32f4651a507f00,b8d8fc639b766319a36039a4823d6d90767254ba,,True,True,True,199,203,1190,2,True,199,Tests_passed,f3ad7992197e97651fa975e95f4937615305d406301f7634661f014bb637f613,True,Tests_passed,eff388f4e1cd024d8b49700d9e4b226bce4d04e54da8d397de0b20af92f9ab79,True,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,0.0571746826171875,0.04491162300109863,0.0561518669128418,0.05173611640930176,0.05363059043884277,0.056411027908325195,0.05794382095336914,0.18787217140197754,0.11075305938720703,0.04973888397216797,1.389056921005249,0.1050271987915039,0.16864681243896484,0.07046723365783691,0.0746302604675293,0.07667040824890137,0.0713505744934082,0.07689046859741211,0.11848902702331543,0.08612847328186035,0.0688786506652832,0.06719803810119629,0.05885887145996094,0.06733441352844238,0.05877351760864258 diff --git a/results/combined/merges_timed/pholser/jopt-simple.csv b/results/combined/merges_timed/pholser/jopt-simple.csv index d652a34aa7..6e7c986fbb 100644 --- a/results/combined/merges_timed/pholser/jopt-simple.csv +++ b/results/combined/merges_timed/pholser/jopt-simple.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,bdcb06831908b4976afc88a67289839a25e7b826,b6e7208e6f31aef4caf048d85a9ee3dd635a44fc,57d378a716c24651b9226e600031ada43fdc4b40,,True,True,True,177,474,1451,5,True,177,Tests_passed,f5efd32cc9e53141f7a40a8398d82906162e50c92af11371ffb0ff305c172886,True,Tests_passed,3b0c81509fa20ef47627200900cdab74556dd22b90b915fbddb3856e9524140e,True,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_failed,29d5f6eec216260a80d9d2ca55ed9e690d98faf7e96712bcc481a49dce43bfaf,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,0.018728256225585938,0.01936793327331543,0.020748138427734375,0.021966934204101562,0.02269744873046875,0.022199392318725586,0.022182226181030273,0.09647417068481445,0.24457192420959473,2.4191038608551025,1.1108710765838623,0.18800020217895508,0.17530298233032227,0.08146309852600098,0.08330035209655762,0.08049249649047852,0.08076357841491699,0.0812840461730957,0.17463183403015137,2.190371036529541,0.07848954200744629,0.07852697372436523,0.04836010932922363,0.07638168334960938,0.046506643295288086 diff --git a/results/combined/merges_timed/pholser/junit-quickcheck.csv b/results/combined/merges_timed/pholser/junit-quickcheck.csv index e67eb55af0..488aed1004 100644 --- a/results/combined/merges_timed/pholser/junit-quickcheck.csv +++ b/results/combined/merges_timed/pholser/junit-quickcheck.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 50,refs/heads/master,82018eb390ce060d8e32a32961554f77973a92eb,d41d56b567fe3ddcb2da98f6a199d31c0fed5765,670a37e18b46b93c691cceea314f16ba719d2a47,,True,True,True,432,469,1217,5,True,432,Tests_passed,9788013b7efd4478965bbb84574c7b0274f51196e3c50306d5045739419d844e,True,Tests_passed,a7f5b56a9eb53f57e29671109c9cb74b400b5716c585d68f1d22f4b5cb58fe39,True,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.03385615348815918,0.04625105857849121,0.05042719841003418,0.0514223575592041,0.049298763275146484,0.053858041763305664,0.05949211120605469,0.3568844795227051,0.29055333137512207,3.0934879779815674,2.9443917274475098,0.20427989959716797,0.20500826835632324,0.10665440559387207,0.10646748542785645,0.10548615455627441,0.1050872802734375,0.1058955192565918,0.2116844654083252,3.0202088356018066,0.10041236877441406,0.10004115104675293,0.06608867645263672,0.10128521919250488,0.06929802894592285 diff --git a/results/combined/merges_timed/pires/obd-java-api.csv b/results/combined/merges_timed/pires/obd-java-api.csv index 6c42e1d661..999fb49884 100644 --- a/results/combined/merges_timed/pires/obd-java-api.csv +++ b/results/combined/merges_timed/pires/obd-java-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 51,refs/remotes/origin/pull/80,f755208227503c01478c10a0912fd469d0ec5d79,fb2058698022dc891446c1367a27a8be2356bb4b,8d61fd4c32fb3bf9d99c44b078fab8c8087b4b98,,True,True,True,10,25,259,4,True,10,Tests_passed,1e4e159a11ce06872aff10b6d1b59802a5e35c8d63b814d27778d3be6e0feb7d,True,Tests_passed,1c1ee8480eb4263a22ce92a609098eb0f6820b9a05a8291b1daf4401c368bbb8,True,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,f03dbfa05a0d36e7c029ea282f742bde703f929e510c466c916f5ecdd3ab69c2,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,0.041791677474975586,0.043460845947265625,0.0485539436340332,0.04334521293640137,0.04042387008666992,0.04159355163574219,0.0474400520324707,0.3143136501312256,0.23618769645690918,1.6029725074768066,0.39590930938720703,0.12498855590820312,0.12346601486206055,0.04500722885131836,0.044356584548950195,0.04480314254760742,0.04596900939941406,0.044064998626708984,0.11029577255249023,1.591435194015503,0.04458260536193848,0.04341006278991699,0.035509586334228516,0.04436182975769043,0.03582024574279785 diff --git a/results/combined/merges_timed/plaid/plaid-java.csv b/results/combined/merges_timed/plaid/plaid-java.csv index 5118edd80f..9c3bbaf29f 100644 --- a/results/combined/merges_timed/plaid/plaid-java.csv +++ b/results/combined/merges_timed/plaid/plaid-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 72,refs/remotes/origin/pull/130,5f856fdd6d1f3b51ce203c9ad056bc91471d939f,0bd56626ceb3d18c9d876dc91c1f4ae758eef0a8,abbf5df9c62aaa286ca14bacd418d05a55e9f8b7,,True,True,True,19,42,728,2,True,19,Tests_passed,c2c0e699cba818ee07aea888e5712469387d269bf32360cf5868de182e867eb4,True,Tests_passed,7efcfaed7d06ec6cd6d37cb4255c6ac00cab370f6905c5252a5107c2284b0584,True,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,0.05514383316040039,0.04605984687805176,0.03869152069091797,0.048285484313964844,0.01608896255493164,0.050669193267822266,0.03977680206298828,0.16525006294250488,0.11487770080566406,0.8094010353088379,0.4348793029785156,0.07771778106689453,0.14165902137756348,0.04854631423950195,0.04827570915222168,0.04822683334350586,0.04241466522216797,0.04862356185913086,0.08295130729675293,0.8376309871673584,0.04286527633666992,0.04536938667297363,0.03678774833679199,0.04430699348449707,0.03603315353393555 diff --git a/results/combined/merges_timed/plum-umd/rubah.csv b/results/combined/merges_timed/plum-umd/rubah.csv index 5efe6b5aa8..e16ebf0d5e 100644 --- a/results/combined/merges_timed/plum-umd/rubah.csv +++ b/results/combined/merges_timed/plum-umd/rubah.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/remotes/origin/pull/1,384485219562438c5abd5db59fdd0bc56061ae10,0d76b2beb5a7ea23a061221127be6e7b3ba30139,52adba8bdaf39255e685b0fee48887ccd1c4dd2f,,True,True,Tests_passed,78704f4ae6b8ef79870011f2a7bb2bf3c9a3db32d7453848720d0262ef2f55a3,True,40,268,1561,2,True,Tests_passed,b1a3a400daa2a5ffbe89e49c0fc9c886134027b526fa0ff42975a2b060af8de3,True,40,True,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_failed,4271582c4fe3884a7988fb1b2761e87f3c0b701f7afd89f46aba4c62bdeb3270,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,0.05342674255371094,0.03730154037475586,0.051659345626831055,0.061933040618896484,0.05410456657409668,0.0503230094909668,0.05350828170776367,0.17432117462158203,0.12256169319152832,0.7606844902038574,0.8141932487487793,0.09357929229736328,0.1471555233001709,0.05946516990661621,0.0610504150390625,0.04633665084838867,0.05938577651977539,0.06061553955078125,0.08165788650512695,0.7551355361938477,0.05673813819885254,0.05438852310180664,0.05048513412475586,0.05685997009277344,0.04766559600830078 diff --git a/results/combined/merges_timed/plutext/docx4j.csv b/results/combined/merges_timed/plutext/docx4j.csv index c0fe2f7a5a..f3bf516a77 100644 --- a/results/combined/merges_timed/plutext/docx4j.csv +++ b/results/combined/merges_timed/plutext/docx4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 129,refs/remotes/origin/pull/378,aa42a5b3f77c350916c1b790b26cb2633e9aa31c,80a43b991b62ac742367c51306a8aef824e5f415,6ee32d1afde00a15e72212e119322d81c4423deb,,True,True,True,58,146,6548,217,True,249,Tests_passed,2cdc23ee00a42fb287a38c24bc72aabd44e3daa5ee565c63e097c5337141c80e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Merge_timedout,,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,0.03621029853820801,0.03673434257507324,0.049668312072753906,0.049480438232421875,0.04985618591308594,0.049483537673950195,0.04905056953430176,0.05588817596435547,0.037664175033569336,0.03977847099304199,-1.0,0.2701687812805176,0.363262414932251,0.273728609085083,0.2745494842529297,0.26520824432373047,0.27210497856140137,0.27015233039855957,0.2783541679382324,0.2743194103240967,0.2585723400115967,0.25240135192871094,0.07921075820922852,0.25344276428222656,0.07790327072143555 diff --git a/results/combined/merges_timed/pmd/pmd.csv b/results/combined/merges_timed/pmd/pmd.csv index 08fa201a08..79673517f9 100644 --- a/results/combined/merges_timed/pmd/pmd.csv +++ b/results/combined/merges_timed/pmd/pmd.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,True,True,True,435,1197,8416.0,3,True,435,Tests_passed,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,True,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,True,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Merge_timedout,,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,0.04955315589904785,0.04905509948730469,0.06485319137573242,0.06600189208984375,0.06580257415771484,0.06609106063842773,0.06555461883544922,0.1255786418914795,0.1633446216583252,0.7231693267822266,-1.0,0.19666838645935059,0.2531909942626953,0.1374814510345459,0.1401989459991455,0.14084625244140625,0.13921666145324707,0.1396794319152832,0.20895910263061523,0.7345283031463623,0.12386679649353027,0.1238551139831543,0.10963582992553711,0.12769198417663574,0.11136269569396973 diff --git a/results/combined/merges_timed/poetix/protonpack.csv b/results/combined/merges_timed/poetix/protonpack.csv index 80ae77fc01..0735075794 100644 --- a/results/combined/merges_timed/poetix/protonpack.csv +++ b/results/combined/merges_timed/poetix/protonpack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,7f6e8773f8a428c8fbcee81aeaf42e04b45144c4,740db1ba99cc80ee8a2c54916e8e6975b629a276,65d9207fe1a022ef6151aaf0eff8a939c9083e12,,True,True,Tests_passed,fe1585c6430d0c6b8311be21f6957611b614db27f5337be349f76ad40d237de0,True,13,15,494,2,True,Tests_passed,8a4c04bec613b1a495bbb92ed4c4145aadce30e7553c6bbed6d91bbe8e409ced,True,13,True,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_failed,d2c7bd44758573b8c46dc302d5f9ecff2a7d72795b3503f9193c534c65b6934b,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,0.03695416450500488,0.03446793556213379,0.04493856430053711,0.04324054718017578,0.0479588508605957,0.04027962684631348,0.0364227294921875,0.16062402725219727,0.10717511177062988,0.8181695938110352,0.3046095371246338,0.0700070858001709,0.12584137916564941,0.03875470161437988,0.03826189041137695,0.04024553298950195,0.0393526554107666,0.039823055267333984,0.07205033302307129,0.7721290588378906,0.039703369140625,0.03918766975402832,0.028055667877197266,0.03932070732116699,0.028205156326293945 diff --git a/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv b/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv index 5e48c2180c..ac76ff34e5 100644 --- a/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv +++ b/results/combined/merges_timed/polopoly/jetty-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,bfc17aa246a1ff1e7c301d5a90f4101f82f8ec12,57be9f5949522592799d85e9760e748bc472a098,429f5db8ddccfba6827b259b8131eb64cbca7db2,,True,True,True,3,12,37,2,True,3,Tests_passed,da2a3914d2a8517695f29bf304ba892035004dcf7e960e27337e5a6f8931174c,True,Tests_passed,261126bb0dffb3e5730b1a54f72cdeb0945419aed050c1252ba9638e331fd87a,True,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_failed,e5c8e73840dc48ab41cba881927ee7ca067dac7b35c513f803c373ff7d04aa9d,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,0.031856536865234375,0.04558539390563965,0.03905224800109863,0.06144881248474121,0.02948760986328125,0.05935382843017578,0.024600982666015625,0.1719648838043213,0.10637426376342773,0.8127665519714355,0.2796182632446289,0.09111714363098145,0.14540362358093262,0.055750131607055664,0.055084943771362305,0.05493974685668945,0.05736684799194336,0.0548558235168457,0.0926520824432373,0.7907283306121826,0.05286717414855957,0.052918195724487305,0.04183244705200195,0.04853677749633789,0.04235577583312988 diff --git a/results/combined/merges_timed/pragmatists/junitparams.csv b/results/combined/merges_timed/pragmatists/junitparams.csv index c017e94b7b..5c5dadd352 100644 --- a/results/combined/merges_timed/pragmatists/junitparams.csv +++ b/results/combined/merges_timed/pragmatists/junitparams.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 46,refs/heads/master,8f6c13ae04b9f525f36e55c1dd881be14a246b59,4c5658534e52bb9da9b8d56d6c36890a91e21db3,1e33e02a72bcdee753a5bffcc10d4a35b75c2199,,True,True,True,18,102,883.0,2,True,18,Tests_passed,a216f59d9eeb40209d459cfaf936509e52c81c7b6c6a0a73067acc5b38c7f271,True,Tests_passed,531693458bda96633abc2bedb8b04c3219da1f1dbfbd0789218188866fdba637,True,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,54f80524f28c3de9444dc5fa7e8ecfdf34ef0e4ee20a3bb6fc8e997dfbeba2b7,Merge_failed,9e2c8a007aa9520294d052d208fa346500f6992e691bdb2872feb15991f9e60f,Tests_passed,d7c5d0ea6dcd60a12f705998975be2faa3fc9774a356d67fa8b7b563eaf2a75f,Tests_failed,8343367efe18f253b6c4f3afa1e35b1b12ba87a230f2a1625d113aacba707381,Merge_failed,9e2c8a007aa9520294d052d208fa346500f6992e691bdb2872feb15991f9e60f,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,ee2c58a6ac881479e3a3807f639e2740ec08e9726f638fe79337fb30f8e9c1fa,Tests_passed,d7c5d0ea6dcd60a12f705998975be2faa3fc9774a356d67fa8b7b563eaf2a75f,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,Merge_failed,d38e0fdfc31af187b96b09daaa00dd6be8a10e69dde59c08c0e2d3bf9f1a6056,0.04014158248901367,0.01605701446533203,0.0214688777923584,0.03995704650878906,0.04335331916809082,0.039109230041503906,0.04449963569641113,0.15265321731567383,0.1311655044555664,0.5802152156829834,0.5229718685150146,0.07991838455200195,0.1257171630859375,0.04397988319396973,0.04273247718811035,0.04440784454345703,0.043905019760131836,0.04394125938415527,0.07662177085876465,0.5888502597808838,0.04032635688781738,0.04284238815307617,0.04178905487060547,0.040918588638305664,0.04029440879821777 diff --git a/results/combined/merges_timed/premium-minds/billy.csv b/results/combined/merges_timed/premium-minds/billy.csv index 9a40b1189a..fef131c078 100644 --- a/results/combined/merges_timed/premium-minds/billy.csv +++ b/results/combined/merges_timed/premium-minds/billy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 50,refs/heads/master,b34f1fc12b6717091254cc8f8c6bc313bd2a3e38,4d7c765f34c6bd796695bded10da84ee2816d819,d113a54f81e5649a8137cb49e45313689ba7836d,,True,False,True,10,18,62.0,4,True,10,Tests_passed,7a11d2e79a1e3c09fa09674d26a46c79f386723ca13c68692d6a6534091cec08,True,Tests_passed,56561ebe92a2edad87948ea6cd1104ada423f36bfb6b22fbec7e5e6e3266325f,True,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,0.017379283905029297,0.01732778549194336,0.019989728927612305,0.020926952362060547,0.01982426643371582,0.02013230323791504,0.020589351654052734,0.08220624923706055,0.1791839599609375,5.928813934326172,0.8155767917633057,0.15438437461853027,0.17739486694335938,0.07594466209411621,0.07972073554992676,0.07954573631286621,0.07681775093078613,0.08052563667297363,0.15983986854553223,5.969412803649902,0.07431864738464355,0.07673048973083496,0.04744362831115723,0.0736076831817627,0.048642873764038086 diff --git a/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv b/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv index 6ae43a3f4e..a72b902f93 100644 --- a/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv +++ b/results/combined/merges_timed/premium-minds/pm-wicket-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 94,refs/heads/master,a73b5bf686d93a29daa3513d0e62422111b3f4b6,212b95bc3d85dfec1d2d2b27ac5d5b8a4aa06fc5,2d452fa3a767f08154527af54210a8ad5805df8f,,True,True,True,83,108,589,106,True,184,Tests_passed,fc764aa3f192b9fd407e04f01935db53dfd1f9717c171532598a11b078e9ee0f,True,Tests_passed,5908c5716fb0b2b2f61dd4c09596f8c033f8348170303b8f404464df31fdb921,True,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,75a1f68499badb8d65ecdcbd678870be39e444722ab6a390c41f27568616cb12,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,fdfbf64a53a31570235ac037f6f092b13a6c69b4ac6c9b4f6124735484de2d47,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,61be8359d0b5d1e6f294f2e43b54482a9f2086b054e839c27a390b00140beb62,Merge_failed,79973388288be6d2939b13a532cf1c5387b1743eb1a5f349fde600b0b9bd8d71,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,0.02253890037536621,0.022507429122924805,0.024704456329345703,0.024053573608398438,0.01761770248413086,0.02482008934020996,0.024268388748168945,0.08472084999084473,0.24028968811035156,1.3886172771453857,0.6472272872924805,0.1876990795135498,0.160261869430542,0.08163213729858398,0.08176851272583008,0.0812826156616211,0.08170056343078613,0.07008814811706543,0.16950178146362305,1.4383783340454102,0.07112598419189453,0.07185983657836914,0.054753780364990234,0.07847857475280762,0.05192279815673828 diff --git a/results/combined/merges_timed/prism/prism-bukkit.csv b/results/combined/merges_timed/prism/prism-bukkit.csv index 7229a5a436..73fc941f8c 100644 --- a/results/combined/merges_timed/prism/prism-bukkit.csv +++ b/results/combined/merges_timed/prism/prism-bukkit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 33,refs/heads/master,c9fd69aac937051cc93bbc7b62a22245e0ea33cd,4b5d8a5f750a9cbe1a58cf3f67be4d025cee8182,e99fcdd4ae5a93d7185c8b575d5f14e2d15e7a56,,True,True,True,29,173,876,5,True,29,Tests_passed,f1c99d40af6b068f88c0020020babe2d879bf3f0d172935054618aefbd5c57ee,True,Tests_passed,ac53fd399251fd9e5b9f928255372dbfc1d699060b1abef16bbe395986c83ddf,True,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,afe76c72e561928c929d4144aa319bc7cd8c88cf9d819d6d1467a8e812fbac66,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,62f288082642215af32434a6f7179ebe385d6fd9bde1d09f73ffeba8a476bee3,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,9c0b045e738ff6af1258d73e52463b6413f84242905b2185cabd8bead6940a0b,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,0.017651081085205078,0.01960158348083496,0.019744157791137695,0.023189306259155273,0.019907236099243164,0.019655942916870117,0.02040576934814453,0.0937964916229248,0.2356414794921875,3.619046926498413,0.8238646984100342,0.17144489288330078,0.15358710289001465,0.06380701065063477,0.08400154113769531,0.07373309135437012,0.06574392318725586,0.07671713829040527,0.1669168472290039,3.68609356880188,0.06853055953979492,0.08084774017333984,0.04892849922180176,0.06499075889587402,0.050203800201416016 diff --git a/results/combined/merges_timed/progether/jadventure.csv b/results/combined/merges_timed/progether/jadventure.csv index 07b4fb90b8..47ce8e64ee 100644 --- a/results/combined/merges_timed/progether/jadventure.csv +++ b/results/combined/merges_timed/progether/jadventure.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,7deca2169f09a5cc2f3701736396132d5f36f2a2,1628bc864e5bd45e8d99a75484adf7d317dada07,22eddd9a0a61f8c44eb2f504762cd811b54344f2,,True,True,Tests_passed,44973629f349af797bf1793a4ae08e5d130889e9d95c6c11b1cc1953fcc243ea,True,3,2,3,2,True,Tests_passed,5a626ac617c5fe94755cb45b8431e707543b176c34e89e8f96f99f3c2c873938,True,3,True,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_failed,ee8138068cc7a5b7a3a682cc49350b2680830ff7dd55b05699b665af26972e09,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,0.012983322143554688,0.012844562530517578,0.014133930206298828,0.01381373405456543,0.014107465744018555,0.014664173126220703,0.014070987701416016,0.042209625244140625,0.07049870491027832,0.8336226940155029,0.2818732261657715,0.07814669609069824,0.13930749893188477,0.04725289344787598,0.048571109771728516,0.04598402976989746,0.04745125770568848,0.047324419021606445,0.08339715003967285,0.8044247627258301,0.045893192291259766,0.046953678131103516,0.037503719329833984,0.047132015228271484,0.03559565544128418 diff --git a/results/combined/merges_timed/projectblueshift/blueshiftapi.csv b/results/combined/merges_timed/projectblueshift/blueshiftapi.csv index b1456c56d6..48ffb07d4e 100644 --- a/results/combined/merges_timed/projectblueshift/blueshiftapi.csv +++ b/results/combined/merges_timed/projectblueshift/blueshiftapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,9e18a10c3a100f154a2bf48d76421427c571330e758be5341b831d1f92f4ca40,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,0.047301292419433594,0.04222846031188965,0.04514932632446289,0.040122032165527344,0.03235435485839844,0.045581817626953125,0.046633243560791016,0.34291505813598633,0.29395461082458496,1.6473522186279297,0.3763124942779541,0.17135143280029297,0.1430802345275879,0.05514025688171387,0.06053471565246582,0.06197977066040039,0.056566476821899414,0.06267571449279785,0.1428520679473877,1.6177287101745605,0.05998086929321289,0.05540609359741211,0.060797691345214844,0.05711507797241211,0.06158781051635742 diff --git a/results/combined/merges_timed/projectdanube/xdi2.csv b/results/combined/merges_timed/projectdanube/xdi2.csv index 77a5291c83..2251ed83ee 100644 --- a/results/combined/merges_timed/projectdanube/xdi2.csv +++ b/results/combined/merges_timed/projectdanube/xdi2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 53,refs/heads/master,e9b5fa658b6b5429239c768233df8b2134740542,aa25d13cf1e1149ae2ead3b868a9ddbf904248d9,f0c3462c6222bfac8e95801e772edc20d7af740e,,True,True,True,35,106,356.0,2,True,35,Tests_passed,7a21ef5e8f6497e2c7fdbf2e055f79219ba718fc6779192fdba7350e0738a779,True,Tests_passed,af50781b94a9a3e1e6d431f0ba405fc4102e578b58552273829b0e0d4f452301,True,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,a4a13c0de15dc667130c1c7d9c83116bf8e31ccef45a1b820554a5fb23d4a455,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Tests_passed,1167ac88c3f1125a3a0936ff711185027122b96ca49bc9c7350e52f1e34a4d37,Tests_failed,e8a795ce8f4c3561b04e159a31ed7e96c819056906d3d78a4db0884c466ebfcc,Tests_passed,08839471bdba29828c0a035685b5a926df7dad0f1d7a4116d6e5429a6987b0ef,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,de00e5f70ec80b12d3e3b13c9ec720311ef1c4a5a525d581f80b5129d18deffa,Tests_passed,1167ac88c3f1125a3a0936ff711185027122b96ca49bc9c7350e52f1e34a4d37,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,Merge_failed,cd0cb93c6bd512bd1a9df31b40b169d64726c82d09bb468f33938f0b441dff42,0.054694414138793945,0.05677056312561035,0.05607295036315918,0.06301498413085938,0.0504155158996582,0.05533456802368164,0.055222511291503906,0.22943449020385742,0.12304878234863281,0.8093924522399902,1.017552137374878,0.09908795356750488,0.13158845901489258,0.045433759689331055,0.04575920104980469,0.04634428024291992,0.04664158821105957,0.04634380340576172,0.07826948165893555,0.7830920219421387,0.044773101806640625,0.044400691986083984,0.04435014724731445,0.044962167739868164,0.04427909851074219 diff --git a/results/combined/merges_timed/projectkorra/projectkorra.csv b/results/combined/merges_timed/projectkorra/projectkorra.csv index abdc2f8d67..ae73c03f1b 100644 --- a/results/combined/merges_timed/projectkorra/projectkorra.csv +++ b/results/combined/merges_timed/projectkorra/projectkorra.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 701,refs/remotes/origin/pull/961,dd6d1252c9301ab42113fcc18f215eaf8fc6eb96,a9c8c47cda20149f10db486d3dfb5139641864e7,b05b5122854df1818e39515742d15f11e6b840b3,,True,True,True,36,288,982,5,True,37,Tests_passed,a3895f4dba5e6155d6dc6c8b3f8a24d02d919068a4e4ec3f9e47278474667bec,True,Tests_passed,2f57d90a2ea360bb259e42f77de2bbc42c9ecc1c363a8bab42c7d8b06c05d6a7,True,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,1e3eefa444cac9650ef808c1496cec3df1b168fb787878f641722e16bebf01cf,Merge_failed,9bdc46bafddb9255d92de52d9ccf7988795dbba25f31ff5e8e09c7df82c365d5,Merge_failed,5d2fe22231461c0182612d572c60467acb522cb90fa7b6557502cb38bbd64ebd,Merge_failed,92d47e002f78107cc425a9ed44e34cdb712990bf7fc093bc1e19a373e561f689,Tests_failed,a017d6613cb664953eed07bfb30e06ddb577558e62a5006d847f2ed8a77a02e2,Merge_failed,5d2fe22231461c0182612d572c60467acb522cb90fa7b6557502cb38bbd64ebd,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,f33ab90970fa82c49e07f3f20fc31dcb07139a6ac37e93b357ea4c3b94d1d3b7,Merge_failed,1e3eefa444cac9650ef808c1496cec3df1b168fb787878f641722e16bebf01cf,Merge_failed,4262daeda542e9098eb69a5d38c55788c795cc4a422d53db314e604f15bbabdd,Merge_failed,92d47e002f78107cc425a9ed44e34cdb712990bf7fc093bc1e19a373e561f689,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,1d7556385d7378e594bd329f9bf5dde3e91760be996211db88e1011f4336ce4e,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,Merge_failed,5131e37ace3c4b5fe42417b1cf2caaba2224003bad1aa978a7d9494d4e326876,0.032308101654052734,0.02655315399169922,0.025826692581176758,0.042574167251586914,0.031633853912353516,0.03948259353637695,0.024959802627563477,0.3701155185699463,0.21459197998046875,3.6153440475463867,1.437159776687622,0.1535630226135254,0.14875555038452148,0.06636571884155273,0.07302427291870117,0.06465697288513184,0.06382918357849121,0.06563377380371094,0.13476872444152832,3.4497156143188477,0.06371855735778809,0.06248879432678223,0.054178476333618164,0.06350064277648926,0.05334138870239258 diff --git a/results/combined/merges_timed/ptgoetz/storm-hdfs.csv b/results/combined/merges_timed/ptgoetz/storm-hdfs.csv index 826de51398..0b4c5ef431 100644 --- a/results/combined/merges_timed/ptgoetz/storm-hdfs.csv +++ b/results/combined/merges_timed/ptgoetz/storm-hdfs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/remotes/origin/pull/14,563b4340f350a93c9efb6a6991b8028d16144345,8007c40b349f8cdedbf10f95bd480db1cdbc86a3,be5eae3bcc07cfbaf49c19c57da42dac1351a3e3,,True,True,True,9,48,315,4,True,9,Tests_passed,e65dcd2daa1f316f295653444319c789f75f86ef6d433bc6803de8e994e81f27,True,Tests_passed,23795b9ee2753e1d584e00ec6fba7972b95b74e61d5218279564f331688d9f85,True,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,0.03601527214050293,0.04451775550842285,0.041697025299072266,0.0526881217956543,0.04684734344482422,0.048070430755615234,0.04725837707519531,0.2977323532104492,0.2156987190246582,1.6960506439208984,0.3498821258544922,0.13969135284423828,0.1418001651763916,0.05498981475830078,0.05672430992126465,0.055971384048461914,0.055715322494506836,0.055506229400634766,0.12273454666137695,1.717392921447754,0.05461692810058594,0.05657362937927246,0.029755592346191406,0.05530810356140137,0.030034780502319336 diff --git a/results/combined/merges_timed/pydio/pydio-sdk-java.csv b/results/combined/merges_timed/pydio/pydio-sdk-java.csv index fc816d3d12..eb0e29a0aa 100644 --- a/results/combined/merges_timed/pydio/pydio-sdk-java.csv +++ b/results/combined/merges_timed/pydio/pydio-sdk-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/develop,29da20204a34f94644314baa2da9f9c436c3597f,dc81ee556594723f2ee47b2d264bd74f2874d3f5,5f7420e9df2f3a9a6b9908f0cada5be9930a5f27,,True,False,Tests_passed,55187d38795f66b3594e2b1931f9e059bc7a8cd51948c799ba88fca72a959767,True,4,19,69,2,True,Tests_passed,3a040643ace61f3a5682c6def579f7805282f5645df08f17344d2da32a436a5a,True,4,True,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_failed,04794da4bd4c21a82943fcf932cec8048b89dbc3925d45d4c7604ebd2aa6e90b,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,0.03952503204345703,0.037337303161621094,0.0434873104095459,0.04748988151550293,0.0398409366607666,0.04028034210205078,0.04524064064025879,0.17040705680847168,0.11426711082458496,1.32769775390625,0.3493971824645996,0.07046079635620117,0.1245720386505127,0.04050707817077637,0.04073023796081543,0.038652658462524414,0.040341854095458984,0.039138078689575195,0.07158327102661133,1.2747414112091064,0.03976082801818848,0.039730072021484375,0.0278778076171875,0.03938913345336914,0.028420209884643555 diff --git a/results/combined/merges_timed/pyknic/codegen.csv b/results/combined/merges_timed/pyknic/codegen.csv index 76ab4008e4..e43f8cfda8 100644 --- a/results/combined/merges_timed/pyknic/codegen.csv +++ b/results/combined/merges_timed/pyknic/codegen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,3e0d4067f68ebf4163e850c7031571271b4893e0,c0a3be22b99918411b41e1e075253e928079c2ea,cc625538048bd84c0763de49f8cceda5f40b9cc7,,True,True,Tests_passed,e5b84acceeb2830bb1ab1d622d07db01610bb2f3b652ac09dbfd2f729aefb7a0,True,146,1034,5810,25,True,Tests_passed,746c55dcd348adf7169a334ad98e005a4205ec95baa1657ddd17fdef75ba84f4,True,152,True,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,51c0153f0de5a337c6a1fb9546b38866dd97633fb2f59242f83cfa6a891fa731,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Tests_failed,3c4f902f354f00a3f8f3ca65277c63a22ddc50d4e35da6e2870a816b99ccec8a,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,37d4e06fcb388d3f0f4ee5b3b847d114c15cee1d68b3e6d8d7ba7a872bd4157e,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,0.03583264350891113,0.03908681869506836,0.019222259521484375,0.018906354904174805,0.01874256134033203,0.0185849666595459,0.018709421157836914,0.8446898460388184,1.1810507774353027,10.156453371047974,1.1525278091430664,0.6844446659088135,0.2584567070007324,0.17202520370483398,0.17307329177856445,0.174407958984375,0.1748976707458496,0.1710352897644043,0.5150940418243408,9.87962293624878,0.17379403114318848,0.17522096633911133,0.10927891731262207,0.1747574806213379,0.10912203788757324 diff --git a/results/combined/merges_timed/qcadoo/mes.csv b/results/combined/merges_timed/qcadoo/mes.csv index 9bacd5eabd..571dd07a7e 100644 --- a/results/combined/merges_timed/qcadoo/mes.csv +++ b/results/combined/merges_timed/qcadoo/mes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1544,refs/heads/master,5a3300ac9087e80293dbab93d59b7bf559fb509a,9cbec5446d2c3392b8157222c8647612cd334d10,8d80a80050e179194d2592eb31cb9b78050d0c08,,True,True,True,15,29,140.0,2,True,15,Tests_passed,089bb19bf37d52e1b2fe510387735908704f583bf5423373db1ce3fa0c265ad4,True,Tests_passed,6e695137456e4fc2b462063091281316b5b8edad35d1ac259012452092746a2a,True,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,3748fda02f177071531da5a7169b02a5a6a9339303d2950716d6096e965bcd56,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,Tests_passed,fa7318feaadba3ee4e1247accceb02529e07ed736f7fef18f20419db2538e0b0,0.01837301254272461,0.011696577072143555,0.02417898178100586,0.02376103401184082,0.023353099822998047,0.02355027198791504,0.011115074157714844,0.05362439155578613,0.07412385940551758,0.8565731048583984,0.5020146369934082,0.10562872886657715,0.14595794677734375,0.06475424766540527,0.0682973861694336,0.06768441200256348,0.0560302734375,0.06865835189819336,0.10481429100036621,0.8861231803894043,0.06293344497680664,0.06357002258300781,0.05393195152282715,0.043680667877197266,0.05181288719177246 diff --git a/results/combined/merges_timed/qihoo360/xlearning.csv b/results/combined/merges_timed/qihoo360/xlearning.csv index 7b3ad79df6..8655e93f4b 100644 --- a/results/combined/merges_timed/qihoo360/xlearning.csv +++ b/results/combined/merges_timed/qihoo360/xlearning.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,True,9,14,67,2,True,9,Tests_passed,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,True,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,True,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_failed,f226a5740dab6f70aa0626b650fcfabf965aedc84240c2f158477199e61f2b48,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,0.04380655288696289,0.04984688758850098,0.05139327049255371,0.04793262481689453,0.04714512825012207,0.04538917541503906,0.054291486740112305,0.16465163230895996,0.12756013870239258,2.479236125946045,0.6234662532806396,0.0754852294921875,0.12861347198486328,0.042903900146484375,0.044465065002441406,0.04247927665710449,0.04363512992858887,0.04286932945251465,0.07770109176635742,2.263261556625366,0.04325985908508301,0.0429997444152832,0.031160354614257812,0.04276871681213379,0.030575275421142578 diff --git a/results/combined/merges_timed/qubole/presto-udfs.csv b/results/combined/merges_timed/qubole/presto-udfs.csv index 232b40f177..aac4ab7a95 100644 --- a/results/combined/merges_timed/qubole/presto-udfs.csv +++ b/results/combined/merges_timed/qubole/presto-udfs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/6,4079746bcf5db1be249f4cab5cc8dfdd71961c4c,ea67e78dbcb8e5814bef147200ca386140286494,d178b8e62619906b2405b974facb07d565a0e26c,,True,True,True,2,11,111,5,True,5,Tests_passed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,True,Tests_passed,c09e3820fb0eaabc87977c3bce3c15bb23692857af2c578944fe8056b690745c,True,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,b1ce8b983657c6d6b72a193668b73355e15a20f3806ac7a1c6c82c34fd8aede0,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,0.007806301116943359,0.008121252059936523,0.007941007614135742,0.007681608200073242,0.007650613784790039,0.007485389709472656,0.007800102233886719,0.03119635581970215,0.06455469131469727,0.6087543964385986,0.363067626953125,0.0622248649597168,0.10791587829589844,0.02996659278869629,0.029468059539794922,0.02917170524597168,0.02980637550354004,0.03001546859741211,0.06192517280578613,0.6317839622497559,0.029519081115722656,0.030156612396240234,0.028304576873779297,0.030084848403930664,0.028969764709472656 diff --git a/results/combined/merges_timed/querydsl/apt-maven-plugin.csv b/results/combined/merges_timed/querydsl/apt-maven-plugin.csv index c1c37c069e..b54d33cb6a 100644 --- a/results/combined/merges_timed/querydsl/apt-maven-plugin.csv +++ b/results/combined/merges_timed/querydsl/apt-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,a665fd53a68969af9effa507810b58a4f3aa5f8b,dbb7382379247c709a4b6194e0789a7f9d4bbe39,ba0b58a11190f93a62992908bbdc2bb201ce57bd,,True,True,True,4,14,70,2,True,4,Tests_passed,e99cdecd632bb5bcab00d309f785e200449f0ce754412ae2d6e29a3dde0c0803,True,Tests_passed,1a926c173a71ba675eb682ecf9b40e8784211a5d8ec731343c50373a50a5a090,True,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_failed,0d9f5ba5dfbd45d823e3fe15ff56999c7db30cbf14db780837bd195d6da4bbf2,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,0.039708852767944336,0.04330086708068848,0.04273343086242676,0.03950619697570801,0.04420661926269531,0.04340076446533203,0.04450249671936035,0.09470343589782715,0.09827828407287598,0.8316278457641602,0.32596349716186523,0.06552505493164062,0.12247896194458008,0.03718900680541992,0.0372774600982666,0.03704690933227539,0.03708982467651367,0.037161827087402344,0.06967616081237793,0.7979331016540527,0.03788423538208008,0.03800010681152344,0.027010202407836914,0.03686332702636719,0.027005672454833984 diff --git a/results/combined/merges_timed/qunarcorp/qmq.csv b/results/combined/merges_timed/qunarcorp/qmq.csv index 3db6ca8278..594a205869 100644 --- a/results/combined/merges_timed/qunarcorp/qmq.csv +++ b/results/combined/merges_timed/qunarcorp/qmq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,True,988,2973,40595.0,2,True,988,Tests_passed,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,True,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,True,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,6bf187bb1f9f17744328185f25a5af5102a0e5362f19eae8fcae9730e19962c0,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Tests_failed,97512a5ba23c77db07f95565e2a490c3f153cfc978a0f0b54d40679f37fe7bc7,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,1766fdb39419d15aee1ddb77cba52c567f8576a1767d2d8572670b2a0e3db964,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,0.06831073760986328,0.0698542594909668,0.08614349365234375,0.08961105346679688,0.07843828201293945,0.08429408073425293,0.08479857444763184,0.15212368965148926,0.1692051887512207,0.6770317554473877,12.647403240203857,0.21581435203552246,0.21749162673950195,0.1351304054260254,0.1306743621826172,0.13561725616455078,0.13380002975463867,0.12902593612670898,0.16089940071105957,0.7420063018798828,0.12067127227783203,0.1194155216217041,0.10882210731506348,0.12427115440368652,0.11075687408447266 diff --git a/results/combined/merges_timed/quux00/simplecsv.csv b/results/combined/merges_timed/quux00/simplecsv.csv index 35887d3cd2..50a0dc69b4 100644 --- a/results/combined/merges_timed/quux00/simplecsv.csv +++ b/results/combined/merges_timed/quux00/simplecsv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,e0ad6010aa7bdb86ac4b59bbf90337b6929108d9,7d4cfeea2f8674d55c5cd2227b0f4150460c4a60,b91e64b85fbd567d874906f36548c2a91328e864,,True,True,True,78,361,16653,4,True,78,Tests_passed,40551650259b743df2cedd556d58d694ee4e582fba58504a3b68e0a7ef471ea9,True,Tests_passed,b03ea54f5b4eba5d65b1b6aa57df08d733a189a99feeb63336de75039ceb8555,True,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,cf30a0b2be3d0cbe095ccdc27219ff655bd6623328493de6145062326de8c4fb,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,30004cf94dc5b6d5be669fac6c9b459f1dc5c14933b0ace2da57deea79657205,Merge_failed,0c5192b7b128a28c50366525934924ca41442e9ed06832e0315eefeab79a5af9,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,9ea656546c19b8a624997c0a5088247ac0133fa987ba504ba5069788014ccb4e,Merge_failed,d5935322e421a72db1b8291a714d69f2c053e0ef720b2be3af471eb1b3ad5445,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,0.05243182182312012,0.042519330978393555,0.06344962120056152,0.043267250061035156,0.05979609489440918,0.06010103225708008,0.03376460075378418,0.3076045513153076,0.23326587677001953,0.7271168231964111,1.2778587341308594,0.14664649963378906,0.138930082321167,0.05888962745666504,0.06030464172363281,0.06000638008117676,0.05958151817321777,0.0583193302154541,0.12085556983947754,0.7451860904693604,0.05944561958312988,0.05659198760986328,0.05443143844604492,0.05840158462524414,0.055695295333862305 diff --git a/results/combined/merges_timed/rackerlabs/blueflood.csv b/results/combined/merges_timed/rackerlabs/blueflood.csv index 93c89f46fa..acd5a75ebe 100644 --- a/results/combined/merges_timed/rackerlabs/blueflood.csv +++ b/results/combined/merges_timed/rackerlabs/blueflood.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 40,refs/heads/master,f83485d6abdaef72cf27abda4ee7f1a7951f6063,8133bf7948e95ae843ec029b268d7409bf2152ba,859a6a9ae5b584fc1969e84ce7e3c41f0f22678a,,True,True,True,10,38,582.0,2,True,10,Tests_passed,c0961f8c5ecae697c6650457c732ba77254effd5d1fa7624aaa036c8619847e9,True,Tests_passed,391766fae545cc73b60975f58b7abb6a4a63bd86ff12d8b9efbc213fdec4cd4e,True,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_failed,73e958f91145ad7dac8318f1f0a1b5a685af39cee84856ca1da2f43af7dd41c0,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,0.04640769958496094,0.04857301712036133,0.04402756690979004,0.036324262619018555,0.05599665641784668,0.05721306800842285,0.06047868728637695,0.18665623664855957,0.11330151557922363,0.8167831897735596,0.4580061435699463,0.0770883560180664,0.13862013816833496,0.04728817939758301,0.05119132995605469,0.051690101623535156,0.05092334747314453,0.04841876029968262,0.0814354419708252,0.8024232387542725,0.049886465072631836,0.04433083534240723,0.038860321044921875,0.047598838806152344,0.034795284271240234 diff --git a/results/combined/merges_timed/radkovo/cssbox.csv b/results/combined/merges_timed/radkovo/cssbox.csv index bc9221f73a..319ef4946d 100644 --- a/results/combined/merges_timed/radkovo/cssbox.csv +++ b/results/combined/merges_timed/radkovo/cssbox.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/master,a43ab1df773cd86623a45610d396e2d3048efb6a,fe025ed3eb78c1d09be279b1ff43a81269e6def2,71087dd6359c906ef07d42c80d7d0d76ae1d99ca,,True,True,True,14,77,585.0,6,True,14,Tests_passed,642adc7bd4d53f9a21c66f7ded2c0b4b342554fe7ffe665a10b777f0d64966dc,True,Tests_passed,d90d53cd2dbc93ec0047a45a7e442fb2b0d48c4bc7bf387ad381684e4e41e997,True,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,ae295d2f0d64ad31217b8011f807bfb1cff45e09a972b3689d924bab4205a046,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,0.061218976974487305,0.0532839298248291,0.05602717399597168,0.04654884338378906,0.04481959342956543,0.06633639335632324,0.045362234115600586,0.4381446838378906,0.32419896125793457,5.966154098510742,0.801293134689331,0.20409178733825684,0.17638659477233887,0.08870124816894531,0.08759498596191406,0.08683562278747559,0.09074902534484863,0.08819961547851562,0.19920849800109863,5.574446678161621,0.0845174789428711,0.08424496650695801,0.04749488830566406,0.0831613540649414,0.04503273963928223 diff --git a/results/combined/merges_timed/radkovo/jstyleparser.csv b/results/combined/merges_timed/radkovo/jstyleparser.csv index c2b33ff25b..a23c4578a9 100644 --- a/results/combined/merges_timed/radkovo/jstyleparser.csv +++ b/results/combined/merges_timed/radkovo/jstyleparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,8f59a62d1400a52875e9d221cd43368a589a4249,c1e0f1ad746e881ffd87b73fea780f50b37071f3,c26312235c1fdd56a68dc5d240269bbd05862dda,,True,True,Tests_passed,e3f85d40a833ed92e01140759da7136c47808b873a531fc75cf86347b67e067e,True,9,32,106.0,2,True,Tests_passed,0b7e51de8e0874158fea7b7056320a1d9d802b22ef3ef394e61c1289322767ec,True,9,True,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,0.038549184799194336,0.027960538864135742,0.04063081741333008,0.051610469818115234,0.04336857795715332,0.03191041946411133,0.01997685432434082,0.1706995964050293,0.11175680160522461,1.9421722888946533,0.6665534973144531,0.07800889015197754,0.18012714385986328,0.07379841804504395,0.0743865966796875,0.07677006721496582,0.07765007019042969,0.07807612419128418,0.08736467361450195,1.8639113903045654,0.06920051574707031,0.0682532787322998,0.05878853797912598,0.06936192512512207,0.05790233612060547 diff --git a/results/combined/merges_timed/radsz/jacop.csv b/results/combined/merges_timed/radsz/jacop.csv index bc3e0d02c2..fecaba06fe 100644 --- a/results/combined/merges_timed/radsz/jacop.csv +++ b/results/combined/merges_timed/radsz/jacop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/develop,709370e5e7ca8887a55ae12f3357138d7f38684d,a4c3d5c2677fcfde5ebba400dff84db1ba1d202d,dea313a8840655eb7f180b4bb17e3842917592c8,,True,True,Tests_passed,0b426a9d9350a3d72d790f76974937ea169be6de6cf1778fc98f914d213a09be,True,1951,6948,4410953,3,True,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,True,1951,True,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4e1f35ecfb0e04dbc1c9fced6bd6a5162aa467fa2114cfb4a8d7c661d57b84ca,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,89f26487d0cc7eedd0b31c4fd54155a801d5795186efba5f82c010cf0f79ec61,Merge_timedout,,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4c4c9930542dc1dbc33cc57e28e93a236edd400b08eaaa5f04df628320d72f48,Merge_failed,9410eb3d41ebc27b957bc3f2373570a6abbbe6de963c24b509962d8685f1fe40,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,1.1856019496917725,1.2169826030731201,2.9726181030273438,2.1358423233032227,2.130396604537964,2.111809253692627,3.0532546043395996,1.9766581058502197,1.2829430103302002,3.1715314388275146,-1.0,2.688528299331665,2.7219762802124023,4.402254104614258,4.786555767059326,3.1152865886688232,3.4222569465637207,3.9215235710144043,2.5225558280944824,4.45746922492981,2.158794403076172,2.630145311355591,1.6104316711425781,2.6084253787994385,1.6162095069885254 diff --git a/results/combined/merges_timed/ralscha/embeddedtc.csv b/results/combined/merges_timed/ralscha/embeddedtc.csv index b6e9924374..d46bc5ee59 100644 --- a/results/combined/merges_timed/ralscha/embeddedtc.csv +++ b/results/combined/merges_timed/ralscha/embeddedtc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,bfd16f6a9720ac0ff5fdcddf91a5ddd18d996ae2,d9908dceb43b0c27fa9699630dfc3714f224170d,9fec12b47ef5a0a668443caff176254d78117055,,True,False,True,2,1,2,2,True,2,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,True,Tests_passed,d793988448317818b80e57579942e79a08b6af00bac838b24f7c716c1ff20d52,True,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_failed,6fc1030734ed957f82c2e81bacd6b486859153f34199ea591b1a4d2677593e80,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,0.03755521774291992,0.036257266998291016,0.0402987003326416,0.03762674331665039,0.033106327056884766,0.04208850860595703,0.04137539863586426,0.15802812576293945,0.08736753463745117,0.9598631858825684,0.2989387512207031,0.06425094604492188,0.11859989166259766,0.036302804946899414,0.03612375259399414,0.03670954704284668,0.03658938407897949,0.03641057014465332,0.06732630729675293,0.9360928535461426,0.03588390350341797,0.03704643249511719,0.02537703514099121,0.03670144081115723,0.02554154396057129 diff --git a/results/combined/merges_timed/raml-org/raml-java-parser.csv b/results/combined/merges_timed/raml-org/raml-java-parser.csv index ce77588326..6a808790f2 100644 --- a/results/combined/merges_timed/raml-org/raml-java-parser.csv +++ b/results/combined/merges_timed/raml-org/raml-java-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/remotes/origin/pull/623,ae1104a8aa2b37f92b8aa6485cb38c285310a5e8,83a2384ffbfb2d7814dbc458b27dfcd09f589a3b,3cd23b57bf897436eaa3ecd5d45358494f9f7671,,True,True,Tests_passed,df4079e1916c26503d43aa89f37d730ad6f05b7a213506ec636df979c5ea58e6,True,23,81,1030,4,True,Tests_passed,042e065ce82ddbe36f3f92807b53f66c1380b3b59c9d1bc7f1f4fc0082db6dd1,True,23,True,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,0.07626962661743164,0.07617306709289551,0.07812213897705078,0.07600975036621094,0.07413959503173828,0.0799412727355957,0.07761764526367188,0.3223702907562256,0.24941277503967285,1.999312400817871,0.7541985511779785,0.15094709396362305,0.17026424407958984,0.07318997383117676,0.07829594612121582,0.07634830474853516,0.07766556739807129,0.07566380500793457,0.15801262855529785,2.0200228691101074,0.07539796829223633,0.07660961151123047,0.0575556755065918,0.12208008766174316,0.06920003890991211 diff --git a/results/combined/merges_timed/rcarz/jira-client.csv b/results/combined/merges_timed/rcarz/jira-client.csv index 17efe88d29..d78f19c5ba 100644 --- a/results/combined/merges_timed/rcarz/jira-client.csv +++ b/results/combined/merges_timed/rcarz/jira-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 101,refs/remotes/origin/pull/295,bcfc36277af06a98a808a3f83bc019232db1bd49,af3260c77d2cc0fe2c8b0d8089e7b7fd68abed91,ec5cc1cd8fcab98c87e02837e9e774b1eff4328a,,True,True,True,5,81,663,3,True,5,Tests_passed,a24c7f37958333a4571427a01f4dbe19b25233c70fe7e6e11a4b05e9156b4ba1,True,Tests_passed,7cdf69ff6ad2e7881862c68a71160d1af043bc1d368780aedba30deed0e0ca88,True,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,9a210ee8e697131f47069e7f7fbb0c54858c7c662b8bae4a5b8196556cf34bf6,Merge_failed,3ee210c74639b519177fb85f92f65df4471ecf21158f1ab183e19a3946a48331,Merge_failed,b34b7464714f9e9c48c3fef489bd2f3ea3345bc6bcdb4052f89f620419021f54,Merge_failed,b7d68736f54805cd88ab0235d1f409ceb6ccab477254624a8bb837db81e2fd14,Merge_failed,3ee210c74639b519177fb85f92f65df4471ecf21158f1ab183e19a3946a48331,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,869b5348d23839e768f75dceea911c2db7d24189c0f9646df796c9c4529e0303,Merge_failed,52b2b8727e687804223162747d3ff7b3ebe7e9cd6f558eae6885a8d075ea87b9,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,fb3c949b4cd97f9a735510f05569b78eb270b22543421d46416a3b9501b333b4,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,Merge_failed,f17527b47a5cd9be3c657990fea16092000f9af6ea994ea507fe53e5ec181caf,0.033385515213012695,0.05448746681213379,0.04417729377746582,0.04562830924987793,0.035360097885131836,0.038709402084350586,0.04232335090637207,0.23445487022399902,0.17163491249084473,0.9487850666046143,0.4935109615325928,0.10796737670898438,0.1343843936920166,0.04646706581115723,0.048467159271240234,0.048341989517211914,0.049118757247924805,0.048215627670288086,0.0985257625579834,0.9141545295715332,0.048053741455078125,0.047747135162353516,0.03812146186828613,0.04798007011413574,0.038818359375 diff --git a/results/combined/merges_timed/rcongiu/hive-json-serde.csv b/results/combined/merges_timed/rcongiu/hive-json-serde.csv index e4b4e4c9aa..b929aff856 100644 --- a/results/combined/merges_timed/rcongiu/hive-json-serde.csv +++ b/results/combined/merges_timed/rcongiu/hive-json-serde.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/develop,86449da613900d3e02c87a2c45d6c6f731858130,1936f6dc438e040c207510141ba1e2f148c7aa6e,409c6184b8cadd945c3c44da9bde386e0646c115,,True,True,True,25,155,1097,2,True,25,Tests_passed,36144dd1f5094661f82f457985b9d51b8918a84501bb75e05bec926f40ea28b7,True,Tests_passed,259c726b8278cf3f98af08d42d9d491141c85149a1882474c8756f381493e85d,True,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_failed,e93437ddfbd7f7d846a402cbeb4434ee02a66835c51c46910c2321d74a276fd6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,0.012160062789916992,0.012373208999633789,0.013889074325561523,0.013831377029418945,0.013921499252319336,0.013530969619750977,0.013926982879638672,0.03930401802062988,0.0669562816619873,0.8882541656494141,0.592106819152832,0.08060383796691895,0.13832831382751465,0.04997825622558594,0.04864001274108887,0.04927229881286621,0.048004865646362305,0.049443960189819336,0.08481502532958984,0.9405453205108643,0.048307180404663086,0.047805070877075195,0.03696036338806152,0.046422481536865234,0.03722524642944336 diff --git a/results/combined/merges_timed/rcsb/colorbrewer.csv b/results/combined/merges_timed/rcsb/colorbrewer.csv index 2c8fe8a790..ecfce642b5 100644 --- a/results/combined/merges_timed/rcsb/colorbrewer.csv +++ b/results/combined/merges_timed/rcsb/colorbrewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,c551ca68b2e9bdc50824f990db085754ffa6dbdb,43693ef94faa798cf7f15dd0f3557c377e9a201c,ccfe414fa1d26237f8c9538fc5ab255ac8746a1f,,True,True,True,12,68,454,2,True,12,Tests_passed,238fb7ce6926ddc3255f3e34385b4fa728c7ebba038d895b3cce8ec92dbe3106,True,Tests_passed,ca9a9f5c61fca4d9d0e96bd8e8de449ad3ec3d2133315ec76c8f6a75293839d2,True,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,ffc51d80ac1a6f8571969d141ad8f7486d339a97ead4471540a5065d7d07303d,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Tests_failed,bf79b14d1da5d4824b2978599c8f48945889403ecca92a9fbf5ff6e3ac0e83d7,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,1d46a80d3d5252eb71298a5055e2d9efbaf756304b100dafe0b0d1402da52d95,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,0.04866838455200195,0.042530059814453125,0.01657700538635254,0.016355514526367188,0.045257568359375,0.04692864418029785,0.04195713996887207,0.16344785690307617,0.11564207077026367,1.1143171787261963,0.47612953186035156,0.08761334419250488,0.1257007122039795,0.04519319534301758,0.044478654861450195,0.044069528579711914,0.04374408721923828,0.04352855682373047,0.0770721435546875,1.1041626930236816,0.04424738883972168,0.04446578025817871,0.0428926944732666,0.04303264617919922,0.0418853759765625 diff --git a/results/combined/merges_timed/rdfhdt/hdt-java.csv b/results/combined/merges_timed/rdfhdt/hdt-java.csv index 2bd5725c66..b528149209 100644 --- a/results/combined/merges_timed/rdfhdt/hdt-java.csv +++ b/results/combined/merges_timed/rdfhdt/hdt-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 84,refs/heads/master,957ba7f643048114a3936adfae1d1f3b46a5cc12,f36f561a6571e7663568ed2f9f249ee01aac6502,8e23b101e278eda1b1ebcec4bca3543520717812,,True,True,True,110,289,1562.0,13,True,110,Tests_passed,beebd6d83095eb3f63fd612de75b2f86811d44481141ee5fe8071f5b170f72d0,True,Tests_passed,61a73b86a2d81844bb6289942366122c51c2c385d1968534f3b32c30e1fc9562,True,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,fff981ef917cf60898f27fcd9a9691f419fcee99141b1fc0657f46ee3c3ebe73,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,fff981ef917cf60898f27fcd9a9691f419fcee99141b1fc0657f46ee3c3ebe73,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,Tests_passed,3e1624282b92deaf5cd5533ee1ae48701d3d34ecd8b872dde4646a52442beaa6,0.021065950393676758,0.02107071876525879,0.024847030639648438,0.0246584415435791,0.025048017501831055,0.024925947189331055,0.024729490280151367,0.19023895263671875,0.6547856330871582,8.358103275299072,1.0670557022094727,0.4171473979949951,0.22608327865600586,0.133711576461792,0.13480114936828613,0.13470673561096191,0.13600540161132812,0.14495372772216797,0.35981011390686035,8.639507055282593,0.1424424648284912,0.14524126052856445,0.054534196853637695,0.13313007354736328,0.0445859432220459 diff --git a/results/combined/merges_timed/reckart/shib-http-client.csv b/results/combined/merges_timed/reckart/shib-http-client.csv index cdbf16091c..b270b2e2dc 100644 --- a/results/combined/merges_timed/reckart/shib-http-client.csv +++ b/results/combined/merges_timed/reckart/shib-http-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,536fe936a3def7020da2c514f6b2c42fd39b4d11,da399ec67592ca7205a57c599e4058a69669ad3c,3918e16a51c68433085c57c3690a21e4219b74ba,,True,True,Tests_passed,d4c1c32de7c810aea99daef55638bb0f41153fe5af179c6c004ef0a7d7161d73,True,2,19,97,2,True,Tests_passed,96df33bc8056dea40d7ef25e1175ec08eadeaa5409565001c92fa916a7bf77a3,True,2,True,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,0.042814016342163086,0.044199228286743164,0.042525529861450195,0.04421520233154297,0.04509735107421875,0.044655561447143555,0.04479408264160156,0.1647961139678955,0.11196041107177734,1.0000224113464355,0.32399702072143555,0.06668758392333984,0.12071990966796875,0.03798341751098633,0.037389516830444336,0.03769659996032715,0.03787827491760254,0.03746509552001953,0.07060384750366211,0.9916234016418457,0.03796672821044922,0.03730487823486328,0.02651500701904297,0.03741812705993652,0.026713848114013672 diff --git a/results/combined/merges_timed/recommenders/rival.csv b/results/combined/merges_timed/recommenders/rival.csv index 8de2812722..54111f5c88 100644 --- a/results/combined/merges_timed/recommenders/rival.csv +++ b/results/combined/merges_timed/recommenders/rival.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,a8d64144a645278ab58db673a56ef5ff43417d0f,35e15a2d817fa78d5673187304b7b0db0f67b79a,ddfa73bea6cc8ac327d313fa229cbe1b56cef22c,,True,True,True,9,17,327,2,True,9,Tests_passed,60571ade857332c578d2f66add29262b732f18fe63ed4a42082b31a84978db51,True,Tests_passed,f77ff9dbf10b7cb1035c46ae951426ba231b54ccb56527d58e4237441342d5e0,True,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_failed,7f55a721b59540e9bdbf3320cb0b705c6961485cf4d9d34a55d3c03d2cefb562,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,0.04232907295227051,0.04488635063171387,0.048690080642700195,0.04459714889526367,0.04055380821228027,0.04505491256713867,0.03595423698425293,0.16249752044677734,0.08306241035461426,0.8822517395019531,0.36553120613098145,0.08511757850646973,0.12338972091674805,0.056169986724853516,0.057030439376831055,0.053090810775756836,0.05321788787841797,0.055881500244140625,0.09523916244506836,0.8635244369506836,0.05369138717651367,0.05465412139892578,0.04499006271362305,0.052091360092163086,0.04379844665527344 diff --git a/results/combined/merges_timed/recruit-tech/redpen.csv b/results/combined/merges_timed/recruit-tech/redpen.csv index 06e1bc3c1a..0dc59f3b8d 100644 --- a/results/combined/merges_timed/recruit-tech/redpen.csv +++ b/results/combined/merges_timed/recruit-tech/redpen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/heads/master,fa710f48dd8ca04e42fa079491a65d17763dbfc8,647b2646daa95dd8dcb77bf6c8a5b5f653acf0f6,64ca201ccd7fcfc3fbcc45f2d8c934bed01e56e7,,True,False,True,14,52,178,2,True,14,Tests_passed,68f4424f3594a8b6d46124a8aff1f6d931b7fff47fd626d27489e03070c06989,True,Tests_passed,08b7d4b08ef90917fae5c9f7c661b7f52f4be87f11cf225079798a695b65a57d,True,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_failed,999c1b539ab0edd8ca40cc12da23eabc61607b98f94134f03f459727fcec4fad,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,0.047443389892578125,0.045870065689086914,0.0496065616607666,0.03603363037109375,0.02188563346862793,0.04604983329772949,0.03578996658325195,0.15380287170410156,0.11947250366210938,0.6913967132568359,0.34085941314697266,0.07841134071350098,0.13428592681884766,0.04483485221862793,0.09689974784851074,0.042943716049194336,0.044672489166259766,0.09526705741882324,0.07872343063354492,0.7194914817810059,0.04531669616699219,0.04342985153198242,0.037100791931152344,0.043697357177734375,0.03290414810180664 diff --git a/results/combined/merges_timed/redhogs/cron-parser.csv b/results/combined/merges_timed/redhogs/cron-parser.csv index c4ae69d72f..fdc20691c0 100644 --- a/results/combined/merges_timed/redhogs/cron-parser.csv +++ b/results/combined/merges_timed/redhogs/cron-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/remotes/origin/pull/46,200e4e12bf5d866a9b127c78d5c44dd1ca5180a9,449f4a3742f32e463fc9f360f325c67c5f3813b5,e0a8d56ec328b0c3f6fc397891948545e0804cce,,True,True,Tests_passed,8f1f1e38968faf4bdcf4505d19d38ae747bc70f038cbe2e7ddcdbd16230cd2da,True,7,17,1176,3,True,Tests_passed,d005990ece286fc40fc39a12143ddc3bc898d928f007561d70ff34cd1068ac0d,True,7,True,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,9c37059bdf68f69e63f3677eb768e996dcaa2d1cb450de5a35b56407feb2f988,Merge_failed,e6f4a50194a441f2f03e7f9f2478691804751cc4326c0bf99cf8ac4e7b8a4269,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,81bfe11d6d63829c81eb6af8462a91378fffdb1d4367cd2b7fe6935982fe444f,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,0.03078174591064453,0.039942026138305664,0.04521012306213379,0.030151844024658203,0.04386734962463379,0.044976234436035156,0.050771474838256836,0.23487067222595215,0.17686915397644043,0.6570889949798584,0.2607254981994629,0.09322452545166016,0.11983370780944824,0.03732609748840332,0.03777885437011719,0.037680625915527344,0.03706073760986328,0.03529953956604004,0.08601117134094238,0.6627914905548096,0.03695416450500488,0.036498308181762695,0.035758018493652344,0.037131547927856445,0.03539013862609863 diff --git a/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv b/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv index e09ccd020e..459784dad5 100644 --- a/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv +++ b/results/combined/merges_timed/redline-smalltalk/redline-smalltalk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,9cf94e88e0aa92bd28fbf690202b6428789fa3d2,c789c22cdb1587566a1db933c5e94e470eeb8330,ba962853fb12f7b9caa3a7f35e75ed5bf3aa994c,,True,True,True,31,82,320,2,True,31,Tests_passed,42e27e8e2ef5d8978a01c1e4d77f9831016a7ca579cdd7e29bdc09f332c2bdd7,True,Tests_passed,0a72157776f23d88bfd3527734732155be398c4591ab878e22ca52a7171d9433,True,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,f3ade887df686001949dd8648e6cbcd54bd134f3a2688611a4a83d9998297578,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,0.05435585975646973,0.0455629825592041,0.05287337303161621,0.05108904838562012,0.05508232116699219,0.04820847511291504,0.04382467269897461,0.17595577239990234,0.10870981216430664,1.389901876449585,0.8441858291625977,0.08493566513061523,0.14731574058532715,0.0536348819732666,0.045972347259521484,0.05611610412597656,0.05461859703063965,0.05481266975402832,0.09330177307128906,1.2483580112457275,0.05298471450805664,0.05145549774169922,0.03350973129272461,0.05440998077392578,0.04307985305786133 diff --git a/results/combined/merges_timed/redsolution/otr4j.csv b/results/combined/merges_timed/redsolution/otr4j.csv index 79ebd89e0f..886fca2dfe 100644 --- a/results/combined/merges_timed/redsolution/otr4j.csv +++ b/results/combined/merges_timed/redsolution/otr4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,fee9c908d0389fa3e5ae469d907f2c872a23ce39,61f4011bf4abff5d60aab546bec06f886267b848,001049afe7cabe92929fed4bdc5b639a581763a9,,True,True,Tests_passed,18e903ecbd4b08fe7c00c8308ac378c77f01176f89bb5af75880d3b70baf2639,True,15,86,2135,2,True,Tests_passed,d9d5f2b75a18c7e67a058524f550ff03fe02b2b30d0a219540b7cc50fbe40c03,True,15,True,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,5ac512d983d560539d00ec6c24c08ef9b93fbc303419434a7d931e40ba86ec01,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Tests_failed,e207537fa310f8c3ce2423bac93cb0f1fc9043e3791c3d42faaceacf3f699dd8,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,f9a6c9be6b6308231f5aa55c066aff601276b448a1d9a63541e02c351a62b0e6,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,0.012730836868286133,0.01240992546081543,0.013198137283325195,0.013145685195922852,0.013331174850463867,0.013328075408935547,0.013620376586914062,0.040426015853881836,0.07405614852905273,0.9386904239654541,0.6256122589111328,0.08042359352111816,0.12362980842590332,0.04125571250915527,0.0399785041809082,0.04092288017272949,0.04160022735595703,0.04190635681152344,0.07367634773254395,0.9846839904785156,0.0407567024230957,0.04009246826171875,0.03835773468017578,0.0399470329284668,0.03909945487976074 diff --git a/results/combined/merges_timed/reficio/p2-maven-plugin.csv b/results/combined/merges_timed/reficio/p2-maven-plugin.csv index 35dcc0bb4f..feb4fbbbff 100644 --- a/results/combined/merges_timed/reficio/p2-maven-plugin.csv +++ b/results/combined/merges_timed/reficio/p2-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 70,refs/heads/master,d3cdd1c58dd31c5b6a2ece582ccb58cec53b684a,fe15b0719486b8eda7c323abe2d6de77a7826314,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,,True,True,True,6,9,188,5,True,9,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,True,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,True,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,0.04572319984436035,0.04218006134033203,0.042825937271118164,0.044447898864746094,0.030017375946044922,0.04366922378540039,0.03965878486633301,0.15820002555847168,0.1149599552154541,0.9635367393493652,0.340071439743042,0.08326506614685059,0.14081358909606934,0.052426815032958984,0.05101823806762695,0.04645085334777832,0.049462080001831055,0.04925060272216797,0.08947873115539551,0.9453785419464111,0.049216270446777344,0.049898386001586914,0.03922414779663086,0.049241065979003906,0.036638736724853516 diff --git a/results/combined/merges_timed/reinert/jjschema.csv b/results/combined/merges_timed/reinert/jjschema.csv index b4dc476ca8..4f92fed7b9 100644 --- a/results/combined/merges_timed/reinert/jjschema.csv +++ b/results/combined/merges_timed/reinert/jjschema.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,1276436b3b812eaaf43853b357eaa08039f5f291,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,3cda79e6dffc9bb6162bac5f926f2ec5721d12c4,,True,True,True,8,28,74,4,True,8,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,True,Tests_passed,a475a662b481575e3dcfe3f088dd0f303541a96b1d302632d87b5d2bf1f3a1a1,True,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,0.014084339141845703,0.013935089111328125,0.015578031539916992,0.015449285507202148,0.015547513961791992,0.01589369773864746,0.01563286781311035,0.07394051551818848,0.18160796165466309,0.029676437377929688,0.4066734313964844,0.1391284465789795,0.1594381332397461,0.06424498558044434,0.06707024574279785,0.06657838821411133,0.06462883949279785,0.06510353088378906,0.1384141445159912,0.0763394832611084,0.06350851058959961,0.06361937522888184,0.03825807571411133,0.06411242485046387,0.039253950119018555 diff --git a/results/combined/merges_timed/relayrides/pushy.csv b/results/combined/merges_timed/relayrides/pushy.csv index 9ef86dc3c0..bd4801ba28 100644 --- a/results/combined/merges_timed/relayrides/pushy.csv +++ b/results/combined/merges_timed/relayrides/pushy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 194,refs/heads/main,37aade73e77e75f5aab20300651a247d9b96c1ab,ff61066de3f0d95df8ea8d52e00964b0fa23b294,9886db776864ebac91327b127008ab9013ab38b6,,True,True,True,26,267,2922,4,True,26,Tests_passed,b9bcf51788f6efdb084c19c317e9d9c7db6eecdc2bcf2e085b561542162a28f8,True,Tests_passed,d167b8cd68816774c58ef578198562d232a54861914c1857b6e79781c7276ce2,True,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,031e7031e0768074b361f5d4872018d5283688b4e4a63d7c04dcf168d9b03925,Merge_failed,0269f289b2940499483e702d472e27c3e2c796045cf92c451d9f12a28761a419,Merge_failed,fa101fce4ae615f4dd37e4a04ed35a38f97ede4b1a8c4dd84b97194efa13bc8a,Merge_failed,9e950886f6bdf20f5485b2072f3d7759e7ff6571fb26d3be1744b7d15522bc37,Merge_failed,0269f289b2940499483e702d472e27c3e2c796045cf92c451d9f12a28761a419,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,3ea5f54e624fabe7c6ebf235140d5bd3dbddba4339a004d49c28b22341d58590,Merge_failed,fa101fce4ae615f4dd37e4a04ed35a38f97ede4b1a8c4dd84b97194efa13bc8a,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,Merge_failed,1d377fee67c468ac1b92a0c0a1b3207f1666fdffd95b59bf961895b9cb873047,0.013028860092163086,0.04218697547912598,0.046770334243774414,0.05018281936645508,0.05138540267944336,0.04596114158630371,0.012801408767700195,0.28589606285095215,0.1712172031402588,1.7000908851623535,1.144361972808838,0.10326242446899414,0.12709951400756836,0.04819226264953613,0.048827171325683594,0.04903864860534668,0.04821300506591797,0.05016636848449707,0.10629987716674805,1.6703391075134277,0.04872417449951172,0.0493927001953125,0.03867077827453613,0.04858970642089844,0.03809022903442383 diff --git a/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv b/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv index b7a06193c2..23982a6a6d 100644 --- a/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv +++ b/results/combined/merges_timed/release-engineering/pom-manipulation-ext.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 299,refs/heads/main,f742e2398f271a294be77b95814feed3fcddd144,80b6b8712f99eeef4fa92845ed66d47bbb0c95d0,2af23194cabbd906de81e134e0e54cd8efd92dd8,,True,True,True,5,16,76,3,True,5,Tests_passed,051eb4d82150dd58e8bd4f4a3647c9cd556dccf92e7347a83d492bc774760b36,True,Tests_passed,635508baf24033af50ba2b5b69c5f69fe49bc0fdb648a80d3fe61f67304797e7,True,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,0.04129624366760254,0.043050527572631836,0.04796433448791504,0.04821157455444336,0.05438876152038574,0.048902034759521484,0.02735733985900879,0.23865175247192383,0.16268062591552734,2.4165632724761963,0.4075596332550049,0.10885357856750488,0.1502072811126709,0.0744924545288086,0.07664227485656738,0.05519604682922363,0.07415127754211426,0.07386064529418945,0.10825419425964355,2.1665258407592773,0.055090904235839844,0.06765508651733398,0.05201101303100586,0.05528378486633301,0.05469822883605957 diff --git a/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv b/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv index a009384098..967da21c07 100644 --- a/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv +++ b/results/combined/merges_timed/renepickhardt/generalized-language-modeling-toolkit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,f8105ddc44d47cbadcf250db7f2e6240addce1de,159a50f8e2b21ae099529ca63155ade49e5b64a3,d1fe078010338d875bd7eb034505e0bbb8180878,,True,True,True,10,69,1910,2,True,10,Tests_passed,94dbcabceb1b23a8c1a83275a4882391d257edf919655d326212e4f8fdafc8dc,True,Tests_passed,7b76b1b94de96f93eadfae1aa0f02dd874d579db6ce983bf5b16d7810636620b,True,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,0.04607224464416504,0.04683518409729004,0.01387786865234375,0.011320829391479492,0.04167366027832031,0.0839393138885498,0.01137852668762207,0.18076634407043457,0.10594820976257324,0.6746811866760254,3.1434755325317383,0.1771388053894043,0.2895205020904541,0.1499636173248291,0.15292859077453613,0.04007744789123535,0.1509718894958496,0.14725208282470703,0.07424473762512207,0.7476358413696289,0.040719032287597656,0.12302517890930176,0.13347315788269043,0.11483311653137207,0.13583135604858398 diff --git a/results/combined/merges_timed/renggli/java-petitparser.csv b/results/combined/merges_timed/renggli/java-petitparser.csv index 87ab51eda9..c75bd9af1f 100644 --- a/results/combined/merges_timed/renggli/java-petitparser.csv +++ b/results/combined/merges_timed/renggli/java-petitparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,5,13,32,3,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,5,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,6364a3812cdc5b4e14163c71234a7b2b04c94fde57e36cc181e3def70758e30c,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,0.04942202568054199,0.05022859573364258,0.047605276107788086,0.049599647521972656,0.044625043869018555,0.042426109313964844,0.04822540283203125,0.23439264297485352,0.1763904094696045,1.2477366924285889,0.3027315139770508,0.10635805130004883,0.14478039741516113,0.05289936065673828,0.053640127182006836,0.05307340621948242,0.053710222244262695,0.05225515365600586,0.10527443885803223,1.2152841091156006,0.05247855186462402,0.051914215087890625,0.035119056701660156,0.05234479904174805,0.03423595428466797 diff --git a/results/combined/merges_timed/renggli/petitparserjava.csv b/results/combined/merges_timed/renggli/petitparserjava.csv index 6f562761d5..eccce73f09 100644 --- a/results/combined/merges_timed/renggli/petitparserjava.csv +++ b/results/combined/merges_timed/renggli/petitparserjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,True,18,89,800,5,True,19,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,85cdb350e3ef34101be7fffd2144198f9dbfc409bc0b4d576dbf1b0d741abc97,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,0.04497075080871582,0.043775320053100586,0.03349924087524414,0.04470634460449219,0.05392313003540039,0.045473337173461914,0.05715751647949219,0.2990546226501465,0.21396470069885254,1.3772261142730713,1.0974421501159668,0.13565587997436523,0.13169145584106445,0.05023932456970215,0.05242037773132324,0.05276679992675781,0.053047895431518555,0.051928043365478516,0.11910271644592285,1.3897624015808105,0.05227541923522949,0.052628278732299805,0.03748965263366699,0.051840782165527344,0.03584551811218262 diff --git a/results/combined/merges_timed/resthub/springmvc-router.csv b/results/combined/merges_timed/resthub/springmvc-router.csv index aba9dc87ac..e47426ae79 100644 --- a/results/combined/merges_timed/resthub/springmvc-router.csv +++ b/results/combined/merges_timed/resthub/springmvc-router.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/heads/master,71d38b423902b98a187292a1c0e9a6665fe35231,3bc490f1e9e979e3189625ac19f2741a69699010,bd30ac190818c9c32c8031cac4e3000058fc97d1,,True,True,True,20,111,2216,4,True,20,Tests_passed,feb2b6df8a147fdf1601ba8eaed7f15db417fef74a5efa6bce8909e5dceb63b3,True,Tests_passed,471c3694e6663ad3811ec61d10dddef8a7abf46b0481061bb3338b069eaf362a,True,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,102e69c0660440003e727d3fab4699276fd76ffeb22aebcad00f5467613b895a,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Tests_failed,cb62aeaa9cca9562e53c67fd31855c8d90c0486159989292ad0f4fa15039ee0a,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,655f360fed45d4400928443f03794f0986e448f05c9b229c2bcda93088329f9d,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,0.03872871398925781,0.04697155952453613,0.04500102996826172,0.044501304626464844,0.036568641662597656,0.0408017635345459,0.04121255874633789,0.28460073471069336,0.24010634422302246,1.4766814708709717,0.5456421375274658,0.13710260391235352,0.12773704528808594,0.048922061920166016,0.05033588409423828,0.04817938804626465,0.04896998405456543,0.04788565635681152,0.1134328842163086,1.436786413192749,0.049488067626953125,0.05002117156982422,0.033629655838012695,0.0501408576965332,0.03380322456359863 diff --git a/results/combined/merges_timed/resty-gwt/resty-gwt.csv b/results/combined/merges_timed/resty-gwt/resty-gwt.csv index 5f5d152df5..3bfe0642ee 100644 --- a/results/combined/merges_timed/resty-gwt/resty-gwt.csv +++ b/results/combined/merges_timed/resty-gwt/resty-gwt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,867b917c43c32acbdcac55767e7f04334006c866,05733cb0d13bbfd97adc6a9eda47b4ea3dcf04e6,9d45c90a98203c46b16910b1470fead4b3ae09e4,,True,True,True,76,362,3588.0,3,True,80,Tests_passed,833d3a55324d94ffa54b859d6714376079b6e3c1ecef892dad5248540068965d,True,Tests_passed,acf6165089b11a4759d351a9b67c1f38511392d7d788a3aa22a0ba1871060943,True,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_failed,5b4de61dff6d7b716d03562d27889d741b9821b13e3bd218a9c132b7ce27de73,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,0.017783641815185547,0.021543025970458984,0.027135848999023438,0.027832984924316406,0.02328801155090332,0.027645111083984375,0.026882171630859375,0.07192277908325195,0.12758803367614746,1.0986828804016113,1.3246972560882568,0.11704611778259277,0.15546631813049316,0.06827807426452637,0.08130908012390137,0.06641530990600586,0.06507444381713867,0.08304905891418457,0.1418154239654541,1.1698741912841797,0.06259655952453613,0.06147909164428711,0.05870628356933594,0.062108755111694336,0.04273843765258789 diff --git a/results/combined/merges_timed/richardwarburton/lambda-behave.csv b/results/combined/merges_timed/richardwarburton/lambda-behave.csv index 8c690b9cf3..40d1d2ab64 100644 --- a/results/combined/merges_timed/richardwarburton/lambda-behave.csv +++ b/results/combined/merges_timed/richardwarburton/lambda-behave.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/master,1122d7779dd0c352baf30f702efe19bd4852b727,cd83aba4a3445415807b25b8198eae8fcc31816d,f94034d1b799357cb1ad4d61c99951870c75ec3a,,True,True,Tests_passed,1f4ab1f542d90df8e1491c780eb558a0f597ed6f1da5656e44984dd62c75d1bb,True,23,45,246,3,True,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,True,23,True,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,7d00a2af8e60352da908b9251a69541dca840ce922502a249d3b410b605f80ca,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Tests_failed,2ce40dfd880d5c928eadede3c6f8fd3345890896a064ad25abd7f9ba6ea56f00,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,5f13f16cc71d2ae8d3987645986830db16173c5cf803ff87dec00b0215c40591,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,0.010235071182250977,0.009866714477539062,0.010353565216064453,0.009755611419677734,0.01004791259765625,0.010221719741821289,0.010025501251220703,0.05066347122192383,0.13028812408447266,0.609471321105957,0.3165595531463623,0.10229754447937012,0.12257647514343262,0.0414433479309082,0.04155611991882324,0.0423130989074707,0.04178476333618164,0.04212784767150879,0.08830475807189941,0.5764031410217285,0.04247260093688965,0.04216933250427246,0.03290987014770508,0.042209625244140625,0.033344268798828125 diff --git a/results/combined/merges_timed/risingoak/jenkins-client.csv b/results/combined/merges_timed/risingoak/jenkins-client.csv index 0f53b31944..004d3c40bf 100644 --- a/results/combined/merges_timed/risingoak/jenkins-client.csv +++ b/results/combined/merges_timed/risingoak/jenkins-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 79,refs/heads/master,56d27735ae3aef791a8aa330fd489917c7ade50d,65516173af2f28b3b4f5f76feadd0a9120e28ac6,887cbfd64c010a702f92b171ae3cac3fd48893ba,,True,True,True,14,44,551,2,True,14,Tests_passed,d3eb9f97f751086ec1a9e98f9b157db5337b74c91f85eb2f61b89090822bd465,True,Tests_passed,140999204148a5c381e11a068b608fb303d63bae532d725c9f7b66460929056b,True,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_failed,231bc4b0e544034f5646d15fd87b8e7b2bb8b9192485453818a67af62cdd1dc1,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,0.04503774642944336,0.04433155059814453,0.04630231857299805,0.04579591751098633,0.044297218322753906,0.04596138000488281,0.03574872016906738,0.16649484634399414,0.11400437355041504,0.707813024520874,0.34736108779907227,0.06810545921325684,0.12481284141540527,0.039266347885131836,0.03965616226196289,0.037964820861816406,0.03912544250488281,0.03882741928100586,0.07167243957519531,0.7210144996643066,0.03827214241027832,0.0383758544921875,0.02774357795715332,0.038095712661743164,0.028396129608154297 diff --git a/results/combined/merges_timed/rjohnsondev/java-libpst.csv b/results/combined/merges_timed/rjohnsondev/java-libpst.csv index ebd166043f..cff5a10e52 100644 --- a/results/combined/merges_timed/rjohnsondev/java-libpst.csv +++ b/results/combined/merges_timed/rjohnsondev/java-libpst.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/develop,8fc5a5c5d12b78425941201f89f76a3d2d0a50da,e0296adde1bccf18d25b2cea922d5955d7e98ed6,6b8a24004fe1140303f403a4e15d59ba3baa8fa8,,True,True,Tests_passed,1f0f28817352bd3ed687715154efa1336eafd178739ed3d3b7f1e9f388336ce2,True,14,93,718.0,3,True,Tests_passed,b19a06025c8ae73ee9fccdbd9340cfd5addad69285bb94c0f1de7db54fe49f8e,True,14,True,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,0.0961461067199707,0.09292721748352051,0.14193201065063477,0.13309621810913086,0.1369779109954834,0.1422421932220459,0.14014863967895508,0.24657511711120605,0.21096253395080566,2.195932626724243,0.6452546119689941,0.28261733055114746,0.3916661739349365,0.22697758674621582,0.2268526554107666,0.23254823684692383,0.23187804222106934,0.22410130500793457,0.36216282844543457,2.1427383422851562,0.19262218475341797,0.19032526016235352,0.2034616470336914,0.18532967567443848,0.19527506828308105 diff --git a/results/combined/merges_timed/rncryptor/jncryptor.csv b/results/combined/merges_timed/rncryptor/jncryptor.csv index 4e6e4a3409..304918f833 100644 --- a/results/combined/merges_timed/rncryptor/jncryptor.csv +++ b/results/combined/merges_timed/rncryptor/jncryptor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,c54c76bac35c50d72514642ee6390435c3a93590,7ce2822d12b3e6cf2e23bc42ff6e2ff540544357,94cabd7011843fa8d95c448be63db95183b1bf4b,,True,True,True,10,31,181,3,True,10,Tests_passed,178ade38a2ad32d0c458f2476afa73460be8fc83af2a76721571a596867aa453,True,Tests_passed,2ee8b274c7b1d22c925932b64d8d4d3b95b6a6c35c042ce8da6920c5c42fbb63,True,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,0.04300403594970703,0.03883242607116699,0.03608202934265137,0.05085897445678711,0.037552833557128906,0.04473710060119629,0.03963184356689453,0.23386120796203613,0.16720867156982422,1.5109608173370361,0.33107423782348633,0.10380053520202637,0.13339853286743164,0.04743695259094238,0.04779481887817383,0.0484309196472168,0.04770016670227051,0.0476841926574707,0.09791946411132812,1.4884982109069824,0.04750704765319824,0.04664301872253418,0.02982044219970703,0.04596543312072754,0.029892683029174805 diff --git a/results/combined/merges_timed/rnewson/couchdb-lucene.csv b/results/combined/merges_timed/rnewson/couchdb-lucene.csv index 3cf800011d..b3ad9a4743 100644 --- a/results/combined/merges_timed/rnewson/couchdb-lucene.csv +++ b/results/combined/merges_timed/rnewson/couchdb-lucene.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 51,refs/heads/master,f9e7354b4dc38678549f66943f25d05962de3049,a3a70153628e5d1c6faa1418bef09e8e3090a29d,682e93f3ac6bb4b870e71c97864ae313a0edfafb,,True,True,True,10,16,621,2,True,10,Tests_passed,721f1627b793685addda9b9fd499f963abeed08af6cc76a19f3a8a0b8c8ffb09,True,Tests_passed,add5690542149e1c451d3335bddb2887de735c53b1053ae219cb92f66badd66d,True,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,d458be4327b4397558437e250f70e2f30dacfa5070e9367233473b9b0694cc3f,Tests_failed,46309defa7a855bcef74d0539a2346cb30dfd61aade17475c4c7742ccd893e4e,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,d458be4327b4397558437e250f70e2f30dacfa5070e9367233473b9b0694cc3f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,Tests_passed,056a843e95d047931a6bb7796c72cc85bc11bf531e41eee631c7dfb4b3ba524f,0.008959531784057617,0.008867502212524414,0.009128093719482422,0.008950471878051758,0.009104728698730469,0.009095191955566406,0.009429931640625,0.03239703178405762,0.0635077953338623,0.9902217388153076,0.3331596851348877,0.06874537467956543,0.12387657165527344,0.03927969932556152,0.03912973403930664,0.038893938064575195,0.03917837142944336,0.03965878486633301,0.07079911231994629,1.0095973014831543,0.03845810890197754,0.039034128189086914,0.027765274047851562,0.03879117965698242,0.027280569076538086 diff --git a/results/combined/merges_timed/robert-bor/csveed.csv b/results/combined/merges_timed/robert-bor/csveed.csv index 476b3a124a..d34666d6cd 100644 --- a/results/combined/merges_timed/robert-bor/csveed.csv +++ b/results/combined/merges_timed/robert-bor/csveed.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 105,refs/heads/master,b99c0263d2893ce82b0cb4e45d34cc526acd4704,520c0ce425155f6353e4cafda41d9c3895a30051,84a334ca087a8e2a90ba5bbd7e3eaaf7e539b42b,,True,True,True,15,47,194,2,True,15,Tests_passed,ad361a9cb59de8aeb762342b49184f0238d2129b669d483c6d9acbd85d40b2a9,True,Tests_passed,7ebce14368dd8b9d3e5ae1585402e1da284244e452872a236d3804ac89850cfe,True,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,0.049590349197387695,0.050989389419555664,0.061864376068115234,0.03691887855529785,0.041390419006347656,0.040387868881225586,0.038573265075683594,0.17391324043273926,0.10534238815307617,0.5910487174987793,0.4040071964263916,0.07642197608947754,0.13741493225097656,0.04653334617614746,0.04558420181274414,0.04661130905151367,0.04696154594421387,0.04547905921936035,0.08272433280944824,0.5995345115661621,0.04556989669799805,0.04595828056335449,0.035161495208740234,0.04437589645385742,0.03677654266357422 diff --git a/results/combined/merges_timed/robobees/simbeeotic.csv b/results/combined/merges_timed/robobees/simbeeotic.csv index 4e56cd1698..1bc327f6f9 100644 --- a/results/combined/merges_timed/robobees/simbeeotic.csv +++ b/results/combined/merges_timed/robobees/simbeeotic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/autoheli-dev,d8cc9db915bb7f2fd6a528df8c173d1c08407ec4,749d71d29f5e2109d744395ac371452d3e53d26a,d7ac67438b4894fe659d052451d89690ddc44da1,,True,True,Tests_passed,726d92b4178350acde3e24a7432e7fe303490b084cec6f579f4f67370afb0869,True,13,144,836,4,True,Tests_passed,2715556027cc8e037d2c518193feafac6679a0313e79981c996a000317ced594,True,13,True,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,394a5b5b7582767cd21bf0fbd0de2f0fed4bafc3e5b1db75d7ba496be32bf6dd,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,4c38f05f55337ff7069f8e35122b28046f8e8b7277ef3977c9b97094258e8152,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,890ceeb23bd7c4f9f5bfe64463466775243cdeb261ad24cd095043315d27011f,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,0.014538288116455078,0.1210625171661377,0.12198090553283691,0.12076807022094727,0.12173843383789062,0.12233924865722656,0.11960315704345703,0.19703125953674316,0.19800329208374023,3.3615498542785645,0.8329930305480957,0.17186713218688965,0.13615822792053223,0.05398297309875488,0.05496954917907715,0.05285477638244629,0.0529475212097168,0.054349422454833984,0.11745524406433105,3.4202682971954346,0.054705142974853516,0.05480456352233887,0.053858280181884766,0.05479145050048828,0.0528416633605957 diff --git a/results/combined/merges_timed/robotframework/javalibcore.csv b/results/combined/merges_timed/robotframework/javalibcore.csv index a469c9e347..19737eb513 100644 --- a/results/combined/merges_timed/robotframework/javalibcore.csv +++ b/results/combined/merges_timed/robotframework/javalibcore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/develop,84e942f595e4fb4db9da155f4a448a6d1d76dcce,11bf4ea41799866526a7c70d40d9c76fe8be7496,f7adc77f3618f17cdd9af0ae35a485b724292fa4,,True,True,True,53,71,3957,2,True,53,Tests_passed,4544f1fcd61d4753afee64ed9efd1cfdf3e41bb35cbbb187907d23e32a2b9e7d,True,Tests_passed,60f0efe8fec3f6f504ff9a33999ba55c423a8161516ac577cbbceed27502e8ae,True,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,0.03501152992248535,0.04582476615905762,0.033421993255615234,0.045256614685058594,0.05124378204345703,0.05075383186340332,0.04888558387756348,0.14262795448303223,0.05163264274597168,0.04602789878845215,0.42282867431640625,0.04855751991271973,0.1261742115020752,0.04192352294921875,0.042357444763183594,0.04266953468322754,0.04143118858337402,0.04289102554321289,0.06693696975708008,0.0549468994140625,0.04152393341064453,0.039150238037109375,0.04041862487792969,0.04198479652404785,0.04024553298950195 diff --git a/results/combined/merges_timed/robotiumtech/robotium.csv b/results/combined/merges_timed/robotiumtech/robotium.csv index a6c6f4faf0..3b6e4f59b9 100644 --- a/results/combined/merges_timed/robotiumtech/robotium.csv +++ b/results/combined/merges_timed/robotiumtech/robotium.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,True,20,147,760,2,True,20,Tests_passed,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,True,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,True,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,b6d677a147b41a9fa7be61498d50cd062463766a02174677829065710a989c58,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,1ca63c9e064947f5c49946817bfb9487df93659f03e4b7269ef366390da3a540,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,0.03948783874511719,0.054152727127075195,0.048850297927856445,0.04844975471496582,0.05275583267211914,0.05498552322387695,0.03831171989440918,0.1726078987121582,0.10677576065063477,0.9639925956726074,0.8779711723327637,0.07491803169250488,0.11920595169067383,0.04036068916320801,0.04047703742980957,0.03930497169494629,0.03932785987854004,0.039098501205444336,0.07143521308898926,0.9042356014251709,0.038393259048461914,0.03931736946105957,0.038942575454711914,0.039008140563964844,0.037920236587524414 diff --git a/results/combined/merges_timed/robrua/orianna.csv b/results/combined/merges_timed/robrua/orianna.csv index 74ccf4eb4b..9bc8904cd3 100644 --- a/results/combined/merges_timed/robrua/orianna.csv +++ b/results/combined/merges_timed/robrua/orianna.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 45,refs/remotes/origin/pull/14,9a25a31a4be7ef7572044ef26d11ba55395bbc59,ce872febd076a19ce53c7024de2f8e06569a1d12,87726ac82247ab8002fb2101b3e6a3167bf8ba85,,True,True,True,17,53,3747,2,True,17,Tests_passed,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,True,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,True,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,0.043892860412597656,0.045764923095703125,0.05271124839782715,0.03854656219482422,0.0498347282409668,0.013085365295410156,0.02253413200378418,0.16094493865966797,0.09457612037658691,1.1646265983581543,0.6426763534545898,0.09634876251220703,0.1344001293182373,0.06477499008178711,0.06582522392272949,0.06270313262939453,0.06542754173278809,0.06152749061584473,0.10492801666259766,1.1428580284118652,0.056375980377197266,0.06177163124084473,0.048072099685668945,0.04329538345336914,0.050244808197021484 diff --git a/results/combined/merges_timed/rocketscience-projects/javaslang.csv b/results/combined/merges_timed/rocketscience-projects/javaslang.csv index 4270de8895..d77e8040a1 100644 --- a/results/combined/merges_timed/rocketscience-projects/javaslang.csv +++ b/results/combined/merges_timed/rocketscience-projects/javaslang.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1174,refs/remotes/origin/pull/2745,fee08d022774a000e65551fc71a74ae5f865866a,e07b9e2b96211219cc1b5fc87d1e38994ec74dd5,26181f14b9629ceb729a73795d3854363c7dce0e,,True,True,True,331,1178,18550,8,True,331,Tests_passed,758362099cc2193eaa631d765a90f790a2c19d3f9c488a4f3e57827c1a73a193,True,Tests_passed,e85dfc6d60d80af3f858131d96a7646c775e8302f46f8200fedcd1612d4c7ebc,True,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,fcbaa247b4d7599e51ab63b56f2d7740f583505fe211058f4743efe230b928fe,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b3b3cdc5a6968b8e88a43951fcbdf9d5fb68ee982576cbf1a69ddfed90a0cbd9,Merge_failed,c0f68e5f20c9c6ec7c98ad83ed32b6674fd42ea187b6ba73462e4a96aeb8062c,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,89a962605d95493b3babec67589220a84eeae458bd7921e367f22e7096a6c8df,Merge_failed,e3704272f907370a7a6481847a32a4af07242bd568f79f02d50f419ee907b746,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,0.07187533378601074,0.06670427322387695,0.07304763793945312,0.08113884925842285,0.0754232406616211,0.07819938659667969,0.07961392402648926,0.4189724922180176,0.46135687828063965,7.614904403686523,21.11718225479126,0.33881545066833496,0.2513899803161621,0.15327858924865723,0.15215826034545898,0.1499788761138916,0.15601849555969238,0.1518869400024414,0.35059356689453125,7.3516716957092285,0.1432936191558838,0.14644408226013184,0.10671663284301758,0.14208078384399414,0.09345221519470215 diff --git a/results/combined/merges_timed/rometools/rome.csv b/results/combined/merges_timed/rometools/rome.csv index aa0b47bca1..9df7081cd1 100644 --- a/results/combined/merges_timed/rometools/rome.csv +++ b/results/combined/merges_timed/rometools/rome.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,0de36f1a02e1eb86a90adb362239474aa26151ae,e3dc44cf971a74e5fd7e3af7b7ba3835ffbeaa30,20e07a97e16fa762d275ba80db8e7f6dd35ac4ac,,True,True,True,112,231,638,2,True,112,Tests_passed,c775a4537ef113cff864923701a73b269577fcb23ae68a103fa49256668e4a63,True,Tests_passed,29f56cc1c4f1e7d62e4ea59508aef9e70235f4f1df9de25606471fc7bb09313d,True,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,0.03630709648132324,0.032739877700805664,0.04429912567138672,0.0415654182434082,0.03151702880859375,0.033658504486083984,0.0391085147857666,0.11873912811279297,0.08716559410095215,0.0431210994720459,1.3751721382141113,0.11194753646850586,0.18119239807128906,0.0789949893951416,0.0788114070892334,0.07945752143859863,0.07927942276000977,0.08200216293334961,0.13204121589660645,0.09817719459533691,0.07561802864074707,0.07716894149780273,0.0711817741394043,0.07465100288391113,0.06884169578552246 diff --git a/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv b/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv index 95e9518367..94180d33a1 100644 --- a/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv +++ b/results/combined/merges_timed/romix/java-concurrent-hash-trie-map.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,03335a9caa6fc867344c8c015d6dfc2d11ab062f,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,3e7efd43b645924502c3acc7e5ebe211090e855c,,True,True,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,True,7,32,149,3,True,Tests_passed,fdee5637855972184693f2c625baaf20f7f2e00089e0cccc6e07543bcfe68556,True,7,True,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_failed,69c07fbdef179b87e2d682ee7b17b6769f947783ea72d92695207477f1c02723,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,0.011383056640625,0.01169729232788086,0.012000560760498047,0.012270927429199219,0.011901617050170898,0.011997461318969727,0.012024402618408203,0.05214953422546387,0.12515568733215332,3.345703363418579,0.5100531578063965,0.10919427871704102,0.13285303115844727,0.050095558166503906,0.050118446350097656,0.049146175384521484,0.04932451248168945,0.04906940460205078,0.09890341758728027,2.9313461780548096,0.0488286018371582,0.04814791679382324,0.030091285705566406,0.04893970489501953,0.02917027473449707 diff --git a/results/combined/merges_timed/roncoo/roncoo-pay.csv b/results/combined/merges_timed/roncoo/roncoo-pay.csv index b20c319094..11a2695985 100644 --- a/results/combined/merges_timed/roncoo/roncoo-pay.csv +++ b/results/combined/merges_timed/roncoo/roncoo-pay.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,True,454,1016,81789.0,15,True,456,Tests_passed,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,True,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,True,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,bffba307306921b7593bceea518e05510a309b6499e94beb6a41d0b37c1f8cf1,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,d64afbee676d3a35e2a6eab85c813863cc5d9c85b18d2274df5276be87def460,Merge_failed,473bcd20a3c891fc4a75e5c3f18c547ca2c4d63e092bd4c957e3c82de3f04b3b,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,0.07822179794311523,0.07942938804626465,0.08997750282287598,0.100250244140625,0.09738993644714355,0.08235287666320801,0.08982300758361816,0.95804762840271,0.9595131874084473,3.383166790008545,4.5080249309539795,0.6279795169830322,0.3327341079711914,0.2281506061553955,0.22977948188781738,0.22601079940795898,0.21593999862670898,0.22484707832336426,0.5184924602508545,3.327563524246216,0.2158660888671875,0.21607494354248047,0.1927027702331543,0.21155452728271484,0.20173096656799316 diff --git a/results/combined/merges_timed/rschreijer/lutung.csv b/results/combined/merges_timed/rschreijer/lutung.csv index a9d3202dde..fa349aeb14 100644 --- a/results/combined/merges_timed/rschreijer/lutung.csv +++ b/results/combined/merges_timed/rschreijer/lutung.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,70e3458c0a4c096d7b1ca7426e61f5a876025fe6,8048493cf975b711e28a79be0705ff7ea8a5b27c,db1238d7be4edb64826603189f3cb48e9d8de7cd,,True,True,Tests_passed,e800d7eac14e7f1d8ba73ca1de478b3673b7b935b95591d3e29b3e8a576db623,True,10,168,601,2,True,Tests_passed,391cba75427c89f6f270f662d424c3f8983726cf48002fc8e100e0b6b8601ec9,True,10,True,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_failed,8911fba26592cd8378f5490a7da6eed0ad35a942c670a4dcbf6bd52dc78f4d23,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,0.052941322326660156,0.04083108901977539,0.05146288871765137,0.04053926467895508,0.04784440994262695,0.04294228553771973,0.04652261734008789,0.17083072662353516,0.11686921119689941,0.9065563678741455,0.5250186920166016,0.07260441780090332,0.1409471035003662,0.044307708740234375,0.04264950752258301,0.04402661323547363,0.0441434383392334,0.04457831382751465,0.07780122756958008,0.8827235698699951,0.041960716247558594,0.04244875907897949,0.031766653060913086,0.042745351791381836,0.03239893913269043 diff --git a/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv b/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv index e332e2d4a7..1382842720 100644 --- a/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv +++ b/results/combined/merges_timed/rtyley/android-viewholder-listviews.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,b5a40bb804382b21052c99890298fc5afcd4b6b1,f1a4013c4f3a8d85879574f36c43e60214116b9e,a357f921c5ce966b1e8e61650d5541fa02ab2f27,,True,True,True,4,5,16,5,True,5,Tests_passed,52852961f97f69652d8b6831bbef8ccb09bf651c37221b84087567baf5236619,True,Tests_passed,5551da408aa8f3ac531f4cc4413936307e9a8553eaae4007eedb2fe74be3336a,True,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,407bbf3e6d1c5ada81b2d459b23ef25666e9b6f3136ae6bc83a772c9fb9d3c75,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,1c9aa07d0fed893515971bde710cbe56e61e57e11b814b3c37dedf9774a6039c,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,efa6444b492b195b0736f3b05956ec094654a59e17548665bc9dafc94f3405fe,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,0.008880615234375,0.008183479309082031,0.008372783660888672,0.008173942565917969,0.008391618728637695,0.008042335510253906,0.008249282836914062,0.06107211112976074,0.18434929847717285,1.525156021118164,0.26735615730285645,0.13643836975097656,0.12477850914001465,0.04563713073730469,0.046404361724853516,0.046239376068115234,0.046492815017700195,0.0462346076965332,0.10625696182250977,1.4680211544036865,0.046033382415771484,0.046009063720703125,0.03858304023742676,0.04653334617614746,0.038388729095458984 diff --git a/results/combined/merges_timed/ru/casanova.csv b/results/combined/merges_timed/ru/casanova.csv index 0f032ba080..98ded05ee8 100644 --- a/results/combined/merges_timed/ru/casanova.csv +++ b/results/combined/merges_timed/ru/casanova.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,455f0369c9e8ebe41eee39f890ceb6ddd9310eda,d2932adf48fc17976dc74f3e965030522fcbfe12,1da9ce5a7695fdbab0c29966a594ca5fed796faa,,True,True,True,53,60,4468,2,True,53,Tests_passed,1149d181575fe104cc30e2e433f5aa9b440c4bd53725e9ff539477759a8542bc,True,Tests_passed,cfa82e0dd62db04aed04507c99da6acbe43353205595ef3e0a9a26fed0c26f2e,True,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,0.027199506759643555,0.04771256446838379,0.03955221176147461,0.05595588684082031,0.05283522605895996,0.050324201583862305,0.06424975395202637,0.16228556632995605,0.10109663009643555,0.6705255508422852,0.32062745094299316,0.11914277076721191,0.1721513271331787,0.08458924293518066,0.08552408218383789,0.08140420913696289,0.08135843276977539,0.08707928657531738,0.12737321853637695,0.7114808559417725,0.07467412948608398,0.07770466804504395,0.07098650932312012,0.07568883895874023,0.06745314598083496 diff --git a/results/combined/merges_timed/rubenlagus/telegrambots.csv b/results/combined/merges_timed/rubenlagus/telegrambots.csv index 7b1b49b683..431974a7e0 100644 --- a/results/combined/merges_timed/rubenlagus/telegrambots.csv +++ b/results/combined/merges_timed/rubenlagus/telegrambots.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 128,refs/heads/master,15fe637998d55ef567d4e499e948c9d183b99fb4,ef1bd09a6ae312da059076e82de2ffafd98f45e8,fc12de81c0ab1c076a974a4505a8eb48ab567290,,True,True,True,41,151,2213,5,True,41,Tests_passed,9e020980e01f698749561bf794806ac92be32dc608dd0a1da648123c1f9bf19a,True,Tests_passed,856f1c857d9252741c52b9ee99e1dfd2d0245bd15f640f73fbdc53fc75b35584,True,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,6542d9032d5b7897ff29c730a604f9019df0fad43c7724f9a7089525b8e0ac04,Merge_failed,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,6e59f1fdc4f915228c35b250be077d297700e9804c6978d5ba6b65793b6fc615,Merge_failed,0a856019c4d8c9f4ac65faf6fff261a9f7cb8cdfb8c7290101f7a562118a7ce8,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,21d365e47aec4e757b203b83f79fd300727c72abd8cecc9341ba7f57574353fa,Tests_failed,773883e34cf9868d904cab7d9bd74d75fc486df14a6b7af3ff5604c6c43ce30b,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8aa664319f0021c7604ee638ba66a490cdd4aef4541dc18a9948d8469dc38803,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,Merge_failed,8a93d583b2a038d5b120f35cdc413ecd771617d676e9ecb2e77efc8dd8a69e07,0.03579282760620117,0.05072498321533203,0.0315098762512207,0.04394698143005371,0.04407620429992676,0.04171252250671387,0.05278635025024414,0.3486945629119873,0.27482008934020996,4.423612117767334,3.58838152885437,0.1912987232208252,0.17011237144470215,0.08330726623535156,0.06303668022155762,0.06493186950683594,0.08384513854980469,0.06437325477600098,0.14880037307739258,4.010519981384277,0.08090424537658691,0.06222844123840332,0.04090142250061035,0.0810401439666748,0.04209637641906738 diff --git a/results/combined/merges_timed/ruedigermoeller/kontraktor.csv b/results/combined/merges_timed/ruedigermoeller/kontraktor.csv index 46fd91a58f..de6278a96c 100644 --- a/results/combined/merges_timed/ruedigermoeller/kontraktor.csv +++ b/results/combined/merges_timed/ruedigermoeller/kontraktor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/java14,b8ed9bb629b78fb9e64991252a2554260323ead0,d3ac25c82aa6fd921352e9bdf7ee3878397ebf1c,bc9d0d697ad281de065610ca8fb2298ff38f7434,,True,True,True,20,52,474,3,True,21,Tests_passed,dd46d9e739e4bb8a61c233ed3173d3c74d0c9cb34c6e225900f959e80d59054e,True,Tests_passed,966a793f07c9b1016df2e5df699c8b8159be2575f6c8fe2f0343d8d31b9199fd,True,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,0.06696701049804688,0.05681037902832031,0.05919647216796875,0.05419492721557617,0.053261518478393555,0.04517054557800293,0.06209278106689453,0.19669556617736816,0.11977624893188477,1.070711612701416,0.5591239929199219,0.08571195602416992,0.15008306503295898,0.057755470275878906,0.05455589294433594,0.05562472343444824,0.0545809268951416,0.05375337600708008,0.09388279914855957,1.0459644794464111,0.05398440361022949,0.05461406707763672,0.04174947738647461,0.056385040283203125,0.0417330265045166 diff --git a/results/combined/merges_timed/runeflobakk/motif.csv b/results/combined/merges_timed/runeflobakk/motif.csv index aa90ccbeb8..79e48e1938 100644 --- a/results/combined/merges_timed/runeflobakk/motif.csv +++ b/results/combined/merges_timed/runeflobakk/motif.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/dev,2df475c5347893eec68348da93344790f6957fbc,e2e547e3c14524f255e0f6ca55c99bcd6ef0c338,61747cd4ffb978ae2dfce019d190825ee4d620d4,,True,True,True,27,94,777,3,True,27,Tests_passed,520d919493b5743dfc0929dcd4f9e7bdc96c9910728c42bd8b18ef1d5c5f3286,True,Tests_passed,88b0b166c1d41b07354158ae5b7be8757cd81644f853c4a8a7fe2f412a5401bf,True,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,0.011472702026367188,0.011249542236328125,0.012975454330444336,0.012786388397216797,0.013503313064575195,0.013033151626586914,0.012988090515136719,0.05133938789367676,0.11944770812988281,1.323204517364502,-1.0,0.10939192771911621,0.14066624641418457,0.05542445182800293,0.05513572692871094,0.054375410079956055,0.05665254592895508,0.05477428436279297,0.10653424263000488,1.3571083545684814,0.05341506004333496,0.05327773094177246,0.036275386810302734,0.05374026298522949,0.03557896614074707 diff --git a/results/combined/merges_timed/runelite/runelite.csv b/results/combined/merges_timed/runelite/runelite.csv index cf91fc58fc..a1c362150a 100644 --- a/results/combined/merges_timed/runelite/runelite.csv +++ b/results/combined/merges_timed/runelite/runelite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,Tests_passed,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,True,219,1354,9917.0,2,True,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,True,219,True,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Merge_timedout,,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,0.06751799583435059,0.07097363471984863,0.09463286399841309,0.09535408020019531,0.09900164604187012,0.0975186824798584,0.09487247467041016,0.17764544486999512,0.13149070739746094,1.758108139038086,-1.0,0.20857787132263184,0.2987391948699951,0.17223215103149414,0.16694402694702148,0.1676480770111084,0.17417120933532715,0.17408084869384766,0.23957419395446777,1.6527063846588135,0.14288592338562012,0.15121245384216309,0.15064644813537598,0.14026093482971191,0.14035272598266602 diff --git a/results/combined/merges_timed/ryantenney/metrics-spring.csv b/results/combined/merges_timed/ryantenney/metrics-spring.csv index 5f1cfccfc5..c9e9d9151b 100644 --- a/results/combined/merges_timed/ryantenney/metrics-spring.csv +++ b/results/combined/merges_timed/ryantenney/metrics-spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/v3.1-maintenance,5244ad0b109cc2814221012c959aee61705efe5b,32f5ac65aefa8fa8a9b4d96ad60eac5aeb01f096,ccd21978ea0d9b2ec4e5680e81093ae1c54f0c7c,,True,True,True,75,171,1945,11,True,76,Tests_passed,7487bf355c7c49ad1c8f49aff0184e5177884159b82a2abc679229a05bd1160f,True,Tests_passed,07606770b047e7a96c5615ad76379d1f66c829ada41d83970efae9a6657350af,True,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,a80ca6f0954bd07233d28a2e94c059fe84fbe32dd2a5592eeb093667c72721b0,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,bf643a544874ca6efd201eb6eb7d5a0964593049a808a217b0d0f179c7b0b1e2,Merge_timedout,,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,882c79888f26166916b791edc5b4bdcd1ef606c305515bcba9e77b81a8d4d891,Merge_failed,d9849779c9a83752351625200a826d8b177a9a2243a7ec50e5559b91401fd166,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,0.031641244888305664,0.04033970832824707,0.036911725997924805,0.04186272621154785,0.021524906158447266,0.034440040588378906,0.02434682846069336,0.3970625400543213,0.6162712574005127,3.1117892265319824,-1.0,0.3523709774017334,0.18639206886291504,0.10763764381408691,0.1053168773651123,0.10474014282226562,0.10613155364990234,0.10448360443115234,0.2901620864868164,2.9516892433166504,0.10462450981140137,0.1061546802520752,0.05413103103637695,0.10619401931762695,0.055333614349365234 diff --git a/results/combined/merges_timed/rylinaux/plugman.csv b/results/combined/merges_timed/rylinaux/plugman.csv index 8f4a6ba5c4..3544481286 100644 --- a/results/combined/merges_timed/rylinaux/plugman.csv +++ b/results/combined/merges_timed/rylinaux/plugman.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/remotes/origin/pull/53,cd097a5e02123e8341949738d8b0a91b9345b684,b4eb99945c41fc6f4006bdc4c89e9afedf372020,940979e30479e718afcfa6bb71a0b4bd2529f23e,,True,False,True,3,6,22,6,True,6,Tests_passed,369094163191050836bc326e7c0619a31ef18e9d12b0d546acec62ddb5104a4c,True,Tests_passed,5e9443034202cc68c8596fef46a595d4e3fb6046792be089028c0162847147a1,True,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,82334ce55c1e61b8c0c1b52f5fa0786686ecae2f1108a6ba8fea9b798b3286f7,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,bec72c1ec71f1cd2e66a81af3a01c8062ef8b35953f3599ef677f9de9b67d1da,Merge_failed,d7269860ca5eb0280b4dc0e9ba65f3c325fe5fc61c637c05c5dcb516b70d2ec4,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,0bbb884e2d80f415e38b72522e66315cec632c57c5f40c37ddaf108838d12cf2,Merge_failed,03a229fb74c8bff77b1a7208efddc242513d16493a7a1e8f4eec5412338dee9a,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,0.013731956481933594,0.0414731502532959,0.036864519119262695,0.03207874298095703,0.015032291412353516,0.04126167297363281,0.0380854606628418,0.23420453071594238,0.1683812141418457,0.6470465660095215,0.2673990726470947,0.10349106788635254,0.12443947792053223,0.04116225242614746,0.04159736633300781,0.04241943359375,0.04235243797302246,0.04228353500366211,0.08948540687561035,0.6438901424407959,0.04303550720214844,0.042362213134765625,0.04175925254821777,0.04354405403137207,0.04130220413208008 diff --git a/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv b/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv index 332406755c..4ebe2ec146 100644 --- a/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv +++ b/results/combined/merges_timed/s4u/pgpverify-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 145,refs/heads/master,86423815da5ac60c8f09cdf198e6d08a50f7ff87,bc4854a58fccc72f9c68290fd4e68e6cdc828978,086cbea80d0b32b10041a57dc9e71d9c8d20ba0d,,True,True,True,10,62,839,2,True,10,Tests_passed,8615ffce9fe64589a6f708b6ac559cb2c6cfb0785d0284987708c98a52a4933b,True,Tests_passed,7bef9b09c737852d75a16f57e98c98c1979c577a83f6e945d4ec4704f32d1597,True,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_failed,c6048999a833894694521fcfe9a2a2a5ff6d8e26bfe27a4f222f6dab67989aa5,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,0.04601168632507324,0.04321694374084473,0.04431486129760742,0.04833197593688965,0.038786888122558594,0.04589557647705078,0.04889059066772461,0.1651134490966797,0.10788750648498535,0.6902163028717041,0.5452384948730469,0.09153389930725098,0.15256929397583008,0.05730152130126953,0.05598187446594238,0.0589299201965332,0.04413104057312012,0.05733990669250488,0.09858989715576172,0.7187771797180176,0.05406594276428223,0.04891800880432129,0.04725503921508789,0.05430126190185547,0.04574012756347656 diff --git a/results/combined/merges_timed/sachin-handiekar/jinstagram.csv b/results/combined/merges_timed/sachin-handiekar/jinstagram.csv index a5525e2b40..fad8e21122 100644 --- a/results/combined/merges_timed/sachin-handiekar/jinstagram.csv +++ b/results/combined/merges_timed/sachin-handiekar/jinstagram.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 34,refs/heads/master,8a29221353368d4d290973e4d8ebe90325567793,1758fa70e7a74e72c0a4ffad99cf6c7435676173,840c591a5e5cf424f5f1745ec911a79d2cd1185d,,True,True,True,82,771,9732,2,True,82,Tests_passed,9e6663596a779a6b3091f01f6e904946348a9e3dc9e332460762642c27114cd7,True,Tests_passed,0bf72301352fd98232923cf9535589946937d73fc1a2bb5c15989820dcddca5c,True,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,0.015666484832763672,0.014853954315185547,0.01722407341003418,0.017493486404418945,0.018180370330810547,0.017844200134277344,0.01782369613647461,0.04449820518493652,0.07184457778930664,0.5612952709197998,4.393582820892334,0.08412742614746094,0.13687682151794434,0.05342912673950195,0.05144977569580078,0.052253007888793945,0.0513157844543457,0.05382704734802246,0.08468508720397949,0.5622463226318359,0.04992032051086426,0.049413442611694336,0.04149222373962402,0.04679703712463379,0.039394378662109375 diff --git a/results/combined/merges_timed/sailthru/sailthru-java-client.csv b/results/combined/merges_timed/sailthru/sailthru-java-client.csv index b233bff74c..c1d00ad1a3 100644 --- a/results/combined/merges_timed/sailthru/sailthru-java-client.csv +++ b/results/combined/merges_timed/sailthru/sailthru-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 55,refs/remotes/origin/pull/4,ee1f9176009eddb98d87251dfd9d8476b8684fc3,59fcb2eaa94d5b401e3a510f5deef270c613d727,2281a3407450b6811fa6483d0b54c4f954d1deaa,,True,True,True,15,39,267,2,True,15,Tests_passed,00e414fbd0762d5af9bee125b260a97e47b17f07b177702e3f360c674c16120e,True,Tests_passed,4d36e446f25b93fb1ae090e5f822e43e090098b1b84e8390d7d0413b4ec89b1c,True,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,ec276bb69517c9e6c6592b029a625de165c6a3d4cae8acd23bdc702bb806fb0a,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Tests_failed,948cade4af456ce2edad58c37373f98b646f102618dda4ffd0b3f708618a2c37,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,9e205a122caeef015eff5d26e981b7f62d66241c034964d0760b76d8685f1597,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,0.009576082229614258,0.030141115188598633,0.04052925109863281,0.03221845626831055,0.04212784767150879,0.032663822174072266,0.027092695236206055,0.1670088768005371,0.10263562202453613,0.5490584373474121,0.3259775638580322,0.07673048973083496,0.1139979362487793,0.032987117767333984,0.03333592414855957,0.032895803451538086,0.03324007987976074,0.034249305725097656,0.06535458564758301,0.5588798522949219,0.03419208526611328,0.034567832946777344,0.032164812088012695,0.033773183822631836,0.03138017654418945 diff --git a/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv b/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv index d07544c539..07c62491cd 100644 --- a/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv +++ b/results/combined/merges_timed/salyh/elasticsearch-river-imap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,8827bca9e525e2306ce7d2ff8089317e31092489,fc5f5c074e841ecdc2d686ed07f4cceff940a4e9,d0a3a8b63781fc75f3058208e41a7e1be22e0770,,True,True,True,24,147,623,6,True,25,Tests_passed,53ac098e9cbc12d5d43d6d6100bfe330b8ac0bb51b8c4bdb67bd51b951193d2f,True,Tests_passed,8a52517f62352329303c5aed8f052af3a9c89f39e9bc6d209a59e0c6bb4a67ea,True,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bd83d0006c9ed814acfeb5ca9d9cd93e61503f6e366e9671f220ea99cd421df6,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,e4dad75633a02c7eb222e80ea1be70cc3f578ce271be61aaa30dfcb2f0686823,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bcbdeecd3344870d6deb209985f0d98d66c53e813aaf426a688733ffc575d118,Merge_failed,e744fa9c99211279645f29d9634a88b2632483cafb411dfa4ffc0d180cc7dfac,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,0.012491941452026367,0.012009620666503906,0.012743234634399414,0.012562751770019531,0.012820959091186523,0.012827157974243164,0.012740373611450195,0.07577943801879883,0.23171544075012207,0.7637197971343994,0.6568710803985596,0.16579937934875488,0.1424860954284668,0.0635230541229248,0.06411528587341309,0.06432676315307617,0.06162524223327637,0.06314706802368164,0.14125704765319824,0.8275012969970703,0.06116342544555664,0.06032967567443848,0.04758119583129883,0.06311440467834473,0.04587721824645996 diff --git a/results/combined/merges_timed/sammthomson/semafor.csv b/results/combined/merges_timed/sammthomson/semafor.csv index 4a3e755482..c6510a17f6 100644 --- a/results/combined/merges_timed/sammthomson/semafor.csv +++ b/results/combined/merges_timed/sammthomson/semafor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/remotes/origin/develop,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,4db260dd91b978ccd72a0a279dd9546413efd238,0a53b56bfd23a41697bbd84f76773d09ce8bac86,,True,True,True,183,573,18288,86,True,223,Tests_passed,361a0fbfbce9327bf5ea2ea8f428c5bef03568a96aae5eed0937e0ea1f4ccff8,True,Tests_passed,3da49e3a26b0f1705aea4d02707091d6b0b95da1a4b5896076b02aaeacff2556,True,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,630cc8fc1402c6fb6d7ebc0f6c7409b58833f43456c599eb2076fcfd698de7db,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,2ea318638e1d329fd93eb74484304e897e40988feb1012537f81c078cff69d60,Merge_failed,58e87a7dde4a6fcc4024b24dc922b2296bd59a02d76a4d14515d65e24413237f,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,6359a45b821e2fb5bb462e70e0528c6e4510d0c6cafaa0ab9715fe5608f39280,Merge_failed,fb0e04c587e0dfbe00f275269a2883fab13b84496f2fd4867cb533b3c4425c33,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,0.03727293014526367,0.03716540336608887,0.052245140075683594,0.051882028579711914,0.05320882797241211,0.05187535285949707,0.051692962646484375,0.25905656814575195,0.5947272777557373,2.0264406204223633,2.054007053375244,0.5992457866668701,0.4107801914215088,0.32682323455810547,0.33199143409729004,0.3260636329650879,0.32930850982666016,0.3291645050048828,0.5333762168884277,2.29795503616333,0.31961631774902344,0.30884718894958496,0.1245427131652832,0.31563329696655273,0.1269547939300537 diff --git a/results/combined/merges_timed/samskivert/jmustache.csv b/results/combined/merges_timed/samskivert/jmustache.csv index 0d23ff1826..58165c2b39 100644 --- a/results/combined/merges_timed/samskivert/jmustache.csv +++ b/results/combined/merges_timed/samskivert/jmustache.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,940af397c4c27995bcf56fb26151d7a98a662e8a,c8915ffc3c76750c7c795225fe17db162dff43a5,d1d72031f209d864ee721c40cd9ce1e174383577,,True,True,Tests_passed,7754199c00a1bf066a8ad588e6ab14cf4ba3dd70bd0b0cf725600cfcd3b2fd0b,True,9,40,297,2,True,Tests_passed,c66c21a53b5ae8fb1d0424331487e954703c9cbd188aba10271ffec58818bc38,True,9,True,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,1810bb53c3441173b5e308c9053b7623ceca657b6e9855c6671ba3605f2a49bc,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,0.049575090408325195,0.03847074508666992,0.04694533348083496,0.04808807373046875,0.049124956130981445,0.04333782196044922,0.04963040351867676,0.17274999618530273,0.11419439315795898,1.864311695098877,0.6583638191223145,0.07622385025024414,0.11859822273254395,0.045035362243652344,0.04513406753540039,0.04425835609436035,0.04477667808532715,0.04571938514709473,0.07753825187683105,1.6900634765625,0.04388618469238281,0.04410219192504883,0.03315448760986328,0.043154001235961914,0.03287458419799805 diff --git a/results/combined/merges_timed/samskivert/pythagoras.csv b/results/combined/merges_timed/samskivert/pythagoras.csv index f61e9b96ef..ea7bed2555 100644 --- a/results/combined/merges_timed/samskivert/pythagoras.csv +++ b/results/combined/merges_timed/samskivert/pythagoras.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,c521fcd74ec43af2196b7dac29bffc6f2aba1643,402711b76630c2c012b4fb1f64d2ac51a7df4ba1,923dbc128472ae335d035dd934be0bf4132d204a,,True,True,Tests_passed,a427d656beefa5f9b2410d95fcd99403d1504ca39879adcc512d52bff3bc8f17,True,53,87,1125,4,True,Tests_passed,7fa68889ee7c8397c49dd468bf7ef35fb853896a5cd817d0a887b875aef29284,True,53,True,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,0.05650043487548828,0.061684370040893555,0.055864810943603516,0.05786609649658203,0.05172228813171387,0.06251335144042969,0.06187105178833008,0.2819046974182129,0.22982025146484375,3.7207083702087402,0.8484389781951904,0.14548587799072266,0.1576824188232422,0.0678255558013916,0.06582331657409668,0.06707262992858887,0.0670473575592041,0.06673359870910645,0.13837075233459473,3.5120370388031006,0.06565117835998535,0.06600069999694824,0.0400848388671875,0.0631718635559082,0.04089522361755371 diff --git a/results/combined/merges_timed/samskivert/samskivert.csv b/results/combined/merges_timed/samskivert/samskivert.csv index e4590f4531..0c3d9f6758 100644 --- a/results/combined/merges_timed/samskivert/samskivert.csv +++ b/results/combined/merges_timed/samskivert/samskivert.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,d870dd2fac79ec07a7e9143cda4efe41fd3e66d4,5356672130809882e5d7d169af7d6a447ce7ebd3,a641e6c502f06dae6a0b6a4af3ed827040b05877,,True,False,True,6,15,39,2,True,6,Tests_passed,63a4bed6ef8c8446082eeefd4694b5b4e761688a9c19390dc16680f6ec66bfc9,True,Tests_passed,44b1d457e4a08d09d8f1c79a39be686a004bc4b71011ce1d41c02a017b5a449d,True,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,0.011094093322753906,0.023093700408935547,0.02966451644897461,0.02831292152404785,0.011029243469238281,0.02857518196105957,0.028960227966308594,0.06164383888244629,0.06848812103271484,0.9480438232421875,0.3717832565307617,0.0723114013671875,0.13118410110473633,0.07511353492736816,0.04146313667297363,0.0691673755645752,0.07404971122741699,0.04146218299865723,0.11754894256591797,0.886749267578125,0.04031038284301758,0.04135727882385254,0.05582308769226074,0.04025983810424805,0.05982494354248047 diff --git a/results/combined/merges_timed/sander2798/enderstone.csv b/results/combined/merges_timed/sander2798/enderstone.csv index 3a5a91856d..b68f76d4c4 100644 --- a/results/combined/merges_timed/sander2798/enderstone.csv +++ b/results/combined/merges_timed/sander2798/enderstone.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 99,refs/heads/master,27f9c43869468a75a469b9d40b3e3e946da5c687,36b08dfce06b1bcc1db0c53ab0d0f2b59cfd659f,f4902dea1ad7f177a300c4cbb7c277a64a9c4cfc,,True,,True,55,165,,5,True,55,Tests_passed,7a2fdde0c9906c9993e90b50ffa6803141280240605c810fbb3258da579b9eae,True,Tests_passed,d3ca35b59a9aa89336ed7b328458e219d7050b4e24073d91fd2732d1533ffa88,True,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,126af9e6e901a0972448150c690a6b389362701ef4b2443666db54624d3a7309,Merge_failed,c372decd06b636833bebfe9a77d3df024ec1ee69e21872b2ad1cd39766804bb8,Tests_passed,96c5983484b0705bcd2a6ad38c3006641db944ad5829504c7747f96b4ee322be,Merge_failed,14b31f3efa0e86d709cf0ba43305a0fbb88055bb1166de77d85a2ef9a71bb7ad,Merge_failed,c372decd06b636833bebfe9a77d3df024ec1ee69e21872b2ad1cd39766804bb8,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,ef73794f30a0eb0e0782b43280bad6a84766c475053dbe16c06f2e2e6f007b7d,Tests_passed,96c5983484b0705bcd2a6ad38c3006641db944ad5829504c7747f96b4ee322be,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,6b3efc59308b2732f58660eefd321ced8192760939245251f39432bd9b917df0,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,Merge_failed,a1dda01b57c3f683c2ed0449aac47f56fe0ae3279afe7efccae4cecd5f26a4f3,0.047823429107666016,0.04610919952392578,0.053949832916259766,0.04184722900390625,0.04827761650085449,0.047757625579833984,0.055533647537231445,0.3588130474090576,0.296022891998291,3.302981376647949,0.6403002738952637,0.177565336227417,0.14145421981811523,0.06209611892700195,0.06317329406738281,0.06325626373291016,0.06211543083190918,0.06354379653930664,0.14728832244873047,3.2015867233276367,0.06370782852172852,0.06336307525634766,0.04777240753173828,0.06400656700134277,0.045578718185424805 diff --git a/results/combined/merges_timed/sandergielisse/enderstone.csv b/results/combined/merges_timed/sandergielisse/enderstone.csv index 5ff14738b6..cafa3076e4 100644 --- a/results/combined/merges_timed/sandergielisse/enderstone.csv +++ b/results/combined/merges_timed/sandergielisse/enderstone.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 102,refs/heads/master,7e7c2aae079a09a93b1d3811f8a1111a5e60d991,6a8556dc171591cb769f7b2485fd15118eee8230,615f68f0fd9d5b6b91d84ef4977586f6e442a04e,,True,True,True,6,22,464.0,2,True,6,Tests_passed,ec75da5ea2cdd38f3818529c0d9ca8ed06cc0f2c48412af89b3e7ba8d8b18439,True,Tests_passed,a999b9317237e00a1d31abc53c6bf985dc1432379483afacada2910fc3da4891,True,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,dff1a0f8d0267668f016ff85d2e324ecaebfe7afa7ffe51eddc640ec1fb45ca8,Merge_failed,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Merge_failed,d6fc330b13629b07a28c948dba3c8f46ec396a51ee5dd21af05a193427231a36,Merge_failed,90a52afe07936a171dd227c521323ce7c8b944dd2e224229622a39ec34ea30bd,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,8dced6af12d42296655b5ea650cbcbcc8d72730087a729f37975e781c8d72eb9,Merge_failed,b0e42ec6355ea928f52692ba5e6bc4e9b8128cfb02413252e883a04f6087b5f6,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,Merge_failed,5dce595049735b083f2d518981afc1052648f0bbbb2c485225da3fdca433f1ec,0.036665916442871094,0.04160928726196289,0.028784513473510742,0.04394388198852539,0.03448081016540527,0.04143643379211426,0.04108548164367676,0.16999602317810059,0.11867618560791016,0.8917727470397949,0.4736473560333252,0.07355499267578125,0.11669087409973145,0.036585092544555664,0.03731894493103027,0.03737235069274902,0.03786158561706543,0.03686785697937012,0.06899142265319824,0.8327419757843018,0.03711390495300293,0.03670668601989746,0.036174774169921875,0.037125349044799805,0.03573727607727051 diff --git a/results/combined/merges_timed/saucelabs/ci-sauce.csv b/results/combined/merges_timed/saucelabs/ci-sauce.csv index 9f1917b90c..39236c944b 100644 --- a/results/combined/merges_timed/saucelabs/ci-sauce.csv +++ b/results/combined/merges_timed/saucelabs/ci-sauce.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/main,46cc1e6e2bce0bd5819fb9f1045666e678ec0feb,940f484bf0fd29a946a0da6c46b7bc62d5b4beb2,24d160f16d457a770121267820d492c355c03814,,True,True,Tests_passed,9f470db15aa826b67b57e0bf6e8c7655fd2466d24b1ded3788639ae27449aa64,True,4.0,8,24.0,2,True,Tests_passed,37ff35992ce1a29d448c42f5381b0db7732dbdb8ed0c66af6b5e3bdc656c532c,True,4,True,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,0.13714170455932617,0.13630437850952148,0.1972336769104004,0.1914665699005127,0.19876956939697266,0.19763970375061035,0.1368250846862793,0.2197704315185547,0.18990278244018555,1.2191381454467773,0.4247748851776123,0.2031235694885254,0.1266939640045166,0.16862010955810547,0.1662883758544922,0.16621732711791992,0.16364145278930664,0.16637969017028809,0.19580912590026855,1.2432010173797607,0.1649491786956787,0.16601991653442383,0.15462827682495117,0.16766095161437988,0.15295124053955078 diff --git a/results/combined/merges_timed/sbtourist/journal.io.csv b/results/combined/merges_timed/sbtourist/journal.io.csv index e1df4c09e9..30c86c74c7 100644 --- a/results/combined/merges_timed/sbtourist/journal.io.csv +++ b/results/combined/merges_timed/sbtourist/journal.io.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,8bac7e41e6145a0dc0b5e315a5d683f54bb67172,a3ec3110f06cca7c0222f5d29d2d5621ae14baec,8e420a131d6b726abafd703d4fcaf060783f828d,,True,True,True,5,10,51,2,True,5,Tests_passed,f676f5ed2fd008313ad02325bbb63fd2f6fd868d69981e2cc6bedf98036c87a0,True,Tests_passed,715e2a1c763822ff0a9b88bcac1e5c96208d03328a6d5011538751fce365aa70,True,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,0.01446080207824707,0.04899263381958008,0.04634356498718262,0.04081416130065918,0.04824495315551758,0.061363935470581055,0.04815316200256348,0.1651003360748291,0.10224199295043945,1.7110404968261719,0.4245026111602783,0.0848846435546875,0.14346075057983398,0.05504035949707031,0.05327558517456055,0.05172586441040039,0.051788330078125,0.05309653282165527,0.09056472778320312,1.6126811504364014,0.05024552345275879,0.04995322227478027,0.04121136665344238,0.05130648612976074,0.03965640068054199 diff --git a/results/combined/merges_timed/schema-repo/schema-repo.csv b/results/combined/merges_timed/schema-repo/schema-repo.csv index 08e991dac1..de7d4d7b44 100644 --- a/results/combined/merges_timed/schema-repo/schema-repo.csv +++ b/results/combined/merges_timed/schema-repo/schema-repo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,f85f90da3d8305f4cd40870cf736123b49ae379f,451984af54baee5a10f21aba0da677f9299749fa,c467eb41915fc8ebb794f8121a4b9785f734540d,,True,True,True,10,23,110,23,True,25,Tests_passed,5e68d50ebde97a0439a267b07edc8028039372e44e046fdc4c4a40c983237b9c,True,Tests_passed,fd1c543fa3a9c99cbb59b31c78cff5aa5f2ba22d67d62ce8c7280e981870a0d6,True,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,9d9993feb89e5617e28c8bd0e73702e705d86c9c757d14698a11ef57dd312f8f,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,a13f319441127f91d03e922652735a99bc2450ff0758896fe31e3d65e4cc98bd,Merge_failed,c1a31a837ebe49b38ab9d9f84fe6bc0873c91fe15e628031efa21b5e4fa90b37,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,b82947ede293b70f13e23e36bbee8b84bb95052c7d3757dcfa786f7b35c9f063,Merge_failed,d3a9f20a3743204bd194235bf0eedab0633986844941f64f435fa48304e13827,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,0.045438528060913086,0.043648719787597656,0.049162864685058594,0.04714703559875488,0.055777788162231445,0.05204367637634277,0.04569721221923828,0.5482721328735352,0.46456432342529297,1.9948866367340088,0.6181650161743164,0.25810933113098145,0.15424585342407227,0.07340025901794434,0.07378387451171875,0.07561016082763672,0.07460761070251465,0.07392477989196777,0.20341157913208008,1.9303760528564453,0.07412028312683105,0.07468914985656738,0.05920004844665527,0.07587409019470215,0.05738258361816406 diff --git a/results/combined/merges_timed/scifio/scifio.csv b/results/combined/merges_timed/scifio/scifio.csv index 568e2a5533..9ccff9ec1b 100644 --- a/results/combined/merges_timed/scifio/scifio.csv +++ b/results/combined/merges_timed/scifio/scifio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/master,057b12613c528cbd789093ae86203d872e38ca2c,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,26064e23697a0eb96d77439e65ba0c097dfaf2c8,,True,True,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,True,335,370,1016.0,3,True,Tests_passed,cbb390cd83fcb1060af352741ec6d6ede6faae13f1dca8e90a7f74845067927a,True,335,True,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,0.045686960220336914,0.05408120155334473,0.06567049026489258,0.06084799766540527,0.055480003356933594,0.05959606170654297,0.062175750732421875,0.21261835098266602,0.160416841506958,1.3496289253234863,-1.0,0.16836261749267578,0.2169492244720459,0.1041102409362793,0.10975337028503418,0.10773038864135742,0.10736298561096191,0.10398340225219727,0.17182612419128418,1.4311203956604004,0.10337185859680176,0.10191893577575684,0.09004688262939453,0.10117411613464355,0.08516073226928711 diff --git a/results/combined/merges_timed/scribble/scribble-java.csv b/results/combined/merges_timed/scribble/scribble-java.csv index 86577c4f6e..c399af1cca 100644 --- a/results/combined/merges_timed/scribble/scribble-java.csv +++ b/results/combined/merges_timed/scribble/scribble-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 125,refs/heads/master,164250d0d03a6cfb879d3ea5c5672bac5b0133ec,ea369a7bd0505034d7ed548fb26eeaeb70198517,2742ef8fd2ec92aa2b7f7a208961892a18ca580c,,True,True,True,49,132,996,3,True,50,Tests_passed,485c573108b2bcaccd8fdc91276e529ebefadd9467142339db70cc76d9c2e48d,True,Tests_passed,2d15da0a135d5e7e7502878823725924c1aeb4c5f1cee77a2a77fc89a9f2306a,True,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,1557bd724e43000449b11c959e03d2c3b1398314a06ed9c3a355dfbc61803e22,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_timedout,,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,13f8f81110f4482ac0f29df6dd11b68de42978cd1f73e1dcf88cfa84f1029d7f,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,0.04323387145996094,0.04462933540344238,0.05592060089111328,0.06535840034484863,0.06730365753173828,0.03790402412414551,0.05307173728942871,0.2932107448577881,0.23778486251831055,2.908494472503662,-1.0,0.14039850234985352,0.13500022888183594,0.0508122444152832,0.05356597900390625,0.049588680267333984,0.049968719482421875,0.05135655403137207,0.1079094409942627,2.781979560852051,0.04961419105529785,0.0509183406829834,0.04785656929016113,0.04957461357116699,0.046633243560791016 diff --git a/results/combined/merges_timed/scribejava/scribejava.csv b/results/combined/merges_timed/scribejava/scribejava.csv index d43871678d..e9d6e8bfab 100644 --- a/results/combined/merges_timed/scribejava/scribejava.csv +++ b/results/combined/merges_timed/scribejava/scribejava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,0.03954148292541504,0.05458664894104004,0.031190156936645508,0.04810595512390137,0.06870579719543457,0.06032061576843262,0.06110382080078125,0.1753065586090088,0.12111067771911621,1.0731663703918457,1.183617115020752,0.08529210090637207,0.1450188159942627,0.06935310363769531,0.06794881820678711,0.05498361587524414,0.06586384773254395,0.05461597442626953,0.11019659042358398,1.020984172821045,0.05475902557373047,0.06181478500366211,0.04172968864440918,0.05325937271118164,0.05603456497192383 diff --git a/results/combined/merges_timed/sd4324530/fastweixin.csv b/results/combined/merges_timed/sd4324530/fastweixin.csv index 80e770b62b..8a18416084 100644 --- a/results/combined/merges_timed/sd4324530/fastweixin.csv +++ b/results/combined/merges_timed/sd4324530/fastweixin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 29,refs/heads/master,f4aa5c9e2a5e5009160e2d1062d540641e668ee1,53405b48ba245741340013ef7859304fd8cbdcac,c029ac02521337ef75360e6cd06e8631516b15e1,,True,True,Tests_passed,e53d14076a1f9a9cbf5d5b48f6a6124bf7171f48d69bd814edff2905f4ffc858,True,33,139,966.0,4,True,Tests_passed,db280075ffab9e7baace574aa523c1a00e8973c308285c92b27e3e9bbc4b3024,True,33,True,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,43382d7d3757c6beb3fffaf37d759bff9983f30f6d9f7d1988a849f318d8b337,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,6faa722c2e30b94a412009243385713eb393e883730961dac1655c3bcbfa0ea0,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,4a83937b54ae152daeb19c6bd98122155480556d9bda4c9db199896d560fbdf4,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,0.03698539733886719,0.04671454429626465,0.05628323554992676,0.03951740264892578,0.03972887992858887,0.055013179779052734,0.02562260627746582,0.29799938201904297,0.24357271194458008,1.7471787929534912,0.5181500911712646,0.1485583782196045,0.13849282264709473,0.05674934387207031,0.0527653694152832,0.05732583999633789,0.05197620391845703,0.05637168884277344,0.12430548667907715,1.744680643081665,0.05230712890625,0.056632280349731445,0.039534807205200195,0.05634331703186035,0.04292440414428711 diff --git a/results/combined/merges_timed/sdllanguagetechnologies/testy.csv b/results/combined/merges_timed/sdllanguagetechnologies/testy.csv index 62072f4a66..cb429a5bc0 100644 --- a/results/combined/merges_timed/sdllanguagetechnologies/testy.csv +++ b/results/combined/merges_timed/sdllanguagetechnologies/testy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 101,refs/heads/master,0bf477ccc77a6520539fe7e11709e07be71f85ae,1d0cfa99fb9f6603805e823f19d5b92bed401406,929cf45ec065c4cc0fa4ff743ff74c29a779d253,,True,False,True,10,14,44,2,True,10,Tests_passed,a840952329a3c1687284edc4df81aaa85b2898329208ac0d7083c27078709552,True,Tests_passed,5a8e4d345c41403be5c479598c4e8a3cdbc62d17ea753b6c7c495ff082dd4019,True,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,c07575d8c19e77706f8d026f4727b323f4e1587412bbb4f4ee9b7118fe08dabd,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,c07575d8c19e77706f8d026f4727b323f4e1587412bbb4f4ee9b7118fe08dabd,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,Tests_passed,b50f7dbe92ca64a8daeb92e053801c13bed7f3915b474cb49c80722d70acecd3,0.03060436248779297,0.05168795585632324,0.0533297061920166,0.036672353744506836,0.012773513793945312,0.04325389862060547,0.012861490249633789,0.09770464897155762,0.06959891319274902,1.1076595783233643,0.4608135223388672,0.25551724433898926,0.28887486457824707,0.22373390197753906,0.2187819480895996,0.16912269592285156,0.2154862880706787,0.22053885459899902,0.2928459644317627,1.170914649963379,0.08389472961425781,0.18158340454101562,0.07465243339538574,0.18025875091552734,0.14203977584838867 diff --git a/results/combined/merges_timed/seam/render.csv b/results/combined/merges_timed/seam/render.csv index 2bb32e9d29..b1e75d0c16 100644 --- a/results/combined/merges_timed/seam/render.csv +++ b/results/combined/merges_timed/seam/render.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,5371832457e9d1037dba8e7091513b6521e5af80,14a752b7aeb92757324cda24a10eaf88a3eaab52,b380fe528888dfd752a4d43dc90aee4c781ff821,,True,True,Tests_passed,d16a0cbc2642704a82f1ac17db759746c6ceae3ed6b96761c4b77e1224065d19,True,12,83,675,11,True,Tests_passed,61819922851f7332362555523491387f3fee5afda86330e9149acc9dde441a26,True,19,True,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,48b9e50ac05d7c76a60d931f7af4a99af06ab7bcf7d3a1b52de87e51fd01fe2c,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,45881c7819193197adc2271cd4dfc31e3f413996e9b7335cc05ff5acc8a694c6,Merge_failed,ca3a7dd97512c984c42e480ee28a410fa459cd2c2270a3d5b24f9dc8d4e48ad6,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,7184111bc7bdf25c42d513457f3106b4009d8bd4cda903a4328e26148e1efef9,Merge_failed,af0a94c1ad825ed90060cdf5c08b3d719815674b518b0a1127b11077b52c2734,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,0.010184049606323242,0.010345220565795898,0.010647058486938477,0.01052713394165039,0.010709047317504883,0.010600090026855469,0.010545015335083008,0.059484004974365234,0.18144440650939941,0.9451065063476562,0.3651468753814697,0.14197206497192383,0.13016796112060547,0.05062437057495117,0.05185198783874512,0.05069732666015625,0.050512075424194336,0.05138444900512695,0.1156153678894043,1.0111689567565918,0.05150175094604492,0.05079913139343262,0.04230904579162598,0.051299095153808594,0.0440068244934082 diff --git a/results/combined/merges_timed/seanchenxi/gwt-storage.csv b/results/combined/merges_timed/seanchenxi/gwt-storage.csv index 81dfcd7578..4cb4ef9e44 100644 --- a/results/combined/merges_timed/seanchenxi/gwt-storage.csv +++ b/results/combined/merges_timed/seanchenxi/gwt-storage.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,8ce0dc7d7973f330a05563badf54037c90cd129b,87b4707591b8e61609aa40f3a8c37568e3702e9a,f0e679c108f9bdb7a7246cc863643addcf8b5cb1,,True,True,True,15,84,207,3,True,15,Tests_passed,af5b7be2994a633165dfc66399ac5c1122f6215e48952a588dcb6740e51d0649,True,Tests_passed,fc2f89a04c8ba091c36031fd343f329711d660cdab05ff819a434ea90bf74cd8,True,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,6f98cf5dd872e0551a4dd71add1582352d899158525d900b9e415cac1a3394dd,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,b819c2457d494b2a0184f5d0ca9988f871848e2031740ef7c4f5cf369f046533,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,d5d5c3d158d0334fbc497419df2fbd9a9aa1d484274f00da61c29d6dc2cadbd1,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,0.04510641098022461,0.04225778579711914,0.039565086364746094,0.0367279052734375,0.043144941329956055,0.04473876953125,0.03986501693725586,0.19292354583740234,0.14043855667114258,1.0975100994110107,0.3826768398284912,0.10708785057067871,0.12378907203674316,0.042560577392578125,0.043066978454589844,0.04347944259643555,0.042868852615356445,0.042406320571899414,0.09096908569335938,1.111663579940796,0.042876243591308594,0.0430607795715332,0.03499913215637207,0.04313468933105469,0.0342249870300293 diff --git a/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv b/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv index 88a384a539..6e9809c19b 100644 --- a/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv +++ b/results/combined/merges_timed/sebfz1/wicket-jquery-ui.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 40,refs/heads/wicket9.x,d26c29217ed316b58ca7daf26f949caf2866b578,b0a253173342389021a5f41925b61d4041691969,bac2626a365dc38f92e188334fbe1f1aeb4096f7,,True,True,True,10,24,133,8,True,15,Tests_passed,547f624da3a4b80f1ccb4b18cf1ad03cc2c98365c48c91e040c364cdc8f4695e,True,Tests_passed,cc783846d9edca551d7b4de62438e1bdb551221f12a4ce02c7b503dd44deee51,True,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,1c259b0a7dc8dbab14adb804048c6fccbf1993bbb5fb6a0e418ae1d7f640a936,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Tests_failed,8a995edae439ca72cf2cdabfe33869b951f2a8823b9747d5217653d3fa45b2dc,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,266ad727d0925754d82fa7d780c6459a55cd1074975b4ac50420cff42ce92bf4,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,0.02611565589904785,0.016202449798583984,0.018110275268554688,0.017938852310180664,0.018146991729736328,0.01820230484008789,0.01785588264465332,0.08224749565124512,0.12966394424438477,1.2912404537200928,0.7301967144012451,0.13800597190856934,0.14169836044311523,0.05566835403442383,0.055002689361572266,0.05605506896972656,0.05608820915222168,0.05618143081665039,0.11416363716125488,1.285658836364746,0.05503702163696289,0.053551673889160156,0.04671525955200195,0.05489659309387207,0.04643368721008301 diff --git a/results/combined/merges_timed/seedboxer/seedboxer.csv b/results/combined/merges_timed/seedboxer/seedboxer.csv index a0dd70d548..d98d7a46e2 100644 --- a/results/combined/merges_timed/seedboxer/seedboxer.csv +++ b/results/combined/merges_timed/seedboxer/seedboxer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,0076809898ee1ef1330ce41242de492d4d0a6de2,b511ab595ccc81bed5d9daf8ce078e5ce56aa1c4,dbf23fc6adbc1bc80e104b619f9c62ff4688ab8d,,True,True,True,18,31,553,2,True,18,Tests_passed,4b2bde9116dd403a8a389bf6734e535cfeafa29dfa704ee37ad948923d074de9,True,Tests_passed,d6a7aaa7ce3dfc87e29c2a916469d0a1ec7d18850070fc139bc6e5fde91de778,True,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,0.03856968879699707,0.04642915725708008,0.0518336296081543,0.038854122161865234,0.04487299919128418,0.040398359298706055,0.048494815826416016,0.16422486305236816,0.11340689659118652,0.4973893165588379,0.3979525566101074,0.08426570892333984,0.14654183387756348,0.04124259948730469,0.05526900291442871,0.0406031608581543,0.05277562141418457,0.041513919830322266,0.09058284759521484,0.5207438468933105,0.041581153869628906,0.050662994384765625,0.030432939529418945,0.05001664161682129,0.03069758415222168 diff --git a/results/combined/merges_timed/segmentio/analytics-java.csv b/results/combined/merges_timed/segmentio/analytics-java.csv index 55f11977bb..e2fc3c7d77 100644 --- a/results/combined/merges_timed/segmentio/analytics-java.csv +++ b/results/combined/merges_timed/segmentio/analytics-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 114,refs/heads/master,b5a96236e473740ea83e5d1ab0548deea21a5656,8b7b1ee33b59215e43ce3ef57e6f9d8105b6f19b,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,True,24,111,1451,3,True,24,Tests_passed,da4e67631ea3ecd978882cd78108232eea8d19af4c470cb7ab8459b99230408c,True,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,True,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,52eae83a36e79f019592d0d2e39b834f3976c1ef6956e2eb171047f3a4cafdcb,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,1268617b4876dbfac9e8eb0fc097fa78249233bf0189e759e21218cefd9d904a,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,130d72cb2a54e4706845c47cadf2d6deac53156011644b67fc8bffe90b73e6b3,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,0.04375863075256348,0.0443568229675293,0.03990340232849121,0.04166436195373535,0.050798654556274414,0.04447317123413086,0.049394845962524414,0.15560483932495117,0.17710614204406738,1.9982876777648926,0.5738058090209961,0.11009049415588379,0.12739348411560059,0.046746015548706055,0.04449033737182617,0.04663491249084473,0.046648502349853516,0.0458066463470459,0.0939180850982666,1.9405162334442139,0.04696393013000488,0.04570412635803223,0.046980857849121094,0.04556608200073242,0.044600725173950195 diff --git a/results/combined/merges_timed/semanticvectors/semanticvectors.csv b/results/combined/merges_timed/semanticvectors/semanticvectors.csv index f87aa53f13..1dae026ee3 100644 --- a/results/combined/merges_timed/semanticvectors/semanticvectors.csv +++ b/results/combined/merges_timed/semanticvectors/semanticvectors.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,58058d15d12a3b15eec26e609c5f656f5d301e85,73590b42957e7f7f81c31238e01641121fe14060,f5f7370a488ffa4a1ac597cf0dc773b507923662,,True,True,Tests_passed,75366712fad34f36ac5538c8ab1608ab52beba580beb4c1e14bf6bc96fcf8454,True,2,76,415,2,True,Tests_passed,eed294b4ad78a10cfa60efdfa14ec8b15209ed846077b530e65baf6955e6abbc,True,2,True,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,6551b72a30caca58dede218f656c77b0e7d8c60faae34a3e168be31bec3c9954,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,0.025330305099487305,0.025463581085205078,0.03290414810180664,0.03425741195678711,0.03354215621948242,0.03334546089172363,0.0333404541015625,0.06694221496582031,0.08181262016296387,1.3818466663360596,0.711993932723999,0.11504149436950684,0.18291306495666504,0.04089927673339844,0.08768820762634277,0.08203291893005371,0.0801537036895752,0.08389592170715332,0.12084031105041504,1.4221646785736084,0.07224392890930176,0.07791495323181152,0.06659317016601562,0.0768423080444336,0.029250144958496094 diff --git a/results/combined/merges_timed/sexyideas/moosificator.csv b/results/combined/merges_timed/sexyideas/moosificator.csv index b29ad3dada..e8417fbcfb 100644 --- a/results/combined/merges_timed/sexyideas/moosificator.csv +++ b/results/combined/merges_timed/sexyideas/moosificator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/master,51490f87bbf813d01164e101fd6cd32ec4a21596,a662006ee08d1fd941f2ae7eab1812acedf6f232,6b6a2301e40919efa350a5d9f5f2632e85f9393f,,True,True,True,3,21,181,2,True,3,Tests_passed,42e4d036a6e455454b2015304a532ad0b31c348d59b8353a80c96391841fb2df,True,Tests_passed,d865536fe26ff93df8cb6861c8a2f8f6f42db0d3ef81c10a2e1c70dd2d5bb33e,True,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_failed,b164b9ed0b51315260d180745556879aabf8734b0921c330e187673d0f261edf,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,0.024816274642944336,0.02511000633239746,0.033158063888549805,0.033293724060058594,0.033238887786865234,0.03332853317260742,0.033098459243774414,0.06605696678161621,0.0801999568939209,0.8998317718505859,0.5147256851196289,0.11024022102355957,0.18889617919921875,0.08139753341674805,0.07776808738708496,0.08062124252319336,0.08155107498168945,0.08401107788085938,0.1247868537902832,0.9395768642425537,0.07470893859863281,0.07347273826599121,0.0642843246459961,0.07539677619934082,0.06843829154968262 diff --git a/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv b/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv index e835a22d3e..3860712438 100644 --- a/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv +++ b/results/combined/merges_timed/sgoeschl/jmeter-sla-report.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,True,True,True,21,131,558,7,True,21,Tests_passed,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,True,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,2fc449e6f33f6d1e4899541d6090246ebd4146c6bfba73d4951b445975b10cdf,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Tests_failed,0ca14efc38b9542fec6950f38cd79741ae650f3196b5f0428043f4b11d68427a,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,d0a57503e87a34700da60f870f70d7350ddf76ded84f2e1e0183f731515a7cba,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,0.04803776741027832,0.0465397834777832,0.047884464263916016,0.04525446891784668,0.03565835952758789,0.06402182579040527,0.041419267654418945,0.479264497756958,0.39775705337524414,3.594984292984009,0.4280509948730469,0.2374429702758789,0.16932344436645508,0.08167123794555664,0.0847632884979248,0.08283853530883789,0.08531355857849121,0.0848839282989502,0.20922422409057617,3.4599051475524902,0.08437132835388184,0.0824880599975586,0.0552825927734375,0.08290743827819824,0.056290626525878906 diff --git a/results/combined/merges_timed/shazam/shazamcrest.csv b/results/combined/merges_timed/shazam/shazamcrest.csv index ecfd76592a..ecc3db2008 100644 --- a/results/combined/merges_timed/shazam/shazamcrest.csv +++ b/results/combined/merges_timed/shazam/shazamcrest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,9be9807f1cf79c5a11d69fde25afc99f3fb2f40c,c4fa05990bece3e3ead865e456dd2cfd3fb345d3,fa139e6f61d0cf631855edc581afb7afd724aa8a,,True,True,Tests_passed,871b1e77e5a4f82e1512f575042d7d5ddd28ff65efdb7c092e6e4a3aa6515604,True,3,7,42,10,True,Tests_passed,981bdbd883d0d232276f0b421b5a5776f0f6bd73038539a46610bec2d88d1e79,True,11,True,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,0.04093050956726074,0.04181098937988281,0.04340720176696777,0.050935983657836914,0.047173261642456055,0.05077362060546875,0.04831814765930176,0.17142391204833984,0.11551952362060547,0.8054537773132324,0.49353456497192383,0.07123088836669922,0.12927627563476562,0.040886878967285156,0.041413068771362305,0.0422968864440918,0.0394442081451416,0.04161548614501953,0.07359838485717773,0.7961993217468262,0.040593862533569336,0.04114651679992676,0.030327796936035156,0.04111528396606445,0.02977132797241211 diff --git a/results/combined/merges_timed/shhs-coding-club/drugwars.csv b/results/combined/merges_timed/shhs-coding-club/drugwars.csv index c4cd9eff68..d8c46b9251 100644 --- a/results/combined/merges_timed/shhs-coding-club/drugwars.csv +++ b/results/combined/merges_timed/shhs-coding-club/drugwars.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/heads/master,f07c4b5d24a5a246a9de55940bb80151684c64ea,b8eb50bedfdf55ec6b51691779e564b80fd60799,c5e4ce34f82b7ce324f28144dd63d4f2480ee1fc,,True,True,True,7,17,54,4,True,7,Tests_passed,fdb5f107f879b7555c9c649995501707e845377ae68221f5ad5c5abf9842eaad,True,Tests_passed,15e928c0cb5581dd85d110f3ac905ccf0d68d81917a73e963c36c1905ce41329,True,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,de071cfa8128d6c528f9bcc11742a8d2d4c6296e8758bb64ff03e1e0c3f19d02,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,c28f5139bab47198f554d98887585c1d56efc549ffe25da7129051a984b0c252,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,feefd189a090f936fab49fed3f3f46bf1ca051f791a336c3c4a3cc07b9877da7,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,0.034474849700927734,0.0351715087890625,0.036629676818847656,0.03506183624267578,0.03618907928466797,0.03722262382507324,0.0374755859375,0.2816050052642822,0.2166118621826172,1.4728028774261475,0.38126254081726074,0.12453961372375488,0.12286734580993652,0.045908451080322266,0.045688629150390625,0.04630923271179199,0.04642629623413086,0.04580521583557129,0.10944724082946777,1.4811737537384033,0.04655027389526367,0.047167301177978516,0.030298233032226562,0.04634380340576172,0.030510663986206055 diff --git a/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv b/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv index 0d242e4f18..102c327dae 100644 --- a/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv +++ b/results/combined/merges_timed/shimikano/spring-jpa-bulk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,1bec64a7690dee7f6fb602f4d81137e45f9a419a,76c2031d5aaa0b245efdaa7addda008b2cfc2292,4a12f402b921fef6c1af92b29ae26e8ccd6409a9,,True,True,True,28,78,787,3,True,28,Tests_passed,d1cf6c3a02e28773666284e44cf2e36148791c486dc0c7d608776586ac4829b6,True,Tests_passed,3bde474f695068c743ed1256f637c5abd849f3b04092a69b40a3fc031ad493ff,True,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,7b9a0f59f2a208f3c3bdcccc3d0714ad4ec1b044e0336d736bbe6f36fca66e77,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,7b7f184f0e12780797f3a11b678db01b85d1e4a7a4ea23b9eb6f2deea33c1fd7,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,fdcff5035c1ffb2235d7cd1ccfdd999af21881bafad6e0842718357d7f6e1206,Merge_failed,a93ed9f287610e0015494bde2248ad611a425ac76344583d091902c3298e96b4,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,0.03922295570373535,0.038866281509399414,0.03798699378967285,0.02372145652770996,0.016871929168701172,0.03718304634094238,0.04098176956176758,0.21569323539733887,0.16754460334777832,0.6607444286346436,0.40941548347473145,0.09739422798156738,0.11980485916137695,0.03955698013305664,0.04075884819030762,0.04087328910827637,0.04047966003417969,0.04063773155212402,0.08610677719116211,0.6442880630493164,0.04045915603637695,0.0395510196685791,0.030478477478027344,0.03973889350891113,0.03035140037536621 diff --git a/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv b/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv index f8625a1fe3..4b1c00ec9f 100644 --- a/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv +++ b/results/combined/merges_timed/shopizer-ecommerce/shopizer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,True,13,25,189.0,2,True,13,Tests_passed,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,True,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,True,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,72eab868eba9b44cb2c5a053d69ed7e5a2b7fe54fa3dd36bd222af37ca24d836,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_timedout,,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,3f001fa1a7b94a41acf30a3f9f876476a983c7d397b919d5e69a4e00df281103,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,0.05871248245239258,0.0506443977355957,0.06371355056762695,0.06975030899047852,0.07283139228820801,0.06819915771484375,0.05322694778442383,0.37462592124938965,0.12846994400024414,1.1160502433776855,-1.0,0.07909083366394043,0.12728166580200195,0.04454159736633301,0.04568791389465332,0.04640698432922363,0.042975664138793945,0.0461573600769043,0.08288168907165527,1.0610442161560059,0.044629573822021484,0.04426693916320801,0.044275760650634766,0.044313669204711914,0.044371604919433594 diff --git a/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv b/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv index 4064ce264e..45335f2ead 100644 --- a/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv +++ b/results/combined/merges_timed/sijpesteijn/mafia-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,397e23f5f00948ceb35a9ab4cccdd34ff9543f01,911a3f7b5dd59a6aa1461b862ea42f5bcdb232d3,007abfe5eea0e36631d43093a83e58506b181921,,True,True,True,28,65,1145,5,True,28,Tests_passed,a7236748e684460349469fb9eeb09ea553e940206890ddfa0632bc0d54fd75b1,True,Tests_passed,3b4095e53f2aba162d6420ca26749f10c40d1f7827f2adfb0841b384db6d4c1b,True,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,f69abb0af99933d9aff2cee99e1cc9605114cbf750710b3645a5c220f9c2bf63,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,f9a38a6e7121bc9be8023d1fc0ecc68f1deb15c17afd902a23e3ddff6fcb1349,Merge_failed,ee6be996eb565776150070f34ad39e9339c33a0d00a8ea6466d828aba19f9559,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,a471aa366d65d49fc01ad6d1dd98de2cbfbcdeae08624334905804020a78d79f,Merge_failed,a9c45a54ec77b814175c47a1ecbd51e0b2d9b21733ec84c78ad5ca750710d7da,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,0.06412935256958008,0.0642547607421875,0.07767677307128906,0.0777435302734375,0.07806968688964844,0.011252880096435547,0.0782012939453125,0.14611363410949707,0.28690481185913086,1.8885271549224854,0.5534060001373291,0.24802279472351074,0.25243568420410156,0.08278703689575195,0.1488199234008789,0.14551162719726562,0.14024567604064941,0.14274358749389648,0.24786686897277832,1.906050205230713,0.12989354133605957,0.1285390853881836,0.13155722618103027,0.13332438468933105,0.14532756805419922 diff --git a/results/combined/merges_timed/silverpop/engage-api-client.csv b/results/combined/merges_timed/silverpop/engage-api-client.csv index fc1b9502e5..768b863b86 100644 --- a/results/combined/merges_timed/silverpop/engage-api-client.csv +++ b/results/combined/merges_timed/silverpop/engage-api-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,0c3e3e535b5514a92bd19280f2ce4bcde989ad23,c534abe100affbf873e577db76543f6a44c02a8a,1c532fc7d21e4a4a5ce3fb120ba7114626a02739,,True,True,True,42,113,1102,2,True,42,Tests_passed,10b3da864cdc0fcf0ceccbad7aa306cda1dc4e9c1608c52157660f71927f5377,True,Tests_passed,5a66e59d1d9995a540ff79fdddd6a68ce9906e2df384a829e4583a4994fac446,True,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,0.039132118225097656,0.04591512680053711,0.048517465591430664,0.04326939582824707,0.0525362491607666,0.045278310775756836,0.04542803764343262,0.1691431999206543,0.10554885864257812,0.5767779350280762,0.5813744068145752,0.0827338695526123,0.13775062561035156,0.05386018753051758,0.04456758499145508,0.0535578727722168,0.05137443542480469,0.052861928939819336,0.09066390991210938,0.6002709865570068,0.05390477180480957,0.05207395553588867,0.0310671329498291,0.05170440673828125,0.04238557815551758 diff --git a/results/combined/merges_timed/simasch/qlrm.csv b/results/combined/merges_timed/simasch/qlrm.csv index 3dfbd483cc..216ec55e72 100644 --- a/results/combined/merges_timed/simasch/qlrm.csv +++ b/results/combined/merges_timed/simasch/qlrm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/heads/develop,e03f1617f3978b3a1906f96e92317514eef243ff,1d2aa4ed9d6c383f7b0e9c6ca0c6a286c553b4e4,14a5cd7ede23d4a472bf95090457ad367252378f,,True,True,True,11,79,866,3,True,11,Tests_passed,bc57a5c7fd3664d95670d140d7fa248621474729b14d763d1976e8541001731d,True,Tests_passed,2a85a98cbe62197750309e38b2c9a99ee0aa18034899e05835c0d0f31fd91eb1,True,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,d730020cb1f6084ef5dd870f73e66230ddb0aeef7ca27a97afda387c0aa75796,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Tests_failed,62606285ea34c262c9739ff9674da19e8ef5e22fa988a487cfd4e1084cc5fdb9,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,5c28ce7d89bd392f544c8bfb7006ea26b00ca3482e56abc3d54c7d68f2b3a5a3,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,0.007882118225097656,0.008205175399780273,0.008131265640258789,0.007930517196655273,0.008134603500366211,0.008313417434692383,0.008220911026000977,0.042388200759887695,0.12354135513305664,1.082301139831543,0.44722700119018555,0.10221409797668457,0.1207418441772461,0.039751529693603516,0.0400540828704834,0.0398709774017334,0.0401759147644043,0.03971552848815918,0.08583760261535645,1.1219489574432373,0.04065346717834473,0.04102349281311035,0.03879809379577637,0.040869951248168945,0.03897595405578613 diff --git a/results/combined/merges_timed/simmetrics/simmetrics.csv b/results/combined/merges_timed/simmetrics/simmetrics.csv index 7ebd3e54b0..bc2b19a325 100644 --- a/results/combined/merges_timed/simmetrics/simmetrics.csv +++ b/results/combined/merges_timed/simmetrics/simmetrics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 59,refs/heads/master,a0857905c0446c61e7f264aea4138a5cc0d2a2b5,4e647c4e54524f977a71d09a34624261f225d81b,ab3332f7038654d70023b9438597bc305e844503,,True,True,True,33,79,584,2,True,33,Tests_passed,52f04d3da6331129cfe81c89e6b5f505ee54d281434e694429df3a6d285801ca,True,Tests_passed,283191769b1da266ac42cad72db5b4760cea4caa3fe393d614b2e2f1726b595d,True,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,0e601b3f720bc61da71a727faf15c78323996be2feabeb1e20fbce33d6226d70,Merge_failed,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Tests_passed,1dc21296b321f78f59c73fefa55d4b390fa7dc125d9394df479f47514f3521cf,Merge_failed,b5ca95125ff6a2507edc37b4b7b435689ae46df3487785eae5ceb5dbd83edb41,Merge_failed,78b63bc291de1401aa1c60549a5416d1d430ce8f6579035e3e7ebe2af8980396,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,b6a928e93c67f5ed8300f1f4e5580f95ad7af5cad389eecd7b0d941e0751a83c,Tests_passed,1dc21296b321f78f59c73fefa55d4b390fa7dc125d9394df479f47514f3521cf,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,Merge_failed,23fb5652debb2c7987a6d19461094b6c00bb762c8d66e97bd452e3a2feaadaf5,0.056630849838256836,0.022049427032470703,0.021914005279541016,0.0540468692779541,0.011544466018676758,0.035361289978027344,0.039339303970336914,0.12678837776184082,0.11190938949584961,0.7704253196716309,0.567192792892456,0.09888386726379395,0.15505719184875488,0.0599520206451416,0.0586702823638916,0.05877280235290527,0.058017730712890625,0.06015801429748535,0.10038185119628906,0.7811214923858643,0.05884552001953125,0.0548248291015625,0.057778120040893555,0.05646014213562012,0.05926704406738281 diff --git a/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv b/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv index c8af3d6496..89676129a0 100644 --- a/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv +++ b/results/combined/merges_timed/simpligility/android-ndk-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,0432151e0e8138a983c601b2819b1545c8ff0385,c1740da3713bd8140e942082ba1b2c3a25da7fc3,f4c21f525979eb3b3741d55e9d9efd794ee8c642,,True,True,Tests_passed,89faae25697a9ab681135ac573afa485389fe5b2b721e64ba8fd7c90cae6d45d,True,15,40,690,2,True,Tests_passed,8973991a3ca3a68d049175fd377f64fe5af2488773f4666f4833fd8b12ef198f,True,15,True,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_failed,569cc7c62abe9d97e2c4e83f2f2acdf0946882546c95be491178c7c72ac932ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,0.04755997657775879,0.042946577072143555,0.016492128372192383,0.05692172050476074,0.04719209671020508,0.047753095626831055,0.03908276557922363,0.14884352684020996,0.10892319679260254,1.5399529933929443,0.3455159664154053,0.08263087272644043,0.1455216407775879,0.05463695526123047,0.05329561233520508,0.052616119384765625,0.052327871322631836,0.05374717712402344,0.09092879295349121,1.410489797592163,0.04982590675354004,0.05034208297729492,0.040123701095581055,0.05036783218383789,0.04028630256652832 diff --git a/results/combined/merges_timed/skyscreamer/jsonassert.csv b/results/combined/merges_timed/skyscreamer/jsonassert.csv index 1b547cfa01..e2e99974d7 100644 --- a/results/combined/merges_timed/skyscreamer/jsonassert.csv +++ b/results/combined/merges_timed/skyscreamer/jsonassert.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,2c6ec3c693d465934a99fe0c3d99218965ff74f4,9abc2bb5b97e2d075aa3f8c5f6e823f45ae8f2ef,054919c5723680b2821cc2219cc3b9fb72151b5e,,True,True,True,4,16,45,2,True,4,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,True,Tests_passed,e124194a166f50f012b045ce08509dd5f9e7e8b3ca9582d3a36f48f23f6088f0,True,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,0.039108991622924805,0.040750741958618164,0.047838687896728516,0.043126821517944336,0.040300846099853516,0.035968780517578125,0.04454779624938965,0.15165996551513672,0.10843181610107422,0.8140027523040771,0.32557153701782227,0.06947827339172363,0.12735533714294434,0.04088473320007324,0.04056382179260254,0.04086899757385254,0.04076576232910156,0.04102182388305664,0.07437944412231445,0.7940678596496582,0.03979206085205078,0.03933858871459961,0.029790163040161133,0.0392758846282959,0.029012680053710938 diff --git a/results/combined/merges_timed/skyscreamer/nevado.csv b/results/combined/merges_timed/skyscreamer/nevado.csv index 3f5c1dc536..f439e8796b 100644 --- a/results/combined/merges_timed/skyscreamer/nevado.csv +++ b/results/combined/merges_timed/skyscreamer/nevado.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 47,refs/remotes/origin/pull/112,cf100f0487d532b8ba2b16e2cbaecfcbce149f46,2f08cfbb74a3e4dd089d0bff9ba74f791718ab62,e56a0d771e3e40b14cfff69c49d9c87cd6ce720f,,True,True,Tests_passed,f0295fca35e28d616df73be758d533453fc4dec81413bbbf915520dde2913de7,True,11,26,141,3,True,Tests_passed,709040c3aea1ec645d19220eb6437517b54914585cb7ff657f8f5d60a368cc98,True,11,True,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,12add52f71003afcc0b9e94cc16fd34467826ca838e4c9eb805ae92ec51ea96b,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Tests_failed,e551ab3a517c7aa55f7e1c8a395469d9824325b52d3523447d18e3c11abac1a1,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,99e715e779e1a10daa907fe6191e4aed0c78a8cf496a43892aaa77d081b5c13b,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,0.0459904670715332,0.04252791404724121,0.044263601303100586,0.04171633720397949,0.03361225128173828,0.02917957305908203,0.04478740692138672,0.22947001457214355,0.18228793144226074,1.2623364925384521,0.356126070022583,0.11193180084228516,0.1316089630126953,0.05101203918457031,0.047478437423706055,0.0496063232421875,0.0494081974029541,0.046205759048461914,0.09888315200805664,1.271164894104004,0.048024654388427734,0.04613542556762695,0.03914594650268555,0.04741096496582031,0.040932416915893555 diff --git a/results/combined/merges_timed/skyscreamer/yoga.csv b/results/combined/merges_timed/skyscreamer/yoga.csv index b32b045eb3..b77d985945 100644 --- a/results/combined/merges_timed/skyscreamer/yoga.csv +++ b/results/combined/merges_timed/skyscreamer/yoga.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/heads/master,1f22844c51753edd813e117213a7e336d917d262,cfdd480dd2b83b4ac26b1d1e5299939ae961dd02,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,True,71,311,1977,8,True,71,Tests_passed,f98b9b65692bd9500811a1a4cf0c74804498fd15039f75a4a8f4a9062aa3dbe3,True,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,True,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,ef27fc35ba7014340b6554ef0e99be793788558fc396657f0e31e0af1642d9e3,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,e97de2bb89b055588b0b7ec5b0b86f010ae7c750be970f20e12c8925722b754f,Merge_failed,2677e044961ab951d915db26abc586274a53533cd969455ff646fabd1215f9b6,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,d7466d03e37c2f38d33970942edf65d7d379dc532afd60c5ee2931f063c0e3a1,Merge_failed,ba570deebe5d0adaf19eb84f04b60272b6f4ae00b91f0214042381af7ac1767f,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,0.05683565139770508,0.042063236236572266,0.05932426452636719,0.045731306076049805,0.054372549057006836,0.06060647964477539,0.04792499542236328,0.5594606399536133,0.44727540016174316,0.544395923614502,0.8343822956085205,0.26953554153442383,0.16756606101989746,0.08658242225646973,0.0865321159362793,0.08646774291992188,0.08440685272216797,0.08834195137023926,0.22404956817626953,0.584954023361206,0.08633875846862793,0.08682513236999512,0.049932241439819336,0.08807921409606934,0.049991607666015625 diff --git a/results/combined/merges_timed/smartrics/restfixture.csv b/results/combined/merges_timed/smartrics/restfixture.csv index 6a8fa1f793..7ff508286e 100644 --- a/results/combined/merges_timed/smartrics/restfixture.csv +++ b/results/combined/merges_timed/smartrics/restfixture.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 34,refs/remotes/origin/pull/38,d8c6704346b6c678edcfb02a11c914f6db985b21,5a7acd31fd8fe2417a14c50f4b27dbc4fd9409c8,bfa6c9c2940e3ace3f2bea11ddb81e33a84d5c25,,True,True,True,7,16,116.0,4,True,7,Tests_passed,c0280a72c4e322859dbf07d9c240670206e9c076673d770ca87a39501161424c,True,Tests_passed,42f3798d7b235524aac0c29c067f427ec48c23d5e73e810a99ff36c1699f344b,True,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,311b66c4af3b13ce0a5bbd2bdd8b50814c44f2b448456f89b0ed857440d1a803,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,b99c1229d50061675eeb87d187d49510e7b6d68ce58649c874b822f3b406a0d8,Merge_failed,24e4214dac4c1773cb6537c6ca260640f8c693ea454a0259d7172dfaf1678be6,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,df75ed661d5a920a32ba18d5144a64590ac470f3a1b983e75d48a16eaebd25ce,Merge_failed,0676a2913b152de6f369a66ffeb4a30655274bd0e683c351d4355281d5c5305e,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,0.04712033271789551,0.032410621643066406,0.04405069351196289,0.04053163528442383,0.04775547981262207,0.05484461784362793,0.04756975173950195,0.33116579055786133,0.23745512962341309,3.310755968093872,0.5079143047332764,0.151047945022583,0.13965439796447754,0.05774331092834473,0.055580854415893555,0.0554201602935791,0.05444693565368652,0.05677938461303711,0.12132835388183594,3.0997166633605957,0.05796647071838379,0.05665850639343262,0.056206703186035156,0.054967641830444336,0.05446934700012207 diff --git a/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv b/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv index 6e2a032be4..628b2ec2c6 100644 --- a/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv +++ b/results/combined/merges_timed/smartsheet-platform/smartsheet-java-sdk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 71,refs/heads/master,e3a8071836d7e5cf8949174a783d1f0d9525934e,23244c7e820d404fea45d0d7faee587730603333,411e1cb4c61d34b5e6f11e5ab55e9b350b02e248,,True,True,True,40,122,1784,3,True,40,Tests_passed,f864f2b8307072228bd2e7800aad334f799ea82a087fd83be06631af41570b8b,True,Tests_passed,a436be6a4ddf84d6c7294ff5deb0323ec6c09fd4fc0e315afbe164f0ad7a4cf9,True,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,0.06071805953979492,0.05594897270202637,0.07062172889709473,0.0720362663269043,0.07303500175476074,0.0609433650970459,0.061292171478271484,0.1522512435913086,0.1570422649383545,0.5640630722045898,0.8307290077209473,0.11339998245239258,0.15669488906860352,0.0628502368927002,0.06261539459228516,0.06307721138000488,0.06319761276245117,0.06215643882751465,0.12000370025634766,0.578549861907959,0.06055569648742676,0.06025075912475586,0.04349994659423828,0.06018972396850586,0.04318881034851074 diff --git a/results/combined/merges_timed/snazy/ohc.csv b/results/combined/merges_timed/snazy/ohc.csv index 1a0f3ee4da..671a82749e 100644 --- a/results/combined/merges_timed/snazy/ohc.csv +++ b/results/combined/merges_timed/snazy/ohc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/develop,cf706bb89ebae023432c2bbd949266bfd68401e8,3e7f87adb7c65086351661cf5376c73e3f20d7c3,4d69670710441527e4a81f19596960986d30f63e,,True,True,Tests_passed,a2a902e5dd16d024e7ebc5166f2b160f12aad1c411be6dafcec88b8a16207552,True,33,162,958,6,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,True,34,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_failed,d76a7d3cf28ca4eee58e94ab59a9ebd7ba0613c7365f94801885758884a43c5a,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,0.04987931251525879,0.05515909194946289,0.0626986026763916,0.04615664482116699,0.07596349716186523,0.06566143035888672,0.058216094970703125,0.3641183376312256,0.2866528034210205,3.735194206237793,0.8739743232727051,0.19105839729309082,0.16183137893676758,0.08102869987487793,0.08114385604858398,0.08194375038146973,0.07903361320495605,0.07868385314941406,0.1638352870941162,3.4441487789154053,0.07654023170471191,0.07867598533630371,0.0432581901550293,0.07919836044311523,0.045638084411621094 diff --git a/results/combined/merges_timed/sndyuk/logback-more-appenders.csv b/results/combined/merges_timed/sndyuk/logback-more-appenders.csv index 44ca22fddf..ee94ce2053 100644 --- a/results/combined/merges_timed/sndyuk/logback-more-appenders.csv +++ b/results/combined/merges_timed/sndyuk/logback-more-appenders.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,ae3f6ef3d318598fc3cd1587a59a6358e3ea329d,5101380a368f76bc2fe058486266b44656f99360,e16baa5f46a753149085e2aabbcebef477f88064,,True,True,Tests_passed,154111fe41ba74d57075b5b0da67bc1b014c8d627344a82e5661b3da2221594c,True,4,21,90,3,True,Tests_passed,ead0b4a977837688584fdb15f956559587f7dfdcb693483376211f53455f507a,True,4,True,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,0.044792890548706055,0.04378008842468262,0.04364824295043945,0.04214835166931152,0.04381823539733887,0.04122591018676758,0.03301572799682617,0.22879815101623535,0.16487836837768555,0.9326791763305664,0.4655768871307373,0.09865641593933105,0.1306607723236084,0.04532313346862793,0.04537796974182129,0.04512476921081543,0.045805931091308594,0.04408621788024902,0.09373617172241211,0.9076752662658691,0.04483652114868164,0.04486489295959473,0.02699136734008789,0.04509568214416504,0.02693462371826172 diff --git a/results/combined/merges_timed/soabase/exhibitor.csv b/results/combined/merges_timed/soabase/exhibitor.csv index 2f423e87b2..23dad5d711 100644 --- a/results/combined/merges_timed/soabase/exhibitor.csv +++ b/results/combined/merges_timed/soabase/exhibitor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,True,51,143,1676,6,True,51,Tests_passed,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,True,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,True,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,161aa20d88da027986c097f66b280b1c7df17e069b05cf196d09f691440a127a,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Tests_failed,53d2b1b10d7a2944a83064f5ddbc2000660ad2ac638790554f74ddcec760781c,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,dcbf706b555adacfb9d5c55afd9030432234c66dd0e939e1ae2de58d7ae07bc1,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,0.06190800666809082,0.038482666015625,0.0528407096862793,0.052583932876586914,0.051085710525512695,0.020075321197509766,0.04843592643737793,0.3914914131164551,0.3454859256744385,3.250204563140869,0.7379119396209717,0.20717644691467285,0.18372273445129395,0.09018611907958984,0.08860659599304199,0.09039783477783203,0.09155488014221191,0.09187197685241699,0.17230010032653809,3.0512266159057617,0.09078383445739746,0.08142399787902832,0.06708097457885742,0.07071828842163086,0.07135677337646484 diff --git a/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv b/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv index 71db008e87..723e5ecfc8 100644 --- a/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv +++ b/results/combined/merges_timed/socialsensor/graphdb-benchmarks.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,87e995db5654b3325daa07c4181e8e358faaa887,93a1be1010118acc6c154755359f84b2eaa1eac1,6691219b7fbe7d54102ca0641348f6a1db78f7d1,,True,False,True,7,14,51,3,True,7,Tests_passed,097c95d3f82066d5e9650bb2b488f52475fe89603d27468b522631dd75e8278b,True,Tests_passed,a5ee3685ac75680f07ee698e1b883ee8798e30a9c879731073979fa195dc147a,True,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,0.03930974006652832,0.05469465255737305,0.044381141662597656,0.046930789947509766,0.05128622055053711,0.04402661323547363,0.05203676223754883,0.2496962547302246,0.16327238082885742,2.430676221847534,0.5148074626922607,0.10406661033630371,0.13596463203430176,0.051200151443481445,0.05127716064453125,0.05037498474121094,0.051523447036743164,0.05201125144958496,0.10129046440124512,2.3217854499816895,0.05032920837402344,0.050688982009887695,0.03188323974609375,0.05085301399230957,0.032659053802490234 diff --git a/results/combined/merges_timed/sockeqwe/annotatedadapter.csv b/results/combined/merges_timed/sockeqwe/annotatedadapter.csv index 64862d3715..d9e3164168 100644 --- a/results/combined/merges_timed/sockeqwe/annotatedadapter.csv +++ b/results/combined/merges_timed/sockeqwe/annotatedadapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,62c7d43b5adeee8c47a42f4ab48ff106a6444b7c,32dc59ab83720ed5891a8701647211050f298e5c,ae79611e8f48cf8be3b0168e56c457d9bef2cad5,,True,True,True,4,10,44,19,True,19,Tests_passed,ddaf68a6e7bfce4270454ffee8333a997cefa1115c72af36be631a80267b60fe,True,Tests_passed,38cf0f39aa1a0ce50a77d650636f7d5784473604919a97c116fcee9e556382de,True,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,05a5f1a4e82cc3ece27e0fffcddadc5f4b9d5cb936f62139709a54de8e625dc1,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,7a67939a410ed774b4a073244d26a241a84b2883513b604f3e02dc2b1d48220a,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,1baf33f091684ee949c85870b4de42ff7417fb7e921f09d365e3326c850a6b57,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,0.04201340675354004,0.04259824752807617,0.03926396369934082,0.0373377799987793,0.011531829833984375,0.04198503494262695,0.037132978439331055,0.2854464054107666,0.23096537590026855,1.1284871101379395,0.3957228660583496,0.13413357734680176,0.12371158599853516,0.04439496994018555,0.045035362243652344,0.04479575157165527,0.0464937686920166,0.04492068290710449,0.10742020606994629,1.1073122024536133,0.04573178291320801,0.045417070388793945,0.0358119010925293,0.045552730560302734,0.03635668754577637 diff --git a/results/combined/merges_timed/sockeqwe/fragmentargs.csv b/results/combined/merges_timed/sockeqwe/fragmentargs.csv index ab25024f87..e30903e910 100644 --- a/results/combined/merges_timed/sockeqwe/fragmentargs.csv +++ b/results/combined/merges_timed/sockeqwe/fragmentargs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,6e9506af9dd9fc0662d32080a9a5365ed7bffa0a,ba404aa9b8d30efd64ac6c6f281ef44a7c5958e5,64a24cd37a6707fb7dc88da55ffbee72d696a20c,,True,True,Tests_passed,56a4283b9c9abceeea3f0f2a52461d7fddda1fe780466a9b8b1042e7ca518802,True,6,10,41,2,True,Tests_passed,9d18930b60a1cc89aa0e0089242978e2751f707bbc392f421641c679d4f6425a,True,6,True,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,0.050516605377197266,0.04752826690673828,0.047812461853027344,0.05126690864562988,0.0478823184967041,0.04660606384277344,0.04710865020751953,0.11432290077209473,0.10444259643554688,1.5301034450531006,0.39453792572021484,0.07364249229431152,0.1377875804901123,0.04152417182922363,0.04224133491516113,0.04154658317565918,0.04475283622741699,0.04462862014770508,0.07892131805419922,1.5564615726470947,0.041586875915527344,0.04143643379211426,0.030333995819091797,0.041005849838256836,0.030652999877929688 diff --git a/results/combined/merges_timed/socketio4netty/socketio4j.csv b/results/combined/merges_timed/socketio4netty/socketio4j.csv index 671323c76f..6af841b028 100644 --- a/results/combined/merges_timed/socketio4netty/socketio4j.csv +++ b/results/combined/merges_timed/socketio4netty/socketio4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 36,refs/heads/master,813f83b673ac76d5e779d19f146833e1646e09cf,84a94c3b791dbd85b99a40a88a75343fe831573e,f49db6acf7af63f796342cd2e201c119b4f327db,,True,True,True,23,73,440,2,True,23,Tests_passed,4484a3aa7796e1e5727ca87c88ee09918915f20bac17188b87a28028c0ecffef,True,Tests_passed,a1bbeeb072df1c84de322caf57d0c13456d868d1ea0443836b24f86819135767,True,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,0.04577493667602539,0.04224586486816406,0.037161827087402344,0.04689216613769531,0.047486066818237305,0.057264089584350586,0.05083060264587402,0.17453527450561523,0.12903261184692383,0.465667724609375,0.5231876373291016,0.08073139190673828,0.13708877563476562,0.0498661994934082,0.048949241638183594,0.047902822494506836,0.04921126365661621,0.048766136169433594,0.08209991455078125,0.47885608673095703,0.04529571533203125,0.045963287353515625,0.03549647331237793,0.04521059989929199,0.03663158416748047 diff --git a/results/combined/merges_timed/sofastack/sofa-bolt.csv b/results/combined/merges_timed/sofastack/sofa-bolt.csv index 4a87cae317..5c5159a9f9 100644 --- a/results/combined/merges_timed/sofastack/sofa-bolt.csv +++ b/results/combined/merges_timed/sofastack/sofa-bolt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,True,True,Tests_passed,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,True,216,252,659.0,10,True,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,True,216,True,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,c2e7d5a62eb388104c2fdf4c856623633d6b52a565b6a05b7ffb75b5c5b2fc70,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,459e9acb88ec5b327042473340d2dc8f403fd85560cdefdfe8256d8be99c643d,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,0.06525468826293945,0.05779147148132324,0.06747269630432129,0.08174467086791992,0.0697011947631836,0.06210970878601074,0.05730485916137695,0.7185218334197998,0.5613417625427246,6.123358249664307,1.8316898345947266,0.35801100730895996,0.21183252334594727,0.12114095687866211,0.11864542961120605,0.11983609199523926,0.11960649490356445,0.12157678604125977,0.3065042495727539,6.021010637283325,0.12073969841003418,0.11694693565368652,0.07343602180480957,0.12020444869995117,0.07819128036499023 diff --git a/results/combined/merges_timed/softinstigate/restheart.csv b/results/combined/merges_timed/softinstigate/restheart.csv index 223fd7816b..2c82fcb8ca 100644 --- a/results/combined/merges_timed/softinstigate/restheart.csv +++ b/results/combined/merges_timed/softinstigate/restheart.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 153,refs/remotes/origin/4.1.x,ef75e2ee223cd17f1f8d37bf30a3d9e193e77eac,44c6c13c0ce36263ed4dd3a6d6135c6eae02e64a,66eca10811db469358f72d28247700249d60a0bc,,True,True,True,164,878,8649,21,True,167,Tests_passed,b869c71dbdb92ed12aaa4d800f67d8e89074a3714cd0af5105f31789d35a566f,True,Tests_passed,e6a2bf7f4c3967422dba06313d49dfd4e521c19776f3b6a47efddfb7920638e8,True,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,e79b151783c23477125cb1a4387c06b1c935cb3e7df960836b358f0eb9bcac8b,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,69aa83e454b9e4061e8d68a69ba8f8ccb6f59decf5f3146a032b1b84844daa72,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,054223f5af93c292aefb01bcbc19fcf7852169e4884da39ecaff5dde61300c09,Merge_failed,f6be0e629bdb30137c52618c2203fc47d088fef85a183b0d0861dbadca216217,Merge_failed,d8ad931a048544fe75da3bf05b7de624502d2f92bd2102db071e1232ceebd866,Merge_failed,eec87e7ed2a4c539c67accb9347ddb62df35d9c5f4ba333cc000fd934fc6f83e,Merge_failed,f6be0e629bdb30137c52618c2203fc47d088fef85a183b0d0861dbadca216217,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,69aa83e454b9e4061e8d68a69ba8f8ccb6f59decf5f3146a032b1b84844daa72,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,6ab50cf6c115c8faabd7b1f6ca5e31132e76aa700ef356f797d1a31ab70e7815,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,29d7a5cdec479de8377242da85edfd55005b21df8b7766bbdacd1a0618b5158e,Merge_failed,91990db08e118e63c2cb891999aeee401a2809fb49e942f9e19b2e464f3039f7,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,e79b151783c23477125cb1a4387c06b1c935cb3e7df960836b358f0eb9bcac8b,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,Merge_failed,277dfc72fc47e5b116e32f998953ec6eb08f2c1d2e43a86dc9bc657df1ab20bd,0.02738666534423828,0.029784440994262695,0.030854463577270508,0.032196044921875,0.030838727951049805,0.031493186950683594,0.031028032302856445,0.28580403327941895,0.9730720520019531,12.200442790985107,7.425472974777222,0.6281161308288574,0.2764465808868408,0.1864173412322998,0.1882169246673584,0.18515992164611816,0.18859624862670898,0.1878659725189209,0.5057146549224854,12.069629192352295,0.1860647201538086,0.18347501754760742,0.14235711097717285,0.1831493377685547,0.14053988456726074 diff --git a/results/combined/merges_timed/solita/functional-utils.csv b/results/combined/merges_timed/solita/functional-utils.csv index 1536630c6e..ec92593c66 100644 --- a/results/combined/merges_timed/solita/functional-utils.csv +++ b/results/combined/merges_timed/solita/functional-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,a64f974e8d33134ba7f1b5e2450dfcdf9e764731,0690e9cfb6695662bfa7971480c5787864adb3cf,c9832d266ab93c8270c0a775404cd92b8cf73e18,,True,True,True,46,273,1424.0,2,True,46,Tests_passed,fac7f7c2141bfb63e58ce4f40f70e6525014f603c7ee68ce29aa925661097cfb,True,Tests_passed,13e2792f96dbadec538ca821da28f9f954ee1993bdbfb6e08d2eee7229d68edf,True,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_failed,927db1cea10b9d041045382cff0272f56ac745b9c2656bb14160ea4fe78d02b4,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,0.05056142807006836,0.04099106788635254,0.06392908096313477,0.06911349296569824,0.06912565231323242,0.059584617614746094,0.03641843795776367,0.1906442642211914,0.12222552299499512,1.0600824356079102,1.1754646301269531,0.08536267280578613,0.14460062980651855,0.054425954818725586,0.05508708953857422,0.05473923683166504,0.051970720291137695,0.05420947074890137,0.09316587448120117,1.0493154525756836,0.051674604415893555,0.05171465873718262,0.04102015495300293,0.05290937423706055,0.041996002197265625 diff --git a/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv b/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv index a33f513309..23b43028ea 100644 --- a/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv +++ b/results/combined/merges_timed/solovyevk/htm-cla-visualizer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,94286559181db4d3b19d0d0d814a28efe3e1d783,f7894cf76d0b1aa1f1066187a6b2213b3630e338,ae607d6bcb18f27ddfa008da90d4de8aae5c57da,,True,True,True,18,47,513,2,True,18,Tests_passed,68372ceb2273588a76f20363acefb67058292d041bab067a32be34a01cc47197,True,Tests_passed,a068a97a3867cd212869da1291a42fe75e14bc6ab07c450f558ac3baa9c7fabc,True,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,0.05016827583312988,0.041754722595214844,0.046508073806762695,0.05228567123413086,0.048126220703125,0.053401947021484375,0.05227398872375488,0.18311381340026855,0.11677861213684082,0.5188345909118652,0.6541435718536377,0.07742834091186523,0.13386154174804688,0.04344367980957031,0.046819210052490234,0.046381235122680664,0.04367947578430176,0.04704022407531738,0.07835149765014648,0.5404987335205078,0.04498863220214844,0.04556632041931152,0.033078670501708984,0.04604053497314453,0.03428530693054199 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv b/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv index fe3d8847ef..30f670832c 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-build-breaker.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,0a474ef6d91248a199a65c9ca24556e598116fd1,937870ed1c0f1c0f785b318bbd66d91e2080e043,6654db7b83ce2e7900c99d2540bdcca57a9fd3b7,,True,True,True,7,13,817,2,True,7,Tests_passed,25357fd119adf4c68630353ed196eb309a8c4d6aa66b280a1eb22591ed7de169,True,Tests_passed,c4ba271d24bd7adbf3b7ab6130671ac90c9701f8e93d1483d9f500e5bde36c52,True,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,6bb2141e158e68f022858f9e3e4d90c367561d41f2bc4818f1cd26ab96ec57aa,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_timedout,,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,31c078189bb846184e8dfab1d3846a4282f7ee7c2c8e7799d83090ec13e4461f,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,0.038768768310546875,0.03595995903015137,0.036933183670043945,0.027440786361694336,0.040004730224609375,0.03994417190551758,0.03907942771911621,0.09037613868713379,0.1091151237487793,0.5784099102020264,-1.0,0.06744551658630371,0.11213159561157227,0.03269553184509277,0.03287696838378906,0.03283500671386719,0.03323554992675781,0.03245234489440918,0.06323957443237305,0.579495906829834,0.03298163414001465,0.03310823440551758,0.03153800964355469,0.0331728458404541,0.03134870529174805 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv b/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv index b3f2dfc48c..e233244a7f 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-ldap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/1,245133355f897caada1272aff129ffe56d3ad4a2,6a81bd5a6f17f247f39784815ff5cf3966ef2865,6b7fb9409178b44ab52175ba3b2265554062d089,,True,True,True,31,186,3936,32,True,32,Tests_passed,89ef06aa7e710d9e8ee37ea428148cadb047f8db7b9b1be99338c239e5ff39ed,True,Tests_passed,9b7200002758d949a0b1fe19afc07b4d22e5a8fb3dc7e5eed52b5812075a5492,True,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,e78f0e075844e298179d7ef737648d6a3fb4cbd04da9eb99f17255b7b1da4c92,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Tests_failed,bd26361dc8dbec425b786b6cd75b65cf6afd6f857c70aa25d21e82d94b222b7e,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,59aace462e3f4630515a94363e4466d8a4aceb14dbe290093d23cf6b94bb90ba,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,0.06477665901184082,0.05567026138305664,0.05591535568237305,0.05863165855407715,0.04359006881713867,0.053417205810546875,0.05775618553161621,1.9883637428283691,2.130169153213501,15.511932134628296,0.4779174327850342,1.1443848609924316,0.3251311779022217,0.2453460693359375,0.24261689186096191,0.24327874183654785,0.24745702743530273,0.24707770347595215,0.7204868793487549,15.363377094268799,0.2482295036315918,0.23993706703186035,0.24599528312683105,0.24513006210327148,0.24124360084533691 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-php.csv b/results/combined/merges_timed/sonarcommunity/sonar-php.csv index 94a0c4bd33..f1e74e1d19 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-php.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-php.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/remotes/origin/pull/536,ad3b13cdd68bfd6e2cd944ac3c10ab5cfa005135,a775f0a16cab51b5cfb2fed6c916ba2fa406fd6c,13e149f93c8a92a61ddbf8278a6bc489882fc7be,,True,True,Tests_passed,35397118277aa8a26d7627f2723806d736b9bcf7b99b7819acb351b23f812257,True,13.0,15,317,2,True,Tests_passed,3a4ce9f7e5757033ec26ccec4b9cba4c5d6017effd6f87dc1b5d4039be578740,True,14,True,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,9d67b462cba82ff269f15d4a507793ac0e30e6aec620f27ce7b7f252e05bc657,Tests_passed,12ed56e9f9823671f2417ce39262a48e9f9d013c00c0d8f736c1634790d65e5e,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,9d67b462cba82ff269f15d4a507793ac0e30e6aec620f27ce7b7f252e05bc657,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,Tests_passed,0d3d50ad31107244fa82d50c8b9409776810158c17be3fa66ad726bd32947bf8,0.016687870025634766,0.016593217849731445,0.018274545669555664,0.017493724822998047,0.017777204513549805,0.017873525619506836,0.018300294876098633,0.04727053642272949,0.07164621353149414,0.6551830768585205,0.3824324607849121,0.15825319290161133,0.22487878799438477,0.12343621253967285,0.12812423706054688,0.12920236587524414,0.12979578971862793,0.13275504112243652,0.167219877243042,0.7832705974578857,0.12654733657836914,0.1263566017150879,0.09091806411743164,0.09674620628356934,0.1166388988494873 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv b/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv index 4dd5708a61..1d33fb9851 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-pmd.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 95,refs/heads/master,933775819973c32cc8a831ea756e9a6c7a10f113,0a066a0b69aba7799612a24ce4647dedddc07c2d,b118e67f15d4f913fcd4e4952ad31b56291476a2,,True,True,True,253,640,6597,6,True,253,Tests_passed,4eaae77b2157c186abf57a4a21fdf7b72784dc2173c933c310afe8a94f077f01,True,Tests_passed,9fc2f862b927e7ae6dc2d2eaba7c186fa270202ad600af9dd62af7f06802d825,True,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8d8403ac294aa879cf0c872cc04619a9a9649dbcdd19e6a1a7b45a84c2be5737,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,6ac9740e775a8a7750f43aed5e62f206175f6d42dce94ceb258d21571e1221fe,Merge_failed,084ac0b4834afaf8faee710ddfd8fc04c8ea184679df110eac4a19de6b0272eb,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8f91023b1e0e6c0841fa8f32b2b531666e04a2d5493e6cb290c3a9111b86936e,Merge_failed,322246225c204ffe32985abf12bc4037e8322a8784fd0d0d48b61e24cf85c09f,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,0.023099422454833984,0.023203611373901367,0.02489495277404785,0.02432847023010254,0.023604869842529297,0.024251461029052734,0.024379491806030273,0.10152220726013184,0.30505943298339844,1.9055724143981934,0.8020064830780029,0.22295427322387695,0.17127203941345215,0.08436870574951172,0.08220171928405762,0.08131051063537598,0.08387970924377441,0.08464717864990234,0.17998480796813965,1.9897229671478271,0.08343100547790527,0.08435606956481934,0.08157086372375488,0.08198976516723633,0.0790712833404541 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv b/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv index 62ac1ebb44..5b77b28e02 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-scm-activity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/remotes/origin/pull/4,eb6d39619d9c570d93b08239891ca2983e73e85c,2a004dc73737229a24009e64cfe68d8a9a4796f1,11e3ca2815a75f93ff30d276caea7caf48562f93,,True,True,Tests_passed,d415eab3e2d82e969d504dc93244f445a5337b5d4628194e23749b95d3370da3,True,50,228,1473,3,True,Tests_passed,2c4ad171e512e0f17fc186fb4f2773595f48144e8a01d634b63174b33bcefd9c,True,51,True,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,821133f4d24858a9d7305de5dac2feabc9205af64efa352cc26b26591f4694af,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,08a86cbda8b72f5d7c672fdef2ed11f8123c0302a9f887d6d014537acceb1fe8,Merge_timedout,,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,1d44e2213a9daad2d6a4d716de004b417c0b1a8ccaa9da203039d5179213d735,Merge_failed,fa57199e3af30a1f39095fb39616b8225efecf9577dd3446c84c50e0ec33ebda,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,0.011174440383911133,0.011368989944458008,0.011558294296264648,0.01156926155090332,0.0118408203125,0.011393308639526367,0.011681795120239258,0.048553466796875,0.12550759315490723,0.46546030044555664,-1.0,0.10623598098754883,0.13349175453186035,0.0450892448425293,0.04578375816345215,0.046079397201538086,0.04526090621948242,0.046105384826660156,0.09237527847290039,0.5158252716064453,0.04488563537597656,0.045839548110961914,0.043527841567993164,0.04595351219177246,0.042958736419677734 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-web.csv b/results/combined/merges_timed/sonarcommunity/sonar-web.csv index 60f6136cc4..fd3a05c215 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-web.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-web.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/117,b6a68a63c42d8f2dce3fd92a208351b3cf4f2857,b4c07004f18f2f89123e2f56316d1cd221efe878,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,Tests_passed,5cb9e4a18671d81d619d4dab64820ba17ce46aa2f7f79d4e18020936eb734b0d,True,19,31,11733,3,True,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,True,20,True,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,ca8d60db0082d675bcc3b177f267a487ca325771cf096b3c11cfc6c520184c4c,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,63ab2da013a8b9d10c44335a4adccc519f9d208e106e193d46b740f1549929e2,Merge_failed,adde5491deddc3f181201ae0bcccdc5d9b85a0e20c19146217d088694fa6ff00,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,bf16356cb79d728266f6698a912abe6c0c08cad726a56066f36c9501b6b95541,Merge_failed,1fcb3fd4559c9db821d535eb1786b6dde36382e6b9761d2b4e73da189d26b2da,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,0.013602256774902344,0.013594627380371094,0.013042211532592773,0.01298379898071289,0.013762712478637695,0.01301884651184082,0.013196468353271484,0.07855415344238281,0.1291346549987793,0.5835535526275635,0.44565391540527344,0.11267352104187012,0.13323283195495605,0.0492854118347168,0.049436330795288086,0.04864239692687988,0.04839301109313965,0.05004763603210449,0.09516024589538574,0.6398637294769287,0.0480799674987793,0.0500025749206543,0.04920601844787598,0.04891657829284668,0.05037641525268555 diff --git a/results/combined/merges_timed/sonarcommunity/sonar-xml.csv b/results/combined/merges_timed/sonarcommunity/sonar-xml.csv index 60c493527b..0f5c8d2e9d 100644 --- a/results/combined/merges_timed/sonarcommunity/sonar-xml.csv +++ b/results/combined/merges_timed/sonarcommunity/sonar-xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,0e1fee2967a660d9ad773b8279e8ffe5ab4d0908,7c4f9c62a54532c13a302793523e6c5ec498c54c,90964790a53ea2e1c81906221666a3fb33ab68bf,,True,True,True,23,117,624,143,True,153,Tests_passed,a77b55b7a45b441baeef7140fae50e2f005e93b8f7eaff4939fe71cf5b7f54eb,True,Tests_passed,a138b393b01e2f41e2588142f289fbe748e3795bc997e13f950a5f5310ace78f,True,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,65539822e0d594d5630b4feabc46ce2239216cdec3c716d65c59073641653d7e,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,5dacc30d3d17647f1644931d3371538e2d7053eaccf75866b9ac90492a247789,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,7c41aa6c1f84049b41e613e27ad6395109545901f0279b46f04e2dbc640dda13,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,0.02320241928100586,0.023861169815063477,0.026244640350341797,0.025684595108032227,0.02603626251220703,0.025902509689331055,0.025763511657714844,0.24013471603393555,0.936445951461792,9.596669435501099,-1.0,0.5796902179718018,0.22080421447753906,0.15647315979003906,0.15610289573669434,0.15696454048156738,0.15598797798156738,0.16003823280334473,0.40038347244262695,9.768583059310913,0.15067291259765625,0.13628888130187988,0.13274693489074707,0.1541304588317871,0.1334075927734375 diff --git a/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv b/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv index 70533717d8..307119d31a 100644 --- a/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv +++ b/results/combined/merges_timed/sonarsource/jenkins-sonar-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 35,refs/remotes/origin/pull/175,ffd5c4bca45dd46beef89274d9038c75674ebc75,8f1211f8bc2315b76bc8069e8634109c89824177,3ccb62e49f48393112a5de43295ef4ee474cf6b5,,True,False,Tests_passed,030ae5f4f6367f13cca4292050fa23065fd5af3beef9f5b416b229bcbd34dc85,True,113,119,264.0,2,True,Tests_passed,10c0ee8982cb9b767179e5529f3b83de2a6b7d2d894db1afb6a05a49c01e7eb6,True,113,True,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,0.06476116180419922,0.07024717330932617,0.05503273010253906,0.06516790390014648,0.0787506103515625,0.06492757797241211,0.06130838394165039,0.19928932189941406,0.10593771934509277,0.056282997131347656,0.9435052871704102,0.09544944763183594,0.1579301357269287,0.06609725952148438,0.06487345695495605,0.06432342529296875,0.05998110771179199,0.06424951553344727,0.10767364501953125,0.0809180736541748,0.06372284889221191,0.06163144111633301,0.05356240272521973,0.061708927154541016,0.05275082588195801 diff --git a/results/combined/merges_timed/sonarsource/sonar-findbugs.csv b/results/combined/merges_timed/sonarsource/sonar-findbugs.csv index 13b90e1c95..973735f02f 100644 --- a/results/combined/merges_timed/sonarsource/sonar-findbugs.csv +++ b/results/combined/merges_timed/sonarsource/sonar-findbugs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 209,refs/remotes/origin/sq-10,185c5314e370b844d643c036c0bebada30bb7de6,863f3163111b75cc7bf2817f0d7862e3e7185807,8e93e5ab17b54ec7c3001ea623d999e1de863b86,,True,True,True,61,238,3938.0,6,True,61,Tests_passed,0cf61a3b4920d0659f046cc4e6d8512c0339f752894766dccd363a49fd791fa9,True,Tests_passed,eee6aac93552220e94ca101c359aeab1ab76c1b77e6d4e03d0e1b5fd45cbcc01,True,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,f96b5dcbbcd5831d454ad24a538104860df8884b25893fe71a2d4a619b9eac64,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,bb5251a64838f0fb84702275d27a145860b87df57f115e227344ab82e64ae051,Merge_failed,4ab53a39feb95662036d02eb85292b6645eb83cc0653e2ed3b1c8fdacb075b02,Merge_failed,2627aaf7f26988c8fcb6243deb255ad33f938fa760ba8cf2859614b427db674e,Tests_failed,0a8017340baf0544994926ddd6cda1c82aebc17af55a6b1a3c67ccae7954ead8,Merge_failed,4ab53a39feb95662036d02eb85292b6645eb83cc0653e2ed3b1c8fdacb075b02,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,f96b5dcbbcd5831d454ad24a538104860df8884b25893fe71a2d4a619b9eac64,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,0adbb30f8c4d4c4da05297c8ac4bd1f48d39d7cbac80bb46c4e05dd56032fa4a,Merge_failed,2627aaf7f26988c8fcb6243deb255ad33f938fa760ba8cf2859614b427db674e,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,c88db041c44fd0b0d4ee7ef0f56586097fd5ca38cdb7d97c9a2a764e16e9c8a5,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,Merge_failed,2a0c422bee1099a4e857d4e3032fcb0725a9dd9b5fd5a01e64346e1dc4696b1d,0.0604248046875,0.05564546585083008,0.0479123592376709,0.05431866645812988,0.05476117134094238,0.03700375556945801,0.05029487609863281,0.40113019943237305,0.31797051429748535,3.243856430053711,1.7736895084381104,0.24657583236694336,0.20492076873779297,0.10479950904846191,0.10384011268615723,0.1068110466003418,0.1090400218963623,0.10432767868041992,0.22462749481201172,3.3012173175811768,0.09650778770446777,0.09994316101074219,0.08582615852355957,0.1008901596069336,0.08301806449890137 diff --git a/results/combined/merges_timed/sonatype/jgit.csv b/results/combined/merges_timed/sonatype/jgit.csv index 1f2549bac6..e018364348 100644 --- a/results/combined/merges_timed/sonatype/jgit.csv +++ b/results/combined/merges_timed/sonatype/jgit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 38,refs/remotes/origin/struberg,7ce2207c2b66c7fec63cdcb816bd570c534fb829,ea4903241e2b096d85101dc4697b0b7b9749f820,6c5dff4f907654ffb7ba99887d36d57bdd0d1f74,,True,True,True,28,179,2745.0,25,True,50,Tests_passed,4c7c9f2cfcfef5418f353e07765f9500e1bb03ab765c5b671e226773ebdc8e1b,True,Tests_passed,5422cfa265a3148065a2dbab138da2b11f35aed165bafc57bb3669a1ff023ae8,True,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,8e5d2dee98b55f33840e00467dceeac83d81a45000bd4e96df1a39ebf7736235,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,da1491f4001f955051bb20683e7a27dbaf361dfc04bfc868be0efebfb3e3eae8,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,0.0584559440612793,0.02779841423034668,0.02100396156311035,0.018849849700927734,0.01661396026611328,0.015439033508300781,0.01610708236694336,0.07274246215820312,0.13216710090637207,0.031262874603271484,1.049753189086914,0.10152459144592285,0.12545442581176758,0.04586505889892578,0.04475045204162598,0.04478716850280762,0.04473423957824707,0.04606795310974121,0.09540677070617676,0.05712294578552246,0.04290938377380371,0.0426483154296875,0.04067802429199219,0.04411125183105469,0.041826486587524414 diff --git a/results/combined/merges_timed/sonatype/plexus-compiler.csv b/results/combined/merges_timed/sonatype/plexus-compiler.csv index b66f67e306..4990f1fb42 100644 --- a/results/combined/merges_timed/sonatype/plexus-compiler.csv +++ b/results/combined/merges_timed/sonatype/plexus-compiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/remotes/origin/pull/36,379b6114536f2f3d363d096fbe2246f5cb3b8ad1,3eb04b388662f4f3394b51983837b3065b3aa3f9,70cce375cf186440ac930c41e026b1ef614202cd,,True,True,True,3,5,83,2,True,3,Tests_passed,c337201bd8796ab798364b29a4c5b47c9a1d1df453ea8b28f0ea82885c32afab,True,Tests_passed,f960cde03470289072c5f5033ad4910a9f0242fbc89f908d5d46ddd0e7968905,True,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_failed,4c0567bd18a760ef2290fff6f912d2bd23b82a3c6e1567ffc471b758d7f88eb4,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,0.03644132614135742,0.03720378875732422,0.03164196014404297,0.03416132926940918,0.04146218299865723,0.03551912307739258,0.047429561614990234,0.13329625129699707,0.10052752494812012,1.1716594696044922,0.34188365936279297,0.08124899864196777,0.14458465576171875,0.05296611785888672,0.052997589111328125,0.05265021324157715,0.051422834396362305,0.0517125129699707,0.08518028259277344,1.0607502460479736,0.0486910343170166,0.05070185661315918,0.03787851333618164,0.04941296577453613,0.038222312927246094 diff --git a/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv b/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv index 98929dee50..ccd628f26f 100644 --- a/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv +++ b/results/combined/merges_timed/soundcloud/prometheus-hystrix.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/remotes/origin/pull/11,fd664ae55bf754fbd5764a2c19019e1ed8d5ba14,876af34a18e3dec75c57c959a230921f32cbe529,7a8337d0fb5d70f209f5bbe6838e55d9789a6b57,,True,False,True,2,3,3,2,True,2,Tests_passed,0ed23bef9c2183e93b691fd4f1a2a737f46f1947cd24aa480fcc22a80f0db15f,True,Tests_passed,d703dcf1d53b48eb9b34cf5e1ff00a14c6d3c065c93a9cf67b27ab97ea397d0f,True,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f45f889ae4fcf16aba72b23a8819229366584fdad84bb4e6351917ada1e3c63e,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,Tests_failed,cd73ea4244ddb787f54fafc779933b0ce96e16d1c2e0a1b5a7696032d9faef00,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f517bf2eb64df6c3c49e17eff2eeacd3391d9e71b289f4a74077d8abfc017841,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,0.009229421615600586,0.00987696647644043,0.009827613830566406,0.009305000305175781,0.009278059005737305,0.009392261505126953,0.009252309799194336,0.037497758865356445,0.0749821662902832,0.02507472038269043,0.25144338607788086,0.07683920860290527,0.11456084251403809,0.03400564193725586,0.03343796730041504,0.0339198112487793,0.03300285339355469,0.0331881046295166,0.06509923934936523,0.04637408256530762,0.03291440010070801,0.03467869758605957,0.03222084045410156,0.03325653076171875,0.03229188919067383 diff --git a/results/combined/merges_timed/spigotmc/bungeecord.csv b/results/combined/merges_timed/spigotmc/bungeecord.csv index 00a1cd697b..c2a17dc4a3 100644 --- a/results/combined/merges_timed/spigotmc/bungeecord.csv +++ b/results/combined/merges_timed/spigotmc/bungeecord.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 381,refs/remotes/origin/pull/3371,f61fa56a8a1ea5e8f471014a614f6aff85198900,75aa9eb93c3fa63038e33b682bdd1d19e22c26d9,ca8f31bdc70a2ec626274b4659b99732ec602969,,True,True,Tests_passed,6ee17908cc61bda9bf0adfe3de861b1369efb1e7824d41ac411dcf3f29aa3d11,True,68,152,4969,2,True,Tests_passed,96ffe75b7be6e3a284eec92a9e9288490db32a692ac0aa87c8a6204995bee633,True,68,True,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,078f636bf448dc8b8705e67c04a22e344530b871295c7475c66582c8ccd488bc,Merge_timedout,,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,078f636bf448dc8b8705e67c04a22e344530b871295c7475c66582c8ccd488bc,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,Tests_passed,6b2edb5fed8abe64b06638c9034d39a152b4c1a2c29fb04f7bc7c2f30fcf842b,0.03581833839416504,0.04290032386779785,0.057970523834228516,0.0571591854095459,0.05745649337768555,0.057672739028930664,0.057851314544677734,0.08434247970581055,0.10061240196228027,1.0959999561309814,-1.0,0.1381540298461914,0.20428204536437988,0.10598206520080566,0.11677193641662598,0.11710619926452637,0.10136842727661133,0.09811091423034668,0.1667344570159912,1.1543591022491455,0.10615038871765137,0.0882575511932373,0.08733892440795898,0.10207581520080566,0.10680770874023438 diff --git a/results/combined/merges_timed/spinscale/dropwizard-jobs.csv b/results/combined/merges_timed/spinscale/dropwizard-jobs.csv index 657df5349f..c2550a87d6 100644 --- a/results/combined/merges_timed/spinscale/dropwizard-jobs.csv +++ b/results/combined/merges_timed/spinscale/dropwizard-jobs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,f10957c9cc94f1aebe4eb4416353065fa0fc4ba1,2c65c4f0accaea4a891af4e8cd063b3c733a3a95,8f70c45b5d1ebb3d13081a504a66e686b52dae99,,True,True,True,14,49,233,2,True,14,Tests_passed,e2e3fa4cc027cf9846be2fc5a9c019227dc2f044a8fe8628234e7e576d4f179a,True,Tests_passed,591c3c4baf550ce5eb82adbbfca17fdae086a3e951cda4972de6e0ff8a276109,True,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_failed,7a1dac1af00c467f9e88064b6fbbfdcb9098c07ad51324321509007f43acc51c,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,0.033475399017333984,0.014754056930541992,0.04237985610961914,0.04811453819274902,0.04627275466918945,0.04199671745300293,0.04508495330810547,0.16614246368408203,0.11492800712585449,0.974041223526001,0.41315746307373047,0.07591843605041504,0.12766647338867188,0.04167509078979492,0.04213094711303711,0.0423274040222168,0.042482852935791016,0.04237079620361328,0.07476925849914551,0.9466321468353271,0.039200782775878906,0.040467023849487305,0.030724525451660156,0.04113602638244629,0.03078436851501465 diff --git a/results/combined/merges_timed/splunk/splunk-library-javalogging.csv b/results/combined/merges_timed/splunk/splunk-library-javalogging.csv index bc49beae0d..b31db6cc6a 100644 --- a/results/combined/merges_timed/splunk/splunk-library-javalogging.csv +++ b/results/combined/merges_timed/splunk/splunk-library-javalogging.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/main,eaabf143fcd981acedad944e96014590671bc8c5,f4c5d7d45b0dc154b2a4f2fedc4b02d0248767c9,256fc35520f005d938eda5b4bfb960c280a51580,,True,True,True,19.0,129,739.0,4,True,19,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,True,Tests_passed,47ca92145bf0073c74bb275215ae8322a50b96b68f71364744aaf45bb9d643e2,True,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,0.012869119644165039,0.01305532455444336,0.014390230178833008,0.014469623565673828,0.014300823211669922,0.01484823226928711,0.015042781829833984,0.06598687171936035,0.1744081974029541,2.417557954788208,0.6770827770233154,0.14375925064086914,0.15015053749084473,0.06389737129211426,0.0630350112915039,0.06371879577636719,0.0630345344543457,0.06299996376037598,0.13293981552124023,2.4431941509246826,0.06348395347595215,0.0610044002532959,0.03799080848693848,0.06174206733703613,0.038294076919555664 diff --git a/results/combined/merges_timed/spotify/apollo.csv b/results/combined/merges_timed/spotify/apollo.csv index 6e038a0906..4822425c62 100644 --- a/results/combined/merges_timed/spotify/apollo.csv +++ b/results/combined/merges_timed/spotify/apollo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,True,240,348,6860,4,True,240,Tests_passed,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,True,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,True,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,444f98aa757f194157f6a61f23427f26bba24d910882ba7fefcabb33a1974c2e,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,0.06300663948059082,0.07809996604919434,0.046755075454711914,0.07096982002258301,0.0643620491027832,0.06816935539245605,0.07728242874145508,0.3040618896484375,0.2470555305480957,1.6079597473144531,1.6141736507415771,0.16741347312927246,0.18785452842712402,0.0895390510559082,0.09107398986816406,0.08774781227111816,0.09084606170654297,0.0886847972869873,0.17410063743591309,1.635822057723999,0.08663058280944824,0.08886957168579102,0.06087517738342285,0.08789920806884766,0.06540346145629883 diff --git a/results/combined/merges_timed/spotify/dockerfile-maven.csv b/results/combined/merges_timed/spotify/dockerfile-maven.csv index aac8e3e371..4b0af0a666 100644 --- a/results/combined/merges_timed/spotify/dockerfile-maven.csv +++ b/results/combined/merges_timed/spotify/dockerfile-maven.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,False,True,8,14,117,2,True,8,Tests_passed,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,True,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,True,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_failed,9e89a24ace0ba4e0a779c9e067e8b2860330bed71a4256e061a77a1764003e2a,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,0.04335927963256836,0.0442354679107666,0.04241204261779785,0.048003435134887695,0.04336905479431152,0.04075121879577637,0.04299187660217285,0.15304279327392578,0.1180882453918457,0.7774229049682617,0.2745676040649414,0.07357168197631836,0.13594341278076172,0.0415651798248291,0.0438084602355957,0.040197134017944336,0.042082786560058594,0.04202699661254883,0.07512068748474121,0.7200138568878174,0.04173874855041504,0.042279958724975586,0.03168773651123047,0.03993821144104004,0.031818389892578125 diff --git a/results/combined/merges_timed/spotify/elasticsearch-index-window.csv b/results/combined/merges_timed/spotify/elasticsearch-index-window.csv index 2d943eed9a..756fb3c078 100644 --- a/results/combined/merges_timed/spotify/elasticsearch-index-window.csv +++ b/results/combined/merges_timed/spotify/elasticsearch-index-window.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/remotes/origin/es_1.2.2/master,32d09a063be531c17ea178ffd24c1d250b560e80,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,ccf1d21762244db2a4231715da4fbfee4a0f2306,,True,True,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,True,3,14,68,2,True,Tests_passed,b598a96eaeee7daeb50b1158a49626dc8ec0dda0c7855797644849dfda7515f1,True,3,True,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_failed,18531d744b7a41919618935f086d96557c2f92f50d8530759b4e8deb309a5615,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,0.04086041450500488,0.04193449020385742,0.04231548309326172,0.04102921485900879,0.03837394714355469,0.009404897689819336,0.042809247970581055,0.15707612037658691,0.11060738563537598,0.9588029384613037,0.29221153259277344,0.06595706939697266,0.12005138397216797,0.036264896392822266,0.03686022758483887,0.03700447082519531,0.037461042404174805,0.0353245735168457,0.06903767585754395,0.9021618366241455,0.03687167167663574,0.03695034980773926,0.026170730590820312,0.03676724433898926,0.026630163192749023 diff --git a/results/combined/merges_timed/spotify/ffwd-java.csv b/results/combined/merges_timed/spotify/ffwd-java.csv index 8b173f9e6c..06a8c51e4c 100644 --- a/results/combined/merges_timed/spotify/ffwd-java.csv +++ b/results/combined/merges_timed/spotify/ffwd-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 72,refs/heads/master,f03fcf1bdf4070e224e56d26eb0d2da20d71bb9d,a66a58f4683f76cd189f7c976497b8d3b568722e,34934670b4760870bc03ee52ea80fc3ea32815c3,,True,True,True,38,104,821,9,True,38,Tests_passed,8bd78f5802142070f576f5c30820424e9920556bb69a1bab3d14c15d80624163,True,Tests_passed,a67c13e0249d404dfb9d623d7289f385a2bae35904eb4996f27cdd7bb257d2f6,True,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,0.02539658546447754,0.026096343994140625,0.03353595733642578,0.033066511154174805,0.033627986907958984,0.033824920654296875,0.033248186111450195,0.12299156188964844,0.44967007637023926,4.795285940170288,0.5005240440368652,0.3132789134979248,0.23451924324035645,0.13484525680541992,0.12916207313537598,0.09585285186767578,0.12661337852478027,0.13330531120300293,0.31873464584350586,4.810143709182739,0.11076927185058594,0.12077832221984863,0.034234046936035156,0.12235069274902344,0.03507065773010254 diff --git a/results/combined/merges_timed/spotify/hdfs2cass.csv b/results/combined/merges_timed/spotify/hdfs2cass.csv index 7340a5c24b..43a33135c3 100644 --- a/results/combined/merges_timed/spotify/hdfs2cass.csv +++ b/results/combined/merges_timed/spotify/hdfs2cass.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,d9ccc2bac7fe1bbb5a690b6a95ab80eac4e0fa36,7a757f461ac3132b81d96d92b7a033ca7c05bb45,f3a003a8385c087bbe4b372cfc5b3443696c2167,,True,True,True,11,48,214,3,True,12,Tests_passed,55a8f0595daccbea9e464f212df864dc7c8becab629047ad413ee8045a6a75e5,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_failed,c52724fec2478112b1e9835c831cbe4e8ef1bf59fceca0d627263bde5e860dc3,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,0.04835939407348633,0.05001544952392578,0.04179024696350098,0.043401241302490234,0.047612905502319336,0.04718732833862305,0.0493931770324707,0.1671743392944336,0.10576581954956055,0.8120906352996826,0.5068802833557129,0.0736386775970459,0.12745308876037598,0.040566444396972656,0.04072928428649902,0.0416107177734375,0.040042877197265625,0.04171133041381836,0.07488441467285156,0.8126108646392822,0.04044294357299805,0.042376041412353516,0.03092050552368164,0.04053688049316406,0.029979705810546875 diff --git a/results/combined/merges_timed/spotify/netty-zmtp.csv b/results/combined/merges_timed/spotify/netty-zmtp.csv index 393ecdde18..5de7e248ab 100644 --- a/results/combined/merges_timed/spotify/netty-zmtp.csv +++ b/results/combined/merges_timed/spotify/netty-zmtp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/remotes/origin/pull/12,8d02651ebcbfc80ea17699b5547176248b2635c7,7effbc621510cc26959f25d09d5857b663f46550,21fd8022c592b2c294c77090c16654ebb493a1be,,True,True,True,32,227,3832,13,True,32,Tests_passed,cdc535f07b4716c09bc13a1e68c7f375a89c65152118382a129bef76c574b480,True,Tests_passed,6770f99f75ba645ec74aceb050a396d4616d279fb694a65a6e5f48b59d7728d1,True,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,3c624374762e5c56605311228d7e31ccdbc83fcfdb1532c7f5cbe48dff4cc6d0,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c1bcd0ccb245361dbbf8ee9a3ebc490211535c0334c19c08271b805e20294e44,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,e72dbe5a38a74a11fb950f7ed0853d8dad669ba15f5bad9a29dcf3e004316d1e,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,0.055075645446777344,0.055922508239746094,0.0539703369140625,0.04948925971984863,0.04944968223571777,0.05825376510620117,0.055877685546875,0.8547348976135254,0.7348642349243164,6.995342254638672,0.9349479675292969,0.41809630393981934,0.20585250854492188,0.11794114112854004,0.11735391616821289,0.11760616302490234,0.11616969108581543,0.1171879768371582,0.314314603805542,7.0220208168029785,0.11823821067810059,0.11762380599975586,0.11042499542236328,0.11744093894958496,0.11034512519836426 diff --git a/results/combined/merges_timed/spoutcraft/legacylauncher.csv b/results/combined/merges_timed/spoutcraft/legacylauncher.csv index cb71e9a0e4..1ce8c3ce4b 100644 --- a/results/combined/merges_timed/spoutcraft/legacylauncher.csv +++ b/results/combined/merges_timed/spoutcraft/legacylauncher.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/heads/master,75e5f920cfdd14b65def29aabf6fc7a981cfa82c,3957f69a5e30979056644a3ce9261ab03cd9e0ce,87a19ffce60d9f05c7a1206bbf107d1852fa952e,,True,True,Tests_passed,e67be0dbf2347f747f6e3c4c77eb2b8c8a8423dfe6d5b206825112abf7e57572,True,6,32,225,2,True,Tests_passed,6f31180c12066cd3265cb088b8f010141fa1d04929949fb2e07fd9cd6f0bc2ba,True,6,True,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,6523b7c559b5cb0ecb704ef304527e0f00929ab6c57b0bb336f3d04e53261545,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,6523b7c559b5cb0ecb704ef304527e0f00929ab6c57b0bb336f3d04e53261545,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,1937e5730000ede95d1d12dc8362429448c400a2618938c3a0ec510d501210f3,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,Tests_passed,ebabdd40d34d029e4591cca50f4f8c4cbfd8b4a100efab99cff6248c11cee75b,0.011612653732299805,0.012366056442260742,0.012682199478149414,0.013003110885620117,0.012772321701049805,0.012521982192993164,0.01270294189453125,0.03854084014892578,0.06647968292236328,1.4180631637573242,0.41522836685180664,0.08062624931335449,0.13459372520446777,0.04930591583251953,0.04569244384765625,0.047777652740478516,0.04778456687927246,0.047104597091674805,0.08447790145874023,1.5404951572418213,0.04580974578857422,0.04756331443786621,0.035535335540771484,0.04480600357055664,0.036223411560058594 diff --git a/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv b/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv index 876d5524c4..9f2ff116f2 100644 --- a/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv +++ b/results/combined/merges_timed/spring-projects/spring-data-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,True,False,True,4,8,96.0,2,True,4,Tests_passed,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,True,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,True,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Merge_timedout,,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,0.06298828125,0.0325016975402832,0.043036699295043945,0.0440523624420166,0.047220468521118164,0.03683328628540039,0.045871734619140625,0.14998269081115723,0.08961963653564453,1.1124932765960693,-1.0,0.09893655776977539,0.15520977973937988,0.06762242317199707,0.06473493576049805,0.0638420581817627,0.048684120178222656,0.06597232818603516,0.07533812522888184,1.0554120540618896,0.061200618743896484,0.06288647651672363,0.05605792999267578,0.05700564384460449,0.04836106300354004 diff --git a/results/combined/merges_timed/spring-projects/spring-guice.csv b/results/combined/merges_timed/spring-projects/spring-guice.csv index e6986366de..dc815df65d 100644 --- a/results/combined/merges_timed/spring-projects/spring-guice.csv +++ b/results/combined/merges_timed/spring-projects/spring-guice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/remotes/origin/pull/6,3cf16afb341868108e4b2bfd50dd6b80dec1880d,097a86e4a2005206aaa0701657afda65a1730265,1002284360c3ead3989c89d8f185aaf6f48943a0,,True,True,Tests_passed,56a38d7ee159e751444d30b9cc5609a7a3f9f1435d9876c5a5aecbbeadf819bb,True,17,75,623,3,True,Tests_passed,7912f0e692e80a35cf51a88f0b816e71118aada0a890a6532833c1f54707ef2e,True,17,True,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,e4a89858995b5b3a0cca4ca6b1ae482a530a7cf48a4e693d704d5c0b308e78b4,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,0bd07d848d5b3f7f544c2858dfc163cb1823c17e13c5cc51534378f24d6b7ad7,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,a8058652de2332aea9e8bf1dce7b372e1bd97991ed9211aeac7ab607b593ffb8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,0.043654680252075195,0.043051719665527344,0.04335427284240723,0.049578189849853516,0.04160284996032715,0.040316104888916016,0.04358720779418945,0.2241971492767334,0.15804648399353027,0.6402933597564697,0.32243824005126953,0.09847211837768555,0.12201881408691406,0.04174089431762695,0.04756569862365723,0.04238581657409668,0.041121721267700195,0.041700124740600586,0.088775634765625,0.6463925838470459,0.04173898696899414,0.0470125675201416,0.032205820083618164,0.04067873954772949,0.032415151596069336 diff --git a/results/combined/merges_timed/sps/pushover4j.csv b/results/combined/merges_timed/sps/pushover4j.csv index 21ac2ceb5b..898be2eb1a 100644 --- a/results/combined/merges_timed/sps/pushover4j.csv +++ b/results/combined/merges_timed/sps/pushover4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/remotes/origin/pull/11,88cd636fabef766f358a3a81d802a07e940a5ceb,552d38a52a74750342db1341dc0547a23b0e66ba,edd25b58e3dc39bb01e3305f27ca4b8841be38bc,,True,True,True,11,50,472,3,True,11,Tests_passed,b4f52aecc8c8b4fc911d293c0dd059d1d5858ed74989b9c4ac929ada6d258925,True,Tests_passed,9dff968a536cc3c242a52f95638c895f20bd63963f3634f3a71ecbc153a12e1f,True,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,88b3416928043aa47e2a5c150fcf201f1dce9446019ac61bda65c3f8df11a457,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Tests_failed,148074370ea7c0cb0c848de2c7a4c303cefe7f1baa29a8025fae8300d22226a5,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,fc2e171fd95a34e3693e149d01f51bc8a2ce5bcfef00a79cd57c023c35e389d6,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,0.0385127067565918,0.04065680503845215,0.03860592842102051,0.03985857963562012,0.040575265884399414,0.0397489070892334,0.036165475845336914,0.2198195457458496,0.15230512619018555,1.2205595970153809,0.31556034088134766,0.10228943824768066,0.12115836143493652,0.04001498222351074,0.04041624069213867,0.03977632522583008,0.040184974670410156,0.03990960121154785,0.0867760181427002,1.2407727241516113,0.040186405181884766,0.04031658172607422,0.03016495704650879,0.039971113204956055,0.03116440773010254 diff --git a/results/combined/merges_timed/spullara/cli-parser.csv b/results/combined/merges_timed/spullara/cli-parser.csv index ed01feb272..905c9e6586 100644 --- a/results/combined/merges_timed/spullara/cli-parser.csv +++ b/results/combined/merges_timed/spullara/cli-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,a22d6462c8282339109510d2f810bc07fc09444c,2abb7cf0c7d114c33a521485910696d24f1e7ccb,7eac8a0be58bbcf8bfd82c64ec0a8c3f2fd572fe,,True,True,True,5,9,42,2,True,5,Tests_passed,e51d6970040173af365bfe572f4f8a1bba650f21b06e9d2b205e6c74d0fb25ae,True,Tests_passed,1ee40283cef307e10d83bbf2db9fbe41d5acf38cf19480bf77a70403792e4cbf,True,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_failed,b055054fa3520eb2951cffadfb2bb2c85b9de4aecab54da87e55537e9e6617d3,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,0.04181480407714844,0.041767120361328125,0.042313575744628906,0.04323601722717285,0.04053926467895508,0.04519796371459961,0.04488730430603027,0.09242367744445801,0.10806798934936523,1.1725594997406006,0.3568100929260254,0.06701922416687012,0.12380695343017578,0.037247657775878906,0.037832021713256836,0.03840208053588867,0.038411617279052734,0.03788495063781738,0.06865382194519043,1.141794204711914,0.03762030601501465,0.037611961364746094,0.026627540588378906,0.03726458549499512,0.027245759963989258 diff --git a/results/combined/merges_timed/spullara/java-future-jdk8.csv b/results/combined/merges_timed/spullara/java-future-jdk8.csv index e824c64480..a729faa7b7 100644 --- a/results/combined/merges_timed/spullara/java-future-jdk8.csv +++ b/results/combined/merges_timed/spullara/java-future-jdk8.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/remotes/origin/jdk7,0e8ce31ebd03ba223dda4339601f61b8ffd53ace,fa524323c0baa78224724f5cf3fc4871a4648e80,5f9ff75e9c4894e2cacaea19d87c5bdf5c00e23e,,True,False,True,5,31,79,3,True,5,Tests_passed,4e2a131c64eecbe0fb8936dab27bc856c2d180a28970affe87098d716d216a4e,True,Tests_passed,e057cba81f411c057ee988a51ecb046e23141ccaf9248c9af781b108d2187ad4,True,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,7478d12b713baa2dd4a01bdd2797d17b7eafb83406a7422ab3061b90d7c8b62c,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Tests_failed,0e9a1df776432dd054498f89cd8ed2d1d4154ffec691886425d0a26f95c9fdda,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,648b4903b1c92e2d7a9ec67e7e317a2fd5907fdeb9c2e8ff3746157e36b9b8e8,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,0.027054548263549805,0.027018070220947266,0.014333248138427734,0.026520967483520508,0.026129484176635742,0.01507711410522461,0.020133018493652344,0.14643168449401855,0.15822410583496094,1.1099374294281006,0.3479275703430176,0.10569429397583008,0.12221860885620117,0.03948068618774414,0.03929638862609863,0.03970909118652344,0.039613962173461914,0.03919053077697754,0.08597159385681152,1.0086596012115479,0.0400083065032959,0.03914523124694824,0.030820369720458984,0.03952813148498535,0.030667781829833984 diff --git a/results/combined/merges_timed/square/burst.csv b/results/combined/merges_timed/square/burst.csv index 43adf6b0fd..61e274e0a9 100644 --- a/results/combined/merges_timed/square/burst.csv +++ b/results/combined/merges_timed/square/burst.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/heads/master,08629234e54b58a5477fe85f3cb7ddc115e343db,dc83bd281d0fefd7638b8a4228d810221a1b0a0c,ee3143a23bc1ea3c1cf2a5d2c150ed3ffac08e35,,True,True,True,4,20,104,2,True,4,Tests_passed,72d1bb911712919c24acd89d7729cdbad18a9ca0311c4f6b410c32aa72affbde,True,Tests_passed,20adda77977d15c38744d88224b928144162215bd388c8c934d97b45adafa5fc,True,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_failed,e7c3b03e714a82a52d1efb13c23371b4850a1e20bc34a07e75dca6f46b112f9b,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,0.041535139083862305,0.043637990951538086,0.03125119209289551,0.04283595085144043,0.044558048248291016,0.04207468032836914,0.043247222900390625,0.16170740127563477,0.11283397674560547,0.5715217590332031,0.4767277240753174,0.06781625747680664,0.12537670135498047,0.03802013397216797,0.03779935836791992,0.037468671798706055,0.03704714775085449,0.03786444664001465,0.06931662559509277,0.5691711902618408,0.037502288818359375,0.037622690200805664,0.026893138885498047,0.037935733795166016,0.026870012283325195 diff --git a/results/combined/merges_timed/square/javapoet.csv b/results/combined/merges_timed/square/javapoet.csv index aadc108488..5ffd5bc2fb 100644 --- a/results/combined/merges_timed/square/javapoet.csv +++ b/results/combined/merges_timed/square/javapoet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 393,refs/remotes/origin/pull/681,51a233ea132edf4d94c9b88a2dc6d4ce6e673953,23210ddf289ad3d5b9ddf22b016c32c7c9a577da,e9460b84fc41464c2aa2ef85c84dd1ac87ae1692,,True,True,True,18,47,301,2,True,18,Tests_passed,e2e6681ffed01a198e0202a4622d74974dbb14499d3016111d36086671b9be1c,True,Tests_passed,48202a6ffdeddbfd6fce3b795943220c15ad35c63b5be60cbfb590bb2121b9a7,True,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,d2fb2021d8f7c27ba9dbeb04c8403a964fa297630b9e799f7309486af908ccdd,Merge_failed,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Tests_failed,d29b22784a091481604a649cea14d1abb2f3d3b672719537f947f75d6da24865,Merge_failed,e58f9421b970facb202f03992c6cf1af2deb94ee13fcd2416e007c9840613b95,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,9c34811768107d86302fba9c782431ddea736ae258bf427caa76c93b3d2c06a1,Tests_passed,4265762ca47b106693710521108d246822d5344a5b9dbc9c39e39e511bce8c81,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,Merge_failed,52202579286c8c5ef5f829321b97ecd9ea621602ef8b655bb9879b0fb8fc0cf6,0.04164004325866699,0.03193950653076172,0.04573655128479004,0.048374176025390625,0.0348658561706543,0.0527338981628418,0.04807615280151367,0.17081522941589355,0.11350131034851074,0.9764175415039062,0.6715469360351562,0.07600855827331543,0.12367868423461914,0.04090619087219238,0.04067826271057129,0.040843963623046875,0.03952383995056152,0.039098262786865234,0.07065296173095703,0.9265449047088623,0.04063272476196289,0.03970789909362793,0.03955388069152832,0.03890824317932129,0.039481401443481445 diff --git a/results/combined/merges_timed/srdc/ontmalizer.csv b/results/combined/merges_timed/srdc/ontmalizer.csv index 4edfa6a8fe..d52318fa2b 100644 --- a/results/combined/merges_timed/srdc/ontmalizer.csv +++ b/results/combined/merges_timed/srdc/ontmalizer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,b20eed45e9a12168948f7c951699f7d2533356e9,92303866bd71e360416678e98c895e8f49dfb0d5,535e8c7861e8f22b042f46f624e5551a85bbde9b,,True,True,True,3,9,38,2,True,3,Tests_passed,e9a250ca003f14fbfe09bf418f5b6bde5499f78658d501b59f29eebd25631b09,True,Tests_passed,40a96c12c202781df45badc26d0df7644d9cfee73b84a7518f09d9f3597c3a32,True,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,68e9acddc8aee71f1464905c03a799458ca8429b48d9126593f89314aabefe45,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,0.041312456130981445,0.031078577041625977,0.04424786567687988,0.05993843078613281,0.03132009506225586,0.04942965507507324,0.03839278221130371,0.09991240501403809,0.10624837875366211,1.4558322429656982,0.47424960136413574,0.09972882270812988,0.16873836517333984,0.06882429122924805,0.06720423698425293,0.07046151161193848,0.06856226921081543,0.07234668731689453,0.11358141899108887,1.3241117000579834,0.06392931938171387,0.06363892555236816,0.05717039108276367,0.06371164321899414,0.0587010383605957 diff --git a/results/combined/merges_timed/srt/asterisk-java.csv b/results/combined/merges_timed/srt/asterisk-java.csv index c86d9c672a..5f402193a5 100644 --- a/results/combined/merges_timed/srt/asterisk-java.csv +++ b/results/combined/merges_timed/srt/asterisk-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 246,refs/heads/master,a4b27137cc92af086da78fdfb634a441cb07e1d0,d99448f4a1021ad00bc2d75899852f6216cb62ed,93cdc9400b591aa3696bb2c07da548985123feb3,,True,True,Tests_passed,834ad6bf4657505b30c60af9cbb4c03fb4587ba30e7219bfe9dd98f15f78690d,True,217.0,1043,12580,4,True,Tests_passed,1f2e983d86b24afdbff5f3f8e08fcd61965a41351ef0040d23d3eadda256a9f1,True,217,True,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,3b6246c1ba273090daf815ef99b7a09f54168ac10337e5a3af2001ca9e0a89fc,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,bfec755b7828093274620c70023065911184c651fd4318081f6f90989c4e80f5,Merge_failed,2bc5141faa3c32dbcf446c03b7e010b82786ed6895101618d0a96e05c238c01a,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,c84db5d22928a935aaedf4faae944b97341e0017cf8c4518bbae0492d4ea032e,Merge_failed,d16ba4cc69d555a78cfa5a3dd4b16b1f82472e75d64b893b98b6c1cf385444bd,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,0.025496482849121094,0.03514742851257324,0.027884483337402344,0.028696775436401367,0.027953624725341797,0.027448415756225586,0.04669499397277832,0.10853219032287598,0.19387555122375488,1.107546091079712,2.07549786567688,0.16693758964538574,0.1630394458770752,0.08213973045349121,0.07979321479797363,0.07830595970153809,0.07944726943969727,0.07831645011901855,0.14734172821044922,1.1652812957763672,0.07838916778564453,0.07469940185546875,0.06965827941894531,0.07806038856506348,0.06907939910888672 diff --git a/results/combined/merges_timed/sstrickx/yahoofinance-api.csv b/results/combined/merges_timed/sstrickx/yahoofinance-api.csv index 42e5729481..886962f43c 100644 --- a/results/combined/merges_timed/sstrickx/yahoofinance-api.csv +++ b/results/combined/merges_timed/sstrickx/yahoofinance-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 59,refs/remotes/origin/pull/177,c56607f37b486c62e41828b51ac752381d2974a3,1ad6c0d50ee724a2102cb3771ffe1fa93b4f5764,f06a1c19bed4df9b6ca31df7d293ac3ae7691a9c,,True,True,True,7,25,138,2,True,7,Tests_passed,96e2cbbf850b49e779ba8187bf989dfe7f02efd2bb12f8baa65231db43ac54cc,True,Tests_passed,46c1136d45572937624c8f0c9a04adbb3a80360652f02d07e764534d3bbad1f4,True,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_failed,af391b0548740e152582afef509fee2f55bdd212463161e121bb3c30228e4ce3,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,0.04486656188964844,0.04787135124206543,0.04181408882141113,0.04328632354736328,0.04027986526489258,0.041587114334106445,0.051138877868652344,0.16675615310668945,0.08397936820983887,0.5200858116149902,0.3644723892211914,0.07375264167785645,0.1353013515472412,0.04391074180603027,0.04403281211853027,0.04281497001647949,0.042174339294433594,0.042545318603515625,0.0760798454284668,0.5179638862609863,0.043125152587890625,0.04274272918701172,0.031887054443359375,0.041556596755981445,0.032183170318603516 diff --git a/results/combined/merges_timed/stackforge/monasca-common.csv b/results/combined/merges_timed/stackforge/monasca-common.csv index 6665694037..2426b8ad73 100644 --- a/results/combined/merges_timed/stackforge/monasca-common.csv +++ b/results/combined/merges_timed/stackforge/monasca-common.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 114,refs/heads/master,856542f7e63ab0de3f7dcd4c6428ae30210a4ee0,f45ef6a540ca83b78fa11330201eeaed529b70d1,d832aeed98ccae4a192c61d24513b358f7837f69,,True,True,True,8,33,94,2,True,8,Tests_passed,14a6d00455b889e908fd0aeb80b1591b99e2e3668493ec2954be193e809dcc96,True,Tests_passed,62be44340c23642979c33b417de7f5cc9a0315cb1a054ba735e2c2211aac638c,True,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,0.03691983222961426,0.03333091735839844,0.04592490196228027,0.02376270294189453,0.029520034790039062,0.025876760482788086,0.03501749038696289,0.1588304042816162,0.11148309707641602,0.7451493740081787,0.4383864402770996,0.0807945728302002,0.144683837890625,0.04993033409118652,0.04990673065185547,0.051509857177734375,0.052373409271240234,0.05011415481567383,0.08524632453918457,0.9346423149108887,0.05161094665527344,0.055814266204833984,0.04213857650756836,0.052275657653808594,0.041873931884765625 diff --git a/results/combined/merges_timed/stapler/stapler.csv b/results/combined/merges_timed/stapler/stapler.csv index 0933e40607..ecdfc94499 100644 --- a/results/combined/merges_timed/stapler/stapler.csv +++ b/results/combined/merges_timed/stapler/stapler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,e4c10835694bc8f5db30ffa1c15c50469c60acd8,93a11d2d52296fb4b622a61baa26c1d7a6a84fc1,a9519c27c7c26e92706ae40f03a75ba002e21f6f,,True,True,True,27,75,391.0,2,True,27,Tests_passed,105ec030e9c33296de9002d165d8cc09c95586fa5b615f81613af28af71929af,True,Tests_passed,50730b41fe09bb9bc597bdd89773766c895275de7426d87f7cf97850ae4af7d0,True,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Merge_timedout,,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,0.027306318283081055,0.028360843658447266,0.039819955825805664,0.02346348762512207,0.02395176887512207,0.045267581939697266,0.03314805030822754,0.16994190216064453,0.08597636222839355,0.6681013107299805,-1.0,0.08399009704589844,0.14704370498657227,0.05103421211242676,0.05147576332092285,0.048853158950805664,0.050512075424194336,0.05040240287780762,0.10690188407897949,0.6574246883392334,0.07808899879455566,0.08036255836486816,0.07438468933105469,0.08179330825805664,0.0715491771697998 diff --git a/results/combined/merges_timed/statefulj/statefulj.csv b/results/combined/merges_timed/statefulj/statefulj.csv index 7ede636147..2db78c549a 100644 --- a/results/combined/merges_timed/statefulj/statefulj.csv +++ b/results/combined/merges_timed/statefulj/statefulj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,04a51e8f65b0c1d909e035b63f77a12578cf0611,2fd1ec4bc04c51134b4d8f9be03713bf41cf47ef,68f69b76111e99a70e13b00fcc186531eb2cbdcf,,True,False,True,3,5,37,2,True,3,Tests_passed,7780dbed8659d784b31a924e4d8eecbe72642a1f2ea88080f7fee7f04b3efa45,True,Tests_passed,8ab6c1b017b3ebd08f66fb343f3f7cef463c4a3e4ccfc91d3d6616e30e5a59f4,True,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_failed,b69946fc3c71375276ef0ce2a0f15c2eacfeda5e464390c40938422ed3500536,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,0.03967857360839844,0.04439973831176758,0.04187130928039551,0.047775983810424805,0.042815446853637695,0.03521609306335449,0.04176783561706543,0.17615175247192383,0.11277389526367188,0.6611871719360352,0.2931530475616455,0.07440066337585449,0.14559412002563477,0.05117297172546387,0.052977561950683594,0.052188873291015625,0.05287337303161621,0.051287174224853516,0.09008479118347168,0.6697347164154053,0.04818582534790039,0.05120587348937988,0.03804326057434082,0.04921770095825195,0.0392000675201416 diff --git a/results/combined/merges_timed/stealthly/xml-avro.csv b/results/combined/merges_timed/stealthly/xml-avro.csv index bb2eff6026..07c9c5d3d2 100644 --- a/results/combined/merges_timed/stealthly/xml-avro.csv +++ b/results/combined/merges_timed/stealthly/xml-avro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,4cadd7d11f80af746499bcba731b0559642e621e,ac3bea4c04b2d23c845194634ab600d700989a37,9b30127c7477a4977b3a01198b06a334a229691e,,True,True,Tests_passed,c01c9bd493a0bec33888edebebf8a2960416874d5cb5995fe54506a1d48e6f74,True,7,14,151,4,True,Tests_passed,504469fcf40bd00d054cea9564f90575d4bf1fbce2e62023b5f75a8675a1490d,True,7,True,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,0.04396247863769531,0.04432868957519531,0.04644346237182617,0.042690277099609375,0.04962754249572754,0.05124497413635254,0.050194740295410156,0.2955362796783447,0.22114086151123047,2.000974655151367,0.3687727451324463,0.1311047077178955,0.1368086338043213,0.054327964782714844,0.05341053009033203,0.054697275161743164,0.05568575859069824,0.05349421501159668,0.12045669555664062,1.9057996273040771,0.05389857292175293,0.053771257400512695,0.028310298919677734,0.05390119552612305,0.0284574031829834 diff --git a/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv b/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv index b1c0320cef..3acf4bcc93 100644 --- a/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv +++ b/results/combined/merges_timed/stefanhendriks/dune2themaker4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,fa32851fce4806699ba6828e72e145fd0107837b,90456df635b83ac37be5033d96e119f530546d5e,846229488ab051e5265797975731d9cd8ae212ad,,True,True,True,61,236,1808,3,True,61,Tests_passed,bc6e14b3e17641792dbbbd6ef8e66a86acdbab4678d16b7996d5eb9e3db49848,True,Tests_passed,57cc38753454497d67a6657a342c1c0cc4b2865738524f4c2fbc3a52174cc3ab,True,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,7857064672993b15305d334f2dea2d4651a31402a9e971bce36bc46dd8aa531a,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Tests_failed,3289f320d7fa69a2f3c161d0f59485dc6f8d04e55dc1ad60fc790b880c906df3,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,89fb0782f5470d1644316e9d7d3487c35faee1f9d23ee5077c2ff85dfa5bc4d9,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,0.022198200225830078,0.021750926971435547,0.023116111755371094,0.02328968048095703,0.024184703826904297,0.02344965934753418,0.023403406143188477,0.07099533081054688,0.14589500427246094,1.235701084136963,0.9158604145050049,0.13468599319458008,0.1308274269104004,0.06303071975708008,0.04990577697753906,0.06071925163269043,0.04867053031921387,0.0611569881439209,0.09951663017272949,1.2141444683074951,0.059934377670288086,0.05189847946166992,0.06034421920776367,0.058377981185913086,0.047315120697021484 diff --git a/results/combined/merges_timed/stephenc/high-scale-lib.csv b/results/combined/merges_timed/stephenc/high-scale-lib.csv index 488ff7e0fb..c26ffb7c42 100644 --- a/results/combined/merges_timed/stephenc/high-scale-lib.csv +++ b/results/combined/merges_timed/stephenc/high-scale-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,2d63f18a07e62c62e5e72666a35d36bacbe95798,a8867cd95e0131f8c2fd9c757c6550d2e3a5aaba,634dceae3ff00fc9ae1b533dc77e5e53f969817e,,True,True,True,30,65,696,206,True,230,Tests_passed,a7ec06cd2c0def7c6c313ab0a02b06ba721613f829754576fb694db950fc9de3,True,Tests_passed,dfc44ff8513b67e1bad86a919a8cdcf6d11563b2fa4d18ccc57d4ea75e4f5c71,True,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,ddc604ba3d70cd1dadf956a0b6c0e32ae41d17776553654d45fec9bc32164e40,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,2b351ca15081d3a8b7ae16c58d7507bff86483185b3c7d5776b8ea963619394f,Merge_failed,1603069cf0e47cb88b1263ecf0e840e996678a9db83b3b1b8b9ee85597c0b06c,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,e4eb2ce5c35bb70b634b7bafb809e2d18c7dfeb0532bd3216ef8e9eb12ce5e7c,Merge_failed,56fa4711ac756afa44154cffa884adc906068f40c5055da418efe256caa4ff9f,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,0.049782752990722656,0.047698974609375,0.0700535774230957,0.06124281883239746,0.06251645088195801,0.0416109561920166,0.053411006927490234,0.796644926071167,0.45923352241516113,4.700870990753174,0.34354710578918457,0.2884974479675293,0.18671345710754395,0.10639047622680664,0.10601091384887695,0.10652661323547363,0.10501933097839355,0.10206294059753418,0.28720664978027344,4.405313491821289,0.10313272476196289,0.10321998596191406,0.13123822212219238,0.10313200950622559,0.12926673889160156 diff --git a/results/combined/merges_timed/stephenc/java-iso-tools.csv b/results/combined/merges_timed/stephenc/java-iso-tools.csv index beaf8854ec..230c85fdf1 100644 --- a/results/combined/merges_timed/stephenc/java-iso-tools.csv +++ b/results/combined/merges_timed/stephenc/java-iso-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/main,abb37e3cfda2f2774f128d2a4f8299b4d721b452,f1d38f9cb55dfda2daa2fdcc17450748d48e5b69,e19d5289c8764302aa3b53fabaf9b1d03742d5d6,,True,True,True,32,106,695,3,True,32,Tests_passed,cf6ee7b8f349e6091661786faf71744a24ed828424573aeafeabfa71d8b7e581,True,Tests_passed,1b211d7188d7dcec5f00c10c2e40047a2281ccfbb5ead8a303a1bde7b9958485,True,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,9c05a984098a3fa0c4e2e3708454523f67e30cfdea032124e45d9768abef6dc4,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,1ce65bf3b92d87f0970e31767226b6d380ccf770e44d6d78699b5abea3ed1836,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,dbfe9b393650cf1481a7b95e2795304760acf58e1b5c561bedb8f5f11ea8634d,Merge_failed,83c7bb83693783cc548ee3edda5ac9f8ac361e1cb22ed160d05920fe2de0978c,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,0.053295135498046875,0.051064252853393555,0.04543638229370117,0.04497671127319336,0.026882410049438477,0.04539132118225098,0.028838634490966797,0.21299099922180176,0.16507482528686523,0.7602548599243164,0.5206778049468994,0.11680769920349121,0.14040827751159668,0.057648420333862305,0.05673718452453613,0.05966329574584961,0.057428598403930664,0.058255910873413086,0.10864400863647461,0.7701606750488281,0.044641733169555664,0.05743980407714844,0.050080060958862305,0.0433042049407959,0.04979276657104492 diff --git a/results/combined/merges_timed/steveice10/mcprotocollib.csv b/results/combined/merges_timed/steveice10/mcprotocollib.csv index 0dcad02278..dd1356a72e 100644 --- a/results/combined/merges_timed/steveice10/mcprotocollib.csv +++ b/results/combined/merges_timed/steveice10/mcprotocollib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 112,refs/heads/master,36e5eafd286fc1d6a554487a0a2e2f18032ece1a,f2b170bbca9eb8fed073b1c389d52ce2ca509f24,a9d83ee61b1a4ad48066c3ed4ceff0717eda6796,,True,True,True,46,228,4031,3,True,46,Tests_passed,105f29957a5295bf856c8ee07577efa08078758f39f0b341a03231d5f8efc83b,True,Tests_passed,a426c1f152032b27ed36222ecffe1c1c78a458cc3293cd720518a3a4c358a72e,True,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,49818883b8614ab42bfff5492a394cb2edcd91551f0d15d817f60fdb82f33364,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Tests_failed,5d8cd001c7a3ccbf657038fbdbcbb19f1a137b3d7e7ec0eaf2edd9029e75b361,Merge_failed,265f353be98a3521aa1d246329aea30386e231fd6ce939e18c17ca5bd686c336,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,f018cbab2e9eb660726d69de8308a3442eecf9cebe2ba02feca17e45a666e3a6,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,9f310fe12c9315eb5f3bf011c93c95d60771ab5cbc3375456707812c3aafbe28,Merge_failed,c67a5b0b1c5b75b764d64cff01515b212faa833a7b49f62226c53b3718c8acc8,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,Merge_failed,01af9305f2e0a7e591e678636e88c4f1de2f763a1f9b3c4a90c581884609d69a,0.049477338790893555,0.04834914207458496,0.06033468246459961,0.043663978576660156,0.05930042266845703,0.05095171928405762,0.04589509963989258,0.22457575798034668,0.21477341651916504,4.416977643966675,1.4543735980987549,0.11798644065856934,0.1412675380706787,0.05177950859069824,0.05943918228149414,0.05194234848022461,0.05841994285583496,0.05131125450134277,0.11094355583190918,4.104907274246216,0.05373239517211914,0.05011320114135742,0.05441403388977051,0.04952502250671387,0.05824160575866699 diff --git a/results/combined/merges_timed/steveice10/packetlib.csv b/results/combined/merges_timed/steveice10/packetlib.csv index 0d9cd5cd83..7950986a5f 100644 --- a/results/combined/merges_timed/steveice10/packetlib.csv +++ b/results/combined/merges_timed/steveice10/packetlib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/remotes/origin/pull/38,295cf3e47add5dd28970797dbf371a7afde444b3,75e3b5a85416dfd0f0ca7e9a8eced4cca810810d,0b7557069e3f8a7ab42caccf5b0a9fed7a7b6028,,True,True,Tests_passed,913cb9b9fa839697f26e14177e9a166fe63bf50986f065a9daf5e30ad90c625f,True,8,18,571,2,True,Tests_passed,f3b747ed50cb104aaa357420855a6955e9f034a1f452a4c2f119a96018c8b5dc,True,8,True,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,6d66af17c2528a95cb003fe3633867bf5b0212cb645093f8b91b8d389a8256de,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Tests_failed,3bd1246f6b80fcf1cb7dbc845f6902e6ccf5d38702b9a516850bfcf53453a414,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,f855097dac92189650393d15e7e4e0b8555604d5d15784c9d00b03e89715cb1f,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,0.04115581512451172,0.041048526763916016,0.04378795623779297,0.04727292060852051,0.04036664962768555,0.03858613967895508,0.041867971420288086,0.1680448055267334,0.12557005882263184,0.902921199798584,0.28936052322387695,0.06768298149108887,0.1161799430847168,0.03597712516784668,0.03576850891113281,0.034615516662597656,0.036098480224609375,0.03456711769104004,0.06732535362243652,0.8616538047790527,0.03562021255493164,0.03637242317199707,0.033437490463256836,0.03617691993713379,0.03441309928894043 diff --git a/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv b/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv index 3de4ff60f1..0f7ade87a2 100644 --- a/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv +++ b/results/combined/merges_timed/stevespringett/dependency-check-sonar-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 45,refs/heads/master,b3cbcd1d5b0a89d5651398bc0afd9bf04b204183,64e5a244761eb7c11334ee42d9b6f5b734b202bf,64a20550b8633495a6442fdbbbb3b562fd7b6b73,,True,True,True,24,126,788,3,True,24,Tests_passed,c1b23d5024b473a4add1e2d3edee58616407786d2c1ef6ef339644e4ef7cc861,True,Tests_passed,76ead37b6f8e0f9dd7baed602b49fb6a0552487afc863e9bb1637d3b96eb15da,True,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,65a2acfb2f0c042363f3f5918ba8a792443ebf8165042e3fb44e44d936056bed,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Tests_failed,fc5fc2c2c1b15d8bd7d3a83d2070b89187d39587d707b06819a392851f7612a1,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,b7567b3094d964fd1dbf037eb9b9cba88b2b3fb39131cdcbe283d158851ed5a1,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,0.015884876251220703,0.019470930099487305,0.017460346221923828,0.02119731903076172,0.017284393310546875,0.01746988296508789,0.017505884170532227,0.0643923282623291,0.1310744285583496,1.0309133529663086,0.564410924911499,0.13057160377502441,0.1393876075744629,0.056404829025268555,0.06755805015563965,0.05662202835083008,0.055355072021484375,0.05562329292297363,0.10647726058959961,1.0931901931762695,0.05343484878540039,0.06866312026977539,0.04585599899291992,0.05253458023071289,0.04631996154785156 diff --git a/results/combined/merges_timed/stoicflame/enunciate.csv b/results/combined/merges_timed/stoicflame/enunciate.csv index 2cdac78bb4..2632a738e0 100644 --- a/results/combined/merges_timed/stoicflame/enunciate.csv +++ b/results/combined/merges_timed/stoicflame/enunciate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 151,refs/remotes/origin/pull/1191,46949ae95bd07a25a0c66af8bd4e523ae21009d0,e5132c25ec1e98c91c9527d5b8e33ba4a5289572,1d6fe66363d73eedf0e9ba1fdb46a2010e752aa7,,True,True,True,9,18,1552.0,15,True,22,Tests_passed,cd0b8a7ad85ec9c762cbf5bcccc0bb20e235aa8dd5526110672b209085d746d3,True,Tests_passed,a5fbd41a2b94dacfc242203b7ffd37b4d189c4c01a11acaa9545edd6805d1d5a,True,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,94221563edf43b1330de689fdff480ccf874ac9774f48a02bb8c68b120d8aaf8,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Tests_failed,7aec0242fe2020399f3860cca7669db3947b1b1584d5543ce68ae4c4eda24c1e,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,39b05506380a0906cde745d61b7a7db089540e0c8c38004d0277361ac37fdd9c,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,0.014941930770874023,0.05138897895812988,0.06596899032592773,0.019191265106201172,0.06143069267272949,0.05439281463623047,0.06634736061096191,0.2151203155517578,0.15001988410949707,0.7109589576721191,0.5283432006835938,0.08111405372619629,0.1259772777557373,0.04340553283691406,0.044234514236450195,0.04407930374145508,0.04311394691467285,0.04384326934814453,0.07986164093017578,0.6936662197113037,0.04219365119934082,0.04226493835449219,0.0419161319732666,0.041886091232299805,0.04187798500061035 diff --git a/results/combined/merges_timed/stratehm/stratum-proxy.csv b/results/combined/merges_timed/stratehm/stratum-proxy.csv index f638d8f478..b7e71b5b0b 100644 --- a/results/combined/merges_timed/stratehm/stratum-proxy.csv +++ b/results/combined/merges_timed/stratehm/stratum-proxy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,185a97668a9fa06017dd079fcebb91ce44fa2ef6,9a9b1254809deb4643c384d8b67485a226781852,c03b71882dba613280d87d11f9377e9b3dde3406,,True,True,Tests_passed,1991d719fd78aa7b9a5778f694c4626934bf650d9406f2512c64cc9468d3f430,True,36,72,10240,2,True,Tests_passed,114c06533c0fe832eebd2da2679cc984368e4702995bf1ef02a468a87b985f32,True,36,True,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,0.01815199851989746,0.017971277236938477,0.019533872604370117,0.019294261932373047,0.020151615142822266,0.020522356033325195,0.020990371704101562,0.05327153205871582,0.07278561592102051,0.7091410160064697,0.6480007171630859,0.0906975269317627,0.15590786933898926,0.06288862228393555,0.06222891807556152,0.06259536743164062,0.06213879585266113,0.06077384948730469,0.10612893104553223,0.7156980037689209,0.06009626388549805,0.06065511703491211,0.05095028877258301,0.05957937240600586,0.05561542510986328 diff --git a/results/combined/merges_timed/straup/dogeared-extruder.csv b/results/combined/merges_timed/straup/dogeared-extruder.csv index 0eda20dfeb..a352ba89ee 100644 --- a/results/combined/merges_timed/straup/dogeared-extruder.csv +++ b/results/combined/merges_timed/straup/dogeared-extruder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/main,0176ca61e4bac5035afc89e56f3063a206c3a660,4f94ff016cdf80bfa4d4484fd90811cccf32a24c,033b2ad62057286ac831cb111a73fb198852794e,,True,True,Tests_passed,502193e884edab48b986df72b3bc764320c2e1029eac743334a557e206b73592,True,12,57,518,4,True,Tests_passed,cf551a3072e83514947fc3c543d6854819268e726746c374175de33e4aea2bc0,True,12,True,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,b2f9d005b4d460d986a0a47b2f4d876c7318fd917056e5c0eb4b2a9aabce7d40,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,e8c402eca4edaf12a977d26fa4871730ceaa2d1fecfdbd05d5b5746ed40d76c3,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,7e67e5cfe2409d39644e35ee5774cccaf3172ede49d6cda90561f01d9aa7f2c1,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,0.03839230537414551,0.04458427429199219,0.03794717788696289,0.03522372245788574,0.04323983192443848,0.03570675849914551,0.038968563079833984,0.26676344871520996,0.17857813835144043,1.140211820602417,0.42096948623657227,0.10988044738769531,0.1411278247833252,0.04838109016418457,0.047051429748535156,0.048467397689819336,0.047627925872802734,0.04783892631530762,0.10503101348876953,1.1676437854766846,0.04732561111450195,0.048218488693237305,0.04744291305541992,0.049391984939575195,0.047504425048828125 diff --git a/results/combined/merges_timed/stripesframework/stripes.csv b/results/combined/merges_timed/stripesframework/stripes.csv index 7de2332a73..b60db840d8 100644 --- a/results/combined/merges_timed/stripesframework/stripes.csv +++ b/results/combined/merges_timed/stripesframework/stripes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,28a8f08ed74f8c2082076c5b6cb79eed3a111150,61e31c483e62accafb29de9ffef8186870de57a7,a06cb5f3e874c90489f6d7f96eb22fa2546a2411,,True,True,Tests_passed,20c6d325506af3209c7697d0e95af238cc1fada4a6ca4e1afd01baff3889c405,True,32,60,395,2,True,Tests_passed,6f6fb3639d976afe3c4dd8831fd3acbe894df671b47310088ab0075f9576df97,True,32,True,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_failed,412dd7ebce9c0ebc5fc0a65b36704ff4ced3755c5a6eb0a3c746916be03787a6,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,0.0481874942779541,0.06094837188720703,0.04646611213684082,0.04850268363952637,0.061124563217163086,0.05701184272766113,0.049375057220458984,0.21686673164367676,0.11984658241271973,1.2847588062286377,0.7936115264892578,0.08921265602111816,0.15420961380004883,0.05159878730773926,0.05482625961303711,0.051663875579833984,0.054592132568359375,0.07233524322509766,0.09299731254577637,1.278892993927002,0.05303215980529785,0.050707340240478516,0.04914450645446777,0.05163860321044922,0.04177737236022949 diff --git a/results/combined/merges_timed/structr/structr.csv b/results/combined/merges_timed/structr/structr.csv index 4e086cd505..39cfb4b76c 100644 --- a/results/combined/merges_timed/structr/structr.csv +++ b/results/combined/merges_timed/structr/structr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 220,refs/heads/main,6fc7c9a53b47fc2815ccf201c3bdcfd41ce40604,e4a61bdb2b0dc86c4ab2e5941d42bcd90f7f3dfe,43de2c909844a3a8be59080e4d3858bbef4696da,,True,True,True,81.0,565,3985.0,3,True,81,Tests_passed,879ad76a33a9111cc49adcd78160d7982225c52fb47e5fa006729cf63e5a30bb,True,Tests_passed,e3432ed84ea1bcc117f09e33907550780b48c106a1861198f8ae26f873a76b3c,True,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,056eff467ff502a7cb0d8ac1c80a634f9a683b68007c5d04f17d4e2f85058e7f,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,6c5e09e263640558fbe39c085f06fe8d6f09b5baf275eef5b8803683e9f744ad,Merge_failed,d22ead3ef7782a230ce1e4234ff9167be107e6216d94ff3e1bad64e3936181e0,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,2b81d082c3157c22719c1e0d9ac51abf910052ed69dba904926d4aedb0e3104c,Merge_failed,5c83209a2889044494a554f185284477d433057118182657d06e8cdd204eb170,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,0.043933868408203125,0.04338645935058594,0.04859471321105957,0.04900932312011719,0.04919576644897461,0.049001455307006836,0.04912376403808594,0.22030425071716309,0.16022300720214844,1.156846046447754,2.2860682010650635,0.1587984561920166,0.1942310333251953,0.09435153007507324,0.09342360496520996,0.09496283531188965,0.09561038017272949,0.09775400161743164,0.16254544258117676,1.217109203338623,0.08843708038330078,0.08989834785461426,0.07962751388549805,0.09015488624572754,0.08341360092163086 diff --git a/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv b/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv index 771a9768ee..107fa49ef6 100644 --- a/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv +++ b/results/combined/merges_timed/stuartgunter/dropwizard-cassandra.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/remotes/origin/pull/24,41f878d01c4d9c8015295cdb67599294ec53d75c,1b66691a6f4f32cc2efb2748087d357277877aeb,3f3ac96ec64bd26c14dc3111f343f87054621fe2,,True,True,Tests_passed,e575dfbb7d65d89c1209175e6f85c6cb8d1a1409dcb4559dde26d4038e774788,True,34,56,1363,5,True,Tests_passed,c3af472c3d1db1511e290e0ceabaee839e53cf4c361839e20b5333c6d2630bcb,True,34,True,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,021a0ee7aba501164086d79dfa960105811f554911aece30c4ad1243ff77a71a,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,22d5ac28a0ce649b0ba23e633d0ea4c74e03f973ef9b10da4dd90686fb677b7c,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,0c1448bd18ac8255265710d8f5078cfc232f96d8e9c83887c2093e37eb6fe213,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,0.04148530960083008,0.05640101432800293,0.044133663177490234,0.037175893783569336,0.05477643013000488,0.040110111236572266,0.044371843338012695,0.36508679389953613,0.27416110038757324,1.3286709785461426,0.3603942394256592,0.16587305068969727,0.14063596725463867,0.06261825561523438,0.06239795684814453,0.061208248138427734,0.06143641471862793,0.06018424034118652,0.1431872844696045,1.3383285999298096,0.06270241737365723,0.06242227554321289,0.03837251663208008,0.061011552810668945,0.03892230987548828 diff --git a/results/combined/merges_timed/sviperll/static-mustache.csv b/results/combined/merges_timed/sviperll/static-mustache.csv index 7d2a8438bd..ed214e5bf5 100644 --- a/results/combined/merges_timed/sviperll/static-mustache.csv +++ b/results/combined/merges_timed/sviperll/static-mustache.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,271693c779061cde2069af7507b5721c208da8e4,98354a47addf041d851017ae5af25db72d481fa5,85f6735c24b80909fb2cef22a1eb133c7b651f09,,True,True,Tests_passed,fc7abdfc47de3fdbe7c4b5773135afc05e4fe616ea6ed47b66286fe43784ab10,True,41,188,1230,4,True,Tests_passed,5416ff038be468f55ff05f041e8725b6acf330f3dfe928100964b6c05f520a80,True,42,True,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,39c0484515dcb3f813fd9c1f07861d57091775e6cc2e74caa829ff07503aa6e3,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Tests_failed,90d78b93ab6b6bf5957420760f252f6f6d0e30574eac9943535a1c2dac967e3d,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,6b8ee1be8877d034fa8d0a04485525a5306053c4b740979aeb923757ef917189,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,0.010977506637573242,0.011341333389282227,0.011127948760986328,0.011146783828735352,0.01127004623413086,0.011226415634155273,0.01140594482421875,0.060337066650390625,0.17992687225341797,1.360405445098877,1.1422200202941895,0.14608216285705566,0.134230375289917,0.05357933044433594,0.05351996421813965,0.05345296859741211,0.05439400672912598,0.05280280113220215,0.11775922775268555,1.4280529022216797,0.0537409782409668,0.05318951606750488,0.04401850700378418,0.05505657196044922,0.04400014877319336 diff --git a/results/combined/merges_timed/swagger-api/swagger-codegen.csv b/results/combined/merges_timed/swagger-api/swagger-codegen.csv index c003ccd402..abafe37673 100644 --- a/results/combined/merges_timed/swagger-api/swagger-codegen.csv +++ b/results/combined/merges_timed/swagger-api/swagger-codegen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 466,refs/heads/master,4a3d9358eed45dde1ca5541526b224466b65177b,75bd838d23b44e842c3873ebc39d180ed304e6b1,cff573f3ddb38d35053d648a921b4517719abf35,,True,True,True,1863,4437,124231.0,2,True,1863,Tests_passed,6f36a44c98caf3f8f191fd46208cfa0ba9ea5d5b4141180def3ea94e2c9599a3,True,Tests_passed,116184c2153309ed2b8e7382e7e2251bdd4f6f083a53e52cf0e39a9386481316,True,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,abdcda207648f20ec1f55b4a3a9411b0a38251b538222fa566c5769329875966,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,abdcda207648f20ec1f55b4a3a9411b0a38251b538222fa566c5769329875966,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,ebd3b6b8a305d023c57776ca630a31745b9cfb22b9099a693bfbe917af779f98,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,Tests_passed,5c4a063b99f829a8a951bcd1d57a0bb94bfbbaa3a0fe15418f99d30dd68dfb57,0.11798787117004395,0.1209554672241211,0.19637155532836914,0.20195722579956055,0.19887614250183105,0.19826650619506836,0.20042657852172852,0.2284870147705078,0.17418527603149414,0.8080813884735107,9.106657981872559,0.34137940406799316,0.472383975982666,0.35915255546569824,0.3560371398925781,0.3541145324707031,0.35716962814331055,0.3583385944366455,0.40936756134033203,0.9272899627685547,0.2662172317504883,0.2705206871032715,0.22984838485717773,0.2737252712249756,0.22574305534362793 diff --git a/results/combined/merges_timed/swagger-api/swagger-parser.csv b/results/combined/merges_timed/swagger-api/swagger-parser.csv index 64d4c73a6e..3d6c4b10ad 100644 --- a/results/combined/merges_timed/swagger-api/swagger-parser.csv +++ b/results/combined/merges_timed/swagger-api/swagger-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 18,refs/heads/master,9c6ec9e5c91fa04147c9e52ad7fabf9bd7caf192,58fe433c6572bb5ca364fed5c568a7d845f6a510,98e8a4e27d42a270b530fe15a3a772334390dd21,,True,False,True,2.0,9,76.0,3,True,3,Tests_passed,20c1799e360412d3fd52574fe812708c804abbab2c00f39925d3948656c3e011,True,Tests_passed,af5168a0ef53169f3669daec10cc09c1b5140468b45768ee0929be7dced3c4f6,True,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,7534add66c8c2ec798b9a78ef0db20a9cec3c251fa2e473c0532bda246a70567,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Tests_failed,325244ec0d1a0a11c79de33da0944bb197762d21f167265a6267d03b551132ee,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,c54f74f01a4cbfc466ba08af744049867040f7a03de74868ae99c2af4897a3e3,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,0.037400245666503906,0.03524374961853027,0.01166081428527832,0.042859554290771484,0.045549869537353516,0.044206857681274414,0.04946446418762207,0.16750597953796387,0.11723852157592773,0.6091639995574951,0.9580173492431641,0.0702822208404541,0.1170957088470459,0.040621280670166016,0.03582906723022461,0.03744101524353027,0.03829693794250488,0.03714442253112793,0.07191109657287598,0.604590892791748,0.03780865669250488,0.03848528861999512,0.03552722930908203,0.03780984878540039,0.036176204681396484 diff --git a/results/combined/merges_timed/swagger-api/validator-badge.csv b/results/combined/merges_timed/swagger-api/validator-badge.csv index c02ab74157..850d5e2b03 100644 --- a/results/combined/merges_timed/swagger-api/validator-badge.csv +++ b/results/combined/merges_timed/swagger-api/validator-badge.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 97,refs/remotes/origin/pull/20,2adc075f5b157cb6cdd555e4757691aa3a64bccd,7dc4cab9ca327e4717ff60cecd03e816e669cdff,faa0dbe1995a027075ea369c41b369baa9ab7c15,,True,True,True,9,69,1789,3,True,9,Tests_passed,50c8add3df8a2d8df425529ca8ef8758412ea256b517762c667244cf876a96f5,True,Tests_passed,c785097acfede3937a05ba66e846c855c1bb74aa94ed974a680e05d1afef20d1,True,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,95450ef69108b32fad2ceedc780f7b057f5559fd61e6cbaf643261c4e60452a0,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Tests_failed,8ba589c435226f7818b1210ac2fcca4ceb3a28244551786ac4caebaf2e576189,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,6caf98cc5402f280afb936cb281309a5f733f59964bdaa3c2ca1b2b9f6c6f9c0,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,0.041629791259765625,0.041890621185302734,0.03996586799621582,0.035828351974487305,0.03858184814453125,0.04163169860839844,0.0398707389831543,0.23205065727233887,0.16985750198364258,1.3908233642578125,0.27697157859802246,0.10744428634643555,0.11968135833740234,0.04056811332702637,0.04030323028564453,0.040563106536865234,0.040194034576416016,0.04024505615234375,0.08704876899719238,1.3331022262573242,0.04079747200012207,0.040228843688964844,0.03799748420715332,0.039365530014038086,0.039231300354003906 diff --git a/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv b/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv index 6907a2ef07..9d566f987a 100644 --- a/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv +++ b/results/combined/merges_timed/sylvain-bugat/rundeckmonitor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 41,refs/heads/master,4072a5bef34ba969de10ef3aac0401f487632ab0,3b94c80a8dcb04aaea5b51494afe4d495163c4d3,47dc44315b4dc9e09a3d37384e14a6b536fcca20,,True,False,True,4,14,54,2,True,4,Tests_passed,52d21b457040105f6ed59b54c43f4c86b377194348b308d23e73e9c2e3c11252,True,Tests_passed,dcfef962eecb9455166d77c9a86cadd2f7cfdf2c1f9d53c981e9b4d3adfb898e,True,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,0.06017804145812988,0.058310508728027344,0.09206104278564453,0.08856725692749023,0.08423614501953125,0.09364104270935059,0.0847787857055664,0.15560078620910645,0.11568212509155273,0.8433101177215576,0.44896697998046875,0.1871476173400879,0.22844934463500977,0.15296483039855957,0.15303707122802734,0.1533336639404297,0.1605665683746338,0.16069746017456055,0.21250581741333008,0.8949790000915527,0.13248825073242188,0.12840056419372559,0.1332552433013916,0.1278986930847168,0.13704371452331543 diff --git a/results/combined/merges_timed/synbiodex/libsbolj.csv b/results/combined/merges_timed/synbiodex/libsbolj.csv index c8ce4bc21e..cb126ef55b 100644 --- a/results/combined/merges_timed/synbiodex/libsbolj.csv +++ b/results/combined/merges_timed/synbiodex/libsbolj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,0ceaff01a914de507b9e40736a6730d9038c022c,92859a9bd3fd681c0e316af0472d00337d803ea4,39258e9b59518bcebb9c6d5a174b7d71ac2a5cdb,,True,True,Tests_passed,af285d8d27b1e3142d62ffc0ff5deedb4220a4d8be04bac04ae3d4c70bad3af2,True,10,31,560.0,2,True,Tests_passed,b57e30f3ec812c0f49f3783627bb97f37c350c4f35775f0ef80a7600ec992860,True,10,True,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_failed,6a83b7d989d81a85a631e6bc56dc96ac4bbf36a2c7090a4c84d6919333ddcf99,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,0.01741766929626465,0.018407106399536133,0.02079486846923828,0.02154397964477539,0.020008325576782227,0.02008986473083496,0.0201413631439209,0.05031847953796387,0.07264924049377441,3.177938938140869,2.0606720447540283,0.0921180248260498,0.14597725868225098,0.0627586841583252,0.062183380126953125,0.06075572967529297,0.06045842170715332,0.06292152404785156,0.10414743423461914,3.2106611728668213,0.059369802474975586,0.0605771541595459,0.05085277557373047,0.05974221229553223,0.049266815185546875 diff --git a/results/combined/merges_timed/syncleus/ferma.csv b/results/combined/merges_timed/syncleus/ferma.csv index 17b950b487..ca7c62459b 100644 --- a/results/combined/merges_timed/syncleus/ferma.csv +++ b/results/combined/merges_timed/syncleus/ferma.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 22,refs/heads/master,f113f2c4af4aae68f922c437a4c3d6acad4daece,f1e3ab2409e5fea718b17f5d7d00b6d21fa97a0a,c89d36cdc198d6b4c6e9036e746066c98b1919a1,,True,True,True,52,193,647,3,True,52,Tests_passed,2065aef7e8b721079b788aecc58a7fc6c2df07fc6cc66e197abf007b325b55cd,True,Tests_passed,5d9f7b3e8ecb7d7178f78881cf17daf90771e64966a105cc5ccd9798deee2e8c,True,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,0.06989574432373047,0.05419278144836426,0.0653538703918457,0.05479931831359863,0.07117772102355957,0.06744647026062012,0.06168699264526367,0.2442326545715332,0.18275737762451172,1.5998272895812988,0.9947972297668457,0.12114644050598145,0.16065645217895508,0.07304549217224121,0.07224225997924805,0.07264828681945801,0.07263040542602539,0.07240152359008789,0.1217811107635498,1.5092735290527344,0.0653541088104248,0.06567978858947754,0.04434347152709961,0.06637835502624512,0.04419827461242676 diff --git a/results/combined/merges_timed/synergian/wagon-git.csv b/results/combined/merges_timed/synergian/wagon-git.csv index 8a268d7c21..e16e3a8e47 100644 --- a/results/combined/merges_timed/synergian/wagon-git.csv +++ b/results/combined/merges_timed/synergian/wagon-git.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,b56e7945f404c808deb3efd468a888226dca89bf,b86d4a227212ac808ab985a4d1c66e13dd0e3080,284865d5c003c3cac22dd04ccee674be985f1e29,,True,True,Tests_passed,5aad08b0e2f9dd4ad1dd81c8f11b002e7cb0aab6958ebade9101d3473017642b,True,2,1,2,3,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,True,3,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,0.04148244857788086,0.03937363624572754,0.04178261756896973,0.0382380485534668,0.040834903717041016,0.03988790512084961,0.03753018379211426,0.16123485565185547,0.09822225570678711,0.66471266746521,0.373431921005249,0.06676888465881348,0.1206820011138916,0.036377906799316406,0.03708600997924805,0.03608274459838867,0.03705930709838867,0.03741741180419922,0.06745600700378418,0.6614694595336914,0.03674674034118652,0.03681325912475586,0.026304244995117188,0.03664708137512207,0.025548696517944336 diff --git a/results/combined/merges_timed/t-oster/liblasercut.csv b/results/combined/merges_timed/t-oster/liblasercut.csv index 8f1e451041..e4245d7ce2 100644 --- a/results/combined/merges_timed/t-oster/liblasercut.csv +++ b/results/combined/merges_timed/t-oster/liblasercut.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,1b8d7560d2e41b046bf2141db37a0026ef3cac1f,b1a2853dbb655ba49769907231c486fff2ed7815,cf14d4d95c09f27c4efaa35b2ebc3b4530b06315,,True,True,True,15,21,61,2,True,15,Tests_passed,6a4aadcab00381ab8c6b16c5b31b2cb6163486c7d0c4c500abd726bc6b36f687,True,Tests_passed,ca59dda4d0ec61d0c35e61e10e3625837bbbe79c2055ba483b7af0658082eeb5,True,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,0.04989457130432129,0.0581815242767334,0.05586695671081543,0.055925846099853516,0.0675802230834961,0.019044876098632812,0.019267559051513672,0.11400127410888672,0.09880208969116211,1.6819303035736084,0.6157791614532471,0.14954566955566406,0.2237234115600586,0.04356718063354492,0.1098785400390625,0.11035466194152832,0.11728858947753906,0.10731124877929688,0.16391944885253906,1.5450401306152344,0.09833526611328125,0.04528307914733887,0.10129952430725098,0.09557509422302246,0.08974313735961914 diff --git a/results/combined/merges_timed/t0xa/gelfj.csv b/results/combined/merges_timed/t0xa/gelfj.csv index e986bfcc05..92d41665ee 100644 --- a/results/combined/merges_timed/t0xa/gelfj.csv +++ b/results/combined/merges_timed/t0xa/gelfj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 39,refs/heads/master,f57a572d8c372b60afde1f1f300fdb93e3d1a194,12b0e906d74e71e914a53f94d127a54f65cc5886,6a073dd4aeab69bfe117076da40f41433126bc74,,True,True,True,14,62,212,7,True,14,Tests_passed,4ac95891390d37748067ac2a2e08f79e1f2969c88a163ffa3fd952b5d169fd73,True,Tests_passed,ad9f380f9ad1fe692f75c7c87c3bbc1c64b31f26ed925f28fcab37e64d0f2e6c,True,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,10ad6a1bc4e4d5a52bcb0af16670de6c0f76e725b063edb9dd7e40478facbcbb,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Tests_failed,4b28297863cb136d94fe8fb8d33d259e9f365dbbd3fc8d830af3312729267224,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,8f86ec7a17563dd31946ee497bf7fdafd525d3ddce8584d553fc17e36647de9b,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,0.034657955169677734,0.04533243179321289,0.04227709770202637,0.042845964431762695,0.04363751411437988,0.03152346611022949,0.04490208625793457,0.49304723739624023,0.4368579387664795,3.882582426071167,0.5271866321563721,0.253617525100708,0.1473710536956787,0.06968522071838379,0.06960344314575195,0.06959676742553711,0.06962966918945312,0.06939959526062012,0.1762557029724121,3.8203518390655518,0.06872797012329102,0.06868648529052734,0.05356025695800781,0.07033109664916992,0.05365943908691406 diff --git a/results/combined/merges_timed/tabulapdf/tabula-java.csv b/results/combined/merges_timed/tabulapdf/tabula-java.csv index d16ced9ddb..13753ac645 100644 --- a/results/combined/merges_timed/tabulapdf/tabula-java.csv +++ b/results/combined/merges_timed/tabulapdf/tabula-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 78,refs/remotes/origin/pull/217,03052f76c71af1b9b91e2c8023490c30456e2d45,5d90107c4a8a2c6a9bc2019dcfd3e119603fe6a0,1eafa3e2cda365e57967ca2b618b6b5aa08770a3,,True,False,True,4,30,145.0,3,True,4,Tests_passed,147a7b0309bfe281310d919ce0204b76525d7b7adecd13954c427c90272add03,True,Tests_passed,f897ea7da8f55e50f011b4dc53a2582cdca7da12032b0cb6c5a3786ceb5695f0,True,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,f4ac12024ac3d22e652d0d27774e70003cab9999dc818ee210923e1715891499,Tests_failed,206c0e857666db8b18d5b1936a78cad5a6da64b3ab31328dda49f81e0df676ee,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,f4ac12024ac3d22e652d0d27774e70003cab9999dc818ee210923e1715891499,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,2493169fcd9ac9d24a9b2ed1365becfb599a27eed9bcda0d09bac30878ac16d3,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,Tests_passed,882cfc4f9d2099e4d324cd2fbdcb71e13f8d186256f862bc89f0f715db708bbd,0.048470497131347656,0.052896738052368164,0.0530552864074707,0.045711517333984375,0.05224776268005371,0.049524545669555664,0.049344778060913086,0.2246718406677246,0.16437721252441406,2.7011666297912598,0.6241703033447266,0.1136481761932373,0.14152932167053223,0.05047345161437988,0.05462956428527832,0.05319070816040039,0.054134368896484375,0.052060604095458984,0.10414505004882812,2.4601171016693115,0.052138328552246094,0.052634477615356445,0.036224365234375,0.05576491355895996,0.03258085250854492 diff --git a/results/combined/merges_timed/tacitknowledge/jcr-mock.csv b/results/combined/merges_timed/tacitknowledge/jcr-mock.csv index 7d0e1ea44e..5f532d3905 100644 --- a/results/combined/merges_timed/tacitknowledge/jcr-mock.csv +++ b/results/combined/merges_timed/tacitknowledge/jcr-mock.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,cb49187d9a84ab070a49d6af8a16bb00b59da572,399a1ef752b17491e80b0fedc1f4b2668e51ed36,,True,True,True,6,27,194.0,2,True,6,Tests_passed,1b7bdf6ccaca77f530e33d4247aab27392b865be1741ee544661d01ccaa061d5,True,Tests_passed,5f9b74f3ba14a3159e310483d79e86567f1d607d607205095d5288a11ded26d0,True,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_failed,d00c0556813aafd5d8714c2f62cd94925a5a7fac1677f999c369da01f6e3cc8c,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,0.05289626121520996,0.04740548133850098,0.054036855697631836,0.05247759819030762,0.04678964614868164,0.05577564239501953,0.04749703407287598,0.16563010215759277,0.10259485244750977,0.877765417098999,0.3628551959991455,0.07528853416442871,0.1358940601348877,0.04594087600708008,0.04511666297912598,0.04556560516357422,0.04459118843078613,0.047293663024902344,0.08024072647094727,0.8728861808776855,0.044673919677734375,0.044419050216674805,0.035082340240478516,0.04440641403198242,0.034934282302856445 diff --git a/results/combined/merges_timed/tackley/dbdeploy.csv b/results/combined/merges_timed/tackley/dbdeploy.csv index d398c8d80f..ad1bab848f 100644 --- a/results/combined/merges_timed/tackley/dbdeploy.csv +++ b/results/combined/merges_timed/tackley/dbdeploy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,50e6bb3003bf2e91512f9263a966f9e30fb17113,22c01a36a381eea3fc3650a2761bd55c14c84e28,d879c80b39966a526add4c1917914fd609194273,,True,True,True,38,79,1000,32,True,60,Tests_passed,13ba18ea3211bcde7d10dd3ba2c942c8c3555683e1f05456f3770576345438f6,True,Tests_passed,a3dbe934c9df25f77e2804d71d996605a5d5c712105a4f43af8b6a188f2ba0ee,True,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,7db308de47c446f14384d467d7e5883ba65d167327da25a909a5bf10c15bfd24,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,fb914efb04b7928ab7ebb9b937f7352943bd7639c52d0933b29120090e2610f0,Merge_failed,ea3619407f3e9007774c4c21425d79abb5ed7a2663e2c82b8fba2f5a35634241,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,239c1bac1e731df029611814709867a1eefe20d9abf1b2a24b9d670f6f88314f,Merge_failed,00bc7d8c5f2637915d80ca262a5b1929d2ad4d3236d168013d2d54aa0ac198d6,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,0.04839038848876953,0.052559614181518555,0.04446077346801758,0.038683176040649414,0.05119824409484863,0.052079200744628906,0.056581974029541016,0.6682753562927246,0.5694789886474609,2.651601552963257,0.615283727645874,0.314225435256958,0.1661088466644287,0.0859677791595459,0.08681845664978027,0.08559823036193848,0.08497452735900879,0.08443355560302734,0.24984002113342285,2.6520886421203613,0.08719611167907715,0.0861356258392334,0.05792665481567383,0.08740448951721191,0.05788278579711914 diff --git a/results/combined/merges_timed/tadglines/socket.io-java.csv b/results/combined/merges_timed/tadglines/socket.io-java.csv index 59956a5f5a..4d1298d24a 100644 --- a/results/combined/merges_timed/tadglines/socket.io-java.csv +++ b/results/combined/merges_timed/tadglines/socket.io-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/pull/5,0b8d2cd18442e598db6bdb1df67e815bc23b0e24,8e7d52406fd6ab70d0f536846c547179da689598,9e85c5a5b25fca09c22322af5b99dc6c77986cdb,,True,True,True,100,203,5642,3,True,101,Tests_passed,4702dd6ada2d6c527be42fe3757e01ccdb6d201b21a29c284a2b33476ae4fd5a,True,Tests_passed,dc317441af3533bf1923b17fdbf79590fe733faac43f91aace9952a1c33348b2,True,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,604f000927785c46a80ec3fc8956abeeaee2fb33a6b8f31c52249107f514e646,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,d7b4982b99e0389c22e167ab4a063b3386410857d08ce186df4a6deefbccd637,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,1caa06a37b2f0fa3c86a439d5635a751f4c2a93a96ae74638f8ae058955bb8a4,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,0.05713057518005371,0.05605483055114746,0.04126691818237305,0.05292916297912598,0.07038998603820801,0.06493210792541504,0.05194401741027832,0.23194026947021484,0.13475394248962402,0.5069625377655029,1.6605629920959473,0.08141970634460449,0.12883400917053223,0.04673957824707031,0.04927682876586914,0.04973149299621582,0.04913592338562012,0.048920392990112305,0.09002065658569336,0.48359155654907227,0.048364877700805664,0.047359466552734375,0.04260873794555664,0.045143842697143555,0.04590201377868652 diff --git a/results/combined/merges_timed/taimos/daemon-framework.csv b/results/combined/merges_timed/taimos/daemon-framework.csv index 1427b4e4cb..debd546f3b 100644 --- a/results/combined/merges_timed/taimos/daemon-framework.csv +++ b/results/combined/merges_timed/taimos/daemon-framework.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,f1696c8958a9311d29297b106064211abec721dd,f0d0273d57f9788f4ec9f67e775b72cd3f67989d,734108ae9a6c9041a6cc9d2dae044288a15a5914,,True,False,Tests_passed,36e16e2a7b16c01841741244c419038c7b176b2b6ad930d96fbb491c9a40ea02,True,3,3,6,3,True,Tests_passed,23e98da8783a222b4f3eef095527de5997fc4f2df434492d0e43913138abe462,True,3,True,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,695108cb5cc5792fc21d161fe390c2f8dada4a5f6c99f3147224f54fbcd8c6e2,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,482605dc79de940fa50c2b5abe64c904203554de03a2ffc0451665caedd1f523,Merge_failed,ac760d4bb31cfac6c106dfdca47545de4a8d1ab3bbf00c7ebbdf386fecf8418e,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,8c25adc39395eda546923934949b906b4834d0b7c6e92bdbf569dc6debd862a6,Merge_failed,3c7523c0e223bb3fb804820b51d52800ecd2f21b954a4f3cefe5c2636a7eb135,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,0.04091382026672363,0.03199124336242676,0.03783845901489258,0.031865835189819336,0.03195905685424805,0.04061484336853027,0.04035615921020508,0.17400908470153809,0.18381094932556152,0.8892562389373779,0.28873133659362793,0.10325407981872559,0.1211249828338623,0.04111671447753906,0.04082989692687988,0.042171478271484375,0.041921377182006836,0.04159045219421387,0.08807945251464844,0.8357858657836914,0.04058098793029785,0.04109525680541992,0.03895211219787598,0.04123377799987793,0.04033780097961426 diff --git a/results/combined/merges_timed/takari/maven-polyglot.csv b/results/combined/merges_timed/takari/maven-polyglot.csv index 05fc1f382a..8c83929308 100644 --- a/results/combined/merges_timed/takari/maven-polyglot.csv +++ b/results/combined/merges_timed/takari/maven-polyglot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 112,refs/remotes/origin/pull/257,746ef5141b10b1281a83864bd72ff5b78816762b,81f25ea0fffb6c4e6f06b45fbf095ec1cd5c8faa,64c31c9ec3f960f91c03c9190058ce46015e92d1,,True,True,True,189,325,844,6,True,189,Tests_passed,b467f82db537e206fa5bb04b80cd2d9cfd68ef9a4a64c9e2b042012887ac8311,True,Tests_passed,9f6c159422c4e3c711e033a45403aed025b389ca66eb5de3ac9d11cd54d9baf0,True,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,4e30b7a9c9a034e657831f288ed056a7396ac78aa914f6a3469454daf14417d9,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,e08ed24e65b4f80ffc67cc8efbe016edca9276f3f374d73da0b47b56cfc3e27c,Merge_failed,0d9a72dcd41dd6794888fea88d34f018039d46faa4413f373bb095f42a5ef78e,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,69ddbf407e8db56ef69c9e32d8e8d1b7a4dcdcc81a9ff23a6739f1a02593f17f,Merge_failed,1f120238937b0e6c82df1cc15501044514f140487d0eb116345876bc961bba16,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,0.01901984214782715,0.018642425537109375,0.020608186721801758,0.020964622497558594,0.03937101364135742,0.02161693572998047,0.021588563919067383,0.10232329368591309,0.29697418212890625,2.5837721824645996,1.1735732555389404,0.21727490425109863,0.16460609436035156,0.07880353927612305,0.07941532135009766,0.07964515686035156,0.0787966251373291,0.08038973808288574,0.18344640731811523,2.6736998558044434,0.07901334762573242,0.07882928848266602,0.06392884254455566,0.08034014701843262,0.06362366676330566 diff --git a/results/combined/merges_timed/takari/maven-profiler.csv b/results/combined/merges_timed/takari/maven-profiler.csv index 24053ff61f..4e3ac9280f 100644 --- a/results/combined/merges_timed/takari/maven-profiler.csv +++ b/results/combined/merges_timed/takari/maven-profiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,2d7f5eba094953230771d27e6d178cfe31373c6d,1b28f199e81f4644158ce00777be0a01c9ec352d,bd79a8b0afb29357df3d1e6567a4a08b8fee6b07,,True,True,Tests_passed,62069443749a1b72cee7ba90461fc8b46c73539adbe0031cb0a851e36898629a,True,15,28,289,2,True,Tests_passed,acbacc44c3b64f710cbe0eb3d76b2e42ff12df0cc78a946c4ddc765bdd747ed7,True,15,True,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,237b60a9d7ecef48390b0a7d41e5940753a453249807802133f53246b30a9bd4,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Tests_failed,060b51bd82b48feb35cb776f367b829f7b7e2c6bed0e79a8ac24eb5f9968cdbf,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,d33df7247d603e08e318e45456bec75d87947ed42e4688d2ab58efd69e7fb858,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,0.03977608680725098,0.03958272933959961,0.03516364097595215,0.035744667053222656,0.03660225868225098,0.035181522369384766,0.03385448455810547,0.16474246978759766,0.11278104782104492,0.43213319778442383,0.4161050319671631,0.06288838386535645,0.11169028282165527,0.03199028968811035,0.03209805488586426,0.03194403648376465,0.03183174133300781,0.031873464584350586,0.0626077651977539,0.4477555751800537,0.03224372863769531,0.03251218795776367,0.031118392944335938,0.03294873237609863,0.03012394905090332 diff --git a/results/combined/merges_timed/taotaotheripper/sault.csv b/results/combined/merges_timed/taotaotheripper/sault.csv index b6ab2babe5..6cd77ee951 100644 --- a/results/combined/merges_timed/taotaotheripper/sault.csv +++ b/results/combined/merges_timed/taotaotheripper/sault.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,c42a266c8aca381fb541ecf5cabf1ad9594f7026,933d69d97a75b7e2b5e6f8eabd004a6bcf789e86,9cda7b949bf4e8acfb7afba7dc17e83307b83b50,,True,True,Tests_passed,a916198305d4b0c58d332060d3084a179fa14278dc36ebf80d30d62fe86cde03,True,13,80,481,3,True,Tests_passed,0863541900daa4d3cad7f5d42ce2a82a639377ad1192b6b490b0b778e8ae51a1,True,13,True,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,b87e902701bccca60a6922cbd3fcf6a887ce9d0705e434ca47e7cec8132a0162,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Tests_failed,32b8b708a7176f441b13e0eaf4fd1c3b942bb774df46c37275e5b4e6f09e800a,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,75ebc1152a4f1f730dcff681d89ad906f84127c11082a30fa27c00ebd3b9bb74,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,0.008306741714477539,0.008397817611694336,0.008479595184326172,0.008207559585571289,0.00822901725769043,0.008214235305786133,0.008481025695800781,0.04323387145996094,0.12239646911621094,1.458219051361084,0.6100649833679199,0.09906506538391113,0.11890363693237305,0.04053020477294922,0.04131197929382324,0.04025435447692871,0.04002666473388672,0.041489601135253906,0.0875544548034668,1.4681684970855713,0.04155850410461426,0.04197859764099121,0.03945207595825195,0.041513681411743164,0.038895368576049805 diff --git a/results/combined/merges_timed/tarql/tarql.csv b/results/combined/merges_timed/tarql/tarql.csv index 86f8fb5e8e..ffefd41c47 100644 --- a/results/combined/merges_timed/tarql/tarql.csv +++ b/results/combined/merges_timed/tarql/tarql.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/remotes/origin/pull/83,0644473c2bd9194e86eed5131e12cc580cf2956b,343224e3375158c06a2e4fafc7f4463c39a3822d,8f17e28a9cb099b6c1c4dfe8e03f800c8d947a81,,True,True,Tests_passed,6a39c94c100e8e5f5435520039216821f405f5bd3435be6742f2c7ee147af28d,True,5,14,119,2,True,Tests_passed,e62e083db65054b04132adc83c650d77d3b07ec2da039b6a31904ca3a7a1fd83,True,5,True,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,eb15c4879377776fe522e35b7ea78a8f1a107b02c114c62292dc1dfd80f6f6ec,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Tests_failed,3846195068aa790310619ec837c5a7e200d3adb646ae3b120bdf0615121816d5,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,01f68e9c33b9583f4da597e6c3f24344f08b9c712ada87e86a4c1c7d510520a9,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,0.035048484802246094,0.03992176055908203,0.03750753402709961,0.0318598747253418,0.022405385971069336,0.03984332084655762,0.03847360610961914,0.15937566757202148,0.10741233825683594,0.9291791915893555,0.2954123020172119,0.07379317283630371,0.11668753623962402,0.033295631408691406,0.03422212600708008,0.033829689025878906,0.033530235290527344,0.034796714782714844,0.06528306007385254,0.8679840564727783,0.03373551368713379,0.03401923179626465,0.032370805740356445,0.0347132682800293,0.03238320350646973 diff --git a/results/combined/merges_timed/tasermonkey/thumbnailator.csv b/results/combined/merges_timed/tasermonkey/thumbnailator.csv index 44ed31b036..b4a9468468 100644 --- a/results/combined/merges_timed/tasermonkey/thumbnailator.csv +++ b/results/combined/merges_timed/tasermonkey/thumbnailator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,a5b774ffb53f86f36b97d39dbfbe0741ea203438,f7798c6a0ce4ad760eacb103bc33cefd3e1f6455,1576ec739a73e4416fe431f8249aeb74aa6e5b97,,True,True,True,5,16,997,2,True,5,Tests_passed,fa3b945e2f9a7d0d09f0a740b2685a5332a9694ade8b0bed86b5a69b6c2cbf86,True,Tests_passed,2de97e5c3df6490ed251b3184db36772e6c29b89f81972a053cde7015cddd5e9,True,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Merge_timedout,,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,0.050701141357421875,0.013884782791137695,0.014980077743530273,0.013988971710205078,0.01704883575439453,0.049243927001953125,0.056847333908081055,0.16471004486083984,0.11032509803771973,2.0568888187408447,-1.0,0.10089659690856934,0.22991323471069336,0.11498332023620605,0.09015059471130371,0.11363863945007324,0.1200723648071289,0.06599903106689453,0.08115482330322266,1.9325714111328125,0.0457918643951416,0.10112166404724121,0.09613180160522461,0.045777082443237305,0.06787872314453125 diff --git a/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv b/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv index 1269cecb6c..147879c474 100644 --- a/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv +++ b/results/combined/merges_timed/tatsuhiro-t/argparse4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 25,refs/heads/master,c3b38c0b78286623022b1bfb8b4cac5a5d732e8e,05f1be895ef13eca5ebc195863a901093d9c63be,e05ab77b5f2e5562b109f4669bbaad0ab6113b5f,,True,True,True,40,189,705.0,7,True,40,Tests_passed,4d1b2e312f9a0da65efae4eaebe70fb50d864c7d88bdaef362d831fbf69c6eff,True,Tests_passed,1143f6a8dbb39ab2a96152b6ffdd09ce909ccbf0a52546980c6458c4933a2630,True,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,0.016752243041992188,0.017255067825317383,0.020101308822631836,0.020272016525268555,0.020020246505737305,0.01999354362487793,0.02037358283996582,0.11244726181030273,0.3364527225494385,6.4538414478302,0.8937623500823975,0.24255633354187012,0.1810302734375,0.09208083152770996,0.09258365631103516,0.0941464900970459,0.09331369400024414,0.0938265323638916,0.21283936500549316,6.528320789337158,0.09051299095153809,0.09238839149475098,0.0445711612701416,0.0895833969116211,0.04468894004821777 diff --git a/results/combined/merges_timed/tcurdt/jdeb.csv b/results/combined/merges_timed/tcurdt/jdeb.csv index 7a3ebb0158..0b9855f386 100644 --- a/results/combined/merges_timed/tcurdt/jdeb.csv +++ b/results/combined/merges_timed/tcurdt/jdeb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 84,refs/remotes/origin/pull/139,bbf1c1ad25cd27b141e5973cc7d70575a951faf4,cd5398c82520d7200a428fa90daa50f1b5b79413,f5a3be7ac1c646b94e9c197d12061cb33d2fa32e,,True,True,Tests_passed,e9fd9b2e220fb8c5f4bcf29f8d1650e34aecc6d37d82ee24ba32cd3c742628da,True,27,84,949,5,True,Tests_passed,aafeef1a862eb9c473dd7e94a56b69b88eebb106923abe3d272f035c60d1d94c,True,27,True,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,e3355a73299757774d51087b3b92add2f114e5879edcc031f889ec67bf28b866,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,5e6dc71ec77754919e16c07220afa8fbfc92e273eee2ec73e8f37297f0e8dab4,Merge_failed,b87ea880f7c1e2f51a543e76e5f59e87994333e695f730d1cbff230eeb81acab,Merge_failed,303e3dcc51e61fc5b9ba20dc26972ac5daac72162e07f70ccc5972ea92ad1b0f,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,021995962e9e3e9e65c1e8c96ab2455b9245410e2a4be8b57305ff1b6f5f3601,Merge_failed,09c764130d43ac1dd986efd5f532c98785bb7dfeca6e194f610a6ce4a3c5a4c2,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,1113f0c5b1b808676211b64da15b720cda48ba685f871532bf5dc0fbd632b0d4,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,Merge_failed,c06ac1948ea294796b41f4af0d73468ec160f8cefb574d7c9fb4321699e7b04e,0.056647539138793945,0.04537677764892578,0.0582125186920166,0.04661226272583008,0.035658836364746094,0.05364274978637695,0.05900263786315918,0.3859422206878662,0.28548479080200195,1.781719446182251,0.5633127689361572,0.18002867698669434,0.1462242603302002,0.06500029563903809,0.06630563735961914,0.06361889839172363,0.06297683715820312,0.06599044799804688,0.14325475692749023,1.7777361869812012,0.06492948532104492,0.06484484672546387,0.04798293113708496,0.0642087459564209,0.04778409004211426 diff --git a/results/combined/merges_timed/tdebatty/string-similarity.csv b/results/combined/merges_timed/tdebatty/string-similarity.csv index 5761064ec7..655fbdf588 100644 --- a/results/combined/merges_timed/tdebatty/string-similarity.csv +++ b/results/combined/merges_timed/tdebatty/string-similarity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/master,2b2930e1f500efd5f9efbd95891a62ab7da3a818,4f03e3415088bf26bbef62b06090b525974a7cd8,25ac055200fb6fc1f762258aee8cf30d166b0cc1,,True,True,True,5,8,134,2,True,5,Tests_passed,f8ff744cc3f1436d03a0f83e3199e8eb96e1b55d3191e23453c641baaa17ee35,True,Tests_passed,f51968e07c00a98b945404ab66db082ac8a53bd51cf50a948c54c1ca803f354a,True,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,b00ede1d197a5939dc211eda4e5a00a002bfb0e44aa407f8f1b061f443776c8e,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,ed9a7f5d930117d6b1016d2a3ab2a1a9f9d9f872ea71ee3f488971b9e4d7715d,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,bdefd09bcaa2aa921d347fbaf7cc70e0f507495acfbace6e3d1b319a47055692,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,0.03553462028503418,0.03863644599914551,0.03687739372253418,0.03499579429626465,0.03679299354553223,0.027471065521240234,0.029201507568359375,0.16185355186462402,0.11900568008422852,0.6155436038970947,0.2630586624145508,0.06493520736694336,0.11565780639648438,0.031023025512695312,0.031594276428222656,0.031371116638183594,0.032012224197387695,0.030877113342285156,0.06323885917663574,0.5948925018310547,0.03267312049865723,0.03143715858459473,0.030454158782958984,0.03234052658081055,0.03032231330871582 diff --git a/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv b/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv index c341314a98..15b438e567 100644 --- a/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv +++ b/results/combined/merges_timed/tdesjardins/gwt-ol3-playground.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 112,refs/remotes/origin/pull/64,89bea69f8eea1dfa5e8cc75c0dc1a941e6306aa4,5550df625dfea8ee9cdccc0c0cb4f4c68fd46fd0,92604b1effaeee499cc82b3e833466c1303bec80,,True,True,True,36,133,1188,14,True,36,Tests_passed,1b2b48bdf7513b63b9be55f04eaf0057a560a16a7a3ce244c4ec83569cd52ec7,True,Tests_passed,54b465ab5a627006d402301d7c245fafd6ef29de9b2d2c6e192f94d6417a8997,True,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,c02643b2efdd21d2b9e2a247f6370d22beb7b4060cc49169b4178acaf16123ce,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,dd8f339e65965937767b23a452a9d847306c1f98859f3c29e4786c87e05c1b67,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,b210ae4024bd29b735ff23b28431c29ecddadb617de0cdcec0b1eeaf6341f6dd,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,0.04657745361328125,0.046735286712646484,0.051160335540771484,0.0288541316986084,0.04456925392150879,0.0327916145324707,0.04673600196838379,0.9252209663391113,0.8061039447784424,5.48820161819458,0.47315096855163574,0.4331800937652588,0.19298815727233887,0.09936356544494629,0.10082650184631348,0.10538411140441895,0.10516071319580078,0.10860300064086914,0.33118605613708496,5.389954328536987,0.10040545463562012,0.1016387939453125,0.10723590850830078,0.10379290580749512,0.10172724723815918 diff --git a/results/combined/merges_timed/tdunning/log-synth.csv b/results/combined/merges_timed/tdunning/log-synth.csv index 8cc91db85c..b62b36f51a 100644 --- a/results/combined/merges_timed/tdunning/log-synth.csv +++ b/results/combined/merges_timed/tdunning/log-synth.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,2e2af435a69c21d5c6ad352db9c030ae8e0abf89,1b65c0f09bb7cb301c4bce5ff90700ef7b43b24b,c8fae8ddb4b84601bdf5ab75e1674b512a129ac3,,True,True,Tests_passed,4512c6e152d4ea54ff471d3459ee563966be8d63a6f860ceb09c9c54c7430f81,True,8,9,42865,3,True,Tests_passed,691ad4c2f8927ebc887c33c802ba8031ba86bc423406f275a570edc990691176,True,8,True,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,0.03777003288269043,0.05052804946899414,0.0839383602142334,0.06653404235839844,0.08615827560424805,0.08973956108093262,0.0925607681274414,0.2381596565246582,0.17780160903930664,0.7133419513702393,0.3428385257720947,0.23110198974609375,0.21011114120483398,0.1614677906036377,0.09735345840454102,0.17172837257385254,0.15567564964294434,0.1653449535369873,0.18780016899108887,0.7769310474395752,0.14394283294677734,0.13876914978027344,0.14037752151489258,0.14141631126403809,0.14191102981567383 diff --git a/results/combined/merges_timed/tdunning/t-digest.csv b/results/combined/merges_timed/tdunning/t-digest.csv index 7c64fa30f3..e337f847e3 100644 --- a/results/combined/merges_timed/tdunning/t-digest.csv +++ b/results/combined/merges_timed/tdunning/t-digest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 30,refs/heads/main,f028aa397892b426fe384f551b7ccc36b2f1ade7,2460bd11d91a2a9a2e1b4eca0c20b005e856effd,f0ca2a55413b4b8346a7e7a7ba0bcbedfd411aff,,True,True,True,13,55,218.0,4,True,13,Tests_passed,783d6dbf5fa1370e7c447d893f1ced461f7194c88d0c06ebb460ced4b9651709,True,Tests_passed,f9cbf54b3bba2f3f6dfc3ea779e24dcd02e273a0839a3289b86b6576d4efd874,True,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,0.04175567626953125,0.03976869583129883,0.07410430908203125,0.054636240005493164,0.055344581604003906,0.05438947677612305,0.0605473518371582,0.3115413188934326,0.21319890022277832,3.320234775543213,0.6705644130706787,0.2076563835144043,0.24655795097351074,0.1284196376800537,0.1263415813446045,0.12199187278747559,0.12329316139221191,0.12546181678771973,0.22868943214416504,3.2126033306121826,0.11177229881286621,0.11275219917297363,0.09977340698242188,0.11758732795715332,0.09614682197570801 diff --git a/results/combined/merges_timed/teamed/qulice.csv b/results/combined/merges_timed/teamed/qulice.csv index a1a5e09ec8..c5e238a274 100644 --- a/results/combined/merges_timed/teamed/qulice.csv +++ b/results/combined/merges_timed/teamed/qulice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,ad93f0b28b154ea6cbd4901d05f3bedc74a0ec82,d577051ce5ead53e8c888a9be4624835169cfc68,4b1608ac72f3a55879cc4583143355faf3982981,,True,True,True,21,47,384,4,True,22,Tests_passed,ecc11d354ac877a3b85318e386e12953880405b21d219f54a7a9bd5172e8e594,True,Tests_passed,02d78e81a6e221767be4ff4f33fc7c29f8c16406a4ff54afc6981d0c7a40c334,True,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_failed,5ea8510f9be11f455bf7b158fac29149510b7cfeb13bdeb0b66610ba7a76f4cb,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,0.05356478691101074,0.04167675971984863,0.050629377365112305,0.06312346458435059,0.05175304412841797,0.05104851722717285,0.055185556411743164,0.29207921028137207,0.22446084022521973,0.03240346908569336,0.4331953525543213,0.15024256706237793,0.18862676620483398,0.0717008113861084,0.06429600715637207,0.06482124328613281,0.06522393226623535,0.06432557106018066,0.13568115234375,0.07783246040344238,0.061321258544921875,0.0628366470336914,0.03711700439453125,0.062308311462402344,0.03600192070007324 diff --git a/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv b/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv index e53010cfcb..863e19e097 100644 --- a/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv +++ b/results/combined/merges_timed/tech-advantage/sonar-gerrit-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/master,7599e6becd5b64bb5a00786c488b037f257b2f20,fabf6eeec8809cf1b9f7e775c07db71a41578dfe,df0d909e3fe4165912b13a76ad6ee40bca8b2eb0,,True,,True,9,15,,3,True,10,Tests_passed,0d70fe434f25b498fdf5718709d7e7114e72fb25b78c94f2186f16ed2d7cb286,True,Tests_passed,2ae4f768488199e8511c6de69c952047a050633ad5b1bf1397d6f88898ad8ed3,True,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_failed,a0ebd7c8629b7063ec6ce839fa9ad0c87ee31b1d7ec5bc8e5dc0ea8506ca3d30,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,0.02446126937866211,0.03871917724609375,0.03851795196533203,0.04145002365112305,0.0369105339050293,0.04306507110595703,0.04577231407165527,0.1595461368560791,0.10589385032653809,0.519024133682251,0.33179593086242676,0.06932878494262695,0.12329411506652832,0.03911304473876953,0.03995561599731445,0.0396571159362793,0.038689613342285156,0.038529157638549805,0.07165145874023438,0.5095269680023193,0.03902268409729004,0.03806352615356445,0.028294801712036133,0.0379176139831543,0.028369665145874023 diff --git a/results/combined/merges_timed/techblue/alfresco-restclient.csv b/results/combined/merges_timed/techblue/alfresco-restclient.csv index 1c6f366b56..8190a20201 100644 --- a/results/combined/merges_timed/techblue/alfresco-restclient.csv +++ b/results/combined/merges_timed/techblue/alfresco-restclient.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,8e71d5b8d714d63b1c3cdd4b8d70de278f04bc07,039b6f1fd1e3d214a90f74ff0c60319be73f0e24,d803b272aa0c08461eb4e0e9c63e12be5ebda020,,True,True,Tests_passed,7c128dff941dbe2fd39139010b2994aa344030a8cc92ed36f19c8095c583a2f6,True,30,92,847,2,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,30,True,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,0.011607646942138672,0.011668920516967773,0.012777328491210938,0.01245880126953125,0.012756586074829102,0.01267695426940918,0.012707948684692383,0.038208723068237305,0.06641554832458496,0.7202482223510742,0.6507556438446045,0.07884955406188965,0.13535356521606445,0.047234535217285156,0.04610586166381836,0.045999765396118164,0.045912742614746094,0.04726243019104004,0.08311772346496582,0.7786552906036377,0.04498696327209473,0.04330611228942871,0.03508734703063965,0.04531669616699219,0.035163164138793945 diff --git a/results/combined/merges_timed/technicpack/launchercore.csv b/results/combined/merges_timed/technicpack/launchercore.csv index 8b316b7eaf..594adbfa40 100644 --- a/results/combined/merges_timed/technicpack/launchercore.csv +++ b/results/combined/merges_timed/technicpack/launchercore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,4ac1958198ddcdadd9ae665e250037300118a39eaa37f421fbb1179721aa556f,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,0.06716561317443848,0.06340694427490234,0.06884217262268066,0.06488442420959473,0.07603025436401367,0.07026505470275879,0.08099937438964844,3.6564536094665527,3.164231777191162,23.768027305603027,4.283266305923462,1.7030487060546875,0.4877607822418213,0.40144824981689453,0.4068286418914795,0.40378427505493164,0.40560126304626465,0.40433382987976074,1.3928735256195068,24.031379222869873,0.40613341331481934,0.4021914005279541,0.390453577041626,0.40316081047058105,0.3870871067047119 diff --git a/results/combined/merges_timed/technicpack/launcherv3.csv b/results/combined/merges_timed/technicpack/launcherv3.csv index 1ea1ffb018..653fbd79af 100644 --- a/results/combined/merges_timed/technicpack/launcherv3.csv +++ b/results/combined/merges_timed/technicpack/launcherv3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 42,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003.0,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,ba55fb901c65a2e130f31db1fbfabd7a2eddce5282b72bcf6d0bd6ed63fd88cf,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,0.07431674003601074,0.06747078895568848,0.06656146049499512,0.06886124610900879,0.07654523849487305,0.06823492050170898,0.06670117378234863,3.738886594772339,3.1322431564331055,23.719077587127686,4.105910301208496,1.7747297286987305,0.4923520088195801,0.40400242805480957,0.4069697856903076,0.4119119644165039,0.41152286529541016,0.40782976150512695,1.3877441883087158,24.09490704536438,0.4159407615661621,0.4055211544036865,0.40079832077026367,0.40793824195861816,0.39419054985046387 diff --git a/results/combined/merges_timed/technophobia/substeps-core.csv b/results/combined/merges_timed/technophobia/substeps-core.csv index db477d2058..7eee339707 100644 --- a/results/combined/merges_timed/technophobia/substeps-core.csv +++ b/results/combined/merges_timed/technophobia/substeps-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 28,refs/heads/master,07b94728d642a789e11b45c284432544e6a013a9,982720d6b47d67d338b4af39487f52731500066e,0e08102f130e1d739ae7817224315b4608324526,,True,True,Tests_passed,c4037c0e6b73121199741ada7d8c9765365744051cf7ffd757a5a731822f46f8,True,61,668,4287.0,5,True,Tests_passed,452f1ef83993cfcc6a3c675604ff2e7a4bba5bc0c0b8707c4dbf64de774c2a83,True,61,True,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,7a8c68287ec73b6318231a953d726c90b83eebc65b151022475206187e9d81c0,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Tests_failed,dc7d72b4a2c22735e07810d3e97c5fb422cf327377be7ca32179341f4bfb82fe,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,d767b91373beec30dae73f9b6ed16adbbbe422c5aae5dcfbc28d5a4b8f4b87d3,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,0.05379438400268555,0.05382037162780762,0.05042099952697754,0.05613350868225098,0.05984091758728027,0.06731557846069336,0.059821367263793945,0.34575891494750977,0.39374828338623047,3.4483702182769775,1.3644812107086182,0.23342490196228027,0.15769505500793457,0.07267642021179199,0.0814979076385498,0.08100223541259766,0.08162808418273926,0.07921719551086426,0.16365790367126465,3.4176688194274902,0.07910561561584473,0.07541227340698242,0.07053589820861816,0.08028364181518555,0.07095503807067871 diff --git a/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv b/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv index ed8f7c6eca..e55b99732a 100644 --- a/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv +++ b/results/combined/merges_timed/teknux-org/jetty-bootstrap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/develop,17deab171882d57f5d02052ea6e631cb11aa0d55,46488ced29a30f06d91e594c3e8e31e4345410d6,9f9fcbcf522fd5cf99bd44b8dfa146bd4bfecf8b,,True,True,Tests_passed,d048ccc41e8a36c201a618801271ae063c616800933def0d128a3d0418ef2901,True,17,105,1757,12,True,Tests_passed,7061200a232d54e21761bb3a497208a97c2d70466f7787f4b61516b866987e72,True,19,True,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2b8a6a2902f9fdd51646e5e1120099e0bafbc3cd9f1b4d7f84f2d4057a81e5b8,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,0f73de83f944567a46dc00878a55d6f9f063678d3a318a4580a67a0ec5b88c41,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2507f6fa45e99cb3e9ad178ffaefc69d1b64aa40d707858cbd5e61c7fd09de2a,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,0.0112152099609375,0.010804176330566406,0.011072874069213867,0.010826826095581055,0.011476755142211914,0.011279582977294922,0.01110529899597168,0.12340760231018066,0.4709489345550537,4.063489675521851,0.5373513698577881,0.3241424560546875,0.17472243309020996,0.08982229232788086,0.08944988250732422,0.09125685691833496,0.08939003944396973,0.09067296981811523,0.2365574836730957,4.165318250656128,0.0896296501159668,0.08994841575622559,0.09065437316894531,0.0895226001739502,0.08797717094421387 diff --git a/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv b/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv index 4daaad3f41..ee16610990 100644 --- a/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv +++ b/results/combined/merges_timed/telefonicaid/netphony-network-protocols.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 31,refs/heads/master,44919e4a94b5992d04186779c82da587aa5e3bc8,ef3cd2327f0ddcbcf186789fbf279ff312c45d7f,6c226b6329de94a4a026717628bad8f9eda81b02,,True,True,True,20,51,1698.0,3,True,20,Tests_passed,a95fb0bfc0ead9397c75ce5ad54d0f7d11d1c76db19311af2f085f7f13556c4c,True,Tests_passed,6f494c650b125f509d23c1430260b0c7f266bb80bfa8631a1274d4d7a9a8aa45,True,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,4a0ad4325e08006f95ba15fab41f12e4446b3c83a33e6120bf13fd8d39a15970,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,0.048279523849487305,0.04612231254577637,0.052570343017578125,0.04571104049682617,0.0456850528717041,0.05443882942199707,0.047806501388549805,0.23520445823669434,0.15998005867004395,0.6936957836151123,0.49302053451538086,0.10477232933044434,0.12324047088623047,0.06803369522094727,0.05199718475341797,0.05205941200256348,0.05071711540222168,0.05057549476623535,0.10268163681030273,0.7061035633087158,0.07172656059265137,0.04409956932067871,0.03566932678222656,0.060254573822021484,0.035660505294799805 diff --git a/results/combined/merges_timed/termd/termd.csv b/results/combined/merges_timed/termd/termd.csv index 73157e873c..440ec51d9d 100644 --- a/results/combined/merges_timed/termd/termd.csv +++ b/results/combined/merges_timed/termd/termd.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,True,True,Tests_passed,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,True,28,172,796,2,True,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,True,28,True,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,0.01897597312927246,0.01926112174987793,0.025281429290771484,0.025454044342041016,0.0254366397857666,0.025339126586914062,0.0250091552734375,0.05398869514465332,0.07519054412841797,0.6783711910247803,1.0578455924987793,0.09797024726867676,0.1683814525604248,0.0668184757232666,0.07002592086791992,0.06917190551757812,0.06641960144042969,0.06658935546875,0.10672259330749512,0.7395772933959961,0.06505799293518066,0.060189247131347656,0.05336284637451172,0.06112051010131836,0.05724811553955078 diff --git a/results/combined/merges_timed/testingbot/testingbot-tunnel.csv b/results/combined/merges_timed/testingbot/testingbot-tunnel.csv index fde8a2b311..a2bb23d523 100644 --- a/results/combined/merges_timed/testingbot/testingbot-tunnel.csv +++ b/results/combined/merges_timed/testingbot/testingbot-tunnel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 11,refs/heads/master,ce11672c43fa8e85ed7201f026f455e7382da7e1,32db181f6873158694db8e270063e62fef2c5947,facda2b071f90624ea57358b6613b9979dadb7b1,,True,False,True,12,23,181,3,True,12,Tests_passed,76ca400bc42ae691ec4003653e48bf9597a12cd525506661e6038f171f133a22,True,Tests_passed,ea2398f2962636de879c22b9fc3ad3835f7e0889dc3ffe426deb884e2223472a,True,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_failed,d144578ebebd1f9f08c1e0bcbadf52ff98df6b1d9625dd0fcc12802d5fca251f,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,0.01547551155090332,0.0164644718170166,0.019103527069091797,0.019920825958251953,0.019588232040405273,0.019629716873168945,0.019219636917114258,0.05976581573486328,0.12343192100524902,1.5274429321289062,0.40409111976623535,0.1183004379272461,0.15542173385620117,0.048300981521606445,0.06476521492004395,0.0514988899230957,0.06568479537963867,0.06440925598144531,0.11851048469543457,1.5926709175109863,0.048172950744628906,0.06244206428527832,0.04737591743469238,0.06340670585632324,0.04920005798339844 diff --git a/results/combined/merges_timed/texasdigitallibrary/vireo.csv b/results/combined/merges_timed/texasdigitallibrary/vireo.csv index b16b134a14..c4acdbcfe4 100644 --- a/results/combined/merges_timed/texasdigitallibrary/vireo.csv +++ b/results/combined/merges_timed/texasdigitallibrary/vireo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 85,refs/heads/main,4b5dc59cfe12549b797941e4dd561c0b6665b5cf,652d9f280761401d9f774df9769214bcf6091696,7d947fc0539bdb535cf3f63e51ee25f056a79dfc,,True,False,Tests_passed,db129a66d3a14cf0aa68dc89350f975f0f81a43a9fd301bf781dc447e4ef5745,True,8,51,241.0,2,True,Tests_passed,83e5c85de437b95fdabd72c20fd98096ff1958a8ebc0b76b5cda9957f71a3f9e,True,8,True,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,0.014161825180053711,0.014272212982177734,0.015602588653564453,0.01565265655517578,0.014933586120605469,0.015428543090820312,0.014975547790527344,0.04386568069458008,0.06969738006591797,1.7412195205688477,0.4478633403778076,0.08098435401916504,0.14210987091064453,0.05355501174926758,0.05332493782043457,0.05147409439086914,0.05365324020385742,0.050818443298339844,0.09003305435180664,1.783412218093872,0.05058097839355469,0.0518341064453125,0.04047131538391113,0.050096988677978516,0.03944849967956543 diff --git a/results/combined/merges_timed/tgac/miso-lims.csv b/results/combined/merges_timed/tgac/miso-lims.csv index a27eca670a..2c2f84704f 100644 --- a/results/combined/merges_timed/tgac/miso-lims.csv +++ b/results/combined/merges_timed/tgac/miso-lims.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 566,refs/remotes/origin/pull/2747,fa7593e209edb54b5a5c11eeb0b07103c0b02a94,4507173cbdcd0d2389767fe4aeb43936629af24a,0955feeaaab386ffc307e46d7c65bbbaa953ee8d,,True,True,True,4,40,209.0,2,True,4,Tests_passed,36a1c96b6544b5018bbb56254c2f658744a0aca87cfa1e7284e6fa1b78384261,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,39c4338a9fecaefacf887140db1e315af14172a22d04d3c4ed5e02caa209af90,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,0.05723285675048828,0.047110557556152344,0.06276941299438477,0.06278014183044434,0.047406673431396484,0.0583646297454834,0.0655519962310791,0.1997087001800537,0.0822145938873291,0.8062405586242676,0.5534849166870117,0.09133458137512207,0.15570807456970215,0.061226844787597656,0.06055164337158203,0.060904741287231445,0.06125521659851074,0.06079554557800293,0.10594320297241211,0.7800302505493164,0.05849766731262207,0.0583040714263916,0.05013298988342285,0.058840036392211914,0.04896235466003418 diff --git a/results/combined/merges_timed/thealgorithms/java.csv b/results/combined/merges_timed/thealgorithms/java.csv index 0852f70899..402ca52c08 100644 --- a/results/combined/merges_timed/thealgorithms/java.csv +++ b/results/combined/merges_timed/thealgorithms/java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,True,8,50,800,2,True,8,Tests_passed,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,True,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,True,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,2ad62f9843f992482061f6a245a76a8ad90a8de64a4a1ffc7136df7509aed821,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,f0d3b4704e2de4cd5333777dc5333d0172d4edfa0f688b08fa94b1d516b400f1,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,0.04273271560668945,0.015909194946289062,0.04032754898071289,0.03788328170776367,0.03939199447631836,0.03731226921081543,0.0488436222076416,0.23323750495910645,0.11980676651000977,0.752741813659668,0.7615702152252197,0.06839394569396973,0.11562061309814453,0.035169124603271484,0.054064035415649414,0.03648829460144043,0.037000179290771484,0.049666404724121094,0.0704803466796875,0.7939920425415039,0.03651618957519531,0.05157899856567383,0.03439736366271973,0.034888505935668945,0.054718732833862305 diff --git a/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv b/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv index 5daf67fbef..d480c45bc7 100644 --- a/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv +++ b/results/combined/merges_timed/theholywaffle/teamspeak-3-java-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/heads/master,d41446711b7338794a8c348f50c7a53b99a08d4f,4811ec5f9bf8b712817248a7808bc329a3946189,a43548c29475a68e4e6b2b5a2a7dca5d803691a0,,True,True,True,13,52,534,193,True,203,Tests_passed,5f3c598a5cc7ecc43addc7b2286c8f86b8421a79ff9f5155e95a9374cb0bf4e1,True,Tests_passed,58c91f8610af1f116ca759dc3c846aea399da76a38be8d75dd8439f9f4311908,True,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,50953d3d312416299d57dfbf6c596b26e9918bf0e52b690c9b6b8fb79f85822a,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Tests_failed,1184b5050180d5d3bf7e361da946f8cad30c35110fa4b5f7d907d1eb6cc8d856,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,36ca8d78a00d29cab06692c09a03cf60f2c39c3c126073a957d47640a1fd34d3,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,0.04725289344787598,0.03384852409362793,0.046283721923828125,0.03459930419921875,0.04184842109680176,0.031975746154785156,0.045328617095947266,0.47111988067626953,0.4185802936553955,2.903336763381958,1.3000049591064453,0.21593546867370605,0.1465158462524414,0.06537604331970215,0.05818605422973633,0.06390976905822754,0.059172868728637695,0.06449580192565918,0.16990137100219727,2.9092259407043457,0.06386351585388184,0.0623621940612793,0.041460275650024414,0.05892658233642578,0.03916120529174805 diff --git a/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv b/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv index 0db450710e..c7646e52c6 100644 --- a/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv +++ b/results/combined/merges_timed/thelinmichael/spotify-web-api-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,486691eb608d4758d2b6aadb231913f9d1f0dccf,d78ea37c1f9171e9394128660eedbc0fd1d6e186,7683a952cc154155e775f98e41aeb23fa70e9d77,,True,True,True,7,28,456,2,True,7,Tests_passed,de790a0d58cefb7e3c67ff2e97297f288ae8364b76be222223da3399933612e7,True,Tests_passed,b79d5e3c4efbc0d8958a39c2ba0d689cd7a7fddb8832fc0e7b20825ecd040fe9,True,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,0.05703020095825195,0.06425833702087402,0.06943655014038086,0.06445741653442383,0.0654900074005127,0.06991219520568848,0.06636595726013184,0.20519375801086426,0.12740421295166016,0.8734674453735352,0.34723544120788574,0.08234357833862305,0.14388585090637207,0.05074453353881836,0.0519256591796875,0.0525822639465332,0.05178570747375488,0.05293393135070801,0.09079766273498535,0.887103796005249,0.0517888069152832,0.05093789100646973,0.04007434844970703,0.05097651481628418,0.03944134712219238 diff --git a/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv b/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv index 2d7ec77ef5..93aeb7d295 100644 --- a/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv +++ b/results/combined/merges_timed/thenewcircle/spring-hibernate-20120924.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/remotes/origin/new-cheatsheet,7ec9c1b4bb69e9fbd58d5bef0bab16a09ca7bf68,a133049b147a4e77cbb9fd22068680adec4a8dca,28040ef7891dd8179ccfb25a3d3b1ef7dfa40553,,True,True,Tests_passed,98a80124f8d4c0863a2bd42439a176d63b90d0530f12a64781de8351e97140b2,True,21,41,496,2,True,Tests_passed,68e8015eee2df1f6c36c9288f4ead74cd1dd26d81d1b9470ff64dfd53a267937,True,21,True,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,d542f3bf343081fd66267d4fb614e02725311c37563457de5dee1f880ae3004f,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Tests_failed,04c806debd70d435e5b6bc15b3af7ae276b4d00d3b74f25b608eb8ee0c7323af,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,deb2ed6dfb51761fcc829efa45d3aa3992c64141dc338d688a9daadbc7599ad4,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,0.008947134017944336,0.008824825286865234,0.009146690368652344,0.00893712043762207,0.009183406829833984,0.009041309356689453,0.009010553359985352,0.03586435317993164,0.07046270370483398,0.603801965713501,0.37836194038391113,0.06676387786865234,0.11176776885986328,0.033528804779052734,0.03332996368408203,0.03337502479553223,0.03351235389709473,0.03383922576904297,0.06313204765319824,0.5580935478210449,0.03321981430053711,0.03368878364562988,0.03155636787414551,0.03343081474304199,0.031533241271972656 diff --git a/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv b/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv index a8edcf4a9c..ca6d8f60ed 100644 --- a/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv +++ b/results/combined/merges_timed/thepoofy/foursquare_v2_java_adapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,dacecfc813308901bc17bdf1bc849c3ca820eb01,8a91258647f7283dfc59c43c5cb9e6947e668d16,7251dbe912796e499451016170d0dd1dca2bb969,,True,True,Tests_passed,c29ee449380aa2417cfb01a4e30ce6e1a22810275ef08fb3d474cc4c47fdc3bb,True,13,52,159,2,True,Tests_passed,ba1018dcc74b75db03bb7a977ce73f721171735346fcf70550b72f44be193aac,True,13,True,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,2dcb801ab82596fcc1e662c5594a3afba3770b10e1da5f65d02bffe533f1ae34,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_timedout,,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,0dba0631590c7d401dec9e2c10e6f11ee894f4f49847bfa9362815914c40a2aa,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,0.032804250717163086,0.04710817337036133,0.04077005386352539,0.038506269454956055,0.02958202362060547,0.028903961181640625,0.05150794982910156,0.1609952449798584,0.1306319236755371,0.6017105579376221,-1.0,0.08821368217468262,0.13312983512878418,0.04575920104980469,0.042824506759643555,0.04637765884399414,0.04689216613769531,0.04427647590637207,0.07835936546325684,0.5902285575866699,0.044388532638549805,0.04308152198791504,0.044365644454956055,0.0454256534576416,0.04559063911437988 diff --git a/results/combined/merges_timed/theupswell/appengine-counter.csv b/results/combined/merges_timed/theupswell/appengine-counter.csv index 72e09d5a22..abcba2a22f 100644 --- a/results/combined/merges_timed/theupswell/appengine-counter.csv +++ b/results/combined/merges_timed/theupswell/appengine-counter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/master,303ad503d31a1b375af2a85f46a0c512ace1dfd1,40b139ac04cd6c2e2a4ddfe86bf2fff7b90a1bbf,2eaf5b5c27c22c411eb066f546cb5051b1a73a9d,,True,True,True,17,163,1959,4,True,17,Tests_passed,8ddc69f47b9783365844b5ca259198e29c2cc640bf60ac9b5bdda52451107b18,True,Tests_passed,185dc3f8bb12a351eb4fec64ca8012277f6264c27174b768a1320c7c08c8b5a2,True,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,0.01147150993347168,0.012592792510986328,0.012764930725097656,0.013081550598144531,0.012677907943725586,0.012376785278320312,0.012668132781982422,0.05925273895263672,0.11979484558105469,2.0322532653808594,0.5854220390319824,0.10740447044372559,0.1431570053100586,0.05577969551086426,0.056984663009643555,0.05513477325439453,0.05512690544128418,0.05572319030761719,0.11469793319702148,2.110106945037842,0.05265998840332031,0.05475187301635742,0.038808345794677734,0.05331540107727051,0.03908228874206543 diff --git a/results/combined/merges_timed/thinkgem/jeesite.csv b/results/combined/merges_timed/thinkgem/jeesite.csv index 574754006b..81ae71befa 100644 --- a/results/combined/merges_timed/thinkgem/jeesite.csv +++ b/results/combined/merges_timed/thinkgem/jeesite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,False,True,2,1,9.0,22,True,22,Tests_passed,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,True,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,a8db65bb3362c7da5be0d9eb7f443738ec481b79d4f6244803202fee20c23254,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,0.03728294372558594,0.0598902702331543,0.06261682510375977,0.05206036567687988,0.06624245643615723,0.05527758598327637,0.0629739761352539,0.19293904304504395,0.13468718528747559,1.0537712574005127,0.5787553787231445,0.0801386833190918,0.12324666976928711,0.04296445846557617,0.043326616287231445,0.042218923568725586,0.043349504470825195,0.04312944412231445,0.08040452003479004,0.9961948394775391,0.0412745475769043,0.04234743118286133,0.03859901428222656,0.04156327247619629,0.04088282585144043 diff --git a/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv b/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv index 0fa64ae625..ca766806a9 100644 --- a/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv +++ b/results/combined/merges_timed/thomas-joiner/hunspellbridj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,fc1359b4df627beb16aa657b3d6944e83b72fb9b,d1d5bf43bcc12996715030a6e73461cf507d7a88,275ff63bccd4e5d57f763840ef9eb118616bf987,,True,False,True,14.0,10,69.0,2,True,14,Tests_passed,b8a2e2248c52cb23a5e8009aee6124142b3988a3fd94effbc60ec6f585b509bc,True,Tests_passed,34077f203c3b3faf45c45fe12d6ebdf626e4e25dd64df57b67f8eaceb1adac9b,True,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_failed,1d7e619363e00637ef9b4b83b86022a0734323d9ec0fbce7d59830f4f2ab38f0,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,0.055756330490112305,0.056215763092041016,0.07534575462341309,0.07629919052124023,0.08039331436157227,0.0699605941772461,0.07189488410949707,0.14732003211975098,0.10773420333862305,1.039766550064087,0.4244227409362793,0.17001795768737793,0.25437307357788086,0.14690136909484863,0.13565778732299805,0.13523435592651367,0.14414095878601074,0.13890862464904785,0.18739771842956543,1.0514376163482666,0.11516332626342773,0.11797714233398438,0.12189149856567383,0.11699151992797852,0.10760807991027832 diff --git a/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv b/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv index 1b2d3b23f7..0f5eeab1b3 100644 --- a/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv +++ b/results/combined/merges_timed/thomasjungblut/tjungblut-math.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,e93e48e4d4a1335c20d31794ba41eea7641603d3,87ca2f19f4519fdc576c7344aeda35855a369dd2,551e96fbb6c1231e912ea3110c677e2d0c8421df,,True,False,Tests_passed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,True,5,5,39,2,True,Tests_passed,0176f50d794e17693f7406820808543e7951cb19d7d44d4f2e8ae980ad90907e,True,5,True,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,3fc0c01ca386e9fef321d14e0c43291c1fec12009bd29db2410ab4ffe5ea4868,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,0.0396115779876709,0.04133439064025879,0.0396575927734375,0.035677433013916016,0.040308475494384766,0.03750729560852051,0.04199624061584473,0.15165162086486816,0.11079645156860352,0.558215856552124,-1.0,0.06308650970458984,0.10783910751342773,0.03005814552307129,0.030185461044311523,0.029880762100219727,0.029241323471069336,0.029613256454467773,0.061841726303100586,0.5470242500305176,0.02950882911682129,0.030260562896728516,0.02883744239807129,0.029483795166015625,0.027751922607421875 diff --git a/results/combined/merges_timed/thoqbk/traprange.csv b/results/combined/merges_timed/thoqbk/traprange.csv index fb7e94c130..7339910aa6 100644 --- a/results/combined/merges_timed/thoqbk/traprange.csv +++ b/results/combined/merges_timed/thoqbk/traprange.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/remotes/origin/pull/22,8227158f2f52cc7a01bb3775e7dd0b6a3274e0a3,7efc7d786d536bac577259823f5425dd7b357bbc,2fda0c4474fc8f1563ec41b24d631118570f5203,,True,True,Tests_passed,4d8e34a5097ed424996d23ebc356045a3d3ad38c5dcada4bfc800ff23535cfa9,True,19,88,1466.0,3,True,Tests_passed,b95b1ba3a6af63749572a2696a0d13ad71bb37198d8fa3ec6ff260b1c802f19c,True,19,True,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,29e3b54d712a223cc40f98977f472bb8933b58c94f3a4ffdd6855fcabafc1a9c,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Tests_failed,d27fc4c23466aab78773b034ba8afbd2266342da5212f53c06e424ff9f0ef4f1,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,f5ca52ea27430c56fc3bffb9e4efbc80cd59f2720eb668f35545e29b5a4463cc,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,0.11645388603210449,0.11516046524047852,0.12140059471130371,0.12118697166442871,0.1390094757080078,0.12848901748657227,0.14404916763305664,0.25577735900878906,0.23910236358642578,1.195561170578003,0.7104277610778809,0.25002098083496094,0.2847590446472168,0.1875467300415039,0.19106483459472656,0.1893143653869629,0.16894912719726562,0.1906585693359375,0.24655795097351074,1.2147457599639893,0.1625816822052002,0.16307616233825684,0.16811680793762207,0.1625370979309082,0.17042899131774902 diff --git a/results/combined/merges_timed/threerings/getdown.csv b/results/combined/merges_timed/threerings/getdown.csv index 950d81bbef..fea1ebce97 100644 --- a/results/combined/merges_timed/threerings/getdown.csv +++ b/results/combined/merges_timed/threerings/getdown.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 94,refs/remotes/origin/pull/213,4120f253744b1f47df06c1b5b92d0edc41bd49d1,095d59ceea407e5c8c04f67fa224892f2b00fe88,76a6401d82c1bcf87492ade2d26e685172de8f0b,,True,True,True,22,208,1071.0,2,True,22,Tests_passed,530ab90e332d56829d168b6fa0ea91572280b96bb682313256027cf1c1ecb074,True,Tests_passed,e208343337674743ff1ae4811bb7cb3cb430c4772486fa7f0c74380b20f0b4e2,True,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,3e904ddef5290f08a3df84c7b92c7c54f10ce5a139ff89c63074bac2977080a3,Tests_failed,7fa994644b55270eb7c24ca53e5257d17c78dfe1f7b42b25fff175374a282ca4,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,3e904ddef5290f08a3df84c7b92c7c54f10ce5a139ff89c63074bac2977080a3,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,Tests_passed,0d139db96803e064d14dcfc27e9e733b6aaad25471b91b35a781769e2b4ab214,0.061486005783081055,0.05655550956726074,0.05259966850280762,0.047286033630371094,0.05902838706970215,0.052060842514038086,0.06271147727966309,0.21150875091552734,0.12158417701721191,1.5057730674743652,0.8130438327789307,0.08627915382385254,0.1448049545288086,0.0551760196685791,0.05309724807739258,0.05556821823120117,0.05203437805175781,0.05619096755981445,0.09343075752258301,1.435821533203125,0.04930615425109863,0.05316495895385742,0.04420661926269531,0.052620649337768555,0.0424191951751709 diff --git a/results/combined/merges_timed/threeten/threeten-extra.csv b/results/combined/merges_timed/threeten/threeten-extra.csv index 62b0d61c12..809471b568 100644 --- a/results/combined/merges_timed/threeten/threeten-extra.csv +++ b/results/combined/merges_timed/threeten/threeten-extra.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/main,f0bf686f1738f1d253e907670e43dcb57789a592,28f100b913b407c72fdcb509ff02eb6de4d68bb3,01f5e014d8e158e32353355b1c09956794c6d8a8,,True,False,True,10,27,235,2,True,10,Tests_passed,9414c830421dc01c4c1fab23dc6a1e2bb71e5db052b083acdedcfaf63e634cf6,True,Tests_passed,2798aab0ee424cc0d2efb1c737ea81b5d4b883790ec8dc6d5e6ee42e88e9abba,True,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_failed,76beeb909d7884bd25040e4ea4cba2087f7bdbf163ed103363cc0d27e9fdb332,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,0.05016446113586426,0.05155754089355469,0.06448936462402344,0.017853260040283203,0.04949069023132324,0.015114068984985352,0.018814802169799805,0.16316008567810059,0.11509156227111816,0.06695747375488281,0.6394195556640625,0.17651891708374023,0.26472043991088867,0.1390364170074463,0.09129071235656738,0.14167118072509766,0.05050921440124512,0.1459043025970459,0.08742165565490723,0.1528942584991455,0.048331260681152344,0.11984682083129883,0.05653262138366699,0.1201772689819336,0.11072015762329102 diff --git a/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv b/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv index 25196911e3..37ea55086c 100644 --- a/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv +++ b/results/combined/merges_timed/thymeleaf/thymeleafexamples-springmail.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/3.0-master,158fb6406b10311f114054c66f6206dc7e915917,9210b250b1667cd62f21b06849ca55d4fef2764b,2e149543aa353adaf99eaa544f2c78ad5d091bbd,,True,True,True,24,91,472,11,True,29,Tests_passed,aeb3adf5ff75668d4a1a0c0f0534aabf158afcd762f278d5a30038c51711ea23,True,Tests_passed,49691c320824661f6155e51f0219bcf10423dd997edd806f0e05c1d2e6429aa0,True,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,03cad3ba7bd5bcfcbef1e1af5cce620cd4be49dff444c1c25026294b270ef756,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,687a3ae1da9fdc2f4293d61eb23a5e46421372b37b9c937eafcbf2310b76df20,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,603e6290faa506118f9c9fe59a7954d7b96bdd4177970730f270bacf4aeac6d7,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,0.015668153762817383,0.015673160552978516,0.016704559326171875,0.016475915908813477,0.01669788360595703,0.01659369468688965,0.016273975372314453,0.1132814884185791,0.4038982391357422,3.0706772804260254,0.48837876319885254,0.27161097526550293,0.16359639167785645,0.08223485946655273,0.08282327651977539,0.08138680458068848,0.08225703239440918,0.08198833465576172,0.21047043800354004,3.1683545112609863,0.0804452896118164,0.0824432373046875,0.0558624267578125,0.08005023002624512,0.05498337745666504 diff --git a/results/combined/merges_timed/timroes/axmlrpc.csv b/results/combined/merges_timed/timroes/axmlrpc.csv index 06e5f89997..8cc8763971 100644 --- a/results/combined/merges_timed/timroes/axmlrpc.csv +++ b/results/combined/merges_timed/timroes/axmlrpc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 28,refs/heads/master,be8156e8c76bb2cfede311ce136ead1916be2fc4,860c8ff40e85fa27d30c0c37fa6ebfe6688197d0,abab2528a322425135d44257e6efe3e7e361b6d8,,True,True,True,10,23,107,3,True,10,Tests_passed,3c502d00da89828d147caa07a3825a1d61ec315548c61a269234de0073303b98,True,Tests_passed,aec16f12a61218c227c51387c6fd8227e3d851d404262e9a122500dc548cf5a0,True,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,0.010595083236694336,0.010419130325317383,0.010778188705444336,0.011620044708251953,0.010905265808105469,0.010598421096801758,0.011379718780517578,0.047914743423461914,0.1178581714630127,1.3165383338928223,0.37392687797546387,0.10450148582458496,0.13623046875,0.04986882209777832,0.04976987838745117,0.05034232139587402,0.04926276206970215,0.04972338676452637,0.10065937042236328,1.342031478881836,0.04795265197753906,0.04864811897277832,0.0321505069732666,0.04854559898376465,0.030325889587402344 diff --git a/results/combined/merges_timed/tipsy/javalin.csv b/results/combined/merges_timed/tipsy/javalin.csv index a4bfbde686..f52468b8e7 100644 --- a/results/combined/merges_timed/tipsy/javalin.csv +++ b/results/combined/merges_timed/tipsy/javalin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 101,refs/remotes/origin/pull/2020,60530d20dd09c78de5831f0e9dace00d67c65df9,cedc91760eb796e72d5e45146e47633fecbfbae2,1fd96f8402b32ae8a80cb7e9e94c3245424cdca5,,True,True,True,52,209,1328.0,4,True,52,Tests_passed,e7a74f7077564b0463257b4dfdc8640567c00724b05d672dfdc5a5bd692519b1,True,Tests_passed,159e39dfe631d3dd32e3162fb2ae916ff95e2750ce5cb37da62f92f9ab9f0e13,True,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,c841eceb977856ad00896a9e2d957f120c22ce2950d4b81b9fb60a62d786c1d5,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,a209323091224cf3a2a22f308de3a41958dfa3ffb03aa564b94143acce7d6bb6,Merge_failed,223fcb504f276559c799be5fb8eff7773d269fc4beef0b77024ca538e78b48b2,Merge_failed,81030e0e45b9e5f9c24fa97d5d60489e4630878a5155a7197f175c1a89423a7b,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,2d6a5c2a7de9a13f0ad476c7218290df6ca87f1ff76fb450cd604be29bae9c53,Merge_failed,56122c28ceb6cb15476119df28550df30d24334bed531706558184fae34e0536,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,Merge_failed,ae25770f7f92e112ea4f7987bf4e78cdcdf9554908574550cb4af548ab77149e,0.05678844451904297,0.04638075828552246,0.06685876846313477,0.042023658752441406,0.03247499465942383,0.06253623962402344,0.05232119560241699,0.3135712146759033,0.2360239028930664,0.6348621845245361,0.3718280792236328,0.16147661209106445,0.15816473960876465,0.059543609619140625,0.07194304466247559,0.05955171585083008,0.0706624984741211,0.07073545455932617,0.12750768661499023,0.6664533615112305,0.058528900146484375,0.07033681869506836,0.04262709617614746,0.06769919395446777,0.04261374473571777 diff --git a/results/combined/merges_timed/titokone/titokone.csv b/results/combined/merges_timed/titokone/titokone.csv index 8c304b6da7..655d3cff55 100644 --- a/results/combined/merges_timed/titokone/titokone.csv +++ b/results/combined/merges_timed/titokone/titokone.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,b4ac484b6a1a0484bc131e305cb531835efe9aa0,db2a1a74458f65887c532c52c60ab73d99eb6021,642f4a961a4c51b8baf679211a7e4de1bcc17b00,,True,True,Tests_passed,74cf1e3ed7e57adc6162b7432c67b363b79e4df1909f3524c2142fa3b2172d88,True,60,539,2631.0,2,True,Tests_passed,a23397a2d22680845537fca02f46c85344b1b7f5dd9abdeaefb9491263eed114,True,60,True,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_failed,71926a2dde501078bcc30f481319647fa8349af681ceeb5af9d2521b162e67a6,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,0.05215144157409668,0.029134750366210938,0.062140703201293945,0.049237966537475586,0.04490971565246582,0.039763450622558594,0.05616950988769531,0.17666912078857422,0.13451004028320312,0.04860234260559082,1.387143611907959,0.09021496772766113,0.15198659896850586,0.06600260734558105,0.0811161994934082,0.08384108543395996,0.0815877914428711,0.05379128456115723,0.12992405891418457,0.09647274017333984,0.0743257999420166,0.07461166381835938,0.04215288162231445,0.07483077049255371,0.06927800178527832 diff --git a/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv b/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv index fd7bd59054..efa9b55bdd 100644 --- a/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv +++ b/results/combined/merges_timed/tkelley-eg/collectd-fast-jmx.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,0.044940948486328125,0.047214508056640625,0.043787479400634766,0.04687929153442383,0.045101165771484375,0.04206228256225586,0.045850515365600586,0.1631019115447998,0.10330986976623535,1.031886100769043,0.29920148849487305,0.06955456733703613,0.12182402610778809,0.038210391998291016,0.039566755294799805,0.03851151466369629,0.03862476348876953,0.03848862648010254,0.07013225555419922,0.9986410140991211,0.0387263298034668,0.03891777992248535,0.027877330780029297,0.03798723220825195,0.02715158462524414 diff --git a/results/combined/merges_timed/tntim96/jscover.csv b/results/combined/merges_timed/tntim96/jscover.csv index 78072461ff..1048a3a0dd 100644 --- a/results/combined/merges_timed/tntim96/jscover.csv +++ b/results/combined/merges_timed/tntim96/jscover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,15,45,1706,2,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True,15,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,0.015267610549926758,0.016220808029174805,0.016614675521850586,0.0168306827545166,0.0170745849609375,0.01710343360900879,0.017294883728027344,0.0468745231628418,0.07390689849853516,0.7279741764068604,0.5244240760803223,0.08767843246459961,0.14140558242797852,0.051175832748413086,0.05244612693786621,0.04986739158630371,0.05225515365600586,0.051840782165527344,0.0892953872680664,0.8061666488647461,0.05164670944213867,0.050985097885131836,0.03815817832946777,0.05189871788024902,0.039801836013793945 diff --git a/results/combined/merges_timed/tomitribe/crest.csv b/results/combined/merges_timed/tomitribe/crest.csv index c7c37e9f02..6d5d1945ef 100644 --- a/results/combined/merges_timed/tomitribe/crest.csv +++ b/results/combined/merges_timed/tomitribe/crest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/heads/master,d23c256ef0e1c28707583fd2f1738b932dd0e832,7b4318ffe350c221991bd51e6d59053743f284aa,81d39d8b802bb3a45408b0f4c0fca973010199ba,,True,False,True,16,24,91,2,True,16,Tests_passed,dcaabc6052244ddc997dfdd2a00da997799d6866b2fc621cda352ce59f8d11ad,True,Tests_passed,05848175f35a6b36a10f9b8f5de68e9b60fc17ce94d52e1ad85eb2955d745de6,True,Tests_timedout,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.056478023529052734,0.05665254592895508,0.05809903144836426,0.0520174503326416,0.048818349838256836,0.04215812683105469,0.0450441837310791,0.18069243431091309,0.0968177318572998,1.6507484912872314,0.5622682571411133,0.09477758407592773,0.1316072940826416,0.06165504455566406,0.04546618461608887,0.04659128189086914,0.060118675231933594,0.04646897315979004,0.09721875190734863,1.5251986980438232,0.045300960540771484,0.04509997367858887,0.047000885009765625,0.04463768005371094,0.04718327522277832 diff --git a/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv b/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv index 3de27f8aec..46e6cd4a57 100644 --- a/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv +++ b/results/combined/merges_timed/torquebox/jruby-maven-plugins.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 28,refs/heads/master,1571b55f4b470341a6ff1ef05e5ef3410cbc0418,2c944d6a12023c5ed33046fcc8ae99ce6ef6d146,3d550d56429568679fae47c9d1d640e2e3477cc8,,True,True,True,8,21,217.0,2,True,8,Tests_passed,fb5fe927362e284a846fce49ddc75a818be3bd204c48efda9267b523a1b8c7bf,True,Tests_passed,38490cf7d91b2434f63c5614a2d9495896940e09efd5847e0a3fc6c7d3bb6e62,True,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,0.056017160415649414,0.03256058692932129,0.057526588439941406,0.04972243309020996,0.05842900276184082,0.05703425407409668,0.051679134368896484,0.19242477416992188,0.11243128776550293,0.8196380138397217,0.4030790328979492,0.08344054222106934,0.14291691780090332,0.051018476486206055,0.050444841384887695,0.04993462562561035,0.04943037033081055,0.04969429969787598,0.08738183975219727,0.8181354999542236,0.04819798469543457,0.048166513442993164,0.038707733154296875,0.04881453514099121,0.03858470916748047 diff --git a/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv b/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv index 3e8c4ea202..9860ebc3ad 100644 --- a/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv +++ b/results/combined/merges_timed/tpietzsch/bigdataviewer-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.016152620315551758,0.016547441482543945,0.02034473419189453,0.020302534103393555,0.01977062225341797,0.020272016525268555,0.020308732986450195,0.04810905456542969,0.07109308242797852,1.2589967250823975,0.40744805335998535,0.07100272178649902,0.15539216995239258,0.06030869483947754,0.040007829666137695,0.060214996337890625,0.039748191833496094,0.06244826316833496,0.07406902313232422,1.2827484607696533,0.05666756629943848,0.05543041229248047,0.03612875938415527,0.0579380989074707,0.04471111297607422 diff --git a/results/combined/merges_timed/tpietzsch/spimviewer.csv b/results/combined/merges_timed/tpietzsch/spimviewer.csv index 49c907d8ed..6c02b27d9b 100644 --- a/results/combined/merges_timed/tpietzsch/spimviewer.csv +++ b/results/combined/merges_timed/tpietzsch/spimviewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,0.01582169532775879,0.016814470291137695,0.019854307174682617,0.019657611846923828,0.01968860626220703,0.020383596420288086,0.019805431365966797,0.048204898834228516,0.0720665454864502,1.2331314086914062,0.40624022483825684,0.09221148490905762,0.1357276439666748,0.061479806900024414,0.04009580612182617,0.059096336364746094,0.0446629524230957,0.06015157699584961,0.1041562557220459,1.2758886814117432,0.040160417556762695,0.05640912055969238,0.028640031814575195,0.059265851974487305,0.02893996238708496 diff --git a/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv b/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv index 19ea6604a9..413ee58ddd 100644 --- a/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv +++ b/results/combined/merges_timed/tqh/uglifyjs-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,c77d67ab1de02ab8fca05ea264d59a50ef71cbcf,9c75486c84fc0a219d63db87d46e782f6a771030,4ec7118d75ff23876d0d08e8eb65884bf64fc7d2,,True,True,True,3,21,97,2,True,3,Tests_passed,bbbc792e3b4dd1035526207693bf33adb93d8a35482fc4dd0bc2f37b692addd7,True,Tests_passed,dcd0ad0bfc7a8d47966134a33190681ec1670d6807f6d68ba179a7e9feb0551e,True,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,0.009611368179321289,0.009708881378173828,0.009871244430541992,0.009593725204467773,0.009908437728881836,0.009857654571533203,0.009978055953979492,0.03478264808654785,0.06551051139831543,0.7030458450317383,0.3504805564880371,0.06983375549316406,0.12361836433410645,0.03837251663208008,0.0378262996673584,0.03932619094848633,0.03796577453613281,0.039504051208496094,0.0710749626159668,0.6721394062042236,0.0379939079284668,0.03841209411621094,0.028496503829956055,0.03802609443664551,0.028345823287963867 diff --git a/results/combined/merges_timed/tracee/tracee.csv b/results/combined/merges_timed/tracee/tracee.csv index 7935c315a3..85321f0b15 100644 --- a/results/combined/merges_timed/tracee/tracee.csv +++ b/results/combined/merges_timed/tracee/tracee.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 94,refs/heads/master,f75ef3990515f567880ae6045fed482ce05cc02a,62baa332cdbfcdd7955a7c72e827929e58254b04,d787ab20924a98d77c44dc8fe5ce5c27046d9b5f,,True,True,True,53,224,1825,37,True,57,Tests_passed,f4d6d2d762ce4d53448fe934fe38e8e2da67dc9b345ae5814b95fb39cd6e7020,True,Tests_passed,de969bd4b3c296052b56f85266ed185ab7c16b3cb53566781c5b510d78bd29b6,True,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,a38b6a5d40456754b09574e65a89bc30473fa3059c02f3b99684f747f58a7bfd,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,b725cfa0ac1b6f5fd689ad8e521c86f05c29bcb7aee42170dad92f865e4ed271,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,0.0675191879272461,0.07007503509521484,0.048508405685424805,0.06962704658508301,0.0733804702758789,0.04801583290100098,0.06391096115112305,2.10709285736084,1.990940809249878,0.045385122299194336,0.517815351486206,1.1322143077850342,0.35875844955444336,0.27385878562927246,0.2691669464111328,0.26648759841918945,0.2688298225402832,0.26866626739501953,0.784700870513916,0.28505778312683105,0.2686741352081299,0.2710132598876953,0.26672840118408203,0.2674376964569092,0.259716272354126 diff --git a/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv b/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv index e769d5ef40..1d2be4a842 100644 --- a/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv +++ b/results/combined/merges_timed/trecloux/yeoman-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/remotes/origin/pull/31,5f3e6016a840a88e18f554d79d9d94de21a070e9,fc5039fe2138132a59acadd539481f1bb0e43aab,d56218d04ed9200e1eff7e35f3498f604aca4d86,,True,False,Tests_passed,f96a464abd63f497c626ffe37ea864f36d70d8e417529dbcbe274d34cdfe4ea0,True,3,6,60,5,True,Tests_passed,97d0ffe23c8acf9e3c4c101a2086e6cd3e238be91e42c10ecf6e6c64e600e30d,True,5,True,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,a7de7def47def04c383a986b3995fe6a74ef00f581c34a2886f4a26c3efad223,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Tests_failed,b12103bc467459b95674a2a1d35e196ef9830d683c4c62a7b7c336a43fa69605,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,3041254b31bef81d09e9526f8ed224524ba48b1bef0d2d9473841fc81334a8ea,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,0.03911447525024414,0.04003572463989258,0.037322998046875,0.037390947341918945,0.037674665451049805,0.03882622718811035,0.038288116455078125,0.21964478492736816,0.18127679824829102,1.1765682697296143,0.28589510917663574,0.11034893989562988,0.12390470504760742,0.0394899845123291,0.03919053077697754,0.03918600082397461,0.03893756866455078,0.039020538330078125,0.08649373054504395,1.1774981021881104,0.040244340896606445,0.039019107818603516,0.03110980987548828,0.040064096450805664,0.031015634536743164 diff --git a/results/combined/merges_timed/tridentsdk/tridentsdk.csv b/results/combined/merges_timed/tridentsdk/tridentsdk.csv index 7ce150ac1b..f8845049ae 100644 --- a/results/combined/merges_timed/tridentsdk/tridentsdk.csv +++ b/results/combined/merges_timed/tridentsdk/tridentsdk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a33d481a2f096378f2db34c2db8acc985f5c920c978e018c649631512e7d998f,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,0.015267372131347656,0.01525259017944336,0.016328096389770508,0.021394968032836914,0.018965959548950195,0.015974044799804688,0.03414487838745117,0.1474616527557373,0.2797842025756836,1.624173879623413,0.36621594429016113,0.17099928855895996,0.14779353141784668,0.06169486045837402,0.05550742149353027,0.0629417896270752,0.06109499931335449,0.06203627586364746,0.14234328269958496,1.6250731945037842,0.0626676082611084,0.06213855743408203,0.054166555404663086,0.0605320930480957,0.05971193313598633 diff --git a/results/combined/merges_timed/trung/inmemoryjavacompiler.csv b/results/combined/merges_timed/trung/inmemoryjavacompiler.csv index 7148706a3f..a0eac7798e 100644 --- a/results/combined/merges_timed/trung/inmemoryjavacompiler.csv +++ b/results/combined/merges_timed/trung/inmemoryjavacompiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,True,True,True,13,33,548,2,True,13,Tests_passed,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,True,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,True,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,0412aebef45f173e7cabaa7cdb28aa40e9e502b30955fca48da2de65c4354c45,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Tests_failed,de6480414d085ef1d577719fac7ceb6e3cfafb9f24043f952999f39c3f7b3da5,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,1bfa158fef813e526b1558caee3127281d50d73d74741cbe636e37e9f61492d3,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,0.03392291069030762,0.031009912490844727,0.03581714630126953,0.03729104995727539,0.03768277168273926,0.036516427993774414,0.0324857234954834,0.15687203407287598,0.11629796028137207,0.642298698425293,0.3793294429779053,0.0672905445098877,0.11101913452148438,0.030879735946655273,0.0316929817199707,0.03089118003845215,0.03130960464477539,0.03187417984008789,0.061342716217041016,0.6370766162872314,0.03215622901916504,0.03216886520385742,0.03046393394470215,0.03205275535583496,0.030589580535888672 diff --git a/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv b/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv index c81fc2a59d..8ff6f8e845 100644 --- a/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv +++ b/results/combined/merges_timed/tuanhiep/mqtt-jmeter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/remotes/origin/pull/22,0c9d74cdf98412aeadda94cf3267e82549b0a391,3536c9e59f9eca285fa7df740b2bd3175fd8b36c,8fbcc8f2e694e9a9b112219606d4039a529e5876,,True,True,True,6,15,400,2,True,6,Tests_passed,c871a2a1dd1d1ed7d57d77dd426daa961fac9a317abf6e6ba566a66279e3657e,True,Tests_passed,ca69d46e29de6a208e5542bfa77e620c95b8c471501999ffd71b5c77f364da92,True,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,8c1b13bdf5924604714bf1bf9a1f9c6fd97f3190cffcdabdae6afa200e6adf78,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Tests_failed,afb9daa7db495d06e62417076e81d9c81d0c41d2905d1406a36ccc23d268ce3d,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,a05828f86b08ce516300b0cc6104948ccf249a5049583dbd2fd4f2c1a9848529,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,0.014379739761352539,0.014288187026977539,0.015680789947509766,0.01551508903503418,0.015498638153076172,0.01593494415283203,0.0158994197845459,0.04353690147399902,0.0703427791595459,0.6736428737640381,0.44020509719848633,0.07802557945251465,0.13033628463745117,0.043778181076049805,0.04653215408325195,0.04637479782104492,0.0468447208404541,0.044379234313964844,0.07976222038269043,0.720888614654541,0.04421424865722656,0.04402279853820801,0.0449984073638916,0.04458451271057129,0.04513359069824219 diff --git a/results/combined/merges_timed/tuck182/harmony-java-client.csv b/results/combined/merges_timed/tuck182/harmony-java-client.csv index efeb258e69..2f397b0cd3 100644 --- a/results/combined/merges_timed/tuck182/harmony-java-client.csv +++ b/results/combined/merges_timed/tuck182/harmony-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/remotes/origin/pull/18,fb735c719e4cfcc69791ce5365a58de81b892eab,c2b95a0ce01f03de824c68ffa44a724186d543af,208518395654bdbe14e712d57f61edeb25e5fc10,,True,True,True,28,154,2324,8,True,29,Tests_passed,061bc76cd8427cadaad08e053d52ba98ccbc23919e9a6700a523abe9fe264f66,True,Tests_passed,9b4ab486b57fedd69bd48c6d57310345381941388b59153ff6722441b8354998,True,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,b70925fc078c93576c38aecd623833730c1c87abd73e8c5c821531b82344fe7e,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,c034c11ab26f4ff3a13678fcf9b63e1a283dbec3878e2e49cca67c13d514636f,Merge_failed,e17224a247560c7038a0fd5e36eaf56c05a1bba5c3bf79419072a4e9d76b6005,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,16dfd1f9e6b30c37bb5de73c4c6b0b3083b029d8ff170b8bc8051c4146f8c0f9,Merge_failed,21e06b3fd4f90ff878b0c760b31227a20b203aab033032af8e01c2a3267077bb,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,0.010153770446777344,0.010296344757080078,0.010285377502441406,0.010156631469726562,0.010285615921020508,0.01027989387512207,0.010286569595336914,0.09299969673156738,0.3565390110015869,2.205512523651123,0.7684335708618164,0.24040865898132324,0.14722084999084473,0.07016539573669434,0.07035636901855469,0.06954383850097656,0.06829285621643066,0.07030391693115234,0.1779940128326416,2.291970729827881,0.06943798065185547,0.06905078887939453,0.0674436092376709,0.06962347030639648,0.06760907173156738 diff --git a/results/combined/merges_timed/tumblr/jumblr.csv b/results/combined/merges_timed/tumblr/jumblr.csv index 7870819ecb..f57b4af361 100644 --- a/results/combined/merges_timed/tumblr/jumblr.csv +++ b/results/combined/merges_timed/tumblr/jumblr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 39,refs/remotes/origin/pull/18,7bd1a3a093ace02c2ebc38d3be82b32648347cc8,b6eceef13010039abfa0207b9414596c36b44232,560d193ec4b29a3a279a595dfe820c28c2d79572,,True,True,True,10,32,554,3,True,10,Tests_passed,9b4ca1edb7927cd6698f011538d47fd7e0d69ae74ffd94c58138fe6d452fd1d1,True,Tests_passed,dc26af4cb9ee9d74196fdf731bdcf20316a7e1cdee7034ec39d377f605393cec,True,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,95a5ab0d1833a090557630f29ab64bd3a39145b459fd5d57d77fcca7c9985207,Tests_failed,a86692b2a3abe7e9d01a75d0c8ad70aea17b3f02f78ebaaef5254199b5e8b563,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,95a5ab0d1833a090557630f29ab64bd3a39145b459fd5d57d77fcca7c9985207,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,Tests_passed,d89d6a5512835c2c9c0957a2b056eb5ae4498e471f5e97d82e1f1f75066c4782,0.041060447692871094,0.04610133171081543,0.03771257400512695,0.04943680763244629,0.05413031578063965,0.05374455451965332,0.04127383232116699,0.050099849700927734,0.15685343742370605,0.8798577785491943,0.3348047733306885,0.10088086128234863,0.1342170238494873,0.04950308799743652,0.04953908920288086,0.049601078033447266,0.04866528511047363,0.048926353454589844,0.09695959091186523,0.8771953582763672,0.047214508056640625,0.04717445373535156,0.03077101707458496,0.047681570053100586,0.0301055908203125 diff --git a/results/combined/merges_timed/tupilabs/tap4j.csv b/results/combined/merges_timed/tupilabs/tap4j.csv index ee8250380c..af256e3604 100644 --- a/results/combined/merges_timed/tupilabs/tap4j.csv +++ b/results/combined/merges_timed/tupilabs/tap4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,99628e2c44b0d5f5c4d7bad5e525a56566d16080,2620ea5c57e3da066aa1af75070a704a80854c2b,2fe814a4e5272af1d0976c2b24cf5b67160f810e,,True,True,Tests_passed,fafa762c385d191ebc2ccf86b45b1862bbd6644256b853ad21a0859ef06bd6a8,True,2,10,48,2,True,Tests_passed,948c1d31ca76688fc9ef8dbb95e608922e207e7487192d18c168a57937ad9bef,True,2,True,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,0.03746318817138672,0.04988908767700195,0.03250265121459961,0.048722267150878906,0.046083688735961914,0.04366564750671387,0.030047178268432617,0.17029142379760742,0.0755617618560791,0.8004753589630127,0.34023451805114746,0.11723518371582031,0.1369636058807373,0.05513715744018555,0.0419309139251709,0.09370613098144531,0.09237051010131836,0.04114890098571777,0.13337492942810059,0.7923445701599121,0.05091452598571777,0.04166984558105469,0.0784444808959961,0.08012032508850098,0.07160353660583496 diff --git a/results/combined/merges_timed/turbospaces/turbospaces.csv b/results/combined/merges_timed/turbospaces/turbospaces.csv index 7f209d8c13..085d3a25bb 100644 --- a/results/combined/merges_timed/turbospaces/turbospaces.csv +++ b/results/combined/merges_timed/turbospaces/turbospaces.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,8ae57f28d98ec897164b09822d86603b02833a83,0fd7d6b196273b3582b1ecf415ee6e853ac37bf2,5ff57c384e86fcead8f20be720e12a30b992b22b,,True,True,Tests_passed,a17078563d25fe2d807d3342993548764250989e81abc3e63441278ef670ccba,True,22,117,1267,2,True,Tests_passed,e94f1dc1fe358a84c77af71e0d6009644a002e7143af12afa909faac31733a40,True,22,True,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,0.015007257461547852,0.01499795913696289,0.017852067947387695,0.017876148223876953,0.01806926727294922,0.01778435707092285,0.017854928970336914,0.044738054275512695,0.07070255279541016,0.7909126281738281,1.227013349533081,0.08807635307312012,0.14631175994873047,0.05740666389465332,0.054619789123535156,0.05663752555847168,0.055188655853271484,0.05254030227661133,0.09351277351379395,0.8440454006195068,0.053786277770996094,0.052544593811035156,0.043137550354003906,0.052123069763183594,0.041536808013916016 diff --git a/results/combined/merges_timed/turini/vraptor-authz.csv b/results/combined/merges_timed/turini/vraptor-authz.csv index c0b7658356..9e9bdff9c4 100644 --- a/results/combined/merges_timed/turini/vraptor-authz.csv +++ b/results/combined/merges_timed/turini/vraptor-authz.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,ff9a0b0405f0d759760b73d8963d788c837bc9d0,603809922d1ebfc28b76ced0a454f82ef3b822a8,c8106473de8fc96beef50f5f9f9c778455d23a08,,True,True,Tests_passed,342bbf7d6a11eb6cf5775789e02d3f32b3458ed218a58b408f08bd8bcac41351,True,5,10,59,2,True,Tests_passed,c874ace2b4c4d01a77fed200bcfd28dacf648237071cb058e02cbdd98fc371bd,True,5,True,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,d777f521f416c7ef2f024cccfe3d37d1eb03805345a2342132af6ed15095a2d3,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,60ab4b9ee6f3db69cb2cf7dc11d6f0ed562685d8f39a4ac0aee3fefec34c45ff,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,562eea3702397b7157cad3a4a87b5671271836bac27714869aaabf9ad7977eef,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,0.03749251365661621,0.03683066368103027,0.034343719482421875,0.03172922134399414,0.035796165466308594,0.03577136993408203,0.027764081954956055,0.16187000274658203,0.11249327659606934,0.5201516151428223,0.24050331115722656,0.06685209274291992,0.11037349700927734,0.03165483474731445,0.030982255935668945,0.031085729598999023,0.03137469291687012,0.030994176864624023,0.061302900314331055,0.525115966796875,0.031662702560424805,0.031198501586914062,0.02973771095275879,0.03181314468383789,0.03047657012939453 diff --git a/results/combined/merges_timed/twilio/starter-java.csv b/results/combined/merges_timed/twilio/starter-java.csv index dc01be30a1..ff8b7940fc 100644 --- a/results/combined/merges_timed/twilio/starter-java.csv +++ b/results/combined/merges_timed/twilio/starter-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,01cc9db061b3d98083e4e49d56aaa052434a1f2a,c5eaf35629aa4f1ada2a42df3a6c0957ba65b1d0,c9dba43c85333197b7592dd083fdf6e3dfdb7294,,True,True,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,True,3,2,4,2,True,Tests_passed,4f6d043d71d56d02ccc2f94323e736bccffdea3ed7fc33702df7b11607f727a2,True,3,True,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,8d6c4218cbf798d14b74e0bbed5bc7dcf0d08233197b7f7489344a69f001202e,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,cc3db33559ad68eae3b56591a6358a9ca97ac0df9389e2ee4e59f42b27cc64fb,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,27a495d4874e3690f1ddce84544979539d974c01ee3eb0f0777f693775ced5cd,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,0.03761744499206543,0.0364992618560791,0.03437495231628418,0.03635430335998535,0.03448152542114258,0.0345911979675293,0.037702322006225586,0.15799951553344727,0.11231684684753418,0.43064379692077637,0.22272419929504395,0.07036423683166504,0.11131525039672852,0.03159689903259277,0.03175926208496094,0.03171110153198242,0.03146958351135254,0.03069019317626953,0.06103944778442383,0.4337630271911621,0.03185868263244629,0.031047582626342773,0.029979467391967773,0.03128504753112793,0.02985978126525879 diff --git a/results/combined/merges_timed/twilio/twilio-java.csv b/results/combined/merges_timed/twilio/twilio-java.csv index 39d6d033af..44412cde59 100644 --- a/results/combined/merges_timed/twilio/twilio-java.csv +++ b/results/combined/merges_timed/twilio/twilio-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 147,refs/heads/main,da7bfa5df647e4ebf4b074892143028abee0bdb6,b21b03e6e1ab2a1ce8bd61e84c56626b2069547a,3d0e236505f0ac0e1b7d1ff7f2da8daae17de785,,True,True,True,27,70,554,2,True,27,Tests_passed,62e835ab0e19498a73df01df0cec6aa334d047471f18e9f0e3efcaaa21f64b98,True,Tests_passed,06491f98033557195a2bbc6e35ef5e62092762b734c343a62ccbacfea758d7bd,True,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,0.010402202606201172,0.010457038879394531,0.011280536651611328,0.011085033416748047,0.01136016845703125,0.011229991912841797,0.011070728302001953,0.03582119941711426,0.06473612785339355,0.518751859664917,0.612617015838623,0.07329511642456055,0.13335561752319336,0.043222665786743164,0.04419898986816406,0.043051719665527344,0.04321026802062988,0.04418659210205078,0.07664823532104492,0.6045510768890381,0.04180765151977539,0.04209136962890625,0.031059741973876953,0.0403439998626709,0.03110647201538086 diff --git a/results/combined/merges_timed/tyagihas/java_nats.csv b/results/combined/merges_timed/tyagihas/java_nats.csv index 2c02a85b9c..beed93c701 100644 --- a/results/combined/merges_timed/tyagihas/java_nats.csv +++ b/results/combined/merges_timed/tyagihas/java_nats.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/remotes/origin/pull/8,2d1935a3170dcf60976924026ff17aa76a431ede,65f9995df7708f4b6024bc1e9d6128203b1255cb,e4f2f8ec702eb75455c011207ee9d2dc85d5fc6b,,True,False,True,2,4,8,2,True,2,Tests_passed,6ce70efb79ce9699b31aeadbd817d9332e5fa61ff930f5cc6b33a44c3cb68904,True,Tests_passed,c66d9976b329a83e46b297b76052df81de0509566661e4a8a52712da94d41f2a,True,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_failed,3b6c482fa49eb2f42ecc4b19bde3c7898f2672808f44cf65b1bc6d7bf45b61f6,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,0.04514312744140625,0.04834270477294922,0.0399322509765625,0.04945802688598633,0.03916525840759277,0.04670238494873047,0.04463648796081543,0.16697168350219727,0.11380171775817871,1.5317983627319336,0.40795063972473145,0.0797123908996582,0.13936090469360352,0.047492027282714844,0.047902822494506836,0.048056840896606445,0.047120094299316406,0.04703569412231445,0.08271574974060059,1.4023854732513428,0.04624748229980469,0.045943498611450195,0.03511214256286621,0.04529452323913574,0.03672981262207031 diff --git a/results/combined/merges_timed/tynamo/tapestry-security.csv b/results/combined/merges_timed/tynamo/tapestry-security.csv index fb3b8f9436..0ef75a8671 100644 --- a/results/combined/merges_timed/tynamo/tapestry-security.csv +++ b/results/combined/merges_timed/tynamo/tapestry-security.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,568cab9871a77bfa6a90c2b463facf1b01df42bc,f5562e2b7a8700bbaf146edac5b015dc88d21aa1,c4ff9efea18c287783bcde4cfcf94b91d3372ac6,,True,True,True,11,21,136,2,True,11,Tests_passed,8ad7c7efae6dde5c39e3110d28ffec139463bfa76e230538e432308d40a83dce,True,Tests_passed,5d0c7c533bf3144dec45f5891a79ef9008fe18aff62c5aba55c96c99942f5d5d,True,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_failed,e96e414a96a5fb84d86fea33adb7411a43979220e253ec6b1170160c3b8dd494,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,0.011854410171508789,0.011873245239257812,0.013995647430419922,0.014057397842407227,0.013672590255737305,0.013475894927978516,0.013625860214233398,0.03948712348937988,0.0679171085357666,1.1693241596221924,0.4260580539703369,0.07986688613891602,0.13306760787963867,0.04837822914123535,0.05020952224731445,0.049078941345214844,0.050043344497680664,0.05015397071838379,0.08363580703735352,1.1776435375213623,0.04614520072937012,0.046334028244018555,0.037711381912231445,0.04681849479675293,0.038117408752441406 diff --git a/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv b/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv index 9660071287..7c6017eae3 100644 --- a/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv +++ b/results/combined/merges_timed/ubervu/elasticsearch-river-github.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,261184e89701acd7169b001d0dc58293ec680512,3e590fef47b5eb9b167659841295e40f298e23c4,e8b07ad4428dde2308166ef5e48e0c1f98ceed44,,True,True,Tests_passed,d78ea6fa704344eae1441581abe96566e8bfa96418123e8b7bbee7cd0b3845d1,True,4,35,243,3,True,Tests_passed,c3a6bf77979d06d0c5d5001209afdf15283038697cfaac6c97e119a6dcb50a45,True,4,True,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,81cc1a3606d60bec7525648bee539e11188ce56108b4a6c76eca784a96a005dd,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Tests_failed,e06e85507b97b75bc30267cbb8b51fad2aee88ce5f10e9ddf5855c9681fdf7f9,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,995746a518383563de600b181a00722d1dac639d11bb3291f158da789ebec57f,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,0.04102826118469238,0.04026341438293457,0.03988504409790039,0.03873920440673828,0.04004693031311035,0.03931927680969238,0.0372006893157959,0.22145986557006836,0.17002439498901367,1.059084415435791,0.5303597450256348,0.10188746452331543,0.11780142784118652,0.03977775573730469,0.0391077995300293,0.039229631423950195,0.038842201232910156,0.03897261619567871,0.08657240867614746,0.9998300075531006,0.03994274139404297,0.040358543395996094,0.03185009956359863,0.039374351501464844,0.031636953353881836 diff --git a/results/combined/merges_timed/uklimaschewski/evalex.csv b/results/combined/merges_timed/uklimaschewski/evalex.csv index a08286cfcb..4106b5f4e7 100644 --- a/results/combined/merges_timed/uklimaschewski/evalex.csv +++ b/results/combined/merges_timed/uklimaschewski/evalex.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/main,c152bc8eb6d302460f56f989e91c2967cc3a0894,5d9db79516070c1cfb1395891de45d9757fe188a,b9cb3eaadf28e6de3dfd222689e25d3195667421,,True,True,Tests_passed,b69601d494c5ebb798cea0713432b207347ef3c775ef3f89e5d941ddc6eb502f,True,3,21,212,2,True,Tests_passed,50c67c674c272dd26b4e936e2c710d3d80bdfd873f0363ca295436a3c81e4718,True,3,True,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,ca0f93d868fbe46c3acdd4e4843dd3f1cfc840057bbb944950def87c8d3619d1,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,0.04999065399169922,0.04826998710632324,0.04838919639587402,0.048920392990112305,0.04271340370178223,0.049001455307006836,0.03878426551818848,0.1768479347229004,0.11624455451965332,2.362563371658325,0.5251431465148926,0.07208371162414551,0.12721538543701172,0.04321646690368652,0.04088115692138672,0.041941165924072266,0.04119682312011719,0.042832374572753906,0.07715177536010742,2.2218565940856934,0.04213857650756836,0.04195594787597656,0.030048131942749023,0.04186391830444336,0.03067946434020996 diff --git a/results/combined/merges_timed/umut/spring-social-salesforce.csv b/results/combined/merges_timed/umut/spring-social-salesforce.csv index 7a100efb30..c6bb759069 100644 --- a/results/combined/merges_timed/umut/spring-social-salesforce.csv +++ b/results/combined/merges_timed/umut/spring-social-salesforce.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,c0ba949826659e6d82e8cd4b958530add191586a,d2f14b90370242638f71cecc14ba6c2b880fa5a7,641d0c91b8ddddfca7f1c71fef1b195a5ccbb804,,True,True,True,20,36,1168,2,True,20,Tests_passed,a3f13e088e4c881b71e471946d45563600eb277e27d598a38675636434920b65,True,Tests_passed,5001d457983015612622eaf150d0cf15dbdfaa1f516a18fe18feb7f4ef093169,True,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,20551bfe0132a95905e3fc4c9a3e90afaf6ef8b332e43c6507a478caa527797f,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,0.04053139686584473,0.045568227767944336,0.050142765045166016,0.04441070556640625,0.0413050651550293,0.03874015808105469,0.03651309013366699,0.18294525146484375,0.11135029792785645,0.6087915897369385,0.33073854446411133,0.07704734802246094,0.140000581741333,0.04878497123718262,0.04950428009033203,0.04901862144470215,0.05054306983947754,0.05058431625366211,0.08600664138793945,0.6052579879760742,0.04717755317687988,0.04881787300109863,0.037934303283691406,0.046846866607666016,0.036559343338012695 diff --git a/results/combined/merges_timed/unitsofmeasurement/unit-api.csv b/results/combined/merges_timed/unitsofmeasurement/unit-api.csv index 120753384c..3861555309 100644 --- a/results/combined/merges_timed/unitsofmeasurement/unit-api.csv +++ b/results/combined/merges_timed/unitsofmeasurement/unit-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 56,refs/heads/master,af3a3abfab663d442a692e5d1c503dab05665afe,83afd3ef45cb4af71be258e7f5863b6384b7db5a,049ade04d1087a5fe8f4357c19db95b3fe167916,,True,True,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,True,101,121,15500,3,True,Tests_passed,6fce6f2b06d9bea3199a032dde14a83689ef0ca2d55f44103c5b3c819cdd5fdf,True,101,True,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,02a80495312b6003f1768b6f87473fcfbebd9fb3282233abb478c40fa09058c1,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,Tests_failed,157a2be2185b3c87d408afed6446e9a9f3a84af0326831c0d280a7e5dbeb6684,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,4a3eb11f598525bf7190aef02c3a8dac1331765f7e79892419640a7466453752,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,0.04342174530029297,0.06737899780273438,0.03961753845214844,0.05180978775024414,0.046526193618774414,0.061394691467285156,0.05493927001953125,0.2726869583129883,0.18018674850463867,0.052156925201416016,0.716681957244873,0.11559605598449707,0.13701105117797852,0.05604219436645508,0.052399635314941406,0.054457902908325195,0.05366635322570801,0.05461239814758301,0.10291934013366699,0.9547054767608643,0.053376197814941406,0.06604957580566406,0.053603172302246094,0.053572893142700195,0.053192138671875 diff --git a/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv b/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv index 1a6afbc1d3..8c6da79676 100644 --- a/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv +++ b/results/combined/merges_timed/unitsofmeasurement/unit-impl-se.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,16,53,270,3,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,16,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,0.04952669143676758,0.05021309852600098,0.0483546257019043,0.01691126823425293,0.06855463981628418,0.029349088668823242,0.01993417739868164,0.2368924617767334,0.16765117645263672,0.053243398666381836,0.5445990562438965,0.1601262092590332,0.218489408493042,0.10287046432495117,0.10620450973510742,0.1027822494506836,0.06611943244934082,0.10888671875,0.12229228019714355,0.11945462226867676,0.05642867088317871,0.09761285781860352,0.04053330421447754,0.09711790084838867,0.05900096893310547 diff --git a/results/combined/merges_timed/unitsofmeasurement/uom-se.csv b/results/combined/merges_timed/unitsofmeasurement/uom-se.csv index 5f0adf36ba..2e6f6bd4a5 100644 --- a/results/combined/merges_timed/unitsofmeasurement/uom-se.csv +++ b/results/combined/merges_timed/unitsofmeasurement/uom-se.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,True,16,53,270,3,True,16,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,0.040654897689819336,0.04229855537414551,0.035779714584350586,0.04290294647216797,0.03989887237548828,0.03497886657714844,0.05681133270263672,0.24170851707458496,0.15783262252807617,0.05457353591918945,0.5536737442016602,0.11642122268676758,0.22121524810791016,0.1011049747467041,0.05786633491516113,0.10386371612548828,0.05640387535095215,0.10616230964660645,0.1124427318572998,0.11843466758728027,0.05746316909790039,0.10176873207092285,0.03917241096496582,0.09430742263793945,0.04784107208251953 diff --git a/results/combined/merges_timed/univocity/univocity-parsers.csv b/results/combined/merges_timed/univocity/univocity-parsers.csv index 7a2960af06..5f358b3de4 100644 --- a/results/combined/merges_timed/univocity/univocity-parsers.csv +++ b/results/combined/merges_timed/univocity/univocity-parsers.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 22,refs/heads/master,9426fbefd3b6e57649e45d79bc7d4fdf674e9377,04cf38831b7fba1fa265e84c1deac9f0274046c8,8a463847eca82abb885b4203d1ac17e5f4384d90,,True,True,True,4,7,207,15,True,17,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,True,Tests_passed,060f8700b83b0afa92d6348c12c5fb1d0be6298dc82b019c2ceb1027cdc4bf72,True,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_failed,a85faab50cf7959f923be10f679eb94be242533ef47506d0393b5e4dda315ca4,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,0.032270193099975586,0.0350189208984375,0.022449493408203125,0.034584999084472656,0.019934415817260742,0.015309572219848633,0.01880955696105957,0.11253190040588379,0.09871745109558105,1.8368995189666748,0.6329305171966553,0.10235190391540527,0.1336650848388672,0.07400870323181152,0.04495668411254883,0.07313299179077148,0.07052874565124512,0.04523587226867676,0.11340641975402832,1.6091029644012451,0.044394493103027344,0.06364035606384277,0.03711509704589844,0.045166015625,0.05821967124938965 diff --git a/results/combined/merges_timed/unruly/junit-rules.csv b/results/combined/merges_timed/unruly/junit-rules.csv index f21c43480e..5e631282ff 100644 --- a/results/combined/merges_timed/unruly/junit-rules.csv +++ b/results/combined/merges_timed/unruly/junit-rules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,9f9e68b409b45bc46b8210c50964508e185dea8f,7b70c0ebce2dadfa3c20c95a258562889b923e2e,492670cc827654754a93d59b562cfe27fad84c57,,True,True,Tests_passed,19aac3cb0894586e9cd50dad5781d0189f52adc3994e50d3432f48822ef6f374,True,5,12,114,4,True,Tests_passed,1c066bad00671b7bef3b5dc2ee06e82d0097162cde2f44de67d11d9f6addd734,True,5,True,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,11e610e9b8b910b9bedb0e57f82f16af16ea698be5043be4159e208d96197f19,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,fd014bd2375d4630eb6ef13e69652fda2d5c4fb131267f77a11375164da8b3ff,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1d203775cda1701552b32f92c72bf1b0cf542b9478dac70514396119c1bd2051,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,0.03817868232727051,0.03901481628417969,0.03864479064941406,0.03680014610290527,0.03712654113769531,0.038132667541503906,0.03747248649597168,0.2868845462799072,0.22166776657104492,1.1187233924865723,0.25284600257873535,0.12272787094116211,0.12891459465026855,0.045346736907958984,0.04661393165588379,0.04582977294921875,0.04566478729248047,0.04585838317871094,0.10803079605102539,1.097710371017456,0.04613494873046875,0.04649496078491211,0.03133964538574219,0.04601454734802246,0.030600309371948242 diff --git a/results/combined/merges_timed/urbanairship/datacube.csv b/results/combined/merges_timed/urbanairship/datacube.csv index a9361aa3cd..6f34148e8b 100644 --- a/results/combined/merges_timed/urbanairship/datacube.csv +++ b/results/combined/merges_timed/urbanairship/datacube.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 46,refs/heads/master,e98794fe0b952cfbec98456698cd0e1c8226173c,c176fe3f098b025057d82bb50e327d227f3cd154,b4f7933ed957d5b8841ae731e7156a70beaa2c37,,True,True,Tests_passed,3965a63425c8f76c65ff240d62a0697307679c0fc9ca6f389840bb9d48bcaa87,True,5,12,75,2,True,Tests_passed,298dbae6f5a26224c6fd0864e294572e10f950671ad2895d866fc426f68c39f4,True,5,True,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,0.11950564384460449,0.12035369873046875,0.010845184326171875,0.17383670806884766,0.010720968246459961,0.17339849472045898,0.011289119720458984,0.2553989887237549,0.17539095878601074,1.0702314376831055,0.5156795978546143,0.30552101135253906,0.46393632888793945,0.2090158462524414,0.29987335205078125,0.2943000793457031,0.27965688705444336,0.2952687740325928,0.3910229206085205,1.2543935775756836,0.23197126388549805,0.24260759353637695,0.26592159271240234,0.24375510215759277,0.2561604976654053 diff --git a/results/combined/merges_timed/urbanairship/java-library.csv b/results/combined/merges_timed/urbanairship/java-library.csv index a85d82e8fc..cb2cdcb9ec 100644 --- a/results/combined/merges_timed/urbanairship/java-library.csv +++ b/results/combined/merges_timed/urbanairship/java-library.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 85,refs/heads/master,4be3d18ac5d8d4f21dd63731ba9cf92aeadc16e5,dd350b3bd64c7ecec5926bf19c999ea77893f5b8,9f8273317362999795cfad1aa6f5fb82d38271b0,,True,True,Tests_passed,d8712d36339ffd9c2bb7b2006dce6bda868a989651256d2727cff7d549e9c8ad,True,5,14,30,2,True,Tests_passed,704f38aa289e58cc08ca0da8dc47c5017bab946462644f5b309ed12f5ce4345d,True,5,True,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,929531a547dd74ae1723adb7a5c040a5711cf722a8be8fab375dc525f2a7252d,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,656b483fc5eaf7402260cbf2042707288d319725888f2801cb391c5f0d6e5574,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,ad792b2c1065307c8bf3eeb766a7282553966d803ab0a31ca2022196bcf12f2e,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,0.05812692642211914,0.046090126037597656,0.04871654510498047,0.05058479309082031,0.056825876235961914,0.050248146057128906,0.056765079498291016,0.21186137199401855,0.14960193634033203,3.098188638687134,0.7676205635070801,0.0804300308227539,0.12211799621582031,0.04375648498535156,0.04348134994506836,0.04405713081359863,0.04281139373779297,0.043178558349609375,0.07904696464538574,2.879160165786743,0.04259657859802246,0.0428469181060791,0.041384220123291016,0.0432283878326416,0.04053497314453125 diff --git a/results/combined/merges_timed/urbancode/terraform.csv b/results/combined/merges_timed/urbancode/terraform.csv index 46e63f7aa3..712cca9f5b 100644 --- a/results/combined/merges_timed/urbancode/terraform.csv +++ b/results/combined/merges_timed/urbancode/terraform.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,23cda111d2be54f22e8222a29f71f29bb61f3188,95b28fa95c875e4c1e7c85d1e0164f5f2783cbd9,7da71a46727f3db5c199f4ffa765cc95c16997cb,,True,True,True,8,32,345,2,True,8,Tests_passed,79d4a2f1c49febe7730103f9e960f015f5cf3e76dd3ca2df46144e260e5e1437,True,Tests_passed,b0b544f09b12a5d7cd396660e3f709ecab62e1ad918da0f9f83023e57ac9897d,True,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,ca6d61dcd21a17f86b12a4453d5d7340847f0e59739d1f2e16ed09c017a0061f,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e0eeb42530b3e98720ea65d7ab0af1cfa8c8940127638a134b774d5198e25606,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,1256bbc2638df5e64a1e909a8b60954f40af0434432d99decac8a518f0726b1f,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,0.013887405395507812,0.013849020004272461,0.015292644500732422,0.014734506607055664,0.01487421989440918,0.01495051383972168,0.014254093170166016,0.04125404357910156,0.07480216026306152,0.6047706604003906,0.4296293258666992,0.08700060844421387,0.131575345993042,0.04419112205505371,0.04445624351501465,0.04253244400024414,0.0425267219543457,0.04523825645446777,0.07556486129760742,0.6666922569274902,0.041878700256347656,0.042308807373046875,0.044237613677978516,0.043648719787597656,0.04298281669616699 diff --git a/results/combined/merges_timed/urish/gwt-titanium.csv b/results/combined/merges_timed/urish/gwt-titanium.csv index 80b76c8506..5027c1ec70 100644 --- a/results/combined/merges_timed/urish/gwt-titanium.csv +++ b/results/combined/merges_timed/urish/gwt-titanium.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/remotes/origin/emul,8283194660a0d362eab3f08a61e31d400d9a56a9,a22853e43bd0683d9a09f4e409ac0ed431bb99ed,18650ec3760d6293ad56fa70c3eabddcb24ccf02,,True,True,True,153,257,34067,35,True,153,Tests_passed,20c475afa38390c216f3a9a0f9deda4e64dfba181ea1d2a213561fbf541d7f4e,True,Tests_passed,070e30656769757e7cb688bc5a2d3d9fea500e09bb5aa28da515f8dcd5029901,True,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3d8ba7b26749216bc3de5c4bd583f73e5d23d329aed370dfc50e5ba33ba2880,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Tests_failed,35129bb7c9a10431e89331c05256d9aa956b876f0a6758bb38e679ce85d78712,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3c5eebd57ffb99e3148b8dd5b240541fad2108c894df3f31385204cce1ddb0b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,0.041434526443481445,0.030248641967773438,0.05463361740112305,0.047739267349243164,0.04567098617553711,0.03812694549560547,0.049129486083984375,1.3313608169555664,2.0178568363189697,15.254916429519653,1.6583387851715088,1.1329264640808105,0.3739180564880371,0.2998678684234619,0.3027462959289551,0.29825806617736816,0.30022144317626953,0.29532670974731445,0.842432975769043,14.641674280166626,0.2991483211517334,0.3062882423400879,0.2926931381225586,0.29517507553100586,0.29064083099365234 diff --git a/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv b/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv index 41af312334..72bef441db 100644 --- a/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv +++ b/results/combined/merges_timed/uwolfer/gerrit-rest-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 114,refs/remotes/origin/httpclient-android,63c4c0de93ac1545662f946e7b8b821c6c85da68,db86712fee757b5b1808098856d6ac77837c2801,6b9cfe0eaef6462b8405ca2362a4b8a54b062fa4,,True,True,True,178,639,3533,4,True,178,Tests_passed,6abd3aac8693c66ef661bfaccfd62caf6b63bc2f347ae65add0a4058db77eda2,True,Tests_passed,8eb92b00d86730c2de3dd37ec19a9f8a15567df3237dd74fdd6a3e4152539178,True,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,4f003efaf94b98bd4d4da6e1ebcd7cdb009c96892e3b9f2e82d2c253c37a9698,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,dff161dcd17e4fb34650addf26e521ff5eb124cd505b3b3dd1d316a98165a417,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,593f349be4fa0a69de0aa9cea9f3c2d4b20737e3205fb82a977e7b161b6f02f0,Merge_failed,53e21196a543cd5fd57979f751a6e935c34a30d1cb307234c7d3292c4c42aa14,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,0.0634758472442627,0.05135655403137207,0.057817935943603516,0.06045699119567871,0.06470417976379395,0.06846928596496582,0.06708574295043945,0.32297730445861816,0.25173425674438477,1.2036387920379639,1.1340336799621582,0.15353894233703613,0.15216279029846191,0.0725095272064209,0.0665431022644043,0.06706929206848145,0.0700833797454834,0.07045888900756836,0.1340944766998291,1.172832727432251,0.06677794456481934,0.06924676895141602,0.058928728103637695,0.06373023986816406,0.05833005905151367 diff --git a/results/combined/merges_timed/valotrading/silvertip.csv b/results/combined/merges_timed/valotrading/silvertip.csv index be02f2db4c..4b1f89ccd0 100644 --- a/results/combined/merges_timed/valotrading/silvertip.csv +++ b/results/combined/merges_timed/valotrading/silvertip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 27,refs/heads/master,9d31f8111075f508c9ecfbe3680b12d13a48f927,47b363321c14cd5e46ef5d2eb91463007b8916c5,7be1073b258791c55ebb6a8d499f0b8ad76e6cc0,,True,True,True,24,33,445,5,True,24,Tests_passed,80df0a65c04ce8cc250a78293d6a24c463f1564052101bcaffc8a04e27f74d05,True,Tests_passed,984964b6a6d87f1e8c8d38fda84d3053daadcd389a6a6376443b81db4dec6603,True,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,0.012937068939208984,0.04482126235961914,0.042548179626464844,0.0413970947265625,0.0429685115814209,0.04750633239746094,0.034178972244262695,0.3603978157043457,0.27751755714416504,2.645644187927246,0.3974134922027588,0.16056084632873535,0.1429734230041504,0.06046104431152344,0.0618438720703125,0.059885263442993164,0.059723854064941406,0.060807228088378906,0.14120244979858398,2.5774800777435303,0.05988717079162598,0.06145763397216797,0.02783203125,0.059586286544799805,0.02791285514831543 diff --git a/results/combined/merges_timed/vandurme/jerboa.csv b/results/combined/merges_timed/vandurme/jerboa.csv index 36bce68154..8d71a536ce 100644 --- a/results/combined/merges_timed/vandurme/jerboa.csv +++ b/results/combined/merges_timed/vandurme/jerboa.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/remotes/origin/pull/4,3ce0e6dedb14acd3be38b052f4158734778b4973,d4b49e2bfb050626774cc3f3fb654993a3fcf099,6f00c6fe70e86fcb6f6e78ee7f1f590108cecba2,,True,True,Tests_passed,9e7b018019fc6c5fbca750e359a122d184930595e31bd19f4e6830848ab2522e,True,45,259,1260,2,True,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,True,45,True,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,2ddc0b1a6a4c96d97009f9b701988102e8509d838287fc20bbc487b828967815,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Tests_failed,c812b70eed7120580b5a83568f6cbc0b613b1b69e996da5eb2fdaf80cea455aa,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,87bd5a077fb44facbd3efb647b96b9599142ccec7b213134ebab1ae50a94c3bb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,0.013466358184814453,0.013352394104003906,0.014047384262084961,0.013964176177978516,0.013547420501708984,0.013590097427368164,0.01409912109375,0.03936266899108887,0.07443594932556152,0.7072696685791016,0.8112771511077881,0.08917546272277832,0.12808513641357422,0.042732954025268555,0.04253506660461426,0.04150867462158203,0.04242300987243652,0.04138636589050293,0.07588934898376465,0.768775224685669,0.0429692268371582,0.04182839393615723,0.04170799255371094,0.04250669479370117,0.04166460037231445 diff --git a/results/combined/merges_timed/vanduynslagerp/enml4j.csv b/results/combined/merges_timed/vanduynslagerp/enml4j.csv index 14a04d5bb6..326cc640a6 100644 --- a/results/combined/merges_timed/vanduynslagerp/enml4j.csv +++ b/results/combined/merges_timed/vanduynslagerp/enml4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,61e72c5c3568a9dc49d49cc19ef79a19972ccd26,83c3de81ff9b7fb8a047be4abb0a9b3b82256cbc,0e08aa59830a000eced31b31a2d556531d15283a,,True,True,Tests_passed,21b135e72d860adb5d727b37f264cfec4eaa2832ca87e463f67daad48912d812,True,17,156,697,2,True,Tests_passed,8cbf4b26ee339dbf2eb63874a67d64436fd103bd089d1ef397a7ba0d02448ea2,True,17,True,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,d3c673a974574947296fa7f4b66b0bf130cfa1985b63fe062e8bcfc81761b111,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Tests_failed,544d1d32813f91e4d061daa8aec00227e9fcd666e7a3a22f51b6578c013ff4c4,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,c0a54544fb2e7251030b6a27b916589dad872c46bfcf1e0a6e1b31d3d41627f4,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,0.01658010482788086,0.01620030403137207,0.018276214599609375,0.018630266189575195,0.009918451309204102,0.01844024658203125,0.0188751220703125,0.04689216613769531,0.06923103332519531,0.5234501361846924,0.472548246383667,0.08925724029541016,0.14653754234313965,0.05154609680175781,0.034943342208862305,0.0355534553527832,0.05108237266540527,0.0498046875,0.06711530685424805,0.5629918575286865,0.03562450408935547,0.03509187698364258,0.03613781929016113,0.046367645263671875,0.03474736213684082 diff --git a/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv b/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv index 5965fa3338..e6c2d9dd0d 100644 --- a/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv +++ b/results/combined/merges_timed/vbehar/rundeck-api-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/remotes/origin/new-style,ca48a23f4bc9ba6e23057d3615272938e61eb670,564a3ce90f61dcb10c46c4553e68e6221f516248,2206d677247431280a262ccbdfc9d3f4b2e4065a,,True,True,True,24,73,1496,2,True,24,Tests_passed,467a2fbf1959be604c388e7cebadbad43fdc77005247cc7d2be077c506c5a757,True,Tests_passed,c43917a5a447a89393e014c98848fe09f50a3bd0bc22f2103a0977dd936a4872,True,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,0.051877737045288086,0.05070304870605469,0.050154685974121094,0.05548286437988281,0.0465235710144043,0.057256221771240234,0.061745405197143555,0.2005906105041504,0.11813163757324219,1.837486982345581,0.6309425830841064,0.0800173282623291,0.1375417709350586,0.0506901741027832,0.051520347595214844,0.049727439880371094,0.05208706855773926,0.05169534683227539,0.08826541900634766,1.7526025772094727,0.04813957214355469,0.05022382736206055,0.039032697677612305,0.049135446548461914,0.03973746299743652 diff --git a/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv b/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv index 8f3c836cc0..b4553c072e 100644 --- a/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv +++ b/results/combined/merges_timed/vdenotaris/spring-boot-security-saml-sample.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,88d2426c11714615322d84934cc2e1ac72fd08e7,1874da0eac0466062024733152861fd994f2d863,ec64add49e8afbc99404f1fcfe15285457553b68,,True,True,True,40,101,797,2,True,40,Tests_passed,6c082e8c67aad2fff9df716176724babd11e8c014ae326571b9f2963ae2a035d,True,Tests_passed,eaf097aa2d90637a13cbff55442df88b305635dbfbbb27ffbe78fcf92905646e,True,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,65e2c707537d3826be17d3d7c61bf18548d03f64f17c238e9097a16b835b07e2,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Tests_failed,20c9dc28359056a064f47fc783e7ddb6fdc9ae3eebbedd83db235d249679b9d7,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,30d1d1468ff7de72fcea320c29ca85452598cbf2ce35eb7bbb0b9d6abb15db90,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,0.01454615592956543,0.03885698318481445,0.020694494247436523,0.045261383056640625,0.04478120803833008,0.04912161827087402,0.03902077674865723,0.04634284973144531,0.10519623756408691,0.9757688045501709,0.46628332138061523,0.07854223251342773,0.12156510353088379,0.042476654052734375,0.04129505157470703,0.041414737701416016,0.04234170913696289,0.03960895538330078,0.07048249244689941,0.9453587532043457,0.04281735420227051,0.04111671447753906,0.042592525482177734,0.04075264930725098,0.0431673526763916 diff --git a/results/combined/merges_timed/vdurmont/emoji-java.csv b/results/combined/merges_timed/vdurmont/emoji-java.csv index 1ca5cb3f2d..1b6eb08351 100644 --- a/results/combined/merges_timed/vdurmont/emoji-java.csv +++ b/results/combined/merges_timed/vdurmont/emoji-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,False,True,6,15,1799,3,True,6,Tests_passed,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,True,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,True,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,51ebf42a2f8d9d37091a6725527b15bf7c8a78aff4b2706afc1e5806a503a638,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Tests_failed,c5815305e7a225afe29e0f8aabd52000cdb462188ab69830453840773ad66d30,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,f65b3a6c898a16b1c787ec8938a39634a8d6e19b7f14291a50b9d14e3e48c865,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,0.05758333206176758,0.054793357849121094,0.0549626350402832,0.05405545234680176,0.04608583450317383,0.04279947280883789,0.03378176689147949,0.24564146995544434,0.18066668510437012,0.6428718566894531,0.30562877655029297,0.1136927604675293,0.1371927261352539,0.05435371398925781,0.0557703971862793,0.05463671684265137,0.054779767990112305,0.05471658706665039,0.10848116874694824,0.6527156829833984,0.05503439903259277,0.05438351631164551,0.04407787322998047,0.0545649528503418,0.04286336898803711 diff --git a/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv b/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv index 98e9d78911..d55bdbc24a 100644 --- a/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv +++ b/results/combined/merges_timed/verbalexpressions/javaverbalexpressions.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,Tests_passed,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,True,6,11,95,4,True,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,True,6,True,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_failed,5ba545899eda6c8b251f801cd0f9fd8603209c22faf33c7a02e4ce85ca255af3,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,0.04606914520263672,0.044884681701660156,0.044451236724853516,0.0402071475982666,0.04472708702087402,0.04655933380126953,0.04401350021362305,0.28654050827026367,0.21962833404541016,2.4249777793884277,0.5019302368164062,0.12714147567749023,0.135148286819458,0.05367779731750488,0.05400443077087402,0.053386688232421875,0.0524439811706543,0.0532383918762207,0.1191246509552002,2.3254804611206055,0.05321955680847168,0.052546024322509766,0.027867794036865234,0.05406546592712402,0.02745366096496582 diff --git a/results/combined/merges_timed/verhas/djcproxy.csv b/results/combined/merges_timed/verhas/djcproxy.csv index 4fd6f6333a..443c4d76dd 100644 --- a/results/combined/merges_timed/verhas/djcproxy.csv +++ b/results/combined/merges_timed/verhas/djcproxy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,db3b9bf7957d4a0e56fda33ca5d5e9340d9625ca,9db5e5b7908a16e773116d2483bad160803e90d9,a32513a5d9a409c995562fbcfede61c982301c1c,,True,True,Tests_passed,009f8e66c25a54003cef9139b7e8e98abc066415a86c566d47a9d44ddf037dc9,True,5,8,77,2,True,Tests_passed,60f6295160ce31bda21ceda8a75c29c9972f48f79b234c93ebb7e034b6d2b832,True,5,True,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_failed,c34de71dc51846a2aa4c913bbe2e6a564e2b3f4b9a9b21a90bdcd5ca950a865e,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,0.04162335395812988,0.043466806411743164,0.04169106483459473,0.04076671600341797,0.040949344635009766,0.03909754753112793,0.04338645935058594,0.16414308547973633,0.10923171043395996,0.8765342235565186,0.4279754161834717,0.06724357604980469,0.12170553207397461,0.037783145904541016,0.0382227897644043,0.03764510154724121,0.038617849349975586,0.03780961036682129,0.0691075325012207,0.8614656925201416,0.038297176361083984,0.03699231147766113,0.02742934226989746,0.038443565368652344,0.027631759643554688 diff --git a/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv b/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv index dff35b3f95..2f515c6db7 100644 --- a/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv +++ b/results/combined/merges_timed/versioneye/versioneye_maven_plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 32,refs/heads/master,a890d82eb3698c4a20b2035eb3fd1e871bf52aa6,fbe5f5fd02487b865ec5b1b63891b56c8ddf642e,73fa448ea55736bb6281bb34d6bb5efb4e618fd3,,True,False,True,3,12,47,2,True,3,Tests_passed,34047f9faf00864135bf7eccf1f5de85c653b53251c2a6b385f63f5e53f2dd55,True,Tests_passed,82f3effcb60635228fe2447d9a023afcc33b523a47b7bd9dd27a313efc33658b,True,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,0.04193258285522461,0.042113542556762695,0.05091404914855957,0.04629063606262207,0.05039048194885254,0.04601478576660156,0.05202293395996094,0.15494632720947266,0.11756205558776855,0.6794338226318359,0.2644209861755371,0.06951045989990234,0.12714076042175293,0.04096627235412598,0.04090523719787598,0.03963136672973633,0.0412290096282959,0.04060626029968262,0.07380270957946777,0.6819071769714355,0.04023623466491699,0.040789127349853516,0.028748512268066406,0.04044365882873535,0.0293729305267334 diff --git a/results/combined/merges_timed/vert-x3/docgen.csv b/results/combined/merges_timed/vert-x3/docgen.csv index a840dc9b30..b5debbe32b 100644 --- a/results/combined/merges_timed/vert-x3/docgen.csv +++ b/results/combined/merges_timed/vert-x3/docgen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,0.039632558822631836,0.033168792724609375,0.040204763412475586,0.04746437072753906,0.049410104751586914,0.051752328872680664,0.04147982597351074,0.22783756256103516,0.18182826042175293,2.2788164615631104,0.390169620513916,0.10416269302368164,0.1342315673828125,0.049550533294677734,0.04881000518798828,0.048484086990356445,0.0499725341796875,0.05049753189086914,0.0976111888885498,2.1330647468566895,0.047766923904418945,0.048972368240356445,0.03102874755859375,0.04778575897216797,0.03139448165893555 diff --git a/results/combined/merges_timed/vert-x3/vertx-docgen.csv b/results/combined/merges_timed/vert-x3/vertx-docgen.csv index 90318c63dc..2edbe0a48b 100644 --- a/results/combined/merges_timed/vert-x3/vertx-docgen.csv +++ b/results/combined/merges_timed/vert-x3/vertx-docgen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,0.0450742244720459,0.04598569869995117,0.04983186721801758,0.04212641716003418,0.04552650451660156,0.05417299270629883,0.0391542911529541,0.22362971305847168,0.1682429313659668,2.273361921310425,0.3808627128601074,0.10234379768371582,0.13498997688293457,0.04782819747924805,0.047644615173339844,0.04986119270324707,0.048758745193481445,0.04914522171020508,0.09772205352783203,2.1196210384368896,0.048622846603393555,0.04931068420410156,0.031434059143066406,0.04815101623535156,0.03069591522216797 diff --git a/results/combined/merges_timed/vidstige/jadb.csv b/results/combined/merges_timed/vidstige/jadb.csv index 9fc68f9574..e0f2efc8c2 100644 --- a/results/combined/merges_timed/vidstige/jadb.csv +++ b/results/combined/merges_timed/vidstige/jadb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,6c84fe654222121475fb066fd217db3143fb901a,d3bd5c5ba684549f03086c46c0223f2e968af32b,3db1b31a0c4f5e74503cf43bbdcf1d1dc51b8ab5,,True,True,True,20,61,165,3,True,20,Tests_passed,824287fc2c4692fa431c4bcfee647a51b871eb82fd3feaf20a2544de1ddfd0cc,True,Tests_passed,c473f07bf2bcff4853b65549831a6b7ee9ee89f9fa3a44eb65b9e9ce7af4d29b,True,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_failed,c39b4b16d4b80274439e845e1d3e6354a38ee017172322069881ed869cc08e3f,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,0.05410313606262207,0.03744101524353027,0.06272554397583008,0.05194854736328125,0.057993412017822266,0.06374335289001465,0.03536367416381836,0.2735469341278076,0.16875863075256348,0.04860877990722656,0.5869932174682617,0.11607718467712402,0.15991663932800293,0.06222343444824219,0.06296277046203613,0.06428003311157227,0.06304240226745605,0.06183767318725586,0.12322545051574707,0.0772104263305664,0.05902910232543945,0.05960369110107422,0.04623079299926758,0.06302571296691895,0.044072866439819336 diff --git a/results/combined/merges_timed/vietj/modsh.csv b/results/combined/merges_timed/vietj/modsh.csv index c80b3eed0b..b91e33c6bf 100644 --- a/results/combined/merges_timed/vietj/modsh.csv +++ b/results/combined/merges_timed/vietj/modsh.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,True,True,Tests_passed,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,True,37,181,2394,2,True,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,True,37,True,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,0.019367218017578125,0.019985675811767578,0.0249330997467041,0.024822473526000977,0.02405095100402832,0.024149656295776367,0.026101350784301758,0.05353283882141113,0.07450437545776367,0.6215226650238037,0.6777863502502441,0.09744548797607422,0.13671326637268066,0.06933712959289551,0.06509947776794434,0.06719779968261719,0.06467628479003906,0.06623077392578125,0.10670161247253418,0.6554789543151855,0.057032108306884766,0.06437063217163086,0.05528068542480469,0.05846047401428223,0.052724361419677734 diff --git a/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv b/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv index 8163a90eca..417ed2d7cd 100644 --- a/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv +++ b/results/combined/merges_timed/vijay2win/flume-cassandra-sink.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,38cdbeced79a3299317c1d44123c7e5c60e42a83,c7587b8c301132433d6f7663c31018f9ec44b503,981bd79f59b939b49f342d12b1c00c3805b632a1,,True,True,True,12,22,324,4,True,12,Tests_passed,23aeb5e858e4a85fd9e1f890f98b3be9facc42b5791ec1ba9deec9ef8cf35726,True,Tests_passed,584006bd6823b8480436f8d3d00324548d86af8d085cbf82f2cb42c5fe2547a0,True,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,0.008170604705810547,0.008087873458862305,0.008167028427124023,0.008293628692626953,0.008495092391967773,0.008467435836791992,0.008624792098999023,0.05395793914794922,0.16842985153198242,1.6654281616210938,0.2851221561431885,0.12860584259033203,0.14075922966003418,0.0519258975982666,0.052069902420043945,0.0531461238861084,0.05193018913269043,0.05076146125793457,0.1159677505493164,1.7348556518554688,0.051492929458618164,0.050846099853515625,0.02655196189880371,0.051047563552856445,0.026621580123901367 diff --git a/results/combined/merges_timed/vipshop/saturn.csv b/results/combined/merges_timed/vipshop/saturn.csv index 123279fdb1..77cab09cae 100644 --- a/results/combined/merges_timed/vipshop/saturn.csv +++ b/results/combined/merges_timed/vipshop/saturn.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,True,33,101,2917.0,2,True,33,Tests_passed,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,True,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,True,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_failed,cf6cf5b64dc559b25eb46db144e716e3b701c8c2b055ef3fe12bad3f24df7089,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,0.07315945625305176,0.06657218933105469,0.07694482803344727,0.06779861450195312,0.05364632606506348,0.048409223556518555,0.07526493072509766,0.19193506240844727,0.11674165725708008,1.4250233173370361,0.9253385066986084,0.08862423896789551,0.15086603164672852,0.05766487121582031,0.05910038948059082,0.05910611152648926,0.05715632438659668,0.05865645408630371,0.09876275062561035,1.2756705284118652,0.05860280990600586,0.05653572082519531,0.0459139347076416,0.05674028396606445,0.04541778564453125 diff --git a/results/combined/merges_timed/vkostyukov/la4j.csv b/results/combined/merges_timed/vkostyukov/la4j.csv index f1b3dcaec5..246270eb1a 100644 --- a/results/combined/merges_timed/vkostyukov/la4j.csv +++ b/results/combined/merges_timed/vkostyukov/la4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,965ce08afb0f6e85991ea707d72c97a293b2010f,1229fcf1bec83b678ae8655fac893dc14b8e70ec,4d368a0cb4622b1b99298a3f1d9890e44bd38dcb,,True,True,True,4,6,40,2,True,4,Tests_passed,df72f84ce360854d6c2155728c1ec9accc5c607c68778a1bb3ecb5ef5e03d718,True,Tests_passed,8da09d8986e8ff637f6d693f78be703219038d12af19ba43e5214def4f1c4952,True,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,0.0442049503326416,0.015281915664672852,0.04570651054382324,0.049993276596069336,0.0417637825012207,0.03204703330993652,0.03085494041442871,0.1573173999786377,0.08864712715148926,1.355109691619873,0.6453044414520264,0.08271908760070801,0.14331769943237305,0.0506136417388916,0.05197596549987793,0.051969051361083984,0.05332827568054199,0.0505518913269043,0.0910036563873291,1.310427188873291,0.04981374740600586,0.04900193214416504,0.03930854797363281,0.051595449447631836,0.03993582725524902 diff --git a/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv b/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv index efcccc2444..a3b284e686 100644 --- a/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv +++ b/results/combined/merges_timed/vojtechhabarta/typescript-generator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 43,refs/heads/main,8b71d6eb351b292eb27460955cba6aca5939e3cc,c08bbaae91b9e4b7903b5435796a4956d2ebcff5,8de1ab469c2adbab43ed2c0dd503f2f9918902f0,,True,True,Tests_passed,3a8f423667ee282dd740b01c9105d4369e7bde5522dcbac0fb0d84407679eec4,True,14,57,280,2,True,Tests_passed,16e909dbaa8a76a5445b0bbb1a5a9708bfb65de4d4a14ff795b310d1806ee8e0,True,14,True,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_failed,616f94e44505cfcac52a45ebd33187ac3ea48ec336e3ded9e62876ad1491dbc0,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,Tests_passed,95d9c5be824f8d12e542c8fb88cc24c332dd844b229708695c913d27b1bc2041,0.0482325553894043,0.04230761528015137,0.055707454681396484,0.01957988739013672,0.05772089958190918,0.054230690002441406,0.0130767822265625,0.15918469429016113,0.11407947540283203,0.04871940612792969,0.5788002014160156,0.15534663200378418,0.15544795989990234,0.11441469192504883,0.11697196960449219,0.11544179916381836,0.11667251586914062,0.044255733489990234,0.16898894309997559,0.12160444259643555,0.10180258750915527,0.10069584846496582,0.04445958137512207,0.10478925704956055,0.09774017333984375 diff --git a/results/combined/merges_timed/vt-middleware/cryptacular.csv b/results/combined/merges_timed/vt-middleware/cryptacular.csv index d7e5dbd863..7908fda593 100644 --- a/results/combined/merges_timed/vt-middleware/cryptacular.csv +++ b/results/combined/merges_timed/vt-middleware/cryptacular.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 21,refs/remotes/origin/ISSUE-31+32,beff926fbd2c8940c25922973b25fa29f403375a,236c0a813a83cd2f0db82e3c713c484d0fbef9be,c105eb282f4fd13f11db26207b342e3580646abe,,True,True,True,26,62,1046,3,True,26,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,True,Tests_passed,678b4849bac8b899bf8a78b88b9296570468df858afe01c8db38dd66ff5718bd,True,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,0.03758358955383301,0.0458371639251709,0.052614450454711914,0.05257248878479004,0.05359387397766113,0.04848599433898926,0.02736949920654297,0.23956990242004395,0.14471793174743652,0.03748965263366699,0.5070233345031738,0.11652755737304688,0.15961670875549316,0.0663001537322998,0.05211067199707031,0.05225229263305664,0.0669257640838623,0.06834673881530762,0.11730122566223145,1.4824044704437256,0.06194472312927246,0.06017708778381348,0.0443263053894043,0.059731483459472656,0.042897939682006836 diff --git a/results/combined/merges_timed/w3c/ldp-testsuite.csv b/results/combined/merges_timed/w3c/ldp-testsuite.csv index 4012daced3..7eb822afea 100644 --- a/results/combined/merges_timed/w3c/ldp-testsuite.csv +++ b/results/combined/merges_timed/w3c/ldp-testsuite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 49,refs/heads/master,a7515238ae8139c8d6b2ee7e042183294ca3869f,9f71b5fb60327dce3a35fe585722902387facd37,0a602bc5ba8375d431ae17943031105efccee35e,,True,True,True,3,24,204,9,True,10,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,True,Tests_passed,ab96cdde264ef12327ac54084e02cae4da522374bb1825c9ba952a511ea20d7a,True,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_failed,3a2a72648ba73f8ec331a02fce28c66ca52b8ec24ea80e9d50a70a6135b2c873,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,Tests_passed,b07ff7b9513ae2021210625ad1a96b0b1e1d8658d5f6a66f23ff3ac7ad556cbc,0.0219271183013916,0.052010536193847656,0.03831362724304199,0.040357112884521484,0.03878211975097656,0.03774404525756836,0.03984546661376953,0.10372352600097656,0.03979754447937012,0.03509664535522461,0.7387981414794922,0.05830669403076172,0.13788080215454102,0.04902029037475586,0.04680514335632324,0.0480198860168457,0.04789233207702637,0.04677605628967285,0.06454873085021973,0.06357526779174805,0.04680371284484863,0.049553632736206055,0.03645038604736328,0.04748082160949707,0.03915810585021973 diff --git a/results/combined/merges_timed/wakaleo/game-of-life.csv b/results/combined/merges_timed/wakaleo/game-of-life.csv index e4841d697a..661e0fc731 100644 --- a/results/combined/merges_timed/wakaleo/game-of-life.csv +++ b/results/combined/merges_timed/wakaleo/game-of-life.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,False,True,2,2,8.0,2,True,2,Tests_passed,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,True,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,0.058582305908203125,0.050942182540893555,0.05884504318237305,0.06287312507629395,0.04906654357910156,0.06416487693786621,0.0633401870727539,0.18934416770935059,0.13115763664245605,0.6045498847961426,0.2942514419555664,0.08292245864868164,0.14456892013549805,0.05057549476623535,0.05056333541870117,0.04920649528503418,0.05063199996948242,0.04967951774597168,0.08798646926879883,0.5961484909057617,0.047806739807128906,0.04907584190368652,0.037969350814819336,0.04874897003173828,0.03790926933288574 diff --git a/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv b/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv index d3c0e0c237..914fc5407d 100644 --- a/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv +++ b/results/combined/merges_timed/warmuuh/libsass-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4,refs/heads/master,b0dfdbd7a4774d227a6a5948d44506345ad9d08b,e6325978b1bee1bad13457c5f480228a3de74a85,b5df2be37584aea6c16fea9ec19f522dc98cd596,,True,True,True,6,15,79,2,True,6,Tests_passed,a2bcccd161130e7c75904de293529ef636d286e6086001004175f0107eaff51a,True,Tests_passed,719c603b43304f7de93e239e6485ffbba739ec166552f47083ee3a38f9871a3b,True,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,0.04195451736450195,0.0433809757232666,0.03959465026855469,0.04398083686828613,0.04206418991088867,0.04266238212585449,0.0403292179107666,0.1580033302307129,0.11315464973449707,0.4482738971710205,0.292604923248291,0.06794190406799316,0.11988306045532227,0.03798508644104004,0.03802776336669922,0.037332773208618164,0.03673410415649414,0.03785371780395508,0.06958413124084473,0.45758867263793945,0.03725290298461914,0.037896156311035156,0.026322126388549805,0.037511348724365234,0.026575803756713867 diff --git a/results/combined/merges_timed/wasdev/ci.ant.csv b/results/combined/merges_timed/wasdev/ci.ant.csv index 632709ed90..d8c2f48ed3 100644 --- a/results/combined/merges_timed/wasdev/ci.ant.csv +++ b/results/combined/merges_timed/wasdev/ci.ant.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 74,refs/remotes/origin/pull/37,efb665d50069552d430474f751de1200b18c1ffd,f3495fe4c5c4787e38713e4a970b45f344363cb1,79a92e604d15aa4001563419b192ee44a1aa9bd4,,True,True,True,21,132,856,3,True,21,Tests_passed,f0ae1ad6024d95e54631d8187f67961f3c6dc551c84d1cecc6623c0ae917b667,True,Tests_passed,b1783fc936ea374af8edce8d3f105bc8606aa4baa496c948a4161ccbf2f89fe0,True,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,0.011378288269042969,0.011291980743408203,0.012219905853271484,0.012177467346191406,0.012295722961425781,0.012592554092407227,0.012549638748168945,0.05019116401672363,0.1192014217376709,0.908545732498169,0.5665676593780518,0.10516071319580078,0.14195585250854492,0.052579641342163086,0.05359029769897461,0.05133318901062012,0.05307364463806152,0.05273866653442383,0.10386419296264648,0.9256970882415771,0.05170464515686035,0.052158355712890625,0.03407597541809082,0.05246901512145996,0.034658193588256836 diff --git a/results/combined/merges_timed/wasdev/ci.maven.csv b/results/combined/merges_timed/wasdev/ci.maven.csv index 53142da76b..9761dc3078 100644 --- a/results/combined/merges_timed/wasdev/ci.maven.csv +++ b/results/combined/merges_timed/wasdev/ci.maven.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 437,refs/heads/main,cb3e380ef1b5cba7e829084eaadeaa9fc222a5da,664f0befcf20efb7ee4a6e4ded74b0f77214daf6,58ec62cd460ef1d38c4c19da9d01a959fceacba8,,True,False,True,8,15,37.0,2,True,8,Tests_passed,74d1926cedf2d68e55aea663a30540ad7a5a22e2daff12df4dcf8c92e1ccdebb,True,Tests_passed,42303a1c583040817bbb647e23d37e87da5f7e0246ed3f91af5499e2c0be91c2,True,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_failed,5464bde4a5e39f4afbe1c5cd2070dd8cb2b30cf8faecb8c33bd3b13104c93af8,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,0.05859780311584473,0.052454233169555664,0.06406116485595703,0.05817079544067383,0.058736562728881836,0.047368764877319336,0.03728127479553223,0.18810319900512695,0.12727832794189453,1.590374231338501,0.43297433853149414,0.08393192291259766,0.15573501586914062,0.09566831588745117,0.05543708801269531,0.05630064010620117,0.0584259033203125,0.0541994571685791,0.09570741653442383,1.480445384979248,0.05294179916381836,0.054749250411987305,0.07687830924987793,0.0528712272644043,0.061775922775268555 diff --git a/results/combined/merges_timed/webbit/webbit.csv b/results/combined/merges_timed/webbit/webbit.csv index 8b8ed6ab75..d74d59c0e7 100644 --- a/results/combined/merges_timed/webbit/webbit.csv +++ b/results/combined/merges_timed/webbit/webbit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 69,refs/heads/master,9d2ee1bdfa18f1df22260361a5005f52a5a6934a,474607b64bce97663f3ef42fb8298a4d2973c5fc,f5b8e55ad46b1e8a8f7f303f6deec1f629af98bc,,True,False,True,2.0,13,42.0,5,True,5,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,True,Tests_passed,f4368f73732f333c3a9039a5c8a2499cd3042f744cb0d9d602487e9e32b9f840,True,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_failed,dec7fa63657acdceed2098b975ab809fb4409fd64d6d25bae13a6d10c6c6bb40,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,0.04013800621032715,0.009405136108398438,0.03176283836364746,0.03832888603210449,0.030933856964111328,0.03676414489746094,0.03541302680969238,0.10479474067687988,0.04031085968017578,0.04983162879943848,0.4364025592803955,0.07347512245178223,0.2158374786376953,0.08578824996948242,0.08914804458618164,0.08862566947937012,0.08852481842041016,0.09017086029052734,0.12233161926269531,0.11258816719055176,0.08674430847167969,0.08671140670776367,0.08809971809387207,0.08466863632202148,0.08713269233703613 diff --git a/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv b/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv index 4c3a144a08..19ea106956 100644 --- a/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv +++ b/results/combined/merges_timed/webbukkit/dynmapcoreapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,ac66071a804ee6c7946eabc804948c54cfca6bff,682b3f0dca03e0bc60c929bef9a3d0d29278f34a,905966ed4556fa95ca1df8566c0315bbe8e4120c,,True,True,Tests_passed,ae6436802ce4f311a9102e90cc4296e3a1032213d0cca7251435b24196257806,True,13,43,100,2,True,Tests_passed,1cc4cc7d62b08ada071354d1e4663b68b83d5ce2a48b9b70e479c124113fe24b,True,13,True,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,5d62152f702d53dda4494de09028e26ee60c122a33955a2266d5b04c51fcc0d6,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,0.04529261589050293,0.046320199966430664,0.05116868019104004,0.04583263397216797,0.04642295837402344,0.037297964096069336,0.047931671142578125,0.1682109832763672,0.12474727630615234,0.6643869876861572,0.32213616371154785,0.07017993927001953,0.12395238876342773,0.04027366638183594,0.04100608825683594,0.04003143310546875,0.039536476135253906,0.039972543716430664,0.07282590866088867,0.6896615028381348,0.0395817756652832,0.04009103775024414,0.02894282341003418,0.040291786193847656,0.028415679931640625 diff --git a/results/combined/merges_timed/webjars/webjars-locator.csv b/results/combined/merges_timed/webjars/webjars-locator.csv index dcbbbbce34..2c0fb6a352 100644 --- a/results/combined/merges_timed/webjars/webjars-locator.csv +++ b/results/combined/merges_timed/webjars/webjars-locator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 105,refs/heads/main,15dd8b3a1ab2c18d94d61298070d2cffc27ffe5b,be05d7649c5e2d84cf40e61c04eafceaa9af2939,4d6d1579624536495b3ff568f139e4a524b61659,,True,True,Tests_passed,e842e670ce94390971e192f9f2f5b22e0b47bce88018a7d831f4e5d33968e418,True,5,37,441,3,True,Tests_passed,12fd811e54cb21e34645fdf29fd240cf2861297a084da0732765b5d3ee3f77f8,True,5,True,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,46d2bf5e79e70a5a11c0f511f21e789d0e3de42ef3d82959865fe2cbaa5604c6,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Tests_passed,f8ebb7564e7b42a921c98b15883522585bf4417f84404fe4bfb7ddadec43f630,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,3bf9544ec81ff963b447cec10fafec7e850d5fc07d9123d470f4072c388e49c7,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,0.031907081604003906,0.046518564224243164,0.03914976119995117,0.04486799240112305,0.038720130920410156,0.038645267486572266,0.03802347183227539,0.22913098335266113,0.17231273651123047,1.2847251892089844,0.4041433334350586,0.09033918380737305,0.11624383926391602,0.03881955146789551,0.04555845260620117,0.03956484794616699,0.03980565071105957,0.039951324462890625,0.0858759880065918,1.300234317779541,0.04014420509338379,0.04574108123779297,0.030491113662719727,0.04010820388793945,0.0306394100189209 diff --git a/results/combined/merges_timed/whizzosoftware/wzwave.csv b/results/combined/merges_timed/whizzosoftware/wzwave.csv index 01ff957d3a..b33fe97740 100644 --- a/results/combined/merges_timed/whizzosoftware/wzwave.csv +++ b/results/combined/merges_timed/whizzosoftware/wzwave.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/remotes/origin/issue-24,957ba2027da2ce9a5bf458ec36101136224e2711,f9a9c84695ac50bb8a33092b3cd49ad05dc3a31d,fa8e6835b13278aef2bfd1b0e521c1d0cf096061,,True,False,True,3,8,44,6,True,6,Tests_passed,12d1cdeb5b6905d5e398a04d5362d6197fcd1c92494d4a4f493908da87f23de3,True,Tests_passed,c9c8250933a872e65495d71fc0cb00be4314f1a496f9738831d7d1a6e037160e,True,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,5703d69f10c3c746bc60870267019fff3aa3f5bc75d6079d5dc7b357afd49e71,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,449c1c093127c59e89c225b54eec21af13f6198a683df6eb1afcad6ecb070884,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,d2c1885286beeaecdf8765f731503c3d3cd079fb4820b3a471c8acf1e13ae806,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,0.03492140769958496,0.046927690505981445,0.04199361801147461,0.04085993766784668,0.039571523666381836,0.042749881744384766,0.04192304611206055,0.21908855438232422,0.16547894477844238,1.8683269023895264,0.5518810749053955,0.11188912391662598,0.1210782527923584,0.04922628402709961,0.05001997947692871,0.04637551307678223,0.049565792083740234,0.050287723541259766,0.09786128997802734,1.9142580032348633,0.04790067672729492,0.05056500434875488,0.049001455307006836,0.049276113510131836,0.042644500732421875 diff --git a/results/combined/merges_timed/wikimedia/search-highlighter.csv b/results/combined/merges_timed/wikimedia/search-highlighter.csv index f484f2180f..899c826248 100644 --- a/results/combined/merges_timed/wikimedia/search-highlighter.csv +++ b/results/combined/merges_timed/wikimedia/search-highlighter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,b871bfa5025d79dff5ab9324144558ac61319b47,96cf93e041a289e531e7b2fa54a603926442e700,4ca041a8710fe41d6e6bbba1eb22998c7d9b2537,,True,True,True,7,17,142,3,True,7,Tests_passed,208ed4a9c1f937c1374a6206501fc7100cef30f602e4c7fa45af0e528294228b,True,Tests_passed,999e708a253838913fca82306cd404567920cb874aef1d685b0e028a269e61fb,True,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_failed,f2d7a575857547b3c885db21a66c75decabda15681198fb5565cae123ea58225,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,0.01609182357788086,0.01607346534729004,0.019089221954345703,0.019120216369628906,0.019291400909423828,0.01913905143737793,0.018915176391601562,0.061125755310058594,0.12629008293151855,2.3730711936950684,0.545757532119751,0.12021589279174805,0.15739178657531738,0.05640292167663574,0.06908178329467773,0.06602644920349121,0.05048394203186035,0.06723403930664062,0.11222076416015625,2.4220097064971924,0.06254434585571289,0.0637369155883789,0.04419374465942383,0.061423301696777344,0.046643972396850586 diff --git a/results/combined/merges_timed/wildfirechat/server.csv b/results/combined/merges_timed/wildfirechat/server.csv index 3aa7e4b559..ac08e27504 100644 --- a/results/combined/merges_timed/wildfirechat/server.csv +++ b/results/combined/merges_timed/wildfirechat/server.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/wildfirechat,b4b736c0c4bb6cd344dd9a659364030aa7dc17fa,c4e8c5811c189be2d0c1eabaf6022aefd49e58bd,804b2fc610bb048c05097cf714f4577d64c83bf2,,True,False,True,2,2,4,2,True,2,Tests_passed,c68c12abe918e65aead45ea1c7291c88fd1d757d0ea1bdc726e22faeb04b0b36,True,Tests_passed,a3cd98d9492cab858ab0bf8d310c4f05dea84e175fbe12c0c348622ac2cec037,True,Tests_timedout,110d6e6b6e325d1a4a7926a93a5f6b1cf7bb6f7ab51c23d29eae0899502e5eb2,0.04774594306945801,0.05331110954284668,0.05517220497131348,0.042325496673583984,0.05661821365356445,0.0507044792175293,0.05615973472595215,0.13201403617858887,0.11960005760192871,0.04873180389404297,0.7113966941833496,0.07698798179626465,0.1326005458831787,0.04636740684509277,0.04716992378234863,0.047003984451293945,0.04621577262878418,0.04666328430175781,0.0823984146118164,0.05804586410522461,0.04419827461242676,0.046398162841796875,0.03378176689147949,0.046118736267089844,0.03408241271972656 diff --git a/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv b/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv index 260bb49a4e..728a978e13 100644 --- a/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv +++ b/results/combined/merges_timed/wildfly/jandex-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 24,refs/heads/master,15cf92691e506ecc0f08820c7745c4e922d9a6ea,328a4172c6252066abe263160dbb7d7ac3850e82,bd0d4a8a73f6b72cc8262ac7796c50fe1b7057cf,,True,True,True,7,18,808,2,True,7,Tests_passed,ba67dbe65fabc8c0679f77914bb9bb0ba75efc0dd2c4990ad8a2c2fdc8bf4cc4,True,Tests_passed,e2b1bc8f2a07af67292efcc1945be51206063ed19b81f8da4b1d9c6e203d3a13,True,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_failed,0ddd76de99706a063093fd559615fdf9d3b449e71cb11379bf9da98848a1ef84,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,0.007798433303833008,0.008360862731933594,0.008168935775756836,0.008222818374633789,0.008031845092773438,0.008181095123291016,0.008092880249023438,0.03044915199279785,0.0618433952331543,0.6983485221862793,0.26331567764282227,0.06761527061462402,0.11813092231750488,0.03756523132324219,0.037811279296875,0.036798715591430664,0.03718161582946777,0.0374150276184082,0.06784439086914062,0.7030344009399414,0.03701949119567871,0.0375516414642334,0.026580333709716797,0.03727006912231445,0.026329755783081055 diff --git a/results/combined/merges_timed/winder/universal-g-code-sender.csv b/results/combined/merges_timed/winder/universal-g-code-sender.csv index c864bb880c..a93cf266fd 100644 --- a/results/combined/merges_timed/winder/universal-g-code-sender.csv +++ b/results/combined/merges_timed/winder/universal-g-code-sender.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 448,refs/remotes/origin/pull/2282,b35723447a7acc01274ecf342d6e6c23a506b25f,5672e02762786c40cc2ac2a794d296ddcb8636bc,e1764efb4d2d997bc9939fa72a3fb06561c40403,,True,True,True,11,24,122.0,2,True,11,Tests_passed,c5745a129fddb0f2c287731913a096e4cc800b5e89c05bc1f2c289b37a9f9b3a,True,Tests_passed,04e3d8ac8e2ddade4ced7ae3b62dd3807b807e89448a3c4bf50d4c1616eb3158,True,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,9699335e25831c7f9ef034abfefd8c987fd4b4833785fde0e2aa3b080c242f79,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Merge_failed,09f41f5f9c7e47b2a42e2f3b87aa4d7dae5fb8e84293a97b2d4d36e9adac750d,Merge_timedout,,Merge_failed,94461f0347283d6dc6eb646439a59cc73251ce3c6e09fa8b32297259a14b26f3,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,4796fe634f7b5e6916dd53f45cd555a11c26a7375fb238628607d657d2264338,Merge_failed,09f41f5f9c7e47b2a42e2f3b87aa4d7dae5fb8e84293a97b2d4d36e9adac750d,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,Merge_failed,5880a539bfbdb49c8fdef25cbbdea1552377ae4834245242a2a223fff348a6ef,0.017594575881958008,0.017143964767456055,0.019128084182739258,0.019368410110473633,0.019375324249267578,0.01952219009399414,0.01936650276184082,0.13346433639526367,0.10713791847229004,1.796215534210205,-1.0,0.08807778358459473,0.13370752334594727,0.04932236671447754,0.04843926429748535,0.049849748611450195,0.04966545104980469,0.05012679100036621,0.09065055847167969,1.0146589279174805,0.04770350456237793,0.046968698501586914,0.047144412994384766,0.04884672164916992,0.047884464263916016 diff --git a/results/combined/merges_timed/wizzercn/nutzwk.csv b/results/combined/merges_timed/wizzercn/nutzwk.csv index 0d62afe907..4f1c7afc55 100644 --- a/results/combined/merges_timed/wizzercn/nutzwk.csv +++ b/results/combined/merges_timed/wizzercn/nutzwk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,True,92,249,4046.0,2,True,92,Tests_passed,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,True,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,True,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_failed,fcbb97186af4d68cae18568107d95ea16f3b1dd5e5c7746ce8f5477263d81860,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,0.05518007278442383,0.05664253234863281,0.07776689529418945,0.04841732978820801,0.0557863712310791,0.07007169723510742,0.06670022010803223,0.21561098098754883,0.12298583984375,0.5718934535980225,0.9765884876251221,0.09989786148071289,0.15886545181274414,0.07043671607971191,0.06940126419067383,0.06686210632324219,0.07180976867675781,0.07027554512023926,0.10644674301147461,0.564070463180542,0.06600403785705566,0.06424188613891602,0.05286550521850586,0.0629572868347168,0.05240225791931152 diff --git a/results/combined/merges_timed/wkennedy/swagger4spring-web.csv b/results/combined/merges_timed/wkennedy/swagger4spring-web.csv index 6b8eb964d1..f6a486bc55 100644 --- a/results/combined/merges_timed/wkennedy/swagger4spring-web.csv +++ b/results/combined/merges_timed/wkennedy/swagger4spring-web.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,7dd2733c22ee77c38df42d845c0d43f669528b3d,e47cd3336c793529d944af45d39864995b0a0d9b,705b69c4994795fd6223048f8b7ae501a4f039cd,,True,True,True,10,46,377,2,True,10,Tests_passed,fdaff6f963d2206d94beb989be08e8f0e7132f5b8e9e99018e504f3dd09687fa,True,Tests_passed,3a81822f6b8512b92fd844968ace77ea03934aa29c191ea3fb9a582507e022e3,True,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,c1afb8b861ff4ebd1486869f70809a70518602664e74a9e213e3f720386e8b91,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,0.00908041000366211,0.009594202041625977,0.008964776992797852,0.009395837783813477,0.009104490280151367,0.009166240692138672,0.009153127670288086,0.032154083251953125,0.06394362449645996,0.7360045909881592,0.5428726673126221,0.06865811347961426,0.12260675430297852,0.03860116004943848,0.03872990608215332,0.03954005241394043,0.038362979888916016,0.039490461349487305,0.07200050354003906,0.791729211807251,0.03806495666503906,0.039190053939819336,0.02849888801574707,0.03834176063537598,0.028096437454223633 diff --git a/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv b/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv index 96a9330c28..4aa45fce3e 100644 --- a/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv +++ b/results/combined/merges_timed/wnagele/hadoop-filesystem-sftp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/remotes/origin/pull/5,4251b394791f3e0fd46204502b6a6dccc43dc08d,2132dc226541c0ac0317a6a607688408074498a0,7dec3d9fe4cc308bb0654b315347877cafc10ee3,,True,True,Tests_passed,40d3b11daa126236987ec8f60d93fc346ad89db239d3fc1505c62b84e685155a,True,6,69,379,2,True,Tests_passed,21cbf9e028e10988382431d337e3c54abe6f7d8774edde878b126ecc8b1c0a15,True,6,True,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,81a8f18016ab66dbdbbf6556ac9c94f7694e19eeedb5b13f2210e9cd4d56a7ea,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,83dba2724114e619895d6a4bcf126fd12f6a0ac5088bb989e2a7f669ca0455c7,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,5877e45023ed965509039a48bd7ab6ceaa6ea30677844536a690ca5ac67f35ec,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,0.008591175079345703,0.009990453720092773,0.008712530136108398,0.008523702621459961,0.008918523788452148,0.009684085845947266,0.010998249053955078,0.04060077667236328,0.08302164077758789,1.4124438762664795,0.39698290824890137,0.06784415245056152,0.1092672348022461,0.03172755241394043,0.03223609924316406,0.03172135353088379,0.03183555603027344,0.03132939338684082,0.0602259635925293,1.0614252090454102,0.03227639198303223,0.03324174880981445,0.03109455108642578,0.032217979431152344,0.030670881271362305 diff --git a/results/combined/merges_timed/wnbittle/dyn4j.csv b/results/combined/merges_timed/wnbittle/dyn4j.csv index 73999c03af..788575d5ba 100644 --- a/results/combined/merges_timed/wnbittle/dyn4j.csv +++ b/results/combined/merges_timed/wnbittle/dyn4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,b6c114ea1ff974840b5daa3092732877134ecda2,63f89ed0cd89ddf7076f252e57a585909f931326,0a67375f798efe71e1ec4c5e20348a35962ab0d5,,True,True,True,247,1282,34297.0,37,True,250,Tests_passed,55cedd7301612cbd29284787291e7eb4978585d765b75e4c301cfb6a69771b3b,True,Tests_passed,45e9ddf50076845b8a4c5548a2078ace4239c3a51b4e25a3ec3921994e512552,True,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,75f5aa7d8a5c5de16491c4af76409d532705d73f0d1376932a2b4a7ea83e830c,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,20c66693c31cd2a87805f310e9147b66449be149f1f7083bc5d62241ce65fc5c,Merge_failed,805ebfb3cd846b7986a754e06394b6875856b8e0b0a6a58ffccf46ee78955bc7,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,bed7c8474539c1d2fd0ec65da74f791417ef592f8ac886b389c11178698f546d,Merge_failed,78ad608afd7e5ea8f0b95f568af9d214907c2320ac946500ee33fa1ce6942b09,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,0.06372952461242676,0.0687704086303711,0.06677627563476562,0.06870627403259277,0.08351397514343262,0.07204246520996094,0.07474231719970703,2.592613458633423,2.2393059730529785,32.43512988090515,89.31699466705322,1.2989909648895264,0.4310612678527832,0.3468942642211914,0.35492825508117676,0.3545267581939697,0.3469521999359131,0.34683823585510254,0.9898681640625,30.882814407348633,0.3402259349822998,0.33478641510009766,0.21022725105285645,0.34340810775756836,0.2169933319091797 diff --git a/results/combined/merges_timed/wocommunity/wonder.csv b/results/combined/merges_timed/wocommunity/wonder.csv index 065097c182..d36cdee797 100644 --- a/results/combined/merges_timed/wocommunity/wonder.csv +++ b/results/combined/merges_timed/wocommunity/wonder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,6829a78f8f8a42271eacb3c382d62a60c37c6c81,0cd2aa5aab7ab4a12b830da1a5d0e34136e3eb20,fbf8deff2330de216f21ec24cf390f2e5e189c00,,True,False,True,2,3,8.0,2,True,2,Tests_passed,9e6ffa91ec04b31ad61bdcad765ec90de37bdd721bff2f35b83bb326fb87c0e5,True,Tests_passed,bc61d500a00a1717e7768d0c3cc864c2e9f4eec267c53e112ab2bd04c288381c,True,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,0.08449554443359375,0.057265520095825195,0.106231689453125,0.1076669692993164,0.09912562370300293,0.0887749195098877,0.1087484359741211,0.17799019813537598,0.1332697868347168,2.442981243133545,0.833698034286499,0.1557161808013916,0.2503957748413086,0.12900948524475098,0.1329052448272705,0.13289999961853027,0.12935924530029297,0.13132047653198242,0.21989059448242188,2.324673891067505,0.11454319953918457,0.1158287525177002,0.10752511024475098,0.11701178550720215,0.10684823989868164 diff --git a/results/combined/merges_timed/woder/torchbot.csv b/results/combined/merges_timed/woder/torchbot.csv index bd4fd83d7d..887082b953 100644 --- a/results/combined/merges_timed/woder/torchbot.csv +++ b/results/combined/merges_timed/woder/torchbot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,975c6e38b77419ee259a8f006ef9d342280c90b4,f9b31353053bc3293bf227153a4dbf156c842d9a,edad798eae80caa51a1413172f0101ce03ec2967,,True,,Tests_passed,cff7260d3f4f22d068d2e081599c67ec136280e625053ef0ad8cc6bbd380254a,True,10,22,,2,True,Tests_passed,fe9c192a65a8c9a8388aaac49041e5d08a4b74fc352668c73f3bd40501c46f97,True,10,True,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,8e801544deec94f7faa3c907a1cb327e22175d3683d9d25392318013a8449fcf,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,Tests_failed,f9500ed2f4c611f3596a0c8920a985a14b0819598e68a1e23e41bac4a19a511b,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,ddaf765efdd253ccb8bb4241122e336ad26a9019f6b5fce3f0cb24eb3dc76a12,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,0.029256820678710938,0.026271343231201172,0.061632633209228516,0.04420733451843262,0.04181480407714844,0.04488801956176758,0.01919245719909668,0.17643308639526367,0.1066596508026123,0.03395223617553711,0.5281000137329102,0.10422706604003906,0.15781188011169434,0.06777310371398926,0.06792593002319336,0.0675356388092041,0.06726574897766113,0.06555509567260742,0.10771679878234863,0.08381366729736328,0.06147193908691406,0.06329536437988281,0.06861734390258789,0.06201744079589844,0.0641336441040039 diff --git a/results/combined/merges_timed/wokier/teh.csv b/results/combined/merges_timed/wokier/teh.csv index c8e51f620f..b28862aa9f 100644 --- a/results/combined/merges_timed/wokier/teh.csv +++ b/results/combined/merges_timed/wokier/teh.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 1,refs/heads/master,4291bbd98f8d30d9c9df931de88a54163764af15,8f90b419fa41ac2c4d00f280faaa163fb2316269,5d71673e219de860eef417580d6f93dbe7219ef0,,True,True,True,6,36,194,2,True,6,Tests_passed,0ed4fbb524c7a334573205ea7b3066f81cc588f11619052bca4aa1579120091e,True,Tests_passed,31995b7b6d111cd611f080a7993277384279037be6c34b011d1e4f6e24199f7b,True,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_failed,79def38101000ee453f030a27a17137b9dda63b0e1edb918c73e056307e9b576,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,0.044860124588012695,0.04207134246826172,0.009540319442749023,0.04321908950805664,0.025434494018554688,0.03693413734436035,0.04274296760559082,0.16337895393371582,0.11221647262573242,0.5293869972229004,0.30550408363342285,0.09642267227172852,0.15403199195861816,0.06550979614257812,0.03953194618225098,0.06370306015014648,0.06300759315490723,0.037865638732910156,0.10152864456176758,0.5414309501647949,0.058013916015625,0.03852248191833496,0.05249476432800293,0.058116912841796875,0.027457714080810547 diff --git a/results/combined/merges_timed/wordnik/swagger-codegen.csv b/results/combined/merges_timed/wordnik/swagger-codegen.csv index 1b8224351e..67cc59a809 100644 --- a/results/combined/merges_timed/wordnik/swagger-codegen.csv +++ b/results/combined/merges_timed/wordnik/swagger-codegen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 4005,refs/remotes/origin/pull/2059,71c496e2102ef301d1febb77fd6986e5cb70e0b6,9e50dfe4db8c08b714b26286d7ffb1afd7533fdb,248be5e75aac40c8b412b222bbb546021e1c2ab3,,True,True,True,29,101,1076.0,16,True,30,Tests_passed,c86093eedc0a66d040746fabeb3eaba3a86faa959707e5fb744596748b101d32,True,Tests_passed,0014cd8c033f647ca436b045e6b9d49538cc89489ab3f5046cf5453951aeb976,True,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,4339c6de10bbc5268a35268fad2bd8a9ffcd7d2e70e9b427d67926c2411e4722,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,09518d85fd78fc02201c498acb28574b34eb691c72de2f176e669cb6af401263,Merge_failed,c86b1c44344f4414ad81d9f6fde1afffd5909361a1084fa3b483630670eb36e2,Merge_failed,5e3063dc6983c06353ea4d83ef8b52d72378a213325d49d2c78dc424f55c9d02,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,08acaf257e651013d911a9023ba51d09cdcd2a1c24556a08c69ac294b2e17362,Merge_failed,39c070cfb99752e17fa6bde519fc35d81984a22f80eb3cb7d0d172aad341cc35,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,Merge_failed,c912345228c53ba76ff9ab7c058a381912d69d2fd8122367ed9dc3f359c153f8,0.06907415390014648,0.06562185287475586,0.0764780044555664,0.06424069404602051,0.07636642456054688,0.06364774703979492,0.07616043090820312,1.171959638595581,0.8724992275238037,4.947203874588013,0.5238676071166992,0.46207690238952637,0.18291974067687988,0.09942817687988281,0.10076355934143066,0.10069155693054199,0.10148906707763672,0.10126352310180664,0.3533458709716797,4.946407794952393,0.09996223449707031,0.10096192359924316,0.09968185424804688,0.0985870361328125,0.0985403060913086 diff --git a/results/combined/merges_timed/wsky/top-push.csv b/results/combined/merges_timed/wsky/top-push.csv index ad1d9030f2..7920b652be 100644 --- a/results/combined/merges_timed/wsky/top-push.csv +++ b/results/combined/merges_timed/wsky/top-push.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,9867decdcc897cc8538400054ffa3c2fde517cc0,37da8398d50cf30b90d81a0245f989d85fe1a534,f0fad16e227c00a986cebb5919b2ef9cd2b5e114,,True,True,True,8,30,165,3,True,8,Tests_passed,fac2c1b6ea7d391b3bc039ddf354e6dbbe37fbed34d89c34c5a610821cf897e2,True,Tests_passed,f6109671b473744080bca0224a8175e4d4063cb85dbabea311a709d1e04fbb5a,True,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,97327f0437154f64909b44ad5ceffa8bff0a1c4af95cf36461975589354b15f7,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Tests_passed,fa245b0623251d0f8e5ef8cb95295088e3e0e4b0aa629d7fcf95e128016896b1,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,eee4151a19b24c2cd7adb270c4b8d7d2509f4c171f3c07940a8bdda0e90471bd,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,0.011473655700683594,0.01157999038696289,0.012828588485717773,0.012625694274902344,0.012850761413574219,0.012777328491210938,0.012888908386230469,0.05435991287231445,0.12476992607116699,1.0732040405273438,0.40987682342529297,0.1185302734375,0.12930631637573242,0.04903388023376465,0.04835796356201172,0.047487497329711914,0.04596710205078125,0.04760003089904785,0.09432363510131836,1.1251227855682373,0.04707741737365723,0.046721458435058594,0.03821372985839844,0.04658341407775879,0.03916144371032715 diff --git a/results/combined/merges_timed/wstrange/googleauth.csv b/results/combined/merges_timed/wstrange/googleauth.csv index f7af9b1f75..5294a00c7a 100644 --- a/results/combined/merges_timed/wstrange/googleauth.csv +++ b/results/combined/merges_timed/wstrange/googleauth.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 41,refs/heads/master,bb6e4a0c6f4c595a93bcd3b06c05d0c55df8e365,ba8ef98003e0d88ad03b458469c00820482cf3a9,faf4deeade71408fa33bc8030ace85bf7b791f16,,True,True,True,9,51,576,4,True,9,Tests_passed,a178687b0494ce929058cea330860811825bc49d857294e4a2980421ec6f42a2,True,Tests_passed,7110f678829647334a2739db4aadf76582173dd04d5730a18d9ad874958e307f,True,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,46e5360d5e0b97e8ab490a0e058a30f201ae3c7416a3bcc35588a3d877bdc366,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,b7b09533a02d3bd79e8b8d118e8969bf2c90a14c6ba064c4ef727a1da4a19874,Merge_failed,23fd23fd6da1a2008375ab3d36ffc27a36fb41dba4d3b348659010777416a5e6,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,97ba6b02f06cfe9caca51c4302542d7f84d05591294876d314ec8639b625b3b5,Merge_failed,bdc974ca89cbcb38fca6dacb00f0cb94baea8f233b8494477f6c46dca7c59236,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,0.04676532745361328,0.04135274887084961,0.04450058937072754,0.04259228706359863,0.04786276817321777,0.029761791229248047,0.04519939422607422,0.3025088310241699,0.24462652206420898,1.4528205394744873,0.48685479164123535,0.1351182460784912,0.129319429397583,0.048760414123535156,0.04918503761291504,0.048845767974853516,0.048862457275390625,0.049566030502319336,0.11128592491149902,1.396472692489624,0.047989845275878906,0.049460649490356445,0.04021906852722168,0.05006694793701172,0.04068136215209961 diff --git a/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv b/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv index d690535002..e8cbbd80b9 100644 --- a/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv +++ b/results/combined/merges_timed/wvengen/proguard-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 134,refs/remotes/origin/pull/76,14a73cb57b51b49248c3f76c52d97c311dd7a4c2,10e134245825a25842e170ec12c08c99b86b261c,566f6b3a1cf6c52c902e9c2f1b8fdce0281f72c1,,True,True,Tests_passed,63c8c47e67f9341d3e086d4023201ce8803c54d0bef75d8a5d62c191f157cbc7,True,10,61,417,2,True,Tests_passed,38ba3b34cc141cead979862489112bc5bca6c07176d8260aead8883ab5ea3e46,True,10,True,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,0e7ed1f1cfc0d1e78d3c62d2b0e44b90692bd34e8a64e779d2b8cad0c5d8996e,Merge_failed,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Tests_failed,0196e41d548edf4dea7a0b1396f358cf7d01cf85a791445f6fe4e38c4f1b2147,Merge_failed,52111320e2a374679cd7d1dcb43c883464af176e0f5aa64ef53146f8897bc92f,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,e1f7c8068bd945f1af9ed97a021c887abc360b9d8332994bee886aeeac68f356,Merge_failed,cd84e1e1b7244b232716313ed8d219508e07fc4a7b14313b079372e07b5032eb,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,ccb7f26df8681a25c9dc7c6a7d77dee74207eab09ce2479f136257743edf6d4e,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,Merge_failed,dce6cd457c2db45af1ea92e653de4cd332b41dfabd302a514bbb4070fab66bd1,0.047963619232177734,0.04803180694580078,0.043988704681396484,0.037221431732177734,0.046434640884399414,0.04266834259033203,0.03987264633178711,0.17411375045776367,0.11956381797790527,1.511155128479004,0.5130455493927002,0.06538176536560059,0.1200566291809082,0.03534531593322754,0.03565406799316406,0.035585641860961914,0.03507423400878906,0.034671783447265625,0.06657171249389648,1.408616065979004,0.03508186340332031,0.03535127639770508,0.03368997573852539,0.03540611267089844,0.03400683403015137 diff --git a/results/combined/merges_timed/wwadge/hbnpojogen.csv b/results/combined/merges_timed/wwadge/hbnpojogen.csv index 27509655cb..6ea920ff10 100644 --- a/results/combined/merges_timed/wwadge/hbnpojogen.csv +++ b/results/combined/merges_timed/wwadge/hbnpojogen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,16f458ccc0b3675ec72a298481794ed4afd70666,583f67a93208929c28782528af94a6befa838c22,c05e424bdf26cc9587415dc1b34ac3628e6f0ea0,,True,True,True,11,22,136,2,True,11,Tests_passed,a8cbd141c88bbc428d841e90389995c171fe8021b35d1d0f6e6c75b6d96841b6,True,Tests_passed,5c9430292c82a9aa7a9bb357c563cef9def1a24418578eaccb2fc6617a018e1c,True,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Merge_timedout,,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,0.05835318565368652,0.053958892822265625,0.05819058418273926,0.024224281311035156,0.053214073181152344,0.03547549247741699,0.03730201721191406,0.18923687934875488,0.08883547782897949,2.1661458015441895,-1.0,0.09300088882446289,0.15964627265930176,0.06305503845214844,0.06381821632385254,0.060828208923339844,0.05732369422912598,0.05888938903808594,0.0994253158569336,2.0098328590393066,0.04707741737365723,0.06040167808532715,0.04979372024536133,0.05928206443786621,0.035767555236816406 diff --git a/results/combined/merges_timed/xaverw/msearch.csv b/results/combined/merges_timed/xaverw/msearch.csv index 94276b8f07..cd704edd91 100644 --- a/results/combined/merges_timed/xaverw/msearch.csv +++ b/results/combined/merges_timed/xaverw/msearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 5,refs/heads/master,ab544f9464acace234ed164113e9d6fc42fcc898,cd770473148aa5a7de33b3505b2257416a605c55,285cd0684d635bc4f6288be7b66d5513ff2f5268,,True,True,True,3,18,67.0,2,True,3,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,True,Tests_passed,cb4d57b07771831aa03da393176ab13571fa7b995235e5419b3e5b6c9fb01a0e,True,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9d45eb1f4284a70a3e4093ab5cf1141ba1bc8e1014bf1976e7c125d7b9b71ed2,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,bb84efae233f35826bd693c5510ffe64c92afef91b86b6605c058b565e989171,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,742dd1747c3c2a5f283fd7000a032eb92c067b5964edcf85752f664c30968015,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,0.03905344009399414,0.04337596893310547,0.035262107849121094,0.031200170516967773,0.045031070709228516,0.04102492332458496,0.03164958953857422,0.18196439743041992,0.12399411201477051,1.1821303367614746,0.4678459167480469,0.07725071907043457,0.1185309886932373,0.03691911697387695,0.03599190711975098,0.03519415855407715,0.035985708236694336,0.036131858825683594,0.06975889205932617,1.0989773273468018,0.03740429878234863,0.03758811950683594,0.03601694107055664,0.03574824333190918,0.035521507263183594 diff --git a/results/combined/merges_timed/xceptance/xcmailr.csv b/results/combined/merges_timed/xceptance/xcmailr.csv index bf0d0b13fd..3606808b90 100644 --- a/results/combined/merges_timed/xceptance/xcmailr.csv +++ b/results/combined/merges_timed/xceptance/xcmailr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/develop,d2595e205ca2e2c05d51c0005d2a0a476346a766,57b3825589b9a4df633d45657f2f19b1aae327ab,e0e4311c3dad42818e9d6069f6a2234fd2dcf42c,,True,True,True,22,65,597,6,True,24,Tests_passed,e640551537f04f760b1f31e060acf3edeb744f3db132a70947b1dbf55fc86be9,True,Tests_passed,5cf7025ad9cd77670ad2b8f14758f387218dbab9ddaf72f3f23042a63c3bf3a9,True,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,aed7a1d9ca44ad3c06853689b0351782dfecb60680ff99fa34defaa077bc7da9,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,477173b308636e58d923a33ed366217d68443569a734cc900f24504318a22b1c,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,b85a9e782ffab18630979a93c23d353d1efd3ee2a5b85879ab7fcc7106664402,Merge_failed,26094e3bc6a080df84e924db09e7e7374d4b6bace096c7234f2983178a7e2803,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,0.06205415725708008,0.06223344802856445,0.07507705688476562,0.06677532196044922,0.04774165153503418,0.07446432113647461,0.07465314865112305,0.16774606704711914,0.21636247634887695,1.067270278930664,0.5284194946289062,0.15092158317565918,0.1346743106842041,0.054395437240600586,0.12848258018493652,0.1378769874572754,0.12951946258544922,0.13229918479919434,0.14818668365478516,1.1485166549682617,0.12299442291259766,0.1255478858947754,0.12386608123779297,0.12368416786193848,0.12714529037475586 diff --git a/results/combined/merges_timed/xebia/xebium.csv b/results/combined/merges_timed/xebia/xebium.csv index 4d76e4b203..b51db8bded 100644 --- a/results/combined/merges_timed/xebia/xebium.csv +++ b/results/combined/merges_timed/xebia/xebium.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 16,refs/heads/master,2808ba14a8b8932184099d8a63e9c5a4d69d6a25,5741e34076818d5ab03d55067a60a4a9db37a064,3a99245672b2f98fe3de5600d1012e2625201edd,,True,True,True,17,26,1083.0,2,True,17,Tests_passed,4fea512beed85924066989703783ab13254da091cda925f5ed2852253fb602af,True,Tests_passed,d8b3cef5ffdc8707665176455fa4c806a7f94cd22a6a82fcd9fd6ab724e940da,True,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,11fbe24fb046172c5104ad8794af73d3d6d8b91373c573e5395619cdc1492c4e,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,0.05892348289489746,0.04136180877685547,0.04996514320373535,0.04343986511230469,0.0494232177734375,0.04474925994873047,0.044936418533325195,0.17433571815490723,0.07441997528076172,1.0687639713287354,0.3715245723724365,0.08334851264953613,0.13646721839904785,0.04816579818725586,0.050567626953125,0.050991058349609375,0.04938650131225586,0.04972577095031738,0.08476376533508301,1.0164098739624023,0.04719996452331543,0.04493117332458496,0.03786325454711914,0.04488730430603027,0.03641390800476074 diff --git a/results/combined/merges_timed/xerial/sqlite-jdbc.csv b/results/combined/merges_timed/xerial/sqlite-jdbc.csv index c0ddb8af9e..23fac43af2 100644 --- a/results/combined/merges_timed/xerial/sqlite-jdbc.csv +++ b/results/combined/merges_timed/xerial/sqlite-jdbc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,1b28e87bebefd5dd7deb7b0712e2ab5729a363e8,60bcbe8753b72abdabdcf203381c7615e7df499c,a987e5deb8ee1c54c747ef5c364c83cb2425a8a9,,True,False,True,3,9,46.0,2,True,3,Tests_passed,90b3f767992119fe56afe43f9484afc247cc18627578d400bf1310ab5c2c153e,True,Tests_passed,21877632a27041a36fff6fb23c59ac8be08845afa59e64876c2c7fbb23a88662,True,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,0.045928239822387695,0.04534125328063965,0.013927221298217773,0.03855538368225098,0.053664207458496094,0.054592132568359375,0.014462471008300781,0.1858205795288086,0.07611298561096191,2.214717388153076,0.6627154350280762,0.12476158142089844,0.23713970184326172,0.24093341827392578,0.24532842636108398,0.2511148452758789,0.24853205680847168,0.2431628704071045,0.22509193420410156,2.173715353012085,0.22829556465148926,0.2287001609802246,0.23687362670898438,0.22838449478149414,0.24822640419006348 diff --git a/results/combined/merges_timed/xuxueli/xxl-job.csv b/results/combined/merges_timed/xuxueli/xxl-job.csv index ddc8d73dc3..f677ca9ad7 100644 --- a/results/combined/merges_timed/xuxueli/xxl-job.csv +++ b/results/combined/merges_timed/xuxueli/xxl-job.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 283,refs/remotes/origin/pull/529,ae3ba5571a06adf8fd231cea40241a11d4c3f651,60bfd95c8f4c60a17b326a5d7885955e66d521eb,f24df15ddb82b839ce2e1ea0ae16c75bb408617a,,True,True,True,27.0,47,898.0,3,True,27,Tests_passed,d24396fdf7e038af858c2f8b3b657fb4357093285d506579e71cb5b920b274f5,True,Tests_passed,6d5828dde6df6dea4360927268532dec1899ca458a81b058db0de73729b0ae6f,True,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,ad2e3b11530a2edb74fac316cf33a347ca215fd9ade51399b20b86d2594c7b6a,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Merge_failed,b7250a57fe7d1d96996eae558ab57b35e2b26b94114f698222e4d5b4a69c7da9,Tests_passed,06f3af2ced0e43eced819f2f52d56e0c7e7515601cd7034447e1018f0ca0ea3a,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,99660803c3f30561c9a15098919d0555e4f046b4dcf2a83566021da4b94c08a4,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Tests_passed,05fe509e5ffaad87fd8209fb00ae2985c2162f8410ee5863489d50f9a9edaef1,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,Merge_failed,e905082d45f3e6316db14aa2b5c9ed1f684c91b93d65c2301373e452977d02a3,0.05978679656982422,0.06105756759643555,0.04837965965270996,0.03770732879638672,0.07230377197265625,0.07218217849731445,0.047579050064086914,0.06858587265014648,0.17415165901184082,0.01564788818359375,0.6454758644104004,0.2332913875579834,0.1787090301513672,0.11961889266967773,0.16562676429748535,0.13027286529541016,0.12526440620422363,0.12462806701660156,0.2071704864501953,0.14849591255187988,0.11376714706420898,0.14983701705932617,0.11324000358581543,0.11660099029541016,0.11654114723205566 diff --git a/results/combined/merges_timed/yandex-qatools/ashot.csv b/results/combined/merges_timed/yandex-qatools/ashot.csv index b8ad254382..79c8e77ff4 100644 --- a/results/combined/merges_timed/yandex-qatools/ashot.csv +++ b/results/combined/merges_timed/yandex-qatools/ashot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 74,refs/heads/master,c885c16709720ca016eeaad7056c0a39a9490878,3f0f936d5420486e0fc81188a8b910efd658d527,c4dd51684fd9c41c3007a2738ea5956eb3de894d,,True,True,True,6,12,51,5,True,8,Tests_passed,fe30a35cebd8fd18b96194edc73b49b9ee0f724aa8c4e548f7bc6022c2d7eceb,True,Tests_passed,5241c4d02046c03f064e714c909160493feca3f1ecf6295fbcf1403682a0890f,True,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,de3f02302a8699e9a6cc8fcd5ce44d8a36e0620929858d65cbe60bf0f47b20fc,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Tests_failed,a09182471537a72fa3bff2dddf834528c4e38be5fcb84877045fc9b1833c05d5,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,961403e5712aa0c40d7041f5ad661b8791c0baae6adfaaed6276fb9d19991d12,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,0.010593175888061523,0.010580301284790039,0.010961771011352539,0.011276960372924805,0.011044740676879883,0.010965585708618164,0.010863304138183594,0.05048847198486328,0.12567710876464844,1.3154582977294922,0.4201514720916748,0.11066174507141113,0.12615108489990234,0.04651618003845215,0.04615926742553711,0.04615592956542969,0.046205759048461914,0.04722166061401367,0.09240317344665527,1.3657236099243164,0.046028852462768555,0.0453181266784668,0.045226335525512695,0.045648813247680664,0.04481101036071777 diff --git a/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv b/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv index ab46b1d1e0..b7f44b5c2d 100644 --- a/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv +++ b/results/combined/merges_timed/yandex-qatools/postgresql-embedded.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 30,refs/remotes/origin/pull/82,a3c37f7112acccd27f2c75daa7c0414fa495845f,b07cc8784d865c964493bdf10d4180719cf2c825,c9281552120f7d0ffb2b5a487e4f4cdb4138fe19,,True,True,True,11,60,305,2,True,11,Tests_passed,ca95662991c6369583c4236a41049b9b1551eacd2beecd145668229f90d75304,True,Tests_passed,9e1fb8c13cd003c9648748e88fb969fab05fbc039dad492b0bc05fe8c3e05465,True,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,7dba4a92afb17ea3d8b9fbca44eba5f21a698c99fc60682b6a1857e217bfd121,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Tests_failed,24ab39477d327cf5f0f9ae824bb5a7d02ea1cdb17ec98e90a0aa54e3c0292cd5,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,858b8a296a72be5a6e0298fc8e5c0ab82c2c259d50647ab057bcf1f2d1e12efe,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,0.009865522384643555,0.009993553161621094,0.009551763534545898,0.009876489639282227,0.009877920150756836,0.010052680969238281,0.009794950485229492,0.03475666046142578,0.06993818283081055,1.1524724960327148,0.6973512172698975,0.07261204719543457,0.12146282196044922,0.03598642349243164,0.03659558296203613,0.03595590591430664,0.035773277282714844,0.03565812110900879,0.06790542602539062,1.1550524234771729,0.0355224609375,0.036289215087890625,0.03427314758300781,0.03610515594482422,0.03441619873046875 diff --git a/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv b/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv index d7bb390b29..8212139d3d 100644 --- a/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv +++ b/results/combined/merges_timed/yannbrrd/elasticsearch-entity-resolution.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/remotes/origin/1.2,5bf2597661014520aa35d0746d813bc012422c8c,33e6486562edeec6be5e0a90c6e7c868bd94381b,618ea967aaf811d96411c1ae2d921593de57446a,,True,False,Tests_passed,3d0810c58349314c5d970dd2c552f45a4be8836cdb5e2ab031cb6b788856009c,True,3,5,10,3,True,Tests_passed,9b8fe86f95fecb955372aee2fab01b5e27f066ceda4c1ef385a90bd58cdd3849,True,3,True,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,9a4244f358a7427417fbb4a913c1380cb724db529f7e85f3094cd47b323818ab,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,003deaac3ed01e8d7dc15fd6ac8ee03bf9da6050f54bf3186a10513b6bed854d,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,0.015785694122314453,0.04281473159790039,0.04190349578857422,0.04496431350708008,0.03847336769104004,0.04178738594055176,0.03984570503234863,0.23376226425170898,0.178663969039917,0.04440665245056152,0.2235267162322998,0.09919595718383789,0.12167859077453613,0.04242444038391113,0.04236245155334473,0.04137706756591797,0.041423797607421875,0.04157590866088867,0.09017729759216309,0.052855730056762695,0.04077863693237305,0.041346073150634766,0.03366279602050781,0.041733741760253906,0.0336298942565918 diff --git a/results/combined/merges_timed/yaphone/itchat4j.csv b/results/combined/merges_timed/yaphone/itchat4j.csv index 728aa13bcd..bcca9c5039 100644 --- a/results/combined/merges_timed/yaphone/itchat4j.csv +++ b/results/combined/merges_timed/yaphone/itchat4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,True,8,26,294,9,True,16,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,True,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,True,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,60e126a60599e44309d3ff50c6008481b1e9c8ed0eccefe7f350eb3a71814fd6,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,0.041831016540527344,0.048271894454956055,0.03961300849914551,0.04330134391784668,0.03619885444641113,0.041841745376586914,0.04855966567993164,0.161484956741333,0.1192479133605957,1.3738751411437988,0.6013927459716797,0.07234501838684082,0.1270756721496582,0.040940046310424805,0.043781280517578125,0.04110431671142578,0.04115462303161621,0.04044055938720703,0.07561659812927246,1.3273839950561523,0.04048657417297363,0.04233384132385254,0.03050994873046875,0.040802955627441406,0.02845597267150879 diff --git a/results/combined/merges_timed/yegor256/rexsl.csv b/results/combined/merges_timed/yegor256/rexsl.csv index 3e53c4d744..72058001a0 100644 --- a/results/combined/merges_timed/yegor256/rexsl.csv +++ b/results/combined/merges_timed/yegor256/rexsl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 12,refs/heads/master,0c8dac7b6c144a3f260a7ebcc1367f9b1efac767,caab13af375e8059b2bfcaeb1af74d0b167f5d56,3dd37ca97a34b46cbd1185d9ec78bc0484f86497,,True,True,True,123,174,1505,2,True,123,Tests_passed,efa53ab5735db2aa4dfa9eabd58f983054d92c643607d66a704557a122eff0d0,True,Tests_passed,0113baa9e2be37aba416881b8dc77c0b4e0d4a0d69322a9066c6f35fa2aecc15,True,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_failed,ed636813ff8dc0381591bc5434fd4e1d16874f5d0b0394e6bec571aabad722f0,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,0.04503488540649414,0.04123234748840332,0.061663150787353516,0.0438694953918457,0.07154345512390137,0.04764103889465332,0.051438093185424805,0.18664884567260742,0.11896014213562012,0.05459451675415039,0.8308706283569336,0.1084754467010498,0.17278528213500977,0.0711526870727539,0.07352590560913086,0.07442569732666016,0.07235908508300781,0.07394814491271973,0.11396479606628418,0.08561205863952637,0.06700587272644043,0.06806278228759766,0.06309628486633301,0.06802511215209961,0.06093955039978027 diff --git a/results/combined/merges_timed/yegor256/xembly.csv b/results/combined/merges_timed/yegor256/xembly.csv index e0c00e02c7..9e540ce1b3 100644 --- a/results/combined/merges_timed/yegor256/xembly.csv +++ b/results/combined/merges_timed/yegor256/xembly.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 20,refs/heads/master,e279293590e9d10fbd09353bd505e6f97a060c8d,f058e1333921e0446563e5da54b16fbc6552832d,35385af641c110c21c0b6af59835b9370a5d674b,,True,True,True,69,264,2406,3,True,69,Tests_passed,2ae3bb884a481812716afec81dd4f72536ed652da690448883864a80c18dec35,True,Tests_passed,94eb3887b406f32733b84e93944f71dcf3f36fd960c918b9180870b2c4f1f16c,True,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,0.06286096572875977,0.05670046806335449,0.060605525970458984,0.06630587577819824,0.07490921020507812,0.07285356521606445,0.05457878112792969,0.2848944664001465,0.1720104217529297,0.053894996643066406,0.5670633316040039,0.11999106407165527,0.16172385215759277,0.06522727012634277,0.06607890129089355,0.06536340713500977,0.06602931022644043,0.06525993347167969,0.12508058547973633,0.07700991630554199,0.06445646286010742,0.06328487396240234,0.0473020076751709,0.06328701972961426,0.04704427719116211 diff --git a/results/combined/merges_timed/yfpeng/pengyifan-commons.csv b/results/combined/merges_timed/yfpeng/pengyifan-commons.csv index 9a559edb30..0123062c68 100644 --- a/results/combined/merges_timed/yfpeng/pengyifan-commons.csv +++ b/results/combined/merges_timed/yfpeng/pengyifan-commons.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,12b4284589d4f1e0461def2ab4b95e07f51ad9f6,495932109e40fc131106c796bcb3357b3549b286,8292eeb7786230f3b080ff8b29868eea46a0d6d0,,True,True,True,15,39,86,3,True,15,Tests_passed,e10885075e953e4c4f2f35796af07521e202243ee79b80079ba91b7fa0d8057e,True,Tests_passed,7c1e8134a2ec2052b46ea435402026f23d79db6dba164631bd53820ed1359cc0,True,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Merge_timedout,,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,0.047850608825683594,0.054338932037353516,0.04835200309753418,0.05653047561645508,0.0469362735748291,0.047505855560302734,0.05023479461669922,0.254378080368042,0.17200541496276855,1.9539625644683838,-1.0,0.10748767852783203,0.1362314224243164,0.052240848541259766,0.05259418487548828,0.05131220817565918,0.05239105224609375,0.05366206169128418,0.1021263599395752,1.8715786933898926,0.051212310791015625,0.0525662899017334,0.033422231674194336,0.05102276802062988,0.03389620780944824 diff --git a/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv b/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv index cbc98b87a1..9598f6dea8 100644 --- a/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv +++ b/results/combined/merges_timed/yfpeng/pengyifan-leetcode.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,bb9b165e9b6f5db5725394be827250f61e87b71a,307fe1c63dac2e5049efdf21a478ed577fe1ed66,79216680be9c17f819e516efb5c9dfd210dad720,,True,True,Tests_passed,7389c76b28bb8988108f02d3f429c9a276769fc94c3b5b47a4382b34d600ac87,True,13,15,334,2,True,Tests_passed,732cba39f762d73abe26fcf138efdb5d481f7589c86d81d831d0f4957a95da99,True,13,True,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,f4e97aae0be0b94aeaa440bc929d863e40d627c3b89dc4449bf29ebf88247f12,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Tests_failed,5fc08050b0aecaa0915a9369f0745dda6f451f9da36dffc1487af0b7b18fc25f,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,a1e561e0e5a53bbe5c1e80806ed869fb91310b89b463b863961aa1df839d0e53,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,0.042832136154174805,0.042839765548706055,0.03577995300292969,0.03447747230529785,0.039369821548461914,0.03593921661376953,0.04081106185913086,0.17174267768859863,0.11858630180358887,0.42534947395324707,0.24170494079589844,0.07050776481628418,0.11253142356872559,0.03424859046936035,0.03366971015930176,0.034520626068115234,0.03387308120727539,0.03295183181762695,0.06525349617004395,0.41931605339050293,0.0342862606048584,0.03419089317321777,0.033022403717041016,0.03424787521362305,0.03232264518737793 diff --git a/results/combined/merges_timed/yinlou/mltk.csv b/results/combined/merges_timed/yinlou/mltk.csv index 9ecfc4cd55..8a4a654d54 100644 --- a/results/combined/merges_timed/yinlou/mltk.csv +++ b/results/combined/merges_timed/yinlou/mltk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 6,refs/heads/master,d8ba61b83ab596ce5a69819325449353409fe333,1e2122a2841cd7ebe466af889c6e69ff6361864d,2fad94a58127f000fdcb9674e1c9a4591e23fd09,,True,True,True,43,80,184,143,True,144,Tests_passed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,True,Tests_passed,dd3673f125e6e0e5f6681bd64cdfa150aaca6ecccb350eeb99cd597ba33682d2,True,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,1034c047b0d0605bda212c41dec63863dd9b110b2a96df63a89d8ea6d35d9028,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,0.06792473793029785,0.0612025260925293,0.055242300033569336,0.05859208106994629,0.0596160888671875,0.03842973709106445,0.06410479545593262,2.7300796508789062,0.19652986526489258,1.1095428466796875,1.0381956100463867,0.28051304817199707,0.29820966720581055,0.22015690803527832,0.2192237377166748,0.22083830833435059,0.2166891098022461,0.22106719017028809,0.9025058746337891,1.3397512435913086,0.2136223316192627,0.21364164352416992,0.04830002784729004,0.2106928825378418,0.04680776596069336 diff --git a/results/combined/merges_timed/yinwang0/rubysonar.csv b/results/combined/merges_timed/yinwang0/rubysonar.csv index 6eba540257..181073566c 100644 --- a/results/combined/merges_timed/yinwang0/rubysonar.csv +++ b/results/combined/merges_timed/yinwang0/rubysonar.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 15,refs/heads/master,fe4005af961bdc19c4f47fd0d60dbea83278b782,b216073a1f42d7eca77a755a5ca50289a7138606,1f10f0ded03292220c69999e0577a96026569dc5,,True,True,True,35,222,1323,4,True,35,Tests_passed,738502cdf6141889aa60d232a8b2b18fc3864f82cad46ea9c1a5ea2370fb35b8,True,Tests_passed,2f8655afdab831f4045ae6d708c557be0de01a5fc7273ee4181a49ee634144e2,True,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,8a03a5db56d203fcff8d452dcea1142fcd33ad1a7ac5fd52571ec0df5994d0e4,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,1bd907e6d2991ac94e9c7e31203e84893631e1a0217e815942d7b67b6f261e33,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,c1ed7d37cdf7cb670516863274cc11adba961ffbb04479f2be7a94fee57ac598,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,0.040146589279174805,0.018051862716674805,0.015120983123779297,0.05376768112182617,0.02375006675720215,0.05970931053161621,0.04673409461975098,0.22001910209655762,0.17007827758789062,1.3007075786590576,1.0780589580535889,0.15657401084899902,0.14014601707458496,0.10235071182250977,0.05687260627746582,0.09527730941772461,0.09760928153991699,0.10252618789672852,0.14200711250305176,1.3537967205047607,0.09509873390197754,0.08996129035949707,0.09354448318481445,0.05630135536193848,0.09515619277954102 diff --git a/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv b/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv index faafe1c2f6..2eba255df1 100644 --- a/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv +++ b/results/combined/merges_timed/ymnk/jsch-agent-proxy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 7,refs/heads/master,be10f22b86225a1829a2ff4074580f1a0482a5af,939214e7588fdf67c6efddaf4ad33b869fbd8146,4dd2606f9629045e4fd93c424e706d40bfb73cb3,,True,True,True,8,10,233,5,True,10,Tests_passed,20e66fcda3a3c4469312b95fec33cc22fda7755a2892418a7e645c8ca90150b4,True,Tests_passed,4827da6cc889d3a053eb6d882d30754efff45091167de6f34709f88045fda768,True,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_failed,4db7da193569eeaa2f9f47b2b2a0c027ebdc6c795b20d0889a7fdefbfedcf8ea,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,0.044097185134887695,0.0442967414855957,0.04829597473144531,0.05019235610961914,0.049395084381103516,0.04402923583984375,0.04138898849487305,0.2341747283935547,0.031717777252197266,0.04310917854309082,0.29298877716064453,0.04877042770385742,0.12923145294189453,0.04236316680908203,0.04273104667663574,0.04251241683959961,0.04234051704406738,0.04187750816345215,0.08370494842529297,0.0558934211730957,0.0411074161529541,0.041754961013793945,0.03060746192932129,0.040838003158569336,0.029442310333251953 diff --git a/results/combined/merges_timed/yubico/ykneo-openpgp.csv b/results/combined/merges_timed/yubico/ykneo-openpgp.csv index 12be2a948c..0a6b16b544 100644 --- a/results/combined/merges_timed/yubico/ykneo-openpgp.csv +++ b/results/combined/merges_timed/yubico/ykneo-openpgp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,df508d799167e2667bf3488214b6df53e5f647b3,998a7e0f1d376b8b0cdfbd4ae512c0aef227923c,3f5a582f98187b408aa67180a2224e041436d945,,True,False,True,5,25,236,3,True,5,Tests_passed,68482b384a81381b88328b4f324dfc1b16589007875c4434d72af0007d01b05e,True,Tests_passed,f98c3c7db67ba9142cff006db01c9e15d03dbc09e2324acae7bc311a2f4f0621,True,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,dddc955e04460ab1921f567c95f4167eb6994bb7fb40a133aabceb93fe1f4a77,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,0.04641914367675781,0.049211978912353516,0.043523311614990234,0.045267343521118164,0.049997568130493164,0.049814462661743164,0.04286551475524902,0.23771262168884277,0.168565034866333,2.5300581455230713,0.4976954460144043,0.10351037979125977,0.13358616828918457,0.04913020133972168,0.048914194107055664,0.04923534393310547,0.0479893684387207,0.04763627052307129,0.09805655479431152,2.3893332481384277,0.04816627502441406,0.04809713363647461,0.02860116958618164,0.048296213150024414,0.029911518096923828 diff --git a/results/combined/merges_timed/zalando/java-sproc-wrapper.csv b/results/combined/merges_timed/zalando/java-sproc-wrapper.csv index c590e28b7e..2579080767 100644 --- a/results/combined/merges_timed/zalando/java-sproc-wrapper.csv +++ b/results/combined/merges_timed/zalando/java-sproc-wrapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 26,refs/heads/master,d748054093c85a1696a2acd4b5183d47da342f4f,f4be887e89736120593dec1076df7e7f4032ebd4,bf69bdb95870794d0419e564ca5af1073ec1afcb,,True,True,True,27,60,254,2,True,27,Tests_passed,1427d00dafdcb90797233a1c08a8622d648fd043547efcc06b9f896183ce2a1b,True,Tests_passed,648be499fbd7eaaeb5eaf523af3e664e8bccb536fae3927d8b7979193ec47859,True,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_failed,a9ee9a2ec46030784c43e4c8d50863c05442b66821bec6cbf409215a760fd3c6,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,0.05435514450073242,0.03977394104003906,0.0476071834564209,0.055161237716674805,0.05068850517272949,0.045848846435546875,0.06190967559814453,0.1990358829498291,0.11773347854614258,1.7386884689331055,0.6276290416717529,0.07827377319335938,0.1420896053314209,0.06347060203552246,0.0608518123626709,0.04938220977783203,0.05331850051879883,0.06183266639709473,0.08354496955871582,1.6389856338500977,0.06030726432800293,0.04714536666870117,0.0364527702331543,0.060288190841674805,0.048383235931396484 diff --git a/results/combined/merges_timed/zauberlabs/gnip4j.csv b/results/combined/merges_timed/zauberlabs/gnip4j.csv index b1a1c13846..80947b7092 100644 --- a/results/combined/merges_timed/zauberlabs/gnip4j.csv +++ b/results/combined/merges_timed/zauberlabs/gnip4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 40,refs/remotes/origin/pull/61,88be680a758bd1873bbabef4cf0a70d52220d333,f83b201e645e716eedc4c3164078612d9d571274,a4661012e34163ba24fa216b5d252831a25e6546,,True,True,Tests_passed,32026961cc0cf7ef2360fb62d63d102b980828a121a33adb5eef06445cc53ad8,True,9,19,123.0,2,True,Tests_passed,41bcb0b98c3473869ebf9a04842abd4900e731b14db2f64dc3b4b854c2a34126,True,9,True,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,ad5cd52fa1a7a994b4f1a507c146c0efdbfe3d7412e2e21413e7cd3294b45e4b,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Tests_failed,f6de7d7464608998f6f3c5bee70f24426b859252c1e2d1f926587ae502f832fd,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,be35a284ad53b2d9e44ed23154039573076c74b8064e81e5d663ba2652bb352c,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,0.027280092239379883,0.04873514175415039,0.025678157806396484,0.044184207916259766,0.03682374954223633,0.04065847396850586,0.03618979454040527,0.16874933242797852,0.11606073379516602,0.6379499435424805,0.515207052230835,0.07183575630187988,0.12192606925964355,0.05878758430480957,0.06151175498962402,0.06018662452697754,0.050660133361816406,0.03538656234741211,0.09605050086975098,0.6337559223175049,0.03610086441040039,0.05286288261413574,0.05621504783630371,0.05272793769836426,0.05344128608703613 diff --git a/results/combined/merges_timed/zenria/weed-fs-java-client.csv b/results/combined/merges_timed/zenria/weed-fs-java-client.csv index 58ecfa560e..1b14a358ca 100644 --- a/results/combined/merges_timed/zenria/weed-fs-java-client.csv +++ b/results/combined/merges_timed/zenria/weed-fs-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 3,refs/heads/master,9cb89da92f92cc11798e83769c332241e6a70d47,dc03761289040c0875e3108602f290c8967277ed,b19e89ccdcf91b972a4160ae81456acf548282e2,,True,True,Tests_passed,00e8db58db1486806e1bef826b0fd5723fa6c8c8857c616603f9f3975953cd0d,True,5,13,77,2,True,Tests_passed,a3eca0cb6bb9c0c8a8fc7978b5ba76b2b80d8105804d55824eabb903c80cfa02,True,5,True,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_failed,2655b588e351a6d571f1e8735d8d35be9ec6bbff353973e3e4a2b8e2de98a8e4,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,0.03885316848754883,0.03927254676818848,0.042862653732299805,0.03614449501037598,0.035462379455566406,0.043630361557006836,0.04184293746948242,0.16144967079162598,0.10970926284790039,0.8189198970794678,0.33669042587280273,0.07159137725830078,0.12925505638122559,0.03861856460571289,0.03859305381774902,0.03873944282531738,0.03855443000793457,0.03930258750915527,0.07370519638061523,0.8342061042785645,0.038616180419921875,0.03845095634460449,0.027181386947631836,0.03940129280090332,0.0281069278717041 diff --git a/results/combined/merges_timed/zeromq/jeromq.csv b/results/combined/merges_timed/zeromq/jeromq.csv index 6815feac64..2448bab583 100644 --- a/results/combined/merges_timed/zeromq/jeromq.csv +++ b/results/combined/merges_timed/zeromq/jeromq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 14,refs/heads/master,82bbdf0b66f2ebaf8cd845c77dd4762b96982363,c424e02c02e5e8c86082b1de353664bbfd858716,f5c6ecd1da3feb49d3cd6f4dcd53c457b062e519,,True,True,True,6,17,50,2,True,6,Tests_passed,50ca1aa6fbfabbd1446bd4915e1fcbafd586bb322df2649d93a0649bee5281e9,True,Tests_passed,88af2617aeddca172e8c4087af3e2eff659b15cc2676c915a143040c9483f60e,True,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,0.03474736213684082,0.03959298133850098,0.03258943557739258,0.04714703559875488,0.04834628105163574,0.04756927490234375,0.02677011489868164,0.15631365776062012,0.1132655143737793,1.3718414306640625,0.5107340812683105,0.09825801849365234,0.1564645767211914,0.06415295600891113,0.04258275032043457,0.06389927864074707,0.06498408317565918,0.06617379188537598,0.10572147369384766,1.261197805404663,0.0579068660736084,0.061394691467285156,0.05200362205505371,0.055519819259643555,0.030118465423583984 diff --git a/results/combined/merges_timed/zeroturnaround/zt-zip.csv b/results/combined/merges_timed/zeroturnaround/zt-zip.csv index 72adbb2349..b81a55fc99 100644 --- a/results/combined/merges_timed/zeroturnaround/zt-zip.csv +++ b/results/combined/merges_timed/zeroturnaround/zt-zip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 51,refs/remotes/origin/drop-pre-jdk8-versions,ce0ab9ec996a81db498e43e0b8d1c104d5c0f479,e077c8e83048c78c0ac13ff04c22d4098a556a99,6933db74aacfc56f2452061e2360386570228a82,,True,True,Tests_passed,48a6dced5edd2be8368cb73d2b2018c9d987796d8ed4eb1ad643440a197e0810,True,27,92,1149,2,True,Tests_passed,1bffcf567ab88edab1e9c2117b20a6a3b427c0370e72ac0847e2c082d5196b4e,True,27,True,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,c2c96189346997b1ecb29e0c28f52a33bc106076b50f4b4d059288c80e309832,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,1468feb88cf2e0e4579dd002231bd0977e4b201932dc31739a920bb0c46ad0d2,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,9c2a0ef248022e4f7288ece0dd891b10ccc375492e66a7c15e29c738a858c2ef,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,0.04478907585144043,0.02575230598449707,0.03756284713745117,0.039095401763916016,0.044118404388427734,0.03557085990905762,0.036002397537231445,0.11208534240722656,0.10580778121948242,2.287614345550537,0.7946357727050781,0.0899360179901123,0.12516260147094727,0.04572439193725586,0.04525470733642578,0.04419755935668945,0.044300079345703125,0.04494738578796387,0.0791168212890625,2.096583843231201,0.04242992401123047,0.04529142379760742,0.042845964431762695,0.04216575622558594,0.043141841888427734 diff --git a/results/combined/merges_timed/zextras/openzal.csv b/results/combined/merges_timed/zextras/openzal.csv index 4ea7469421..6addfcd751 100644 --- a/results/combined/merges_timed/zextras/openzal.csv +++ b/results/combined/merges_timed/zextras/openzal.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 692,refs/remotes/origin/pull/245,31fd311a6e3a8491ecf72c7a6bf8f020aeae7a63,c62df2463b60f8a3b79e7416db8c36ccdee3095b,3a719c8f2950f3b4a4d77c57510fa8a1766ad099,,True,True,True,5,6,71,3,True,5,Tests_passed,a31de397b1eedb12cc7d0ddf0392369ac4cee402a23dffc3135e6e7480be8143,True,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,True,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,956f282fe6889b8a5094fa580c771b54fa9da4d08510b9f744ae4c8bb47da7e4,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,7ac826d71842c96c4357e01b9e5bce40b4332c827bb18aad39a5d3461b8b89d6,Merge_failed,1cb11174718b2b634a8d651578725f3616057cf06fd4863d94b2b12568c4eb05,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,5d8a6fa408fdfaad6b55d57ca3af9106ebf0cabec86562a3ce9e80f498153e29,Merge_failed,b32b603ddb69483e1c01d42fb082693d896e2ef47121da412a76149463b3100c,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,0.010894536972045898,0.02673649787902832,0.031289100646972656,0.011505603790283203,0.030719995498657227,0.031239748001098633,0.030586719512939453,0.07842278480529785,0.12412667274475098,1.292450189590454,0.6608855724334717,0.10981106758117676,0.12723255157470703,0.07349228858947754,0.059191226959228516,0.044762372970581055,0.04487347602844238,0.04520225524902344,0.0934138298034668,1.3100171089172363,0.04590654373168945,0.0458376407623291,0.07162141799926758,0.06827425956726074,0.04299283027648926 diff --git a/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv b/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv index bf4e668462..0b5702eec3 100644 --- a/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv +++ b/results/combined/merges_timed/zhegexiaohuozi/jsoupxpath.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 13,refs/heads/master,2183475da7a4f5a050c6fc4532e1f13052826dde,4ad42a4a0203c7391f2cf3bb72c2c5f6e4203ae4,0f3909ae5d5ab0939b7efc62fa018a0472055713,,True,True,True,6,9,58,2,True,6,Tests_passed,890b00a3e005a713a0fbc72e5ed456b539291c1e90e440feb7577f923bb62091,True,Tests_passed,bd233b41fea7dd70fe2c4fcd3515c0dccf504d794824b8032896dbe0c70349f8,True,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,0.03664398193359375,0.0241854190826416,0.04019880294799805,0.04694962501525879,0.025133848190307617,0.04468703269958496,0.03863668441772461,0.1674509048461914,0.09549236297607422,0.7118239402770996,0.44086766242980957,0.08073019981384277,0.13616561889648438,0.048108816146850586,0.048029184341430664,0.048667192459106445,0.048824310302734375,0.04743242263793945,0.08252096176147461,0.6677966117858887,0.044942617416381836,0.04563736915588379,0.03721427917480469,0.044593095779418945,0.0352480411529541 diff --git a/results/combined/merges_timed/zhongdj/lifecycle.csv b/results/combined/merges_timed/zhongdj/lifecycle.csv index 612ed86829..42d0bfdc2a 100644 --- a/results/combined/merges_timed/zhongdj/lifecycle.csv +++ b/results/combined/merges_timed/zhongdj/lifecycle.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 2,refs/heads/master,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,de6837afbb460ae88d2aa2d580826df2933b151e,9fd474cd1551609c8d62449c15d40b3f40d03454,,True,True,True,42,214,2511,5,True,42,Tests_passed,b5a291465d69b1aad03f86c46bebc956dffa1380541490030d96e308a45213f2,True,Tests_passed,30e7d005cf53167db338ccd86721317803a435af87bee95e9cdc45650dfafed3,True,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,aa8ad9d0755398357318e1f9375172d90dd094f1024b9669189a61f00d54bd2f,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,024f97036a5eac7e7855040f83ec7ec34ea4a2c1b8983f041cb627938ab4afbc,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,50785ebe8c366aa38188f860e5480cb2ea6038ae7023c67816e610a177b5170d,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,0.0444948673248291,0.05820894241333008,0.04722762107849121,0.04735231399536133,0.06663656234741211,0.05589008331298828,0.053575992584228516,0.32775259017944336,0.2905256748199463,4.437683582305908,-1.0,0.1799783706665039,0.14777302742004395,0.06743049621582031,0.06758451461791992,0.06740379333496094,0.06976747512817383,0.06753778457641602,0.15557432174682617,4.16554856300354,0.06576895713806152,0.06698966026306152,0.0512242317199707,0.0670313835144043,0.05025315284729004 diff --git a/results/combined/merges_timed/zhuowei/raspberryjuice.csv b/results/combined/merges_timed/zhuowei/raspberryjuice.csv index c6eda906de..51d1116b28 100644 --- a/results/combined/merges_timed/zhuowei/raspberryjuice.csv +++ b/results/combined/merges_timed/zhuowei/raspberryjuice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 9,refs/heads/master,8c537ab867b5f88945fb3985e05598c96efa70a8,28df7a5c2743b7fa8b43d378be49c84b82e11bfe,4deb15c845662e28d973c26b74650cf092dc0d73,,True,True,True,16,66,1251,3,True,16,Tests_passed,1f15ab56b8db882480879fcda00ab6124c0ac91b92a370509a6ec717d6a2869d,True,Tests_passed,7b3188e3707659936f9b50fc17325e158370b317d6d75506754894b8a7492ad7,True,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_failed,43bfc35a7e4a19e69085247a0446405e67d1aec21102bf5139c602a4c3afd6c8,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,0.0156857967376709,0.0165255069732666,0.018988847732543945,0.019697189331054688,0.019244670867919922,0.018935680389404297,0.019138097763061523,0.0601348876953125,0.12426924705505371,1.60455322265625,0.3654050827026367,0.12218213081359863,0.15695738792419434,0.062040090560913086,0.06568503379821777,0.06537842750549316,0.05060267448425293,0.06675004959106445,0.12535333633422852,1.6626956462860107,0.04996299743652344,0.0639183521270752,0.045894622802734375,0.06292200088500977,0.04844522476196289 diff --git a/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv b/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv index 34e0b1ddaa..f38c7c2bb0 100644 --- a/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv +++ b/results/combined/merges_timed/zsoltfabok/dojo.exercises.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 10,refs/remotes/origin/heikkij,908be82a20bb82045861412089b7c7e409807de8,ae5e0ab1b02da13f7429822e9a1290bc065942bf,c3e18a0c82c7bbb1c7fa220d3d7a1701e9e1721f,,True,True,True,36,12,322,3,True,36,Tests_passed,e0d3707e4773af6228eddf33210cf51aa841f06a32579ddedcf43dc84357e72d,True,Tests_passed,7941519e8a53fd2f295b6a311a74cc0ada1997d9d148ca1929e59ea415e880a0,True,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,0.03672480583190918,0.04035663604736328,0.03165769577026367,0.03134942054748535,0.039823293685913086,0.03998255729675293,0.041176795959472656,0.23372650146484375,0.11052107810974121,0.45059752464294434,0.3515908718109131,0.06854104995727539,0.11693406105041504,0.039305925369262695,0.03998422622680664,0.039936065673828125,0.040149688720703125,0.039215803146362305,0.0898129940032959,0.4554429054260254,0.03991246223449707,0.039885759353637695,0.0314486026763916,0.040062665939331055,0.031876564025878906 diff --git a/results/combined/merges_timed/zxing/zxing.csv b/results/combined/merges_timed/zxing/zxing.csv index bbe8215f52..f105a504c0 100644 --- a/results/combined/merges_timed/zxing/zxing.csv +++ b/results/combined/merges_timed/zxing/zxing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,plumelib_git_hires_merge_run_time,plumelib_intellimerge_run_time,plumelib_recursive_histogram_run_time,plumelib_recursive_ignorespace_run_time,plumelib_recursive_minimal_run_time,plumelib_recursive_myers_run_time,plumelib_recursive_patience_run_time,plumelib_resolve_run_time,plumelib_spork_run_time,plumelib_ort_run_time,plumelib_ort_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,git_hires_merge_plus_run_time,intellimerge_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,spork_plus_run_time,ivn_run_time,ivn_ignorespace_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time 89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,True,75,188,3079,4,True,75,Tests_passed,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,True,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,True,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,93ff26f89efaf105b841b1709c3fb23a0cf238eed69f6dba060e2eff13ea965a,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Tests_failed,3d16d83380785522c9388650e790ed040d8b94b460b58f70f6524ca71417371e,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,244ea54eff03da5fb6b937150c56973dbc9573be093e8eaf118051112efb68f1,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,0.06766009330749512,0.05937600135803223,0.05975031852722168,0.08145356178283691,0.07650971412658691,0.05417585372924805,0.05770254135131836,0.46178340911865234,0.21402740478515625,0.07382321357727051,1.876878023147583,0.18906831741333008,0.17017912864685059,0.0852959156036377,0.10548067092895508,0.0835881233215332,0.08391070365905762,0.08143448829650879,0.17208147048950195,0.09667825698852539,0.07877731323242188,0.10143661499023438,0.06725311279296875,0.08037424087524414,0.06481313705444336 diff --git a/results/combined/result.csv b/results/combined/result.csv index 7006086997..4e353326ca 100644 --- a/results/combined/result.csv +++ b/results/combined/result.csv @@ -1,4 +1,4 @@ -idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation +idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation 38-1,38,1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15.0,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,7fc754b5f625d3078e0bd8b165686f94da41c781623cdd925c22fe66901b791a,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,lwhite1/tablesaw, 38-3,38,3,refs/heads/master,064b075c3a675302f3d372d0ce308a12dcca0ba4,a13a334c97c01a7284a80f171615f159d03b7975,2a7efb82d77980077ded7cee995c9c051fb1545e,,True,True,Tests_passed,8e253e7f54906664c5588ed04337ab0ebc000e46d65ad0c4260c8b5793b5459f,True,49.0,105,1735.0,7,True,Tests_passed,d9750fcfd6013df5ece52ac889dc4e82e0000e94661b33a5001b1fa9aee44e49,True,49,True,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_failed,a6641ae2f6190b5e571da73c4da12d540565a6b91954f68fc5696fe0aa8802a9,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,lwhite1/tablesaw, 38-8,38,8,refs/heads/master,13178c81a1ba18fc39b7280dc40919f4208650fa,25d12ee6c6f5bb70501541813caffa5265c0b9c8,92d27fbeb840ea070dfc5064ab3a67f223c56441,,True,True,Tests_passed,3af57b5a02ba264d51a67d6dc4c1a362302ed8f09cb98a0dcd08abceebeecd7a,True,24.0,84,245.0,2,True,Tests_passed,26fc25b1b168263e7dc12b303fdc31708348e8feab58e387de85d5a18a5fa6c4,True,24,True,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,lwhite1/tablesaw, diff --git a/results/combined/tables/all/tool_comparison_table.csv b/results/combined/tables/all/tool_comparison_table.csv index 20e020cda5..fc3debe0ab 100644 --- a/results/combined/tables/all/tool_comparison_table.csv +++ b/results/combined/tables/all/tool_comparison_table.csv @@ -1,4 +1,4 @@ -,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,plumelib_git_hires_merge,plumelib_intellimerge,plumelib_recursive_histogram,plumelib_recursive_ignorespace,plumelib_recursive_minimal,plumelib_recursive_myers,plumelib_recursive_patience,plumelib_resolve,plumelib_spork,plumelib_ort,plumelib_ort_ignorespace,adjacent,imports,version_numbers +,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,git_hires_merge_plus,intellimerge_plus,gitmerge_recursive_histogram_plus,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_minimal_plus,gitmerge_recursive_myers_plus,gitmerge_recursive_patience_plus,gitmerge_resolve_plus,spork_plus,ivn,ivn_ignorespace,adjacent,imports,version_numbers gitmerge_ort,-,1,0,1,0,0,0,2,0,3,2,0,0,0,1,0,0,0,2,3,0,1,0,0,0 gitmerge_ort_ignorespace,18,-,18,0,18,18,18,20,14,14,13,14,18,18,0,18,18,18,20,14,18,0,18,18,18 gitmerge_recursive_histogram,0,1,-,1,0,0,0,2,0,3,2,0,0,0,1,0,0,0,2,3,0,1,0,0,0 @@ -10,17 +10,17 @@ gitmerge_resolve,2,3,2,2,1,1,1,-,1,4,4,1,2,2,2,1,1,1,0,4,2,3,2,2,2 git_hires_merge,56,53,56,52,55,55,55,57,-,25,28,0,56,56,52,55,55,55,57,25,56,53,56,56,56 spork,289,272,289,271,288,288,286,294,243,-,158,243,289,289,271,288,288,286,294,0,289,272,289,289,289 intellimerge,927,866,927,868,928,928,926,945,776,452,-,776,927,927,867,928,928,926,945,448,927,866,927,927,927 -plumelib_git_hires_merge,56,53,56,52,55,55,55,57,0,25,28,-,56,56,52,55,55,55,57,25,56,53,56,56,56 -plumelib_intellimerge,0,1,0,1,0,0,0,2,0,3,2,0,-,0,1,0,0,0,2,3,0,1,0,0,0 -plumelib_recursive_histogram,0,1,0,1,0,0,0,2,0,3,2,0,0,-,1,0,0,0,2,3,0,1,0,0,0 -plumelib_recursive_ignorespace,20,1,20,1,19,19,19,22,15,16,14,15,20,20,-,19,19,19,22,15,20,1,20,20,20 -plumelib_recursive_minimal,1,2,1,1,0,0,0,2,0,3,3,0,1,1,1,-,0,0,2,3,1,2,1,1,1 -plumelib_recursive_myers,1,2,1,1,0,0,0,2,0,3,3,0,1,1,1,0,-,0,2,3,1,2,1,1,1 -plumelib_recursive_patience,1,2,1,1,0,0,0,2,0,3,3,0,1,1,1,0,0,-,2,3,1,2,1,1,1 -plumelib_resolve,2,3,2,2,1,1,1,0,1,4,4,1,2,2,2,1,1,1,-,4,2,3,2,2,2 -plumelib_spork,289,272,289,271,288,288,286,294,243,0,158,243,289,289,271,288,288,286,294,-,289,272,289,289,289 -plumelib_ort,0,1,0,1,0,0,0,2,0,3,2,0,0,0,1,0,0,0,2,3,-,1,0,0,0 -plumelib_ort_ignorespace,18,0,18,0,18,18,18,20,14,14,13,14,18,18,0,18,18,18,20,14,18,-,18,18,18 +git_hires_merge_plus,56,53,56,52,55,55,55,57,0,25,28,-,56,56,52,55,55,55,57,25,56,53,56,56,56 +intellimerge_plus,0,1,0,1,0,0,0,2,0,3,2,0,-,0,1,0,0,0,2,3,0,1,0,0,0 +gitmerge_recursive_histogram_plus,0,1,0,1,0,0,0,2,0,3,2,0,0,-,1,0,0,0,2,3,0,1,0,0,0 +gitmerge_recursive_ignorespace_plus,20,1,20,1,19,19,19,22,15,16,14,15,20,20,-,19,19,19,22,15,20,1,20,20,20 +gitmerge_recursive_minimal_plus,1,2,1,1,0,0,0,2,0,3,3,0,1,1,1,-,0,0,2,3,1,2,1,1,1 +gitmerge_recursive_myers_plus,1,2,1,1,0,0,0,2,0,3,3,0,1,1,1,0,-,0,2,3,1,2,1,1,1 +gitmerge_recursive_patience_plus,1,2,1,1,0,0,0,2,0,3,3,0,1,1,1,0,0,-,2,3,1,2,1,1,1 +gitmerge_resolve_plus,2,3,2,2,1,1,1,0,1,4,4,1,2,2,2,1,1,1,-,4,2,3,2,2,2 +spork_plus,289,272,289,271,288,288,286,294,243,0,158,243,289,289,271,288,288,286,294,-,289,272,289,289,289 +ivn,0,1,0,1,0,0,0,2,0,3,2,0,0,0,1,0,0,0,2,3,-,1,0,0,0 +ivn_ignorespace,18,0,18,0,18,18,18,20,14,14,13,14,18,18,0,18,18,18,20,14,18,-,18,18,18 adjacent,0,1,0,1,0,0,0,2,0,3,2,0,0,0,1,0,0,0,2,3,0,1,-,0,0 imports,0,1,0,1,0,0,0,2,0,3,2,0,0,0,1,0,0,0,2,3,0,1,0,-,0 version_numbers,0,1,0,1,0,0,0,2,0,3,2,0,0,0,1,0,0,0,2,3,0,1,0,0,- diff --git a/results/combined/tables/tools/tool_comparison_table.csv b/results/combined/tables/tools/tool_comparison_table.csv index 7cd6a67d07..a17a635a44 100644 --- a/results/combined/tables/tools/tool_comparison_table.csv +++ b/results/combined/tables/tools/tool_comparison_table.csv @@ -1,4 +1,4 @@ -,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,plumelib_ort,plumelib_ort_ignorespace +,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,ivn,ivn_ignorespace gitmerge_ort,-,1,0,3,2,0,0,0,0,1 gitmerge_ort_ignorespace,18,-,14,14,13,18,18,18,18,0 git_hires_merge,56,53,-,25,28,56,56,56,56,53 @@ -7,5 +7,5 @@ intellimerge,927,866,776,452,-,927,927,927,927,866 adjacent,0,1,0,3,2,-,0,0,0,1 imports,0,1,0,3,2,0,-,0,0,1 version_numbers,0,1,0,3,2,0,0,-,0,1 -plumelib_ort,0,1,0,3,2,0,0,0,-,1 -plumelib_ort_ignorespace,18,0,14,14,13,18,18,18,18,- +ivn,0,1,0,3,2,0,0,0,-,1 +ivn_ignorespace,18,0,14,14,13,18,18,18,18,- diff --git a/results/combined/unhandled_and_failed_merges_without_intellimerge.csv b/results/combined/unhandled_and_failed_merges_without_intellimerge.csv index dde6665f30..230d29274e 100644 --- a/results/combined/unhandled_and_failed_merges_without_intellimerge.csv +++ b/results/combined/unhandled_and_failed_merges_without_intellimerge.csv @@ -1,4 +1,4 @@ -repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation +repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation 38,143,refs/remotes/origin/pull/338,436f7cfe5ecfe763e7a45ce6745f1d1c52133d22,6e167b15fdeba936874662d6ccc6b0ae0a4ec6b8,03213c8c3ae8e233dc5e115bae6cdb049e8df71d,,True,True,Tests_passed,084c0bad8578a2dc019f9539b3f88abc9220fb38b95b98d40033abf1815975c3,True,18.0,44,145.0,3,True,Tests_passed,dc24f010e05c53895a5ef953bc983f6f75d56077d0931552aa69521dd1a7ee5c,True,18,True,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,05d48409e334cf67975c391080c77388ee1bbc360a2b63a3a4411f47bf836798,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,c3f606babc394883f854633cc4c995956ca0a91f5e5a982fc77c2dd26d00f458,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,664127fc97b840c7e0a318e67f081de2a351a0abec4df1912c5edeb522bc26a0,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,lwhite1/tablesaw, 112,41,refs/heads/master,b41794d7af49d6c07e339f51eac8209f2a0bb9d1,b9f2366c231ac47575199cc0654635d5daa42f8a,2f6f0bd59c9cc4f98ef37cd79974ccedf4df063c,,True,True,Tests_passed,9ce7f449c1040527adf06cddd6f6da828ae9541db40eb6e2a2da5380535a96ca,True,26.0,81,1159.0,6,True,Tests_passed,7d40fae398405bcbdfd89d9512ef772288013a6bf9e9d383881f0596a1eae5d4,True,26,True,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,9e5ab73c3a123504c49f29c888bfa563004784ba45bb91ca1915bb0eb81a8885,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Tests_failed,d9fa2199d7e0c448f2178afb2b3937304e0cd398e4e5953cc273ad5ea9ae8785,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,7b246148fb1c7bba29cbeaf3ed2f0cebd25770b12b23b087d3a67b7f6e7602fb,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,brunoribeiro/sql-parser, 112,48,refs/heads/master,21d9d04b08761aacd8cf844096fbe64d8c4b3c57,d2f7ff9fec38b8653499208aef522767003653fc,0d50066e7c2a0931565a2e2d5fc1d4197b5e2413,,True,True,Tests_passed,0f9a2db5f254d5963175c8669df9ecdb36704a166d4d6e2dff32063ae5b4f7d4,True,27.0,45,418.0,5,True,Tests_passed,20604532ae24b4efc082335ee65716b1923a2c44101faee9382b54975337062f,True,27,True,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,3f5ad9f12a4377acf4402ab238d2923eff22e58923c2f8449bfb229e039bc596,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Tests_failed,99fe1ac1fc65ff3060249daac63f9e4d9f88fe97bf8e2bc394505f45af92182a,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,de840cf8eb614267ee5ec704781bdcbdacaef23cb286f6538c83ac630f228f1e,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,brunoribeiro/sql-parser, diff --git a/results/combined/unhandled_and_failed_merges_without_intellimerge_and_spork.csv b/results/combined/unhandled_and_failed_merges_without_intellimerge_and_spork.csv index dde6665f30..230d29274e 100644 --- a/results/combined/unhandled_and_failed_merges_without_intellimerge_and_spork.csv +++ b/results/combined/unhandled_and_failed_merges_without_intellimerge_and_spork.csv @@ -1,4 +1,4 @@ -repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation +repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation 38,143,refs/remotes/origin/pull/338,436f7cfe5ecfe763e7a45ce6745f1d1c52133d22,6e167b15fdeba936874662d6ccc6b0ae0a4ec6b8,03213c8c3ae8e233dc5e115bae6cdb049e8df71d,,True,True,Tests_passed,084c0bad8578a2dc019f9539b3f88abc9220fb38b95b98d40033abf1815975c3,True,18.0,44,145.0,3,True,Tests_passed,dc24f010e05c53895a5ef953bc983f6f75d56077d0931552aa69521dd1a7ee5c,True,18,True,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,05d48409e334cf67975c391080c77388ee1bbc360a2b63a3a4411f47bf836798,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,c3f606babc394883f854633cc4c995956ca0a91f5e5a982fc77c2dd26d00f458,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,664127fc97b840c7e0a318e67f081de2a351a0abec4df1912c5edeb522bc26a0,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,lwhite1/tablesaw, 112,41,refs/heads/master,b41794d7af49d6c07e339f51eac8209f2a0bb9d1,b9f2366c231ac47575199cc0654635d5daa42f8a,2f6f0bd59c9cc4f98ef37cd79974ccedf4df063c,,True,True,Tests_passed,9ce7f449c1040527adf06cddd6f6da828ae9541db40eb6e2a2da5380535a96ca,True,26.0,81,1159.0,6,True,Tests_passed,7d40fae398405bcbdfd89d9512ef772288013a6bf9e9d383881f0596a1eae5d4,True,26,True,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,9e5ab73c3a123504c49f29c888bfa563004784ba45bb91ca1915bb0eb81a8885,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Tests_failed,d9fa2199d7e0c448f2178afb2b3937304e0cd398e4e5953cc273ad5ea9ae8785,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,7b246148fb1c7bba29cbeaf3ed2f0cebd25770b12b23b087d3a67b7f6e7602fb,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,brunoribeiro/sql-parser, 112,48,refs/heads/master,21d9d04b08761aacd8cf844096fbe64d8c4b3c57,d2f7ff9fec38b8653499208aef522767003653fc,0d50066e7c2a0931565a2e2d5fc1d4197b5e2413,,True,True,Tests_passed,0f9a2db5f254d5963175c8669df9ecdb36704a166d4d6e2dff32063ae5b4f7d4,True,27.0,45,418.0,5,True,Tests_passed,20604532ae24b4efc082335ee65716b1923a2c44101faee9382b54975337062f,True,27,True,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,3f5ad9f12a4377acf4402ab238d2923eff22e58923c2f8449bfb229e039bc596,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Tests_failed,99fe1ac1fc65ff3060249daac63f9e4d9f88fe97bf8e2bc394505f45af92182a,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,de840cf8eb614267ee5ec704781bdcbdacaef23cb286f6538c83ac630f228f1e,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,brunoribeiro/sql-parser, diff --git a/results/greatest_hits/merges_tested/addthis/stream-lib.csv b/results/greatest_hits/merges_tested/addthis/stream-lib.csv index 272f37a948..9c7019c40b 100644 --- a/results/greatest_hits/merges_tested/addthis/stream-lib.csv +++ b/results/greatest_hits/merges_tested/addthis/stream-lib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c901ea4391873e4d195a334dc99cb23cede2b339,b5891e2d3513236d91a2aee3e9d220215663113d,013b3ea315d91417dccdbeb1f5d7f569d0968ebe,,True,False,True,6,9,18,2,True,6,Tests_passed,d23e1a01302eb6fef57307f5e5e5ae7457d74cde83573892f76b1d2ac45fe229,True,Tests_passed,cead205f1db60523ea9dca5c36a261cd82b3a1952c6e14173d3d19f512e2c531,True,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_failed,4e6f9641e3863ba9ceb5754ccef39e41ad5f6b6726f7d985f22b4a3b27eae378,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834 16,refs/heads/master,644e4e9be40e0eb69a9aef6acee6ca28643f174b,e221cb6ab7841007e68d9a6e215f39600ff27502,35816a5396ba66280229d3b0d1c8570f62b6ae4a,,True,False,True,3,29,68,2,True,3,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,True,Tests_passed,035151ed8047112db4cc9368e27b5dbc636d8d2cddf19723cd5ce9951fa442d9,True,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_failed,5c756a4096751ef05974cd3e8bf1e72993f797f1b8fcb404d0e25724411335f5,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c 17,refs/heads/master,e221cb6ab7841007e68d9a6e215f39600ff27502,323e3010615a0f5b3b5356cc77297df94a92cfbb,b05dbce28a6dab82f20f31e4da28b29d2b736cef,,True,False,True,2,27,102,2,True,2,Tests_passed,dce673b5ad07d3f818db2b9c16c774354d0836d9fd774a57222bd20f3fb38792,True,Tests_passed,42093ed8a06fb413e90f54de7737ae684ef6fb6ae973b387f5309d8607b2adff,True,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd diff --git a/results/greatest_hits/merges_tested/alibaba/canal.csv b/results/greatest_hits/merges_tested/alibaba/canal.csv index 685023629d..3770a4eedc 100644 --- a/results/greatest_hits/merges_tested/alibaba/canal.csv +++ b/results/greatest_hits/merges_tested/alibaba/canal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 229,refs/heads/master,4fe6c36c499ffe044d50a9ae1900427433797e4c,899592ce2a18f2787ae1adab4ff5347aba769845,9e3d4a7ffe5371557d79de1899fb68152a1a1d83,,True,True,True,92,159,2624.0,10,True,92,Tests_passed,89cd045707ea84c057fcf47629e626baa8b4c4300d50cac256cc1fb06ca09ebb,True,Tests_passed,a2dc05d4bbd067dfd95e89e028dd5805833451df74a4e2e407255ef7378351ba,True,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,bcc147fccfa3cc6329e214668606a7000d1871b5df9790d3a70c30cde16379e1,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,bcc147fccfa3cc6329e214668606a7000d1871b5df9790d3a70c30cde16379e1,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5 248,refs/heads/master,68d8afae3e9cb4c21c26b3f7c291759f0c9e7426,61c7f7738d33dfb6bd939c3a4211caf0ce86e218,9e816bc48f9955f9e2839873993cef9627c2f389,,True,True,True,42,123,2293.0,104,True,136,Tests_passed,adb0019e4c986e531fe55137f6d06697b46a4ce8b29f02517c2e38382181b0de,True,Tests_passed,23a987cd41852b0dec64796718d0a4c99fefbb00f0ac9bb912c79325cbaba56f,True,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,f8c893d28b0cd9b6eec17ca6fefa13c85ed431a4009a2bbe1957bee2b413b06a,Merge_failed,659525c6f96d60516cc258126b3aa00e834aae1203f88f7639115adbc13c28fe,Merge_failed,827dd2ea39f202b867883a6190d71eb31b63c403aae0648b0592ad3ebc8c6782,Tests_failed,5c3e659f3346cc06a8a94a1506d2498e4cae6238eb50b7367ac1ec85ad912857,Merge_failed,659525c6f96d60516cc258126b3aa00e834aae1203f88f7639115adbc13c28fe,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,9f6e2fd7e0d0fc905ed260969e4c42cfc99923806925cac35881c4e4b60027ae,Merge_failed,827dd2ea39f202b867883a6190d71eb31b63c403aae0648b0592ad3ebc8c6782,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973 250,refs/heads/master,b1dc5bd59f66fdc6df0dbf449d7b9eec8c58452c,02868d8fecb50e445d8b624ca70b25da36cda788,23f7b3b5d82c3571454877e32bc6f5bbd020b4c2,,True,True,True,183,1354,27749.0,6,True,183,Tests_passed,41ae054da8f10862135c8b359d27530c2d5cc8aba7a31046b0c745f7a804c9c0,True,Tests_passed,1349a5494ae220a2c938a2a9ce3ee272465e7f2e16ef60a0e13f51c4a7c99378,True,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,2ef170632ac2a53a693f3cb03dc9f20171c007fc95871de4fce2ad0e02336130,Merge_failed,e527c1c1eabee1a4529fccbb8cc064309d6749269c654608a0c2316baf915049,Merge_failed,29cb5d2f6f2d3bd42bcfb90c405123d4fed20d54bd9ee9a65cecdbb5913306b0,Merge_failed,a5e32df929c17b53b9d284a9dcc74b72981c878cb96b684ab6c56740bccc408a,Merge_failed,e527c1c1eabee1a4529fccbb8cc064309d6749269c654608a0c2316baf915049,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,35501881836d1ecc357d239d19d7a57e7bdfb524d6b22db58ac1c318b824eab5,Merge_failed,6109ea7b53030c3954d844db6942db2e036328b460bbd9eba7f295dde5dd3be8,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25 diff --git a/results/greatest_hits/merges_tested/alibaba/easyexcel.csv b/results/greatest_hits/merges_tested/alibaba/easyexcel.csv index d7ddae5db6..47e6842947 100644 --- a/results/greatest_hits/merges_tested/alibaba/easyexcel.csv +++ b/results/greatest_hits/merges_tested/alibaba/easyexcel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,5ccd41cd7ae9c6560002b7d482e391e8697c6845,a16b181c4ed56ce0672168194afd6b3bc0303caf,4766634105fd11b03905f7efff7fc0aea53e7df4,,True,True,True,2,4,23,2,True,2,Tests_passed,59af16e5467d8a6cf8cf185d8a67eff57b02a8a274e491acc4d68b7f168c392b,True,Tests_passed,843c01cf35ba0377f974bacb5c413c8130b8493964435454f382bd1d3da34e3e,True,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,3a9d0c4f9bd59482349945cb5ed0ff7fa7d8d2c33bbb20e11a10338d01c467e6,Tests_passed,59af16e5467d8a6cf8cf185d8a67eff57b02a8a274e491acc4d68b7f168c392b,Tests_passed,4844d8d0fcff5b4e63d35a9245c22b1e4c07b02da0b812f2cafa7b69db3c69e8,Tests_passed,2d6b3e98c10e700ffad1170102e0dea84ee05f29fc5b7d84718eaaa6eb203912,Tests_passed,59af16e5467d8a6cf8cf185d8a67eff57b02a8a274e491acc4d68b7f168c392b,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,578c16a7576e4a18f70962467b65f940d36e1a2a17d98d439148f006f5429b4d,Tests_passed,4844d8d0fcff5b4e63d35a9245c22b1e4c07b02da0b812f2cafa7b69db3c69e8,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,f47bf1206b8e4189a3736e83251fe21f39a4e41a1943e0971ea9c1519196015f,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0,Merge_failed,b8ec67b40da73ae49b5512c7a2776bb7e7294d4cb11974e57b8bb75f7f8effa0 14,refs/heads/master,a1d3b2b86fbb872a8f3ae20d58161b1a13f1f3ea,7fd3b1f5032b8c081490aa135ba0792e9a9d9d9c,e6bf1649823594bbb8525dea1522274e935f4093,,True,True,True,158,767,4424,3,True,159,Tests_passed,2552ac5b0f5af9a28b19f19a67f5f2c77ca1e83cb85a0be3f719df46afdb942f,True,Tests_passed,bf191b1c7373f67f075c6a1dacc8596ce30a74be540871488e6d21585195e68a,True,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,566c33cff2a8d2e8779435dc3f96cb968cfc2ffdf0e715057522d7097fe2936f,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,65442196acb80b997748b48398dccd5961e5d6c9db11d6e5104673d85008c172,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,56591c789bba8f437ece315870d7f1027e0fca3f85872deba857ec52fdea82ed,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33 39,refs/heads/master,ea2594d340f2bdd5e8079f1b30895e378638a76b,ab7d1a6fcaca7a8145379f4b4d37c19d6da15e61,126135cd427124e5722576b9c1844b5376df5846,,True,True,True,93,182,868,6,True,94,Tests_passed,94254e86762fd42895013e862da2d3896b8e99b2d7b3aa04044ea313b2d9b6d8,True,Tests_passed,b99fe21514ef8d89bf2312eb4faccdb84d0e3eeecdd35d269aa40b07cddba9fd,True,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Merge_failed,c258964292d2e1d0b553a06ba7980efa9c59869c479eaed70e62f6e304a47a66,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,eba5c42c49bebb91f01395e3cdfb51e8d665fb61f356aad82e74c2c28c62e000,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Merge_failed,c258964292d2e1d0b553a06ba7980efa9c59869c479eaed70e62f6e304a47a66,Tests_passed,eba5c42c49bebb91f01395e3cdfb51e8d665fb61f356aad82e74c2c28c62e000,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e,Tests_passed,7564ea744bafa28cd1c4bf9ad523a96800697b6617a8d527ede444a248118a9e diff --git a/results/greatest_hits/merges_tested/antlr/grammars-v4.csv b/results/greatest_hits/merges_tested/antlr/grammars-v4.csv index 03d425ea4a..301dc7d379 100644 --- a/results/greatest_hits/merges_tested/antlr/grammars-v4.csv +++ b/results/greatest_hits/merges_tested/antlr/grammars-v4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 45,refs/heads/master,5212cd6321d56712c4eb42eccc72f751c9213171,9ee31e3908dcb06559b6178643c0d412f3516e09,3fabd952aa101b5211dbed3c60af17e8a8ea6968,,True,True,True,5,41,157.0,3,True,5,Tests_passed,027d0f560b7f7c275eafb6a62c1a7db137c964fd116410112dfd2a1c638b4df4,True,Tests_passed,2813b7fa35905d6dc9b8e31130447f9a31785e93d3f57a217a8379c43374f92b,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,8d9cda6259bbb9199d7953d37747bccf7f81d986fb07464b5392f218c4341f40,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0 978,refs/heads/master,ffe55a577d771d3379a2e47d2e4705fb5c98a3ce,c75b9c4e96d28be16061648840f330c230218726,5212cd6321d56712c4eb42eccc72f751c9213171,,True,True,True,5,39,178.0,4,True,5,Tests_passed,7a4cf56e3206f31e7b8c60edf24bad740438f61882aca5f56ece4f3d1fa53684,True,Tests_passed,9c703166bee23b8ac7b7508030510498c0f508dc91d4dae9671cb9167c7179e0,True,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,97cd9b28209c4558b599f889a74878ea8ebd874dfc044f8256d39036ecf7c8e5,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,f8763e9fd384319c5eccaf7c5368d91034f0d8fb93666fdf377368e5d82ef0bc,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,99e90c50ee70d9f6b3bb7d5b107cd48815d7b253a26e9e7bac9632db188f9427,Merge_failed,d4fbbee2b57bc75329614632f95e763a87ce9d1b1b0370ffb4ad653b45fd15fa,Merge_failed,3005b6d84839d52069c72d2d3c7eb56e4539cf2f6193cfdd7b96706cb84aa84e,Merge_failed,3005b6d84839d52069c72d2d3c7eb56e4539cf2f6193cfdd7b96706cb84aa84e,Merge_failed,d4fbbee2b57bc75329614632f95e763a87ce9d1b1b0370ffb4ad653b45fd15fa,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,f8763e9fd384319c5eccaf7c5368d91034f0d8fb93666fdf377368e5d82ef0bc,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,11d8e2bb8f588d75b03a58c3c12d5f29875bfeb7703b4bd6fabf418c3d5f1138,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,43bf0d8f0bdde25a70afc66e1c1edbd7aa1ab3fc2001f2f4888597478d24cc4f,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,97cd9b28209c4558b599f889a74878ea8ebd874dfc044f8256d39036ecf7c8e5,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3,Merge_failed,5cb34dfabde5c925ad2b6aed21a417c1800fc22aa15c4dbe2ad3963e0f4062e3 1192,refs/heads/master,8c9eade3f3b05c247448cce58dc99ae389608288,cda43d1e0e58baccdf62da56d01b86ab76e88d93,d9a325609fb89db920aa3db3be8b218fa12ab1ff,,True,,True,698,2710,,4,True,698,Tests_passed,4308e306352c4f7f3f7dafd42392d75ec5c2e45380ccb4e97e316bef7b9a63d6,True,Tests_passed,f77a8f00d02c586116e0f6ea8c47b696b281f2740ce5bf18b05ea248505a840c,True,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,6b87a450c80d002dec3b3b3a51a00eeeaecbc8eabe070a1c1bfe30bf1fb9aa92,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c,Tests_passed,192be496df0b1b813e01d5ac3fdd701080240b28ae223d28c7791f211e871c8c diff --git a/results/greatest_hits/merges_tested/apache/commons-beanutils.csv b/results/greatest_hits/merges_tested/apache/commons-beanutils.csv index 62b9de4792..cadc5a6fa0 100644 --- a/results/greatest_hits/merges_tested/apache/commons-beanutils.csv +++ b/results/greatest_hits/merges_tested/apache/commons-beanutils.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/remotes/origin/pull/16,3147331ee84e114c0168b3f0d17164916c3ffa6e,0f37b9f1012ada894d2d4938062694c363c33368,6c0432a423b5dfcaca04f25ccb50a86f66350fc4,,True,True,True,25,75,1863.0,3,True,27,Tests_passed,269e8447898ff19dc12c4d6686f6447467be0f5e6c4a522f01f19f88a6f4bee4,True,Tests_passed,7aa3c6408dceaadd7f9b9b5a1ee58d3eaf6fb8a741018f826bb358ec0d9a5933,True,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d0f4f5aec1398a93a172ef95322d0700e0cec8ca674378abe629f3c6fe8a100f,Merge_failed,2a10ca4b058568e5e3a8e19cbdb7f145591ab082e918e8cbaf8cdc0800c086bd,Merge_failed,3374d3d168ce0b1379252c2ed481f2a08e0ffc6ef751033b7f5ac0072a948421,Merge_failed,47f9842d6a7a0e2e2256ab84e603aa4702166780b14dd08210290edeb3ca46f5,Merge_failed,2a10ca4b058568e5e3a8e19cbdb7f145591ab082e918e8cbaf8cdc0800c086bd,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,b7c6b802a8abf583855b6f50cb31c636db2254d83ea3bf6be525974de640dbd0,Merge_failed,a7bae5ba8d88e19b9f1641c5c8229e666d4abd643b4b7e33c74ba43600d6dde8,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345 17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,True,201,1574,4281.0,2,True,201,Tests_passed,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,True,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,09f92cfe7692f140bb3e839e2d664e5e955f77516bc42f9600e3b8cf9f9cd45b,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b diff --git a/results/greatest_hits/merges_tested/apache/commons-codec.csv b/results/greatest_hits/merges_tested/apache/commons-codec.csv index 478fe1f80b..98181b6a21 100644 --- a/results/greatest_hits/merges_tested/apache/commons-codec.csv +++ b/results/greatest_hits/merges_tested/apache/commons-codec.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,b542cf9d098e65a78b71e5671bf700610b03dc07,b46a254edaa0952421a3b22ae27bde3211ca39c9,1a30728418f1d015453c0ad6521de56f4728e7bd,,True,,True,35,180,,4,True,35,Tests_passed,1fc238ae5b4ddaaf345ab8e1fe37c229c4150e6e001358ae0e7cd85d5b2c0934,True,Tests_passed,24fd4ec92a4026ba3c6837ab0e7b6681a39943f7f9d34032237f6ac137c08d89,True,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40 26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,False,True,3,4,8.0,2,True,3,Tests_passed,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,True,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc 27,refs/heads/master,dd5e46203e5b12f4b65e76ef2e5c34197692b5b4,a94813fb0ce4597d2465a273821306a055f35492,ac7e904531c4509ecb9158e4b31cce95ed938119,,True,True,True,17,31,92.0,2,True,17,Tests_passed,a0f5fe1308f78103e86c985fcb187cf742281f11049c853c1f384b5a6eb5943c,True,Tests_passed,8b3beb79a94d0a621a5b8a1d4c78dc6453fbcd1ffa3a9b8a8d81b86f9150666b,True,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,5e0c3ae4cbc89d8e85d4dc0889f75bbd924cc78547b3d191e1e24546b13a39a2,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,5e0c3ae4cbc89d8e85d4dc0889f75bbd924cc78547b3d191e1e24546b13a39a2,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c diff --git a/results/greatest_hits/merges_tested/apache/commons-collections.csv b/results/greatest_hits/merges_tested/apache/commons-collections.csv index 1e8ec564cd..58ffb695f2 100644 --- a/results/greatest_hits/merges_tested/apache/commons-collections.csv +++ b/results/greatest_hits/merges_tested/apache/commons-collections.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,Tests_passed,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,True,37,108,791,2,True,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,True,37,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a 102,refs/remotes/origin/pull/117,900af49dc3f82c796cb19eb5b0192e39b0f41518,0b8a4c7b71b682ac8417822ac693cbc8b6c261b3,2cbac58f7e3b51a4f2f3a6672bb4380e18469c50,,True,True,Tests_passed,30fae6a152628fd076b7ce4ce7770e78b3e9148d8fd4c524b08d6766fc0b0b5b,True,433,2431,21115,3,True,Tests_passed,d5e0dd301398533f95a463b871a65835c2700c7f00fefd1cef23c68bc2585fdd,True,433,True,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,372e4ba43a67e1e7af848e57f0124b51873f67820e5f8bfe2d279450eda41906,Merge_failed,d86bb8d3bf1ac4fbf674622bc1926579acf39250152c7c5bc385e1cf80e6754d,Merge_failed,cdbd1f8404ea00394944340fbb39137ffddcbcbd74527114e3722029784213d6,Tests_failed,820a1ddd1559ad392d7449ef89d5590e410d2b85d3bd418903f948b74f7ceb1a,Merge_failed,d86bb8d3bf1ac4fbf674622bc1926579acf39250152c7c5bc385e1cf80e6754d,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,7fb6185d883c5700ad4ab031f6f029c1db7b65a1ba0c72c310a7ac9612a60440,Merge_failed,cdbd1f8404ea00394944340fbb39137ffddcbcbd74527114e3722029784213d6,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051 104,refs/remotes/origin/pull/118,fbb5ee798adc480bd3325a27d5b945ecc6fbd50c,f53428c57a19d1316b684d5390c17efbbbd3121d,04c59168baf640912aa039e9b17661ff5a0e770f,,True,True,Tests_passed,5ad6862468d3d826ed6d78faf3858f28feafc8043bf4b48a8c3b121183384eb3,True,268,1440,4106,2,True,Tests_passed,c43b947a4cbe10c6d72bf53a199c9e13b1e8b69402905546505480407139e52e,True,268,True,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,d9e572e88cb47e87e08192203b144a03ffe98f85806ebcf05736d44cf0544f6d,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,d9e572e88cb47e87e08192203b144a03ffe98f85806ebcf05736d44cf0544f6d,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0 diff --git a/results/greatest_hits/merges_tested/apache/commons-dbcp.csv b/results/greatest_hits/merges_tested/apache/commons-dbcp.csv index 204efae34d..b93de8c8de 100644 --- a/results/greatest_hits/merges_tested/apache/commons-dbcp.csv +++ b/results/greatest_hits/merges_tested/apache/commons-dbcp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,True,30,137,1520,3,True,31,Tests_passed,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Merge_timedout,,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9 diff --git a/results/greatest_hits/merges_tested/apache/commons-io.csv b/results/greatest_hits/merges_tested/apache/commons-io.csv index e555cfdf21..6ee12675ad 100644 --- a/results/greatest_hits/merges_tested/apache/commons-io.csv +++ b/results/greatest_hits/merges_tested/apache/commons-io.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,b507d7e60b3593288990dd9f570ab87bfcc65e17,e3aeb380b429dfa54b757c4ac6077c173e885d93,f3b44601abf9b79ba90780b963b4b8f8548bd9b1,,True,False,True,11,13,56.0,2,True,11,Tests_passed,973975dddd9855dabb30ee6db9765402926a0169736233fc591e631e8c121b9f,True,Tests_passed,f7fab8f7c130d64280351b4530f9fc77b7e796e7aca6abd359c3a38e4c4c9fe5,True,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_failed,a8a3afeead41aaae26ae0d4bb88863a0e0072875e192c641ead4590b28c1c3ab,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca 52,refs/heads/master,257d6f423ec5e3e15e136b72fd686c49208b1aa1,cc3e5fb58d371c8ab3eef800be5e2a40e3fb9179,b3447316b5c586312f26e3df431f926e82d7a283,,True,True,True,2,6,15.0,2,True,2,Tests_passed,1709cef5042f67e79725fee5cba19f76a981049fb6c61795b3fc70272d34eaf2,True,Tests_passed,5257aed0c0a4cd90f9e6e14f4c2e96deabd6814bc367fa3691fa6e0cbc919207,True,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363 67,refs/heads/master,5e2ace28efe0476feb6a32794fe6b5e90e71eb7e,65657b874c03a1b6fee23653b01a9baad6a518e8,aafa3dca40e1d0a377ce9112538091581176dd50,,True,False,True,2,6,16.0,2,True,2,Tests_passed,fa34e0f2156f38c8709bd8dcfbbc930ee92a7c6e42831b5592f1adeaa1cde244,True,Tests_passed,c4fda76cdf284534e1a6b3fe7fa0b5f12cc3ef110563290104e454a9bdd819cb,True,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_failed,c987adc44163f45e0b90d29606774fddbbe27acb9e4d7b4fb30155dbd312f915,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef diff --git a/results/greatest_hits/merges_tested/apache/commons-lang.csv b/results/greatest_hits/merges_tested/apache/commons-lang.csv index 858cc9dcdd..760d73f2d8 100644 --- a/results/greatest_hits/merges_tested/apache/commons-lang.csv +++ b/results/greatest_hits/merges_tested/apache/commons-lang.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,bd7956949eff64db275b209429221c816eca9571,bdde0e1c13ed5dddcb358ef8b3d0c0dce11d8b92,07403c9a943d8c4988c85bf6cccfa5926e4dffe1,,True,False,True,9.0,22,40.0,2,True,9,Tests_passed,c61b61fec0c52f237dc3e35ea103a954924a52f99fdccd9af40526c9389e1e8c,True,Tests_passed,ac6a12ec1ad2aa298ce8e581be4d26a0de44d89f6585806e204ae4803be628ab,True,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_failed,a68206ab21707e75d75e8e293b49be4f8267ecf2a013f25e0836f699dc23cef9,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51 64,refs/heads/master,c7c2dd783a2b7c97267a4c185ec1cddde10d513d,dd5d284e86cc83b1ef8088fa8cba383d95957850,b69c4759ed286546ba5437d9fcb6d24a1e2d3f8d,,True,True,True,119.0,735,5163.0,2,True,119,Tests_passed,b1fe9c9ab69884bfdd41ec9aeb37056415c82f20293eecb297f0154e3692d7b7,True,Tests_passed,cc816827abd1117e18dcce3be2e20a91adffc03da55fa957da6af05f173eef75,True,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71 78,refs/heads/master,ee87df847299c55c97347e6c11e00a283feb189d,83dd32b901dea25a571adcd6a976464c8a36601c,b19b2d37dafb1f26360ee5e8ac6fa297e9ae86ab,,True,True,True,54.0,264,703.0,3,True,54,Tests_passed,70654ca8be50dedee73af2b6ff8937c1afd7413631d7360fc0cdca0529ed4df5,True,Tests_passed,2ead4162bf4960650e5ed8eecac194addcdf3e858d26c4bc8611bdf093f32352,True,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,3fdf216d900f2843d280821bda0cb80a9083dfd67f3279d74a5f02e137041914,Merge_failed,e1c813f78e2776da75607b6b8a4d17262dbcdbc9bd54fbf12c34316a2426fbdc,Merge_failed,7ef21b1531406764b8217b5304664281fc4e959729863871314561a730d5daaf,Merge_failed,7ef21b1531406764b8217b5304664281fc4e959729863871314561a730d5daaf,Merge_failed,e1c813f78e2776da75607b6b8a4d17262dbcdbc9bd54fbf12c34316a2426fbdc,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,f5c510654ee68b427170dd64e28255989c10eff32ee91e492f0c5974438a8464,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55 diff --git a/results/greatest_hits/merges_tested/apache/shiro.csv b/results/greatest_hits/merges_tested/apache/shiro.csv index ffa5aab189..fc2f0da6a9 100644 --- a/results/greatest_hits/merges_tested/apache/shiro.csv +++ b/results/greatest_hits/merges_tested/apache/shiro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,True,25,39,1940,2,True,25,Tests_passed,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,True,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39 diff --git a/results/greatest_hits/merges_tested/apache/tomcat-maven-plugin.csv b/results/greatest_hits/merges_tested/apache/tomcat-maven-plugin.csv index 6e296e4cdf..3cddff806f 100644 --- a/results/greatest_hits/merges_tested/apache/tomcat-maven-plugin.csv +++ b/results/greatest_hits/merges_tested/apache/tomcat-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,True,101,145,13939,3,True,101,Tests_passed,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,True,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250 diff --git a/results/greatest_hits/merges_tested/ata4/disunity.csv b/results/greatest_hits/merges_tested/ata4/disunity.csv index d671a62859..23ca74dc76 100644 --- a/results/greatest_hits/merges_tested/ata4/disunity.csv +++ b/results/greatest_hits/merges_tested/ata4/disunity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,True,242,336,13397,6,True,242,Tests_passed,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,True,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,True,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,d392dfd1cc301317c906977eb6e88f4cc93fcc968f42a7bf3f5b67eb0c4276b8,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,c74291a900df05eb1eae076fae81b8504eeb986cd2b66c10138caab84e17abba,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0 diff --git a/results/greatest_hits/merges_tested/athou/commafeed.csv b/results/greatest_hits/merges_tested/athou/commafeed.csv index a1e663d4ca..0e8e034176 100644 --- a/results/greatest_hits/merges_tested/athou/commafeed.csv +++ b/results/greatest_hits/merges_tested/athou/commafeed.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 207,refs/heads/master,6133497a29ab62720d03c3a62637410ece53fee5,598630cc23617c75da17b55d916faca005b7a3a0,23dd016f428660aab9bcf47438e318eb7f7a76b7,,True,True,True,21,106,435.0,2,True,21,Tests_passed,0eecb1074ab850268b6cabaa1bb7fb78728e9330e47a71219e150fd117d38a02,True,Tests_passed,bb2965a4da0154146ad21a2dde17bdb2eec95250528a76f126151ac1f8e3293b,True,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,4fa85cac1834bd4be0ed42bc6a564147c7633e0886cbe6d9a9075430d883ac25,Merge_failed,66c659446d36538512a938eac00723bd0cc436d3a6918f935265f7bac2c4e4e7,Merge_failed,60fceee1b2ed2d3575e38075aa29508619cac9a38327e1771e7d84bacf7213bd,Merge_failed,f5bd79a91c279f97298f4c0b595cb4cdf2eb5f92ae5cf7a3d78a3c45442ceb75,Merge_failed,66c659446d36538512a938eac00723bd0cc436d3a6918f935265f7bac2c4e4e7,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,315d4bdf00fec7bdc5d770ba678b1ee41c2a511b333b50eb54201a9a10d2cee8,Merge_failed,60fceee1b2ed2d3575e38075aa29508619cac9a38327e1771e7d84bacf7213bd,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279,Merge_failed,6a12dabe8fd9919f7fc1b4225bdaa975308c4196b1c9e1d10fb382e15bb22279 211,refs/heads/master,41344e08f72ae44e694fe561330385c1462709bb,0de19a2d182bca10623b9adf5787ba364edc210e,6f35491ec6a85e76235fdb284932f911163e2b9c,,True,True,True,32,129,751.0,2,True,32,Tests_passed,eb9f8f4ba0180c5d5314a3dbc04d89eb7e2b135a7cd3116304718afc28ef54c1,True,Tests_passed,e702bf1a920651a390908ab6f06ccbd4c02dd157f03d71096892f10645d98c3e,True,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,7650b1b61378ca8fee3d68c5f42598c30659182b20e2489433cda9fa1e3bfff9,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,25bd4f3f78b47d3c48642192ba85353c6fab5485656829e650371e727757bb19,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2,Tests_passed,8737acf44a90f96f150ca6cf5543a23121a7a9f75fb89d7b1dfd956deccb2fc2 diff --git a/results/greatest_hits/merges_tested/auth0/java-jwt.csv b/results/greatest_hits/merges_tested/auth0/java-jwt.csv index 09093f8624..3139f4a24e 100644 --- a/results/greatest_hits/merges_tested/auth0/java-jwt.csv +++ b/results/greatest_hits/merges_tested/auth0/java-jwt.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 204,refs/remotes/origin/pull/426,04706657b6695ff5794720f3a6ad7df852b38e07,cf3c498d43c8a07867b538b106d2c540b7cb247a,9fdf105c65cded2a4fde33facf24db6f581e5c08,,True,True,Tests_passed,5cd1b8fa8f0546015890375fbfe4f9abcd4cbe5d70a9a08d7cd1e951bba082e7,True,18,47,179,2,True,Tests_passed,a1373f97c187e1a47cdde2a4161e40b7d1ac6b4e4cc572cbe0d5734dada25342,True,18,True,Tests_timedout,6ca5c9ebfd5e11bc1837078398a21e8bdb21df838391e60b1307d7eeaf5ebe4f,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 219,refs/remotes/origin/pull/564,75ee6a33c14697af6c1b18b10c6a3603f0f8d121,9955599c1fb3db9927ab438356f5ae18118631ae,0333526d9a3d2893b9abb506cc38cc83de091776,,True,True,Tests_passed,3955085f8aeba2e69102f70a2bd22de2474b68479b470fff8270ca3c1a3ce25c,True,63,299,2284,10,True,Tests_passed,010f6c9866cba61a18d308d217f4881f4886852e000e6c76fb6d878a3d9679c0,True,63,True,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,b5fd2404497b663b447c40663f38832aa80a7fc78b0bf0ee6811cf3c29bb7f1b,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,7696f16f686d7f3c1205c7746ca0a5c243d8436072339a4d59164c5dc5aebb23,Merge_failed,04feb4e20ed9e204fae4a4d584ae9a99f3d17913fd724396ed1fa89b033eba6f,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,82da6b237aeb897c7fe1f48963d38a115269b5541da1e3b4b8099eb9b99adcb0,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8394118874165f5af8e9be55eae6714f880441fef246cf9b599841284f08cc4e,Merge_failed,8545447a8a08f11db002c933f54a44fdea2db1fa4d7308d925582e04ad2743f6,Merge_failed,b53caf87b958cb6f6ce340759f17c8100297c9edb5036be86f29c47bbffd506e,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f66a8068e5434e10a34cea2e96c8eac67e0ef48d24feaa2ebf411246fdfec51a,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4,Merge_failed,f9cbaca59b4d1fa3299997955ae1ce92b65ad751a8d4091f1204975d19882fc4 diff --git a/results/greatest_hits/merges_tested/awaitility/awaitility.csv b/results/greatest_hits/merges_tested/awaitility/awaitility.csv index ff20dbcb26..9d98b7474d 100644 --- a/results/greatest_hits/merges_tested/awaitility/awaitility.csv +++ b/results/greatest_hits/merges_tested/awaitility/awaitility.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/master,715ad2ecff73829eade318cdd435a9e91d8c2162,cf261505ee2a2308e270ec9a64a80ce9e5a59f10,6949468fb680f667e0d67e5228d7fabbeeee97ba,,True,False,True,2,1,2,7,True,7,Tests_passed,d1112acb55e9eb9bc6aa3e29ba486300b985ee1f7bbab4372905682f543dba9a,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_failed,5727079f3849b62b0d705dc28d42cfda3bb97fddb83c77d5ddc47dbb22decbf0,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f 45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,True,4,10,43,3,True,4,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Tests_timedout,51d8510d5ed040ef94e34f8be2c6198cb98dd31124aa0176ab2fb5539d83c4c6,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/greatest_hits/merges_tested/bastillion-io/bastillion.csv b/results/greatest_hits/merges_tested/bastillion-io/bastillion.csv index 8b281c6658..b3f7887f82 100644 --- a/results/greatest_hits/merges_tested/bastillion-io/bastillion.csv +++ b/results/greatest_hits/merges_tested/bastillion-io/bastillion.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 98,refs/heads/master,551ae81d94b8f29f3486edf9ad1ec1be6fcfce9a,7e750d65b7f1c02c4ef6385771f2f6e5e2b81435,f3905553e7070af1bf784b42768c5b17851f260d,,True,True,True,7,32,113,2,True,7,Tests_passed,bca3bc493b1a6821783af8694930392bae15267ef01ad6054af27ac16f3bd91b,True,Tests_passed,c33868eaa3a409f8b45e70e249c9d46d0e51a545dc44530e7241c3e25fa78c01,True,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_failed,104d4e4275646fe3a9efa197b0c08323d6f353aa14172a3db0603ba95e5eca28,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,cdf3b785ee50a64c79027be769bebcebd89d8e6a863f564b5554f31e7cd28fad,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,704b9d8e8ef5b0be516394e3d099df44f560e77a426e2bb0707903537fbf773f,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d,Tests_passed,f411876b5a6d8dcc75c8b65f0417e2541ff877cb41212c828cf8e7b4a1811f6d 101,refs/heads/master,974b6c963b42712a5b2d97dbd2b166d239951381,1b2173eb2ee6af0486e891f54d06aafac9ede651,63c25853004ef4631ea134254332044d17cf7bb0,,True,True,True,34,146,430,10,True,34,Tests_passed,c7c706da658feae56082cefd1b34dc6f590846fcb383f6390f6083ecba430823,True,Tests_passed,376fb417040873f09f367dfdbe2bb6dd17c1db1d7a52abd018e649d0af355250,True,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,d60728c1bf3e9e5151b73e05f01dd4c5a710e6b8f8dd2aab991980ce85b84f5f,Merge_failed,be5637b3cc2b74df95ffd4ff327ec587c8e1975307dc782394330da355a41080,Tests_failed,ebca78a08e325d9f159bca5343a30ce59c8ed944c92a0f3c636d612a9209f95d,Tests_failed,2b54efb12f3aad9665100283e284fd84b15bc9ee451124877790562b9d017d19,Merge_failed,be5637b3cc2b74df95ffd4ff327ec587c8e1975307dc782394330da355a41080,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,160fe8cb47954f87d8f38be709622dcc0bc5f1c7d6d499b3a11f02245b4fde1d,Tests_failed,ebca78a08e325d9f159bca5343a30ce59c8ed944c92a0f3c636d612a9209f95d,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695,Merge_failed,dbcc61eda41f65813a4b336395ed0fed95d6e83bfffa9002842512ca85541695 103,refs/heads/master,46d36b7b4a770c0a4404372b39c35a3efdb15cde,fb1429bc175c5ed0096d69f94368a923d45d0eef,716bdc9904562d730750e335c8ae39235f1b89ea,,True,True,True,30,69,171,12,True,30,Tests_passed,68c2d18cb418d7eb0ede410a589ceb12c00f6ed9a7e4e00b6aaab3cae3242ffc,True,Tests_passed,0b39a993d28755656667423d389963d7646a8db07bcdd8715d47eebe49121159,True,Tests_timedout,8b281cd91d66cb5258e020e3b5970fc9ceba9b58fc1c380b1fe98737ea880167,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/greatest_hits/merges_tested/biezhi/30-seconds-of-java8.csv b/results/greatest_hits/merges_tested/biezhi/30-seconds-of-java8.csv index 7a598663e3..2acdda5b17 100644 --- a/results/greatest_hits/merges_tested/biezhi/30-seconds-of-java8.csv +++ b/results/greatest_hits/merges_tested/biezhi/30-seconds-of-java8.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/pull/7,6b515ec5c78bdea3f3175bc443ad871d41a8eccf,d05e3e39138170814f8a101fd86262cb733095ba,598ae2a3ef829753d509b68e862eeb3a2f19ccff,,True,True,Tests_passed,83a2f4ff2e6006ae3321d232c58910d1406919bd0173b4d99a2844d1386d13db,True,2,3,23,2,True,Tests_passed,cf2784b3400dd3de9b1f1f17422b4c7679bff904c41e0cc9748f03bd1f37d695,True,2,True,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,aecc17bc717623a21984d3b3e27ed054c58492c0002ecbfb4b744d531573194d,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Tests_failed,437b7e1683c8a0497ccd8e45561718e4c3446dbb6bbb294ff66d113d79f8b952,Merge_failed,b87c741bb0d0b867cf62c06f9a1273c5be82c9a7c2a58784ab220f1d937b799e,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,ad8dd15ad82b9ea258c6137fcdd93bb452e7c64cebd90087c43cffdadd21bcff,Merge_failed,e9bf915dfc12a723dc244c8bc3c4e867001a4676ddd5ff1caecd851077d07351,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,f4079b631cd79cea4db1fabf6f7a17bc73c4adf6f4ae49c093fd95696badea44,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7,Merge_failed,b7298c8e38f2c76104a7c2c8fbce771f067f0c3d069d2ee051dfc43aa8d3d7c7 diff --git a/results/greatest_hits/merges_tested/bytedeco/javacpp.csv b/results/greatest_hits/merges_tested/bytedeco/javacpp.csv index f54fca3f6f..5f4839d366 100644 --- a/results/greatest_hits/merges_tested/bytedeco/javacpp.csv +++ b/results/greatest_hits/merges_tested/bytedeco/javacpp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,27be9c977a78d746890e5d5e0df1ed54502856cc,079d3d6dd4cd61f555d3b69501bcb0a16e3b71d6,7c53985d8e9d5311b478e903e80c7ff7c5fde277,,True,True,True,5,24,80,2,True,5,Tests_passed,886e3197039cc29085684c9af573bbcad613338107de59e79e75682da8eaad85,True,Tests_passed,2cabf6b5e6ee02ae1a4e92d3871b22b428d701acb7542bd90d0cd84bc5c776bf,True,Tests_timedout,f2578396dda9192bca0792c4fcc8629fb5b6f208e0feece68b61f1693950b746,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 10,refs/heads/master,0c2b518cb4bc81d77f33381473a1650c8da8dcbe,1d407797951ccaa09eb994e5401ebe123943cb5c,49b4f90556a344c1ab3b0cc35f1ac31c72039054,,True,True,True,3,12,33,2,True,3,Tests_passed,a38bd18827effdda15a694d6e2db5a91354000666798d401ecc3528f59474a74,True,Tests_passed,0141e4293d29d0c6e0cb1bfa9a44364d4c2d9c539535b2563a9f9917a47bdff5,True,Tests_timedout,261ef3ffcf4c85e51fdf322c6eeed1c596a282ccc72d72a6a03dd411dfd854b6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 13,refs/heads/master,4b738fa5c21984e5828f75c270ae17dab9c81b69,3380ee99b48a9e829339173307a35ac4363f1f44,7858f2ef7025b1947b30b5b59ab4554c5b594324,,True,True,True,11,87,422,4,True,11,Tests_passed,dbf014f98070d011d1a772484c47ae18ba016d2c0a3c00c27448a64672e67b0c,True,Tests_passed,90a3c4aab32d42d81b4861e9b5e8b280c3523f26a7719c6bde359dce73f51eda,True,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,71ae88aa8d63ad5d37e0b9d6b587c2b478de87bc75102e617ac67456265e4a27,Tests_failed,f1c0cb6781db6796b751ac59d30b6fd419ed2b95e5c2dd0f111e8ad5ffce8619,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,71ae88aa8d63ad5d37e0b9d6b587c2b478de87bc75102e617ac67456265e4a27,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407 diff --git a/results/greatest_hits/merges_tested/cglib/cglib.csv b/results/greatest_hits/merges_tested/cglib/cglib.csv index 9ef0663418..93ec25201a 100644 --- a/results/greatest_hits/merges_tested/cglib/cglib.csv +++ b/results/greatest_hits/merges_tested/cglib/cglib.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,03335449852523a223137862737f81c47d2581e7,ad455b4bc7da8ff08bf1a5045ce401b8aeef021a,89375d8f9ef7b3a890708356844d9bcc0d7d2bf0,,True,True,True,5,17,91,2,True,5,Tests_passed,7234f8af8b6fac8501bdcfe7b3ca20c4cd45326b613ff50989e7a7e04ada6fd0,True,Tests_passed,c0203c38b14ee1f94f5d2ca777e11d74ee48f11df5c1dbab8bfea0c3a502ef08,True,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_failed,2898eae629f6191da3a0808be5590e4cfda466192820b13d0faa90271e4951c2,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda 42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,True,2,1,3,2,True,2,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,True,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13 diff --git a/results/greatest_hits/merges_tested/clojure/clojure.csv b/results/greatest_hits/merges_tested/clojure/clojure.csv index 2f6b354e47..fc262ab8af 100644 --- a/results/greatest_hits/merges_tested/clojure/clojure.csv +++ b/results/greatest_hits/merges_tested/clojure/clojure.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,42f68bc7688db3a24565dfcdc1cba92dd8a99159,ad7d9c46992cac0e812ce3dd47584c9bb2fda11f,46be47c9f51ef10d0082f1bd39ffff1008682861,,True,True,True,5,49,137,2,True,5,Tests_passed,6e436259330ad74709cdcb01ed36d1d248e1410fd3d14b54c4f2adffa3030ff6,True,Tests_passed,124976a36feeda7dd8c82724cc6f128e836c84144aef72764e2acde809534d81,True,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,fdf50a939478e32540c6d31ba0b32c7bd5c7cd612d072a7b3bd0a9980ff54ad9,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,fdf50a939478e32540c6d31ba0b32c7bd5c7cd612d072a7b3bd0a9980ff54ad9,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8 50,refs/remotes/origin/dev-array-type-syms,158b0454a144656a57487e181fbc1f8a76b8960c,c066a61f16526c14dfe44cced136e80950c2e109,28f3ea21ce9251bcf65e9a5cddca4eaeb85c66b2,,True,False,True,6,15,159,2,True,6,Tests_passed,686c3b58841b6dadec224751da89741f4582fcd66dd7bfe781f3efef46386d81,True,Tests_passed,372a96a23d4916ac17c58b5177983fe426dcb58b05d61da23100d18673022af5,True,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,a178efc63c9757162b5e56324ef4e3b0c55059bec3f0cf8838821be1af0405fa,Tests_failed,e23fbf010cf1fc3348fc28c17e78c9e26ddebbd0fc873eb8c59cae0378e3b967,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,a178efc63c9757162b5e56324ef4e3b0c55059bec3f0cf8838821be1af0405fa,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57 52,refs/remotes/origin/dev-array-type-syms,1852e4708497dbef2a7ffd4ce4744678b1f6dfcf,118ecac78085b5081a8e640258bc472097418b16,9313810d6150f97285d3a2c99f50fe157869c83d,,True,False,True,3,6,28,2,True,3,Tests_passed,0559390ff8be2b5fdd3d845eed115597b09b63d5b361c737d62594c1960eb8d1,True,Tests_passed,b0d2fb41514eb2d872989a5cccbc7c31ddff1d29c03c33c51205ba0719bf0c60,True,Tests_timedout,928117466d27183cf04a1f6f7bd91c9e056db356b76d3c47343f0c8325071bef,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/greatest_hits/merges_tested/code4craft/webmagic.csv b/results/greatest_hits/merges_tested/code4craft/webmagic.csv index 7a5b62dfa5..97d2f3d950 100644 --- a/results/greatest_hits/merges_tested/code4craft/webmagic.csv +++ b/results/greatest_hits/merges_tested/code4craft/webmagic.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 123,refs/heads/develop,2913da47637694b5d56bc3773caca473707b6aba,928f98dd93bf3a0ebcb14cb663b5cd924c59f1e7,5883ed93d759e6eb23d736a0929a84ca0cad5a3c,,True,True,True,2,1,1,2,True,2,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,True,Tests_passed,828d4f95b1410834e3ee25ac9f08d9ee632ecc6adda374b305146dbc44f89bba,True,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,4cefa1fa6916912620d8b38900d395a43fa4e7e42995d07eea88a6a5dbd2caaf,Tests_passed,5a074626ba9003a53bca3810b3d40e7e75fc6bd7cf63c8cda1e781caaea06ed6,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,4cefa1fa6916912620d8b38900d395a43fa4e7e42995d07eea88a6a5dbd2caaf,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554 163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,True,69,89,2060,44,True,96,Tests_passed,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,True,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,True,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,11631b5943c563260b712705fa030a630299ce39595b160dcfa9e747f02b2f75,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,bb66ec256429f744a381d9761df927d1056c06cf05399f01c0b0c2121f654dcd,Merge_failed,e9a47a77d84740f02e8e3b1b4a0f42ee9ab03ccebba00a50734b5bd74448f13b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a diff --git a/results/greatest_hits/merges_tested/deathmarine/luyten.csv b/results/greatest_hits/merges_tested/deathmarine/luyten.csv index bdac2bd967..719037c0ad 100644 --- a/results/greatest_hits/merges_tested/deathmarine/luyten.csv +++ b/results/greatest_hits/merges_tested/deathmarine/luyten.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,f1ccf991d7276bb172fd1d961ffd5d1dab2a5d71,577c8124218ed32e104b95c023fa4fdeffcdb535,00cc8f7d7402646075f923c3a85a8539be084a2c,,True,True,True,10,60,179,4,True,10,Tests_passed,bc447c7c09b2dce5ca1bd491624ccab4688598dd19327bb9d718d4030cd51a63,True,Tests_passed,9178c523be5737a10cbe34759ddfb5e29f8c41c5af59fdae414b325844e49d1f,True,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,d1904b7ca91e653fbbe96f6323ac334053638ae15a4359c9873c1b1cac2b54d1,Tests_failed,1ea23d2715df08027bfb24d11a35e019014ded691082f51ce7a649a8824dfa43,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,d1904b7ca91e653fbbe96f6323ac334053638ae15a4359c9873c1b1cac2b54d1,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca,Tests_passed,8d2925499d371c1aa49ea66a36f9877558e9eda173881d86c2683da13aec52ca 19,refs/remotes/origin/pull/130,fc86bc1229c69966e56c737e4d56f8c1fdcc4fd4,6d255bec8b137886ac3be3305f775b1467fc412e,ba68ee10ef017cc92bcffdb3c7a33c64397e84bb,,True,True,True,11,84,332,6,True,11,Tests_passed,d0121556342394f04dccc77d4d3bdbdabdafe867113e5a48cc9eba0ae39e129f,True,Tests_passed,308ec2594da2ff02fc40e524921ddecfd669215d339f40d5f715c93982396738,True,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,f99aa30790233e62f9a2f7b0640846a01cff0f66770282c9bb36ac007334ee77,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,806e28e79a3287ea3bb63d592aa5e00a804c3dac66594ea387c8080e474ded27,Merge_failed,ddf16ea51e80cb5f9945f2d40607e6d26377331a71e2135523f632e089800c90,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,ab2db68a05781df04462e6e41e0929fea5d140d08b8aa26ddd0a757ed65adf21,Tests_failed,58f5f1aa895844aa2e9c9bb75b046f62c38d7958cfa30abda132fb6ad8e9e871,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863,Merge_failed,abe31af3cf3016328568a0e937ab749812c082dd319607d9f478ba87aa08b863 20,refs/remotes/origin/pull/152,c6cd5d8c8ef78ee339561dbf844332d9aa4a5f8c,b9e83eea5caf895a4d189a6c2d64302b14c11475,75d5603b2f12d74852261c0f402f3d53cfe62ce3,,True,True,True,14,77,460,5,True,14,Tests_passed,28f0b4397b36f88cd422ec71ecc705cc952708caa5de734bd0e076b48ea8c6a5,True,Tests_passed,df02b9bbbddd8cdbea53864b61a6f7148ea6ab16a1ae814e9aafa190ff881806,True,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,98267cbab37b27267fffd40c171d039003cc8bcde170589b23c78a1624e9ba14,Merge_failed,60f9b5aca173ca937cb16e40ee57c9186a0865240de1e19e8eaf536f6b5d25bf,Merge_failed,e25310b1f7dee9c69642b72ff9965efae46267ac3f2d356b70c693436be98c41,Tests_failed,24014416d7e6c6280e498054db56bedc26fda8fb7d8779dca2c599fd496a0ff4,Merge_failed,60f9b5aca173ca937cb16e40ee57c9186a0865240de1e19e8eaf536f6b5d25bf,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,42770bc83916266aeb5fad88b14e6330a0ae797752cec6badf9d96734219db02,Merge_failed,e25310b1f7dee9c69642b72ff9965efae46267ac3f2d356b70c693436be98c41,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,dc00dad6f21a0f826651614d266dc8a82cbe819c2d770e4e00f0901c7ac335a1,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3,Merge_failed,f25896ff0635b6120e355ab6c1a70ed0154ca2c27901f0ed17283cdd104357e3 diff --git a/results/greatest_hits/merges_tested/deemopen/zkui.csv b/results/greatest_hits/merges_tested/deemopen/zkui.csv index c4407619b0..7552a4d1fa 100644 --- a/results/greatest_hits/merges_tested/deemopen/zkui.csv +++ b/results/greatest_hits/merges_tested/deemopen/zkui.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,True,19,79,508,3,True,19,Tests_passed,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,True,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Tests_failed,8ac7873650a0138d29417f2066c72baaebed3c15831f67e1684bfa699a69536d,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,b14ea75bd37183a1ccf65a6b6347eab48c4306349098a167166dbb5a4e3c94d9,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1 diff --git a/results/greatest_hits/merges_tested/dius/java-faker.csv b/results/greatest_hits/merges_tested/dius/java-faker.csv index 7a644c175a..92053f09f9 100644 --- a/results/greatest_hits/merges_tested/dius/java-faker.csv +++ b/results/greatest_hits/merges_tested/dius/java-faker.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6f72cb24c50fa83d23a92aad65bcd57efc6bd650,f5efa7048f29bbf3f7a7423e4ac0e8b1a645928e,1d884a03d6cebf07de6fcd24d416f4b187f1d83b,,True,True,True,14,24,375.0,5,True,14,Tests_passed,084a0323468c37a50b9c51507abb885e92ae649c3c1130143bf844ccc74bea50,True,Tests_passed,45060dd0675364853a53d39266d32f2c103162231ce9cb842af279462831eb23,True,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,0aa3783a701cb76150c1ee98b9725469f3c0a882b39c2022ac47c1014f4df648,Tests_failed,1c5b66a8bfb8b2bcb0bd5c91bb8059c8db8597d526fde6adb408c3c819d2488c,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,0aa3783a701cb76150c1ee98b9725469f3c0a882b39c2022ac47c1014f4df648,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e 9,refs/heads/master,b60f23a54a511cf7e24c09366b2957219b448125,6312699f5ed6492f3b9005d849d4a57376f21f7f,aaaf8d9e4783a7e5a2d693f5b870fd2a3756238c,,True,True,True,11,18,894.0,4,True,11,Tests_passed,fa34cdba4acbfbc63ab111a36e7fa1aeaf7eb053684af45ff584fb4e3e62cf9b,True,Tests_passed,618d84f9fcf8ceb73a5ae82b6493c069870273a2e24386289433ecc72afa4760,True,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,05bd0d2ab3662829240207139bcc1831111eca79c247ba1d9442c90738797774,Tests_failed,6a645b7a00e9703125cee940a8f1dc257bca12861be0a342758ce420e45523a4,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,05bd0d2ab3662829240207139bcc1831111eca79c247ba1d9442c90738797774,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1 11,refs/heads/master,aaaf8d9e4783a7e5a2d693f5b870fd2a3756238c,e09c6d4d31b373f8e68fc6c8d00353b77d472730,4fce1fad9e76780fa24aa3d4af22a29aef538593,,True,True,True,42,68,1228.0,5,True,42,Tests_passed,8e427c885ce76d15d2d7826ecd19f0e7727c62ad7500939d51b845590c92e60b,True,Tests_passed,0f262510f19962c54027ac5eca7ac64b688e9b1ac113b91acc43dd608df404bb,True,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,14c26c6250e5c20768aa6febaa2ca54e3273ebd6f71f10c0689bbbcb154b414e,Merge_failed,13536c220a4b533b58470d03f6802dac1e12fb6c72f8c29e2d29dbc3218f5d34,Merge_failed,994fe419e004a802a2fd4d5736d0b3a3704b9124b2c00ce3b66bca06ed906c3c,Merge_failed,0a2222e659eafdf79cfb74902b818f21a62fd2fbc089360f0e4ddd737ac41912,Merge_failed,13536c220a4b533b58470d03f6802dac1e12fb6c72f8c29e2d29dbc3218f5d34,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,12cc80b93159ebd6ce18c4fe872aa70000dcf772dc6baa97a45937548fd798cc,Merge_failed,994fe419e004a802a2fd4d5736d0b3a3704b9124b2c00ce3b66bca06ed906c3c,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56 diff --git a/results/greatest_hits/merges_tested/eirslett/frontend-maven-plugin.csv b/results/greatest_hits/merges_tested/eirslett/frontend-maven-plugin.csv index 13fc946190..af9460d529 100644 --- a/results/greatest_hits/merges_tested/eirslett/frontend-maven-plugin.csv +++ b/results/greatest_hits/merges_tested/eirslett/frontend-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,374f2be4451a2e49c234736ca7e22067722c1c6e,d059da07326c358227ed34c76469fafae4005b71,26740c875cde63eb0faa1abd801408cc62f9533e,,True,True,Tests_passed,1d6e431e99a211d008cfea7c5642e88547d86c338587caef4f32bec54618680e,True,98,268,13006,3,True,Tests_passed,c1d8bfa45a86a8698fd813896b461bb4d90fbe674fe658df70de12a80d48e63c,True,98,True,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,1bbc8da9a774bf9f7f73687a69bfc3b8116a5955e759d712916a43e929094d78,Tests_passed,ccdf200805a8fb5616551e5bac2675b360a652690b5ca003daa9a198e324c79c,Tests_passed,e29f570687ee54f1d67a09c1a2a23565be76f179b559dd54539678e8b3088f18,Tests_failed,e5a6157a97537c5f6094dd753022be31792561018968d88488766fedb08a9e6e,Tests_passed,ccdf200805a8fb5616551e5bac2675b360a652690b5ca003daa9a198e324c79c,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,7af4fac796e2d3ffe802f8108e8efeb8fc258bab3c3bc7bc6891a36ade5b03ad,Tests_passed,e29f570687ee54f1d67a09c1a2a23565be76f179b559dd54539678e8b3088f18,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326 90,refs/heads/master,bd47851ce5a12bee22e36c45e18ca8839271431b,04666aef48b8e3e9b5f3dd0e5e7d7e411bc7b2fa,e568debb5af86abf8467af1ae0c1220d178e941b,,True,True,Tests_passed,58551b7e6a308379cb1ef1bb69ad9a67159fa5b610ede1f8146b998caa62451b,True,41,137,2590,2,True,Tests_passed,7309ab1651e6c83267289a05f1ad228860ed371ffaec7a3cdf69e37009325624,True,41,True,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,b6e7b236d1b0b64103acf9574442f8b89a7feb28d54f60e478cc2775342d0112,Tests_failed,c40a7b69d3f0015a93f9b1330aaa22c8db871be46a28f4d115a28a4e8a780e6a,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,b6e7b236d1b0b64103acf9574442f8b89a7feb28d54f60e478cc2775342d0112,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7 120,refs/heads/master,ff8a15cb812818112592c0bbb4121af3b5ad0844,76120dea4ac1cdd8a770632e9ea35b5a0ecdf278,e0d5fc7377a636cbdecdf55c3752ec94b9ed9ca2,,True,True,Tests_passed,24c0277a5a1f4e7973d1c72f9dd3467bf99ad5e4e659b805ef20b7f8b30a06c0,True,23,77,406,2,True,Tests_passed,b97d0e88054d86d0392ac5e4db99979b9591274a3dd5824770fba969ef4ef0d9,True,23,True,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,b51b96897cfa26870dfaae8101e6b097bc8f91b7ef6dae91ec08553a0b79201b,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,b51b96897cfa26870dfaae8101e6b097bc8f91b7ef6dae91ec08553a0b79201b,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1 diff --git a/results/greatest_hits/merges_tested/elasticjob/elastic-job-lite.csv b/results/greatest_hits/merges_tested/elasticjob/elastic-job-lite.csv index d5690cd032..d13acd85e5 100644 --- a/results/greatest_hits/merges_tested/elasticjob/elastic-job-lite.csv +++ b/results/greatest_hits/merges_tested/elasticjob/elastic-job-lite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,2495503e688486eb2c9e56c57bbed14bf9821c45,d52707f7f365b3d838337b0af63b23ce61c65da9,0b9aab879a38adae1faa3e6e3bacd0ad1f2b60ab,,True,True,Tests_passed,97fde93754d0edb9bf6104a23c887de5e5518a5620073d43e882f010066c38fd,True,10,33,119,12,True,Tests_passed,5d931b96ade64599778526a9c561084342e642bf7b70274d201f999330e83cdd,True,20,True,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,cb9104ec6620cba9f13d569b969ab63dcc1e262195c5091d1d5c4204699db0f2,Merge_failed,9314e8e73474037ce52e6f5243e82be60e65f4cf8db2e454f87b0bd2c118c39a,Merge_failed,02e4fc2538fb3f98645c834d680b15ad72ccd4fead99df71a970e14a58d5ff08,Tests_failed,08a4da369adf8ed22e63de8c4926ffca79c40df0c0f0272568e3e82c5d4d6136,Merge_failed,9314e8e73474037ce52e6f5243e82be60e65f4cf8db2e454f87b0bd2c118c39a,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,704bded99847c0038b8a985b92a6462434d784c57c8057769a6683ce6e948d6d,Merge_failed,02e4fc2538fb3f98645c834d680b15ad72ccd4fead99df71a970e14a58d5ff08,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be,Merge_failed,b513b2dd89cdf7ee543aa86a30aed094829282e89305691ed5947d77e6f2e5be 196,refs/heads/master,ca929e12875190c9739c66d0586d76bfbf52be0e,b0f86b549a9a946f890d49fc14ec55b46cac745f,7bde7e573a551418194fd49e2a95f16007cf2647,,True,True,Tests_passed,322f5399ded6e36bed80726b35b5f2dc9147a4ee86b6d898286aec454295e85e,True,27,93,380,2,True,Tests_passed,4bd834c1265abdb6cf7330fd34017a14e34c393d56d7cdc3a92e9eecba41b010,True,27,True,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_failed,5ee890331e8e255c162944d2208db2338f29849649649c226e8c2fbe59081bec,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,66e447605213c304574c76954433e2a6e9d5c773147a5c4e250dbb428b3ac526,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2,Tests_passed,fc2856bd9d1c85016b6dbc493188188e1375c2fa5c850c940cafe621dd3e81d2 287,refs/remotes/origin/pull/2092,6381f6c7e98de6ac0957cc2f89400aa9dabc2edb,c5e2c9f23096117dca0e9c0c3f17dcfe56c549b4,9fec9e51c2d031381a107372fe804d1c5feb3b47,,True,True,Tests_passed,4d12a0f19d8becc50f1199d646c3e9c9caa29d36fe29f8865ebfdffee8747a6b,True,15,38,237,2,True,Tests_passed,c4a0f983c33a243b7ea436dc48fb9c04cd56024e681bba66458fad1a06d00e58,True,15,True,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,add0cd7cc21dc334c10856c168c52f01b88025fafde646e3130f708e336fa05e,Tests_passed,46f3cf434a6fa26036edaa5f0afd5040e21dfdd9a829abb9371105abab84f817,Tests_failed,61782daea1847febb109062d92e45568bf2a3f85ff8e579fe4e781951db6c369,Tests_failed,27d596b306468f82ce4ea2625169d3c986da5ecf40d1df53432d68e7525de8bf,Tests_passed,46f3cf434a6fa26036edaa5f0afd5040e21dfdd9a829abb9371105abab84f817,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,b1b298127f649c6054115c8f3e6bb62c24631ee80aae6b869a0d232005641df8,Merge_failed,9b6f63f8bab0fb4e4f23bd5515cbef1dedb188b948eca60fbe36f59b80258ba4,Tests_failed,61782daea1847febb109062d92e45568bf2a3f85ff8e579fe4e781951db6c369,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,65f4d0775d6e6b717a84878b8795beb3a0156e1e9650e850fb7a9b7a7cec7197,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7,Merge_failed,99c959753bad4b706bd352fea114744ccfabfe1574d59d447cb8ca9bfb33cdf7 diff --git a/results/greatest_hits/merges_tested/elunez/eladmin.csv b/results/greatest_hits/merges_tested/elunez/eladmin.csv index 048f3e9dfe..4505dac30a 100644 --- a/results/greatest_hits/merges_tested/elunez/eladmin.csv +++ b/results/greatest_hits/merges_tested/elunez/eladmin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5959c3fc62add874df2562d95d24dcaa569d3453,68608b28e34ffa73d12df74555e9dc7d63bfc532,837f23080b0cb1d2f055229e040b355fab53e3e5,,True,True,True,45,139,771.0,4,True,45,Tests_passed,3b5be13efb0ae2990606734c9b61bc3962a231a443e3f7e2fbc18fc2a439cb2b,True,Tests_passed,49cce913d7e69d8b8d6fe6e75171664ec02ac761d31eda9160efbe132cb2b937,True,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,fd1ca2df337a47240b9a5bc601b47b31d53946c97a2c304993c435a546b4df85,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,0e9f3130be034fe8788502d0a2ef78798f2f8186fc6bd07d1e6a046d80b9d3da,Merge_failed,3708af0bfd8b49fdd26fbde12bc99d22cfe8479b352e447617d4e2bad537bbf8,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,e1c74d2275975a3570bc6be7d75f10f1c313da6898928b1fa9774fc860843448,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c,Merge_failed,50fafb1a9db170c06a7ade74843efb340506279191072d76b3912c195bd0c74c 17,refs/heads/master,8b7a1ab6277b4228c8561b0033e9fc9122a100f6,8def7ea9a016c137cbd8344542fe4e827ef364ea,fe77f081c580912c28bc146a3a941d2bd37c414d,,True,True,True,2,2,7.0,5,True,5,Tests_passed,4ba8286b9b9836474e4bbd0ace6d49b282b0d1b3bd6e3013fc587484b0c83d2b,True,Tests_passed,baf38292059b312d12893fc080e9ee054a4d3452d295e3df2e822a2c6003e0b3,True,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,317ed9d62ee7ecbc10cddcaf39ae9ca5efccad7e5574c6633192716cbbc1988a,Tests_passed,4ba8286b9b9836474e4bbd0ace6d49b282b0d1b3bd6e3013fc587484b0c83d2b,Tests_passed,6fada5fb8cd1456a721c62227931a9a0457f5d0127d89a6f688c1ee2b1f70939,Merge_failed,fa1c8879840406d3d9dd95101270fd3c43727321654843a9714ba8830a4b12c0,Tests_passed,4ba8286b9b9836474e4bbd0ace6d49b282b0d1b3bd6e3013fc587484b0c83d2b,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,900e3649c5037cc8e66abdbec7cde3dda0ead5eff29220cd58c28cfad7cbb9af,Tests_passed,6fada5fb8cd1456a721c62227931a9a0457f5d0127d89a6f688c1ee2b1f70939,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4,Merge_failed,84b29a8640bb8549f4ad8429d6bfb0bc37fd14610725c750c52cf4939db94cc4 52,refs/remotes/origin/deploy,e67300e919771858e4e0d7240b55a6257f261f2a,d98c1a1db6e9d62e48ff77aae855ecad268cc811,484785c22201802bb0a37ae5f872325903c4acb6,,True,True,True,21,58,281.0,4,True,21,Tests_passed,e4962a80a03aa228d759effd7ecc578712da497ba00be6549a2a1440fba059e1,True,Tests_passed,f7cc4c9932d480e5f7146d8ec8d4dc60d427fa880850b08aac3882e65944519c,True,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,fa7510e993f70a299f15db718a8fb9460bdb7b9ce580d92d9de57079fd727cca,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,5b52d0475a874af5253e55c0123cfc7360891b6107e4f0f8584ea551fdd62066,Merge_failed,b3e6cae9466ab20601c6d332052732a8e7336236b696d987345ce19cab9c8f36,Merge_failed,3ceabcd1d4cff924b6f70c65a69929c833d65a8982cd42172da3e0611d4dda01,Merge_failed,9f91cb490f5d3ad8675930fa894c1e0d5f79a8c0e6035e4cfea594d2d26dff88,Merge_failed,b3e6cae9466ab20601c6d332052732a8e7336236b696d987345ce19cab9c8f36,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,8fd70350b2c6835a953d9eb9f320388926ec11ee61ecd67961cf4b8497a7e017,Merge_failed,6584261e29c72822b7c1e328638ab2f4d0aa856ef70483a8787ef50e43d049d4,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,fa7510e993f70a299f15db718a8fb9460bdb7b9ce580d92d9de57079fd727cca,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9,Merge_failed,aa4414fbcd7694c0a0e8b60b8c7d1d00c9c3dd448f65dfcf726554692a3058b9 diff --git a/results/greatest_hits/merges_tested/esotericsoftware/kryo.csv b/results/greatest_hits/merges_tested/esotericsoftware/kryo.csv index bece0c9ffb..8021ed5639 100644 --- a/results/greatest_hits/merges_tested/esotericsoftware/kryo.csv +++ b/results/greatest_hits/merges_tested/esotericsoftware/kryo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,36b366102c717919d4d4b91451daa2e81f7416e9,cd0da250d97a7d1b0207db6df16d740fc6d3f70f,c2a94b46ff658505a1ecdd047a22bef4886573c5,,True,True,Tests_passed,d8491a3920b0a3df8e37b0d86af3d60ad3ef4b4b54f103d5e50c5a2c943fbc63,True,18,54,1905,3,True,Tests_passed,8d64f424f4f3be82660510152c07e5b182a15f60686232daa2a341adb9ddc8eb,True,18,True,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,675081d0e746d60aca069504bd5d8b7b04e5854afaf22acecbb426a39e288d19,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6,Tests_passed,6ca15004b4f269e708f1ad8a42e5d14a9bc7f86deab1580afcd9a1ba4847a2d6 24,refs/heads/master,5d1b90e313d71b31b38feeceda9fa7c682484aeb,469cd2169b0d0b2856400aaf368f09865e4ad9b6,ac885ae0bcedb43ad0f1736a5eb0fdc0dab3ee49,,True,True,Tests_passed,0db04a4b326a77dfc610e13cf2b7f2a7925665666b8670b96d7d3d7b1b55e509,True,122,134,1217,2,True,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,True,122,True,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,268a987d613a0d241bfd6598454b79c23e94a6427661e2244fd6cfbc4970f8d8,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,268a987d613a0d241bfd6598454b79c23e94a6427661e2244fd6cfbc4970f8d8,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea,Tests_passed,ec0c4dc2d4606413812258e8fc2ad1db92e4be2feaa60d107fa1722155d04cea 25,refs/heads/master,ac885ae0bcedb43ad0f1736a5eb0fdc0dab3ee49,ad2459b48e13f49a78b1868fefa7c988fa53ef06,8b3310f8f3ffe3940a7a838e0fad7c0f2717c578,,True,True,Tests_passed,686f558e9d21a324a15a8c2d7bb74f93e4f51304983e2eb33c55dc88df5e649e,True,121,130,1211,2,True,Tests_passed,acc334304c7a8685ee77a59e4f6cef2b6f5eb404df8913c934beffb97eee5aec,True,121,True,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,eb85182323dac4cb89c1d13b378ee8319825b42f95a6b5e9451e70a0f86c53ce,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,eb85182323dac4cb89c1d13b378ee8319825b42f95a6b5e9451e70a0f86c53ce,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a,Tests_passed,06dfb5f0f080bb7a06fea60283c5557093a5e375a277f2f8e35f01cf78be2c0a diff --git a/results/greatest_hits/merges_tested/fasterxml/jackson-annotations.csv b/results/greatest_hits/merges_tested/fasterxml/jackson-annotations.csv index 4f72fee681..1f3ae4dd3d 100644 --- a/results/greatest_hits/merges_tested/fasterxml/jackson-annotations.csv +++ b/results/greatest_hits/merges_tested/fasterxml/jackson-annotations.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,True,6,21,194,3,True,6,Tests_passed,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,True,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Merge_timedout,,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04 83,refs/remotes/origin/master,ea746ea4efb59e14f6af514696b63ffc2ddface2,2c63ffe80138755675acc5cb0b94a3aa2347c660,b1245811a100097c0db00af73df45dbac387991a,,True,True,True,39,218,874,3,True,39,Tests_passed,6716d8d98ce62783e39c068d948d58871a2efacb15f953e63282acdb88bbaceb,True,Tests_passed,bcb5a2a4fb808ec240fbff8596c061f8a722648ab0b22eac567e46248198682a,True,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,31aae69e3962d074268b0c1e09dc57ea2d762f0399108ef297cc8537871491ca,Merge_failed,8215ff101ff15a7552df991e62067654938fcd018425e3f362f5cdaefc962bf9,Merge_failed,e5628cf531079d321dc1a1f3d714b953a050c63b6c70a0cad4d6b496e874ab04,Merge_failed,e5628cf531079d321dc1a1f3d714b953a050c63b6c70a0cad4d6b496e874ab04,Merge_failed,8215ff101ff15a7552df991e62067654938fcd018425e3f362f5cdaefc962bf9,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,1b93d5dd8962383d4cd1d0675a5c241591efb4fe06b28e93ee84ce21d52d8501,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e 89,refs/remotes/origin/master,79b31c49abd82ad6802f9b3075d700de2af26ab2,c58f2dfabf288b7861740595bbfffd76fe95c7ad,b7ed5e83ebd286dc955f054933af406ac6a07ef4,,True,True,True,40,220,885,3,True,40,Tests_passed,41796e02e31a7675e086aa000b34f3346782615d4f5444384c168874e3c2eb6b,True,Tests_passed,d15055024ec6aec818f5d248a202a119e925e208c0d89dcca6f5b69f9290875d,True,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Merge_timedout,,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b diff --git a/results/greatest_hits/merges_tested/fasterxml/jackson-core.csv b/results/greatest_hits/merges_tested/fasterxml/jackson-core.csv index 0da9acdb8e..6b9eeae851 100644 --- a/results/greatest_hits/merges_tested/fasterxml/jackson-core.csv +++ b/results/greatest_hits/merges_tested/fasterxml/jackson-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/2.17,a01cf6961cddf10ad7fa55f7185fdd141381d929,cc991e6678e9360353638b99511b3a6bb1f1ec06,03013f25241303a41c62655f8bbd2397890ac2cf,,True,True,Tests_passed,400e698f3a4e7aa4774eff6f36cfb64e9780f1ac42de328118cd84554341b2f5,True,58,329,1395.0,3,True,Tests_passed,64ad0eb9e73d8bddd9fd4e5f434cb6287335276952f876ae3685a9e78864c625,True,58,True,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_failed,3acec4cc84bf0d63389fe8a1280a2e91a1f21ad44b95f4ffa924521e21f2e9eb,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b,Tests_passed,9b2ffb8f5c2104beb816aa14569288e18583160bd700d14d04ecdd4a7108652b 30,refs/heads/2.17,0066b88023debe6dc7243675a968895f3a0b98e6,c67612e1312309b160ff42d092da3af22580a01b,c37bf18c26a51fa241c2ebe074903abb344f4be0,,True,True,Tests_passed,1f2c7d089795c22b7011e58752b0741c6c99f885f8a206e0d70f50f048baaa33,True,300,1726,13941.0,2,True,Tests_passed,3e4855e7f001a54c00ee631048f867c9768a076e4e4f40d6f0ac2eb2ddaa936f,True,300,True,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889,Tests_passed,b1c5cd6560278eb72e84d3310161eec6078ed1d4841a7486f91229adb8cfd889 31,refs/heads/2.17,c67612e1312309b160ff42d092da3af22580a01b,9fa856c1a545018ce40a86b918b514c3329edd86,3aa1ef0497a032cb3267e5fe45ffe09891fe012b,,True,True,Tests_passed,9dadc266e12dde16c64e3359890eef52b603f7bcdeb8b37f67ac1efc790acd78,True,300,1727,13956.0,3,True,Tests_passed,46a3b0545c977924ff822224a90b4b4a9ed4ca7cae4f520c7782e321a7f30099,True,300,True,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,8fa918d0a68d60c645bf5f18dbe1e51a78855716bfcdf25e9859ac296bbb3d8a,Merge_failed,90599e88afa52b236c06361d3484a1e5b1fcbbc882281f7831fa3f522220c8a6,Merge_failed,db1cff4de081aa12d424564139b80e2ba8619afef6fda5333db5a6d939f629f2,Merge_timedout,,Merge_failed,90599e88afa52b236c06361d3484a1e5b1fcbbc882281f7831fa3f522220c8a6,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,16d6caa7534373292c21746b427cbdb9f93c8b66ca1f540beff57945d4fdb0a0,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa,Merge_failed,a6dcce7c5fae9c4259b15f125a5348b88b282ad76aa4f6f6a6e56424dca2abaa diff --git a/results/greatest_hits/merges_tested/ffay/lanproxy.csv b/results/greatest_hits/merges_tested/ffay/lanproxy.csv index 009a6077d0..d15cea433c 100644 --- a/results/greatest_hits/merges_tested/ffay/lanproxy.csv +++ b/results/greatest_hits/merges_tested/ffay/lanproxy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b398ec123de9c959a731c6d19ba4b4bf8d39a9ea,d247ab06fb9f448c690de5fc7e91ba22cd82c19f,ca4d4c4753fcba9783abb3395800abc39afcd019,,True,False,Tests_passed,fec37a13727460eb7fbaf3636292bd86d77d9d491a758b22480a5bce97041e72,True,5,6,145.0,16,True,Tests_passed,e1e759aab60d5b19d141a79e4f2153a8d41ddc40d68ff6a6c2cb8ca1d795e052,True,17,True,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,ad04d3693f1ced2134013679bb5eff9ac388894e3203abe75f23cf8341a63927,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,4f7c6c58e8cc3550cfebce63a4807dcab0d7695a51f86bdbec8525167bca8e93,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,7c0158787f0801d223f62df7920a930845d64ee77869fd9e9279543ba2feb3ca,Merge_failed,c257f879688f452a19ef4db2cd236127b8dea8e54f1acc9b3d54de1b3e8a8bcf,Merge_failed,29ed96728ce88cd648a9b4a25cf509cc7f5c401bf04a2ac55a3362a42a8a433e,Merge_failed,ab34fec52113aa49429acafdeb4cc3f448ba7d6502de221ae9db6dedd3e3be82,Merge_failed,c257f879688f452a19ef4db2cd236127b8dea8e54f1acc9b3d54de1b3e8a8bcf,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,4f7c6c58e8cc3550cfebce63a4807dcab0d7695a51f86bdbec8525167bca8e93,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,89cd2ddee6b3b02cc1fc4eee33b49c2ddd71bdc14a846ac452a289febb29bc0a,Merge_failed,0109a135aab2259ca10bfe6a512bee17ffcc3c97978fcc75e83f4b697be71ae5,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,ad04d3693f1ced2134013679bb5eff9ac388894e3203abe75f23cf8341a63927,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7,Merge_failed,c328100c5d67269aa0cbf04213099f312bb595360911ecf111ab91f93cbda7d7 4,refs/remotes/origin/for-io2c-cloud,1e0cfe7542abf06498662d5723d547188e65c673,2b43c685e954366252e425dc2c2b8ae0b3cfa0d2,a680a6565eac57e0eb0aa27b25bd2d39efdd47ee,,True,True,Tests_passed,5bd2bf681e8ed090661d84df1a6e27ee4915ff23f6892fb45b79edb90c160edd,True,4,7,22.0,2,True,Tests_passed,317a9186ececed2938492e561ae7eba1ee1032306ed77032e7292a433cadf922,True,4,True,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,a4ffd56c32fd83e35aab0adf73bb0055ded766f6ee4fe16fa000a4983ceebc6d,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,a0495a43c69692b217e772421a97186127d5407c87363caaa326d6ecf233ea31,Merge_failed,d2831018ab76440dd753033f7e7df6825d6be91632d60e3bd140803f97298cc5,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,50c832a6472b6834724947aa37d92a47c356e84f438b5e9db569de5784fd45b6,Merge_failed,1e28913346db23098464a82277c619f0c2265d765192fe89dc4da01a69f9a0c4,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c,Merge_failed,8f4c62acac2e3f2ff7fe37377672b99631ee89e35768481e76bc306d3842b26c diff --git a/results/greatest_hits/merges_tested/gephi/gephi.csv b/results/greatest_hits/merges_tested/gephi/gephi.csv index c918587444..70aef32c23 100644 --- a/results/greatest_hits/merges_tested/gephi/gephi.csv +++ b/results/greatest_hits/merges_tested/gephi/gephi.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 248,refs/heads/master,08f9c3e0263df0310cbb975b00b4eab67ffb2a77,9924b0b871a4131c1fec18beacf956f5f839a332,4c342a71593161d772e8e399718bf748252bc907,,True,,True,480.0,1436,,3,True,480,Tests_passed,d4cde71ecb1eb6ce94e44bef35daadc6bafacda78024ab43331fbc26b31a8d22,True,Tests_passed,b05cd9f6c499aa650d215ecdc0ce4adc0bb38f7a546f495836e61f1b022d5bfd,True,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_failed,072f4ab06fa1c253e92b8085c164dc51a8b423ee9af7669deab70d8733e6cf5f,Merge_timedout,,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_failed,072f4ab06fa1c253e92b8085c164dc51a8b423ee9af7669deab70d8733e6cf5f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c 665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,,True,246.0,632,,4,True,244,Tests_passed,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,True,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0 681,refs/remotes/origin/pull/2608,e161809510d2c809c5d9c338bdf90fbe1c32a3ad,f613c0a4ca67c34de37ec9818e8bfe7241d1d9d9,ca58408c314e068c070699f87f910ca253c9b011,,True,,True,1031.0,2546,,4,True,1031,Tests_passed,be104a52cf31665df637e7d15453eec6b81072fe5d02018d323baa7fa310917c,True,Tests_passed,0f769759c85fcd263a1421431d82cd406b16e38be1df08996caaf6017bb796f3,True,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,b78aa20e43be7d979814cb512cb277d84cf876d15d73e530424ce14254d77a48,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,3ecb2345437bbdaea31a8ed8d3b2c3c85a8048ef9492679910d64c5255b7ad53,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,a381fad5f4013f5b6c118b886d01f6c32deb1021833a675b544c83b37c5f6142,Merge_failed,dc80184a4c3540c8587580105a1ae3df34a650784d29b0ff810369cbeb0ccd05,Merge_failed,547a05b624e47220eb56d9253e5057dfd6d8b4a455df34c5fff284f532cbd014,Merge_timedout,,Merge_failed,dc80184a4c3540c8587580105a1ae3df34a650784d29b0ff810369cbeb0ccd05,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,3ecb2345437bbdaea31a8ed8d3b2c3c85a8048ef9492679910d64c5255b7ad53,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,ac629ae16bfad11fa5377dd647b6d6b841cd0629736bbb0fce2adc95b6c06872,Merge_failed,547a05b624e47220eb56d9253e5057dfd6d8b4a455df34c5fff284f532cbd014,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,b78aa20e43be7d979814cb512cb277d84cf876d15d73e530424ce14254d77a48,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc diff --git a/results/greatest_hits/merges_tested/google/google-java-format.csv b/results/greatest_hits/merges_tested/google/google-java-format.csv index 7277c6500b..c687def347 100644 --- a/results/greatest_hits/merges_tested/google/google-java-format.csv +++ b/results/greatest_hits/merges_tested/google/google-java-format.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/195,48316cdcafbef41ab52e86d0a530324cf5384310,b9cdd825f7f1b1c42965e7662b8193a7c6c822d2,c48ee99f0240e0e51af842b3cf17793a83508bd4,,True,True,True,8,26,91,3,True,8,Tests_passed,414989cdb218b577e803c4ef6dd7f76a6558a95dbe15c5dff230056d11c6673f,True,Tests_passed,5c22244fd9653b2585d8fce8d65743b10260cfa86595f6c77b72b4d2ac2d88ea,True,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,a2bf12c51e1298751cec7a732cb1040197b20263453e1380caa519e96100d774,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Tests_failed,dc9dfd5b92c0c56ce6537f6922a3ebb94a51ff5cf9e13941af84ddc60dcb8e53,Merge_failed,1b2ae5ecb965bfdca3dd8e371a49f6f02d6172647bbe2eb74350b2b467a70d88,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,f35c7e0c441e2597ff0129de7f72f046f02bf70ac2f4111b988fb3acedb13474,Tests_passed,6dbee6d64833c3cc5498d1ea3b6cc5c92afe9991311e4f7d41265ee8c6011c57,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4,Merge_failed,333dad386f7964a6adbdc7c27b25046e96aa4f57f19dd262e393ab81bfd40ef4 5,refs/remotes/origin/pull/237,7f8dbf83332119bf2a5524b75f93e7b519094c97,29b4457888df1c067af81d530f2b6878522d4ed0,f29bcc9479fff1a465f322c72c040a7e51483b4c,,True,True,True,4,4,78,7,True,9,Tests_passed,d08c475f37570ec422d27c2d3ba7d41e44735979015372d9ed7dc40647bdba30,True,Tests_passed,ecf4e1d7011be21b3887a45de74d648768751535b52b2d54064b190fd5289a61,True,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,fbe0f829114fa1273ab1a01a75a1d8eaa0f0331bc742717236e34dcfff9719cb,Merge_failed,79d8321cda44e86b4dbd16e6bc64a0b28e90b08909b482041740e8342102bfc7,Tests_passed,88394a0738bc6174c11aa8ec70f35e636f635df94fdd265f2b4ba9992ff4e9fa,Tests_failed,343428701852afc53ce08cca27d4aa9d6c3ad3c5dfd287c664fa61ddbca13a4a,Merge_failed,79d8321cda44e86b4dbd16e6bc64a0b28e90b08909b482041740e8342102bfc7,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,78627019a1431cce25bc4e8c3fa71bde103b27005d92207cd45d33b1a7f70a15,Tests_passed,88394a0738bc6174c11aa8ec70f35e636f635df94fdd265f2b4ba9992ff4e9fa,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4,Merge_failed,aa2fc7a9d286d375dee21a25dfbb645d655f38d310d0aca0483f44bfd095fbd4 8,refs/remotes/origin/pull/558,ff60675a0c7780375b7c6e25eeca4ffecaa6bfb2,c537db84f71204dcd0d79c3374afb0424f368fac,32b63aa2e4675cb03fb853ea84cbc37792e442a4,,True,True,True,35,95,495,3,True,35,Tests_passed,6ce9a9ddeeaf0fb7685cb846ffba6e1b85428c82acd3b4b8bfd8b1bb6772f25d,True,Tests_passed,1fea2929c36307dae063016420eadd4daf5e1676eb90fcae87b22a1a991484e7,True,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,e23153b2aedfe6176414accdc8b94ab43076fc38902b01596799d295ffce6fa4,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,e23153b2aedfe6176414accdc8b94ab43076fc38902b01596799d295ffce6fa4,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c,Tests_passed,ce42b03f2813d5638f94558c3e6d743e8bd2eab7751a08cc45167f260946917c diff --git a/results/greatest_hits/merges_tested/google/guice.csv b/results/greatest_hits/merges_tested/google/guice.csv index f07975d211..ff61197785 100644 --- a/results/greatest_hits/merges_tested/google/guice.csv +++ b/results/greatest_hits/merges_tested/google/guice.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 91,refs/remotes/origin/pull/1337,ffe30c7e3aaed880abdd03d3b9c1a87a723ba163,64180387bbb3e154427a2a37ec32a8fe5fdb3cda,338d0039c1e30038f22f0d5544842c1e87406a8a,,True,True,True,300,1899,27721,3,True,300,Tests_passed,6ed1fc4f6c90560a2535b2cb804e7a565acb6250f2d6c2286d1a8e56a020519b,True,Tests_passed,33471759706ea8d0fb998310a24a6ddee14321e3408978c76b19f5213b2c4dfb,True,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,1d4430f8e61c48f2eb391218ad5bda11c8c90e6a4618e1546fe30905eb3da570,Merge_failed,1dee3e6a0c5915156de28efd35129b8c4fba03a68684844a39118f9c0dffbc66,Merge_failed,0eaa006f6ccbbfe262a1e9e6efb1ed1cb2114d9c926f9c40665350ef076b8c79,Tests_failed,8b1ecd751934bb5f5b195eed525d7a7f9c25459a6b5e26e9d45f10c0d2e6a92d,Merge_failed,1dee3e6a0c5915156de28efd35129b8c4fba03a68684844a39118f9c0dffbc66,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,bd85a1092d0b4f432dd48a607218f600d4f196facf97aa24d324170a3fb3cbb5,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e 108,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,True,106,455,5307,4,True,106,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,True,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,3a1f77ded00d278912d1bb29b2c00bc14142b278ab618eeb3e1ce926a7a48be9,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d 109,refs/remotes/origin/pull/880,3582277dd2180a3561c903f5baecef9817a41463,92903d3974fcb8275e7c610e5eeda89059b060d9,c040e3797e30f4b52df1a10637259b2e08f1c0de,,True,True,True,2628,3640,1590662,18,True,2628,Tests_passed,9947874066e2629adf52c572abfa8dd615895b40ab5080f0325094b38053d911,True,Tests_passed,590a30ed04cfd168dd19c8bb1841b6fd75d234c23f558fdb7fd4a59ad2bf33b4,True,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,690d16e0fee78d047f6d492b675c4c08c4af7760de4d234ba7b1ec9349595933,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,36033a809a6ad414a7f8988e6bd80c6e6a70be8f8f08668db3dda329e7213bcd,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,161067042616ba8c81030ac990b71a668844b31196f2148035b40e0a5a3e159c,Merge_failed,ada6047675a4663170f5f35abbdcdf96bcb79ce3c26d98254ef0908e7ec6add4,Merge_failed,e8eaf0bb226611eb5b8b8347a4edc58fd74c2624d1f34695ca15ceb4bf02878d,Merge_failed,59849b17bd4b3fba05de50bdb47057e40389e466111c42bc6668d00ee55f725e,Merge_failed,e46a0848aa29e3c07934fbb04697cb5cafa55b951b75fbd7840ed1e02ddc2117,Merge_failed,e8eaf0bb226611eb5b8b8347a4edc58fd74c2624d1f34695ca15ceb4bf02878d,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,36033a809a6ad414a7f8988e6bd80c6e6a70be8f8f08668db3dda329e7213bcd,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,161067042616ba8c81030ac990b71a668844b31196f2148035b40e0a5a3e159c,Merge_failed,2f98eaec517bf6d8033b4f760923c083865fb39ad546184bcd3f5b6a97c06b62,Merge_failed,9a1ffd5ba538e2af4d001ab9307af0cc6a22a6ff2768e217f1ad39a75cab8dc4,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,690d16e0fee78d047f6d492b675c4c08c4af7760de4d234ba7b1ec9349595933,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139 diff --git a/results/greatest_hits/merges_tested/google/truth.csv b/results/greatest_hits/merges_tested/google/truth.csv index 4ffa4429ab..7496f9cdfd 100644 --- a/results/greatest_hits/merges_tested/google/truth.csv +++ b/results/greatest_hits/merges_tested/google/truth.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/master,6bba06199f634cae5daafbfd70935a7d76871fe5,39fa8ab5fcff494fa1ed70251869dad3816be3ec,0282392866a66e4828d75b1475dfe17b8e827e44,,True,True,Tests_passed,3084884d2027fc037bda642caaed427e4ed51ef4b912921b309165f3df3308d6,True,19,50,288,2,True,Tests_passed,103fa94c7ce6ff4f1b0fe84bd2204daafa69879d0bfb89d2329d6957c31ec674,True,19,True,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,85ed3b8eaa233ef29e8576b8b0e42ad43b240e0604764c5f41079c969a6c67c5,Tests_failed,d177b4181eb95d346a50ed69b2052e1cc595bdff1454624df14b7e2de2b92e46,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,85ed3b8eaa233ef29e8576b8b0e42ad43b240e0604764c5f41079c969a6c67c5,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4 50,refs/heads/master,ff195129ec6e45449f583a049be3b5a1f9c56a20,d87f02dfb380742e3a27374025cecbe0fdf84f68,1a99ae4aa2eb3d4df4ef4c1779966c6d66721b63,,True,True,Tests_passed,01326b5a10a18929ed0a57a32d0b7eec82faa0c9a83d5c008dde65ff95ffc089,True,13,29,501,3,True,Tests_passed,b861f94b18c119b25fe907f2a49e3935f92560e727f752f70b4191634481af31,True,13,True,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,2614a7aa06caaeb02d3f656e4e46465248f8192efdc3afdbaf83b67e8d65d00f,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,2614a7aa06caaeb02d3f656e4e46465248f8192efdc3afdbaf83b67e8d65d00f,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4 57,refs/heads/master,2e4a23bebbce280861453c0d6f6f0a3dfd0e6dde,a9381d46a71766517f5df21c00a57a3c3f4a0417,5dda414fbb153f5cb20a88611f034f0ba14ffdd8,,True,True,Tests_passed,e62f6d500f4d21fa0095de89da0eb963dd154425eb243055592ffadf0a35a72c,True,4,42,279,3,True,Tests_passed,dfca8ba1e00b31b0e1d91cd18641319bda821aac8cd14291314d6150ce598b75,True,4,True,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,1ae01ccb08ea33ce973ab4c97df359bd4c918e567a89aed28e594ee96a76d19f,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,d7e425adbddf3edb58192f0844ec22cdf4223439831f6a5924a0805986024080,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,f152122c809bfc3e357af51bf0e8fcfdc1cdef4916bae4bac891444ebb7803dd,Tests_passed,38e20705ffbe6e8f0e5efe32f7ab85cc70cdedd23c70ee77478f5e6233e07d78,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,d7e425adbddf3edb58192f0844ec22cdf4223439831f6a5924a0805986024080,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,f152122c809bfc3e357af51bf0e8fcfdc1cdef4916bae4bac891444ebb7803dd,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,1ae01ccb08ea33ce973ab4c97df359bd4c918e567a89aed28e594ee96a76d19f,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab diff --git a/results/greatest_hits/merges_tested/hdrhistogram/hdrhistogram.csv b/results/greatest_hits/merges_tested/hdrhistogram/hdrhistogram.csv index 4d9b5c18da..324686b6df 100644 --- a/results/greatest_hits/merges_tested/hdrhistogram/hdrhistogram.csv +++ b/results/greatest_hits/merges_tested/hdrhistogram/hdrhistogram.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,4faeeb6c175ff46fbb6bf38bd8b91c21d205c866,d279c913888f2fdf8dbec31f77ec2d3573f01c59,941dc5e12699dc2e4e26d0135b0823ad94a5569a,,True,True,True,20,81,1062,2,True,20,Tests_passed,94bf2bc7e83c7d8b072390cef486b68e761fd87c8338c0cb2f8ee3ae97a3ae3c,True,Tests_passed,35f0499c462e3d496567a48c771a6c5e348d5f60108e2ee075ba30f302e4dd57,True,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,be355067efdaf75b779e09a39d225e9312423e4a8ab5f80e78bd080c4e632de7,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,ad7e6b5639261b73ea86ccb9eedc737d2c10080764305f1b7a1dd63ec8057c7f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,115c91cf0b02dc638a145f987f30c06c98e69e04a16166d9f0459ecfa0b6f088,Tests_passed,4e9af85aa690231ce584ec4c6856f6ca84c7bc1a84da891070465928d94d470f,Tests_passed,06993b1ced4b7d0fcdd9a591071612cd5ab9ad11a14783a4738d19ccbec9b0a1,Merge_failed,1808b62041a58ca8c5c880b0c2168ef485c2eb7500765713950a7eb61ef9dc1e,Tests_passed,4e9af85aa690231ce584ec4c6856f6ca84c7bc1a84da891070465928d94d470f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,ad7e6b5639261b73ea86ccb9eedc737d2c10080764305f1b7a1dd63ec8057c7f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,3dc759f00d0a3cd4ded331c66a25f11ce1c5d3df9341f7c14cc7517fbead53ea,Tests_passed,06993b1ced4b7d0fcdd9a591071612cd5ab9ad11a14783a4738d19ccbec9b0a1,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,be355067efdaf75b779e09a39d225e9312423e4a8ab5f80e78bd080c4e632de7,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b 11,refs/heads/master,1b51671cf06062671af931f98a8af2a53d335a70,89b0d5981bafb6b4b4ac624473a1771405d4da20,b7622c26c63437dab6399fda38deab974d0b665c,,True,False,True,11,36,189,2,True,11,Tests_passed,936f9a91c8c410963443475df8c5010477b0f7bddeaf289e14e30183a74156a7,True,Tests_passed,6f60e1e250944900dc954f3126a307d37592d4aea76f7cab9505725c776f088c,True,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,f33b5d9d23947cf68bb0ad70a505974904dc9dad0b22fe6bfc0c4e599e0e30d7,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,f33b5d9d23947cf68bb0ad70a505974904dc9dad0b22fe6bfc0c4e599e0e30d7,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951 15,refs/heads/master,a9592e15cbfc22a9ea0777124708855ecadd4fcc,2c11bfb43d91749a731a69c1d3223a27c682c577,0f13675abe6afed9aa574c0296a0874c977e12de,,True,True,True,10,59,473,4,True,10,Tests_passed,31dbb11d70d8e48f73fca145a4e5c8c2ab4ad514d6ca237e4ed6367b786f1b01,True,Tests_passed,5be2535a9827c234398f93e39678c1a4bb0f866dec4474adbb20ad8caf8426dd,True,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,86a654b661a4c45a5ee4c75bdfbf78a81758878b74827845b93f9b04788ad035,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,86a654b661a4c45a5ee4c75bdfbf78a81758878b74827845b93f9b04788ad035,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17 diff --git a/results/greatest_hits/merges_tested/j-easy/easy-rules.csv b/results/greatest_hits/merges_tested/j-easy/easy-rules.csv index 3c551c0bb6..1ad41148fa 100644 --- a/results/greatest_hits/merges_tested/j-easy/easy-rules.csv +++ b/results/greatest_hits/merges_tested/j-easy/easy-rules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,a437b010651ecb8637c2d4e675c83662d4d529e8,be5d61bda9781047a72876d45ee515fd4977ac9a,be98dc5ed7202577836261a52712b115a9b23a7b,,True,True,True,21,31,213,2,True,21,Tests_passed,3b0f831988334338cd3c00bc5c56345535ad3e2db03ee3da4c457c5d65c7ef95,True,Tests_passed,85ca110bce78ef542ddae007fe55096293313bd905e74846ae1ef11b14e57a3d,True,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,0c792da9439532c52d0ae8dd85d4f899aea28c4c3e686e3dd9eab5467d233a89,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,0c792da9439532c52d0ae8dd85d4f899aea28c4c3e686e3dd9eab5467d233a89,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4,Tests_passed,61f514b84518ed49058709380ba314c49d2811ab952c23f15d9db0d63d4297a4 21,refs/heads/master,7f8d311fd6f8fabcc4e6b54a9e3cdcda47bdbb8c,3bb001c6fcc8f95feb87b41de52e464d27dd693e,1bff470adc5760132d3dc4ea3b37e54157eb2f7e,,True,True,True,21,47,688,9,True,25,Tests_passed,d5684b7f2e3f034de4b23969d67495f96d34280ba99510b9471f3219e24c03cb,True,Tests_passed,3a596a60caacba76a1ed8e3ecc71ba49a39194bc5a380cd6ce129dd218753922,True,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,6fea9e71ad7bada002aba69b755bfa4b6f75b93bff15f16bf40f432b5986cafb,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,1379ab73a0d8e0a852faf7b545a8547a9c08b1efe48e474da7436213b2acf09c,Tests_passed,6b4f14bb05217800c9f95608ad899482e9028aefad8f5fc7187c3ab43af745ed,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,14e7694fb3206570917e6e747919adc676f7052e8e35fd41b12a73faca532956,Merge_failed,53ca3307538fd7b4389b80570eae7603bc585c92573568dbe6557b0f0392ff43,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99,Merge_failed,2a9efbb057ad93765758720568a253818b75f7ca45c525a7c49b5278fb7a8a99 28,refs/remotes/origin/pull/184,ba07071a49b4ef022c745d13c6502b38794ef956,192d3fb32413f101c07fdbc9f5965b41a47daea5,12ef53dec57066f111a7ce9f1e72765469d0fec4,,True,False,True,99,127,266,2,True,99,Tests_passed,8ae063bf60773dbe12a9b1ab6fdcc9c7f1c0867d34f285bbc7003b4ddf87ec5a,True,Tests_passed,48e3adb0e6bc49f758017df58201dac8c127af6c9196395f3d493e6f7cec23b1,True,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15 diff --git a/results/greatest_hits/merges_tested/jakewharton/disklrucache.csv b/results/greatest_hits/merges_tested/jakewharton/disklrucache.csv index e4f8db2534..0817e4cfb6 100644 --- a/results/greatest_hits/merges_tested/jakewharton/disklrucache.csv +++ b/results/greatest_hits/merges_tested/jakewharton/disklrucache.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,True,3,15,135,2,True,3,Tests_passed,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,True,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa 19,refs/heads/master,204d41abb60f981a3f8521b7b5cb41deb43281bc,747e27fe8d35145c0edced0a6f4eda240a75c774,d0ef4584f651220b0189f83bfdc9caaf6a1c9158,,True,True,True,4,27,47,3,True,4,Tests_passed,50679c63faa75c6b2f8df6a11090deef31368696b0b8151d61ec4a20ccf2c833,True,Tests_passed,72aea9eec98e99634c934023009283ecb6e123b63be8470eee57f59891e92c4f,True,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_failed,dec66372ca71bc6b1c05d494d1fa5b24a08fdc84d0dc6436d090623d3fc15adf,Tests_failed,abe143cfb15d5307bad87845c939dfb2cd0a1a187b72042501e1e4cd084ab97b,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_failed,dec66372ca71bc6b1c05d494d1fa5b24a08fdc84d0dc6436d090623d3fc15adf,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad 28,refs/heads/master,7f28919d2a63436d1f4f762c880c16f1cbb4f6f1,aaaa511ae0cb28450d71f66b50e371983fdcc504,f0bcf1c0afe41ae0c2925dc362c72e0c71d54abf,,True,True,True,5,58,347,4,True,5,Tests_passed,90912dee9f9c78c0d221ea00da63b680f9521942f61d59272060a6fcec1fb1ec,True,Tests_passed,120480e0f2af23b1d3275934be29a006ca9575bce5affe29a98a7240b0ede917,True,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,308c60b14e1ca9951a89379aa2cb806d06bf8cbbbb6f95e74079816775f25cac,Tests_failed,c7910b63b1279c57b1c906532de14e5732166bfc00406c647a9c703d5063122f,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,308c60b14e1ca9951a89379aa2cb806d06bf8cbbbb6f95e74079816775f25cac,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d diff --git a/results/greatest_hits/merges_tested/javaparser/javaparser.csv b/results/greatest_hits/merges_tested/javaparser/javaparser.csv index b1b1fcc20b..3c79f7a485 100644 --- a/results/greatest_hits/merges_tested/javaparser/javaparser.csv +++ b/results/greatest_hits/merges_tested/javaparser/javaparser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 146,refs/heads/master,fe096eba51b728f5f0b836f31490b32a842e93b4,a9358d2dea7e519ad6cdd01f568af37194476984,2ec5bbb076fcc057638f54ba532af10c95dc19e9,,True,True,True,140,533,2521.0,2,True,140,Tests_passed,9b73d58fb2aba12280b83dff7434c66dd97a8a99027d33f8c999eab5e72b5e9e,True,Tests_passed,68cadf6c862d69cf36107a9025df2899a2d4a2f27af93d5b9511f2dd23675a6d,True,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,32171cf46f53393613ab116e34c5eeac1b8ccf6817864a51cc0726eeb3c24a7c,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,32171cf46f53393613ab116e34c5eeac1b8ccf6817864a51cc0726eeb3c24a7c,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15,Tests_passed,4c99fba537b0381f870020a844d6321d931dabb8826d2552373510fcdc482a15 153,refs/heads/master,41a398414f1cca3a82d62121158ee82662144fa3,45acd024e1b331fda75fe66942aa36a52aa4d82d,837758135a7b49391643fb56f24ef3c3193ff18b,,True,True,True,88,505,3399.0,3,True,89,Tests_passed,0c7e779d6c042228d34f6ced134ffc15c1775c3c85a7e5efc1fe41f60aac6817,True,Tests_passed,9c03a2a1254fc044b3ebc32ba232d54a53087a00204919352e24a66fd2112dd6,True,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,240917e5e5089a15801cab8205403ef4fb2426f31b2f52f833e9b5b02098976e,Tests_failed,8834a9d4910898a942fc96f5fa56f3b99f2c495d95b5a9877e9ed02f17a34774,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,240917e5e5089a15801cab8205403ef4fb2426f31b2f52f833e9b5b02098976e,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db,Tests_failed,5c4e607385b273b11ea8ee2b3c103f29556ba23d77b824aa839e3d46c8b3f9db 160,refs/heads/master,764600211e14871dfa43e68b6961403a113edb56,a57cd75a62d88f4dc87b23f95b5007ccb82b3378,008452082678aa5e21593eb4c2fccd745f610efb,,True,True,True,293,2043,8318.0,2,True,293,Tests_passed,4e88667f477a920519dda58bb58f7459f6626fb02447338c6f5eb1400a4d5aa3,True,Tests_passed,d2f8ead59255eb4042cf87c3cb8b172e0f195f3663e92d194d2f4ca53cc3ad1c,True,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,60f1846b847760765aeff2e6e6d2fd2ef75a94cff2ab5e487efb6b597800e3f4,Merge_failed,73b581fb85bf9be6957675df851cb1d641c52dbbea57447800d8ea255adfdaca,Tests_passed,45817939fe7b5188b5a5e6c36b581634823ed30732a172f619d6636e0ff41bf7,Tests_failed,bac06569fd731ef9d254d80ce8c98357c7cf7c1e981bf5065fa43a8850f1b5fd,Merge_failed,73b581fb85bf9be6957675df851cb1d641c52dbbea57447800d8ea255adfdaca,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,6ca7be626a59a7689408140cc2f8280f6369f9a464bce2ff91343093774a6f88,Tests_passed,45817939fe7b5188b5a5e6c36b581634823ed30732a172f619d6636e0ff41bf7,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,f24a21cdf01234b041c5f8f94e5a916156d072aa05407aa69056dc5955201940,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40,Merge_failed,cdcacf045fd6d78ab94facc3e63b571bf045bdae25d6fa3984b8718f36f0ac40 diff --git a/results/greatest_hits/merges_tested/javen205/ijpay.csv b/results/greatest_hits/merges_tested/javen205/ijpay.csv index 590b26741f..aa95133b3b 100644 --- a/results/greatest_hits/merges_tested/javen205/ijpay.csv +++ b/results/greatest_hits/merges_tested/javen205/ijpay.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/dev,7c0c75ff0f7feba78cf465dcc3bbe1cf0b23d16e,8be9b0e0ef39f0da1f7801b9f5841d5e7b754fa7,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,,True,True,Tests_passed,09f32db842e055faf624ee5f9423511d0a3fcdbeffe3ac249cd6a2b093cfeeb1,True,13,15,34,2,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,True,13,True,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,accd107d438eb00234be42c2188981ccd28f4863bad2fc789d1956914d91f468,Merge_failed,1184a90ca5952caec407603c33857c221152d2f6bb82c797c352f575710e2fb3,Merge_failed,1e3c18a723a4e3677697e455587c6ceea53de831fcaa5a7938f33d914d1a0c03,Tests_failed,38544189cfef7b473f33de0770cd1cec632f7a72f086beb609c4a7be66307424,Merge_failed,1184a90ca5952caec407603c33857c221152d2f6bb82c797c352f575710e2fb3,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,b0b207940a805d80c8c9b61ee31165a500e0144b0cc925577fb9503e4390544e,Merge_failed,1e3c18a723a4e3677697e455587c6ceea53de831fcaa5a7938f33d914d1a0c03,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8,Merge_failed,d7e15b427c9f13b92dc658d6a7e1117bc720c1d15b136f9a0782ab8eb70d68d8 2,refs/heads/dev,b059527e3c409806c8f9bccb7c8a8e87e1bc96cd,4d3acc222dce6df268df4e99930030e8a0031437,d051efa031ab0d5280925e575b430ee627086c32,,True,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,True,136,274,10642,2,True,Tests_passed,223b1bed8874c3797177407e6f82537ecfc5c3ddd73679957f9e0618fa446ae7,True,136,True,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_failed,fef54fb88648ec223b6dbf3d01bc06ceb8419acafe99490dbac92e212d48563c,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,620e520acefc5b2109e1fb1f4ee043c5dbf303222d0157742469910905cbb482,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90,Tests_passed,658983194d2c5423945812cdab8feba3da53a1317ecae46ae3ce6d8cb606ee90 26,refs/heads/dev,1b109c938d69349065a467e7fbf8bb9053243372,d158e9488e6e3d1996a3bbcfe4753baff66bbefb,66ffa23413e5864c84b2e460256ff8250dac16ba,,True,True,Tests_passed,9e847fd0d3cdf06e620aadaf7fa2c89587c2e8ddd6eb11884b1c37033a392bdf,True,5,5,74,2,True,Tests_passed,6407cffcf52fd06916e27c27a472564cd27b384ef02537a81a5b5cebd5e860fa,True,5,True,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,cb9084ec2f863216f7981e1503c7f6f43e3e8b14488a4f3727e59428b95be0fb,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,cb9084ec2f863216f7981e1503c7f6f43e3e8b14488a4f3727e59428b95be0fb,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438,Tests_passed,19934eb04f8f69b3850457d527be41385604059bf3e0d7fbaea36ec9d7039438 diff --git a/results/greatest_hits/merges_tested/jfinal/jfinal.csv b/results/greatest_hits/merges_tested/jfinal/jfinal.csv index 6063323177..f244253baa 100644 --- a/results/greatest_hits/merges_tested/jfinal/jfinal.csv +++ b/results/greatest_hits/merges_tested/jfinal/jfinal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,83a31ff0cf39aec29ec35e86e1b393c1236b8fa9,4d36c61b9f4c1fdad6dcc82f096c039782727501,85558c161a136e15ddc3703357410dfd002603a5,,True,True,True,378,624,3911,2,True,378,Tests_passed,300506444a5ae03fc8a4f08443ea38ad132f6c7bb91848d7f70e4656399e193f,True,Tests_passed,ecb17683da7b9a8d14f71087584ec95e8a77d143765de0236cef7edb059668d2,True,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,dfdc3b1a741e7720ac51ae818ee6ba14008fc37bf8e347a1de0d06a9fe4cd732,Tests_failed,1dedd9ee413d013626d375e6c524e813d7998a215c371d9554f7585893119c13,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,dfdc3b1a741e7720ac51ae818ee6ba14008fc37bf8e347a1de0d06a9fe4cd732,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828 10,refs/heads/master,77040eaf33ff2f0c2d3c7ea6d7b3b6d0755999d7,04b26b9ed3141349f49fa3141bd2044acc42f6c4,236c8e70295599cc96e83c44f0db84368e49ea03,,True,True,True,2,3,31,2,True,2,Tests_passed,703226916b0840eb75742e6655c4d86da210c9b921064fb905f811f02cc0cd0b,True,Tests_passed,54a415310644e77be425619dc944a025753ac0214de49227ddd111e0cc2b79eb,True,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,47794c6f558f425491ff5b0b4ae8bea47739c3c289a9d3c0630c24764d01373c,Merge_failed,4853a9b6a5e457c1002311884e5584e2c19a425bf9bbae63e03048955ac575fb,Merge_failed,fe4bbbb9b5341e3bc8cf9455df0df0c79ba1e789328c0ca9f595705b303f0625,Merge_failed,43a56d2d41f5747ad0fb90fd6ce04c5cbe1f3b40c08c884b1eb7cda81f7e94bd,Merge_failed,4853a9b6a5e457c1002311884e5584e2c19a425bf9bbae63e03048955ac575fb,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,4224d95e52396c778550d8751b74874fae0790780a56ba6733e06ae8b47ce166,Merge_failed,fe4bbbb9b5341e3bc8cf9455df0df0c79ba1e789328c0ca9f595705b303f0625,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a 13,refs/heads/master,c5ab0b2b5895f3f708e0e8c4008d5f879ce0271f,1f8ad09c19e86235c7df11f8c1f6dcbf4844cf4b,9e426fcc572d52e5b15ce995c40a8dcb8c0c3439,,True,True,True,8,42,277,2,True,8,Tests_passed,cc7128736d084ac5fa7fbbf10c30b591f58fef1844c455d6b57736a5593a2cbe,True,Tests_passed,cb97ce9abe751c8664d01395549df38d6dd99cf223d75f036b61665c29d80b43,True,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,96b7e03b10fea3d2868b7acb1112f685ef1988d187846930c968b5ee7a3e296f,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,4c34123021fe45df7da7f9f9951aa6eec19bfd79cdd90454fb6802a53abc2a84,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,4857a2c9ba5fab44220823ffe7d3101bf27300676bb4c1ce4210bbab4a370edd,Merge_failed,88e90498147ac6259ce6227682d4406b8266c814d564168868075dc47c228c53,Tests_passed,b73dbe75a4348d6ae327253529c46096387db7ec7c1bd95baf1834a90961f284,Tests_failed,04910373b858b14e427c076e97d1baa6fd677c87bf1f2bec549c4e3a07c8f8b6,Merge_failed,88e90498147ac6259ce6227682d4406b8266c814d564168868075dc47c228c53,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,4c34123021fe45df7da7f9f9951aa6eec19bfd79cdd90454fb6802a53abc2a84,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,1c6af53e1a71b3cb242880fd2a77a5671d017c64fe6a84ff4e4be26f2700c368,Tests_passed,b73dbe75a4348d6ae327253529c46096387db7ec7c1bd95baf1834a90961f284,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,96b7e03b10fea3d2868b7acb1112f685ef1988d187846930c968b5ee7a3e296f,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504 diff --git a/results/greatest_hits/merges_tested/jgrapht/jgrapht.csv b/results/greatest_hits/merges_tested/jgrapht/jgrapht.csv index 2da2e76498..dbdb42d6a8 100644 --- a/results/greatest_hits/merges_tested/jgrapht/jgrapht.csv +++ b/results/greatest_hits/merges_tested/jgrapht/jgrapht.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/master,1d1ee81e47c5d22b559dadc871138d181fd665d7,bc0fd56d8575f07736b952fcd7e61b6316661df3,5a2ad0369cbe2294354895b1c59ed5abeeaeea9a,,True,True,True,107,457,11094.0,3,True,107,Tests_passed,b8dadaa1ac86d32e1774d6d7037c3d4f058a8f56223ed2bb53058f55dc0beb46,True,Tests_passed,4553b4acd53f8293eb8ae620a3881ba5e5c442bbb7315655f8494aefa1d78bb5,True,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,2d10193ea44df825366507c689841ac961d18334ba644a2ffca950a6162961ec,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,824b5bbe3e74325ef271c77ff3abf9555e36570e363e1904a29b4e4c3c85531e,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,d76207ac41f52e73e3d534506fec3f02e3278e0ec37282672e59fc9eff15735d,Merge_failed,de388972e53a9767cab1d7d8dd93773f8fd495b593c7173103b6a60be64cee96,Merge_failed,32ce98f8c7229165b96d9db796dcaad4335684a00e5c6ba17b6c7343495ed473,Tests_passed,d4fd6ba7cdfb3552a467d0563401a39a07c3915a6b09cb4eaf6effef545aa846,Tests_failed,589fc80248124847da3c46571bac4f3a27afbbbebb7ecdd3fffc199862507fe8,Merge_failed,32ce98f8c7229165b96d9db796dcaad4335684a00e5c6ba17b6c7343495ed473,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,824b5bbe3e74325ef271c77ff3abf9555e36570e363e1904a29b4e4c3c85531e,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,5f011ce2fdac2b4765776e1830e35834cc96a17718902b8b28cdee0dda31e9ad,Merge_failed,d76207ac41f52e73e3d534506fec3f02e3278e0ec37282672e59fc9eff15735d,Merge_failed,4b1e8b5dbc2ab1e611207b7be5dbeaa1a6ef76a9535fd38dcb81286b2c0e1ecf,Tests_passed,d4fd6ba7cdfb3552a467d0563401a39a07c3915a6b09cb4eaf6effef545aa846,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,2d10193ea44df825366507c689841ac961d18334ba644a2ffca950a6162961ec,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6,Merge_failed,9c256d64453d27c97626ee220ffc4fb10c8ab5aac944ffb457229941f652e7b6 31,refs/heads/master,10cd805a572acf38bdf1669fee54617ec6493c9c,8ad64df03556720ffd3b7c2fedcd8dab81605f47,5a2ad0369cbe2294354895b1c59ed5abeeaeea9a,,True,True,True,5,46,256.0,2,True,5,Tests_passed,a781d1de8531ed0edd4c514ec386791d43cff1059d0c9ce1e0413c5585c0848e,True,Tests_passed,4553b4acd53f8293eb8ae620a3881ba5e5c442bbb7315655f8494aefa1d78bb5,True,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,14fbb1c3302ffd39796182cfacd5e13292beb600b6a73363830b86f1d1129bd6,Merge_failed,85f541a1beea307561a8edc44555b9c59c6ab475d80c86723ae6997fd0690748,Tests_failed,64d6f5dc461f1023b514ee683c07369f117065c84393812d4c8cac5219528c63,Merge_failed,0e83a40fda49221920e5c6f1e9f26106c995f0d38a3e5094f43ea363c4ae1da3,Merge_failed,85f541a1beea307561a8edc44555b9c59c6ab475d80c86723ae6997fd0690748,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,4d3bcd7b8f74eaf397d0a7c31061ee2d005df976b2216a3c72d4feaea4d03f95,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,1d26557e69a0eee7e7ea363610f564a095ab44c48b8e64a7d67c9e4f19668a01,Tests_failed,64d6f5dc461f1023b514ee683c07369f117065c84393812d4c8cac5219528c63,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05,Merge_failed,9fe08e3399a68fe5a21505f775799a3f6fe885370b2e87e6f957d3d9ca195b05 59,refs/heads/master,2d71b99ba5e1de41856a1d1a4f6bbbf3409a907d,55c9864dc572af10068a11efd9768b06bbee3105,801fb0815d22cf9986ff4335095dc0716f9c61da,,True,True,True,110,338,4875.0,3,True,110,Tests_passed,d3e1f23c374a9e5fb57e38c1bff0ad25f88ab249933a92d555dd1b2db862060d,True,Tests_passed,eac2fd0c94898b27556ec1eeb62c7ee9b127cf8a5ae24cd9bbfc84eb7c3bda78,True,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,1e12efa8e9ca953466021ff6600899b64ee46ca40009b0ac8ba3c48a65dc06ce,Merge_failed,11fabdda3390765d48c91039ee14b95a959c90615373821e01556e2bc63f9e24,Tests_passed,4071a7c026ac794b075a6c3335c9bc29cd160d66689a3a35ec0d747cc3ce6c10,Tests_failed,b868299cc59f130fd04e1e607a2bc8a2c580756325312740c6ee81f0ad095996,Merge_failed,11fabdda3390765d48c91039ee14b95a959c90615373821e01556e2bc63f9e24,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,f05ec260f4ab0054cd2626d6a9a927379eea5a966f583c1024d2fc3b36f3c86e,Tests_passed,4071a7c026ac794b075a6c3335c9bc29cd160d66689a3a35ec0d747cc3ce6c10,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365,Merge_failed,26d9b60aa9435dcda1411597f5a2fb530a9f2894cbcbcf5ed5321aaa23027365 diff --git a/results/greatest_hits/merges_tested/jhalterman/failsafe.csv b/results/greatest_hits/merges_tested/jhalterman/failsafe.csv index 6857e2b17e..be80570d58 100644 --- a/results/greatest_hits/merges_tested/jhalterman/failsafe.csv +++ b/results/greatest_hits/merges_tested/jhalterman/failsafe.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,b15e3bd52f2d6cfe3d2b456766847691694fcd72,947589141b1290c6eb3bbfdf67c55a62b4972dbf,ea1bb689ad2a75ef6a89843ab31dc881926d603a,,True,True,True,7,11,109,3,True,7,Tests_passed,5366623e94bc3b3f96f8892568e6f864aae6e5e21aee1a9c1d06497323fd4dce,True,Tests_passed,db05e5da5c5daca74e35a9ceabc60a9bdf34ec2f7b1e5fb96532a76f604a53ad,True,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_failed,f067ae368a63233b8eb581e0f942b4838873d286cd6aee6bb965514fc4774bf1,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,6927025f65fdca89d1e86f84dca57777cfbf5d83356f4d716df817ba202f23de,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab,Tests_passed,25c6c359635ea4bf588cf1046562e7dc72d812e490534c7ed6f54d92467656ab diff --git a/results/greatest_hits/merges_tested/joel-costigliola/assertj-core.csv b/results/greatest_hits/merges_tested/joel-costigliola/assertj-core.csv index fe03b0d881..67068ebdde 100644 --- a/results/greatest_hits/merges_tested/joel-costigliola/assertj-core.csv +++ b/results/greatest_hits/merges_tested/joel-costigliola/assertj-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/main,30d3049359fc8a4cbd2932bebc3b238a7338b8ca,f63c0c1b2ce21951697b1a9b47f214f4e1a8b5ff,a2d13c4a3f88f58e95ac894e113c2192263df150,,True,True,Tests_passed,695a224e70dd817606cbcf6526082028c94a3ab69bfb8344060bc2909ad10371,True,40,182,1400,19,True,Tests_passed,b94fe176594da209508a183b461c4dfde742ee12ed8e3c78554353db8c07ef2c,True,52,True,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,322a4bc0257bc589519d9444284fcc5156b070725f1629fca476685bf04ce1a6,Merge_failed,ebd2fc878276d825514210b5bfbb41b0ef1ca09ca4e506b3ae706edc1c1c2d70,Tests_passed,48e8424a7645fc2c250a17f5fd3d106687bbeba5804b5927722baffb210b8c5b,Tests_failed,9c12411d7d2811c55e814524d10504430f4d6ffc78f618f9667804300eae38eb,Merge_failed,ebd2fc878276d825514210b5bfbb41b0ef1ca09ca4e506b3ae706edc1c1c2d70,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,ac550c6e0210ebdf35ce20976a0a285b133a526e1d95bfc4cec5b3bd8d29c718,Tests_passed,48e8424a7645fc2c250a17f5fd3d106687bbeba5804b5927722baffb210b8c5b,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771 12,refs/heads/main,6e98947d7295414f753f05fd251878ba7277bdb1,f863672644cba48fcc3f6eeec3d3011436087754,0bd42599f5aab6ed0a0b4f3e86a4ae3a48554d00,,True,True,Tests_passed,143cb1ba4ea0a27cbd6b525a3b76d1928a1b26c90782584bea350634d06c844a,True,739,2895,51401,34,True,Tests_passed,89c631f43249551601e9a602219ce75012988ce134605bc7ef4efed53a4df6dc,True,748,True,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,7fa6b64fdd6e3c87b9f69c9cd16ad90ae5cd476e40c585c71e01a60ca9e37db0,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,9b2d8d77dede638b3d7686e79999e20bc9858d4470bdac9bd3ddfba714249883,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,303059e918fc1ecbea3b94ef19959d5e9cca4f7a69c84767eabb55b0eeb28178,Merge_failed,0928ca8e30d02e5684539f76821a5795edc12907c703cb78cddeed2530b7d202,Merge_failed,b461bd516b24cd76d0ce7a6d70fc2d6a89a1cad44b59248e9ecd1306e85fdbce,Merge_failed,f74d01d8b0a5122b3225b314e775b6f10013390545920a4f079071dbeb3c1390,Merge_failed,ae2a18da30e322265359428b773f6281a7c8a47615bd087a151599236be0f874,Merge_failed,12c8dc469698796e46a369592b0ee9f261ce9093874c17819d1f3e208db68f74,Merge_failed,f74d01d8b0a5122b3225b314e775b6f10013390545920a4f079071dbeb3c1390,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,9b2d8d77dede638b3d7686e79999e20bc9858d4470bdac9bd3ddfba714249883,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,303059e918fc1ecbea3b94ef19959d5e9cca4f7a69c84767eabb55b0eeb28178,Merge_failed,0928ca8e30d02e5684539f76821a5795edc12907c703cb78cddeed2530b7d202,Merge_failed,d640b9e60c9e21a91a105f4f6aa0ab811de041007ed4fb6864767bb53bbb913c,Merge_failed,ae2a18da30e322265359428b773f6281a7c8a47615bd087a151599236be0f874,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,7fa6b64fdd6e3c87b9f69c9cd16ad90ae5cd476e40c585c71e01a60ca9e37db0,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294 16,refs/heads/main,15cbb306b6a162438dead6e432ff75f52ec03c22,ce5a93c1161b9fa95a44ab1175556d12238a0e61,9621390b0251b4a1b64984b5db1fb423d84626fc,,True,True,Tests_passed,c6912d051f85e9c8c232f712eab096db21cf56fa466e0cea5243b2369edde600,True,472,1307,37873,7,True,Tests_passed,dbb382761b6dea2c455abf0ceb5bd2c8f1977ad3d807cb63ddeda1e3bee4b020,True,474,True,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,c479f62b4a18f9c42b2ec7317b06b422aa04a73718cd3623894d06a651bffba5,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,7ededf60a84bd98168e3e3c3dc17ee36a24a21ea6d6f3bafdaac6059daee213b,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,8cd2ab75776b99a2d0b65081706228adc7b7090aed99c1516f4929e8254da420,Merge_failed,29c22f8d45a41e72863a5f860921482e2f073e9eacdf02e5041c3c70314ecfc0,Merge_failed,669c9f29f68fe35925598e38baa6453a43596c54e898628882c368758b5f3d04,Tests_failed,81109c0f5efddfea10f30879335133ef3295f94e8079058976f8b6f9da95f54b,Merge_failed,29c22f8d45a41e72863a5f860921482e2f073e9eacdf02e5041c3c70314ecfc0,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,7ededf60a84bd98168e3e3c3dc17ee36a24a21ea6d6f3bafdaac6059daee213b,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,66eb48fb96adc9825b4bd2a9f2aeb93f7490157505dfa598c773d9d99555f6f3,Merge_failed,669c9f29f68fe35925598e38baa6453a43596c54e898628882c368758b5f3d04,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,c479f62b4a18f9c42b2ec7317b06b422aa04a73718cd3623894d06a651bffba5,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e diff --git a/results/greatest_hits/merges_tested/johncarl81/parceler.csv b/results/greatest_hits/merges_tested/johncarl81/parceler.csv index 62feb3d83b..58e06f4f40 100644 --- a/results/greatest_hits/merges_tested/johncarl81/parceler.csv +++ b/results/greatest_hits/merges_tested/johncarl81/parceler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,True,13,54,251,3,True,14,Tests_passed,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,True,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4 diff --git a/results/greatest_hits/merges_tested/jooq/jooq.csv b/results/greatest_hits/merges_tested/jooq/jooq.csv index 6197a53fb4..0b74f7e75c 100644 --- a/results/greatest_hits/merges_tested/jooq/jooq.csv +++ b/results/greatest_hits/merges_tested/jooq/jooq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,True,116,417,3453,3,True,116,Tests_passed,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,True,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e 48,refs/heads/main,db1d75b28875324a15635b91642f52cdb4f6c538,b393fdd738250b2823675610637f5de6d6c266a2,fbdc70e0a0a9a22365f06bbe303c44be9e8c3375,,True,True,True,5,9,21,2,True,5,Tests_passed,5664306aded0070b41ae0370b035351de5668a264e3efa101d62b9068a4ce64d,True,Tests_passed,227c6cca669c72ad5c7fe86bec51cd538ea5a1b466d1b10bf52d3f7bc6bdef80,True,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,1612631646382eb341a14ec19c705600d98b74e26273542cea7bcae5a2206fbf,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,1612631646382eb341a14ec19c705600d98b74e26273542cea7bcae5a2206fbf,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690 60,refs/heads/main,df390cf9197813feb048902e9dedde61fb01931b,f5004522d6823885103365b39788ccc25c603314,8767b8014d1beaee87f4e90ed5ce3f4ce10c8525,,True,True,True,41,219,2416,2,True,42,Tests_passed,8fb7378fb29f3257782c278bc1b25eaf1d45a8821dec4a838824b9d8f9fe7f74,True,Tests_passed,e003554a9b0de037e8016b28297cd8aeb0144752ff536868f90dce0911a1b5ca,True,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,2c9bc315fb7b7e6fef008fe42274345317da0f86b1169ca9bb7c313d939c9bdc,Merge_timedout,,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,2c9bc315fb7b7e6fef008fe42274345317da0f86b1169ca9bb7c313d939c9bdc,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156 diff --git a/results/greatest_hits/merges_tested/jtablesaw/tablesaw.csv b/results/greatest_hits/merges_tested/jtablesaw/tablesaw.csv index 67b57ce033..02335a2b09 100644 --- a/results/greatest_hits/merges_tested/jtablesaw/tablesaw.csv +++ b/results/greatest_hits/merges_tested/jtablesaw/tablesaw.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Tests_failed,9a8d74b1e71927ad96aa3252b792349a2133ea9d7be46479383901610470d286,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,994ba1d592b833cab4ff219b3d1b9073dcfe2162f48c9a414ee984319d96f02b,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246 3,refs/heads/master,064b075c3a675302f3d372d0ce308a12dcca0ba4,a13a334c97c01a7284a80f171615f159d03b7975,2a7efb82d77980077ded7cee995c9c051fb1545e,,True,True,Tests_passed,8e253e7f54906664c5588ed04337ab0ebc000e46d65ad0c4260c8b5793b5459f,True,49,105,1735.0,7,True,Tests_passed,d9750fcfd6013df5ece52ac889dc4e82e0000e94661b33a5001b1fa9aee44e49,True,49,True,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_failed,a6641ae2f6190b5e571da73c4da12d540565a6b91954f68fc5696fe0aa8802a9,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4 4,refs/heads/master,59cc8402011b2280fed364f85cd4431e776b6d4a,70e7c73943e42c1f05c644c1f5f587eb3bdeed98,01abf193ef3d93319ee0452b480f16bbc942ac6a,,True,True,Tests_passed,e670dd370c7784a57914c458397a21fcf74116a297e5f1635764016ea2968479,True,3,13,86.0,2,True,Tests_passed,c6d94a04c96397514352daa08c455249d9bf0a3163c248624bdf05519358dc2e,True,3,True,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,8a4c2a45c677445479def8dabe439a6232a9019506dd807919ea4c895ce0f9ac,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,8a4c2a45c677445479def8dabe439a6232a9019506dd807919ea4c895ce0f9ac,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5,Tests_passed,72c36c798525cab7d8ab7e7d7e841a8cdce80a1dfe8700d09fe3adedd28e8bb5 diff --git a/results/greatest_hits/merges_tested/junit-team/junit4.csv b/results/greatest_hits/merges_tested/junit-team/junit4.csv index 6db59751e3..7ed5863c73 100644 --- a/results/greatest_hits/merges_tested/junit-team/junit4.csv +++ b/results/greatest_hits/merges_tested/junit-team/junit4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/main,ab7c961572adab958edf4c5cf1f5371b72117300,3681aa3796084b41d67a25b31c6595dbc180167a,343599800301b8f0886921cfc605dc85899f8f7e,,True,True,True,305,1133,12392.0,35,True,320,Tests_passed,c0a7dbc9bfcdb1ba4df41619164c4b4d2cc0d488daf2d8a5266b79dbfa66e519,True,Tests_passed,ecb36102132e62af6d728da6d2a70e664afee3fd9d2f068b845897d25de312d2,True,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,955d3da16561f7a65b5b7f029814fdf417eb5d59718757be0eba344133e4c1f0,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,982b679cd1b3ff89add7c44aced7b315bbb0749788a7ac1fe3dbf9e64aebd371,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,d744da66a666c97cbaa0a9d4b76234306e8b965add7fd57f565458ce38bffcf5,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,982b679cd1b3ff89add7c44aced7b315bbb0749788a7ac1fe3dbf9e64aebd371,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,72b33c705850bf6d7a91e41db539d3aef339b3e1c24023e1fdada9812acd5ede,Merge_failed,cb1aa140296c36616ab996663d533208296e6c00b4f2520a47dac2c7e624e8c7,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,955d3da16561f7a65b5b7f029814fdf417eb5d59718757be0eba344133e4c1f0,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae,Merge_failed,c966d5487e92729cc3b53d4250b8fb31938f5837ac68082aba610fa2b62cb8ae 10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,True,True,True,161,760,7530.0,2,True,161,Tests_passed,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,True,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,True,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec 38,refs/heads/main,d712ef951802074695c79740f9bb6954b12ee4ce,3867a7360533cb0fd90a50adb5864bab14ecb425,07cf3c7fa446da330776502fb7cdc7329bfa2265,,True,True,True,53,212,2319.0,2,True,53,Tests_passed,70472ddb60d006c89a2af0f88d9a532f600d0390f50b0a02389e2d060c6526dc,True,Tests_passed,39796539e0cb248b07df818564f653fe00a358853b365c475880d91f223ae4b3,True,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c48936f7624bc428b4141ab46483d48077ef75f7abf6b0967609a9fc4f263904,Tests_failed,1036db12029e8b21fc29205ef9487c1a26f58ca13ad57637d1bc16e5e4b81a9f,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c48936f7624bc428b4141ab46483d48077ef75f7abf6b0967609a9fc4f263904,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c4fa996d6aaab58ba2229e3a15b74f8f80bf0dc2b7b185438f6f3b6b85d46b37,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1,Tests_passed,c88b0248b02e9ef7cf1334a6a51d8f23cddae51998e92bd5cacbdca86e9aeaa1 diff --git a/results/greatest_hits/merges_tested/jvm-profiling-tools/async-profiler.csv b/results/greatest_hits/merges_tested/jvm-profiling-tools/async-profiler.csv index 4f19fa1656..db0c01d1fb 100644 --- a/results/greatest_hits/merges_tested/jvm-profiling-tools/async-profiler.csv +++ b/results/greatest_hits/merges_tested/jvm-profiling-tools/async-profiler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 49,refs/remotes/origin/malloc,f3857d8dcf97af86770d36267c7ce7d02bc6eae7,52d29dd07345a0d4f7c4058c902b96f642aa24ae,0fcc4d9bac6c87b06b60bb75aba82d96bac6b68f,,True,True,True,35,203,1591,8,True,35,Tests_passed,a890ca7b802542e18fc8a354f88cc3727b872e064f7b50398c0d38ed93df703b,True,Tests_passed,9d6afd8cc2619dbea88282e6f3e0636064257baf6e2ed0ecdb07149647240369,True,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a0fc7185b2957e62fc7a304854d60f779643e69641b1e4f9d89c8677f9b1c1bb,Merge_failed,e444375800651ba7d38fbe2df65320865bb47ada3742a074638e99a4019ba191,Merge_failed,7147361844e36e0178564dfd6ebd2741bb83b0bc5d161396b482d26fa5891e56,Tests_passed,2df27d5d891e902069270c2a8986080078d97b1338c53ebcfcf796e5c877f881,Merge_failed,e444375800651ba7d38fbe2df65320865bb47ada3742a074638e99a4019ba191,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,5b021d593af019a8e09b48c5f7c49551ee9a50255e921f2c80f44fa99fb17495,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,3fefc194cca728d44a193bdc7a9ef26e59317e776b80fcc60ef3193934438f8c,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967,Merge_failed,a11d28d696a1309ec92e9a41812577850ce6ae969d9cd23fb952464d19b2f967 69,refs/remotes/origin/pull/485,aebeed5d99ee31497e59c84bfc3d312487391c19,f604f6f4dd3228016571d3fbea4e178372270e1e,4af6b652681d628da7411b55209e887a7247282c,,True,True,True,49,237,1437,3,True,49,Tests_passed,488108c8f6a87ca1d91ef5af0dbc08d53ea00f8320b19b7c0414515980f75895,True,Tests_passed,e1b0769ed10fd9fd33ca334cd32756556f98ad72cc6271b58045c13800641533,True,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,8ddbcc49be31a669686a507c73d8af1cbf9185f76e2798a8941c1f98fd97df01,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,182329f6e082011b8233a25e5a0feafc81ab3478d14d34a00e666f977452533d,Tests_passed,bb5b17759acc5b57443340fcefa6fab2840a0f0c560772f245f2b2053d1c2a5a,Merge_failed,ce6ca7669570164fed9286182e4b560eae2b179f82adeb18188e614a5e071620,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,772b8aab8c53f5cb9fce9e9dc14ee210e72bcd20fbab81789b9280a4b3b24474,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223,Merge_failed,914ca2f9838709f18bb2dec140479f719190a084df13d899f0f8aefd53d70223 75,refs/remotes/origin/pull/530,6a261d7422c4c63902245a640696215453e83978,feb57f74519955034442d6768c0ef202d5ada871,d7a2a4fc8ba5aecd9b6d4bb4b5f1609d37ab4a8c,,True,True,True,55,283,2688,3,True,55,Tests_passed,1db95830de44a19ac65f279748347a4ee3d86d46f0a91d267c0023a6de61c3b1,True,Tests_passed,6564bda60802f91f87ba9f4a6dd3f5945289e51f786bb29f7ffcc3040b58352d,True,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,aefcfaa1a84e78982a37d89a226ec4aeabc27aef682bc815e383ace09993e4d5,Merge_failed,959926dbd8845c947f81ca5ab374b01b89cbfa1cf0bb622d29097b6c01b8ef45,Merge_failed,2069f5ee6d538339ffd3d683b5f8ac7072f09902afcf1f71faa37b9c42f15427,Merge_failed,2069f5ee6d538339ffd3d683b5f8ac7072f09902afcf1f71faa37b9c42f15427,Merge_failed,959926dbd8845c947f81ca5ab374b01b89cbfa1cf0bb622d29097b6c01b8ef45,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,d9348296c27cd88cfa50411bc1cba92399d4076d485327b3d9534e8d20df0d05,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736,Merge_failed,f0519a8e109ff070d77cdb7c69f896df3bfffba2e1709f3e9d9cae29f6182736 diff --git a/results/greatest_hits/merges_tested/jwtk/jjwt.csv b/results/greatest_hits/merges_tested/jwtk/jjwt.csv index 2ca6190bc3..2bb851f6ff 100644 --- a/results/greatest_hits/merges_tested/jwtk/jjwt.csv +++ b/results/greatest_hits/merges_tested/jwtk/jjwt.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,fd52e0ffc2de0989879fd6f6b63e19416db6627c,9bf487f0b7686bec97ac368f592b7cddfa99546f,17c3dcefd0b297ae387c45d1c99a820b5c714bd3,,True,True,True,23,61,697,4,True,23,Tests_passed,19944222845d04de2ffe76d9b7520edfc4d305d0341bf621ad4fbdb4562ddf90,True,Tests_passed,c518474119e1faa6f7d7573f4ad97a45782b94c841365d609b431fa617ef225f,True,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,607c7b1f7c70845db252f560e9a4d1a40130b143a25dbbad233d7c3f5e265cc5,Tests_failed,c91db1392dec5f6197df16d52eb9948a1f3d6073c1cb752f588789cf91eb13a7,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,607c7b1f7c70845db252f560e9a4d1a40130b143a25dbbad233d7c3f5e265cc5,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b 57,refs/heads/master,ff932e9838a9961f4084a51323092559e1a1ad25,af01cca9224371012f9240c756a6a8ecbf606074,3fb794ee9131b9e6d6f0c24e408b05e53025aa79,,True,True,True,11,35,236,3,True,11,Tests_passed,40f183e144f7675839baeff496a088ec2399355e151996b5b0b5ffb9c3417d58,True,Tests_passed,489bd2e017dd2dcca02c17f59763f59df40a9f890ba1010d71bf3ee76c0132c7,True,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,543faa2f8087a2825272faafb9dbb8825726a3f9b52d22ac58b89b76f5a59d22,Tests_failed,7308313919df361e3450c149e9d0e7dda29b369f956a03d7f1f4f3b3fc3eb7a0,Tests_failed,4863d6870831f62ee955f6a0e88cd67ccb2693a8ad19b2737c9e0f2a87b22ebb,Tests_failed,4d839b947d654417fd75e8d033c7b5dd609ae70507b9c6ed4b9814d8d430429f,Tests_failed,7308313919df361e3450c149e9d0e7dda29b369f956a03d7f1f4f3b3fc3eb7a0,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,c7ecaa24922341ada2fdf56ec922aba76f9b555694b1178665be8145da3e3a49,Tests_failed,4863d6870831f62ee955f6a0e88cd67ccb2693a8ad19b2737c9e0f2a87b22ebb,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019 66,refs/heads/master,e55ea34e951f8bbc8be50a49b166949a4d1e4873,8e6e165c1db7a69c9a0d34387892f2bc2409a301,707f7bc046b363ac6262f43bdc0885ff04f35f1c,,True,True,True,35,97,1467,2,True,35,Tests_passed,5f8eb8867805b411684f48bdc39e2252ade78d9c946269a029192c08f218c654,True,Tests_passed,dbffa571c22047f577768182edd2e7934092a67e1b38ecef5389f2f1bf3489fe,True,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_failed,55ae3c777e57d84dd242547ddc745a33c190aeac4e49c0830bff52907466a545,Tests_failed,baa1a856ba105d676eb4dd66d725c5847f4fb3e7024e008ad934ff165d150624,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_failed,55ae3c777e57d84dd242547ddc745a33c190aeac4e49c0830bff52907466a545,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe diff --git a/results/greatest_hits/merges_tested/kevin-wayne/algs4.csv b/results/greatest_hits/merges_tested/kevin-wayne/algs4.csv index 409f0dc1ce..5615b41e81 100644 --- a/results/greatest_hits/merges_tested/kevin-wayne/algs4.csv +++ b/results/greatest_hits/merges_tested/kevin-wayne/algs4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b66548467b304fa8a6e7b939b7c44cd265c0e1e8,8e875f80fefd14897240c10f329d6323e069974e,75395a716f9a6128d69879bee6d09abb3e397082,,True,False,True,4,4,13,2,True,4,Tests_passed,9239c86344ccd63c35764c5a8756ab04ae6490c46700657297d576c7bdccc983,True,Tests_passed,5394368a3322d9e81d66e78df11439668edf9a0f9e6464c60388ff3a4b05c305,True,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f6a22db34ee0065c3a466ea39ecfed63d6499a9d6d1728d44ea3f7f3cfda6492,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,476f4d2a00a84f8b2e50e084e927034c57179db3ae24a83ea3401e37d7734c95,Merge_failed,33a2c29c8a5d5dd6efee4ded4e99fe9ce699fee468cb0c07e2b9f6b37621b338,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,f880f0dbc6b9491ecc3acc784ec8d91673ea0015065fc60e786c885e7e4c8061,Merge_failed,c09457ba7556a53d27d3460f8966f11504ba16dea644047c9dd6ce033011c74e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e,Merge_failed,b730fb9716f9675bf96d7aec178e280b582b0105be9889c18de958246c229e2e 18,refs/remotes/origin/pull/13,f747b209db1cca23c5be2220f0d677f26b98696f,1d8be9146e5178b5b6a345c2ef3beabd53df2254,fbc8db7ca0a2a8e5277ff7fdfbb674c1e6cc2a6b,,True,True,True,195,519,1291,192,True,195,Tests_passed,b50f35f29eee61f6174d91da6af138077fc3fe433c768173f6814084e137f519,True,Tests_passed,5a20f297b1f7db7962c2e61a0655b04f18e1a79105af06c2dac95fc3e0347770,True,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,34b46faa1806132833d60712d5dca714e14e2cb9bc189e01a2570766a975bcc8,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,0ee7d7cf9352f30ee60e245849ab89d6d3a988432a704af81139c83a125844e4,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,5f20165c8dd41abe45f8d7b8166b9fc320a8bd620de81819c61b22923297f854,Merge_failed,0896a2c28037ea21dc3efa72756d40950066eecdad8fafe5c0342828f4e0e588,Merge_failed,7b8453a5e8be945455ed9c7e88441ca380af4667888bf942ea7b934bf70d407c,Merge_failed,608a506075727959fc648d21fe2f85300c85ff8c1e66534d1e85432b90cb24a5,Merge_failed,4629c3617cc41d6e8ec68d459c74fe4c75012dac705d3f221721cdc5a614ece5,Merge_failed,7b8453a5e8be945455ed9c7e88441ca380af4667888bf942ea7b934bf70d407c,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,0ee7d7cf9352f30ee60e245849ab89d6d3a988432a704af81139c83a125844e4,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,de74b5329789abf6781ef6be22097cb802b7d6e347ae1405ce1aca251d8e3a72,Merge_failed,5f20165c8dd41abe45f8d7b8166b9fc320a8bd620de81819c61b22923297f854,Merge_failed,430f2dcf3722c5e66803b504514c3054fc36570ba686a3a39c467f77c5214ff7,Merge_failed,424acc5007f1f64ddb786e0dd989958700775677b0ec0a8bb172a85d4f34a205,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,34b46faa1806132833d60712d5dca714e14e2cb9bc189e01a2570766a975bcc8,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e,Merge_failed,5887ccca3bb031240a07498e06b23eb9f39d8278e818a3330f98552a766f395e 19,refs/remotes/origin/pull/31,e71576186d7f206ba7957efbde9e87ced4313f10,55cbefb6a924cc05999914a03e0ead401ecde308,3d06ba348d4cb9473c6ed9397919b4fa861ad5ba,,True,True,True,44,261,881,2,True,44,Tests_passed,3eaaf4bbda457e33a6b52a720295f5e69c0c77897ec98e276e11839f9a52754d,True,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,True,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,17ca4641743c5ee1621a8702d2b27ada7db78f9cc2ead0193d5b00eb8825f602,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,17ca4641743c5ee1621a8702d2b27ada7db78f9cc2ead0193d5b00eb8825f602,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,c414a2c26ac83173908c8434e842d8867a3fbec1992932931adefd81931f4c1f,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae,Tests_passed,59ff2cd3c3031ee3dc3a99e7e89211c5b05666d87f012212fcf42f69907defae diff --git a/results/greatest_hits/merges_tested/killme2008/aviator.csv b/results/greatest_hits/merges_tested/killme2008/aviator.csv index f4893c185f..ea04680d4f 100644 --- a/results/greatest_hits/merges_tested/killme2008/aviator.csv +++ b/results/greatest_hits/merges_tested/killme2008/aviator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,d4415b36930d0d13221d1b74083d8152292138dd,fc563acf7b7a2f3859f7fecba88b44a28b9879b2,7ddd4fabb2f4ffd82ad61df6e3ec1132d20f9b35,,True,True,True,54,271,1166,4,True,54,Tests_passed,75e722134b9da983206e6087fbbde66ecb4d38690bc96cb9bb549a01ec485b4b,True,Tests_passed,c6ce8b3b2b99c41b4fcd43a4e32d5efbd503159adce296030c1b081ee1d39c63,True,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,e930128edce51c8757b29c934116fe3c42019f3657b05fb4ac322d91b259a579,Tests_failed,f26bf0444bd620e257d131981bdf0985d1e669a0537355349d0a092d472da8b5,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,e930128edce51c8757b29c934116fe3c42019f3657b05fb4ac322d91b259a579,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7 19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,True,72,169,1913,2,True,72,Tests_passed,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,True,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049 64,refs/heads/master,8b16f5427c044e74265c127110b814b4d25b2e9e,2b1dbc1ffbafd8f0e93b63f3609f5b3aa0338800,fbeb07d91da5e6cd3d88a1ce1bc4a1bf510fddf6,,True,True,True,25,38,978,14,True,33,Tests_passed,37cbae6b3251539139d033a9b270485f60166a49e13a5f20b043846dcf967d3f,True,Tests_passed,94b886ddc4ff521fc20c3f50a6625c4671f4378695a270f65ceb505b69c06f64,True,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,10d468adbac921a875569a4a9bc0838cb85293bdce32a5b454105d04fa9bdb75,Merge_failed,276f4d5b6c208e01bbc5d18b8588bcc57881362a6baa58ab2638b35a04630a49,Merge_failed,6e53560aa729164c37c3fbbbd7e96d68bbf00f41d6a447005b575101916c50fc,Merge_failed,7024167c17386b9022c1326b92ff78c896e3a254e9646b75a6b355a888c3f6ec,Merge_failed,276f4d5b6c208e01bbc5d18b8588bcc57881362a6baa58ab2638b35a04630a49,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,1222a24579c243d0522693fc87a6fd06baaff7b0f49e046fe992711754fe5645,Merge_failed,6e53560aa729164c37c3fbbbd7e96d68bbf00f41d6a447005b575101916c50fc,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7 diff --git a/results/greatest_hits/merges_tested/kong/unirest-java.csv b/results/greatest_hits/merges_tested/kong/unirest-java.csv index 705867f9fe..6f6ec8145a 100644 --- a/results/greatest_hits/merges_tested/kong/unirest-java.csv +++ b/results/greatest_hits/merges_tested/kong/unirest-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,dd532cf17f17fba254562c029848558c8c04b79c,a68309c79589e8d1ffd2694f55a412c6ea670306,b8ab11e459e8ea2594905b9139223f09ff27c2ec,,True,True,Tests_passed,de12c2b1920e73f1875ae860f81b2386b37652b57aea2b905fb7b2424127e042,True,310,981,13465.0,84,True,Tests_passed,31095d7ee5b0003a9018cb2758f2b25a0f7425af605dde8fe9d4b108a831c970,True,385,True,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,60f49a051737a6160cbf1f4e743ecf85b34dbb45e464d6d3cfb43ddd1b4ff5da,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,67c8113bdbf91986e4ed1e5f16069c6fbf2773d65a72909ed6c6c177d93ec790,Merge_failed,ea6cb2b8eb34a89252286c82924d3c1206373dceedd1dd910a24851d2b11df85,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,633c12e7a6dc153d4614656592179e594d7c7a10c3da63e559c5f7e7271693a9,Merge_failed,a72330762fd3fccb03f946af5e187e32cb92aece6801c9e31242dbe43c0538f3,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db 61,refs/heads/main,be953b5e242762aa1dbf4f7f4b9380b551334999,f37caf93ad32a898a539faf05459aafe0e15b717,966dd6a8b9d040fb62e163363701467f0cb0d093,,True,True,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,True,9,19,312.0,2,True,Tests_passed,48d21add9fcf55e597592186e1e64eaf4cec1435168717a232eb6fafe56f8854,True,9,True,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,212f80ca595da4bf5b135908dec035618deb4d7cf5630f2c5900994e8d969b1b,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Tests_failed,338c28437f306554d0911408baebf8101bc023b7593a5f7a6c8a429afb241445,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,cee1794cef935c016cb2e951e8cbe72fe4f4dd393d13f28d434bcf140e49ecb7,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2 62,refs/heads/main,f37caf93ad32a898a539faf05459aafe0e15b717,6ae79056194d04b1ee0b5d7eea1e247d40e8dc79,7eeea8a17544883566f337fec6f81eaa115e9f0e,,True,True,Tests_passed,149d054859a6f6ee975a9c449d6322ca0eb7807509cd7542c4195bdb1720a7dc,True,9,16,301.0,2,True,Tests_passed,712d87f7971381a3857b696ee657b9b9c912af837c02cbaea01d25bc4ae932b5,True,9,True,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f diff --git a/results/greatest_hits/merges_tested/konloch/bytecode-viewer.csv b/results/greatest_hits/merges_tested/konloch/bytecode-viewer.csv index 8d832352f3..91f1603e6d 100644 --- a/results/greatest_hits/merges_tested/konloch/bytecode-viewer.csv +++ b/results/greatest_hits/merges_tested/konloch/bytecode-viewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,True,22,89,828,2,True,22,Tests_passed,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,True,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb diff --git a/results/greatest_hits/merges_tested/lettuce-io/lettuce-core.csv b/results/greatest_hits/merges_tested/lettuce-io/lettuce-core.csv index 14c915f808..e6354d7678 100644 --- a/results/greatest_hits/merges_tested/lettuce-io/lettuce-core.csv +++ b/results/greatest_hits/merges_tested/lettuce-io/lettuce-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,7cbdf4542f2e7b781d7212b26bd8349eff93ef98,194eff148f7acd23ac1bc289f51b28d68c48e0b8,6220a63b6ef9c543ca724611d9a1693dd243f3fc,,True,True,True,448,474,1009,15,True,451,Tests_passed,daa8d2aef3c88f98e4e97c80d617955cde68a0293dd0eb3200c28d11d8b9115a,True,Tests_passed,f190e04e6bea2e5990432dbcca5f97562bf5cf7387f0c01f6b2f51d971095153,True,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,dc8dd0e7b2a59265c330e2fcccc42f4f991427a169b62bc839e6ba3f43e8e6ab,Merge_failed,f19434f8b70b82b575a5b14b02dcb29922b61cf0cad66e9bb327d6f234aa0190,Merge_failed,3aaec7d9af822d443cac9d1d1b4c0a07e23627c704d8baa2ee7fd5b9c4fc4d8e,Merge_failed,72ea975c5cee3ef0a1ab88d1f6f8f16ada3bc228378af2bf049c6709f51c7081,Merge_failed,f19434f8b70b82b575a5b14b02dcb29922b61cf0cad66e9bb327d6f234aa0190,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,b3f2af479f6df79d3f24a3a5851282d5409715d3d24e1d9826874e76d0db9f38,Merge_failed,3aaec7d9af822d443cac9d1d1b4c0a07e23627c704d8baa2ee7fd5b9c4fc4d8e,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9,Merge_failed,a37a3188483522d94975ae813fe25e2bfb02681e6142675f4ecd30359a36e1b9 2,refs/heads/main,dea8f66f846bf37494c18d1ca6036edd4a2f7898,9b47dc89b072adf3b3c05f3b9731b54b909df322,215dbee246b3556bff7f9b45daf07030c87e1bce,,True,True,True,456,2280,43926,207,True,552,Tests_passed,ad555d505a17d6a2d0c11bcb7d4968b2b0d05c40241a56e1acf08fcc9e5a28d5,True,Tests_passed,9dcd1bee4e0981b74dc6499c5c1b4fdc8d034f150f06ba66edc52e2e08ec5960,True,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,8f9cfb320799893f04364d7a6390762e891a9a07e0346d943709836262659af3,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,09c81aa80e3264d763b871b82be3ef725102f5f78bc976f563ea64281ec9f36c,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,ff3927232cd823ff22b81617f53286fed75dd7164265f761b17a24bc34a82045,Merge_failed,f1af423ab1690198cce778becc4aeeb0e15653ce9e0dc6472a7004eb3f76326b,Merge_failed,87816efc2fb08b850fe667bca449b8ad0e2799a25dbed7cb0ae8f210dda64843,Merge_failed,4b54e787831197771f4ef2b7eeb53807044a46f570323573808b30663daa98f6,Merge_failed,bdeaff269fc50b52be899b1ac752a6d4453a3436b1c86a837d65a0bf611b0c90,Merge_failed,87816efc2fb08b850fe667bca449b8ad0e2799a25dbed7cb0ae8f210dda64843,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,09c81aa80e3264d763b871b82be3ef725102f5f78bc976f563ea64281ec9f36c,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,61cf5c23ce27ea49bb5916b693fceb211d8f2db5e0ef6be241df980405cc1391,Merge_failed,ff3927232cd823ff22b81617f53286fed75dd7164265f761b17a24bc34a82045,Merge_failed,485348a90d72fbca52cb938ee679ab17530dfb77386bbd022f3ebbf6eee3a57c,Merge_failed,c442b6b61530665ee8b370033f7f77bce3939c287c5b36374872b07e2d640fb0,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,8f9cfb320799893f04364d7a6390762e891a9a07e0346d943709836262659af3,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1,Merge_failed,fa4151f147c6f372e618077e2101c8458e497352700ad5aea0911fa8d3a86ac1 8,refs/heads/main,e144da09a5e5045ae5b45c13a379796d9be9ab3f,5f4e1044530033d93297aab286fb683db0bb99bb,0daa66b1d2558b8108d7e74aceb90a7b4eb6734b,,True,True,True,41,160,1432,4,True,41,Tests_passed,c747c4d2ea06b7603c0489f6a3adbe0e96c726ccf42f5488f07e1e3357143645,True,Tests_passed,cbc7f25b2065e98f57394bcece37cc07afd6d0d5f4eaa86494e4142ea1feb8cf,True,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,ee2d3010cc3451e9e50cf49a15e64880708bb9b5c9fe0a0f44763f40a4c1fce0,Merge_failed,8c279cf4f981da0974b60799eaf769292767f9d8ef11eb88fc8f1c0822095726,Merge_failed,f0bbd7ca3c8fdbf4fe6c50367539e8a6b348db512c58c6fe1838f461dcc3e268,Merge_failed,1f298b12f4387e11cdb398b9df55c76d003b5c27aef479b51ee02c15f24f4f3c,Merge_failed,8c279cf4f981da0974b60799eaf769292767f9d8ef11eb88fc8f1c0822095726,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,051523d5c4cd1c9682360149cd20316100a8f06aceb8e01d04f1367656169178,Merge_failed,97d8d6b6f6c2bc6b867cf7aa7b353d4045fb52911e8ebf66fc3af719b7516593,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3,Merge_failed,59d5c80e1147afd8d1fe1bc8e96d3c17453f85634a408d322f091efed86652e3 diff --git a/results/greatest_hits/merges_tested/linlinjava/litemall.csv b/results/greatest_hits/merges_tested/linlinjava/litemall.csv index d3c174bff5..c6870cd136 100644 --- a/results/greatest_hits/merges_tested/linlinjava/litemall.csv +++ b/results/greatest_hits/merges_tested/linlinjava/litemall.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,c13ccea867fc0c2d3844140521b2b875c6f5875b,97338d20928527485650def8e7681816cc7e19f4,46d2a4e0801b79b43b35af2f3eccd4617da20cf3,,True,True,True,115,1911,8698,2,True,115,Tests_passed,37ed5d0784c0a3162b42b5a35802afbeeadffa629c806beed0d4e59cec67f719,True,Tests_passed,fee7466d2857a405ad6f874a1df422f94e320a4f88b18f6f1a1cef4c79b9a106,True,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,27de70cb0609544dd98898f00091bf4ce7336b851d20b8b9f830fc45a51dfefa,Tests_failed,bab536a2c9bf120bcf225955a1b42cc407ffb0c5caada6f1b4fe9ddabea3fdbf,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,27de70cb0609544dd98898f00091bf4ce7336b851d20b8b9f830fc45a51dfefa,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34,Tests_passed,6774092ac6e70dec05e23c19e949455f716b2ecd921d5dcc8db1306376961b34 54,refs/heads/master,f16b2f35fc8aa4e77ceb428cabc946c330c7c05e,25dd96d4fb6f68596d70f97c59f1929eb07223ba,e95948bfa3aeba1fb46ed5d6aeefa970225bec84,,True,True,True,46,151,1536,2,True,46,Tests_passed,d6994d087c08a016a1fbc76f2d0471dabf118a3c8f8662a05d82e0d7f663c072,True,Tests_passed,ee776af9fa774cd557e8cc05e474f3d66f0368d21fb76e356ce476e494b8ec17,True,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,85509ea1e9eb01c2395b201ef2dc9040201a65d14882ae8b4c40b3457103d3fa,Merge_failed,a7a546a80c6bd8ac14b796e4d6989082d34fd1ec1bc804eb7970cae0077ca58a,Merge_failed,0d8d2f895f0cc4b0fba1d11dbf0b2747f6b45a49ba8ebaefc1c75cdf91d68154,Merge_failed,cf71bf4e02e491a35da36a0c72c46702087e07b1c27c537e914183ceac94ba00,Merge_failed,a7a546a80c6bd8ac14b796e4d6989082d34fd1ec1bc804eb7970cae0077ca58a,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,d3d3d53557d8780ea6ef4f77d9215dbc2f94c6f1d5563cc90375ed3891a26e38,Merge_failed,0d8d2f895f0cc4b0fba1d11dbf0b2747f6b45a49ba8ebaefc1c75cdf91d68154,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0,Merge_failed,8a08002350b937515a03893334fae5a82c867e1ec1d779525eda8fe9916497c0 69,refs/heads/master,4431c5f9abad40dfae481b6028f41cf7d9c24584,7d73c59bd5d86d9dbc92d91e412efbee76020b58,41d2f24509eca48200b5959fd28de4c61353503e,,True,True,True,369,1293,32946,2,True,369,Tests_passed,6046ee74ace0a839d25388a75448a977341a3a3ce4e35bc9a33b4bf2c746d9b6,True,Tests_passed,7955f0c74dd28dd975dd2ef0fd69eb8d24dead843b3bd4f96b5533b50a218ad4,True,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,c9216f8b47cc3072af7ef8fdb9cdb203c20f43c2fef15441b561abdb12312562,Tests_failed,8db3d40757f5cc3785314127a5afaf42c13a0d48914b0201a77c9c43dc71744b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,c9216f8b47cc3072af7ef8fdb9cdb203c20f43c2fef15441b561abdb12312562,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,793d37dd4d12f3bd388de98f4d565fb5df16441c213a84dc6898e884552ffd9b,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d,Tests_passed,00b35e7a8b6be3ea0a18e695b050c77b215436da22b631f69ef8ba5bf298c30d diff --git a/results/greatest_hits/merges_tested/liyiorg/weixin-popular.csv b/results/greatest_hits/merges_tested/liyiorg/weixin-popular.csv index d21f3b0daa..283e95231a 100644 --- a/results/greatest_hits/merges_tested/liyiorg/weixin-popular.csv +++ b/results/greatest_hits/merges_tested/liyiorg/weixin-popular.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,True,34,89,3176,2,True,34,Tests_passed,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,True,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,True,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,b02773877527717f1e1d5e7e89860278c7e9f623d3bb3a7ab758c2f5febec25e,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Tests_failed,b2518a1af05242bb1e273519d62bb0e8c7dcd4f59821c7d42dc68f66e7156692,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,3ec29058271afd3a63e24cea7057fdc83ea347a1f09f47610bd5f9d942ddc065,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e diff --git a/results/greatest_hits/merges_tested/logstash/logstash-logback-encoder.csv b/results/greatest_hits/merges_tested/logstash/logstash-logback-encoder.csv index 01a5b901e2..e207d418ad 100644 --- a/results/greatest_hits/merges_tested/logstash/logstash-logback-encoder.csv +++ b/results/greatest_hits/merges_tested/logstash/logstash-logback-encoder.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 39,refs/heads/main,d0ca2ff424176b80125c1c3a83e5ed9c04798724,7b128141ff2fbb49342a004d1a2ad7d2811b975b,93d5731b36e5f5a488c6b2b1dcd5c72a5d4c70c9,,True,True,True,98,973,4217,5,True,98,Tests_passed,01c643e503a92f6d87dad98ac70813747d25f4a83fc5cd543adf58e6f303e786,True,Tests_passed,961aa9dd40e8a3e1d3b7cbff51111fe7d4d5ad26e22d054468aba98536c54375,True,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,82c41ae0721f5658efd9e040388d47da7ae7f5a8709248b3414f670b7a932e03,Merge_failed,1331521554272e69796e5322c45eff551d90d25ec49444a7f3c08c2966d25020,Merge_failed,c512592d6277c0aaca670d49f6259cbe259ebe7dc1a4f7da342b4fba7b4e4af1,Merge_failed,89e515c68cd2cdd4e3102c17e83747f78d63321c28f41f229b8d73f04a814019,Tests_failed,073be0f117442e8a7df6f45db6b7ea0e5f6924f913ab747c9e367d4dfd439fef,Merge_failed,c512592d6277c0aaca670d49f6259cbe259ebe7dc1a4f7da342b4fba7b4e4af1,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,0412a198f0c36894db74e1912c749687fdf5dcd7951aaf070dc9ce8c5905a193,Merge_failed,82c41ae0721f5658efd9e040388d47da7ae7f5a8709248b3414f670b7a932e03,Merge_failed,bf6456cd90214103160c2114ca3d9b7526592e44f2eaa8f740552e01b5c61693,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,b8900a24bb3f556dee6f16480fbc4507868c979d6cc1652e19fb4330d7c7cb61,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5,Merge_failed,c06a3b78c010549cce46a086916af989b3931d0e585e96371234449762864fa5 76,refs/heads/main,561db6d638f02f740f186f9b45db5e228dfca7a5,18ccb42102f689fa9ce7190d3a130c70fa0c5981,34b4d2869f4591b6666d6f67760e344cc7e46e23,,True,True,True,13,124,1010,4,True,13,Tests_passed,26298fb24cbcdc75d8cc64fd29f7a0d65efca7155d7b5105bf6591119846fccf,True,Tests_passed,b7a4a706290ecdbf96ea29d674d521a5e440c75078bc01d83f1ad0adf8d70448,True,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,3a10fc9c6f7516484118f0d78506eee00ad655f264162f5b8c32c813fee1edef,Merge_failed,5375a7ce9620ac4ac1fcabc7c65b31cd433d00d977176f384a7ee7138616b9f9,Merge_failed,cdda0affd9f1084ed47d3e557400d34358f16c3e2653320e9df04221c9ee4bff,Merge_failed,cdda0affd9f1084ed47d3e557400d34358f16c3e2653320e9df04221c9ee4bff,Merge_failed,5375a7ce9620ac4ac1fcabc7c65b31cd433d00d977176f384a7ee7138616b9f9,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,03329d5603f897f1c1009917bcb13f2c2941e94bde36b7e9fbdb9aef87f09853,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,5e909100e81decfad4a4751aa3d2a263ff10bca56fdecb16d62bd4bd43781854,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd,Merge_failed,ffce8cb0d330d214348753f2ffb8a463f98114ba6b8d1f212319299a83e0c5fd 82,refs/heads/main,614d4a54d87a4206da47e0e49f54e757a08c6133,49e69f2f93100d08b0bf660d7b4a83b5ed21c04c,a3980403a9269b5fdcfd0381d96034bb154fa850,,True,True,True,67,448,1682,4,True,67,Tests_passed,6ebc18076ac5d1ddd7413d28927039d41028d7e67dcb20ad6154b28e6eb031cf,True,Tests_passed,e2b045c2dddd363edb69c657eac211143b67ba4e50b1bedd041bed80bf5baa2e,True,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,3934b3837e51284165350e0fa1749c379d7718136a4efee04563ee1f551d9f58,Merge_failed,93ed5ed4fee96add0199202b8072cab4f2e5063be588bc11f29728ac17e266b4,Merge_failed,76b8e4dba5fbf736dc49db924ce92f616f5020ba998da0c096d279b2c28735a8,Merge_failed,76b8e4dba5fbf736dc49db924ce92f616f5020ba998da0c096d279b2c28735a8,Merge_failed,93ed5ed4fee96add0199202b8072cab4f2e5063be588bc11f29728ac17e266b4,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,11976e0c9bc9e57257ea9ed1cea1398670a165541e9b0c8395205c2a903c988d,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,d5e5f77448ee956d03816880616bd9722329efdf2e2a579adbb92c9928228f10,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c,Merge_failed,9de9f919e8c707cf534b01336668b7c6b084cbfd7cd1c53707c0994ba800ac5c diff --git a/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-ik.csv b/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-ik.csv index 12df9362ed..63899769d3 100644 --- a/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-ik.csv +++ b/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-ik.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,Tests_passed,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,True,7,32,229,2,True,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,True,7,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8 11,refs/heads/master,ca2bfe57320fbf2bbef20c9ca69b9d78f4912710,3bd1490225b3454e89a9b114df909cf03cc2216e,5ec0bd5bd6b20980f56fa2345681961f4525dd33,,True,True,Tests_passed,c52d67480c76e2d737d7345887df82526f21e7ae981e2e106c2f66993bb0104e,True,14,159,798,5,True,Tests_passed,b6151cdd4c5ffe876ee84dfdfb617c30740302efe59dc6e1a6f15f8568099924,True,14,True,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,5c425aae87325bffa34fee004e7b683976b437ca776245c6f02dd8c9e4830fd2,Merge_failed,af0068a5cfde48012ba9a4f1f02c7e565775685a17cd9449a39a658362270ab3,Merge_failed,759733f0ddd5bedbd51f1bcefc876d1f283e0a4af4b046f47b463cabbd7f36aa,Tests_passed,c94ac84284809e8c6a48b0e0cdee2ea0182958387f04d2546042c437a4f15afe,Merge_failed,4cc99734a518e871ce071a665d05d112fdc838910e074502cfa2549c54a15724,Merge_failed,759733f0ddd5bedbd51f1bcefc876d1f283e0a4af4b046f47b463cabbd7f36aa,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,5c425aae87325bffa34fee004e7b683976b437ca776245c6f02dd8c9e4830fd2,Merge_failed,63835c447ac754d5ea6418e8a80ca53b37e221ccbbd3064ea7ac39a8daf80da9,Tests_passed,c94ac84284809e8c6a48b0e0cdee2ea0182958387f04d2546042c437a4f15afe,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312 13,refs/heads/master,e673eca316b224568093cae7c728a9640a6d7e24,c8f4d59f13a403fa5de137076478731e18f403b9,3d8fa5bee0acd1385e5ee8a796c56b9b0a7e775b,,True,True,Tests_passed,6ec3827247b7960ed502e8f7c5095560bf7e4f1eef12eafbdaa15dd96d2a860f,True,13,42,215,2,True,Tests_passed,9c93a3afb7e0ca0161a7d019feae9d1fd9fb2df92523886dbd02d2b5e1ae1a5c,True,13,True,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,8b958d5b83601f37c7ef8b837cf3a19dcb0628deb25778a6f33fb065defde92e,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,8b958d5b83601f37c7ef8b837cf3a19dcb0628deb25778a6f33fb065defde92e,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4 diff --git a/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-pinyin.csv b/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-pinyin.csv index 848a4d0cac..1044da88a7 100644 --- a/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-pinyin.csv +++ b/results/greatest_hits/merges_tested/medcl/elasticsearch-analysis-pinyin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,acdd6eff2a1baba3de2c336880655c5f4c0729ef,21b2b8e1e46bd70c7d1f7fa8f60ec08321ee3378,1e3bb4f99192270b46d7139b2a892026689d8940,,True,True,True,7,107,592,3,True,7,Tests_passed,4b2fdd68dd1e1248f01b041c83589c44d76c37edcd3a1176c5c8308d20139379,True,Tests_passed,3374c45042e3675825ec4ad1c47e2ba00b5ff70ed013f7b2a007c4829379abc6,True,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,80a72e2d28e828e20e996a4adbf4b38f54a89af650773cb6280ab7e767579287,Tests_failed,b08c8c46f0bde42ae73515ed8d9aa81b97e735fb1debfe5598185d3ea1808e1c,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,80a72e2d28e828e20e996a4adbf4b38f54a89af650773cb6280ab7e767579287,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6 12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,True,17,77,537,2,True,17,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,True,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,True,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,8fa34c129004d802cb04c57d5947e7f850d11698b13811c5a68d5bd438811c51,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Tests_failed,4f01496661bfa41d51f6e10349cecad4e67b4aea18f2270639e461b1143ab8c0,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,a4033a649f8decfa9c69affabb84ead4bd9f19ec8cf83dbf18eb2d6e4bb446e0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9 16,refs/remotes/origin/6.x,4a5981413d5c6aced9b81e136f44c22ad56f37e0,51f55f9548bf94231f139fcaf282ea20c1b8d109,2f34d08eb2dc4056f7e958cfead0508ca9acea35,,True,True,True,7,51,405,2,True,7,Tests_passed,11022ada16fee7ba5de311affa791fc612886d20626d77eb80c0be06f8ce345d,True,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,True,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,c18b04e33be8461d8bc49c40f04138aff9e59bd016192c600e83896dbe23c08b,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,c18b04e33be8461d8bc49c40f04138aff9e59bd016192c600e83896dbe23c08b,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465 diff --git a/results/greatest_hits/merges_tested/mojohaus/exec-maven-plugin.csv b/results/greatest_hits/merges_tested/mojohaus/exec-maven-plugin.csv index cc0d3ddc95..cab9c7cf3a 100644 --- a/results/greatest_hits/merges_tested/mojohaus/exec-maven-plugin.csv +++ b/results/greatest_hits/merges_tested/mojohaus/exec-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,93c93f387c6fdc03ecbd14b7e00f3e1903d435f6,60df0802b5c8b1e4ac6569ac23200e734c9a60c4,2a5ac5bae5da83c3e6b2fdf1ee70f8f517b58122,,True,True,True,114,108,934,2,True,114,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,True,Tests_passed,ac673ee00deb49674e16af53598dbf9fea9654111866e7134e05c438db87d53e,True,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,59585c32835f7b146158726a4aea2fcaea3d3716b80c0a2537e8e78335fe10a6,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,59585c32835f7b146158726a4aea2fcaea3d3716b80c0a2537e8e78335fe10a6,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829,Tests_passed,6b2d2458e4123fb0fa4ca1062945b08e1410ac85c716c95805c15804a14b3829 18,refs/heads/master,60df0802b5c8b1e4ac6569ac23200e734c9a60c4,dd95d38b7a25ff819701ee61321f7d23e3e8229a,70cf02273f93aded10a1aa5def60491de6eea5f6,,True,True,True,113,106,924,2,True,113,Tests_passed,0f15eec956fcade4710cb2081a1521cd23cd6ecd3569e8af9ed9d3fec38a217e,True,Tests_passed,f1e8597ca2e475d439aef6cdd8d5697224360134ce25f768fde26f0369b6d188,True,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,91c7cebeddb20d8000c9599da935bcf55e13bb600f19a0b7871e8e6d48051414,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,91c7cebeddb20d8000c9599da935bcf55e13bb600f19a0b7871e8e6d48051414,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2,Tests_passed,6d4763f0904fd1dd55b956ba820be1f5ce7bcbff0742c41f6ca620d9db2ac0f2 20,refs/heads/master,9c99ac931af4f406f8733cdebbc7932c0d28c54c,f717d716adbf032ba04df98f12103b045019ac29,df343858e21b3ff4bbd0855f858f0005f55b9a1e,,True,True,True,10,14,132,2,True,10,Tests_passed,0ca2637dee6e51cf844bf5313513177896c08f18e26b1a5f091bdc136795289f,True,Tests_passed,cd64809f31b8a9393612e90a3284142c976e6d6026c381d6f211b589c6fa9eee,True,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,2e2fd2c810b1da22e9f41d899106b6488011e8c98173a0c41eb00cbdeb7c3362,Tests_failed,d10b5f3b926ec2823765dc001dd857f229d77606981c2573ad700c3bea0757ce,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,2e2fd2c810b1da22e9f41d899106b6488011e8c98173a0c41eb00cbdeb7c3362,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539,Tests_passed,47180f09995ab172edbbf059194a0c3463bca338943cbfc7a6fb11194d9e7539 diff --git a/results/greatest_hits/merges_tested/moquette-io/moquette.csv b/results/greatest_hits/merges_tested/moquette-io/moquette.csv index 722c9419fa..becc2ed147 100644 --- a/results/greatest_hits/merges_tested/moquette-io/moquette.csv +++ b/results/greatest_hits/merges_tested/moquette-io/moquette.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 108,refs/remotes/origin/pull/109,f0bde2f711c6774a067098216079052e05940751,cc4b3715c59dbdca3cc68d422c0e541ef5258b62,a9404bdf31f9c6455857e5cfbaea9f54d95f008a,,True,True,True,20,45,219,2,True,20,Tests_passed,3f33d8a484bbc013c0ce66ab4670073048dd2c4bf434a0847f9c7c94cae3d427,True,Tests_passed,51e1197b825373beb5903fb928988806465201c3ab3388b79fe0e9e4e70ee6ef,True,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,118c8dfdf20c0620660a05797d064dec7edb343e03fe5b2505e3ad8cbbedc23a,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63,Tests_failed,4cd8bcd03bd02cec2dc813cccb85f0ea7e88ae0e823e72776945f209f390ab63 diff --git a/results/greatest_hits/merges_tested/mpusher/mpush.csv b/results/greatest_hits/merges_tested/mpusher/mpush.csv index c2385284fd..f90b5b5e56 100644 --- a/results/greatest_hits/merges_tested/mpusher/mpush.csv +++ b/results/greatest_hits/merges_tested/mpusher/mpush.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,91f53706e07a00c446651504e159dc2e57e41529,023070f34e19c0dd95b8a51d6031890fa3b228a1,d0eb910c134b78ba10234787e4e1f25f7848f618,,True,True,True,157,526,6059.0,6,True,157,Tests_passed,7af88af7ea4ad29b4cb5224bb1af86ea2bbdc6e72029dc1a891a45daf27cc4f2,True,Tests_passed,6709f5887369438a26917b6a41c20673598c3b97e2f70708f32437f38762fe68,True,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,05697a882f0dfe1c982eaff2eb9f98bbf4d3e42dafbac44251e76d2374e372a6,Merge_failed,a37a85627970f56dd52814689526fc4f0226bb2ef3e92e9d5132db0c3b92ddbc,Tests_passed,b411682e460252d0820da3b8780dab440dc514107b2dc26214d241095f2f8b64,Tests_failed,9e08a03c79f7f3caced9ed8f367e3e596d67a8c3a3d822c92c7195bbb144ef0e,Merge_failed,a37a85627970f56dd52814689526fc4f0226bb2ef3e92e9d5132db0c3b92ddbc,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,62c164324093238fedb376be8b5b0937f2c95ad1d1b95b4b1be74e784185b62d,Tests_passed,b411682e460252d0820da3b8780dab440dc514107b2dc26214d241095f2f8b64,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,7e552e58b9d92778b7744bab53e58fbd05a0fce4df7cd617174bf89394ccc858,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227,Merge_failed,768753f0b9d8d3f743f3e1d570d9c29fc2e5237507d86699323e03334b945227 4,refs/heads/master,684f038dad1d5b95b6f3f60674e12e4ef0b47922,07fd8670acc7a57964abb915d5ca5f7ac52fc274,f13181de9b34506304d88fe53c7d7054b4263bfa,,True,True,True,155,580,6042.0,14,True,158,Tests_passed,9325b0a62a895f85e0a4a4c3cbbd4fb641db2580c675202874d33c62ebaecaf6,True,Tests_passed,5e9acc50a49f00d7b8ef74aae78782a1312444730aeacf468783fc14224fd47d,True,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,368a9aca43a4d3394a97290dc99d9c9849ff8ee326ade7aa49d897ff7175d56a,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,fc72ebd162fd37de12fc5452c076ede619f97f3ad91cb988a941e61816ce683c,Merge_failed,ac66d17b435a7e060766986ee0df2af0f2fd065c1259b96ce324e510c0004381,Merge_failed,02dc1703412c80a01b53ecd5b41ff245318610fa5f10aa3e8b06eef9c8e22cb4,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,c32210af9564fb4b8c443c849c00fb24ea31effd878fcbd8666db9d03e2b5a23,Merge_failed,f546853e6867d5c80c380fa86e49f3154eaf9379de386ecf352fcb41e6fadb34,Merge_failed,973d7cd413cd19c967ffb6e3dd6d4469893b6450eb78bbc84e27d81c8f46660d,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5,Merge_failed,9c0be05dfcec45b9e8ae9d101e1a70bfccc8304367df8abef45f3889638538e5 5,refs/heads/master,07fd8670acc7a57964abb915d5ca5f7ac52fc274,e84d313a85ea601c12c561de042d82d18e161d14,d3cb4cbec18cf668c3b708b99f5bcb9b5dd8e330,,True,True,True,96,274,3165.0,7,True,98,Tests_passed,84c6c06ccb5aa201bb5a8d34e1bf271e707bff2ded7e2cb57b9c0c1d176ac955,True,Tests_passed,cb1a73359b041300f02fbed05a04fe8bb2e5a864d106eb8cb0593133a7bea844,True,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,c9b98b1c5eb29a249fcd9d4e3f6193b80c2d0b2a383beaff120c4b48fb24409f,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,b672bab8fdfcf33a8ff1d916b23eb2cdc40eeafecd73b2d6b3dd3b5daeb5a297,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,a3afe049d26f0fba1c7a419aebce316e4a0452550e437405a2f3f0830d5c0782,Merge_failed,ab5b853ee0dc6e6cbcee656a0472496c38815c82d452ad54465a4cfd3da30548,Merge_failed,b24d9c55e0e1345d4db212df958bf9c7d604ddbd0c25080b703800eacfbe064e,Merge_failed,4c646bd1bf2b4945cdeb66cfcd5d286f58b72ac65a23fe7b9b551c589928b922,Merge_failed,ab5b853ee0dc6e6cbcee656a0472496c38815c82d452ad54465a4cfd3da30548,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,b672bab8fdfcf33a8ff1d916b23eb2cdc40eeafecd73b2d6b3dd3b5daeb5a297,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,90223ac03fb6a2e04946d64e7b1a31ab4364bceb73278453f1d2a9c1e8ede8df,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9b0549f930d78bb1db1d7660353b207cf8a76d45a9bc12f4b461631ca72bc988,Merge_failed,b24d9c55e0e1345d4db212df958bf9c7d604ddbd0c25080b703800eacfbe064e,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,c9b98b1c5eb29a249fcd9d4e3f6193b80c2d0b2a383beaff120c4b48fb24409f,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68,Merge_failed,9df881ddc3983959e67335fbd74f1c50b7efb402d4ccb90430d31da6e8444a68 diff --git a/results/greatest_hits/merges_tested/mybatis/mybatis-3.csv b/results/greatest_hits/merges_tested/mybatis/mybatis-3.csv index d7b39d8143..650bbd1abb 100644 --- a/results/greatest_hits/merges_tested/mybatis/mybatis-3.csv +++ b/results/greatest_hits/merges_tested/mybatis/mybatis-3.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 184,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,True,1979.0,7357,48734.0,2,True,1977,Tests_passed,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,True,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c 200,refs/heads/master,9ed919bb1372856fb7cd69969d13731f91fbec16,0c9f887141cbf9a0e6723b4901fc2a8915af6f6f,41b9b839229580cd091ae747b205f207b56157d4,,True,True,True,1864.0,4215,11575.0,3,True,1864,Tests_passed,0b1958033e3122de17471f190f051caeb0fac293139089a7b0bb99ebd5fd3720,True,Tests_passed,53ea0749350579cc69d70173b37854236da7e6be59b762995f28363fd92f9867,True,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_failed,b6b25427c8c980192fb06bab7a4e0b57c246890445fc24d5f15dabd962a1f658,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80 367,refs/heads/master,5a5a6b9abd06e663ca8fe71d5b2dfec037d227bf,dad8c13771a7b98d3814bf9c50bba8d8d36128e4,5e89813d10e903dde4f744942bde3149293b3bc6,,True,True,True,1266.0,1428,5970.0,8,True,1266,Tests_passed,8b00dffd7db15d8556517599794a45d07053b61eb0114e2ed18dae8b249435ec,True,Tests_passed,c6e6c9d84e00d19c059a1515d96f7c2d7341de44ec886b8d9d1275ed6e9fb04f,True,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,2ecea51872cb5c11e07feff204e1703c1668187553a6d220a5e11f39eac674ea,Tests_timedout,e127bcadf0a86a934f0c72728acdf2cc5d46e1e5875cb1bde4641a343c89e55d,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/greatest_hits/merges_tested/mybatis/spring.csv b/results/greatest_hits/merges_tested/mybatis/spring.csv index 444568e7fb..53b1e805d0 100644 --- a/results/greatest_hits/merges_tested/mybatis/spring.csv +++ b/results/greatest_hits/merges_tested/mybatis/spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,True,248.0,448,16217.0,3,True,248,Tests_passed,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,True,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946 diff --git a/results/greatest_hits/merges_tested/nanohttpd/nanohttpd.csv b/results/greatest_hits/merges_tested/nanohttpd/nanohttpd.csv index ee363a021d..159228724e 100644 --- a/results/greatest_hits/merges_tested/nanohttpd/nanohttpd.csv +++ b/results/greatest_hits/merges_tested/nanohttpd/nanohttpd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,e175fd08e041cd741016bb1f1a944d2caec8f3e6,63815b9a19c35d965465fa25028cd0a9a5fbcb40,9cd340f18884c71807da5ed687bc51450b7811d0,,True,True,Tests_passed,064eabb579823852af71b85087c929d27b87659a6b202f5c144a8b23a4ffe714,True,4,19,47,3,True,Tests_passed,d9184fa03ddd372bb9e50d2b80b64f6bfc77099e248476a61a62757e6b96f5c1,True,4,True,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_failed,43c61fd85717e89966d5f7639121d2be34be15b9bb6187ef0a967a6b0f59e56a,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,760d179976a51f1a5bd49cfa994ffce2c119674b7576a63904b2797cc22c1bd2,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,5390b1d239028f5c704f5c6fa85756920676f2cb1b1b1b4d7b4eb8b0cad85eb9,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17,Tests_passed,b4e973647cc419eca43a92abfa1a5b9f52f8f5954d8974e1282106ba62ea9d17 13,refs/heads/master,d2af06753b654b248c5315ca54e816b9c14ae8d9,b49e60862dd61dd5878f751782908c20b85926c4,060d6d2292442e36aa0967b6eacfac9019a1a59c,,True,True,Tests_passed,7d7d92a4fb4c328f27fba210a6bcf58b13b0cf226966991afea8df66d24dfa7b,True,12,55,266,3,True,Tests_passed,585b811673e80e13df2a6b643925231bfa397c3163130c02fc615cda7d038ddf,True,12,True,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,78462d2009996010c677d723fe15dae53bfcb763479418d7d4e84b857f34ae30,Tests_failed,f5cddd6aacb370cba1f226a772683f4fd0cc7620e7a2839008a0d34ac0780fb3,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,78462d2009996010c677d723fe15dae53bfcb763479418d7d4e84b857f34ae30,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9e558904d04c8218bf90ad059b5ac0b2b24d56ebede8ebbac5ef4fd9ee51901d,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0,Tests_passed,9bf3ba301e98cd9208f20355e084631e47b4a4aa4561b9a620f871ea3775c6c0 42,refs/heads/master,59d874466f5bebf2d92b148cfe47eb7482df6a23,ca1cf4bcadfa26eb593f547474227f940c58e681,681f9d425a1f24a04e69c5451e6bb93a7859b774,,True,True,Tests_passed,762af45ccc244284a69a195d5a4bee6166c4979e694c986c2df381f13fd7241c,True,15,38,884,2,True,Tests_passed,3e4527f47c1d372e59d7b606aad6b246922e880dff5ae64dfb81914807019b69,True,15,True,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,e405c11077e2e97c18c37c119d7f9d09f2087dd03b098b424c75c547517c75f7,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,c4f0725a943ed572b5a259d2f18d3c1d0f93ad40e41358780aebf5d69c3d2ca3,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,c3e4a19a1c83b30387eb5b7af3b2cb6746f428aac9706086a1924294f37669c3,Tests_failed,de35795f8c4a0ef49d46b90f31fe4193a262bd105c7f5ada4b3ae50eb1f8fa93,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,c4f0725a943ed572b5a259d2f18d3c1d0f93ad40e41358780aebf5d69c3d2ca3,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,c3e4a19a1c83b30387eb5b7af3b2cb6746f428aac9706086a1924294f37669c3,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_passed,e405c11077e2e97c18c37c119d7f9d09f2087dd03b098b424c75c547517c75f7,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921,Tests_failed,17ccb85eced975c71035266edf0abd7f41ad76421fec184da6048b9a44d8d921 diff --git a/results/greatest_hits/merges_tested/nepxion/discovery.csv b/results/greatest_hits/merges_tested/nepxion/discovery.csv index ece74ff0b1..c0e9cba999 100644 --- a/results/greatest_hits/merges_tested/nepxion/discovery.csv +++ b/results/greatest_hits/merges_tested/nepxion/discovery.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/6.x.x,99c2bc3a686bfaa15e56484c3828e1fb0e17cfd6,a5a645b7496ddd0c4647abc6b1d8334d561f1eb4,eeef4711d6e2f12a03b2956bda837b06311feea1,,True,True,True,9,64,377.0,3,True,9,Tests_passed,084f2c345aeb1284e4d1a6d16ac0ad405f5477595a8ae351ee1f3266b7ee43df,True,Tests_passed,c93f72ef3c8f6ade021264011100c1be77a55a5d6f716404c4e16f69bcbba451,True,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9f12e440b5fef3fb34930f9ee4f9a94d8cdfe5b03b91e127d8ea5348a29cadd9,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,654aa8b66676127a4bca3d2c6fb64152f9ffd08ed3d31488a5a94aca19162307,Tests_failed,cd4a0ddb5320b575bf6d983d5ee5b1e69e24655376fee5113ba549cfe931ea5a,Merge_failed,071c2025e53c5f01e385a9da7b0b6634a42324963d4478cecac7c5a58eed0d0d,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ba8f8d8ca7318b785aeffb8fc19b074682f6a2b403396775bb16fe3b404cb162,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,adbc4c177f49883983e05c7e30a24b9aa85ac9ae66933475d0608926d02b67f4,Merge_failed,6c90cc86b514adbc6af37dd9fa089f713865c675710f443dee8445e5237676a7,Merge_failed,9bf14e494e151ca06d135e78d7ea0fd58ea9b06ca628180fbae6160feaa92f89,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,ac6f8bbe025e778eb8cdda8404ede1fae9a55a06ed080e1c8167caea438f6b62,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a,Merge_failed,9b344a8e4722af7fd6ad53738a939c68721dcf65c4ebd7f5fcc06a71d0378c2a diff --git a/results/greatest_hits/merges_tested/newbee-ltd/newbee-mall.csv b/results/greatest_hits/merges_tested/newbee-ltd/newbee-mall.csv index 7fccd9ce75..4201ab91c4 100644 --- a/results/greatest_hits/merges_tested/newbee-ltd/newbee-mall.csv +++ b/results/greatest_hits/merges_tested/newbee-ltd/newbee-mall.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/remotes/origin/pull/62,0710125767852fddddaf0ab338c25793f492f68d,1c1d9af4776ed9e0da72091e7635065a05f53ee1,59354e6e91eefa18168fb7528c1d4b462196575f,,True,True,True,495,413,314313,5,True,495,Tests_passed,2f4394f7607535d62e504d42dfee2c0163bca12dff23efd0f52a1e8c3b7d8fd2,True,Tests_passed,0f025595e8b03340e6f54231cae991778a17399c8f390b26c0bee570918cab7c,True,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,70b40ecd186f3475b61f24bbd55e10f6393e3bc8d19c9f0729100a3229ffb72c,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,96d6948372f507ddf0211f9dd92f98839ae3ec610e89af3b06bf2e4bb4270de3,Merge_failed,ad8017aed174a22c5cc8c86c9ba16e7a79878fb464088bc684430770d7a25987,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,40033027e24fc18d1b3f7eea34f4192fc1cf295c4679c7b12bd5847fb7cd512c,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,68ed7dd1008f297315948fa08ac0229ffc2ea60aa1ac6fcbef85ba19350a8d89,Merge_failed,4a706d78f55d7541cd86c369cae6ffca51315ad3cd3dec80b0b1264ad8345b21,Merge_failed,d966c397a573179589fcc759fb5e1112fc8a1c5f0d8b8b6a5d93263893ffc5ac,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,fda882667ff42b4c0a4399048e3b35ccad6a042c2a249f99a42b076530fdb530,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2,Merge_failed,2d9670b587bd5240ec47495d43b8b6c1ae7a7d56ea606048a75101e5383153f2 diff --git a/results/greatest_hits/merges_tested/ninjaframework/ninja.csv b/results/greatest_hits/merges_tested/ninjaframework/ninja.csv index e6f4ad356b..04b540edca 100644 --- a/results/greatest_hits/merges_tested/ninjaframework/ninja.csv +++ b/results/greatest_hits/merges_tested/ninjaframework/ninja.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 78,refs/heads/develop,32ae342ef827c23bb4e4997d84a02663abba1964,aeba7be4fd406af50015af33827ad5f705e62880,d8358ef10479ecf0f79c2fe8546032575a39db5f,,True,True,True,477,620,1890,13,True,477,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,True,Tests_passed,b3e9bdbeda7503b8ceb59d4ff01367042ca3d39958a16b9fc097f6e93e649323,True,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,7952821dd131b2afc617f4776df007d0a499a1422aa393c9030347d3f1cc6d47,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,b7822c929cbe4ef2b39758ce827d32b9ebcbc5332f3798a0dda2972d7ebf969e,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Merge_timedout,,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,b7822c929cbe4ef2b39758ce827d32b9ebcbc5332f3798a0dda2972d7ebf969e,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,7952821dd131b2afc617f4776df007d0a499a1422aa393c9030347d3f1cc6d47,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18 79,refs/heads/develop,aeba7be4fd406af50015af33827ad5f705e62880,660f74b9d6a77fc1e39514ff41e512590ec78105,8f95c8237b3021f50607b99fc7408df2e2fb42eb,,True,True,True,476,478,992,2,True,476,Tests_passed,88169f089876d1b9a35d20f6f260ae20413e66cf441886200a41b441dd1343dd,True,Tests_passed,bfec4730f644d6e2636a24802dc32efeeb1fbee128ea00a80adb39a39c37132b,True,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Merge_timedout,,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15 82,refs/heads/develop,8f95c8237b3021f50607b99fc7408df2e2fb42eb,0af3a18710848892e1ef05f6ee9ecb29de3f09b7,bafaa6e26e2465cab4fb04dbed31ec9ef550ab11,,True,True,True,47,129,287,3,True,47,Tests_passed,cb4ad95b69b388e89f1ee603b40a22fffcd1bb6574e2a7a7e592e46ed0ad72ce,True,Tests_passed,129b38cf27f859830e5705fb0d45893653cb728049ce55d2b3579b1c0daae173,True,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,e7558373f8645aee47eae7ffebe38cbf1d3f93a020daed57321fcc075c9a9fd2,Merge_failed,191e237ae57a051558138581b11c2759176dca335db70e9c666a1dee7aef4c06,Merge_failed,6efd2a910e8360226bf30baa0ac05fb9ff0948c549f38b1ab0327decda941c49,Merge_failed,6efd2a910e8360226bf30baa0ac05fb9ff0948c549f38b1ab0327decda941c49,Merge_failed,191e237ae57a051558138581b11c2759176dca335db70e9c666a1dee7aef4c06,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,5112147cc3185f62038130ef7f3d1dc317e0485b1aac9a2e6a051a755bfcb7b6,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a diff --git a/results/greatest_hits/merges_tested/ninjudd/drip.csv b/results/greatest_hits/merges_tested/ninjudd/drip.csv index 6f9c19bb29..420c28caec 100644 --- a/results/greatest_hits/merges_tested/ninjudd/drip.csv +++ b/results/greatest_hits/merges_tested/ninjudd/drip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,d2d0fae2ac75d59f17a8b24764fe886d73349e21,381ee4e2e8e56034ec0b79744aa2e8ad7ccc9796,32381db764e83aa02c6ad94a987076c64c54e259,,True,True,True,8,11,216,2,True,8,Tests_passed,02513436999f519a039250c513424abc4cfbaf279a90f64e54b6f6438445a90d,True,Tests_passed,477d7e3589fe9da218db8dd24a6bc40c75fde183af52b5865fcbacffa0de77b2,True,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,e0c766b9c4ad046f93035cd6590a3663f25ef9b3f66d78b2290204bd2e694ade,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868,Tests_passed,ba4e65503055f8340e5bec897edc188ef734b22e9128a6a50d7b819529968868 diff --git a/results/greatest_hits/merges_tested/oldmanpushcart/greys-anatomy.csv b/results/greatest_hits/merges_tested/oldmanpushcart/greys-anatomy.csv index 16209c5230..805937201e 100644 --- a/results/greatest_hits/merges_tested/oldmanpushcart/greys-anatomy.csv +++ b/results/greatest_hits/merges_tested/oldmanpushcart/greys-anatomy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/master,3d5d857cabac36862f8a8e90c524908762eb8469,8c2f20402460ae3f414d0820b8d2e7b7d44e9aeb,dcc47f11ebf5eb68d090362b475ff32fb7546ec8,,True,True,True,29,127,317.0,3,True,29,Tests_passed,5e10dd945192f0ca5345d4a1c3e068a92204f4ba83d98967fdf407aa4054199c,True,Tests_passed,f8a63df2cf5b5bde16e67166e6baf4d35f8516a80dd14321f063f28f13207159,True,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_failed,a429edc0284021282afd3a8f73cc332a61f4222d8a659aafd871352cefb827bc,Tests_failed,b2aca72a6898b909612a530197e83548d461893a8a6b7f345309bf280cd2e2d5,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_failed,a429edc0284021282afd3a8f73cc332a61f4222d8a659aafd871352cefb827bc,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05 78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,,True,41,259,,67,True,69,Tests_passed,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,True,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,True,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,7d51c2d40d30035684c07dea82694954ae38646f72823094b67f10e60e9b5168,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,085365cbeadfd7c0b17d4d2b4215948c7971b32b0cb80062fb2400d5b5af9892,Merge_failed,a057e93029d1bba19ea80b4c8f3347b310a7ff8de85f97dba4a033e6ac8ede38,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637 diff --git a/results/greatest_hits/merges_tested/openapitools/openapi-generator.csv b/results/greatest_hits/merges_tested/openapitools/openapi-generator.csv index 767a406909..d2549154ae 100644 --- a/results/greatest_hits/merges_tested/openapitools/openapi-generator.csv +++ b/results/greatest_hits/merges_tested/openapitools/openapi-generator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 114,refs/heads/master,e00d102c471a4150da186b30d36c468d2bd72b60,8408b97771f519253c2ecc9f26349d2a958564b3,e104803781270b91c964a2cc17dbaeb1e11e35ea,,True,True,Tests_passed,303d1ff9a7aa2322b787cd2857769b550800fd4076d3ec2ccf0777038f3f12fe,True,132.0,520,6237.0,2,True,Tests_passed,08c6109b0f2a509e68299ca15d2d567e00a98e236bd3cfd78033c6e534e53c7c,True,132,True,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_failed,d6f5f0221b3493ac88df9a2ea40a18cc6401d37f19996f681086dd7a106fcbc7,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09 183,refs/heads/master,3ef7694b9f6803d8df84f5a76d1c7bc830b38fdb,59801d51672c7a33b6f5c2796992fdb428a02467,c14da15b3ef451a2ed50fdbec88656ed758dc982,,True,True,Tests_passed,a887acbdcd03ab860bad472c56fa6e62b1032214e1e93607732630562292e770,True,1181.0,7376,93352.0,7,True,Tests_passed,e7cebe6bba51ca43304dd86e74b7a133272d4b6d703472222549adf229d9cb13,True,1181,True,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,db37db0e7198fc0f1ae0f98b86b2c37b9e9e167c1ad96db5729fee8e9100bed8,Tests_passed,62db64d5125f78d4a714512591dbaa289f81c05790bb51c39496ddde4a3d1476,Tests_passed,f58ef1b64f87c8034b2e49786939f8ad1294f333d6f65e0ab9811687b55498d0,Merge_failed,ae89a78175ddf90dc608e6ed715d154b768701f212a2afbf629576db30930e01,Tests_passed,62db64d5125f78d4a714512591dbaa289f81c05790bb51c39496ddde4a3d1476,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,f1346983c6ec5f975a16cb3d0da9ed92d3127eba3fd0e72911c6d752c15b10f9,Tests_passed,f58ef1b64f87c8034b2e49786939f8ad1294f333d6f65e0ab9811687b55498d0,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d,Merge_failed,a048db788879d1782fa45bcf7ee593298d030c95384bf7ab3d3359123d9ae42d 213,refs/heads/master,c35fdc3bdaf9cef413104f9c7d34d76ec9fd0299,8dbdc31ba7a59ba8907fbe2a92cb7b8ea0d1b8ea,19d5e74dbd2ed6d643561cfdf5f4f1969b5b6591,,True,True,Tests_passed,2c4af04aa6e6c18669a920e7d5fb2142e5927aed7da7e328da2d9f64c33ca247,True,967.0,6032,72978.0,2,True,Tests_passed,6449e58cd8da2828978b57d58af015ac7f06aa1727fd44fd9c4f9e6bcbff19a5,True,967,True,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,456507cb0fd8a12b3d3af56ce5e6f8017fdb4d144d0d64054e34ff83ccd6ecb2,Tests_failed,f04f5687ca3a46a7d0444f5d2449d6cbb61b94d9079d7199c9dc004ba0381529,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,456507cb0fd8a12b3d3af56ce5e6f8017fdb4d144d0d64054e34ff83ccd6ecb2,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a,Tests_passed,94f72fcdda90621a720eb4c7871b42fead00a41a1dcd47d29e9a6f7f62f3590a diff --git a/results/greatest_hits/merges_tested/openrefine/openrefine.csv b/results/greatest_hits/merges_tested/openrefine/openrefine.csv index a0dc55602b..e742a50830 100644 --- a/results/greatest_hits/merges_tested/openrefine/openrefine.csv +++ b/results/greatest_hits/merges_tested/openrefine/openrefine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,True,78.0,219,871.0,2,True,78,Tests_passed,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,True,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d diff --git a/results/greatest_hits/merges_tested/openzipkin/zipkin.csv b/results/greatest_hits/merges_tested/openzipkin/zipkin.csv index 5d2b44b783..6ed2933796 100644 --- a/results/greatest_hits/merges_tested/openzipkin/zipkin.csv +++ b/results/greatest_hits/merges_tested/openzipkin/zipkin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 817,refs/remotes/origin/pull/3437,cc301700a10142e2d7f5f46da869c93197b58b4b,b121d46945d70759a1e1a330831c3085dc406d8b,070afe27beb2d9fa3ffd38780119fb63705534a6,,True,False,True,2,2,3,3,True,3,Tests_passed,bf7714846c403c012dd78282285973c68203482a81c8540a7b472986f7656a09,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,True,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_failed,99f26f67a1cbcce83749566d43867139517c147b462c626fc2712986e43a2b35,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f,Tests_passed,8865a331cc5dbc412c28afa3c87972c96f33648d684f65324c7f0fcd1be9b26f diff --git a/results/greatest_hits/merges_tested/pagehelper/mybatis-pagehelper.csv b/results/greatest_hits/merges_tested/pagehelper/mybatis-pagehelper.csv index 55b7870a65..f01e5afe87 100644 --- a/results/greatest_hits/merges_tested/pagehelper/mybatis-pagehelper.csv +++ b/results/greatest_hits/merges_tested/pagehelper/mybatis-pagehelper.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,8182846c13c90ee486dbbe62bec51705e8fd3f83,8961063ccaebbcb71e3ea627ab90a8c25bcdd75b,be523bc4b471c78a89108bffc9c3f7bf88cdf69c,,True,True,True,213,457,2960,2,True,213,Tests_passed,c82ff8a978d8c2c2ffcda1ea65c82c082dfbf2206a8352126a7034eb8550cd02,True,Tests_passed,b8cbe942156d6c5c0d7d6015d59acfee188dc713b4f283f6fd03906c520f83ef,True,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,1204aebc2be744ee4df19d78bb71eb85e42c111428a54550f97354ceb809205d,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a,Tests_passed,135c02bab256f224d721c7231d6eaa5ee868f63ade261aba35ad7be64ddd5f0a 6,refs/heads/master,d56061dc9389545c712be42fe881ff16dd58182e,2c879208d3c9979832663f38b79f3f5923ca9914,bf1b3b3f9ccf965b8a5dd5f38e63274dfef5378a,,True,True,True,222,617,4320,45,True,223,Tests_passed,c1da8ad826ecdad3aa614226e302352eb42c312cbe1ca7133c3adf3f8b9d1483,True,Tests_passed,ae7c43394d4b6580a9917e8834a7abae287bfca35b6f24e5dbf93e1b4b6e739c,True,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,1fede94c387a24b48ab886a55416f4004732a7783ba2df041ee68bdbc7f78da4,Merge_failed,799b9ef54fb0ad9cd35bfe663a547011939e06b53ec5854e8ca0138d66091962,Merge_failed,05cb197e55460070298640220cd10fbb051da354e925a5bbab14a4641671ebab,Merge_failed,a8a0aa43e8f152e4c20662239f51fddaee2b0bfc9e318bdf2d47c102ea5c2cf0,Merge_failed,799b9ef54fb0ad9cd35bfe663a547011939e06b53ec5854e8ca0138d66091962,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6fbe0c79f6c33bed30c6d75d2cd34934ac7534c700780b6fb43cccb198f63ab2,Merge_failed,30b29a7949c79e4b245f0ae8a3a48dca06790a9b81344116688afc5b9f84342e,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,5d21f329b39f8686407fb22819d48db9e65178b1ea60a8f853e0ddfc05c2e0cb,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091,Merge_failed,6484a1accbf879e7ee06af7c52c01df39456402cc7973c13f06556eba3a15091 12,refs/heads/master,f33d2fd8fef2f9a6d24dab96126a42c4ed807d89,6e0d8beb6fe1b3242ab1904065d8bd29d7da2e00,8afe9865c6580b97dff3742736b72b2c3bb6b245,,True,True,True,13,32,212,2,True,13,Tests_passed,120b8ea5c423761a119bb6579f9b2980297833062af37b4671b4f5c2df4dc994,True,Tests_passed,e259f454141d75c23adeece04662ca20ccff84309575633fb5e8f636d9aec981,True,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,58224fd91a5ffc1dba7d7e061673f8fe5367e5b2de9bbbef30d46cc38bd53585,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,58224fd91a5ffc1dba7d7e061673f8fe5367e5b2de9bbbef30d46cc38bd53585,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30,Tests_passed,3b647f455ba6cd4d0450bf863b6931e4dd9bb95cd1d8517d16ae8a5f57fa9b30 diff --git a/results/greatest_hits/merges_tested/pedrovgs/algorithms.csv b/results/greatest_hits/merges_tested/pedrovgs/algorithms.csv index c25e1aca10..507ac3eff5 100644 --- a/results/greatest_hits/merges_tested/pedrovgs/algorithms.csv +++ b/results/greatest_hits/merges_tested/pedrovgs/algorithms.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,False,True,2,20,219,3,True,3,Tests_passed,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,True,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,b6c0da70d24e30bdadd393948d91c3d07b50a2c1af43ab2d6ff67bd2f372f3cf,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,963798546c8c846f2ad839e3d786c30a7fd48465c315804dacd9649a102e63ce,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7 19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,True,3,10,78,4,True,4,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,0f989663818299a0c7aa64adc393891dae1962999465d1cf62fc88d3ba0b1cec,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4 diff --git a/results/greatest_hits/merges_tested/pmd/pmd.csv b/results/greatest_hits/merges_tested/pmd/pmd.csv index 5c40b34b72..8fdad30c15 100644 --- a/results/greatest_hits/merges_tested/pmd/pmd.csv +++ b/results/greatest_hits/merges_tested/pmd/pmd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1042,refs/heads/master,15a82f0ddb19fe060331dc1ec56075fe4a4b871c,6dbcf77953e9ee91780d1aea3d90074daaf21126,1c08f946917a938669cfcf011e238dae028b3898,,True,True,Tests_passed,22b63a86da4cfa6a87f4432125e0da5e71a8836aebaae855ae4f0488f6aadee5,True,435,1197,8416.0,3,True,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,True,435,True,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Merge_timedout,,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,d0428935c920cb722b9b298db4bd84d5bd530a698dfde0050c1f40875d0ef29a,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43,Tests_passed,b675fc2583cdcaa6d95334a110c7c55f2ff8fce7dd828f7e70d1357fe9ea8f43 2820,refs/remotes/origin/all-contributors/add-dague1,88477e3f54563a3e932a6aeb4c9f0b3d66daa34b,74b6be069082e674f79480ca3062845852a825f4,b4c2a517811f12528fb1cd81a45c465aef81fd27,,True,True,Tests_passed,af83668e9307a4d552417ec4598e612f97fa74e156db922da1c0e48804074416,True,171,414,6845.0,3,True,Tests_passed,ad31b448d01d585f118d2838b82bd594d8b9f15d8f12f53cf0dff77a917b27b9,True,171,True,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,72613798f5cf8007e9d44bce34a4e0a7a54a22f5f36d170dc7ca86cf9eb39548,Tests_failed,0b7e2e9642314b7e18fa8108ddd554471563cd8cfcbd6f9e576c63b48f156b48,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,72613798f5cf8007e9d44bce34a4e0a7a54a22f5f36d170dc7ca86cf9eb39548,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b,Tests_passed,2fbd57ec618d7acd1650532578696b751f6e7f5d329212b5dfa694b043833e1b 3730,refs/remotes/origin/experimental-apex-parser,8528a8ed7d2400fccb0f15c366c9843ee706c329,93d3d73666280f669c59c9e6342a78fd51b29afe,89c7da82f49e09a31d14d65db7b74fa108519348,,True,,Tests_passed,eec146e7a2b6e1a86e0c39dbad61b152475bff4f25812ba2b73f468ed5057cae,True,296,1445,,12,True,Tests_passed,b633c8fa4794258d5162ad54c6d18cbab690020e8a87b69bf3f32d60391c451e,True,296,True,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,672595ce4351b412ba44976aa24f9f2e3036cae502a9efaa3343d96b8f9a0ddb,Merge_failed,f944a94cc6143645738ef6244e9df767b89167e06947caf61b06cfe1a255ad97,Merge_failed,8ef08088b426cd6f392043928cf333c05b4e824c0df116d1137e9d5a25628060,Merge_failed,8ef08088b426cd6f392043928cf333c05b4e824c0df116d1137e9d5a25628060,Merge_failed,f944a94cc6143645738ef6244e9df767b89167e06947caf61b06cfe1a255ad97,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,6069b1144f4395c1f4f2acf83edbb2a644aed7f5e648c34bc2e88a9754804df9,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991,Merge_failed,78d162707398192800beda58baafc111ddd0ecfd19391cda7ee9236eb18ac991 diff --git a/results/greatest_hits/merges_tested/qihoo360/xlearning.csv b/results/greatest_hits/merges_tested/qihoo360/xlearning.csv index d285dc7bdf..3414c8b776 100644 --- a/results/greatest_hits/merges_tested/qihoo360/xlearning.csv +++ b/results/greatest_hits/merges_tested/qihoo360/xlearning.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,93be0646a1cb67bbb6e1117f941151ba14fc7607,be65c5d4b8f92b368953b35409694935906ba113,a136019bb34dcd33c7317dd6a256f6d4ea0f0a19,,True,True,True,9,14,67,2,True,9,Tests_passed,9d882f247fe89083eaa0c8a705148f46f059117e1a79faec1d8f31a54dc63357,True,Tests_passed,66f9ad3fe492a495ad660819ee85e059199a1717583f4e1160ff88de7131743a,True,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_failed,f226a5740dab6f70aa0626b650fcfabf965aedc84240c2f158477199e61f2b48,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,c8ebc3b5b0d1a5eb70f8a96b900038321bdd2d845d3f4b866b2249cdf6e84779,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29,Tests_passed,9915e194c941fedeea114443b3e0f3b85a1e2fd9ad6006c5a16475ca6f80bd29 diff --git a/results/greatest_hits/merges_tested/qunarcorp/qmq.csv b/results/greatest_hits/merges_tested/qunarcorp/qmq.csv index 8ac4f954b4..9ae7eb8b0e 100644 --- a/results/greatest_hits/merges_tested/qunarcorp/qmq.csv +++ b/results/greatest_hits/merges_tested/qunarcorp/qmq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,aceed9c800f1a9e554f5cb8d583ec5a570eba088,831b51e546cc850ed9b5208bf3aafeeacdde0b60,db66b9a79f4902f94122a350eeaf5f52c8069a63,,True,False,True,2,3,10.0,2,True,2,Tests_passed,2d46fe46e3e6f15c95eb775249b8e82ea22970ce3a434c09815ecb9c23c32027,True,Tests_passed,7bf10cb4d9847e99f5b02b13f7242d945416c560aae5378841911fe5620ff810,True,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,8e4ef38ac26317685e34b8330baa6d51f0be2deeb0cea73eaf55c898d2f72796,Tests_failed,9c503b4b09c9a47ec19e767f6acf3fb85404d28149cfce3fdb8d863941223d73,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,8e4ef38ac26317685e34b8330baa6d51f0be2deeb0cea73eaf55c898d2f72796,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf,Tests_passed,cc940cdddfcec0a537b8fa1fdff0c076bbb2daa0120172e7d1888636c4539abf 60,refs/remotes/origin/pull/110,6a8eb4126c66b523da574d008c077fb35426d9a8,6a39e0ac27afd06532a3b69cbc347138ed440eb0,4721e7b153c012f282b28728121a90f7aac9a341,,True,True,True,988,2973,40595.0,2,True,988,Tests_passed,3b9c64e2680c301c5cad0abba71f38420f91096ca50eb4fff09b68d06b428981,True,Tests_passed,607691dcc4fc8e8c6c8ffdc73977be4d1f36fe6b6b9bf15dcf8a36fa75b95cc5,True,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,6bf187bb1f9f17744328185f25a5af5102a0e5362f19eae8fcae9730e19962c0,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Tests_failed,97512a5ba23c77db07f95565e2a490c3f153cfc978a0f0b54d40679f37fe7bc7,Tests_passed,e323e4b9abf83a7f2970b41a7618af4344e1005a71345670eadade7b7776f184,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,1766fdb39419d15aee1ddb77cba52c567f8576a1767d2d8572670b2a0e3db964,Tests_passed,309bcec17c9163cdec83418537765aff91a7b5647bc79f6c2834ba5a4173512e,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac,Merge_failed,4b499ff146961aef9cd690c2feeb4068d489b213d539769ad09677fc1b070bac 62,refs/remotes/origin/pull/148,1d1cd62265c0a297e321c29715f01d3db4bd73b4,c1a317ae7a826e49176c07b986e5fdfdc964082f,a285a88b9fe92f5d334aebdef80def300e4f286e,,True,True,True,21,22,48.0,10,True,27,Tests_passed,2df18cd269ffabd586723669ff56f27ad7f0aee4c49f4fbba632a8f79c6b969f,True,Tests_passed,ffbe95a18151449a4f0322e2ad3e283a6ac856e174cde55b6ecd224c389bde4b,True,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,7cfd9f80c9ffdfa676237d8f13741a214fb9e48a7f1ce11d71f582fc61dd7ee0,Merge_failed,edcd23115c34101aea5c56c5099012163148abb27bb5872410634910ef320ecc,Merge_failed,a547845523af312272ebc474f240b4551c81b036c86a28c3185769ef67d1b9e9,Merge_failed,44178baeff51376cb718a37aa8354ed635530e89d2da58cff80c2c13e42abe7f,Merge_failed,edcd23115c34101aea5c56c5099012163148abb27bb5872410634910ef320ecc,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,93cc32cb3fce43ffb7a841c7192a74536428d91a9de03bd3fc5684e176d3cfc2,Merge_failed,a547845523af312272ebc474f240b4551c81b036c86a28c3185769ef67d1b9e9,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c,Merge_failed,c8140def6cc0f0b86e43fa4c8499ebbe263c5e22110c69d94e1a312ba61ae87c diff --git a/results/greatest_hits/merges_tested/robotiumtech/robotium.csv b/results/greatest_hits/merges_tested/robotiumtech/robotium.csv index 581a67f7b2..a5a3c0201e 100644 --- a/results/greatest_hits/merges_tested/robotiumtech/robotium.csv +++ b/results/greatest_hits/merges_tested/robotiumtech/robotium.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,4476410ce640326a4c4dad7a6373a572b6277c79,d1fa149f493e3313b1c321e35b3ef0935380f73c,246b8682eb7977fd19f17cda345115899fe5325b,,True,True,True,16,72,286,3,True,16,Tests_passed,04ba55c0915cb933b3c02b8613be0264da8e0cb7d4804c35114b39b4a01d602b,True,Tests_passed,a8da5f92ad3447119e7bb7e7a88b6c8003056c64e33870de3cacdd7aea15dff4,True,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,86968050e9aef9bc058d5d375d463bcc33ac45a5940587bf367ceadcfe573549,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,86968050e9aef9bc058d5d375d463bcc33ac45a5940587bf367ceadcfe573549,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654 27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,True,20,147,760,2,True,20,Tests_passed,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,True,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,True,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,b6d677a147b41a9fa7be61498d50cd062463766a02174677829065710a989c58,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,1ca63c9e064947f5c49946817bfb9487df93659f03e4b7269ef366390da3a540,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9 39,refs/heads/master,e4e8e55b531c08b6b551949013e9a41a98727023,bc56decc35ae1d64e8ee75b921beef4b5676ffcd,d0afd0d30d35476cea530c81bcefe924bce4f315,,True,True,True,7,50,232,2,True,7,Tests_passed,01fbc5b347b8130aa4200de408b98a83b3e9a1fabec10cd634859a9a412be8f9,True,Tests_passed,923c1d2b84351cdb2dff0d2c755e9a3471cca0ec3b04af753ec5b4f2beaa201c,True,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,77db15ad23cf9fdeba62322d1a0f0d293e0cabbb99f0946be2483e18b5da3a7b,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,77db15ad23cf9fdeba62322d1a0f0d293e0cabbb99f0946be2483e18b5da3a7b,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be diff --git a/results/greatest_hits/merges_tested/roncoo/roncoo-pay.csv b/results/greatest_hits/merges_tested/roncoo/roncoo-pay.csv index adbbb289c0..aca57f698c 100644 --- a/results/greatest_hits/merges_tested/roncoo/roncoo-pay.csv +++ b/results/greatest_hits/merges_tested/roncoo/roncoo-pay.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,61acbdbc5fa10afe86aa18660b1cad22730af022,764f122f7c890579e31ac93d0d006fc2250d78f1,ccca546fb46e38dad6085df47dbdc9e1327b86f5,,True,,True,370,877,,234,True,496,Tests_passed,b8916bb0b66ad6ddde1134d375c527a549b910d70700bb62c3024c7dcdaa65b6,True,Tests_passed,77039be23788f4e7eac59e11ff24c2fc1397f65ec3ee76a238613f7c06326af8,True,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,1fd71cb93ca5110de173613da6ce924a1c141fb0d0cafd4613de20d20451d394,Merge_failed,8d24a41d13771e8341fcffed982d7385b1bc380b59b61904b4b0129c42784457,Merge_failed,386945e269f5511f6bee82345c1cd7f2a5b71d5af93991696b2069dcec2c6fb2,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,187fb127ccfc4646488e4fc2bf273ff7ca10e8c2740b906ebff0cc07e5b43323,Merge_failed,997f7af0d8be211e85bc369cd2c20a03e41da2fc77fc59cd76dfedf4d2f1e227,Merge_failed,e4be64fb07f6d275362c041de32dfe23f62743283066d19ee9f4b81b4e40a86a,Merge_failed,5db3bc257efee707c85be3a91ed5804a3ba18db5e68178e6e6754c8fadc1bbe4,Merge_failed,d4453a01f5b9bc937cffd2d4727a06be88b80d15cac09ffe4dec71d6d40aecb8,Merge_failed,e4be64fb07f6d275362c041de32dfe23f62743283066d19ee9f4b81b4e40a86a,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,8d24a41d13771e8341fcffed982d7385b1bc380b59b61904b4b0129c42784457,Merge_failed,386945e269f5511f6bee82345c1cd7f2a5b71d5af93991696b2069dcec2c6fb2,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,86b4a97cf889d0bcf4d76f6156123490315e1bccb77a5f4bcd70c4edf89947e6,Merge_failed,187fb127ccfc4646488e4fc2bf273ff7ca10e8c2740b906ebff0cc07e5b43323,Merge_failed,7d6cde7cc61347b130737e0bb69c110ba73cf82fd56296e57f9715777ad9c0c7,Merge_failed,ba77056315cabb1506275c6c153e0ad341915a81194463d64abfe05866519843,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,1fd71cb93ca5110de173613da6ce924a1c141fb0d0cafd4613de20d20451d394,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9,Merge_failed,6a52b227c6613a7f039181842de657bb45aaee773bc3f843c37c9101285084c9 17,refs/heads/master,ccca546fb46e38dad6085df47dbdc9e1327b86f5,3a909a22c9890c12772b13c0901cfaff0b18cc2b,f87b86aa53ecb4dea693ec74ee5292738f8cef12,,True,True,True,454,1016,81789.0,15,True,456,Tests_passed,cdea973b895ee16b3d17a0f23afbf7e75980a0d35130e587f8bc482850c9ae89,True,Tests_passed,89bbd7526f75f6c35a1cee28e626238852bfb36a160d5a9d91ac511df2dd16e8,True,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,bffba307306921b7593bceea518e05510a309b6499e94beb6a41d0b37c1f8cf1,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,30bc0716eb5523b331cce8491d50d5e9ea7bdbe59f15a96366e7f4efe08636a3,Merge_failed,ff28d45460eb58be9d9dd54d40a82ceb5b01554cf23fe15ab3c11fc2b3bba30a,Merge_failed,04e3af37cff59a221c39f7367e9374c55303c7f8ef5e43fbe2121c592a700731,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,2cbaa3fd025225178e029c73ffe8c7a47d464b50dd2b2b875fc43fbd2771f5f5,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,5f69b803800f5a9a57bb41ded088a33ac117cebe73444439ab0f388a8630ae92,Merge_failed,da707a83f98a2ac8c10e6110c6ec1b34c1f5c3cf731843cfa8dc51bb4bbbaa3f,Merge_failed,d64afbee676d3a35e2a6eab85c813863cc5d9c85b18d2274df5276be87def460,Merge_failed,473bcd20a3c891fc4a75e5c3f18c547ca2c4d63e092bd4c957e3c82de3f04b3b,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,c3d329f7427e176e353dcb09fec5fd9a8ef7cc1319bd3aa396b5189e0504e90e,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d,Merge_failed,07bef8d0e4d3803791fd7ad595a8c6ebffd109bc168e20abb574d3376068688d diff --git a/results/greatest_hits/merges_tested/rubenlagus/telegrambots.csv b/results/greatest_hits/merges_tested/rubenlagus/telegrambots.csv index f4c3ed5647..b9a62da3ae 100644 --- a/results/greatest_hits/merges_tested/rubenlagus/telegrambots.csv +++ b/results/greatest_hits/merges_tested/rubenlagus/telegrambots.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d1c70210f13920291335024d0655f164a838e6ee,4a53ed85e434e6d0410bf47efee944caecf8a651,b3099f58cfee3dc1140abd82b1536467b926958a,,True,True,True,60,136,1028,4,True,60,Tests_passed,9ec08527b8796e8b041ee9a0b1ac081779a14347287a17147e7dd2d1fb447d63,True,Tests_passed,8a2c39ec832e40c65974375e64fd20d8b816fdda5994a3b1e7d1c5f8d62f16ad,True,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,c6160c64a7c9c5b07a315c38a73e467824fca70f53bf5d9781d3beeb393425d7,Tests_failed,612d3924c161627447752250fa10b6e917fad98d2084ab43796e26c85b7b271a,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,c6160c64a7c9c5b07a315c38a73e467824fca70f53bf5d9781d3beeb393425d7,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5,Tests_passed,f3e8a50964ffb1bd1e3eb7764905d5288cccd6e838c321ae6061fd60e3f916f5 18,refs/heads/master,69e4a6a149fe041ef4f015076a224a1e44729b08,92c7b1c3ce781556f103f027d7a9ef90ada802dd,80ef86b90d4a3ce3fdae795d61a5772febd0e980,,True,True,True,87,388,1564,2,True,87,Tests_passed,3ff3fb8e8c974df3e51d6767f769fdd03b543ab238ae0cf9a1dddb23d90ae55c,True,Tests_passed,95c30bcf036aa2a343ff49cd5a08b75e49eb6a5abb640a7797fba3ba5b05bf65,True,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_failed,6df26913bbed74bb9c15a36e8e2e2e794fff733261d35821e16afe6647ff4d0e,Tests_failed,ae18f3e8e7787a88ba8659949577264c984d2d0fe3223b55fea2f092ac61b2c4,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_failed,6df26913bbed74bb9c15a36e8e2e2e794fff733261d35821e16afe6647ff4d0e,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca,Tests_passed,66c494cde359ccd84c8cd3e927a228c565db853c036578bb3b0206edc9c5a9ca 70,refs/heads/master,7287c384440479a69cf1104fab81a00c625249f0,4ae315eb0995c3a336c4b21a32a8fdf74f25c4a3,39a5678543c6710c5bc27b9d633828777b8e8205,,True,True,True,20,65,363,4,True,20,Tests_passed,2369271b71276f3be007c8d35893e39661f638b3dbe132260c4fda6fdc5b05f6,True,Tests_passed,393ee2b2d41ee220723e447eaf226b33f1153708a6b6efb733339f840f199989,True,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_failed,d08e53ecdd0d3e8dddf936219d2bedc9fb6892e6daca16e17153744d6cd57527,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_failed,d08e53ecdd0d3e8dddf936219d2bedc9fb6892e6daca16e17153744d6cd57527,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,48a03f635cd192e29fbe8ea1c8a9a575be1ed8f3d0659a3d53f43e4add49abf6,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab,Tests_passed,8aeaf36c936deb4a8b6cc2c63273446cf52b63a73222300484874b46d57044ab diff --git a/results/greatest_hits/merges_tested/runelite/runelite.csv b/results/greatest_hits/merges_tested/runelite/runelite.csv index 2a165b8734..44380a99ce 100644 --- a/results/greatest_hits/merges_tested/runelite/runelite.csv +++ b/results/greatest_hits/merges_tested/runelite/runelite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 227,refs/heads/master,ca11d1926a6f00820640bc73564a555c56fc44df,ea71fcf4bfcd51f76630bc7066ce07a0402544bb,eb098792053145a2e44410b2c60475799d493890,,True,True,True,139,527,5898.0,2,True,139,Tests_passed,5c40fcd4d8d6a303ec0931375b98649ea3dc57695abc732c71aa7556ff3e80c3,True,Tests_passed,19aa6a3b48a3fc0f3b165e187b28ba0282f7e1aec4841f289eb220ec65d35475,True,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,e5da70f45a27cf79ab4418f5b5615851fea4f87c8319d071130a35a065430136,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,e5da70f45a27cf79ab4418f5b5615851fea4f87c8319d071130a35a065430136,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d,Tests_passed,cc6e97cfee7368ba6dccb1802262d88a761bd553b9900ae145c43c02665ef14d 661,refs/heads/master,6b475a74dba16b6dbae71c108df8f4be30384ca3,2835feea7037de3067f6a9ec59e798723d660cdb,91bc28a84ba1ad90c2429b1b61f4236ea929f8dd,,True,True,True,219,1354,9917.0,2,True,219,Tests_passed,ad424b10eef70502998a953805b02ff10f3ecb06663bab544179cc3b6f1d61d8,True,Tests_passed,b8713a3e3dfae813b1bed11bc1595196d2fa18f5478863b29b533d0c585caa57,True,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Merge_timedout,,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_failed,5a9c83a6fb81e8842e1eea167a157721fc6daba0b4b94898898518488fc4ca81,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,0a16dbed15d7470c53ab370a3ba0c3caf142036ca3d38cb48d2f9bd8f6e4c8d9,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32,Tests_passed,df57b465587d2823a5a5a60f06e46c74b96b0b8749ae17332c170c319d393e32 2004,refs/remotes/origin/1.10.17,3700063d3b801ae16f046d6af77785543cb58eb8,5a524471f8358e75405f787964391c986e529029,8d65dcb1eacc0b6a2ebb4a88f41b5474d3302408,,True,True,True,153,809,6055.0,2,True,153,Tests_passed,d071d55cc798058956fd8ad55249f9379c7c88bb28006563c9f48928ac140437,True,Tests_passed,4827eb724fecad1e7aba71a7ce022e703d219d37304869d784d7436ead63e590,True,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,749b3c987e831155258bfeee54613388d09d5b83dd02e4004c29a0e291d9ca50,Merge_timedout,,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,749b3c987e831155258bfeee54613388d09d5b83dd02e4004c29a0e291d9ca50,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6,Tests_passed,b5ee2e437ea98f9bb8743cdc3823de8891a0cd1ef5ff31d8b1cd1495a96078f6 diff --git a/results/greatest_hits/merges_tested/scribejava/scribejava.csv b/results/greatest_hits/merges_tested/scribejava/scribejava.csv index 6d0d5d59d0..607474a74c 100644 --- a/results/greatest_hits/merges_tested/scribejava/scribejava.csv +++ b/results/greatest_hits/merges_tested/scribejava/scribejava.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e 6,refs/heads/master,3b0c0e14ec2b6bf6f7adcac3ecb46c68caa26356,6007a9e712c4b7219d86a4e945835fdcd875943d,3f1cd63ae5c41dacffced9fc0d73446af9f1ca89,,True,True,True,47,123,2150,2,True,47,Tests_passed,5f4672078016a5b34965b94b52b65e71f09f516b32fa5861d65a5cabb5e81947,True,Tests_passed,63c3b896197a3bf80f4d79f734ae11d7fc1970f0427244abc2230b2e547183c5,True,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_failed,6d69b6184561462afe9d101593cd3857025de6a35f1d7525bc53762334632b10,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6 20,refs/heads/master,2f5d9b10ee3604387e16d355cfb95af096d3c51c,73c29f539804fbed6e7e2587a87f97898439eeca,5ee2173fbe4feeab5d5fd93d3b455e9f66771f21,,True,True,True,114,179,1976,5,True,114,Tests_passed,bb56750e94ef526bdcf3f7970d0cc06b5bfccdf77f602f988bab41b8b55da179,True,Tests_passed,b49634ae591d87ba5d6b8f46c82321cca02980f0bd42752835ceff487fcdd90a,True,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,89e5049a47671619ba138ff9b934166885a0ad64c4ae189404a60e9fa6927f5e,Merge_failed,62bbc9c2ef82ecc7af4fa8497e5cc9bb80612ee41b62244d243386894a05ee20,Tests_failed,8d3cdc09e6044c063e5d4218c172e52537d122a0fd601a876f95324c3c5f3f16,Merge_failed,898144c1fc87b9c52b42660e649fc3ec3e0a89c70d790c17413e1492e859e269,Merge_failed,62bbc9c2ef82ecc7af4fa8497e5cc9bb80612ee41b62244d243386894a05ee20,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,a77c0fb882b21e7b26e8cb764980a9882f9896f459b7705ee00476bbd104249a,Tests_failed,8d3cdc09e6044c063e5d4218c172e52537d122a0fd601a876f95324c3c5f3f16,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b,Merge_failed,01b8287a675feb98ce33f9188fcb66b9bf43a38ed4c5c4c42fa619982d143a6b diff --git a/results/greatest_hits/merges_tested/shopizer-ecommerce/shopizer.csv b/results/greatest_hits/merges_tested/shopizer-ecommerce/shopizer.csv index 752153c07b..6d6aa39244 100644 --- a/results/greatest_hits/merges_tested/shopizer-ecommerce/shopizer.csv +++ b/results/greatest_hits/merges_tested/shopizer-ecommerce/shopizer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/main,50ecad795f23f1441823702df26fbe09f8c1add7,e0a1b61381f2f276974e534c54154c0ecd26d15c,6d6c78728d772176067e479445d86c8036928e95,,True,True,True,13,25,189.0,2,True,13,Tests_passed,75576ca2229e0eda424168ae538fd25043f443ed8053407a217c5af63b2e5a4d,True,Tests_passed,f51524fa51d1546c5cd6e11ad45aca3a5520dcdb06cd0c9aed79c14e07956232,True,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,72eab868eba9b44cb2c5a053d69ed7e5a2b7fe54fa3dd36bd222af37ca24d836,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_timedout,,Merge_failed,fd49755ab19b6dece3f42dade104894a48af00877d53a4523c86b6b9890595c0,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,3f001fa1a7b94a41acf30a3f9f876476a983c7d397b919d5e69a4e00df281103,Tests_passed,1c464f76bcb63c4e63c152038a7bf6c87553ec746fd6e5404397f2a9170810eb,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818,Merge_failed,be5499d600a527328b0c3ddb0b795c5b491f1ae69d760da9311be5f0635bb818 24,refs/remotes/origin/2.10.0,47f960c48c69d24ac3bbe2daead14bb90ad522c8,bb3aab427fc25d0244bb71cf3591de25609e3c70,765f19c7f7688381ea65c84da33c28e27cd7f6fa,,True,True,True,42,525,6279.0,12,True,42,Tests_passed,aaffde4128975fca29caeccf936a77769cd182c2b519e024739ef6f0b4881f9b,True,Tests_passed,89c85bb34f311310197f657056b7d1c4e994ff66e121a772efbfca703a173869,True,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,c316d481236e8dc3822ee94406efa8b753fed0f013c84214182f5ef3063a0bfe,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,f33929587088b3d9d58802ebcf644195032d49f6b17fbdfc89ac7150bc2dad2f,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,ee3d88b3ec1e66596f8b9f18bbf9a9fa82156d080f6008fb0898ea297e01d9ae,Merge_failed,7d0212b92a09316307a028bf950ed219ac1817cf81a631c1a4d6f56b5860e70c,Merge_failed,a31c24a84120f32a4f712a508b6ebb0fcdc2e5f2b7171c216b03c35a3e1dfb55,Merge_failed,e96451e8b8a42607b8f7aa01a18ccc1394b3fc0d4b8b8f7a125da787c0812e77,Merge_failed,97711e83cc034e74c82517dc38f8ee032de3689a91bef61e0113f0e1498a4f39,Merge_failed,a31c24a84120f32a4f712a508b6ebb0fcdc2e5f2b7171c216b03c35a3e1dfb55,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,f33929587088b3d9d58802ebcf644195032d49f6b17fbdfc89ac7150bc2dad2f,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,566bdf6d1e497337310ee33aaa415d982d9b9873ed0e557d0f3823b8e56eb384,Merge_failed,ee3d88b3ec1e66596f8b9f18bbf9a9fa82156d080f6008fb0898ea297e01d9ae,Merge_failed,39705151b9461d4728735d68f513481848ccffe696f6566fe2a1cda5fad7cf78,Merge_failed,e96451e8b8a42607b8f7aa01a18ccc1394b3fc0d4b8b8f7a125da787c0812e77,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,c316d481236e8dc3822ee94406efa8b753fed0f013c84214182f5ef3063a0bfe,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485,Merge_failed,6978b02d48d42844fe507e28f2450ee732396654ef45a14800c161a2fd63c485 36,refs/remotes/origin/2.10.0,d6c9e148840f85d4426ea278fdb832236d757ec9,18b1aed89b2f7db8e71800ca9e318f3a8b4cadd7,4bb93f834fcffe97dfb7b37f46d8856d5a5a338b,,True,True,True,13,16,739.0,2,True,13,Tests_passed,90a69f1652ef0d6f1669de1ba01690e78c14b2c4f7206a80f06c60d996943e7b,True,Tests_passed,99a0fc9df1d97c22040b6592f6b537aef7fe68dd6c89f19e41118e44a18d70a7,True,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,5b8686e3b97eb361549c68397564d05f09995298bc1f6d8e3dfb7c34b7af1a07,Merge_failed,d22750124e0efde57150cae3333ebd441d75fef239ceea121ab11accf0c9c67e,Tests_passed,4b8aab54c75130e26a1919221088164506600ab111ef6b0fc1abceed227fdbb2,Merge_failed,059ab78d51dcb1dd68846d6f8d4086ffa0c4fac8790e1de7aeb8f1a00e203675,Merge_failed,d22750124e0efde57150cae3333ebd441d75fef239ceea121ab11accf0c9c67e,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,51f6bc5460a09a349c5436145e56b5bb328beb7a1603adbb70f792951f6dff20,Tests_passed,4b8aab54c75130e26a1919221088164506600ab111ef6b0fc1abceed227fdbb2,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43,Merge_failed,a1314d219e6bc37a50f1a457c82e5c681c0ca75613bf1851325bcc5232272c43 diff --git a/results/greatest_hits/merges_tested/soabase/exhibitor.csv b/results/greatest_hits/merges_tested/soabase/exhibitor.csv index aaf6699812..9b6e61da96 100644 --- a/results/greatest_hits/merges_tested/soabase/exhibitor.csv +++ b/results/greatest_hits/merges_tested/soabase/exhibitor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 127,refs/remotes/origin/frontend-rework,78de708554f75c4e14dc12d8f6ac3f02ed567a26,3955ecd938deb974f1156e416720c1b7fac0401e,c2e2bab03d3aa986fd1b148454e977c8f5309c8c,,True,True,True,51,143,1676,6,True,51,Tests_passed,87fa2edc5f369d896512e0ee7321586dbbb281514b5e901ef27bcb7016f5bfdf,True,Tests_passed,9be6e41f3c3f2d82d470b385606d11204a4db37a387977e745f0d3bd299fd6f4,True,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,161aa20d88da027986c097f66b280b1c7df17e069b05cf196d09f691440a127a,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Tests_failed,53d2b1b10d7a2944a83064f5ddbc2000660ad2ac638790554f74ddcec760781c,Merge_failed,30c537349f36131168999e7cf8f5ee0596b4a0c4de83d8ad4ba2013ff7cdce6c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,dcbf706b555adacfb9d5c55afd9030432234c66dd0e939e1ae2de58d7ae07bc1,Merge_failed,79e1a3e1f8c33449aff9eaa9a6070b1707ce5ade16ba5ffeffb28286a773bf85,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,319d392372f532f5856b5edc552cbdd5429b19533474e65390842126f6d36c1c,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6,Merge_failed,1eeecc299241a1e1b0a1eb715ccf5857f9a53347a2fe9b883b0b271eb214a5c6 diff --git a/results/greatest_hits/merges_tested/sofastack/sofa-bolt.csv b/results/greatest_hits/merges_tested/sofastack/sofa-bolt.csv index b84b789a8f..14126548f9 100644 --- a/results/greatest_hits/merges_tested/sofastack/sofa-bolt.csv +++ b/results/greatest_hits/merges_tested/sofastack/sofa-bolt.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 86,refs/remotes/origin/pull/34,4834878705dfe112f23c859c50765ebe63ef39b5,fdc8b2928fe877158374046e0a25bc474f6895d9,c61f99695292e73ea481e40214f1b331238aa05d,,True,True,Tests_passed,f20baf5049b0dbff17f935467d31abf1e118c8390cd48a2d840f61c34a5a5b58,True,3,3,8.0,4,True,Tests_passed,e81e1e18e73c3dfa3d96abe229c8657c30090eb31f2ab90c6caa1809f39f47f2,True,4,True,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,7964b35d5ba5d03da17f73535fbcf0f2a91c3faf05f0fbd3cbec7254e53bb9d9,Merge_failed,ca52ddf85fd4ada1ef828a84ea46ab0c61486fb5ce259a60578be6e2dcd5fe11,Tests_passed,8e807a0dc5a589ba1909209402ca971c4c03e9cd3ed630600a90f6fea9afe931,Merge_failed,6286ae6bb6cd84e8cd1c2b9820246296689262f4a4215c575c1f21f1b8fa0399,Merge_failed,ca52ddf85fd4ada1ef828a84ea46ab0c61486fb5ce259a60578be6e2dcd5fe11,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,6c003ee76d30684126bb9188885f8ef352607aac7421e1d428bc499f8fd5564d,Tests_passed,8e807a0dc5a589ba1909209402ca971c4c03e9cd3ed630600a90f6fea9afe931,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35,Merge_failed,58226da3345987db3d3e7798a40c89be0d65cc4e307cfdbc0bd5732bcc022a35 88,refs/remotes/origin/pull/36,48c96584e07d2715f0346ea03a50e50c03b8787d,908263dbc59f0b854f1c751617bdab6aecb34693,06398729e98d1ac5779566dfd64be127c2745914,,True,True,Tests_passed,bb5c48b1907e509e420cb177189be4ca8131ea37f739adc5acde3f4602192452,True,216,252,659.0,10,True,Tests_passed,e86ccd0fce2b7c392747b24b749acc01805ccfb60809db6d21419a6daa77e5d3,True,216,True,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,c2e7d5a62eb388104c2fdf4c856623633d6b52a565b6a05b7ffb75b5c5b2fc70,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,c1b2c3cc0de3fd381797f11de552c20b563d05a0a4895a683a8d72b11b6bbf13,Merge_failed,a6a6bdcc180438da7d9c1556880f1a4420758bb2ab35897ebbf4a64ce7586e7e,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,459e9acb88ec5b327042473340d2dc8f403fd85560cdefdfe8256d8be99c643d,Merge_failed,3616958f2adbadb7a230d195b69cbd526b92d22475a8259c3d91cd4f69b2b17d,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,749844dc62ef80c88dcc28e7044e1e52a4bd71814a9121fd46832a49afa74392,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241,Merge_failed,0bea7ee6d35f5a896866e1b3f53fd48d0985b4de4f4c2a7bc0ee024bfb02f241 diff --git a/results/greatest_hits/merges_tested/spotify/apollo.csv b/results/greatest_hits/merges_tested/spotify/apollo.csv index cbd85c3dcd..fc239e7912 100644 --- a/results/greatest_hits/merges_tested/spotify/apollo.csv +++ b/results/greatest_hits/merges_tested/spotify/apollo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/1.x,35d43aac53b274e3d3c5e9553e63baef809c0290,b794228c82100ce5e58ee1518a0a9da4c5b15232,d3c4048f05baac125ee78ac38d031961e61d4a96,,True,True,True,43,181,1228,5,True,43,Tests_passed,642790e87065a7846f781a6cf71e581932ca93c49442eaed35801f507ac37365,True,Tests_passed,a254026c944d3d21dd88bd8be7f7872e8a5c06b99cf0d890e3ec2ca72d7210e5,True,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,3d94567aa8fe6dc01a640e09a7f69b7ab1a423a74e73be3b47a4d94a6186d8bf,Merge_failed,e59778dba156fa84698d09b37463bc833af5c677de3713538676adbe7ee368ad,Merge_failed,1f42e1ee61c45c687f4dd3e29aff9fb7678cf6ccb69f3e017272c3829118b529,Merge_failed,dee4b41db49cf611b2e932e1551633c646ebe916886e1cd7862e1f80b4924eb7,Merge_failed,e59778dba156fa84698d09b37463bc833af5c677de3713538676adbe7ee368ad,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,77061ec573c26e7c3cb11afac2a9329929b2d6060be878a8e2945c3cef1771ad,Merge_failed,02d346123fb665c3997b91a47ac7bd51238bbb0b507be9ec753eb6529b2412e9,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,b1e13416444d4a75e7dd37f85824e80bf142624a91f91b6b26c8cb779d31f80c,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55,Merge_failed,5b8246d728d85d4b22714c378bbdb0a84458c99eb7718980c12a9f04375dbb55 146,refs/heads/1.x,2fa878096eab6deaff1ea76fb125b0532bfd0eaa,44e3d9262d51874823f42ebd330599fb726a2627,54334ee2535a264d5994f3179ed89a576607e198,,True,True,True,240,348,6860,4,True,240,Tests_passed,3f2a34bb6f04d0802bec4291f7d94903105bcff640e0943d077223995ada3c80,True,Tests_passed,74ac13685abdc49322bb19abdfe0b21244c51647d4678e66d100b73186c04721,True,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,444f98aa757f194157f6a61f23427f26bba24d910882ba7fefcabb33a1974c2e,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,b2524925791ce75f583e7415f5d29ec56ef3dfa591f4deb4bf485d5b98f4666c,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612,Tests_failed,8d3d378c0488877e17d774aaaccfccc5f6ccdf8a0532c860193a4d020e43a612 215,refs/remotes/origin/case-preserving-headers,3d1078e037d594c28b0ac72d7bcf4faa87637725,67c7c7094b2e6a15ca50038eacc994f3bba261d6,490de5209a9d8f20bccb496f6289c9f48d7493bf,,True,True,True,87,233,1571,2,True,87,Tests_passed,2395c367e9ea32cc7c92d41f741af9df6acbb6ef0c9a3978e4c4bb68e5de3212,True,Tests_passed,9e9d404517b091e7c9d430e33eb59eeac1072d3ff2dbb99b89765bd0503f4b4c,True,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,45347b6030be510cffdac1dd7a3f2f5c7681a288f001f4dfa8a53e0d8e451c14,Tests_passed,1bb92c23b961a369ef83ae109d77a6515c052d7027d35ee58e7db4fcb765fb67,Tests_passed,8625f60781d7c67d4437d2f585138718ea2db23d8d2f03425c235c114d9450a4,Merge_failed,f85ee99a42f54aa58b6b4cbd24fad3b475073904e869512071832abac0ea4423,Tests_passed,1bb92c23b961a369ef83ae109d77a6515c052d7027d35ee58e7db4fcb765fb67,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,2af215f2d38622566c13cc517f6b21ff5886e1ba02e8904b1955eea44272c493,Tests_passed,8625f60781d7c67d4437d2f585138718ea2db23d8d2f03425c235c114d9450a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4,Merge_failed,628d33358071eb698eba6a14f66d5c59f050e4cc9b4fc0fde12c5abc846435a4 diff --git a/results/greatest_hits/merges_tested/spotify/dockerfile-maven.csv b/results/greatest_hits/merges_tested/spotify/dockerfile-maven.csv index aff0d28dd6..08f46570c1 100644 --- a/results/greatest_hits/merges_tested/spotify/dockerfile-maven.csv +++ b/results/greatest_hits/merges_tested/spotify/dockerfile-maven.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,580f84d9277f80882d20aff38d6f065ed7206bf8,7066622eb72a8482465ededa6198688fd2a84717,eeffcd92e469b7693828a4764310d1c37662e325,,True,True,True,36,115,1053,2,True,40,Tests_passed,dd84ab43b68bf698670339f20240561e823b67afe2eb9dc98a23edfa10e78cbf,True,Tests_passed,bbc0423f3898f4d7633dece72970095016ff5d0ff2623aa5f01b510fff30f9a1,True,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,0e138e633606029e2a8330dff78ddcf462c0c314e6a2de4fd53e95725e251cad,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,e61fa2372705ec2722b3340fe44b2f3d5292ba487f605c1235dfb1d3ead7fb9d,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,b17108c91b6847c7d62f73999d91cb579213a30d8537089637012cd20ba349f8,Merge_failed,c2292fd47689ecc8ce96381467f3644b36a190502db0fea9e8242a77f19bc990,Tests_failed,150b74e7998d7ca2dfda6fb76437924146af7386d926239320f8c29917b8c180,Merge_failed,d026166cbdabbf1f1bba049a0711dc6aa3f9fe3e4de172c4bcb9c9fdbd3b5fe8,Merge_failed,c2292fd47689ecc8ce96381467f3644b36a190502db0fea9e8242a77f19bc990,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,e61fa2372705ec2722b3340fe44b2f3d5292ba487f605c1235dfb1d3ead7fb9d,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,012ebb4e87c300a0108392abbd73eb07d70fa9b7ef37c7a7d47f06c7b62826c9,Tests_failed,150b74e7998d7ca2dfda6fb76437924146af7386d926239320f8c29917b8c180,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,0e138e633606029e2a8330dff78ddcf462c0c314e6a2de4fd53e95725e251cad,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f,Merge_failed,558101b720c30615f30984cffa1055e0083ee2289e72a9ab632edb3bbaf5968f 58,refs/remotes/origin/pull/59,e37bb5427d990c2dfc7aecd1e27b211b7f5a741c,b6070ff108f62ec925668b427f24e250e46cbaa9,ab2ff6ea5e9aa0e534b77d0bd9522da91ef9ad54,,True,False,True,8,14,117,2,True,8,Tests_passed,726e6c0ff2eeda71db26fee3e309082b5906fbcebd132d65e2dc96ea23be5422,True,Tests_passed,76b95ce9a695abd1a80bb7b7c9c1ab677654c51343784aa09e7cd984150906c6,True,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_failed,9e89a24ace0ba4e0a779c9e067e8b2860330bed71a4256e061a77a1764003e2a,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,553d3d1adcdcdf6f68beda3919084100954aa664817a6be364f83f7d861d9a35,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_failed,1ebd0278a269d89608f4c88849ca49921f0c9b97de64fe1e9e63fdd3cd4e9f44,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b,Tests_passed,f6f595c9b60edc80d2523a6571804ec77a03f48e148473fe468b013d5fbff52b diff --git a/results/greatest_hits/merges_tested/spring-projects/spring-data-elasticsearch.csv b/results/greatest_hits/merges_tested/spring-projects/spring-data-elasticsearch.csv index 73d69645cf..f857c51c43 100644 --- a/results/greatest_hits/merges_tested/spring-projects/spring-data-elasticsearch.csv +++ b/results/greatest_hits/merges_tested/spring-projects/spring-data-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/main,923273955bba5524f566cc1df06955738772221f,7853e3da717c0e7316605796f3af7c888bde93b0,8b4da081eb68254dc4a12cdfa4fd68acc3623c4f,,True,False,Tests_passed,0443b75acf5777a405f26f63cb6b91a3ec813c41afcfd67e4f12f00da7cf71ef,True,4,8,96.0,2,True,Tests_passed,fab8e5e895425947f043e9c8ca6ba4bc13b8bed4b4379ee6bcac33f28a24edf8,True,4,True,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Merge_timedout,,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,1e3d9a290f2eafbcc2e59c2f36af337d94e429dc66e31bca47619e193844e88a,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5,Tests_passed,31afaa3524d9919d16aa65f571d52948aca6d57547644d82d086e97d100427d5 diff --git a/results/greatest_hits/merges_tested/square/javapoet.csv b/results/greatest_hits/merges_tested/square/javapoet.csv index 43ec4e9227..275da561f1 100644 --- a/results/greatest_hits/merges_tested/square/javapoet.csv +++ b/results/greatest_hits/merges_tested/square/javapoet.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,a6c9a7dd9433138c81ea40cb8f06009f0486d614,325ebb43e08bb3b7675e33ff44a0da775e3560da,19e1b4e3f253a3169853863199c932f36c5b6584,,True,True,True,7,12,75,2,True,7,Tests_passed,8c66b5a3b890eb88bd06b64f35002e2eecae5aefe3bdfc7ca0bbcba5b105adc8,True,Tests_passed,ccf2d89aff1333e5b248fbc0659ed47e058b522f5edc30a1a479c60167bb4c16,True,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,9537c534776be0ad2aacc8021d13ad60fa0dbf7c04c2e8df34786f54ae1de8ed,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,9537c534776be0ad2aacc8021d13ad60fa0dbf7c04c2e8df34786f54ae1de8ed,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507 295,refs/heads/master,270570874f5b8697768d5fc4e1fd20964387cd45,e66d8ba46f82eaa4bd1842dfa8fcfb5fe1d2ead1,84da75698782a506b2c6a6594e183591575f87ad,,True,True,True,3,9,51,2,True,3,Tests_passed,2be8d763726898300fb962972f9d1508fe4adb0856960131a184dfcd77bdac0c,True,Tests_passed,6d4cc9d590ec4d75875b3c95bf2c71b359c9eac3468f965e831a87504a66580b,True,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,4c8511131804d5d01e8334e770d49717eb5bcd0a6ff1703fce0615517bfe22ae,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,4c8511131804d5d01e8334e770d49717eb5bcd0a6ff1703fce0615517bfe22ae,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677 297,refs/heads/master,c0f4a89bc087d186bf05ee86ae9de4c12ff17130,98f792d249948ae559f7ef99a84fedeb6c799f11,35c59c5a2d7d03ef42726712bf28c53c665e8c1c,,True,True,True,5,56,375,3,True,5,Tests_passed,6a7687f7dec647c2b1d2db0e290e61fc7c06557351e4edff583211cdc0a8fa2e,True,Tests_passed,d33729cc5789140f90cf784553452e2a183d82278dc3ff43176ca98987527412,True,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,f554a5df723a21c1767148327659c588cf3d1eded1abf5dfc7abc3fc6fd38600,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,f554a5df723a21c1767148327659c588cf3d1eded1abf5dfc7abc3fc6fd38600,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f diff --git a/results/greatest_hits/merges_tested/swagger-api/swagger-codegen.csv b/results/greatest_hits/merges_tested/swagger-api/swagger-codegen.csv index e9296f2464..9f02a62b0d 100644 --- a/results/greatest_hits/merges_tested/swagger-api/swagger-codegen.csv +++ b/results/greatest_hits/merges_tested/swagger-api/swagger-codegen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f477ae83aab64a76adc3d22b555f64127300bef0,11d899c9cd8d9b001d57e1e3f13a455a2588417d,2d21bfa21ca5df8256cd46f34b22442235d4cb30,,True,True,True,1075,5828,72772.0,6,True,1075,Tests_passed,fd033267d0618e2933939dc5a616603a3868ab9b03d765c86c34b70b9b012c7d,True,Tests_passed,9d11a0c222ac05963a0176917a052e61e7dd218e77fc9fa27484ba230414651b,True,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,5d656047c4e02a680e49948fb0ce07babd78a0e31a10a1cffde06837a507e4c1,Tests_passed,524318fac11ad760a84106c99d046ccc288948ec6d25eb23e6113c7d8f3d2550,Merge_failed,af8a60aaec0b68e3fe4c312003a6450ffcff6f0124a7caaf537cdabf3bbde032,Merge_failed,31e1a03174ef55fe1515aed598a1ca223e019b6bcb0ec4309ec7330b53705f43,Tests_passed,524318fac11ad760a84106c99d046ccc288948ec6d25eb23e6113c7d8f3d2550,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,66863e8865b06228deb948b73dd5e45a8c2d1ae8b39012b8a3c26c9c750225b9,Merge_failed,3853c6ddef9ef8a2e8176c9d6cc2016518d621b0c9817b9569699009941be94e,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0,Merge_failed,cdf08fa65867c1dc031d35786bca9a3616db4a68584f253e05b49331500fbcd0 2,refs/heads/master,640b16b58a4c9131c18e53f03c204ac1b7fee3c5,8153284f071ddb368597e23f7953906999c9fbf0,e66566a9710a5f65e89986bac8fe533164e5a3a6,,True,True,True,838,2132,43826.0,2,True,868,Tests_passed,48153184ace34e1c856723bf80621ff8304ba211dda610a6e1aa0346ad6727c4,True,Tests_passed,de77886ed46e96bb6e2de4bca2170c1ecb825cc88a1894698f2d644da6e4d261,True,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,670ba57294723a24bf3a5d63886ad39f9d29f8effc39cba77e8b0d254e074fd2,Merge_failed,1f605248c68b5c4a1b24840ec389740579f75f3858fd82bad1a8a51128d28149,Merge_failed,972791f6b937485148e3e459d41f9dcce91f6e7db36d3f9ffaf2c646e9d8fb19,Tests_passed,2a14fb18cdbe0af45ba229b2f3e26430e9716759f4bcfe61d486699b6d530c81,Tests_failed,aa5c91a3a7f4b30657e3ab694ec6cca667ba8f8184244c038dd68dfd2498c8ce,Merge_failed,972791f6b937485148e3e459d41f9dcce91f6e7db36d3f9ffaf2c646e9d8fb19,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,670ba57294723a24bf3a5d63886ad39f9d29f8effc39cba77e8b0d254e074fd2,Merge_failed,19f5ba1980b293b993c8fc4dfed98a3bf29a0183b2717befa9eff85a315674bb,Tests_passed,2a14fb18cdbe0af45ba229b2f3e26430e9716759f4bcfe61d486699b6d530c81,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,8a94a14e413cae9ce708ac779f57c4302f86438b4d076597a410664e99a4fd0a,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346,Merge_failed,ba603cd0383ee2fac2e89f7ca3d132ae7238a5c6a101a69b21e4e3dbc8f0f346 32,refs/heads/master,18e6440bcc766e2ee6ed5aa072085051fb94e8bf,009a039fc541897075ba0a646ed316c962092235,b84769d1e37d54ea5fe0c2220678f7f9ab9f05b8,,True,True,True,1543,8706,105573.0,49,True,1568,Tests_passed,75e6d0c20a6e691c4536fa91c71857e7b0d2c72ec00a630326eef73fc0c751e6,True,Tests_passed,748559c0550c0d1a0ab275d978a3a5a269669c538a307055d91b47c96d18e80f,True,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,9b8a744973aaaf83fd4b82718a53a9d714a4d067b1109cd042a85de23ee7dea5,Merge_failed,2289bf486a246da325610f0dbe2448de488f1b5c20d872439d96e8051595a2a2,Merge_failed,9ecc49e8ddb8e3d821b17d3df3077253493fd305a831096413b3133e508e77d9,Merge_failed,7f4faf6b5448f8c8d7cfe50f90ee336de2aae3cd4e01fe657142f50809cfa6c5,Merge_failed,2289bf486a246da325610f0dbe2448de488f1b5c20d872439d96e8051595a2a2,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,0ef2564e1a6582c6ded5cf3eb4928a72e352d03070d9b4e7a0417f7dfa1ffe1a,Merge_failed,426b9d532c0a88b7fa958e0ae7076349c7be05900147032ab53469db6c2a6d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,98e0ac574e49a49e7a257c9adbd9e8f35e22742e888e74e6a2ad7884ac255d61,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b,Merge_failed,c790a5ecf9638ac507e7ab777f43283673d16577b6858c6afd584451e4c83c3b diff --git a/results/greatest_hits/merges_tested/thealgorithms/java.csv b/results/greatest_hits/merges_tested/thealgorithms/java.csv index 238ac47f88..4e45d44c3b 100644 --- a/results/greatest_hits/merges_tested/thealgorithms/java.csv +++ b/results/greatest_hits/merges_tested/thealgorithms/java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 884,refs/remotes/origin/pull/2983,1b5ed154bb8206cfbd6a59ee61affc5f8b12866a,583ceabde1cee7050a9e04683aa0b741c648ede2,7d5de041ebeea76cea257b03d5bd792adeb27b4e,,True,True,True,8,50,800,2,True,8,Tests_passed,52f77ccd11e915fb96ec90edd7500bfd907394eccb0cb0fd872a3fa020563072,True,Tests_passed,c5c363c3cb50bfc106182f59b9061d3d85f68aecdc065462b38042030377599f,True,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,2ad62f9843f992482061f6a245a76a8ad90a8de64a4a1ffc7136df7509aed821,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,1ea451368f60577b6918cb575912f1fc7de0f4040ed1117ff362db1d8533447a,Merge_failed,33cd13e8c5f4e898d301c9fe56c2f376eb441aa765b676d4999d7175f45ede5d,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,f0d3b4704e2de4cd5333777dc5333d0172d4edfa0f688b08fa94b1d516b400f1,Tests_passed,0293cd69c9fe322065b5f4067e6169e49077ae290b2cfa7b611b2b2944ddf709,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,4fa52f886036846c4c5d7b066645adb215a1352a37659d66a8d481ae5f20bfa6,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7,Merge_failed,cac2a8faa171643c66dd7369e425c4dcc3b20f6ffd58ba63e7c88af58316e4e7 1430,refs/remotes/origin/pull/3919,6896fbb09ca80618d128c0d7694cca4b9f6aca5a,914b7f772c1c7c1da08ce683205f25f2942b8c77,2418604f7aa448edfdac18a258841ae3afcb462c,,True,True,True,3,4,124,2,True,3,Tests_passed,1b1fbd1a904b2f94475c0f8f1f7b45c1442c13aa30041057db50fe7c1221fba9,True,Tests_passed,569b0b0c50256257ab71b3f3e8bc83f734bbc8a112723c3d037a0b791f0d47f8,True,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,537f52e8daec58a879452bc4cd5b0f0a19a7da572cd81d1bdc36c0a35d6cacd5,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,537f52e8daec58a879452bc4cd5b0f0a19a7da572cd81d1bdc36c0a35d6cacd5,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a,Tests_passed,4a8b1ae94a4fcba8046c1a22a74ca3697a15169011d4b08e30830929a06e236a 1434,refs/remotes/origin/pull/4131,a0a07dfe59c8acd2075eb279e8e9f666e1afaced,9643e6414a7bc226a088f2c2e95954ec6b4741e9,58db2f7839d057bc5aeb6873f4b4d0a5ab846ed5,,True,True,True,3,2,50,2,True,3,Tests_passed,3ca7a8d874f79eba6a8ac7bf644377f7ad913f09733c07b6381cf4300d51a522,True,Tests_passed,3445b568922b15db28aa9307d99fdbeadcf9ff66e84b8bca9c463dcdce9ae0ea,True,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,97347bbe1355b38281cf670366ff9069b1baacc6b071269650022561b41b372f,Merge_failed,76b66a12e550fcbdd8cd06a21bea2aee26ecf0c4e1e0a7205d40d5eb324ad234,Merge_failed,6b0266e8732c5c80c6f9914eea9b0c9feec521cf2b926f3ba48a2068f96df5a3,Merge_failed,ceb4ad59ce84e68fb0004334667bb1f199c79a86d83b39cb9654cf9097820c3d,Merge_failed,76b66a12e550fcbdd8cd06a21bea2aee26ecf0c4e1e0a7205d40d5eb324ad234,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,72442449e49dd67c73f51a1eab8c2f1f4cc9b932b067fa0217c980ae94d48635,Merge_failed,6b0266e8732c5c80c6f9914eea9b0c9feec521cf2b926f3ba48a2068f96df5a3,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68,Merge_failed,f295aee04a12c3126732f0d06fc85e78b846bb162526e2a7e4a82cd53269fc68 diff --git a/results/greatest_hits/merges_tested/thinkgem/jeesite.csv b/results/greatest_hits/merges_tested/thinkgem/jeesite.csv index 7691acec19..ff78a998c5 100644 --- a/results/greatest_hits/merges_tested/thinkgem/jeesite.csv +++ b/results/greatest_hits/merges_tested/thinkgem/jeesite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/heads/master,618aafef63176f57f1b37ce8ed27900defad488d,e899db71e9da23b3387f7cc499cdae35eef8092d,42b86512b01066f6f3820ce319d00c00b9ca6900,,True,False,True,2,1,9.0,22,True,22,Tests_passed,31c68b2105e95fa976964408cb53292866dc6639a59700b4f4b5208e5a046e6e,True,Tests_passed,b15ce129447eb73ea54b1b6306ad9c1db10124b2c1e336d34e94219a5ef2b6b4,True,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,c56af07c32e076764e6d18382ce5e80b5c3e03daf4419a68d733749639b90249,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,c787b7fa919d5f9e0e99de02712ceb9064dacca4ac29baf97eba6b1afd33c7aa,Merge_failed,f78d9324f55698fc1c246b4fc55f5921c0808ae95b72c9d6381771e90e2159e1,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,58fe376b37029913c525a787e0af851d75a9496da2214308b5fa9e70281d2c12,Merge_failed,a8db65bb3362c7da5be0d9eb7f443738ec481b79d4f6244803202fee20c23254,Merge_failed,b2c519e0b3d73fe6a09fc5712078b4b32906ba19d04025a90546e2a9a25b2d62,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6,Merge_failed,31e914959f513504b6cf040be686a75f6f400dfc1a82178e0e70a24452089ed6 diff --git a/results/greatest_hits/merges_tested/tipsy/javalin.csv b/results/greatest_hits/merges_tested/tipsy/javalin.csv index 7ded3c0e2d..fe08606a3b 100644 --- a/results/greatest_hits/merges_tested/tipsy/javalin.csv +++ b/results/greatest_hits/merges_tested/tipsy/javalin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/remotes/origin/pull/129,93b9b43928f8b9c5d753674f3896c3af7acb0e3d,db051546671395b924f921f7615c0d2018c3b53b,fbf314378f2bfaf86b7c4548304b472a4bbef803,,True,True,True,28,204,1495.0,4,True,28,Tests_passed,319dffa1f05969183a2a96759f69a6d02619383042c667f43cc2183fc487855c,True,Tests_passed,5b89b205ccb2196191340e64042c2ec26ffe79ac916b2fb562b29ea71d1b399f,True,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,e684643687c0ed18e0a2ff9ca819091a97ebbb5dde667432919201d8c1bb6840,Merge_failed,6b63d0dccc67b226beb3f2eb753a5a6b44701f81fccc085623e505304fa3c42a,Merge_failed,30d15462c2af81032aeb5ab7abd4109c13b7a480b9fa98be87aa84cb0dfa9a96,Merge_failed,034b4dc3b030f1e2da4002f8525c0f88def00a02fc1e04b309c5b82691a6080f,Merge_failed,6b63d0dccc67b226beb3f2eb753a5a6b44701f81fccc085623e505304fa3c42a,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,8613d5c4dae3f987eb19abb4d71803cbecae2fdd15de47c83680cac0e72a36ad,Merge_failed,85457bd6da9aa232d11d36defcede16048a8fb25f28f20d422cfab90a96085f6,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d,Merge_failed,1a079572df78de3793b2472496e509cccba794174e84e028417cf7e54fcc879d 96,refs/remotes/origin/pull/2013,659aff13b5362770708cb1b7a93e3c43fdcb4038,de9472bc18f48eb225eaf7f3b3143a0cbc29bf8f,3d90520031a97d4fd47e223ec3071e64aef656aa,,True,True,True,65,363,1558.0,9,True,65,Tests_passed,131aa7ffca750a8756a961eed9b647b5da350bb6705535c5cfa27c2974620063,True,Tests_passed,14a6064f01b57e5785c589047aa78438b7578b988ec80b4a7c128950859ba479,True,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,5021c68b0e9918fd979d5816caad5b058827add5185e35d6f1f5f1415e3e6bf0,Merge_failed,0e9fea5701faa82adf7d2441f2e6814684fd89a446b8d47234ec4f3e63776f4a,Merge_failed,82a5441ac904129bb76ec0e5e1655698fbed7913b6cb4e917b13f9428b354287,Merge_failed,84256df77acb31b5aabdd68c5e76d451d51d6762498deff7f4619ed57082af19,Merge_failed,0e9fea5701faa82adf7d2441f2e6814684fd89a446b8d47234ec4f3e63776f4a,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,dd7b32dae6165e42ce8a8e1ccefd1dcb115d63f5193058fc1a94641088102fa7,Merge_failed,13ce83155bf9f6962049700fca490f18ef8510f37004dd9b46b84d4c54ade065,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466,Merge_failed,cf6586b3440cfadc9df9d13b08b044a1dbf7fc65e3c1928b11dffd2362ff6466 97,refs/remotes/origin/pull/2013,de9472bc18f48eb225eaf7f3b3143a0cbc29bf8f,b24df3c9a75fefc26e0048cb7e4fbfbcb84dcb27,1cc315a8135c26f51ee3f1c26a3a7cfadc06af44,,True,True,True,37,99,431.0,3,True,37,Tests_passed,797e96db6747cc8eeeeb6aa95964e075ea8d006e5a94b1e794ad62ee04869fe0,True,Tests_passed,61e49a71e861991e85c4bb385b2e7a283a7ad049560826c15ce7834394d17247,True,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,547e0200c6dac9b7a4f094e21ea837368df3399bc4cb0d83c09b94706bc0819f,Tests_passed,b782d76dea310fc3038819b2353c52161355fefa86efb7d30a1b07ce9eb77df1,Merge_failed,c3a9955318b3926de0bb603a9446e4bb1931da66707bab5031d0fb920698d50d,Merge_failed,eb28928d7bf38d1ce6bb47662fffe9c4abeebf7b0754c94eb7ec366d5e29fad6,Tests_passed,b782d76dea310fc3038819b2353c52161355fefa86efb7d30a1b07ce9eb77df1,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,5456266650fa9e5b3e7ac7805bf3dd0f86f5289d0af5e0d6f7d57053c385ca76,Merge_failed,383bb5a325f2293d9f9bc8083a8e41efeb7b536aa84eabd035fa2dc14b74ab8d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d,Merge_failed,9316b72bccbe215b51cb05e2380f919ed3417f754ab9049bc24eb6d89d44c09d diff --git a/results/greatest_hits/merges_tested/vdurmont/emoji-java.csv b/results/greatest_hits/merges_tested/vdurmont/emoji-java.csv index 604720d204..ba0a4c87b3 100644 --- a/results/greatest_hits/merges_tested/vdurmont/emoji-java.csv +++ b/results/greatest_hits/merges_tested/vdurmont/emoji-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/120,d8952758be36cca3d760dc922f17b9a135edaa64,15bf60c80feff7bb26a864994f6fbd388070efa3,1f265481de513c1ee1cc744c4d9c18627014cee1,,True,False,True,6,15,1799,3,True,6,Tests_passed,78c6cae5752349d535258efafca720a21ae37ef2f932a31304951d24812ce1bb,True,Tests_passed,f72a2e1e109897ef270ea21c143791aad14d1128d73b8769deadf0117c649750,True,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,51ebf42a2f8d9d37091a6725527b15bf7c8a78aff4b2706afc1e5806a503a638,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Tests_failed,c5815305e7a225afe29e0f8aabd52000cdb462188ab69830453840773ad66d30,Merge_failed,f99dffc78b3d4a912f09c5f22a7eb766c2eb216556bb4b6db0d3a08c30b5dc8f,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,f65b3a6c898a16b1c787ec8938a39634a8d6e19b7f14291a50b9d14e3e48c865,Merge_failed,abb9bb3a10c4a7ff44fd9d0577acb944bc87d969a3ad23c7fdb00a4816bdb210,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268,Merge_failed,e5f1ea11c72952f1812a61611b6cce07ffd72e9188a80c7efd244c4d91a1f268 diff --git a/results/greatest_hits/merges_tested/verbalexpressions/javaverbalexpressions.csv b/results/greatest_hits/merges_tested/verbalexpressions/javaverbalexpressions.csv index f178fa6988..509d0ee308 100644 --- a/results/greatest_hits/merges_tested/verbalexpressions/javaverbalexpressions.csv +++ b/results/greatest_hits/merges_tested/verbalexpressions/javaverbalexpressions.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,12533955388db6f9af49da4590b9744de71293fd,44ad0ecb58c5993a8048b38c455a579285430fea,89cfa80ffd865214808478cfbd87d8a00121421e,,True,True,True,6,12,58,3,True,6,Tests_passed,4a883117534b604938f98d8a5ef18f66afb54e11cb974dde5773dfa50da5fb52,True,Tests_passed,0dad5c9ee45391ca3fe2dcfc9e5c61a380738460dde483192306494c827ba16a,True,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,aa3036fb997820c79bc15857b59fb56a3f3d4f4ce85ee1112b9990ff95dcc1ef,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,aa3036fb997820c79bc15857b59fb56a3f3d4f4ce85ee1112b9990ff95dcc1ef,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,a3400fcfa6dc15a33b231e5351e0a72a5223d122a3e24f4833306070b258d4fe,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0,Tests_passed,16ba556ceae3557a9adce101ccd9cc4c3ebd89dac47353d32cb84117b62f30b0 13,refs/heads/master,59fbccd1d6d4eaef4343585610ec225ed81553e0,8d5949499c77ff1a053375bbd66811ddadc8a93f,0003de4e181872c704994faacdd48c32eda9f183,,True,True,True,6,11,95,4,True,6,Tests_passed,315b55d9ba6f864b27687a6c39065a2b2127b82b49372cffe13bfe22a1f49567,True,Tests_passed,36a3d5e39aad10a29421fbe238c632eeaa3ee69dfe6ac9d6926f3efa2c385dc5,True,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_failed,5ba545899eda6c8b251f801cd0f9fd8603209c22faf33c7a02e4ce85ca255af3,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,7203588b3b7d518a8fac1c220a24b4dc810e6406ae0db45c58c07b2aa5daae6e,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf,Tests_passed,81899543e2eddb96117f3e51ce5dc95accc7fc0c8ec3a295dda66876a055b9cf 26,refs/heads/master,1739d58c32a1c7b9ef9023e0330504f2126a4535,663787fc4d17acf0d36e04fc4fd869cb94d8a204,2afb0341d4d539fd7f8ad5e94041cb5d38b6a3ea,,True,True,True,5,53,918,3,True,5,Tests_passed,fff01f98d057acabaf6b30de0f12e90316ae6866fd5735eec8715df776afa2d1,True,Tests_passed,62120a8eeb62c064fbeb3a3c658001f1600f0c7e98fdf0fda4b69e7a33d44bf3,True,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,0d21dea9690f992cb28c3ebd21173a7696a73c5c5f17e8db5ff3c3b906c3b626,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,432f44ca233ea70693ab2b9538af2938dea574f396e4d43cac087c3652e44d65,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,6d639e0e050a493b6ce550b09946c4aff5cb3bebd50ed9c31db290bb14b5a05b,Merge_failed,38f244aafadeba30ac6f06b81782e8a4c2c580a7645d851b14c52ac04bfba207,Tests_failed,4795a1ed32e9a830ad068edffa5f65e8ade2831cf473c285962576c27b00945a,Tests_failed,2934704d6cab0b607e1d4d46e7dbf43b6a52502c1eb690bae785f7f3115b1908,Merge_failed,38f244aafadeba30ac6f06b81782e8a4c2c580a7645d851b14c52ac04bfba207,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,432f44ca233ea70693ab2b9538af2938dea574f396e4d43cac087c3652e44d65,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,7bba5658bb126f74e21fe893d6d6082f21a1a3f4b5b1e917603b94983b91792f,Merge_failed,a31d7c24fbcfb8b2703d5c488c6618d3f8a2d3a52917c6b28b68459b6a63bfae,Tests_failed,4795a1ed32e9a830ad068edffa5f65e8ade2831cf473c285962576c27b00945a,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,0d21dea9690f992cb28c3ebd21173a7696a73c5c5f17e8db5ff3c3b906c3b626,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351,Merge_failed,878dd3c8a91ccd29253cc7f047bc028496808b2109056f05cadd52ee8b2fa351 diff --git a/results/greatest_hits/merges_tested/vipshop/saturn.csv b/results/greatest_hits/merges_tested/vipshop/saturn.csv index 09b8fe0284..8d9a7439d1 100644 --- a/results/greatest_hits/merges_tested/vipshop/saturn.csv +++ b/results/greatest_hits/merges_tested/vipshop/saturn.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/develop,95c49b595d04b1ee4ab283c7343848df7e9addc9,5cbade739601574332622484945fc1a5f9848465,bf6445a36b7ff34335f42a961d1dd7a97c159711,,True,True,True,33,101,2917.0,2,True,33,Tests_passed,5890adc72858c4b82dcdd741de4233355be12185dea28cecaf9a1452792a60ec,True,Tests_passed,ca62ca1379b3f2fb4720a42bb109753516ec2c001b060668ffed375ac026a120,True,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_failed,cf6cf5b64dc559b25eb46db144e716e3b701c8c2b055ef3fe12bad3f24df7089,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,58bcf1fe764364ea120d8f09d8e607465604579a8bb21eb3ef81c9acebe97f12,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d,Tests_passed,706a9e5fa99e46cc8a1e0ee1cf1a5cf2f0350ed3d0e8b3e1c35b98f4a1d4a44d 19,refs/heads/develop,4c666dfa3ce224a288e241247cb30cd9f38ef202,8c36cd0082e34c6856fe2a1974442acff0450a61,78a52abcb37c9a77f3ef28d282a6a51bcdb928d0,,True,True,True,62,331,2177.0,3,True,62,Tests_passed,c962c69efd59fe5206b53a7f607d72b2b183473deb4efc966a01feee8200e634,True,Tests_passed,3559a9965ec71e3ad618079a277405fee4b312531a4144a8796f0f96bb47368e,True,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,0746a958cdb67196c988c32288eeab9d0114b78ef51196e82459d3d870bd09de,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,60e9dd5faeb6a488f8b4e6d27b4d7c6a826b9d4d9749f16fca227ec380a0ffda,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b29eeed52add153ca2b48ea65e0b8419dde5431bfc11d0c51017b45299f1eebd,Tests_failed,5b11cb0c81a2142117bcc4053aa2f0fd08d97326db3487bff278df1359fd1210,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,60e9dd5faeb6a488f8b4e6d27b4d7c6a826b9d4d9749f16fca227ec380a0ffda,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b29eeed52add153ca2b48ea65e0b8419dde5431bfc11d0c51017b45299f1eebd,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,0746a958cdb67196c988c32288eeab9d0114b78ef51196e82459d3d870bd09de,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f,Tests_passed,b417ae85dd21868106f2251c8d6f869a36f83331f3acd87bfdce19f30266075f 24,refs/heads/develop,22c8f49bc54909be8cf7fc2808fd41f4e9f389c3,555e74883ffa4e6d671d37e2523646d28872fbb2,18950c2d9a62613a3923db9c5d444cfa510bb22f,,True,True,True,45,301,1862.0,23,True,54,Tests_passed,7eb8ad3f4be334e556b53bb8fd3eb9b215bed1a892da4192b36a09f84de924ca,True,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,True,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_failed,9830ab12ae9902657cc05a628fb4e86a713782819f8948fb1430604336bcf2a7,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78,Tests_passed,65df1a629dd6eca2f87b94b9028d6c0d05deea829b8d96d4621be27166d77f78 diff --git a/results/greatest_hits/merges_tested/wakaleo/game-of-life.csv b/results/greatest_hits/merges_tested/wakaleo/game-of-life.csv index 4103474133..126d0581f3 100644 --- a/results/greatest_hits/merges_tested/wakaleo/game-of-life.csv +++ b/results/greatest_hits/merges_tested/wakaleo/game-of-life.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,False,True,2,2,8.0,2,True,2,Tests_passed,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,True,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc diff --git a/results/greatest_hits/merges_tested/wizzercn/nutzwk.csv b/results/greatest_hits/merges_tested/wizzercn/nutzwk.csv index b2e872b902..ece79abd7a 100644 --- a/results/greatest_hits/merges_tested/wizzercn/nutzwk.csv +++ b/results/greatest_hits/merges_tested/wizzercn/nutzwk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/v5.x-mini,b1b9adb2fd7d22f5e8146fce67dcaa2edf80e0fb,12c3b8678ed5b2ddb4d9deb8e280bcaa63ff8f62,d2d39ce76bd825d806a093bb8e3d020d17a840b4,,True,True,True,92,249,4046.0,2,True,92,Tests_passed,c0680e940eeaac43d62727eb2016dc35b49b8dda6a1092ee1d77c9e55e6a8d57,True,Tests_passed,9c40d78a349d5157b3929e4f7230d086c9b63bb044cf586cf062d1128397d2e3,True,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_failed,fcbb97186af4d68cae18568107d95ea16f3b1dd5e5c7746ce8f5477263d81860,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,372d3321dc1938c95af375d5fa994f4d8de6e21284a8da6ded68c8485da8d8cb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,ee187c32aa8a3fd31b7d2be090210cced05b2d4793ea8c808faca9f138f3c4bb,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056,Tests_passed,d497893b0d85525fd69a4ab3232e6dbe37af86f562c42a67ce690223391e1056 diff --git a/results/greatest_hits/merges_tested/xuxueli/xxl-job.csv b/results/greatest_hits/merges_tested/xuxueli/xxl-job.csv index 04248673e4..190b621196 100644 --- a/results/greatest_hits/merges_tested/xuxueli/xxl-job.csv +++ b/results/greatest_hits/merges_tested/xuxueli/xxl-job.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,ebe88bd7ce1f20cda0d9112259c94a2cc99da68c,8c73afa2896d783ca54a3c0b802f20a3c7b09a58,35bceaac0b87f9ab7b5fe44c3ea355afd45b52a0,,True,True,True,124.0,598,6529.0,2,True,124,Tests_passed,a6694199897b2b53f9476a991fc3ef077958f603cfce24fbf71517857aae11ef,True,Tests_passed,1c432cd52cddfa8d7f158109f29a403d0d3c98c146e238de1ff9be8382c9183e,True,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1,Tests_passed,ee3723c99aee81762de36bc6bc4d570a7e28c615ad7e97edc7aa3577779cd1a1 46,refs/heads/master,d0f5c1f6ee60a1e11e89c23749ba2611e53f587c,cd68af99afa12089a76365c7a4336509c355b2d4,b78808259356677415ede135d3b08647f050c36c,,True,True,True,21.0,54,1432.0,2,True,21,Tests_passed,88cb695ed60296dcc968930517a5826307648944a74e341aca36afec5af5eeda,True,Tests_passed,05d0c896e4619e35657e790effb59ade4208980f8c1ac9d51252171929211c19,True,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,bd7485e79945e79dbafe74cabc3a4619d013595bf4da142d8f8a0f9a86acc322,Merge_failed,31d928129df6f735e518658fbe5d8071e7e42094b015120305536720815bdf0b,Merge_failed,efccbe4be75d6ff6d520eb75672f30c62276e7c6f6e5aba17b7983d0223ae10e,Merge_failed,d22f483fe6ff2b266b63525449003578a5368b3da4c02e0b4d7e4b5dbe1f6aee,Tests_failed,e2e5d8b5cbaa5600f09de9729bd6b28819c8f7d22c4533876076a6e92dbdfbad,Merge_failed,efccbe4be75d6ff6d520eb75672f30c62276e7c6f6e5aba17b7983d0223ae10e,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,5c59d49b4f89406545e938c23e792c2893c1f33f8bff33c428cfa526c0563285,Merge_failed,bd7485e79945e79dbafe74cabc3a4619d013595bf4da142d8f8a0f9a86acc322,Merge_failed,f9b58ae198a910984f9a5afec3f2d4173deeb18108ca7d3b51ca14dacd948861,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,ddd5dae7547aa2a0ad55c77fd9229367af1e0adaf5677cc65e86f927d4687d05,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f,Merge_failed,1e5e4cb56c4bdaacd493d480bce015e775d262405786d86ab2b55c3bcc45e85f 65,refs/heads/master,8512a34469bf574b199268d855f7fd86a18d8fcc,4fa63e3aae9f6c438d3dc4949d533fb6a6b7db27,6659ce1b7ddbefb7ab81d03eb80af46afc884073,,True,True,True,50.0,184,1185.0,10,True,50,Tests_passed,ae81b0a502177019f8b7f0150bc6ee978672192b33117a04b80377b8c930bb6f,True,Tests_passed,27d0c1bc2fbf29dbd3bb8119222619e5c292c71c117d2edc38d2d73c70e7746f,True,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,2b89557173f3afcbe2ebc50b8a2a5110dfaec82936b24dead5ac79d6d9ea057e,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,0a9b9cdbea2fa9f50952448c8da7fce8cd8cc0fa4687da5ec8f232cc162ed332,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,991f3afcc402c9776f445ff1f6dbe99bfb093c18e3fd9a1042fb2ced8e258721,Merge_failed,2fe7b558ace74fb6375930034d91669826adf40008aaec3e5d490a1be9910176,Merge_failed,be88cf347c1c9ff6babccdcf5a241dabb456772223252a2955d987379a0a7154,Merge_failed,be88cf347c1c9ff6babccdcf5a241dabb456772223252a2955d987379a0a7154,Merge_failed,2fe7b558ace74fb6375930034d91669826adf40008aaec3e5d490a1be9910176,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,0a9b9cdbea2fa9f50952448c8da7fce8cd8cc0fa4687da5ec8f232cc162ed332,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,827fe75441c7f52abd4f84d35a778f9b945e0567d4c2abaf25b1649baccb4be5,Merge_failed,03a914cd0951c54e4c0dab44d07f91579c41722b676e08700ee42d8c0f884109,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,2b89557173f3afcbe2ebc50b8a2a5110dfaec82936b24dead5ac79d6d9ea057e,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9,Merge_failed,342382923a0310750be4e67fc6b16ea9dd74cf3332eb5b11dfe01e8921d481d9 diff --git a/results/greatest_hits/merges_tested/yaphone/itchat4j.csv b/results/greatest_hits/merges_tested/yaphone/itchat4j.csv index 6c05d58478..11b669f907 100644 --- a/results/greatest_hits/merges_tested/yaphone/itchat4j.csv +++ b/results/greatest_hits/merges_tested/yaphone/itchat4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,2bc3e1ad9d4b8db1554dce5b5fe7eeb8f153d283,047fb40cf09b9e7405de324c4a213074da14aa06,5a0bac9db35f5a337647b39f463a9e6afaf02882,,True,True,True,22,100,904,9,True,22,Tests_passed,4f57a04c700f3ae4128ca777388c68e669e5ce15e90e20df5324aa2a2f1ef225,True,Tests_passed,030098d179a69da74beb6ec901748595497229404c31ab3c2776ed79073520cd,True,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,48d2975b98c17c67f81be34c3c3f735c292614630ed400b1d56b176e0ee4f824,Merge_failed,ccf51d5c7ad5d028ee062d670390943951a4cd0d953cbb8274c173bfc1043d33,Tests_failed,c367b204708b9042df4918a51a405d354f7f9feec8a2db9bf67564c6d591ad53,Merge_failed,6ad5ec660911b22fba559bd4e8de3c44ab2057ebfcc6ce9dac3860f53463939b,Merge_failed,ccf51d5c7ad5d028ee062d670390943951a4cd0d953cbb8274c173bfc1043d33,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,800a32c8eec5253f88a90a9aa9e32d1baa99026cf3905aab2bef85cab9d9ec5f,Tests_failed,c367b204708b9042df4918a51a405d354f7f9feec8a2db9bf67564c6d591ad53,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,1446a8dea60bd7df04a6dc8858ebda3a5b4516422f8dadfbb9af77db8de028d1,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0,Merge_failed,310ff2d3abae4d1c5d2a9bf11e85b1962319b3f08ce4b3ac8d38164d3244cae0 8,refs/heads/master,26a0c2271ccd5a96c27ba6c419c6ae4cb85782b3,a1bc4b4b814df4c3c201f9b69f9d9339bad3d136,12d2c7a7944135b09055470d9ac180f80222c6c4,,True,True,True,8,26,294,9,True,16,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,True,Tests_passed,1bf9771bcf147b9ca6e53253bb62e973789eeb1eefdd53db8e7df796d21a1962,True,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,60e126a60599e44309d3ff50c6008481b1e9c8ed0eccefe7f350eb3a71814fd6,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,e5e0ae9d186a014c89f8cf6a6e42c41e835cdfa63cc5437c9fa498345fcd5b2f,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d,Tests_passed,2c3788a1640b37b220507a98aa72fa838a279bf0481d9ca37ca4687d1873658d 10,refs/heads/master,7dd2c08938241c7fcc70a5f06b671553effee26f,5112e9ea84705897fffbbc9b8cd7bf76340d0cc3,a9581d96dec89ea38bf6871d78327a2b1662e8a8,,True,True,True,18,77,568,3,True,19,Tests_passed,60294d667a39c523205d4a0a87937e1d2a21e5c9ccd82427b0cefad95b958eb9,True,Tests_passed,5ddb9cba2949c9731c6bf98ff57c1c5f8c0943dda8736c97e5ca3844d6e8e7ac,True,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Merge_failed,b6bda2de0572a1800e89bde0e95a983a5b08935e15849e2e977f4513d18149ae,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,470e3c71e1c90c64c8ca3f699e74f08f4591b48f79b24669cf1b3849e7b75612,Tests_failed,be5c0f1767770f3bdd877a0d0adf5776f3234a942764dc5a308154ac748bdbe9,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Merge_failed,b6bda2de0572a1800e89bde0e95a983a5b08935e15849e2e977f4513d18149ae,Tests_failed,470e3c71e1c90c64c8ca3f699e74f08f4591b48f79b24669cf1b3849e7b75612,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e,Tests_failed,8abddcc1e271f908ee6cb239566d868ac982a9aaf8ac7800e3f14026a2df7b8e diff --git a/results/greatest_hits/merges_tested/zeromq/jeromq.csv b/results/greatest_hits/merges_tested/zeromq/jeromq.csv index b094a2b1fd..57fe4ec4c3 100644 --- a/results/greatest_hits/merges_tested/zeromq/jeromq.csv +++ b/results/greatest_hits/merges_tested/zeromq/jeromq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,b784afe7700633ef09703ee343e796f6f8ddca76,9340f6e93a7b352bda7491a70244f98c98c03211,1d435558c04b686ae216e1f4ad97276ac45f1948,,True,True,True,5,26,226,2,True,5,Tests_passed,a46fa2025faa61bf7c1b53dff6cc8f112df11c17ea096d1cebd7950ddb8ef6fe,True,Tests_passed,f2dfa551b6187625cb8e1fbd1be89dcb2dd0e7bda0d4e80d10eb3335c8e9aa1b,True,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,ec3d73c73f4e893859ed3361ed911e34910974159a965c43967d5ced5eb8e15e,Merge_failed,e0e6c74131d2c78d94b4c8e03ffa6a034b43f832bc62e054f9a758040270d659,Tests_passed,d2fedf5aba695aec31444501428f2a597b5d43ad35a183a1c3303b54dc22335b,Tests_failed,9f82e8e3067d52a5e437b3059e29c6d5017d0e08ba9d869fc308f90f91443766,Merge_failed,e0e6c74131d2c78d94b4c8e03ffa6a034b43f832bc62e054f9a758040270d659,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,4c394371a74978435ee5fb962db1d4b5dfa78a9e14f98cb03f016fce14ede43d,Tests_passed,d2fedf5aba695aec31444501428f2a597b5d43ad35a183a1c3303b54dc22335b,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd,Merge_failed,9d738501a15b5381fc39ecf787378917de79043a61716f56a17718d2daba95dd 26,refs/heads/master,9b2438da8f441bb944068f5b31d5d4557b106dc5,afee4ff361ee15a08bfdfb3f55967d7818933b5e,25b1d4830571edb7396a52d81cd973ff3d82b0f5,,True,True,True,8,38,198,2,True,8,Tests_passed,cccda2b77b9df22401fd3465e83b3b47543805a8879dab3bc9c6be033ae99274,True,Tests_passed,270cc4a56361c1ac8f6feefd05950e1aadad12037973b0cd7ebe44e64760512b,True,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,679eb52e21193fe0f108fb0a27ca67a726b0913e53d70dca787ed898d50bf7b1,Merge_failed,1d3fce72a3c4191bfdd8f33e817849cd206e4905f4f79830c2354aefbd16c8b4,Tests_passed,8753b0edc6e7c6e3b57101ff30628c50695c99a07b66d2bcf69e1f62bb1440ec,Tests_failed,a9d303a93748ccfb4965a016104a67a01cae24ccf68e09baff5dc520c39f7e2a,Merge_failed,1d3fce72a3c4191bfdd8f33e817849cd206e4905f4f79830c2354aefbd16c8b4,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,30dd6e4226784087fc508439528526249780fd656e8be6cee7d14e931ea63435,Tests_passed,8753b0edc6e7c6e3b57101ff30628c50695c99a07b66d2bcf69e1f62bb1440ec,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa,Merge_failed,359197912465c85d0b635628d2ce48caf3363c87f6403944c2943b880c4385aa 60,refs/heads/master,15b16288a0f65c4ca0a63edc005496aba8f5b4a6,ed4ff7c76677650c578551f5ce71ca37d28a62d3,e7f904893c33c63cee4246cbcfa05c551c194fd2,,True,True,True,19,55,994,2,True,19,Tests_passed,33b2c85b761758f69151111f2cd74794c876490c7c7c5f217522515cd5e1e0eb,True,Tests_passed,4ff938d8f37dc7d614fed52c4ceaa48a383d884e2031cb034172e98a730527a2,True,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,9604f8123ec27181e63aa2d5db60011a84f8d97c8c260e9f73928b9bea13d01f,Tests_failed,401fe01460e1d7cf067f9ba67b106c586121959c261fbeaf82f8ba3072f76bda,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,9604f8123ec27181e63aa2d5db60011a84f8d97c8c260e9f73928b9bea13d01f,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c,Tests_passed,0d24bfb1d36133516122e6fd7ad40cafafd0c1343e5c2278fcebb9fa9e4a195c diff --git a/results/greatest_hits/merges_tested/zxing/zxing.csv b/results/greatest_hits/merges_tested/zxing/zxing.csv index 6a076d6efe..443ea8cce5 100644 --- a/results/greatest_hits/merges_tested/zxing/zxing.csv +++ b/results/greatest_hits/merges_tested/zxing/zxing.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 87,refs/remotes/origin/pull/1411,e3130cc10e7b16cbcaeb61545f8a65ed12e60be9,aa1e0fcd8874fb7481c774809c79d2b045110271,b94349949a9d62d79135d2f5140b70d355cfbcfe,,True,True,True,839,4944,19794,5,True,839,Tests_passed,b0fffe935db6b288c70d52f81c93f74b613ddc77093a2be799623d6316d6ac96,True,Tests_passed,2e8eddbde5694e567cfc27c0fd966f2964910c07034a4bb7aa8383824baad60f,True,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,5b5ebad3e886e142e323631654040997d1dddaa02290008904107e6853e40b79,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,218a2eeaad3eea8beaff8034d7a34209a09f81bb476c8f8cab12601c6b141779,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,b556a013cf58c4b1bff5ed009feea76d30260b3fd0934bca1830d38e2ac09a2d,Tests_failed,47aade3af941e1fdcfc17c0d5b625a814bcaacd98fb2964a61060ddcc76211bc,Merge_failed,eb5c3e72e24c2d6f275d427359738ac1024089fe2f83d17a44daed13bd144f48,Merge_timedout,,Tests_failed,47aade3af941e1fdcfc17c0d5b625a814bcaacd98fb2964a61060ddcc76211bc,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,218a2eeaad3eea8beaff8034d7a34209a09f81bb476c8f8cab12601c6b141779,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,2c6195f6c506136be2a8a8ff83b5e9b2490b1debee057eae79198ad4286c41bb,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,5b5ebad3e886e142e323631654040997d1dddaa02290008904107e6853e40b79,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d 89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,True,75,188,3079,4,True,75,Tests_passed,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,True,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,True,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,93ff26f89efaf105b841b1709c3fb23a0cf238eed69f6dba060e2eff13ea965a,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Tests_failed,3d16d83380785522c9388650e790ed040d8b94b460b58f70f6524ca71417371e,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,244ea54eff03da5fb6b937150c56973dbc9573be093e8eaf118051112efb68f1,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363 90,refs/remotes/origin/pull/1446,620898d7d57a06972d8b31f61d58a4b25801ab55,153a4da399b03c00af6879e7e78bb6856832abdb,7a760c6384360a54d1a042133fc7c2805eaf3de9,,True,True,True,77,195,3277,3,True,77,Tests_passed,00a8401df9a8d7e0c398df594cf2abbde15bf5e6d4a8e608083c6eb9a5c93eeb,True,Tests_passed,c185b1e274b5f26be92739c0ca7aaa8280d9f1c986744fd4a800f3dc5624d8e1,True,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,1cbd4a8cc554eb47ea0b12994f5ed78bf561de564431096c454d2287a24fdef4,Merge_failed,a52f2dc3e984d96b80b799170ddb77342948bef2dd4f2c8234f1d972acf4879a,Merge_failed,9e15ecc086ddcd6d386ccf17592c59cf4b3374d081d597fd00cc15f2801fe62d,Merge_failed,9e15ecc086ddcd6d386ccf17592c59cf4b3374d081d597fd00cc15f2801fe62d,Merge_failed,a52f2dc3e984d96b80b799170ddb77342948bef2dd4f2c8234f1d972acf4879a,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,090aecf8af52b7dbf3d07fb75273d4d96b4805354a38116828cb1c116613d238,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd diff --git a/results/greatest_hits/result.csv b/results/greatest_hits/result.csv index dda4f330a1..ec006c14d4 100644 --- a/results/greatest_hits/result.csv +++ b/results/greatest_hits/result.csv @@ -1,4 +1,4 @@ -idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository +idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository 200-1,200,1,refs/heads/master,c901ea4391873e4d195a334dc99cb23cede2b339,b5891e2d3513236d91a2aee3e9d220215663113d,013b3ea315d91417dccdbeb1f5d7f569d0968ebe,,True,False,True,6.0,9,18.0,2,True,6,Tests_passed,d23e1a01302eb6fef57307f5e5e5ae7457d74cde83573892f76b1d2ac45fe229,True,Tests_passed,cead205f1db60523ea9dca5c36a261cd82b3a1952c6e14173d3d19f512e2c531,True,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_failed,4e6f9641e3863ba9ceb5754ccef39e41ad5f6b6726f7d985f22b4a3b27eae378,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,addthis/stream-lib 200-16,200,16,refs/heads/master,644e4e9be40e0eb69a9aef6acee6ca28643f174b,e221cb6ab7841007e68d9a6e215f39600ff27502,35816a5396ba66280229d3b0d1c8570f62b6ae4a,,True,False,True,3.0,29,68.0,2,True,3,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,True,Tests_passed,035151ed8047112db4cc9368e27b5dbc636d8d2cddf19723cd5ce9951fa442d9,True,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_failed,5c756a4096751ef05974cd3e8bf1e72993f797f1b8fcb404d0e25724411335f5,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,addthis/stream-lib 200-17,200,17,refs/heads/master,e221cb6ab7841007e68d9a6e215f39600ff27502,323e3010615a0f5b3b5356cc77297df94a92cfbb,b05dbce28a6dab82f20f31e4da28b29d2b736cef,,True,False,True,2.0,27,102.0,2,True,2,Tests_passed,dce673b5ad07d3f818db2b9c16c774354d0836d9fd774a57222bd20f3fb38792,True,Tests_passed,42093ed8a06fb413e90f54de7737ae684ef6fb6ae973b387f5309d8607b2adff,True,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,addthis/stream-lib diff --git a/results/greatest_hits/tables/all/tool_comparison_table.csv b/results/greatest_hits/tables/all/tool_comparison_table.csv index dff93330a3..f622b2c3c5 100644 --- a/results/greatest_hits/tables/all/tool_comparison_table.csv +++ b/results/greatest_hits/tables/all/tool_comparison_table.csv @@ -1,4 +1,4 @@ -,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,plumelib_git_hires_merge,plumelib_intellimerge,plumelib_recursive_histogram,plumelib_recursive_ignorespace,plumelib_recursive_minimal,plumelib_recursive_myers,plumelib_recursive_patience,plumelib_resolve,plumelib_spork,plumelib_ort,plumelib_ort_ignorespace,adjacent,imports,version_numbers +,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,git_hires_merge_plus,intellimerge_plus,gitmerge_recursive_histogram_plus,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_minimal_plus,gitmerge_recursive_myers_plus,gitmerge_recursive_patience_plus,gitmerge_resolve_plus,spork_plus,ivn,ivn_ignorespace,adjacent,imports,version_numbers gitmerge_ort,-,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0 gitmerge_ort_ignorespace,5,-,5,0,5,5,5,6,3,3,2,3,5,5,0,5,5,5,6,3,5,0,5,5,5 gitmerge_recursive_histogram,0,0,-,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0 @@ -10,17 +10,17 @@ gitmerge_resolve,1,1,1,0,0,0,0,-,0,0,2,0,1,1,0,0,0,0,0,0,1,1,1,1,1 git_hires_merge,17,15,17,14,16,16,16,17,-,8,10,0,17,17,14,16,16,16,17,8,17,15,17,17,17 spork,47,45,47,44,46,46,46,48,37,-,28,37,47,47,44,46,46,46,48,0,47,45,47,47,47 intellimerge,198,188,198,188,198,198,198,202,165,96,-,165,198,198,188,198,198,198,202,94,198,188,198,198,198 -plumelib_git_hires_merge,17,15,17,14,16,16,16,17,0,8,10,-,17,17,14,16,16,16,17,8,17,15,17,17,17 -plumelib_intellimerge,0,0,0,0,0,0,0,1,0,0,1,0,-,0,0,0,0,0,1,0,0,0,0,0,0 -plumelib_recursive_histogram,0,0,0,0,0,0,0,1,0,0,1,0,0,-,0,0,0,0,1,0,0,0,0,0,0 -plumelib_recursive_ignorespace,6,1,6,0,5,5,5,6,3,3,3,3,6,6,-,5,5,5,6,3,6,1,6,6,6 -plumelib_recursive_minimal,1,1,1,0,0,0,0,1,0,0,2,0,1,1,0,-,0,0,1,0,1,1,1,1,1 -plumelib_recursive_myers,1,1,1,0,0,0,0,1,0,0,2,0,1,1,0,0,-,0,1,0,1,1,1,1,1 -plumelib_recursive_patience,1,1,1,0,0,0,0,1,0,0,2,0,1,1,0,0,0,-,1,0,1,1,1,1,1 -plumelib_resolve,1,1,1,0,0,0,0,0,0,0,2,0,1,1,0,0,0,0,-,0,1,1,1,1,1 -plumelib_spork,47,45,47,44,46,46,46,48,37,0,28,37,47,47,44,46,46,46,48,-,47,45,47,47,47 -plumelib_ort,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,-,0,0,0,0 -plumelib_ort_ignorespace,5,0,5,0,5,5,5,6,3,3,2,3,5,5,0,5,5,5,6,3,5,-,5,5,5 +git_hires_merge_plus,17,15,17,14,16,16,16,17,0,8,10,-,17,17,14,16,16,16,17,8,17,15,17,17,17 +intellimerge_plus,0,0,0,0,0,0,0,1,0,0,1,0,-,0,0,0,0,0,1,0,0,0,0,0,0 +gitmerge_recursive_histogram_plus,0,0,0,0,0,0,0,1,0,0,1,0,0,-,0,0,0,0,1,0,0,0,0,0,0 +gitmerge_recursive_ignorespace_plus,6,1,6,0,5,5,5,6,3,3,3,3,6,6,-,5,5,5,6,3,6,1,6,6,6 +gitmerge_recursive_minimal_plus,1,1,1,0,0,0,0,1,0,0,2,0,1,1,0,-,0,0,1,0,1,1,1,1,1 +gitmerge_recursive_myers_plus,1,1,1,0,0,0,0,1,0,0,2,0,1,1,0,0,-,0,1,0,1,1,1,1,1 +gitmerge_recursive_patience_plus,1,1,1,0,0,0,0,1,0,0,2,0,1,1,0,0,0,-,1,0,1,1,1,1,1 +gitmerge_resolve_plus,1,1,1,0,0,0,0,0,0,0,2,0,1,1,0,0,0,0,-,0,1,1,1,1,1 +spork_plus,47,45,47,44,46,46,46,48,37,0,28,37,47,47,44,46,46,46,48,-,47,45,47,47,47 +ivn,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,-,0,0,0,0 +ivn_ignorespace,5,0,5,0,5,5,5,6,3,3,2,3,5,5,0,5,5,5,6,3,5,-,5,5,5 adjacent,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,0,0,-,0,0 imports,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,-,0 version_numbers,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,- diff --git a/results/greatest_hits/tables/tools/tool_comparison_table.csv b/results/greatest_hits/tables/tools/tool_comparison_table.csv index 8b8af497f6..d4f8a18dc0 100644 --- a/results/greatest_hits/tables/tools/tool_comparison_table.csv +++ b/results/greatest_hits/tables/tools/tool_comparison_table.csv @@ -1,4 +1,4 @@ -,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,plumelib_ort,plumelib_ort_ignorespace +,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,ivn,ivn_ignorespace gitmerge_ort,-,0,0,0,1,0,0,0,0,0 gitmerge_ort_ignorespace,5,-,3,3,2,5,5,5,5,0 git_hires_merge,17,15,-,8,10,17,17,17,17,15 @@ -7,5 +7,5 @@ intellimerge,198,188,165,96,-,198,198,198,198,188 adjacent,0,0,0,0,1,-,0,0,0,0 imports,0,0,0,0,1,0,-,0,0,0 version_numbers,0,0,0,0,1,0,0,-,0,0 -plumelib_ort,0,0,0,0,1,0,0,0,-,0 -plumelib_ort_ignorespace,5,0,3,3,2,5,5,5,5,- +ivn,0,0,0,0,1,0,0,0,-,0 +ivn_ignorespace,5,0,3,3,2,5,5,5,5,- diff --git a/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge.csv b/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge.csv index 30981ba58c..be6db81dcb 100644 --- a/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge.csv +++ b/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge.csv @@ -1,4 +1,4 @@ -repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository +repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository 481,14,refs/heads/master,a1d3b2b86fbb872a8f3ae20d58161b1a13f1f3ea,7fd3b1f5032b8c081490aa135ba0792e9a9d9d9c,e6bf1649823594bbb8525dea1522274e935f4093,,True,True,True,158.0,767,4424.0,3,True,159,Tests_passed,2552ac5b0f5af9a28b19f19a67f5f2c77ca1e83cb85a0be3f719df46afdb942f,True,Tests_passed,bf191b1c7373f67f075c6a1dacc8596ce30a74be540871488e6d21585195e68a,True,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,566c33cff2a8d2e8779435dc3f96cb968cfc2ffdf0e715057522d7097fe2936f,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,65442196acb80b997748b48398dccd5961e5d6c9db11d6e5104673d85008c172,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,56591c789bba8f437ece315870d7f1027e0fca3f85872deba857ec52fdea82ed,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,alibaba/easyexcel 862,137,refs/remotes/origin/pull/238,15b62fb08d34b9ba2c33cfbed228b181a0bc522e,fc23bcbe9792a6916383818623d862b3624692cc,1e9abf1da5736070ef276ddc509d6069b1598600,,True,True,True,571.0,5727,32574.0,4,True,571,Tests_passed,f1aa930f1d8fd8084e8ace104e28c95e6450774e8925d626812db38c28c41594,True,Tests_passed,8c677cda65c940b10b5b3600fb2693172a55b618ea19811fef944601de08fd26,True,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,472e6340df7f698962871d713d4d184315175a755d5f3d65ecb3cd91e7ea1210,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,f37308dd6eb9c43930d3ad8b863336db4a2039d93407c5d40b05a47946c75613,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4695e4705b8fa528cf5d9ba9721150a25eec1d87a051e52b2df9d16b819a9656,Merge_failed,af083ea22abf59a6c6fa6e5a00932410ea5b5ff1bf98050ced27de33c6bdb482,Tests_failed,b22018f41f0aa97edec28ac9237706bd554dd1a193e22cf102c8c71e6f5283d7,Tests_failed,751df81e294e95af9bba5e2e2106c15d273ab4878a5d720a3da603eed667ec0e,Merge_failed,af083ea22abf59a6c6fa6e5a00932410ea5b5ff1bf98050ced27de33c6bdb482,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,f37308dd6eb9c43930d3ad8b863336db4a2039d93407c5d40b05a47946c75613,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,3d2dcaed5ad878c1324054bf8018d0db2dee84307fe05e5e398f829bbc11d87b,Tests_failed,b22018f41f0aa97edec28ac9237706bd554dd1a193e22cf102c8c71e6f5283d7,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,472e6340df7f698962871d713d4d184315175a755d5f3d65ecb3cd91e7ea1210,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,apache/commons-collections 862,138,refs/remotes/origin/pull/241,923fa03bdbf89d2985eddeb203260499561ce81c,a23d4fb13f5fe4e4887368e92982e1f4b4464259,1e9abf1da5736070ef276ddc509d6069b1598600,,True,True,True,567.0,5719,31953.0,3,True,567,Tests_passed,8d65add69777eae6d331fa5ae3fa2ee14d2b31f5fb243723d05efec6de87c6c7,True,Tests_passed,8c677cda65c940b10b5b3600fb2693172a55b618ea19811fef944601de08fd26,True,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,d32d892bd42b5b1b2a394ca43f43753e3f68a5ea835a87f7c0a0ebb61ff11838,Merge_failed,c979a7eae0aa1e0666f15b42f2ae749b28b3a6fa1f2bfa45b84a0ecbd016c816,Tests_failed,fc6a330e0d3cfef39249133dc820b74a860b0db6c97d33a06e9dccd2333891e1,Tests_failed,ce8acfd34147fe3a20b54a7c30927d0148c24f48610db8f249f8401e0444a6ce,Merge_failed,c979a7eae0aa1e0666f15b42f2ae749b28b3a6fa1f2bfa45b84a0ecbd016c816,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,f87538761f96896944e3ff59568ac753fca6f72ebc674d34eff46ed1c65ecf05,Tests_failed,fc6a330e0d3cfef39249133dc820b74a860b0db6c97d33a06e9dccd2333891e1,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,apache/commons-collections diff --git a/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge_and_spork.csv b/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge_and_spork.csv index 30981ba58c..be6db81dcb 100644 --- a/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge_and_spork.csv +++ b/results/greatest_hits/unhandled_and_failed_merges_without_intellimerge_and_spork.csv @@ -1,4 +1,4 @@ -repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository +repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository 481,14,refs/heads/master,a1d3b2b86fbb872a8f3ae20d58161b1a13f1f3ea,7fd3b1f5032b8c081490aa135ba0792e9a9d9d9c,e6bf1649823594bbb8525dea1522274e935f4093,,True,True,True,158.0,767,4424.0,3,True,159,Tests_passed,2552ac5b0f5af9a28b19f19a67f5f2c77ca1e83cb85a0be3f719df46afdb942f,True,Tests_passed,bf191b1c7373f67f075c6a1dacc8596ce30a74be540871488e6d21585195e68a,True,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,566c33cff2a8d2e8779435dc3f96cb968cfc2ffdf0e715057522d7097fe2936f,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,65442196acb80b997748b48398dccd5961e5d6c9db11d6e5104673d85008c172,Merge_failed,1eeb485e4ed6cd189c5524336079f4d2186b4accd868d6386fe539d752ceb256,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,56591c789bba8f437ece315870d7f1027e0fca3f85872deba857ec52fdea82ed,Tests_failed,4a16ed0ec18c02878759f5015a287fa63768d4ebdbf406dfd6067e52aa19263d,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,Merge_failed,40c417721dbdec49c8b3d18fe5f721efcc4d46e7baa9fdcf261ad5b205255c33,alibaba/easyexcel 862,137,refs/remotes/origin/pull/238,15b62fb08d34b9ba2c33cfbed228b181a0bc522e,fc23bcbe9792a6916383818623d862b3624692cc,1e9abf1da5736070ef276ddc509d6069b1598600,,True,True,True,571.0,5727,32574.0,4,True,571,Tests_passed,f1aa930f1d8fd8084e8ace104e28c95e6450774e8925d626812db38c28c41594,True,Tests_passed,8c677cda65c940b10b5b3600fb2693172a55b618ea19811fef944601de08fd26,True,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,472e6340df7f698962871d713d4d184315175a755d5f3d65ecb3cd91e7ea1210,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,f37308dd6eb9c43930d3ad8b863336db4a2039d93407c5d40b05a47946c75613,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4695e4705b8fa528cf5d9ba9721150a25eec1d87a051e52b2df9d16b819a9656,Merge_failed,af083ea22abf59a6c6fa6e5a00932410ea5b5ff1bf98050ced27de33c6bdb482,Tests_failed,b22018f41f0aa97edec28ac9237706bd554dd1a193e22cf102c8c71e6f5283d7,Tests_failed,751df81e294e95af9bba5e2e2106c15d273ab4878a5d720a3da603eed667ec0e,Merge_failed,af083ea22abf59a6c6fa6e5a00932410ea5b5ff1bf98050ced27de33c6bdb482,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,f37308dd6eb9c43930d3ad8b863336db4a2039d93407c5d40b05a47946c75613,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,4c2064b1b368a31fc58e8d07faa0f975280377cf14a7457a1a032dd000ec6e8a,Merge_failed,3d2dcaed5ad878c1324054bf8018d0db2dee84307fe05e5e398f829bbc11d87b,Tests_failed,b22018f41f0aa97edec28ac9237706bd554dd1a193e22cf102c8c71e6f5283d7,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,472e6340df7f698962871d713d4d184315175a755d5f3d65ecb3cd91e7ea1210,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,Merge_failed,1e67f1a77fae9b0fed1624218ff2b751997aabe1bfa7836f377c3f942e1f5373,apache/commons-collections 862,138,refs/remotes/origin/pull/241,923fa03bdbf89d2985eddeb203260499561ce81c,a23d4fb13f5fe4e4887368e92982e1f4b4464259,1e9abf1da5736070ef276ddc509d6069b1598600,,True,True,True,567.0,5719,31953.0,3,True,567,Tests_passed,8d65add69777eae6d331fa5ae3fa2ee14d2b31f5fb243723d05efec6de87c6c7,True,Tests_passed,8c677cda65c940b10b5b3600fb2693172a55b618ea19811fef944601de08fd26,True,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,d32d892bd42b5b1b2a394ca43f43753e3f68a5ea835a87f7c0a0ebb61ff11838,Merge_failed,c979a7eae0aa1e0666f15b42f2ae749b28b3a6fa1f2bfa45b84a0ecbd016c816,Tests_failed,fc6a330e0d3cfef39249133dc820b74a860b0db6c97d33a06e9dccd2333891e1,Tests_failed,ce8acfd34147fe3a20b54a7c30927d0148c24f48610db8f249f8401e0444a6ce,Merge_failed,c979a7eae0aa1e0666f15b42f2ae749b28b3a6fa1f2bfa45b84a0ecbd016c816,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,f87538761f96896944e3ff59568ac753fca6f72ebc674d34eff46ed1c65ecf05,Tests_failed,fc6a330e0d3cfef39249133dc820b74a860b0db6c97d33a06e9dccd2333891e1,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,2bbfac498d67543ee439390875f35ca22ea59483458e35911332da8cc0b8311a,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,Merge_failed,02afac00a31b239d4e179dc180a5e3a37909d5b6af7527ba572933dc61021217,apache/commons-collections diff --git a/results/reaper/merges_tested/47deg/firebrand.csv b/results/reaper/merges_tested/47deg/firebrand.csv index 39cb8dc510..968da38359 100644 --- a/results/reaper/merges_tested/47deg/firebrand.csv +++ b/results/reaper/merges_tested/47deg/firebrand.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,13,31,147,2,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,True,13,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,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34 6,refs/heads/master,776567ef4e502d276d9b7f6a3c3ba70754fcabde,ece26b9bb6c5fcb3807dabf5810dce5a7e51cf05,ad5e18e5ce13fb70b20b15cbeb49c380c2049701,,True,True,Tests_passed,7443331472584e853baa7fa5152c8a93e8438c566b4f91c905258a0637c94ff3,True,13,43,154,3,True,Tests_passed,212b451b1f4695b9de086e78bf02ef6d9af76b604e8dc0cab2ef61acaa552543,True,13,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,Tests_passed,ab1bd23ccd71385462ed94273ceda67a8a5d2ff5d0625e4739d8136ae584ccd2,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0 7,refs/heads/master,5af53e4af47a4f7638afa8520b08ef519e5042b3,9a06e785e8a0cffa134de02a602715b0cb50b9f8,1a4e908fd03df49084741bbd167328701826caae,,True,True,Tests_passed,df81935bef53d48936e123ec5697943b83c1e2d1de2f1417989a85eccf5ded37,True,11,27,92,2,True,Tests_passed,07f6c21a1269399c043bed38e4cbd84111558717b8d10f1367ef0b06092bae3b,True,11,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,Tests_passed,af0ee49e18bdb6a7722bac9576e3c087445d5da94224ce3d7641f6dc266639a9,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615,Tests_passed,9168df07ed4f2031498571d60d19a0896dc99e2e8d8478eeae8157702a826615 diff --git a/results/reaper/merges_tested/9apps/elasticsearch-cloudwatch.csv b/results/reaper/merges_tested/9apps/elasticsearch-cloudwatch.csv index c9c0030b66..34e03ebd49 100644 --- a/results/reaper/merges_tested/9apps/elasticsearch-cloudwatch.csv +++ b/results/reaper/merges_tested/9apps/elasticsearch-cloudwatch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8e72563c34b534951407fc553222e2d2b2536b0a,21d45d6b78e3e7c6f749cd7a8dd64897cc34a0d4,5e338acd3c7d8fab4361594dfc084ad2a89f31eb,,True,False,True,2,3,4,2,True,2,Tests_passed,8a1c1183895492fa26e72e027ade5ffda13b00ae025bee8bc8ef0773c8125d4b,True,Tests_passed,6346c5a5c40e39265013e7eba7b2e41781f1a17fe78679fdc734e4e48a403ff6,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,Tests_passed,ab987682137551e396c32439051d9f6a1bbafa70346840447d9fd964ee150b80,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02,Tests_passed,6a4a593297d55760b59fd05d342298f2ba803939c4b3a8448670ba5e2905fc02 diff --git a/results/reaper/merges_tested/ab0oo/javaprslib.csv b/results/reaper/merges_tested/ab0oo/javaprslib.csv index 500add0574..c0cb50ed6c 100644 --- a/results/reaper/merges_tested/ab0oo/javaprslib.csv +++ b/results/reaper/merges_tested/ab0oo/javaprslib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,a929486b0e7bf006bd2a192329a16f2b15ab95f1,616fcdc19d53152ca885ab8beac68d3073ec6d8b,9b2402b47af713de3b0b96989fc38023f2a86767,,True,,True,33,128,,13,True,38,Tests_passed,55c9532af6b46b42cc0e3b9bbe94a8e6ae05a63db240c02401dc2a25c48b754d,True,Tests_passed,56ed3a972e2f4eb451c8181a8d32284d9afc19069ceddbea6fe0fb182111f19d,True,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,c1005244cea23c90b85f9ed83eacf23dd49eb4e3eb00850a7e7004672e125956,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,488e4d658c9337dfc60cf550211ff89375362a23724d865f413025afc6dffa98,Merge_failed,c9f6b0ffb9a7895527358c762598a7c04b0398cc7324ccfd04f2fea1b219977a,Merge_failed,52b4176766657a174de8dd4273c79e4f37bb546e703906396cf9a50f323abe81,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,ef011810a94c8b74e909aac656c472c7479df2e338df82b87555a632af804902,Merge_failed,9df6aedb4433679f03a8ea6d87b32c6504aea4e5e25b1ba0b7c3bd02929743f4,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f,Merge_failed,9835c5af528dc8d0532fa50cfa3304d73a5350c50660c1e0bf4cba0ab780d84f diff --git a/results/reaper/merges_tested/abel533/echarts.csv b/results/reaper/merges_tested/abel533/echarts.csv index 179954e68c..f743bb427a 100644 --- a/results/reaper/merges_tested/abel533/echarts.csv +++ b/results/reaper/merges_tested/abel533/echarts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,True,45,49,425,6,True,46,Tests_passed,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,True,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,True,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,907b1bcbd6c0530192451b5a6b3f6bcad63bbd66a493b72d3c22694852f4b5bf,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,69c908a14a0241ffcb5d5a451ed075adda2c56b1ec128e36754dd91353e3a1f2,Merge_failed,a1fabae4541d4a40110c0e590d4efb3d5969787a75f2270e1ecb357a830d0150,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333,Merge_failed,27d781ea85e52a1064daff495ccb06804ebd29ac667f2c50ae7e2d38d49b4333 diff --git a/results/reaper/merges_tested/acciente/oacc-core.csv b/results/reaper/merges_tested/acciente/oacc-core.csv index a1497b9122..5f3d8a91a7 100644 --- a/results/reaper/merges_tested/acciente/oacc-core.csv +++ b/results/reaper/merges_tested/acciente/oacc-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,0ca7e4ea4fd000ca5a3b51bb5e2e2fc27f6217f2,57e7150a72573f547092a0054317ffab8219bc45,c32cb07eda7eae130ce52a9cada989e58a1fbfa3,,True,True,True,214,296,1066,18,True,215,Tests_passed,9648b81286e53d474cb0ca01597f0a94b155d0dd8b1bd322a8921c3ec40b15c2,True,Tests_passed,5137eaf1d40f9a64f41e55dfd63637b140570923d93196f215cb3b23151b0dea,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,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,0ad53a1530f8a34063dbd30466d149f7910e477ea05235886981b3b336b9fda5,Merge_failed,30edee8e81f9b0c03e7f51cbed04aa41ef8d692ce6cc6fe40aa9fe8042254ca2,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,8b0ba4e09c1fd34c6832eaf52a028c2ca4eec9b3486235de3d536a94cf7b21ff,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b,Merge_failed,44fab8c3a10bf70f3ccfa6e82abed9f89cba67e6824e36f9ad31258cd92af87b diff --git a/results/reaper/merges_tested/accla/d4m_api_java.csv b/results/reaper/merges_tested/accla/d4m_api_java.csv index 186dbc14c5..dba43e9ede 100644 --- a/results/reaper/merges_tested/accla/d4m_api_java.csv +++ b/results/reaper/merges_tested/accla/d4m_api_java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,09c65cd9540ef816799eb0540ec463ec912a300a,590e67d0d93811d58b9454be6a0c9178e7f2ba3f,fc2a9e2cffc52f1f4392b5552555196d7e41dc49,,True,True,True,69,146,4086,6,True,73,Tests_passed,b1fc4677d158a76fd8a141595ff1c8791f73abced5b525bfd20fa515589570b7,True,Tests_passed,66af1d880972b5291a442f2ae4572de0c31e6146d48a15a4422715f1d8a235b8,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,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,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,True,27,84,260,3,True,27,Tests_passed,84bf4629f950943fc40bda04af8cfe5a677d96ca7482eace7e62211b8251690d,True,Tests_passed,591e65e775e1fe25a44402f01cc237c299ab39e77b832912a9dba9d5aeabfbd8,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,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,32807dc1e632a981efb923294f9ff9151015e5097849c94b51640fe621fa6ebb,Tests_passed,4dfa2f9010deba83f92489ba77e227344f63215a3554f942136901d972b62f8d,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,b598962e1fd11802906787f69a7c036a879fdc16b1fcf9b9a402ec6614619373,Tests_passed,c1d5a4dda6558c34171a2d66868455282a954b65a06e98b2fdd8976fc09f8d68,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354,Merge_failed,9b14446c43673e03a3a7460864d7b4bab8dc1967484ca1a36e5c3516ede68354 12,refs/heads/master,31dd135b6787853c444473b11b049f41e63d939d,5d66714f7e8d8c8b46a5129e3cf01720dfa89632,69ae63c52d595f71875ebcadc6455b624ac86e1f,,True,True,True,24,61,172,3,True,24,Tests_passed,938fc92e3701b98ec4625d9a79007b41016c2897852933012eb18c3edaa5b7c3,True,Tests_passed,8e702a8d2b5ca4c259fc2c6dd476b91c98e8ac8e678754bdf17f1c0ec9b1501c,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,ff7767b81cf5e947df2b9016c4a623f701df1817c883bcd09ba07cafd14e3d70,Tests_failed,3368051063b0ff8616663278753e3111927f48a772891f717ff1581a106604fe,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,ff7767b81cf5e947df2b9016c4a623f701df1817c883bcd09ba07cafd14e3d70,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,454e71ec32c28cfe70af11cc628effe90acff0b5868c5175bbba6e1f06cfee16,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e,Tests_passed,6d7084654574de65509f02f33818bf03a359923632facb3aa865a91e84fe213e diff --git a/results/reaper/merges_tested/adamd/z.csv b/results/reaper/merges_tested/adamd/z.csv index 4e8ecaa8b8..9480107a6d 100644 --- a/results/reaper/merges_tested/adamd/z.csv +++ b/results/reaper/merges_tested/adamd/z.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,da778dcb9cf35110cc3b35d9c4c26a66238d3450,f8384828f24a11ae196120ff713d10f772828334,3bee6597c0de4c16e2050187c6c18b753a93cee4,,True,True,Tests_passed,108d15f512d15b3844a5e3cf260858f271ab6b7f85a9fcc2843f4c044250a122,True,19,71,1095,2,True,Tests_passed,52bbd0b851c78d8f31bd94992c4d977de86880020109607f7f52095ab16c7025,True,19,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,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Tests_failed,64925337da7f3f3f6781e07b6570448db868540db54950b4b57cb193d9652b68,Merge_failed,695aaef4a2deaf4c03133862934abfd3af047695fb4d405d7a5dd902cced30f5,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,501c1d5967d59f0fb6ce694b4ea73cb0b831f431e603b88f8c8e5f4604c0a4bd,Tests_failed,17df2f430a2cad1ac7eb5a6d77f4de165439df60841ed90f799450e5369ad6a0,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf,Merge_failed,e86bfbe0f89033b9c835f5115c96aeed6250c25fbbba9739c1d852acbd4bdaaf diff --git a/results/reaper/merges_tested/adangel/pmd.csv b/results/reaper/merges_tested/adangel/pmd.csv index a50edbc118..bdf78bcfce 100644 --- a/results/reaper/merges_tested/adangel/pmd.csv +++ b/results/reaper/merges_tested/adangel/pmd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 95,refs/heads/master,f9c6b0b08dac300305daf222438c8b3dd54fc535,fede0e28fb7dfa69854d8a7d520146baa7f68b6d,1c08f946917a938669cfcf011e238dae028b3898,,True,True,True,458.0,1264,9069.0,3,True,458,Tests_passed,330e203411bd99643160a55163acd32680857ea38cd1137a159605b8c51e0c61,True,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,True,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,e5a3e28e16c1372daa7baae7bb974df04b14b3567381092c985a5ac7e95c9779,Merge_failed,bc19a4758a0c3e998b99988cac43ee69d56f7af9bd42b04a77086cec1b034e6a,Merge_failed,dd8eabd01947cf7b4eac438b39b87343c11795e3b16ecab8491e569d29a8019a,Merge_timedout,,Merge_failed,bc19a4758a0c3e998b99988cac43ee69d56f7af9bd42b04a77086cec1b034e6a,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,86b8c74090114373c6870f627d410ac434ce606aeb5b5210b744466f160bc9aa,Merge_failed,9478abcb236d6e3388fd3fae9ef6848940501742fd0c7a5c79c5e95a7af3cffe,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d 372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,True,True,True,436.0,1210,8471.0,3,True,436,Tests_passed,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,True,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,True,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b397d9858ce04ef6f080eef96ef54986de392de1a55dd54680660cc7c558110,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_timedout,,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b6e7c636f7601a8c6e5d7703b626b70b7dc8510783c36470b57de847ffddd31,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63 467,refs/heads/master,e52be1498094e7947e341cbb49c2b537e761d395,2b700c02b62549a26dc444c2a5b699b16686414d,04527bc4cb9c004ff3daf145690a1268b04a2a70,,True,,True,458.0,1261,,5,True,458,Tests_passed,e74295a8924a99c16abb67ed1e11121a1267c3d60c73b109355dd9a9abe66281,True,Tests_passed,466dfff5a728ab07907abf8b9233234504d515e4dcd52e714bb5b607492c187b,True,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,3ea355dda8d6d14c7d8ba9ece741b90c1dbcc5defa83694b0009568fb48a5397,Merge_failed,c3dde99c0b187614f331f7af2da7fc23b606dd31ea96d1c84befcb8968a5c284,Merge_failed,980021a9b7c15b32875a0f9ea207b840d141507cfc604c1703e00e644c45fedb,Merge_timedout,,Merge_failed,c3dde99c0b187614f331f7af2da7fc23b606dd31ea96d1c84befcb8968a5c284,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,0e68ca6a04b8a5714efc88cd1988b401c42112ad5f04491818e9685e801fe4b9,Merge_failed,515961d0dc421c3d1510901240214282ccfca2dba4931cad37c3767840ba4dc2,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff diff --git a/results/reaper/merges_tested/addthis/meshy.csv b/results/reaper/merges_tested/addthis/meshy.csv index f9fc382a47..1b5b798fbc 100644 --- a/results/reaper/merges_tested/addthis/meshy.csv +++ b/results/reaper/merges_tested/addthis/meshy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/1,1079da2f62ed1b8c096c40aeb293b1f1348d6e5d,6299d33d6b0d3e44d3dca4fec896ed368165dc5c,93106b5a0e7cf303bbb19ac8f2c7af5d6a6f5523,,True,True,True,31,158,1119,4,True,32,Tests_passed,d971cadbd932e5b7e11dc49e37ff7632d7af515e9def82bbd9c262f0f0e4db8e,True,Tests_passed,73a2ef4bdec99c031a98953b8085037f9c3eca3783d158d1e694a6994d31ab36,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,845c63d5517686f91754e200552b71f4df8b8b776642f358382f4e446409d07a,Tests_failed,6b3064ba7525438588b69db9ce0f832baf7ad0d9c89d562b75be57ca30b82573,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,50ed54678fbbbfcf03713a74e316107fa5c32c9568015f07a2e443b7c630228d,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Merge_failed,cf204e221e073f340db669687c060f6253a60589f8691bd104387d092a1d79bb,Tests_passed,845c63d5517686f91754e200552b71f4df8b8b776642f358382f4e446409d07a,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,8e0d6e22a9ec58addfbdc6336e5e97d18d3791382067799ebb5d9d43d49b500c,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5,Tests_passed,182d9f0968b682980695dacbc44092d4dff3141df36e590cd246a16db3f015e5 8,refs/remotes/origin/pull/7,66ca16d72b571aa4ce1ed8286de3484fc007ec45,5f37bbd2de7caa3e5d23f54d4a1e685d37e2a74d,58b0e349f804c13a0214a30a9ac93dcde42be2ca,,True,True,True,16,42,313,2,True,16,Tests_passed,1ff45d0cdda0ae3c5518967939172bd066cb971972d87b36cc1252b07877c87d,True,Tests_passed,78ec20e951c988bc2eb553cfcaf5bcdc4d03ae76632490c97261b8d9430fa49f,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,4556d4267b5a466652b2ae1db1dcb50aba3b62d6e04c9b6bba76997ff41076c5,Tests_failed,ea332700fa1bedb43cd44d5a9367e6dffc6f15d75d2a8a6c117283c18f2d046d,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,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617,Tests_passed,bf350e9a90af6066a3b07159dfcb66254df3241bff3569f58e21741095175617 diff --git a/results/reaper/merges_tested/addthis/stream-lib.csv b/results/reaper/merges_tested/addthis/stream-lib.csv index 272f37a948..9c7019c40b 100644 --- a/results/reaper/merges_tested/addthis/stream-lib.csv +++ b/results/reaper/merges_tested/addthis/stream-lib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c901ea4391873e4d195a334dc99cb23cede2b339,b5891e2d3513236d91a2aee3e9d220215663113d,013b3ea315d91417dccdbeb1f5d7f569d0968ebe,,True,False,True,6,9,18,2,True,6,Tests_passed,d23e1a01302eb6fef57307f5e5e5ae7457d74cde83573892f76b1d2ac45fe229,True,Tests_passed,cead205f1db60523ea9dca5c36a261cd82b3a1952c6e14173d3d19f512e2c531,True,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_failed,4e6f9641e3863ba9ceb5754ccef39e41ad5f6b6726f7d985f22b4a3b27eae378,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,545da4c1e4f63800280509483ed43cc9ed958d6557f1bddfb16d8999bbbcaa4e,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834,Tests_passed,bc212ea89cbbfe8d3b330f3c789ab47b505c0ea23a2ffefa1d6579b8f1495834 16,refs/heads/master,644e4e9be40e0eb69a9aef6acee6ca28643f174b,e221cb6ab7841007e68d9a6e215f39600ff27502,35816a5396ba66280229d3b0d1c8570f62b6ae4a,,True,False,True,3,29,68,2,True,3,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,True,Tests_passed,035151ed8047112db4cc9368e27b5dbc636d8d2cddf19723cd5ce9951fa442d9,True,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_failed,5c756a4096751ef05974cd3e8bf1e72993f797f1b8fcb404d0e25724411335f5,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,c12c1065f8994b19ad615513398aafdc26a8b01f41b06bf696e279b278db8769,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c,Tests_passed,361572c83f619486c828fd4656c7164f09910276f1b5d95eb53bbe3ad0c5991c 17,refs/heads/master,e221cb6ab7841007e68d9a6e215f39600ff27502,323e3010615a0f5b3b5356cc77297df94a92cfbb,b05dbce28a6dab82f20f31e4da28b29d2b736cef,,True,False,True,2,27,102,2,True,2,Tests_passed,dce673b5ad07d3f818db2b9c16c774354d0836d9fd774a57222bd20f3fb38792,True,Tests_passed,42093ed8a06fb413e90f54de7737ae684ef6fb6ae973b387f5309d8607b2adff,True,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,de3ba4355676a2a0d9b45a60efe5f40af52041f39e74d8a505491803c19449ff,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,fa536315698c85278dee5520ee15499f782560e7a81ae74912dc5d95fb20be4e,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,019db5e5483a2c43d4f9e428a2684888737d5b66c759aba6dcf2fe6391d3bc93,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd,Tests_passed,29b2ed82a2acfca3a405269be49ebf0ab6995b50bd36919e7aa8e4f87cf6afbd diff --git a/results/reaper/merges_tested/adoptopenjdk/mjprof.csv b/results/reaper/merges_tested/adoptopenjdk/mjprof.csv index eecad04db6..336bc6bc9c 100644 --- a/results/reaper/merges_tested/adoptopenjdk/mjprof.csv +++ b/results/reaper/merges_tested/adoptopenjdk/mjprof.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,754462e890ac29f2155ef2f60aeba253ad15ce76,4962f53609eea0aeef8b98fa156f0d8d12ced109,b53ee16a330b07ab9a9171da60c2919319542260,,True,True,True,44,134,1897,5,True,44,Tests_passed,5b9435e155856cdcbee1c87c1a2a84b98957fc6e9ffdc5bcfc0d512ec6cad1e7,True,Tests_passed,2b9f80aeff490dd0aba9103f23c5be1914eab72d338aa977739f57ec51c71cc5,True,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,62d9d6b1cb3d0a5516df5a5d0c2a35ff8c88c29768d81c546caf08eceb14eb13,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Tests_failed,7bb5087bd724eafa7d8aea7171c7bdda545a3b19e5f150d5b3140047d2a68a0c,Merge_failed,8e0ce045938010f8a0b2a256ac8c2b5521adc69c5ca076c6bec00d8ddce53d40,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,b59b6de50e59aee634af8c13925e7b26112fbaa4c2d61cf66b0b2d168b87820b,Tests_passed,99bd61bbcfcae6d0c83a05f5836cd76f4eb7b2bf113b6823d1eb7490663eb16a,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca,Merge_failed,8d81eacdde26c84e0627b7f42441ef40e859234715508b5ed5e57abbf346eaca 39,refs/heads/master,fde954818e8ec249a1b9888714b6b3d528e3db62,534cb7b1c61e80655b0862d3894d567c7400922d,4ba1f2366f030be0b6edde0065a401ed7197a2b8,,True,True,True,34,68,639,4,True,34,Tests_passed,5d9ffcb139f3aadd15d0cd373799fabb7d3f18f95e9b20557ee138e6ccf46021,True,Tests_passed,d961cca7a62a72eb835cc7f7e098d38c65c844f2a3c8da4ab5e69d042aebdf3d,True,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,637158d79a513e24c2507f204009bfd2f443f5c133ed8180281165716ee8b44f,Merge_failed,44cc378937d5ca83c74e74c891f3d89b792ed4d338151a694af5b49ce539497f,Merge_failed,96b4a469665666de872a3384ae8a5cac2b509b769e833ea4644047072379f6e0,Merge_failed,9d6a36be56d66716f5ae6cca9aa83506a72990c77950aebb9726e733ea606334,Merge_failed,44cc378937d5ca83c74e74c891f3d89b792ed4d338151a694af5b49ce539497f,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e0fb35490308f20f2a25052eb33e96ec990e935683267c88023fb4baa8fe0d26,Merge_failed,96b4a469665666de872a3384ae8a5cac2b509b769e833ea4644047072379f6e0,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Tests_passed,5c7052947306579554516b56cbc5abc7e697bd03f11d44f09a81bf34f3598c27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27,Merge_failed,e5eb0a0ab9db0637d51dcf2a5f50f2de2c0b2ed489fd7bd09171e51acaa89d27 48,refs/heads/master,44b7a2b3dbb6af1aa221a4a38b248e99629f8592,ee53d91c9f1d4dbb6def4312dd01063969dcdef4,9b1e992a94be4f9ac723bbf21b08f596ffae413d,,True,True,True,10,24,131,2,True,10,Tests_passed,f8eb78a84c08b66e69dcdde10811d7c7cc52fcfa128c4dadc0be8e4f50a9aeba,True,Tests_passed,adb3940c366ab752965e0a621b157be520efb02a4fc754c6c916c5daa6ac02d7,True,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,e50c757c672f980cb4024da73757248baf945bafa2899fa8ecdcc32f8b1a9974,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,e50c757c672f980cb4024da73757248baf945bafa2899fa8ecdcc32f8b1a9974,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15,Tests_passed,a1bcd87d9dfc2331834c3c30e5d9318e6b8c72460d9e2adcab6013252d691f15 diff --git a/results/reaper/merges_tested/aerogear/aerogear-crypto-java.csv b/results/reaper/merges_tested/aerogear/aerogear-crypto-java.csv index dac9308b08..44113937c1 100644 --- a/results/reaper/merges_tested/aerogear/aerogear-crypto-java.csv +++ b/results/reaper/merges_tested/aerogear/aerogear-crypto-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,4c895357e7aa06557e4ca3eae89f727c2c1534f5,592aac6c071772332a8f3f405fcc6d6c2b94fcb3,07beb7efc7bd0c3319076c9f14219f8392a39b7c,,True,True,Tests_passed,c63b54bfea1e25b29e519ebf48e0e4a7f834431446bc01f8a4fbf657a9917b2b,True,9,21,75,2,True,Tests_passed,8e399dc2b014f51497be382d63e2bef7b908ba4b122fd20dbf03847fac0aba46,True,9,True,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,3c0b6d04707b2f95dd690f25c029b2929169c4745856eb66dc78a6a042b92359,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c,Tests_passed,214484dab8769c009ca133ed2dfeff25dbfe601ab5a4e16668deb284e12baf5c diff --git a/results/reaper/merges_tested/aerospike/aerospike-client-java.csv b/results/reaper/merges_tested/aerospike/aerospike-client-java.csv index 99989169c3..0220d700e8 100644 --- a/results/reaper/merges_tested/aerospike/aerospike-client-java.csv +++ b/results/reaper/merges_tested/aerospike/aerospike-client-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/remotes/origin/CLIENT-2252,924fe34da0c425c1587a7edfff62947ecd8307d7,ff3bc5c7d7524932d8ae27b4ad6965102c0feacd,f15bfa18ba3fece17351381df2eb2705c446aaa6,,True,True,Tests_passed,7692ba6a959bd681118176fb3b4edf05e7aef2e3ddb1e5ffb062513cf7719bd4,True,102,477,2605,66,True,Tests_passed,d208410214cd8c7a33c6bb56a26a52b0eb40d353141fe535486937954556c0b3,True,157,True,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,18a04fb28c88b1ef17c1990167cccaab7c054be8e4cf9aca0d1d51e4dde1327b,Merge_failed,a5c464112388a0b40b7846f0be8e36568db0f7c2314cbdc90d6eeb42fa9e5fd9,Merge_failed,61822474e8f108f3e5f08fd67720aca706accf1d17a1b617e382565552876a66,Merge_failed,cb84b0b00ea1a899c436adeda33d9a79d9b3c754e9a685c160461f75fdaf2084,Merge_failed,a5c464112388a0b40b7846f0be8e36568db0f7c2314cbdc90d6eeb42fa9e5fd9,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,669dec8f11c302d91923da07beee4e36222925c0d2c5dbee3447f65e8b2954f8,Merge_failed,61822474e8f108f3e5f08fd67720aca706accf1d17a1b617e382565552876a66,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8,Merge_failed,3408ed3845727f03187643101fbb053b4f812cfdf3e081c5ea578d2c2a177ae8 30,refs/remotes/origin/CLIENT-2293,526dc9ce7304f2006178d36d186d43e65bc7fc0d,19b303b3c394023abc5e2b28415376958962bb44,c23f291eb65987f4178ae127a87ce68cb668eae5,,True,True,Tests_passed,c205f0a3c6c9211a46a0744f6f4ab606c88d7e7902a2994c8c9a1467ecc3888c,True,16,101,1651,2,True,Tests_passed,121e49fce46d790ca43aa474251d7a1d8b74732e9f5537aab19ddcd38f214d2c,True,16,True,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,7ea684c73b335b3b930b1c85f9a7b687afc78bcb357a582b130c2aeee59c8b9f,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,7ea684c73b335b3b930b1c85f9a7b687afc78bcb357a582b130c2aeee59c8b9f,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb,Tests_passed,5e908142137e70b914a95773bf768ed29f7a7a4392b2931d6ab657de64f457fb 40,refs/remotes/origin/CLIENT-2335-maven_jfrog_repo,ecf123c1911bd8a8a34e86c37c5db16c8cb3f941,716e82739db36725520bf3459383db9b5a5ebf94,1c4b47652f7612c81f3031d8556808f7c71905fd,,True,True,Tests_passed,847c2067049dbe3f38b0049e730126900ec841cf654eb18115dacaa4f166b9dc,True,133,588,11285,2,True,Tests_passed,9b26ffe44cbc79593c2a2a1b1ddde57a384620469cf23e36186b4384bd2397b6,True,133,True,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,ec91da4f2a0813306fe6799437b9637cd1e8b624d5e457532f6c2c70a132c6d9,Tests_failed,8f820f53f7561df5995690fa5938fa86b4bedca1d47d121666ea70da0f6b7cf3,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,ec91da4f2a0813306fe6799437b9637cd1e8b624d5e457532f6c2c70a132c6d9,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530,Tests_passed,494a6769238bd93cb74748a41fe088dca1b6640e47e95a463a11fce71694f530 diff --git a/results/reaper/merges_tested/afranken/jmeter-analysis-maven-plugin.csv b/results/reaper/merges_tested/afranken/jmeter-analysis-maven-plugin.csv index 7f9e444b9b..2a448800f0 100644 --- a/results/reaper/merges_tested/afranken/jmeter-analysis-maven-plugin.csv +++ b/results/reaper/merges_tested/afranken/jmeter-analysis-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,b5d8d8fc2b75beaa9fa6265208204639dc084991,a8efde4deeb7c6826c64e4e4656c99511ee5df11,7ce5946f318da235038f01f43c3566d8f34b3bc5,,True,True,True,17,61,468,2,True,17,Tests_passed,7b3c674776f4d8f8ab18c29f7e304225ace2138b54558f968612c557541dccfd,True,Tests_passed,5025ee670c84f99302eeaece879ea4b137795a40f904569bc0023892bc174d5d,True,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,65f0b7e0068a334206a0ce5fd5b3a9b547cd2f0acf178437e83cd84757e2fa83,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf,Tests_passed,b51ae5dfdf7fc14874d376948450149a78b6fc4ef4fa6a222b4dfaf10bb647cf diff --git a/results/reaper/merges_tested/ahmetaa/zemberek-nlp.csv b/results/reaper/merges_tested/ahmetaa/zemberek-nlp.csv index 1710f84002..0e72e1efe2 100644 --- a/results/reaper/merges_tested/ahmetaa/zemberek-nlp.csv +++ b/results/reaper/merges_tested/ahmetaa/zemberek-nlp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,ef48fdd35bd72c69cff4a320a5df8120bbeb3a5b,034b88a9489b2e8dc5087ae4aa520cb3db624754,049f566e3b98f0b3738f3ac0a105e4c13fb61348,,True,True,True,7,28,85,2,True,7,Tests_passed,0cf0ab9b9b59369eb4a5b89b820d3801c58b4b7de54eb271cbdf748485e5ee53,True,Tests_passed,510ec606793fe4486cc88b6b6881cf743a81017d2c292821a9fa229b2fda61ac,True,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,730120e50d84325588385456906559703515a6e74e860b0b2d12aede5155be48,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,730120e50d84325588385456906559703515a6e74e860b0b2d12aede5155be48,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c,Tests_passed,8c08e31257478f08d0ddbb2098f019744c1be9efc89c8049a52dfd0a0291277c 24,refs/heads/master,dcf5bee7e969cb5716d5f3490e2ca5722690e318,837e0ae272fc50670019de5dcf6453b2207c2ee5,1796bb4a2081cedb2c82ca81a2205640e9de26bf,,True,False,True,3,25,79,2,True,3,Tests_passed,95ace073d911d2a7ae61404c02199f1fb81d116d47bd044a5460e18e2ff2b52e,True,Tests_passed,ed814382591eb25113a1995f80dee9b3ab804db58b06090d0e40e5b236180326,True,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_failed,a9c1989fb255328fd724775d5f055c9fb6ccfc9bb35177e4c97ddc605b53bf65,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,451bcb53671f4d508445ac4bb856c659f6b6c2361c68cef3f2125a9f82d0b98f,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,80f814e3258ffafc79451f36d16c21b6190322da1be71f8a26286d22491bcc1e,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a,Tests_passed,4592204528ed5cae5a156108171e1512317ba9f46f7f0f640b8e9a9c9a83429a 42,refs/heads/master,e497b43183da07131fc2fa7bd4f05b578b3d70a9,98bfd4f46f0c81015918c4333e2fecc6bff20f37,9ec48c53d9faf2a537129f2f28ef0587d4a1ef1e,,True,True,True,21,84,777,2,True,24,Tests_passed,e55724a76ec80ff4608f0b1cb9bf8dc1fe1afa391fd02d6a823b5936a7c27478,True,Tests_passed,fbaaacdbe8389cc6aeafccfcd991c7e030eb034681fc5457e81eef6e0ca713e1,True,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,455600cfff3f218f44a441a1d8bdca7f465780f5724517d6a15048f4082f6c92,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,be29d02eafc007e69b1f2a218d3c6f4446b9d78a49790299202d3160ec80c134,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,e55a8fe45b0c1e1e2c657da2c86f06ea9b0bf1fd0e4b50f135d64fe08e4df848,Merge_failed,9cbb49ca71bd0cb9b1ad700fabe345464ea3e1032e38328307defb8697b97029,Tests_failed,4657a0a5db75487b152ca6a7f4534203f39cb327d4c4c8af65e80e4518200134,Merge_failed,15a300e8f8cde97f13840320f28e068d69614bc33ea55e89ee657b77a7b300ba,Merge_failed,9cbb49ca71bd0cb9b1ad700fabe345464ea3e1032e38328307defb8697b97029,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,be29d02eafc007e69b1f2a218d3c6f4446b9d78a49790299202d3160ec80c134,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,e55a8fe45b0c1e1e2c657da2c86f06ea9b0bf1fd0e4b50f135d64fe08e4df848,Tests_failed,4657a0a5db75487b152ca6a7f4534203f39cb327d4c4c8af65e80e4518200134,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,455600cfff3f218f44a441a1d8bdca7f465780f5724517d6a15048f4082f6c92,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a,Merge_failed,aab1c551a0e703b800bcec18d69fc77ea8835f52a4958d8587e31e64e09d450a diff --git a/results/reaper/merges_tested/ahome-it/lienzo-core.csv b/results/reaper/merges_tested/ahome-it/lienzo-core.csv index 7cb381e8c5..08904a4fa9 100644 --- a/results/reaper/merges_tested/ahome-it/lienzo-core.csv +++ b/results/reaper/merges_tested/ahome-it/lienzo-core.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/2.0,ac01904309c648db0e7506ae380d3a98037b1531,f96c2fb55256f1a54953cfaf41e40c6365120345,e8f7e68392d2fe629ddbe066a1858a849b3f6ede,,True,False,Tests_passed,0eae40a3728a6faf0aa02c1249f2eec1fa81c37478e5180394161609b81cd32e,True,6,16,48,2,True,Tests_passed,cb7f8b5f17af41014ca514dd1ea21b63a6f0fc908f1b850f6e8eef259736c0bf,True,6,True,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,50d65b8c77863034c4918af46fdbf8a04ee221784fe49da7b3542f3ae7e7df4c,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,50d65b8c77863034c4918af46fdbf8a04ee221784fe49da7b3542f3ae7e7df4c,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,33703f681715c6d04f45ea98ea8e20388604bb5fc0896b9548aad2acd8a717f1,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567,Tests_passed,e2a5502c0344ac8391ac0d266888a6cabbc0309112b538899b505e927d5fd567 31,refs/heads/2.0,bf4b253816bc316cd6dc5437f7ca25f35f591863,9c20b62e512757f686df15a748caa633ccf0cd88,c4be5cb68537dd419f2524786e41404f422ee8fb,,True,True,Tests_passed,ce70921e19a3f1dffaa9a4963a8dcdddacf62da1c4e8cd21687762c526a66be6,True,39,421,5543,2,True,Tests_passed,b07213c428a3ced1d96428b0b5994a5a8e6fae59332b29e48d1937e72f556e2f,True,39,True,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,2e94eb5a514ddf767d93202f98931ff7f59166d40472f60eda60de1d2ee29965,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f,Tests_failed,d5db5f0307bb20368f4a2ee7b194aefc9b12852e44448c64ea6f8d805eed4a2f diff --git a/results/reaper/merges_tested/aleksandr-m/gitflow-maven-plugin.csv b/results/reaper/merges_tested/aleksandr-m/gitflow-maven-plugin.csv index 4600605aa6..28203a35ec 100644 --- a/results/reaper/merges_tested/aleksandr-m/gitflow-maven-plugin.csv +++ b/results/reaper/merges_tested/aleksandr-m/gitflow-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,7482fdb5b64c2210fb5eadb5f90fb30c9163e517,c0b13b5d71779c30994d585ac6b01f7c5fe2d6ec,d2dfaebb57d6ace09903ff8c7e9cd9c6af27100f,,True,True,True,30,60,344,3,True,32,Tests_passed,931b92cd55bdaddc1b62a269eba8f797fb411293b016b3895180df00f10a1c23,True,Tests_passed,134620d9f3d65f31e3a7eaee4b462b6e928cb8a9460d0dbdec00fcd9788da977,True,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_failed,9ed675fa9d95d09286874cc7cefb216cc3124ec8e4dc267c5235829e9e6ab209,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2,Tests_passed,70592c5e24227022194c4729c3c9862f4ee9be26ed7a438c7c1cc620942fc3d2 9,refs/heads/master,1c97e42bdefdcad7659d10a64fd7e6048c3c58c5,637c6df72e51b2ab624ef5987d4eba926587ecd1,f3492cf0d2a9f7a470a1e2ddc06257151e5e96ae,,True,True,True,112,369,2734,13,True,112,Tests_passed,33d15881d2c9712f23bf213f7375ff5b33a2b2e44659801c3cad761de101bb5f,True,Tests_passed,3805c28a3044d25db3476dd51cd03c6444795749e9c8f35d7947aeba09e4f2d3,True,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,dd60c8b82aee3fe6bbd6c539143b4e7c7a4dc0a9f00f28ad86c8fa139b237ced,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,6e989e6121e8f34d26aba5e01cce60cd8c1174437385b5576be1fc940dab0b18,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,e50d1da0fa7d883a5d5faeb71656f4bb967bdd5d5b12856b5ed1e3a3f6a3f572,Merge_failed,f701bc91605f1f4ed45a4632ddd0ea5a12c537368cd6d55f7d59764bc7ef1038,Merge_failed,e9f2d814f55cb51d36bf3ef339c28ca1f75fdc5853d5549e2e5e0bebc8748953,Tests_failed,0a3df58f8ccdf08ec09d206a683e84e8af0eb2d22a9ab3b73497b2dc6b224470,Merge_failed,f701bc91605f1f4ed45a4632ddd0ea5a12c537368cd6d55f7d59764bc7ef1038,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,6e989e6121e8f34d26aba5e01cce60cd8c1174437385b5576be1fc940dab0b18,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,45b14d2a14f211ee2624fe8eb6c60a156aaa4bd5cf3696b7af2c7c91ddbf21b2,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,dd60c8b82aee3fe6bbd6c539143b4e7c7a4dc0a9f00f28ad86c8fa139b237ced,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3,Merge_failed,b220fc794574046a4fb5db73ee39e57e08cafdd01f813bf8dc9882ca455debf3 21,refs/heads/master,b54f0d5c8d960b6069ee6c69abc616fd3e42cb6f,304505cb77bccf51f71641c83be4d8433d52e9db,7fd4321e387f0f666aeff50fda38664ba9f0d683,,True,True,True,19,24,345,2,True,19,Tests_passed,655803869862d3d37f52ff86aca352307d9686dfabe15ded8f1617b18c0f99f4,True,Tests_passed,05eba7bfb74562aa8e4426af872ee0788e9cdacf3f48b231b8b025b8fae232f2,True,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_failed,2a2a996ab1c88dee0b83cfa9edfbf7e5d3aa0ff213d36886aa108a0c58bc599e,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da,Tests_passed,8a5f20872c6df2a11100c70d708a96c73e877b8c27ba66232dc67ee558db06da diff --git a/results/reaper/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv b/results/reaper/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv index 106e3f41a3..29667c5238 100644 --- a/results/reaper/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv +++ b/results/reaper/merges_tested/alesaudate/kickstart-springjerseyhibernate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,feb36bfc8ee3a9e0d4394ef8e845a97c8c489840,daf63b4a8f05792b6c0f530445dc9238b83ed136,f9c2d45541a4c000039e68f8f4cf23dec19efc8d,,True,,Tests_passed,829c333d86eab04b07bdb6004aff20a4904992aedaca3f8e2a60b1b86ef5b14a,True,15,40,,2,True,Tests_passed,52bd5a2eeca2dc99be68d4cc0639a7878f053159cb66dedff9a978108a9aa6ae,True,15,True,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,6fa4425a207d7a60fd6f4cf8191feac7ca4ec501ae4d64426766a7268aa7e207,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,26edef49b09c33360a2bc727f60a6c2147771e4b44de3eecb15528a30e6e7f32,Merge_failed,66314956ab6d4cdb0fc8d013394b9d5178b14e58d0eceae533181b48ba41e15c,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0e2b0ddd3ee3740b8ab6347c05c883bdb0a82bcfd2d9b5eb3f6246f2f5ad3262,Tests_failed,6c19d927d86bf709efe0ed5d75cd9f3182297a3d56e942c7c0a3b38519f85b49,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd,Merge_failed,0611db1a665718fa9c7fc371f2d31b1ca6c4249dfe8448c130575e036bb3bedd diff --git a/results/reaper/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv b/results/reaper/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv index d7ac77deb5..5f0e0ebd72 100644 --- a/results/reaper/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv +++ b/results/reaper/merges_tested/alexcojocaru/elasticsearch-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,6c23c6286d649523f298ec09a2b4c0ca16390d80,a2a9c8c379f039a27fbbd2155d1ea1c437d12973,d43dad41a0f0c2fc7db7bcae6998f269e29f40d3,,True,True,True,10,19,91,2,True,10,Tests_passed,47ada1adc79435beae737b665437ffe360d46959ea92464bc5849a8dbd05307b,True,Tests_passed,80198a2ac49d65f5b42c2b1bef691482c4b077add17b82139dfb98c2964b3e50,True,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,c471a85b83237b9a20a9dddfa66c56cc0650a54cda98c931098563dc10a0341d,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,c471a85b83237b9a20a9dddfa66c56cc0650a54cda98c931098563dc10a0341d,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf,Tests_passed,affa6a911e347a1cee66f598a0790fee2ca47c445e4d9bccfb7bc550e0d9e9bf 54,refs/heads/master,690d8dcc2e2b230c9aa4c5484f74ee56fd7ba029,56a03c07946d9e1137c25c34b561f269a85682b7,f9c65f30b453deaa676db4d2f40a43a61f237a16,,True,True,True,103,168,6423,4,True,103,Tests_passed,53fc56880a65ecfc2ddafcc027eb7040a993b64fdf36ca0154d26697fb8cb7b6,True,Tests_passed,f67be7c2def7ff51b5a974e2670e3afc7250b6f25a0daa39f159acbc3674f211,True,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,c89501900b6cbd0f1219843732848511f0ed9eb5f5e5233616047cfda61a9daf,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,b5d87b24fe0d0536e8afbd4f0f3955888b3a87e656f09ab0ddf5f64dd189ac22,Merge_failed,e473107fa14778cbe07ae7af2c8de0a693b18db551b786ec071c5b742a2836c7,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,23ecea7eb3fabf3a8ce9c5c62521f9d8efb94ad79b6103ad609c528197a51846,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,8960a3dbaee15dd74a578c2c74375273c228fad8db78ac6a99e1688d59b709df,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,00262d6a1175719ca07ada0e73c3b36f084a42365b61696d0d9c0fd607d9f86e,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6,Merge_failed,441f135664f55599bbbbd0751136dbf1d537387ad067fde0b13f088ec5f432e6 57,refs/heads/master,80a84ddaaedf4d73d3e2a4a952dea3593b11d4a3,aee18e6430e21995212686495d4d1474df166a74,e6cb1ecd323a1c0494779dc007fb213f7af82451,,True,True,True,8,38,323,15,True,15,Tests_passed,87cea9606b8d03e550beb2e6557d9a59827ba0d60cabd9792ff9e43de3713b79,True,Tests_passed,27873444c1f487ddd0c53184fb7843c2fb6200549ca1739b13f376461aceae3d,True,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,f56b4246e95985fbc26bbf333ef565176dc2b710d25f13da5f8214fdd09103a5,Merge_failed,7e33f15ef6889f632eeaf3ddc8968e19cbecd993fba555a2636f0dcacde11f77,Merge_failed,193212186e98fea960141eda677b6ea5d85b1b62d2a6d7e4750677807fa33892,Merge_failed,f5033a3ff83f2102a15eb52dbef3600cc51f1825f0253045eeabe94a52ba492e,Merge_failed,7e33f15ef6889f632eeaf3ddc8968e19cbecd993fba555a2636f0dcacde11f77,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,c118c154a1f96b2c08aa8f6e40460d527fb6b2dc3d0b0dfe838719adf6387290,Merge_failed,2280ff097d9cd89fffda91c382f237dbb874ba9bee1731cb3ca2b0ca0c697357,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,051dcbd9f2ffe7694f4e31d9105e96e39e02ab703ecea8e6847547ff303c4bd3,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37,Merge_failed,472c48424542e9813fc5a81017ddf269607b00ec78b479784debe5c9bf0c3e37 diff --git a/results/reaper/merges_tested/alexruiz/fest-util.csv b/results/reaper/merges_tested/alexruiz/fest-util.csv index 8d5a85e985..ea9fb63aa0 100644 --- a/results/reaper/merges_tested/alexruiz/fest-util.csv +++ b/results/reaper/merges_tested/alexruiz/fest-util.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,ec150f8c4420dbd9d177e880e96f09dca7f35f30,7013ac26f4e59640d2a1b1a56b0f03fd24bc86e2,3c3d01351f4149a749f8278423ca5d8112b18102,,True,True,Tests_passed,833a91462a1542ca9c479413d57c31bd9012625e7f9c8ea1506ad968ebda264f,True,72,482,1751,2,True,Tests_passed,f7dffb843a3421008bf85a098c2b6ae72c7cbc511a41086a51a21a1e9493ae66,True,72,True,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,2eb744e157f3b798acf692b63364a4f63b2638945ca9c769dcc6460235e5abc7,Merge_failed,3f70addfe526a403d8ab4914440513ac294cd04a8844e2785d3159ba2bb1a4e7,Tests_passed,44d02e20800f7d05d904989c32e840c9d18400053678a11e6d5cb9dbe7fb6f92,Merge_failed,505d3e96a238d37ad6dad65e53c5f41130d1530a987795a8602ca72e5fec2098,Merge_failed,3f70addfe526a403d8ab4914440513ac294cd04a8844e2785d3159ba2bb1a4e7,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,dc10dd566d9afb843326e8b91a5772dd83e69cf5c3b1245241d263d8b57be6d7,Tests_passed,44d02e20800f7d05d904989c32e840c9d18400053678a11e6d5cb9dbe7fb6f92,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5,Merge_failed,738bc0b6a561f4465f378837a7ea179282c26ed3484af90c7947b25b400f77d5 10,refs/heads/master,3c3d01351f4149a749f8278423ca5d8112b18102,06f36741ee79cc5ed52de5ff4abd7ba2e676a40a,e95a95aac15a74c43627ec042c7a87bdb6852b9b,,True,True,Tests_passed,f9eca1f111e34587fdbf9e205daa8b08deb0dd575e934f26ac783e2561d1e199,True,19,83,452,2,True,Tests_passed,ca81b0f754f0d863f9395ed9304d5a041f5337275d61814628ccaa0719226661,True,19,True,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,3718cc6b0f38a1b20728c584984cb8f38a1f9419f841efc7035e3eb3dc67fc47,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,9473c23548c9422912b5e1fc1c2436a7692fd9efa67c23e788bfc0b3a780c3ae,Tests_passed,fc9b8709d36c31710bceb8a395d07c3a9eeaf6d3656e5fc313d38a8c01c372a7,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,9ee5dd5bd710b6ca9fc0e25e5520dda6455c946b92b9314f03d73ad511dc0a23,Tests_passed,55534f605b8867d1c18c272f5f2ef1d72fe309c9a5342c6da637a742d25c81d5,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71,Merge_failed,f54f3002bb707dccd4c25282b8f69c8ff46cd74a551a3d132848566dd27c7b71 diff --git a/results/reaper/merges_tested/alexxiyang/shiro-redis.csv b/results/reaper/merges_tested/alexxiyang/shiro-redis.csv index 6fee02a053..cae61f995e 100644 --- a/results/reaper/merges_tested/alexxiyang/shiro-redis.csv +++ b/results/reaper/merges_tested/alexxiyang/shiro-redis.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,056ecf1dff7084af80617c6fe856497ec477fc22,34d1af0961cbe89b28480c8c6550898621ad01cb,234a7ec09972609aaf89da8c78aa677add3c55ff,,True,True,True,4,7,14,3,True,4,Tests_passed,4c7b133d48bd496a5e9a2ef3ec1d4f4c16a1ff5846997aa39917092634e208cd,True,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,True,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,e283a73b4ebdd1e17f73450d5f7b078fc8427d7caa9a066617db97723e7d2e47,Tests_failed,22c9354950b372763e6a1f47466ec6f293967667a597c48e5142c8e6ca977056,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,e283a73b4ebdd1e17f73450d5f7b078fc8427d7caa9a066617db97723e7d2e47,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7,Tests_passed,d4b84f8d1885fdd0905a01e4e91f955eb8e73cce8660f5d9dd42655fc4e718f7 20,refs/heads/master,234a7ec09972609aaf89da8c78aa677add3c55ff,fd8a94fde3f6f4ca24d848ec013f71865ce9218d,ebd16b97867db297230fc5b3e5dd08c559144e6a,,True,True,True,16,101,1012,3,True,16,Tests_passed,79ee8e9a29237c205e7ffdf1c7260b3c64450bde5940a840c0258afd36f51fae,True,Tests_passed,d70087d389678cee0425fd419227cca89280f1c07fe7727fdaa2a1a55ef1b8f0,True,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,1d2b7efa0df3368dbc7132cc8dd60163ded6f43eca0f8da45158f07a9b50e43e,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26,Tests_passed,54616c312c6583f1c0e6f1eec47d5a9272495e7faddb8dc3a767199a5d26bb26 21,refs/heads/master,0f0ecea024252dcaad14f1891f49bf96fd8e0e0b,71ca8a9c7b72f9405d83ffd3bbc4aaad40539663,2f217aec62bc9f46ef4d4f1f43bb0e0d75ce58da,,True,True,True,5,48,127,2,True,5,Tests_passed,53047e409056032e48933f721e6075a329d9dc0affed910bdbef3cec62032bce,True,Tests_passed,28892ce247decea4d0e0721773e9f22436a7d22259c1ff7a804384fd81dbacbf,True,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,a9cf9579a9a4c49c382b3d980afeb3b57844366710a32d6842a5eb13470d4335,Tests_passed,941c2c38f84064edbde7aae719ba867fae607da824944a8eda741359b286e951,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,a9cf9579a9a4c49c382b3d980afeb3b57844366710a32d6842a5eb13470d4335,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,878c0f3ed7f8b4572fddc42dd9f7e5551f233f2aa6d56e846ed55537645356ac,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9,Tests_passed,c0a32494ff9cf15f9422b4afcef91b361e897a7f53e687d8456d15ca54b91cd9 diff --git a/results/reaper/merges_tested/alibaba/canal.csv b/results/reaper/merges_tested/alibaba/canal.csv index 685023629d..3770a4eedc 100644 --- a/results/reaper/merges_tested/alibaba/canal.csv +++ b/results/reaper/merges_tested/alibaba/canal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 229,refs/heads/master,4fe6c36c499ffe044d50a9ae1900427433797e4c,899592ce2a18f2787ae1adab4ff5347aba769845,9e3d4a7ffe5371557d79de1899fb68152a1a1d83,,True,True,True,92,159,2624.0,10,True,92,Tests_passed,89cd045707ea84c057fcf47629e626baa8b4c4300d50cac256cc1fb06ca09ebb,True,Tests_passed,a2dc05d4bbd067dfd95e89e028dd5805833451df74a4e2e407255ef7378351ba,True,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,bcc147fccfa3cc6329e214668606a7000d1871b5df9790d3a70c30cde16379e1,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,bcc147fccfa3cc6329e214668606a7000d1871b5df9790d3a70c30cde16379e1,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5,Merge_failed,fc526d01eeaa0d367a4097a00128fae66be3f2a1bb84423d472f7fcedd6daba5 248,refs/heads/master,68d8afae3e9cb4c21c26b3f7c291759f0c9e7426,61c7f7738d33dfb6bd939c3a4211caf0ce86e218,9e816bc48f9955f9e2839873993cef9627c2f389,,True,True,True,42,123,2293.0,104,True,136,Tests_passed,adb0019e4c986e531fe55137f6d06697b46a4ce8b29f02517c2e38382181b0de,True,Tests_passed,23a987cd41852b0dec64796718d0a4c99fefbb00f0ac9bb912c79325cbaba56f,True,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,f8c893d28b0cd9b6eec17ca6fefa13c85ed431a4009a2bbe1957bee2b413b06a,Merge_failed,659525c6f96d60516cc258126b3aa00e834aae1203f88f7639115adbc13c28fe,Merge_failed,827dd2ea39f202b867883a6190d71eb31b63c403aae0648b0592ad3ebc8c6782,Tests_failed,5c3e659f3346cc06a8a94a1506d2498e4cae6238eb50b7367ac1ec85ad912857,Merge_failed,659525c6f96d60516cc258126b3aa00e834aae1203f88f7639115adbc13c28fe,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,9f6e2fd7e0d0fc905ed260969e4c42cfc99923806925cac35881c4e4b60027ae,Merge_failed,827dd2ea39f202b867883a6190d71eb31b63c403aae0648b0592ad3ebc8c6782,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,5142a47cc74003975cf93e7c89e3dfcabef5651175b233d59cd9143bd7116eea,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973,Merge_failed,09a85d6e0cb61ae723f87c3ee9dda88ac23266f51bd809febace9042ea1aa973 250,refs/heads/master,b1dc5bd59f66fdc6df0dbf449d7b9eec8c58452c,02868d8fecb50e445d8b624ca70b25da36cda788,23f7b3b5d82c3571454877e32bc6f5bbd020b4c2,,True,True,True,183,1354,27749.0,6,True,183,Tests_passed,41ae054da8f10862135c8b359d27530c2d5cc8aba7a31046b0c745f7a804c9c0,True,Tests_passed,1349a5494ae220a2c938a2a9ce3ee272465e7f2e16ef60a0e13f51c4a7c99378,True,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,2ef170632ac2a53a693f3cb03dc9f20171c007fc95871de4fce2ad0e02336130,Merge_failed,e527c1c1eabee1a4529fccbb8cc064309d6749269c654608a0c2316baf915049,Merge_failed,29cb5d2f6f2d3bd42bcfb90c405123d4fed20d54bd9ee9a65cecdbb5913306b0,Merge_failed,a5e32df929c17b53b9d284a9dcc74b72981c878cb96b684ab6c56740bccc408a,Merge_failed,e527c1c1eabee1a4529fccbb8cc064309d6749269c654608a0c2316baf915049,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,35501881836d1ecc357d239d19d7a57e7bdfb524d6b22db58ac1c318b824eab5,Merge_failed,6109ea7b53030c3954d844db6942db2e036328b460bbd9eba7f295dde5dd3be8,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,574746c04fb66b7953f6c5d3000ff410a99faa88d9d92b3a7cd087ca379e4fd2,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25,Merge_failed,d9ab014c640985c4d26cfc8f4d31709f3497a9c282f5f011ac6114f5efba0a25 diff --git a/results/reaper/merges_tested/allan-huang/remote-procedure-call.csv b/results/reaper/merges_tested/allan-huang/remote-procedure-call.csv index 6f7e6f8556..17eaab3be2 100644 --- a/results/reaper/merges_tested/allan-huang/remote-procedure-call.csv +++ b/results/reaper/merges_tested/allan-huang/remote-procedure-call.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,True,True,True,14,46,139,2,True,14,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,True,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,True,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254 diff --git a/results/reaper/merges_tested/allanbank/mongodb-async-driver.csv b/results/reaper/merges_tested/allanbank/mongodb-async-driver.csv index 58f6939c95..15fe3b1f87 100644 --- a/results/reaper/merges_tested/allanbank/mongodb-async-driver.csv +++ b/results/reaper/merges_tested/allanbank/mongodb-async-driver.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,81bedcbc10519b605deb41ef5b29ca78d17d4544,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,d60feb648a010c457b811122bde1eccd800dc3cf,,True,True,True,91,331,7744,4,True,91,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,True,Tests_passed,61800cedd2f345380aa7104c8c5df70b18762f4d942ae8fcf9527ebce00d6ee7,True,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,9eb8fdc3edbb67b37b39eb32533230850a255f5c00aec7ccfa1c1356485cb5e7,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987,Tests_passed,cb772effd26f636a81c8a4d5c06179b87dbf76d2bc8a218f81bc56d7447e0987 5,refs/heads/master,baf4acb3db8ea9d40b142d14a5342d3e81e9104f,30dcedbc589374c4c2a6298028e1fa3cbb3ada94,8bc382834511fef08de9cbeb20bcdb801f963287,,True,True,True,81,196,4650,3,True,81,Tests_passed,8cbcd3ce51889cce90fe5f7c54e2dbb228ce8a9f961930aea7009bcbcc491f8d,True,Tests_passed,bcc579eb6afdeee5aba3b298728edc35360497ed164b043bc913564079200032,True,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,a087a04d112f963c1ace88f95a8929be694b121b9613538fea622f764fd3eb3b,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,a087a04d112f963c1ace88f95a8929be694b121b9613538fea622f764fd3eb3b,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857,Tests_passed,b152bc754d0ad105de54059bcab5f300b2bf1a4b50ae1cc371fb0ce15feb2857 7,refs/heads/master,fad5b54783b500f5cb8039ac62f2504373da2b72,ec79624b161581f95f1832483b2e3fa85c1e8e28,17cda465b17c34c09ae6e1e3679a76cc70b9b4a9,,True,True,True,69,186,3857,2,True,69,Tests_passed,18d20fc6c154e1186125174e6b6552813c41f6030a7287d3da71b487738e9100,True,Tests_passed,f6ea1c519425af208968a7067c59211839e8fbe4623e29d46c9dedcb61f03c3b,True,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,2f44b627fc124de49e44269998a6026c58675205215393f6f032eee875f0eddd,Merge_failed,de4249445ecd057e9b2294d7b75af31cf1b1f595b99418007783270db39ae77b,Tests_passed,70c4a9aba83ece7696f826435dfa3de5f183e8b2acdfc90591b60b245a843f2e,Merge_failed,f292b3166f011a946d6977ef200d549227299a39bb62d5362ff5afd68c0b9afb,Merge_failed,de4249445ecd057e9b2294d7b75af31cf1b1f595b99418007783270db39ae77b,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,5a82d372ec6d4694fe3883a0251c24f3fe13d240f39bc0713c7618bcb5ff8935,Tests_passed,70c4a9aba83ece7696f826435dfa3de5f183e8b2acdfc90591b60b245a843f2e,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31,Merge_failed,900bcd648daf721b502b4ebd91fae6fde52bc9120540686dec76b8c194dbac31 diff --git a/results/reaper/merges_tested/amplafi/htmlcleaner.csv b/results/reaper/merges_tested/amplafi/htmlcleaner.csv index 9ae78e762b..f75590492e 100644 --- a/results/reaper/merges_tested/amplafi/htmlcleaner.csv +++ b/results/reaper/merges_tested/amplafi/htmlcleaner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,5b1e2bd095894b31df3f14834a1d2df1da8bd203,70ed05ffd628822930987f1d43ca03ea2cd0881d,75a6251aac4918ccbbb59b52d5b85de3620bd3f6,,True,True,True,32,290,1968,2,True,32,Tests_passed,ca82ed754a52ebf432c9efa52fa4081a4310558a7b810a9fabd437157ada203b,True,Tests_passed,92d0ab5408293c8bdd89f456643bab91aa2fadde5626be494648cc103d31c3c2,True,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_failed,423fe0cc9c0c29df897059304f38fa22674adf39ad0c4e96c4a57f56a0fb271a,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,57d1c7ec81a36cd7944d86fe5b886e4ef9477c225456cb3e8431302a8c4ac622,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,dfe8fd7c8669c573f5814b39ca9702b48a6e5ad8555994d8986cbbc850529fa4,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80,Tests_passed,e355e8e04b84360f1e0c09c33c81c7b216974c087d73a97035afa72633449f80 diff --git a/results/reaper/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv b/results/reaper/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv index 96d247d375..3b70804e1e 100644 --- a/results/reaper/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv +++ b/results/reaper/merges_tested/andreaskl/springboot-angular-atmosphere-quickstart.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cadddbad17de1526cd54f53de4a0c633acb328e9,c5438560f54b525d3e1a8afb9fc4efbc6db9806c,ca84722195aac40f62ec2db5eed3eea4273a6ff8,,True,True,Tests_passed,afc2fb1335920e6cf399aaf2bddc8abb09b870393caefeccc2b2f792a343923e,True,16,42,4014,8,True,Tests_passed,681deceb3f1d91429c54cf81c807c924f7e374d6e2351e0aaf9c95a4d614ff95,True,16,True,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,e5573efae466ccc37ba93824f6ae7c87fa318908b9bcd9da0ca7683c4f3c1d93,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,1396adb50125b234604d4843012ded79f250975391afab4676df25472af57aa6,Merge_failed,aa769c067b9a1d5a4da3386fe8911ddbaa6bc622ca43e1d22919b83e71ce296f,Merge_failed,90db8dba25ac0a7fdad4affc362ae95ae98a39df1f18c74bcb77ccdb1dee568f,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,a3468ed79e9f670af8607dcd657fcbb13f65a9e29161e4ca7a0c5d0581e641ba,Merge_failed,5b7faede93576782b5377b0768203f1933838b62f73ffa2d7ee85b41b7b2a4ed,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,974a2709afd3057d1f2394d0bf0be8f1b44005d96627b795d28a4fea48d44676,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb,Merge_failed,5b5c92bb30e8f37ca0d03b3a6ad06f13974cf723116406d32fa524012c56b9bb diff --git a/results/reaper/merges_tested/andresoviedo/google-drive-ftp-adapter.csv b/results/reaper/merges_tested/andresoviedo/google-drive-ftp-adapter.csv index c9319d24e4..64a345a50d 100644 --- a/results/reaper/merges_tested/andresoviedo/google-drive-ftp-adapter.csv +++ b/results/reaper/merges_tested/andresoviedo/google-drive-ftp-adapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/45,7046a248be867a7bfadbd2c29fd9ef86c3cca54b,d0a2be254d0cac3cac7f989fa63614219ebee200,0193b2d43121b281e79b77bac820b46f6619de3c,,True,False,True,3,5,45,4,True,4,Tests_passed,ba31b3912bd8f0e88cc8896ab18c819ba2333f1b10d99c7cd38c3ca981213529,True,Tests_passed,247d93dc036dfbee14662705e443c88af623211c07b229f29d7a61c7de33d927,True,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,aadf2b6538766a44b8533fad3730cf113cb983564618533d1f942129f1364b29,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,0ceab100f5bc1fb0502923b0880f011e844f65f5ff4f8b01c55e69d9d5cf2c1a,Merge_failed,fa419cb44a7652398c4700fda6edb72273d7dedd818148845f73908b6b8de2b0,Merge_failed,d4cc286dc1f93c27f0b2012ca041cffac124baae68a8124752ed6a58c9c86e71,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,a124089abf6ac8f663cf7adff7f1b23bc0b96d8efc5a7ee9b7c631f57fe72def,Merge_failed,efd6ce716da6bdc3eedfaa591d18fbd4a1433c82d632a4d587274c014b9c5d7e,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776,Merge_failed,c363e38030be7e1b03828e1d0334636cbd3f3de1ce1fc79eaa53e16924131776 diff --git a/results/reaper/merges_tested/andrewphorn/classicube-client.csv b/results/reaper/merges_tested/andrewphorn/classicube-client.csv index 56244bb586..a2a3999d65 100644 --- a/results/reaper/merges_tested/andrewphorn/classicube-client.csv +++ b/results/reaper/merges_tested/andrewphorn/classicube-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cc32a2554eb5fac5492e7eaa7dcf1ca121b35012,84bf151168576bfa61dc0cee6bd09ced1f10b9f5,9f682a7ed6759e77374a0beb40e3182fd7cf7e83,,True,True,True,20,32,166,2,True,20,Tests_passed,857bf5f828f870e83eae7ce2249622e8b8a97d1dd242e4aeb75a75da30bb8e6b,True,Tests_passed,1dd16ab12f1a1f179b47341ec4b5ad6a6baefa51257f01a3e0ea3f2d3bf5b241,True,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_failed,17f21dd81baab93f2408b87df1948c8ad7471d1256d219a0f4ce06534b3c7099,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,af36e3fe80c4f9d1ffca67199eec05c1fa35e7618db40beedc9940bc6d01c54c,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3,Tests_passed,dc877f6acc534c5b60c5bf55ea482191bd0b76822c796b175b00bce0cfd628c3 19,refs/heads/master,64bbaac8971625a7bd7b46da9bb1091cd4d49e90,122887b8405051aaeef9823e112b39e71880d240,8f79bed3a185f603961c17378e60c81d7cbad774,,True,True,True,11,74,461,2,True,11,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,True,Tests_passed,9d2c86c513253f3afb6b6a8ef144c04206c8109a05d9d1d1a7c96c904e4d5624,True,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,219093ec22ed77ddc18fb07b9c42a24b257861bf93f6e656055fae4013685a93,Tests_failed,f5034a9ef640ba479ccdcb53e58ad7f35387d5ae452fb0ff1250e2b159ff83f9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,219093ec22ed77ddc18fb07b9c42a24b257861bf93f6e656055fae4013685a93,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9,Tests_passed,e5676809749d57a9f06f789f5063f569543f06217a676f507116d266ffa41fe9 21,refs/heads/master,423e913b966e398d2f424b491491f4fa7977dd25,0502c301ab9717cdb22af9aa10634604606f4b5e,2d3765b36fca01582560a716d09dcf0a66b618f7,,True,True,True,10,62,636,2,True,10,Tests_passed,323d0e5d6cf52668ed64b270376699035479c2e46f65c708d4bc984ad1de48d1,True,Tests_passed,3dd94cb991508fdb09bbb09744263cd44428b2c6db8534ebfc682ba392034fd6,True,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,7cedb3d943bf593d9eb5047aa8d20549a67562ddaed831f82ee0cf5d62084e45,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,7cedb3d943bf593d9eb5047aa8d20549a67562ddaed831f82ee0cf5d62084e45,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,0d04a44981da311e63207511fbb8de6a4c10f8fa9bd9ba96ebc9b332ad972e8c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c,Tests_passed,169c1b7b72ab013a48fb296717563f82a99fa42351b93ee3fa1512365157ed4c diff --git a/results/reaper/merges_tested/andygibson/datafactory.csv b/results/reaper/merges_tested/andygibson/datafactory.csv index a4b7efe584..81a1217a4a 100644 --- a/results/reaper/merges_tested/andygibson/datafactory.csv +++ b/results/reaper/merges_tested/andygibson/datafactory.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,1d4a47b045ee2c13820416dd60773690f6093e62,9ce0ce8f79c37a97461cf79d032471b5183e0d34,11f6613d23702cf7280d66129478bcd917d561ab,,True,True,True,6,9,331,3,True,6,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,True,Tests_passed,e97a2256dfe1f376dfb6e7b30f61157af83de4f3295bffae65a5a3f51bb3880b,True,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,a332a8c1b78cae5b6c2cc929a757877f86e3386b3af40645d61b8044431da7e1,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Tests_failed,58b5d34278d52caba6cc75a593c7796db7cea203292308b1d1b7d68ebb45120c,Merge_failed,4ddfc7d94caef56b6f386500790a78f06befade0b2e86063e2960d5867fce124,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,7bae8c05b545c80d74e6eae6340604cf364c85cafebbf1fb8c9510774b465199,Tests_passed,c1878e1b12c1a5d37f22b88401c906535e884e4fedb922c86aa46c56a1c83c17,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,1c6f7b1af0fda36eb24f4366bd1a854b8f76303b87d0c80044fe17083c98aa93,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3,Merge_failed,dbc9a569d77330ffd2b92c4fce5e1a6e2894d13a48356fd29ccba69248ee56a3 3,refs/heads/master,9ce0ce8f79c37a97461cf79d032471b5183e0d34,6220f33ac428c08674fe092482fa53ebca3fdb8f,16b2951895532a5044a71f0d172f22134d9c70ef,,True,True,True,3,5,62,2,True,3,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,True,Tests_passed,0f9b40732c1bd906e69dcd9ee0538ac0cd17ed89afa0d436974620787ab98f67,True,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,b4d54f368a19464bdb0406eae9e06f24d890c4446d575c8e6ca0d35d23f826dd,Tests_passed,5e09fcd93dfd7583bc82df63b0f6435ba543bd9c53e45aa5f98b617e363bcd4b,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,b4d54f368a19464bdb0406eae9e06f24d890c4446d575c8e6ca0d35d23f826dd,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3,Tests_passed,9e0c7676c1f549090ed3348c938280c8e12b6a66d0138662e3081ae44d66dcb3 4,refs/heads/master,6220f33ac428c08674fe092482fa53ebca3fdb8f,1d74d5ce77557bee9093f21cfc39489f0928d837,16e2b25f1721a2134b1c9539a608a0b396c6253c,,True,True,True,6,7,312,2,True,6,Tests_passed,ce1170d1df77f350625f10a6fee4cf1ab9dbeca8f39a50cccc01a002afd9082e,True,Tests_passed,6dd1d0560197f9cad5234e307a9622f98b9042546b4de596975a3d036f60ecf3,True,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f04374b72d953d385f976b395e824da7d13bb73bc84e15c98200334d3986b54d,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f04374b72d953d385f976b395e824da7d13bb73bc84e15c98200334d3986b54d,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55,Tests_passed,f855f99ebdf7c7e8369ac4278c598397a5ad632f6e0868552bd247a49ce68d55 diff --git a/results/reaper/merges_tested/anjuke/hwi.csv b/results/reaper/merges_tested/anjuke/hwi.csv index d0a3837394..8df8ff7675 100644 --- a/results/reaper/merges_tested/anjuke/hwi.csv +++ b/results/reaper/merges_tested/anjuke/hwi.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,93f975a6d0de030195150ffe63a9548de970d20c,50640ee2a825690dd1783887f8a1b32c2a0c4edb,94766cb0d37279e1842a9bff4769c366bf43e699,,True,True,Tests_passed,d46c25a5e4b77929903b49247fc82dffe524eba72c0a02b99a416b316af54f2e,True,7,33,191,2,True,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,True,7,True,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,57bf04d005e4d2a86baee3ba792aca9fba6ae98ccf56ad56029124387c84f484,Tests_failed,c5bd42890931bf6a17244c17e9f93ec66d68d9ca5b37227dfb1b1dc7a5d38870,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,57bf04d005e4d2a86baee3ba792aca9fba6ae98ccf56ad56029124387c84f484,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f,Tests_passed,8607d64bbba964a48832ea6da2fa302bccf5f4d6490b1eba4a35f61a54dda66f 5,refs/heads/master,94766cb0d37279e1842a9bff4769c366bf43e699,73c71cfc99f805ee178b5930e5d8a8adef6c3a1c,9340c5c00c8e261f1660113ef522e13229b39db1,,True,True,Tests_passed,5fd1fa7875970aae4d57cda371e1eae1cdbc124db213a7378d069062a7267607,True,7,34,193,2,True,Tests_passed,5e5a2dd5029029038841e7e40b11809075b3e6a536020abfce013374dcd5a817,True,7,True,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_failed,aec70c98dec34787e9a3f8e63ce283f201c288a5aa0cd79321be4fcb939464d7,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,80007160443030e7436fd62385dbf5e8b5fb615d6f38ae73bd39522223e350ac,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541,Tests_passed,e2113d0e5ab2efec779c3a91491d56ecaca559e4b12e94eb3f8da3611f4e2541 diff --git a/results/reaper/merges_tested/apache/accumulo.csv b/results/reaper/merges_tested/apache/accumulo.csv index 796ebcbaac..4f0e6d6eec 100644 --- a/results/reaper/merges_tested/apache/accumulo.csv +++ b/results/reaper/merges_tested/apache/accumulo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/main,ce3a886c1cf90ff764edd872159cf3c036ff182a,1415599a5b744df3f79d05f9cd49b4fe0e458c1b,1fd1f797ca70f043992fd90485c9dcb33641e928,,True,True,Tests_passed,21fca3ca9ee1354b5475c6e1033702af05e963b80a3b2c0dbdf8be99c25b811c,True,1012,7273,128524,2,True,Tests_passed,745d863e7f0c6c4f8b5f0a6d6e0fef73da8c920dea5eb4c7ed2eb2bc574ef41b,True,1011,True,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,05a6056efedf5074fd4e9095f4ee64d1aa44b26cc1e4644ece644e70a9561a41,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,b69a86e521785d932c01f069655c0db8d29913e9a1a4ce7ea53d8de9c0c3bc73,Merge_failed,559357741ea8d7cdf0946e4885f0891ffc66944f619a45ceb93b4fc72f3a47ce,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,a818912655d31e82d47d6c6469f8b3d1c59f95a27384885039c7158a45aa6db1,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028,Merge_failed,6428459cf5ebc98d050154a2c3e74f797eb30bd1e1e8abc0e5825127b2651028 117,refs/heads/main,c4c8c572c8be14d882899f8f9370700227e87423,c14a97fe8ca91bd6bc5bba3a2f2ba1094f11fac6,e6cbdb4418d50e6c3c99e166a0390e483401fded,,True,True,Tests_passed,e612b5a4c948e7d9011313e6859ac198562522ddf524d01227fe00b833fbdc1d,True,1023,7525,132404,19,True,Tests_passed,1970b16ef0ca7980dffcae6efd5d89cf24d8d40b6b2a9e19619833dffb3afc81,True,1022,True,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,f0e27e7c19f6c382fdc5cce665d13022aa920735f504e8772308ad97d2c8d724,Merge_failed,a613acdc0fb0c625ddf6750eadad65ec0e76154f757b7dea5bd392a60f53c970,Merge_failed,381173d9adbad6e6e9bc5959fb1ae755e173671d492a3b5fd07919405f207b67,Merge_failed,381173d9adbad6e6e9bc5959fb1ae755e173671d492a3b5fd07919405f207b67,Merge_failed,a613acdc0fb0c625ddf6750eadad65ec0e76154f757b7dea5bd392a60f53c970,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,64f24c3d9c4252b8b8db39c1eb5a74fbd9cba6b5dcfb8ba07fb9ba8f45235dd3,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b,Merge_failed,8cd8100dcc0417c00e09dc6f6b3345bb7edf71a6fce26c0469ce2373aad7884b 172,refs/heads/main,862cead28590ef0105febf115192775d1ec826aa,96026abe60ffde3747922defc33d095b9f9731d1,35f8e2b1868cea9849efae7fae21e8ac789a0817,,True,True,Tests_passed,033cccbcc4d1b315b8f66fcd8a7ad54c1ab39671a8656b9a527f4789d6cd7b91,True,230,756,27140,8,True,Tests_passed,3a248ffefcaaff24772e21a04bdc9b78c971d4e3f9282b90daaa72c670fcffa5,True,230,True,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,f2dd6bf31bd2d12725b3e5c2324dfee4875dd7a9bcfcb8e9d5a422d430a5365d,Merge_failed,9c98e86c2333801ece14dbe79120f86a88bc8929bc3a8ccdeda036eb0337e7a8,Merge_failed,649f307c246cc9faa536f57223e3f61aab471324b313d71479ba7416932a53e0,Merge_failed,13e06e070776d59db6f21946a087e41b7dfd7c81b9621dc2ea70fe80339b118b,Merge_failed,9c98e86c2333801ece14dbe79120f86a88bc8929bc3a8ccdeda036eb0337e7a8,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,af58a9a3053ebe464e25decde108257ba5c0fa1a497f18a908f75ec7184a2c83,Merge_failed,649f307c246cc9faa536f57223e3f61aab471324b313d71479ba7416932a53e0,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,e65f96e04465b2d27015d03a3b7c8522681e2ac9bc6ed0bd263612899d897170,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021,Merge_failed,53b01d703ba5e349c47286f73318b3a8d9f9c688264b7eac00e0882924cac021 diff --git a/results/reaper/merges_tested/apache/avro.csv b/results/reaper/merges_tested/apache/avro.csv index 8689e3f1fd..2b6f489a81 100644 --- a/results/reaper/merges_tested/apache/avro.csv +++ b/results/reaper/merges_tested/apache/avro.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 55,refs/heads/main,c299da64ee53de57ea34e589b858d7fe8ada72fd,fd6c4228fbecc6eff3e3ecd5ee27d2ceb46339ff,57bea12e3a0860958b2060cab4f1193391584839,,True,,True,374.0,488,,8,True,380,Tests_passed,fc9f0dd415a77e7ddd310c2a82e63988afcff970e9d2fec8964c376cf791db8f,True,Tests_passed,dcc74ea3e9de72e816ade67ddc36b2ade7155232fd2539e5edd0a13345273875,True,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,a04291eda8f9bded4adece06dfa4c0c3bea0dc06b13be3d3328c829f528bc14a,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,ccbb6f579b792e1ff663b4151a39339017951cd1513d147981a48ea9d6c354f1,Merge_failed,672edcec72370ab880204b31f6f8dce53f119dbdcd2e7f9fe9300589aa13d450,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,b3b1cd4fc59004192f6c12d4d7e3211102deda778814fde087951cbda4680f70,Merge_failed,00c3b8acfdeca2054a8d1c1398d7ec6f56e8ea7aa53459b545a7edfa7047b381,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2,Merge_failed,fd46fa0ec68e68c360f1f9d1a1b362308070541e6ebd8fea6ab25bbd1dc0f8a2 58,refs/remotes/origin/branch-1.8,8c30a2d55d841e3da32554b01850fb40aeff9c0f,ed6a4e1f2aad7cea85bd956165fb7f66277533ea,1ccb4c22c1723d8137c3fa21dc16252af593d76c,,True,True,True,137.0,207,18729.0,30,True,145,Tests_passed,6f941c48fbbff1fff9426265cc83474dfb81f710167e9d83824619989d289802,True,Tests_passed,cad9cb0246f1e8fdad4b727e6f2ffa1a77fd4b19481075b2ef1df59fb437df39,True,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,ea7e15fb22a6aab496da19f88bf8ad51e07b5e022475b8ec9de185566ad43619,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,de513a252c64150ea4ee9662136dd127e4f968d54b6213ceb55730cd885acdc3,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,6494b278043c744088e199c5d14f5cb0fc1d98ff452deac27e70fdd775998d75,Merge_failed,d974b6be06bfdcbba186f2104f61336a1f6af1117bedb2e21f86f46008f927c4,Merge_failed,6b8dc10d8f3a1a20efadd72048a87ad4804e7c8e6d8ceef1eabeba6f0e91d82e,Merge_failed,f4e7c7fb9a8b4de8dbe2fdffb2af2f5c581520de8800f3cf1a7037ad45b7c5d3,Merge_failed,d974b6be06bfdcbba186f2104f61336a1f6af1117bedb2e21f86f46008f927c4,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,de513a252c64150ea4ee9662136dd127e4f968d54b6213ceb55730cd885acdc3,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,8265d51687b36e4774afb11fc33e04690621f0708cb047a004af3c0764b3734e,Merge_failed,3805c324ac70231fce8bf605b0f20ba947d8f31cb5b43c70989b0a7f1e209501,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,ea7e15fb22a6aab496da19f88bf8ad51e07b5e022475b8ec9de185566ad43619,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1,Merge_failed,d9d3500a045fb4a3ad63442a74a4fd86e076cc74f282e1526473849df03751a1 81,refs/remotes/origin/pull/126,3e6422d16dad01e35cf79f9eae39c3e33ef42e45,962379da0269cbc87398ce2afe16b7a17dbdf217,77e7fa0274b85742937026b95a839590368d2879,,True,True,True,56.0,193,2460.0,2,True,56,Tests_passed,d3402fce644700b1333e215bb486ac972ac6486e2ebaf22bfd07cf9bb30ec2f8,True,Tests_passed,31eaa533f0b52e644da1c4e03a2ab0a16f3fda27e4bd37ba9925fdb1e2e56b6d,True,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_failed,cc21fa27edfacd09d03336ed4be6b905255bfbef5e25fb97d181ca5fdb298bd6,Tests_failed,6c32c18d4dcbe3445a8a5b23a2d1c5e9cfea1c807b73b1247c20f317eecf4540,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_failed,cc21fa27edfacd09d03336ed4be6b905255bfbef5e25fb97d181ca5fdb298bd6,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309,Tests_passed,583b350cc2fc92293a95383fdeeb54f4d41d01735944aefa6e891d96ba86b309 diff --git a/results/reaper/merges_tested/apache/cayenne.csv b/results/reaper/merges_tested/apache/cayenne.csv index d1b0e01596..1469dff02a 100644 --- a/results/reaper/merges_tested/apache/cayenne.csv +++ b/results/reaper/merges_tested/apache/cayenne.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,8a6fb9cadcb15edf35e9ef42f6b357aa89df0051,2a8c24a704570a2e89dceeb2607d40b72c4276c6,6ad180b4c52cd585377dc1cc2e97b59872af6c2b,,True,True,Tests_passed,fbcf5ae3ed7d960d7dd287e3619ae8b29ea5298e14359f0b1268caca370d7369,True,33,136,541,2,True,Tests_passed,e7d00c031e17cf6491a2502ea252d9394a93c178cf042dc61b4093d357d470ed,True,33,True,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,c101a26211960b1cfde48ab0b8bf0e7a7c6d49c30b04f6994d44855aac454113,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,c101a26211960b1cfde48ab0b8bf0e7a7c6d49c30b04f6994d44855aac454113,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a,Tests_passed,7a283d28cdb39eb7f249996ffa2888f55faaaab724265347fde7f9fb40347e6a 22,refs/heads/master,40eed24a3ffad2197e216fef06227809c84c1e75,8725b265832a6c2d03ca5d866d5751cc1f35167f,ea1d6913bc80229783ec5842ec50b4b5252e322a,,True,True,Tests_passed,ca8ba6a6a4b949254d71541d85b75399eb829fe655fbd8dfe977867e3b9eda70,True,8,22,55,2,True,Tests_passed,1e31891107170cffd80248e6c4ad4ec32bb012e8c6594b7d971c04397c2a05e8,True,8,True,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_failed,c67fb314352add6761557043879de88bfc049403bf5f274cb6a32550f58d67c4,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af,Tests_passed,2c7ad6fb2bdcfa4f08b931e8bb1d8cda82c7b138bf10db19aed4d37c51d956af 32,refs/heads/master,e9f3501da40ea1f41187c823b3aa3643c77bc65a,473e943e904b39bc87cf8a3e921242378f4257a2,0d96b4a9686e3d587cb2785cd0b125ae8ae458df,,True,True,Tests_passed,70be2019532bff0062fd0699d85ce698385e6720de47c7ee421c7f63059319d4,True,206,823,8610,12,True,Tests_passed,e3f0f84a0ef77c1c71e6ee673f56344bcc61a13a4c69237ec9d3cdf114a62984,True,217,True,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,d212953ab9bbab4e84f21fa87a27708a06d9716fd2cce3d3a6b252462bf49aaa,Merge_failed,446211d85a8088b9196a963fce4864c863a4533c514d7754037cd6d6cfd07012,Merge_failed,dc33d649328b131a931afca56b0bb62815fe272e32f250ec9fe260837138bff6,Merge_failed,b77ffcac196c8d1288684df50a9325ccbdfcf93f62a8e8a94d96a66391628efc,Merge_failed,446211d85a8088b9196a963fce4864c863a4533c514d7754037cd6d6cfd07012,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,bd6d6073d11a6beefcfc6061b6dfe1ffb90a5f3af4743c8cea470141cf1ae2b7,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b0ccab5d9470ee0c93c63f39f7d611c30ad39bd25bd1fe6056cbbee99c666738,Merge_failed,dc33d649328b131a931afca56b0bb62815fe272e32f250ec9fe260837138bff6,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,b8b8d5f5c4e4a4b535917559136c6f433ba0f20dfe9cd388321708a33262b754,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044,Merge_failed,96a544bb84f939ee324e639544f9368c939ebd067f98c434e827c7ce7e325044 diff --git a/results/reaper/merges_tested/apache/commons-bcel.csv b/results/reaper/merges_tested/apache/commons-bcel.csv index 00d1ae82ca..a3bc458e79 100644 --- a/results/reaper/merges_tested/apache/commons-bcel.csv +++ b/results/reaper/merges_tested/apache/commons-bcel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/remotes/origin/pull/10,6c2a6f01fdcd4400bb5decb910915eb78137a07b,496c6ecef0d097383d8e2558a65f62bf38a5bdb2,7ceb5a6b8236517d708d7965f4873344c5630969,,True,True,Tests_passed,b78a25d2c745aaafda153d80811d74438fbbba691bedcdf53212a933284d2c82,True,9,16,373.0,4,True,Tests_passed,9725f060feff49a74ec6523f4688ff452f54d97db523d52697966ef9b167bfb4,True,10,True,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,77bc1a49ebde443019cf89f9f65f0036aee5158aa56cb3d6c2fe3ec0c19a0701,Merge_failed,519a17cdfe67af1466c977dec4bd904e5568d0a911069fa35baae2438a8d1626,Merge_failed,94dc67af67c7a178c9703f796579bef79759fa3201dc220ceb5ecfcbd889770d,Merge_failed,33230dfef6a516c71caa2db049af32c3d47f12da59c818eb3fab0c0ebcb050e1,Merge_failed,519a17cdfe67af1466c977dec4bd904e5568d0a911069fa35baae2438a8d1626,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,318843dda885e948e29c986fcd071603ae0305390d2726774fcf2374c5ee36ef,Merge_failed,94dc67af67c7a178c9703f796579bef79759fa3201dc220ceb5ecfcbd889770d,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f,Merge_failed,df1d2f6386c7d0dc81b209bb464392e300a0e12ef3e349807a75ae8c4688e81f 41,refs/remotes/origin/pull/117,6f207e4850caca46170bbe4074a0773bf7e7f1f1,82d02ab196ea0a135470de590e317ce22d00e186,d865f2df015fc6e04487cce77f18edb602d0592a,,True,True,Tests_passed,7e9904a6026259cd172deb1bd1d15e25889cbae53148b8e90d16806795d3d0bd,True,54,172,3963.0,3,True,Tests_passed,f1e0804621d53dda2b0568f6c387fb6920bb8e44361efa81cc79a8ce139947aa,True,54,True,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,62458c21f714473f88fa617e522f1e0ced4185c87d214a90bb68546835297174,Tests_failed,247da9234279ec5fbb8d87b653654a2a61ce2640d0073f2baa3f41dc9f1314ae,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,62458c21f714473f88fa617e522f1e0ced4185c87d214a90bb68546835297174,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,20363e8b743a509a225251ae89e1defdef719766439b0e7c930485e94ddc4817,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee,Tests_passed,24e13b787b55cbd18c529dab176a9240222f1f9d227d92656574795c35ccb2ee 42,refs/remotes/origin/pull/12,6917052a54643f63b5abebf79dae59eab5aebc4c,6fca90afed94a8b8fc32821bbc28c655bc48aae3,165518ac82555661207efca4e23b9f349c0d2fd4,,True,False,Tests_passed,3ea964ab984f3609a812e4f4f87d8bf9e25cf5f3827437b5519c5f6f21d4b921,True,6,23,55.0,4,True,Tests_passed,709257a2a73d2626f146ad7f82a5f4bf3d0ed1f0c238dd381e25ea85259b8513,True,8,True,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,4d003557af1cf37c3923f0c792f2ae0d002c00a952d4ac4d06d4a7c2fea805b8,Merge_failed,2942b6219838587174d79871783466470d742aa9890f9f8a82c6d0ffcb95eddb,Merge_failed,38a0d562fcedd48fb3068295c90f54cc685c86a10152a40472a53f22bfad4d49,Merge_failed,a39824c3d0f945f36b4b10169b5e9b9bd29277d405fdd661c46bc771f528ab9c,Merge_failed,2942b6219838587174d79871783466470d742aa9890f9f8a82c6d0ffcb95eddb,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,efee1ded415cc0a972729d1e48fa4c85223202345d7b1876664cb53f031f9541,Merge_failed,38a0d562fcedd48fb3068295c90f54cc685c86a10152a40472a53f22bfad4d49,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7,Merge_failed,9de5a889227664aced664e2e3c2297e2b56edaed51435544c6632264abbce8a7 diff --git a/results/reaper/merges_tested/apache/commons-beanutils.csv b/results/reaper/merges_tested/apache/commons-beanutils.csv index 63a6756e2a..cbafa29ebd 100644 --- a/results/reaper/merges_tested/apache/commons-beanutils.csv +++ b/results/reaper/merges_tested/apache/commons-beanutils.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/remotes/origin/pull/16,3147331ee84e114c0168b3f0d17164916c3ffa6e,0f37b9f1012ada894d2d4938062694c363c33368,6c0432a423b5dfcaca04f25ccb50a86f66350fc4,,True,True,Tests_passed,269e8447898ff19dc12c4d6686f6447467be0f5e6c4a522f01f19f88a6f4bee4,True,25,75,1863.0,3,True,Tests_passed,7aa3c6408dceaadd7f9b9b5a1ee58d3eaf6fb8a741018f826bb358ec0d9a5933,True,27,True,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d0f4f5aec1398a93a172ef95322d0700e0cec8ca674378abe629f3c6fe8a100f,Merge_failed,2a10ca4b058568e5e3a8e19cbdb7f145591ab082e918e8cbaf8cdc0800c086bd,Merge_failed,3374d3d168ce0b1379252c2ed481f2a08e0ffc6ef751033b7f5ac0072a948421,Merge_failed,47f9842d6a7a0e2e2256ab84e603aa4702166780b14dd08210290edeb3ca46f5,Merge_failed,2a10ca4b058568e5e3a8e19cbdb7f145591ab082e918e8cbaf8cdc0800c086bd,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,b7c6b802a8abf583855b6f50cb31c636db2254d83ea3bf6be525974de640dbd0,Merge_failed,a7bae5ba8d88e19b9f1641c5c8229e666d4abd643b4b7e33c74ba43600d6dde8,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,1731248061b56527c7fd7fad812c27f05ba292518d9dd9fe3c2e032eb10c1f4b,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345,Merge_failed,d11fc607d7f58b0161ce70143af7722b332d3280772287ef3d788fcab9f54345 17,refs/remotes/origin/pull/18,fc721de2d9600f27fabb5ee05d1a0938b37fe3e5,177d37eb939b08c5a3b88c4bf7d3531f7b0c716a,55dcbaa944b8f677c45831c6198e8c1c75bbf7f1,,True,True,Tests_passed,7a7c578cd4dee626911435f8162860072750f19a7dea92ad8cd10d9566ba93b8,True,201,1574,4281.0,2,True,Tests_passed,47db57126c8abb8a303b21aae28835fa28b8cf43965aa9a916661b20ae8c5536,True,201,True,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,e2677df89c318a2f8ad3d61c52c09dfa8d6a7a7b89cf2499609d392b4345121a,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,428004530686081deabb0ec35fd6e674e35155749cb6fa96ee0291094ac9a4bd,Merge_failed,adbc4c1027eedfed962293619ed33e1a0db9ff11eae1da8579510264455e1b87,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,09f92cfe7692f140bb3e839e2d664e5e955f77516bc42f9600e3b8cf9f9cd45b,Merge_failed,14cc67af79de620dbb5a02df3eec6559006fd3f496813dbb848d52008a1a4299,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,cfb6a360dd0014ed84cddb1615084404de12afd81d15daed7371158a7813a822,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b,Merge_failed,39047f763d595d47343cc9ce4cd936901fc0f10746918fbf00259942360e817b diff --git a/results/reaper/merges_tested/apache/commons-codec.csv b/results/reaper/merges_tested/apache/commons-codec.csv index 478fe1f80b..98181b6a21 100644 --- a/results/reaper/merges_tested/apache/commons-codec.csv +++ b/results/reaper/merges_tested/apache/commons-codec.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,b542cf9d098e65a78b71e5671bf700610b03dc07,b46a254edaa0952421a3b22ae27bde3211ca39c9,1a30728418f1d015453c0ad6521de56f4728e7bd,,True,,True,35,180,,4,True,35,Tests_passed,1fc238ae5b4ddaaf345ab8e1fe37c229c4150e6e001358ae0e7cd85d5b2c0934,True,Tests_passed,24fd4ec92a4026ba3c6837ab0e7b6681a39943f7f9d34032237f6ac137c08d89,True,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40,Tests_passed,2458d482cdf98a5b300d1c18d89f684a05f310f9a2fb484c98b3d10b6a2bfd40 26,refs/heads/master,b957a828ef5682bab987659bd2b03e6043be696a,4bc2c28a190e7cc774dda60038c74865c9058946,1cf4d19069c64d0493f8b92178ffdb728c0c0ac2,,True,False,True,3,4,8.0,2,True,3,Tests_passed,3ca3e50262a4012553b8ac57ad6055b2a35cf61c0f040966277421809f8ae25a,True,Tests_passed,6e9a7e7424f026fb22be0eab93ee1af970abf1ec60c361b383871ba469a24aa2,True,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,56b35ca61096acc99ebdd2b627a68667a9e41e23e431135ddc1bf163fea0c539,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc,Tests_passed,5494c718fc06bf371c37f9a4cf9f4ad79de3e62af056b05de1b4d5773aad1adc 27,refs/heads/master,dd5e46203e5b12f4b65e76ef2e5c34197692b5b4,a94813fb0ce4597d2465a273821306a055f35492,ac7e904531c4509ecb9158e4b31cce95ed938119,,True,True,True,17,31,92.0,2,True,17,Tests_passed,a0f5fe1308f78103e86c985fcb187cf742281f11049c853c1f384b5a6eb5943c,True,Tests_passed,8b3beb79a94d0a621a5b8a1d4c78dc6453fbcd1ffa3a9b8a8d81b86f9150666b,True,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,5e0c3ae4cbc89d8e85d4dc0889f75bbd924cc78547b3d191e1e24546b13a39a2,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,5e0c3ae4cbc89d8e85d4dc0889f75bbd924cc78547b3d191e1e24546b13a39a2,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c,Tests_passed,2eeaa5b672eaa652220004cbc42c11ff0a4fd98bbbbf49bcc1945668c1c63f3c diff --git a/results/reaper/merges_tested/apache/commons-collections.csv b/results/reaper/merges_tested/apache/commons-collections.csv index c6e6032290..7dcab7eef0 100644 --- a/results/reaper/merges_tested/apache/commons-collections.csv +++ b/results/reaper/merges_tested/apache/commons-collections.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,ebc66db42635b901a5dce7f5286ba3b2427fc119,ef728ec96bde5cc7bd5f4c4947720fc972b742a1,c104fd492412fe681dda239f91d4713aa663168a,,True,True,True,37,108,791,2,True,37,Tests_passed,d3b06d0317303a4819fdb558b92e80b261c06419cddf6b646dc8543bf1522c3f,True,Tests_passed,8cb664da59b0f6d860015c326d68103a1c9b9af0ba2069e2f9a34c6cf0cf333c,True,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_failed,1dd197b08a3496d088b14e427eaa874c2b6d871718b91f1d3c66ac74b2028739,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a,Tests_passed,ce30e8b339f69303aada364422ea7d73018fb7c9ed6e5cf0a1b1bc36cc38530a 102,refs/remotes/origin/pull/117,900af49dc3f82c796cb19eb5b0192e39b0f41518,0b8a4c7b71b682ac8417822ac693cbc8b6c261b3,2cbac58f7e3b51a4f2f3a6672bb4380e18469c50,,True,True,True,433,2431,21115,3,True,433,Tests_passed,30fae6a152628fd076b7ce4ce7770e78b3e9148d8fd4c524b08d6766fc0b0b5b,True,Tests_passed,d5e0dd301398533f95a463b871a65835c2700c7f00fefd1cef23c68bc2585fdd,True,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,372e4ba43a67e1e7af848e57f0124b51873f67820e5f8bfe2d279450eda41906,Merge_failed,d86bb8d3bf1ac4fbf674622bc1926579acf39250152c7c5bc385e1cf80e6754d,Merge_failed,cdbd1f8404ea00394944340fbb39137ffddcbcbd74527114e3722029784213d6,Tests_failed,820a1ddd1559ad392d7449ef89d5590e410d2b85d3bd418903f948b74f7ceb1a,Merge_failed,d86bb8d3bf1ac4fbf674622bc1926579acf39250152c7c5bc385e1cf80e6754d,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,7fb6185d883c5700ad4ab031f6f029c1db7b65a1ba0c72c310a7ac9612a60440,Merge_failed,cdbd1f8404ea00394944340fbb39137ffddcbcbd74527114e3722029784213d6,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,05848112ae87367963ad5784d03aa22fa4dcea615138a20fb1026e1615eaf87b,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051,Merge_failed,79d59a2366636871e8ff1452fd61670ba7cb70faf83533cac4fc95345455f051 104,refs/remotes/origin/pull/118,fbb5ee798adc480bd3325a27d5b945ecc6fbd50c,f53428c57a19d1316b684d5390c17efbbbd3121d,04c59168baf640912aa039e9b17661ff5a0e770f,,True,True,True,268,1440,4106,2,True,268,Tests_passed,5ad6862468d3d826ed6d78faf3858f28feafc8043bf4b48a8c3b121183384eb3,True,Tests_passed,c43b947a4cbe10c6d72bf53a199c9e13b1e8b69402905546505480407139e52e,True,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,d9e572e88cb47e87e08192203b144a03ffe98f85806ebcf05736d44cf0544f6d,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,d9e572e88cb47e87e08192203b144a03ffe98f85806ebcf05736d44cf0544f6d,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0,Tests_passed,194f5b41d05e9cd8f264cf7b0c3db41b5dad902aa94f8fb1159e0f210bbdb4f0 diff --git a/results/reaper/merges_tested/apache/commons-csv.csv b/results/reaper/merges_tested/apache/commons-csv.csv index d7118e339c..0c78315284 100644 --- a/results/reaper/merges_tested/apache/commons-csv.csv +++ b/results/reaper/merges_tested/apache/commons-csv.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,082827ceef359ab4554721477bed8fe77fb655ff,6fb2b6e085fe800e7eb96391675c678041fc7a00,f1294a7a65b2a6472dfcac86de0e61483ef8735d,,True,False,True,6,12,84,2,True,6,Tests_passed,f27b058c384139a4695b9378ad1767dfdc77615e4aeb2a02d9a3066d51f2df5b,True,Tests_passed,cebb4fa489a75c1c2fcb6fd97ccfdf73a27937a6535ebf6f89e99a286f868a8e,True,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,b733560744e9a85005727d5eff8635579622500198ed876f51eabf5beda44632,Tests_failed,71975a301f95ae49d8dae41277fe56d44c1e42094076f3a121dcdc9e36eb2e5d,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,b733560744e9a85005727d5eff8635579622500198ed876f51eabf5beda44632,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b,Tests_passed,4b531e10be08ba64ea1ea7eb5cffa39fc4789b63d0dc01d501385313193cea9b 72,refs/heads/master,4a865fd7f8fadc1b12d77ecabacbdc8cf2aab5bf,50f4525614f5fb492a826be303f7bb8c23f3161b,86186dd9656fdc6f29d2d8f7aa061ab9e4a72d24,,True,True,True,8,13,34,2,True,8,Tests_passed,08ec72a94c38546c80093042c07fbea06487b6ae63994d9200dbe24c9bdd6520,True,Tests_passed,da8ce6891b3ff75581b1d4289530c3854f9a1b9173b12d1c98c473c4b64abffe,True,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_failed,c67da5c5e851775e227c5466e6eb1e3ce8b60880ecfe58267526154c6b8b5767,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_failed,c67da5c5e851775e227c5466e6eb1e3ce8b60880ecfe58267526154c6b8b5767,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6,Tests_passed,d89065339a104a59f88b2929e0f6a7e0247cf41262c4c7f07ad1359264b0ced6 76,refs/heads/master,23c39b158e13ee835ae77ed3e39de0d54a0600cd,550309e3278bdcea0ee6467b95f1f1487746f1d8,1da75703a46305dbdf45b29e6d886533769c2a3c,,True,True,True,14,36,227,3,True,14,Tests_passed,f5e1b450003b0c2330dd4ec94e756c3b87b19898c00013f9a3c4c0832676afe4,True,Tests_passed,c397326515e451b0bec86847c0722aad4e6c05ce704f840bf698b677cff6372c,True,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_failed,3f86256f4e57ddd07f24197184b4547a958aaf471567c65f1899a8b2380d34fd,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_failed,3f86256f4e57ddd07f24197184b4547a958aaf471567c65f1899a8b2380d34fd,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755,Tests_passed,91edfa746958c25ef40cdbb38f9bbc55c162261f40c105b5901808aca5619755 diff --git a/results/reaper/merges_tested/apache/commons-dbcp.csv b/results/reaper/merges_tested/apache/commons-dbcp.csv index 204efae34d..b93de8c8de 100644 --- a/results/reaper/merges_tested/apache/commons-dbcp.csv +++ b/results/reaper/merges_tested/apache/commons-dbcp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,e52de7b4f3515efef06638c8ff9184f81d3c979a,b9b0bc94c7e7ccb608e5d9f8ed1ab0dce6f3f8f8,7a75d75acfc06ee0d2b6a79c9580bbec3472e7a3,,True,True,True,30,137,1520,3,True,31,Tests_passed,0bbd0240d369c0340c53a32193ec8a557b3bdf04122e04e028a6f581af163ae0,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,True,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Merge_timedout,,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,db6496863e754e2a212dbb3b35cb292f68c943ed734c2e315089fca026559c5d,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,a2f20f0cc70f5913c20b7dc8ad18145b51a608d61420e183099fbc95280fc24e,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9,Tests_passed,0702bb10ceaf331a03df81b7b5871ebd4410766ca86ffcde87c9872ae27950f9 diff --git a/results/reaper/merges_tested/apache/commons-email.csv b/results/reaper/merges_tested/apache/commons-email.csv index f2a32de53b..ccc57c4587 100644 --- a/results/reaper/merges_tested/apache/commons-email.csv +++ b/results/reaper/merges_tested/apache/commons-email.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 103,refs/remotes/origin/pull/101,e04e3a519953a6d40174ef9d80118c8cc9366288,523ad9a2e391f71e5d37665b31ed5228fc90a3bd,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,,True,True,True,3,8,23,2,True,3,Tests_passed,95f2164dcf5c059464f566caaad9b423d3021a80a30f1c8b68c7226146839198,True,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,True,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,727a2bd01d7454bf8bdf6fe0dfa34b3a71d8c5c08994ef08dd10253b97832d6f,Merge_failed,f503111a409f33730b9da5b0e9465e80d8cce7a4539db741b590942d50b1c845,Tests_failed,375ef583c5fa3e9f92226b63bd5331977263dfde076b3646df79dc11db663b77,Tests_failed,e53017a8d36847ef26bf456390e97c8dfb1b04d180f79f5626757122075222a3,Merge_failed,f503111a409f33730b9da5b0e9465e80d8cce7a4539db741b590942d50b1c845,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,9f2b30a11b1c4abd538bfd4eca71d34587d6020824f010b2406f9b2d8894c168,Tests_failed,375ef583c5fa3e9f92226b63bd5331977263dfde076b3646df79dc11db663b77,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751,Merge_failed,c9a02f2f0c254f33b8bb19ea5b7b9d5cf171494cbd0c73aefe362cc04b162751 104,refs/remotes/origin/pull/101,37e4c8a68fc8e68091a6b07bcd2fc62edba038c2,234aef759f76f4a4de53d2d311cd37806de9f361,2410f4bf5ffacb559984f7584e12cad802b7805c,,True,False,True,2,7,15,2,True,2,Tests_passed,e61be0a8f3eb18ea0261adba74391c43135a450c6b81d61969017e30bad7e18d,True,Tests_passed,41b28dfe3eba4c482094d558d2c80fb0c7925bd33c6793c95934e06add2c4f3e,True,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,9a9de43f36faf7fe901771d4011153e70bb7265bbb6dce5d74b871d15ca23047,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac,Tests_passed,be156946cbab44bc5dc43f4ff64431dcffef6eb03574f58aaf99f36f5c9c4cac diff --git a/results/reaper/merges_tested/apache/commons-fileupload.csv b/results/reaper/merges_tested/apache/commons-fileupload.csv index 17b3fa0f35..cf2649ce3b 100644 --- a/results/reaper/merges_tested/apache/commons-fileupload.csv +++ b/results/reaper/merges_tested/apache/commons-fileupload.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,e7ecf9e2b400f9d2dc7ea333578f171072eeec07,516552828b7ee2a9ac2e5d58c987cccedd0aa857,7f02be4a08481fe319126b797353f641e9a42214,,True,True,True,11,33,73.0,2,True,11,Tests_passed,b047e5164de51fee8eea7ca06b06038cae246e952a740d03e779068479a4f1bc,True,Tests_passed,ec3d0a0c37f27a999ee4d3be2725c2576cfff000f7c083d40a2aed5dc188a1c7,True,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,3425c6e64eba29294113c24aa9a663f54ab00d9de7208f2cc7ebb93905e94009,Tests_failed,4b429d95e1e59272b10c47893277e9b687ee7228997461be6dc3f1dba6d4aa6f,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,3425c6e64eba29294113c24aa9a663f54ab00d9de7208f2cc7ebb93905e94009,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735,Tests_passed,672fea0949e6972b0a4d5abc0ae4b05a5263c481e5a3b2286ae02695877a1735 33,refs/heads/master,5d3e1d8f4eafd654dec3e0ece71940597239a5e9,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,1b10014dddf12527f8dbad24169e4f6a9434e8c5,,True,,True,15,51,,2,True,15,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,True,Tests_passed,5736c3cc1b8062325082bf12feedafa77b5e37d3b23174926a613d2b9a543ac3,True,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_failed,d1e8f065a5a9d9e80afc1aacc906cdafa859ed39438f8154b7a898980ef63151,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,e7371b8f6fd6af1415acc0b90066778452b45fefa0b84d8869ac531b010aaa93,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff,Tests_passed,171ea63c24fc1bef7f6506dffa38ed5d70bf108131752ddfc574da318c4799ff 34,refs/heads/master,e25b70889f2f0d8563f90f50bdc388d2536b3cc8,66427249f9039ed8f65343f94946a3eb6f395cbf,06357585199fe659d9cc4914d04279bb6d5d18ec,,True,True,True,13,34,93.0,5,True,13,Tests_passed,8c5124dbe2f95a1be127496ebdfbfa3a724044ee0fa143aa74f140ddb0f3fdb0,True,Tests_passed,0cd432ff32beaed72781c52197585e39167091a0f4213853e8988b9d9e0f48af,True,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,de39f92863a492897462b14fe520cb1a7aed414961c2c3fde522a527a79d01a3,Merge_timedout,,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,de39f92863a492897462b14fe520cb1a7aed414961c2c3fde522a527a79d01a3,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661,Tests_passed,3cf00d7a323f190508123d98ad51d8cb0cfdb4ee7fd642406bc12b4309162661 diff --git a/results/reaper/merges_tested/apache/commons-imaging.csv b/results/reaper/merges_tested/apache/commons-imaging.csv index cddf4239dc..9f656a1c56 100644 --- a/results/reaper/merges_tested/apache/commons-imaging.csv +++ b/results/reaper/merges_tested/apache/commons-imaging.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,888d6faf62dbb06004f2eae2cb889565ab044def,df36623d1826a43031e01af20783c9df4674c3d8,c0c98466358cedbd78ba91b238bb2cc1a4718f53,,True,True,True,480.0,1205,6176.0,3,True,480,Tests_passed,0d05ffbf27bc75c717c2fe0cf23ca003c37065bf54ab2f76d8e76e1b7b83e450,True,Tests_passed,a2a6ed14001f03ef10a083edace01b168e5876c281b69c0b082a2f518b86baac,True,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,fd02c8352fdae0f1dcc785e078cb95a7205d2577c86eec1f1eaa4336affac57d,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c,Tests_passed,2da6d92791a3a82490973d58ddd5d7e3a54e2772370cf76ddd19c4afb928d26c 27,refs/heads/master,fa1e1be0ecebffef63a7e26a31eb57a75edcab54,0277fc30fd9ad5fb994de15b9251430cd224ac2b,e89555925bd806a130e3d9de3a7ba44c3013446b,,True,True,True,24.0,36,478.0,2,True,24,Tests_passed,a6f73bfbdd661ec0a2a9b7226cf9876fb265eaa644c29912c1c60c86d6eca0d7,True,Tests_passed,bc0885146af2ba15281048607f48986e0e2eb8e45bb54187e75c869cd5179bb5,True,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,83162d99fd70cd5bbf2bcb747b2bc73ba195986fe8ca3fe93e2c7033ed04bdb1,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,83162d99fd70cd5bbf2bcb747b2bc73ba195986fe8ca3fe93e2c7033ed04bdb1,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313,Tests_passed,5b1a875ce0eaf0e3af73be55104c24aecee13819cb5756f59b5ddd62d960d313 28,refs/heads/master,57151c5f2bb8ce52d1d3342c5062d88db096036b,6f80849e4a641bd40af8e8160ad37a5d57cc1b92,adba5dcad7aa258328207162a395abca3b6bc933,,True,True,True,217.0,760,1681.0,2,True,217,Tests_passed,bef63e741990283c32607e5c93c86007ad983610555ca97980d54e0de562e70a,True,Tests_passed,7b82738dc8ea17d4d5abbdee60a59b20bd448c396ee91c2b804059f564d24e1c,True,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,5cd97091be76b04f3ef9c9218342730f8d567d7e1966f544b9e89b0054b192fd,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,5cd97091be76b04f3ef9c9218342730f8d567d7e1966f544b9e89b0054b192fd,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce,Tests_passed,f49fbe6123edbb3533de46df4343b972f69163036e08933f8166b8bf73ad35ce diff --git a/results/reaper/merges_tested/apache/commons-io.csv b/results/reaper/merges_tested/apache/commons-io.csv index fd617002d6..94f9d1e5df 100644 --- a/results/reaper/merges_tested/apache/commons-io.csv +++ b/results/reaper/merges_tested/apache/commons-io.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,b507d7e60b3593288990dd9f570ab87bfcc65e17,e3aeb380b429dfa54b757c4ac6077c173e885d93,f3b44601abf9b79ba90780b963b4b8f8548bd9b1,,True,False,Tests_passed,973975dddd9855dabb30ee6db9765402926a0169736233fc591e631e8c121b9f,True,11,13,56.0,2,True,Tests_passed,f7fab8f7c130d64280351b4530f9fc77b7e796e7aca6abd359c3a38e4c4c9fe5,True,11,True,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_failed,a8a3afeead41aaae26ae0d4bb88863a0e0072875e192c641ead4590b28c1c3ab,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca,Tests_passed,0232a03ff6390aaa5e44b0b480f3afe5568fef463ea87baadf3aa1f8b3a818ca 52,refs/heads/master,257d6f423ec5e3e15e136b72fd686c49208b1aa1,cc3e5fb58d371c8ab3eef800be5e2a40e3fb9179,b3447316b5c586312f26e3df431f926e82d7a283,,True,True,Tests_passed,1709cef5042f67e79725fee5cba19f76a981049fb6c61795b3fc70272d34eaf2,True,2,6,15.0,2,True,Tests_passed,5257aed0c0a4cd90f9e6e14f4c2e96deabd6814bc367fa3691fa6e0cbc919207,True,2,True,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363,Tests_passed,192ff1c6bbb21f55ff2b213143a6f020f0a0d0a286822affdaec26d8a881f363 67,refs/heads/master,5e2ace28efe0476feb6a32794fe6b5e90e71eb7e,65657b874c03a1b6fee23653b01a9baad6a518e8,aafa3dca40e1d0a377ce9112538091581176dd50,,True,False,Tests_passed,fa34e0f2156f38c8709bd8dcfbbc930ee92a7c6e42831b5592f1adeaa1cde244,True,2,6,16.0,2,True,Tests_passed,c4fda76cdf284534e1a6b3fe7fa0b5f12cc3ef110563290104e454a9bdd819cb,True,2,True,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_failed,c987adc44163f45e0b90d29606774fddbbe27acb9e4d7b4fb30155dbd312f915,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef,Tests_passed,2ef47f63642804ef56d66a19bdf3de3cb882fad8a831fc740100870f2e28c7ef diff --git a/results/reaper/merges_tested/apache/commons-jexl.csv b/results/reaper/merges_tested/apache/commons-jexl.csv index 5ffb0be0e8..8705b83b3a 100644 --- a/results/reaper/merges_tested/apache/commons-jexl.csv +++ b/results/reaper/merges_tested/apache/commons-jexl.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 38,refs/heads/master,5592c6cacb2d5ea28b70b77abefeae0e9eae5841,46854b60a75fba8ec96066fae6051e38c6fe1245,33787af3153c80787c14dca6b7d3673a07516ab4,,True,True,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,True,36,114,272,6,True,Tests_passed,9283ad59baa4eaa342b95d638dfbbf55743c06a628b5e593d572d3b848ff310e,True,39,True,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,82303f83be651913bd6eba1e81bb05fcd715b04d6adaddc98369dbd205c31db4,Tests_failed,385fb86f4b8a6cd613fb78cdb34276aa505a74bf3bf48f70a3972c68542e4d3e,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,82303f83be651913bd6eba1e81bb05fcd715b04d6adaddc98369dbd205c31db4,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0,Tests_passed,8aba90b0cadcb14393ca68ef6947a9b87842de980cc57c91ee99473b5f2e78c0 86,refs/heads/master,241f9615d5c3343266186df5d7f79787677e41fa,2b027b4676fbd08c98f37b7014d3a158ef2bade1,8760868c92a542d939569a5f3b627775df22b73d,,True,True,Tests_passed,dbdbd264b93329b9ed48f0eb7219ca4c12b92e441feca11261113d38b879a818,True,4,11,45,21,True,Tests_passed,822336c83ea3329e85e21f9883282ee1efc79468a07d6e87cc19b33799233b8a,True,23,True,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_failed,2f3d886889983be49e1d974d0982c0ce614d059402b5633379fb42538db63400,Tests_failed,7cec897d7df011be26062cc829fed19e5758709c71d55ba8c324bfe201eb10e4,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_failed,2f3d886889983be49e1d974d0982c0ce614d059402b5633379fb42538db63400,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75,Tests_passed,d8bc66f99401324f3d5651e42cc67f28273eb4c87bd91c5ffea8efedd8788f75 90,refs/heads/master,ed73a52cbbd255564ed183a6dbbbc00e0691aa6c,2fd5464c48885edd1dc79736c6b6ebbb869b2d9c,79e655d94da0d8650e89db37d5bd59e72ceb4b03,,True,True,Tests_passed,22a6515db4273c70aac1aede8faef7a06ed616d4427875d799b5fd5ead07b257,True,22,93,595,3,True,Tests_passed,150054ac8aa3400d5244d471c195de8f72044d788830ff9e15412a55eb54a59a,True,22,True,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,80eeebfbe54986cb6193285e4fe540267ef14e3c5220c14b0ac9e32ef7668aec,Tests_passed,9d57c4102f2f61c85bf3b7122d8f613868727dff169f058b0591762b9b0aa8c2,Merge_failed,21cd03383bc618887f5dfa34a3e2d7107b7cb8a4b84e68b4ffc9694040578b98,Merge_failed,e5e729a0491a93ce8d7a4fb4bb27e6ded98862fcf4afe7ee453c362f617c7544,Tests_passed,9d57c4102f2f61c85bf3b7122d8f613868727dff169f058b0591762b9b0aa8c2,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,827f3e291a5156b50c4ee316c6c33e3a7eb938b7ceb89854186ba1b3d2a40bb7,Merge_failed,6022067f352199a859ffaf6e87d92222e51ee962009010f1ae86c48c61484b42,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,1a427f00e7f615d19b338da10a8a4f6021cb4d719895ac4c6e80b0aaef1c2ac7,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3,Merge_failed,a65862662ef12c26809f05b2481fdf08b1168568fbab246400eb3ea5541f19c3 diff --git a/results/reaper/merges_tested/apache/commons-lang.csv b/results/reaper/merges_tested/apache/commons-lang.csv index 858cc9dcdd..760d73f2d8 100644 --- a/results/reaper/merges_tested/apache/commons-lang.csv +++ b/results/reaper/merges_tested/apache/commons-lang.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,bd7956949eff64db275b209429221c816eca9571,bdde0e1c13ed5dddcb358ef8b3d0c0dce11d8b92,07403c9a943d8c4988c85bf6cccfa5926e4dffe1,,True,False,True,9.0,22,40.0,2,True,9,Tests_passed,c61b61fec0c52f237dc3e35ea103a954924a52f99fdccd9af40526c9389e1e8c,True,Tests_passed,ac6a12ec1ad2aa298ce8e581be4d26a0de44d89f6585806e204ae4803be628ab,True,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_failed,a68206ab21707e75d75e8e293b49be4f8267ecf2a013f25e0836f699dc23cef9,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51,Tests_passed,654d5395ca366d18df45c6675d6d638323a394a65924a5dc72402950c661ee51 64,refs/heads/master,c7c2dd783a2b7c97267a4c185ec1cddde10d513d,dd5d284e86cc83b1ef8088fa8cba383d95957850,b69c4759ed286546ba5437d9fcb6d24a1e2d3f8d,,True,True,True,119.0,735,5163.0,2,True,119,Tests_passed,b1fe9c9ab69884bfdd41ec9aeb37056415c82f20293eecb297f0154e3692d7b7,True,Tests_passed,cc816827abd1117e18dcce3be2e20a91adffc03da55fa957da6af05f173eef75,True,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71,Tests_passed,28b4d67b5b973876541d5684ace7433099c2a8e7ae3c74314b639924706abe71 78,refs/heads/master,ee87df847299c55c97347e6c11e00a283feb189d,83dd32b901dea25a571adcd6a976464c8a36601c,b19b2d37dafb1f26360ee5e8ac6fa297e9ae86ab,,True,True,True,54.0,264,703.0,3,True,54,Tests_passed,70654ca8be50dedee73af2b6ff8937c1afd7413631d7360fc0cdca0529ed4df5,True,Tests_passed,2ead4162bf4960650e5ed8eecac194addcdf3e858d26c4bc8611bdf093f32352,True,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,3fdf216d900f2843d280821bda0cb80a9083dfd67f3279d74a5f02e137041914,Merge_failed,e1c813f78e2776da75607b6b8a4d17262dbcdbc9bd54fbf12c34316a2426fbdc,Merge_failed,7ef21b1531406764b8217b5304664281fc4e959729863871314561a730d5daaf,Merge_failed,7ef21b1531406764b8217b5304664281fc4e959729863871314561a730d5daaf,Merge_failed,e1c813f78e2776da75607b6b8a4d17262dbcdbc9bd54fbf12c34316a2426fbdc,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,f5c510654ee68b427170dd64e28255989c10eff32ee91e492f0c5974438a8464,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,faf5f3507273662a4615979e7690495a18f79130c0228f9198d715acdc5e29f6,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55,Merge_failed,dbb23a6d90cadb9d614792952472fe3be6ba7c869c8217ab79164297615cfb55 diff --git a/results/reaper/merges_tested/apache/commons-math.csv b/results/reaper/merges_tested/apache/commons-math.csv index a45a2202f0..5f4acb0d8c 100644 --- a/results/reaper/merges_tested/apache/commons-math.csv +++ b/results/reaper/merges_tested/apache/commons-math.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 48,refs/heads/master,c4c288a3e0e610ed02801b17ed26016b0e734032,a8c6d43b5a61d8da784f0ac188d40b88a15dad50,a3677db89ef3863e8ac7cf578df499f85d970b76,,True,True,True,300,1163,123270,2,True,300,Tests_passed,3d100917289ba2dc011dec4a4ff16170fd7c3e5679094ee328b85c9f21d18b47,True,Tests_passed,6b3fef96cee086a368ec7970f8305409ccb4cdf55ddefccb5cf958248542cbb9,True,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_failed,103b6ef99cae90de7f5cd6e5a9b95a6337e21bf2364dbf0c3efdfca6033012d0,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,ce93465e4cc2585ee43c7626bdc3991650a9287c3eabca1aff490d9e3291db33,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,4c8df2465a526364242acef807038af325c310db2c03432f63e346ea1dd55deb,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432,Tests_passed,14c5faa9b4b60afc11b01449973d5e0d348c8635ce5db9cc29e7394c5b7f1432 69,refs/heads/master,9575054ff07b8dbb912e889111f6b3a3be582680,5f9dda6b900ced96f21c4c0cee9bf14ea58451b2,3ac3ff62b862ee89effcf1a4889b04f32fd8dbb2,,True,True,True,10,15,1023,4,True,10,Tests_passed,42e2e92eb514029404d296b00ffb753880d637fbc8c1a622a7b3a9e6d251d05b,True,Tests_passed,5b1dcff5961966e96cf895e6e3c968c2b97a4dcc0cd7dfb35063edbb7e7ff20c,True,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,1215347c809d3b008768b38d5b6385af3f8d57d2e8928fd340d7be8567be0f2f,Merge_failed,034828b6460ffc7345db5f8b74c3386d26e4bb4b10f4531057ba374b8ec0da7f,Merge_failed,330ed042c9b1da653313197022ff994618f373a392b8cc9ddd620d5b5d40429e,Merge_failed,4ae53c6b264d46c308f9f35cd1103f5822c4bce563a60d225128a1b43d3614d7,Merge_failed,034828b6460ffc7345db5f8b74c3386d26e4bb4b10f4531057ba374b8ec0da7f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,a16110a15c7ce23ab49d131514048d53cd8dbaf920f57a21612a882d3fae32cc,Merge_failed,2154ef91fd1efe1082e148a6ce65587af917dc0be90c6a5f9c82c070f174aa05,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,760af7eac39e22beeddc63529386bf5e07cf9682a3287e260f099ded0318c62f,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a,Merge_failed,c92b931b6d910428d82e3dc3a50651cd3e604af1d5dfcc42909f7b69305d8a1a 118,refs/remotes/origin/h10-builds,a6804eaa74dd04734bac4081d16fc058030dce13,809ce8a30485e65a792674692a8dd66b60c48d98,175d7a1242f98ec9c2da23608bc0fd503a837ad1,,True,True,True,35,188,801,5,True,35,Tests_passed,3bd30ff2e49530c3187ef7afb9d8ba6a4cf5a7dd29b4e099eb719a1f1cc71e48,True,Tests_passed,1d703ebe29992ba38201e018610faaaebae889d3fbaf1da70811acb308428a1d,True,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,8573318dfe5a9eeab4a609c31935c18a477bb20638187d833fc8ee64bc659f4f,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,4ae42fdd8785a81e259e80abc209b6c5a221ceb0aed92cfdcd5ec552d1fae23c,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,c7c52680521055855e2d7da569bc770e485f759448a9863404d65ef128220c5a,Merge_failed,1b258f3b99e4c488b68d5933dfdf70afd92c3eb65e7df12e58169334f24bb1c4,Merge_failed,6cdcb06326f6e5c79d2de1a6de9f08d96e867dd0d7fe30126b8f9d1e8856f4f0,Tests_failed,ab0797bb0f9d26546ab6cd5d029e86de0e89e538a0e6164c7c5ecfaddbbeb62d,Merge_failed,1b258f3b99e4c488b68d5933dfdf70afd92c3eb65e7df12e58169334f24bb1c4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,4ae42fdd8785a81e259e80abc209b6c5a221ceb0aed92cfdcd5ec552d1fae23c,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,df8a5d0767cab0df7140a8dc76fc533087d8c136acb6421d60ef5e4a0d9ac502,Merge_failed,6cdcb06326f6e5c79d2de1a6de9f08d96e867dd0d7fe30126b8f9d1e8856f4f0,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,8573318dfe5a9eeab4a609c31935c18a477bb20638187d833fc8ee64bc659f4f,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4 diff --git a/results/reaper/merges_tested/apache/commons-net.csv b/results/reaper/merges_tested/apache/commons-net.csv index 9ae1068df0..50ffcc5636 100644 --- a/results/reaper/merges_tested/apache/commons-net.csv +++ b/results/reaper/merges_tested/apache/commons-net.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,e3013d784b0b6c93a7624a36870f2dd73e6ecc41,2d0e6ece9df028b11b4592fce2d1c761f570533b,cd0aa01783cc7c0459f24ac9139b952f144c110b,,True,True,True,76,372,1159.0,3,True,76,Tests_passed,0e60b717d0b4708350b767069f2a58a7b80e7a91839ea474d86f50b786df605b,True,Tests_passed,6974d633c93ae3afcd6d7e82f6250dc718697b6613bdb8921807495ea703ca7f,True,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,a2999352b1213272dd1edcefbd298fadc2fcaa759cf4cf6b6d12cf590c6bb49e,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,784c54f9f2db2df21a5a2de5d19cad4f3fe2e80815dce82ba80f54e27caf692b,Merge_failed,5dca67dcd0d3ea4a8bbe84bd28dfec73fbcd7b3a7b56d778681010ebaec2b171,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,e8c147886dd041eaae160812f9c50a36caf9037b5371f3cda6356db934c964e5,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,2d47535b16f532cdc309c22e2736f0da234faa8849fc723fb9c51cdcf6c3eeb7,Merge_failed,bce03791c082af763857e9b8f1ff263073743efd3124e7534d172c99ec320624,Merge_failed,6fa3fc8d09cb57b5ed95207e1c5ec919e4d1434e0946036d2f4d2feeb176bc89,Tests_failed,02a49446aad4b9f856252a4e299cb9edce97c71bda3ace33f18d801fb927cc6e,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,fc5a93d6b58020ce8e9603e1ec009b7ed8b931e65fb1f70e3247578020209043,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527,Merge_failed,d4a6f6652324bf333c7f96d64dd0af4a617b145f4710dc50a09b80089ce55527 74,refs/heads/master,dcb63c3de215cccd34b808f7a4f8fa55be592226,d0c61b76437c48b4dbde6a508616b47b36040126,f7f3f3e73fe64efe630937e70c9151d1773ad5a0,,True,True,True,98,384,2029.0,5,True,98,Tests_passed,38e1396c51e0b728a511cc546b69e261150beac0193ee2d23d3d6dc1132a6bff,True,Tests_passed,da10745ac43520f8a11130fb9fa2a98bc0cc4722e372cbc6fe70e20e2174d330,True,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,2af2e5c6634e0584b323d448dd4639148d1ffcc377dc57ee60cc901dc9c02de8,Merge_failed,2b94a423949986bb9a3c8a02089e25aca61a4b4e215b5a726586df64a5d3254d,Tests_failed,44a0569df0978a9bbcae2d6fa612e4c0e91d5bb06039c38e9c8ea59ac09c3e58,Tests_failed,b21deaf25fa9985f894d3ad38768eaeab848d909baa232311157535cd51c0d89,Merge_failed,2b94a423949986bb9a3c8a02089e25aca61a4b4e215b5a726586df64a5d3254d,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,8a8ed4fd2690eca1dde4619f0375a7d3db8fc9d8934ee2e7a23f19f08f2cd34e,Tests_failed,44a0569df0978a9bbcae2d6fa612e4c0e91d5bb06039c38e9c8ea59ac09c3e58,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3,Merge_failed,a3491e4268dc2c7a71e876a15aee2bf182524bf62fa31337113e1cbf004fc9e3 90,refs/heads/master,2d8ec8dcc97b4ea26220b25771cdaaf4bfa68ad4,69d88f0b284525b259f2870aa08b70a53dfdaac5,400c7bba108bad66198330e508a65a5de91b09fd,,True,True,True,59,159,791.0,4,True,59,Tests_passed,aabb3202c63020e0698d98f062e5a887490a8c1850ea91fee6d3142792a90fcd,True,Tests_passed,e70a942e04efc6a41a6967c6bd77f9937cb3c346720adb084a2850ea8592575c,True,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,1791df66c158fa2845b6eaf61afd8274e3eb67dc8f17b19852d3de88e2b0dbab,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,1791df66c158fa2845b6eaf61afd8274e3eb67dc8f17b19852d3de88e2b0dbab,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4,Tests_passed,c254458d871fd948b3c35f529f3e916ebbe0e4fc0a95785fe729a6317ef5aea4 diff --git a/results/reaper/merges_tested/apache/commons-ognl.csv b/results/reaper/merges_tested/apache/commons-ognl.csv index a869c83192..a8f303f8c8 100644 --- a/results/reaper/merges_tested/apache/commons-ognl.csv +++ b/results/reaper/merges_tested/apache/commons-ognl.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,f2a63d67f5a95954bd780afe63818e4aba601a08,9fd017729bea36b5306eae9fd6709195011d4ab4,c901ba54b752e471f67e66fc5c2867473d4932eb,,True,True,True,29,110,272,2,True,29,Tests_passed,c6f21647664c097488119a547492412182d87cde27a99d830a63a44ddf822996,True,Tests_passed,0cc8d9bae6d7969e2354d3a43716e61286f31971e01ba5f887a65bb5d360c5b6,True,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_failed,711a2eb8987bbd6b1f4b0131d39ab073536ae4f08b0f5878e789e4ca7815ad58,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_failed,711a2eb8987bbd6b1f4b0131d39ab073536ae4f08b0f5878e789e4ca7815ad58,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a,Tests_passed,b871768a6551adfc70c3abb092f7faaf52d62ea37542109a3ab497828a8f372a 89,refs/heads/master,c1132d8fb32b81da8b9192ad1ee4e61dfa890665,812a35eb7f400aa93b2e60cf84151b1787a79cfd,5165bddec796a1e2278c01412e06f44de52c911a,,True,False,True,11,31,176,2,True,11,Tests_passed,01ccd28af5b5560f840e671640c614e7de2c0034fa319201f2701b016a5ebb48,True,Tests_passed,d04c3968e492f8063f94e925e78e31a108e85a0ad86a24b69babd6fce558531b,True,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_failed,8bacca06174bd381821055d56f710fcb9608aaaf1371dbccf004e42a531b0a7e,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_failed,ae63933bc8cc06247c03fa562b305ddacde4a894685b38e8da458c58b81bde50,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b,Tests_passed,7d4eb1dd7c204c0b1ffab9e82073bf7db59859277836d1e1fb98e0ed76d8c26b diff --git a/results/reaper/merges_tested/apache/commons-pool.csv b/results/reaper/merges_tested/apache/commons-pool.csv index ecc421c4bb..3c532f1084 100644 --- a/results/reaper/merges_tested/apache/commons-pool.csv +++ b/results/reaper/merges_tested/apache/commons-pool.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 36,refs/remotes/origin/1_5_RELEASE,14d3779529102d835672c5bad513d859e5e1deea,dc7faf6d8ccfc4e960bc7af6633c25329d8d3f3d,81e055707a4ef6da311fd88a07b891bcd8a576ed,,True,True,True,80,1028,22102,6,True,84,Tests_passed,5ff845cf1883dbc6aa84287a20f41923443e4d202a6fccc6943623677c763d8a,True,Tests_passed,a9b859e5b94d1097e80b39d44f7536499f73a024ea81409747dfcd12064a239e,True,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,aa6e66911bea5debe129b95e7d0934e1c6c748ce7a9616459191301f9bac1af3,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,a8c414bc061f720ac53f6c7b7bf705a8bb8a0642cc290166bf4ce1678c5889d9,Merge_failed,aad768e89a333d52cf91ff5cdea265c54e144670c099dbfdd5cc898f6f9fcea2,Merge_failed,9fb4808963ba7453163a8b02547c28ef103c0418ff5486a9adcf4e4b0f6fc8ae,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,2a24288cf5a59a2440c56058411f9e89b5c3cd937d7e02d392dbefaf1b1c2828,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,bf2e0d540e90ec7c1ac909fb2dd8f83bf87dbe6bcb97f786cc09fcc2ec1a6ef2,Merge_failed,062103779e804d8c637af2d69addddd019610d292c25c12e7ea7759c9cd24438,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,22ff82536a43ee247c3ecc99b7ec9bd347b36e3247f34f8e7b4c97e3d748cbd3,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992,Merge_failed,999aad9dd7b7b44ec2a1b1d097609a7394347405d59a4ce4ca461a1ee2d4e992 diff --git a/results/reaper/merges_tested/apache/commons-validator.csv b/results/reaper/merges_tested/apache/commons-validator.csv index ebce038ba5..5313c250d3 100644 --- a/results/reaper/merges_tested/apache/commons-validator.csv +++ b/results/reaper/merges_tested/apache/commons-validator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,3d8f2df479e5b0884bb8d58b6a194e0f8163102c,cf76af0ad3ba123eb9337c46a60a60623db7129d,79293404604cf443236e859df057962ff28676c4,,True,True,True,74,363,1667,2,True,74,Tests_passed,aee43ad24650e76057f1b884617cc35c9fec55edeaa2d07a9c9940bba7990d19,True,Tests_passed,078eaeaee7cc75875773b14c0fc6502d07c2e526d0e7fd04d50d86e67f45297d,True,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,3117cdf4773a2d3fdf3991b7ef768a6dd12a44124a464e423c7fc0c772e8771a,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c,Tests_passed,0b8687cf80c5f8431bac9629468b471ccda8e0d82e074370bcd5173c3ffedb7c 50,refs/heads/master,9aeb4661a9391148aa439a12ca71fedb4015c466,f1cf42ffa0c6301b2396be672fe97aa8529c7987,376d0ea65f7140a20f7aa3b7b50bc1db8fdf1015,,True,True,True,28,130,302,4,True,28,Tests_passed,fd52923d9b429606a411c04e6f143e40709a94358b1396aecdcc5cd27f990546,True,Tests_passed,ac1cc0b1c2fa3846a880a22da6e53f66d7c2360a15ac7fe49ca931b5082db24a,True,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,e855b64c09f239e6fda7c7addce03046e34df702be4db0942961dc25b12eef01,Merge_failed,8482c20f7bc19e25ccd0f0ed86e358efca14ee00986a56a1573334d4d6afd17c,Tests_passed,f8e213f9b5d810adfafcd9be151dcc61261e00ece90ab6bf2290355ead99d68a,Tests_failed,171b5d05de4bd41c4aad78e9061e610028c1b59ee324a8de19c8ccae371ba72d,Merge_failed,8482c20f7bc19e25ccd0f0ed86e358efca14ee00986a56a1573334d4d6afd17c,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,2034a86def64dd9a7dd35f48f14a1c3b257be98e2bff8456f30203b921a56aa2,Tests_passed,f8e213f9b5d810adfafcd9be151dcc61261e00ece90ab6bf2290355ead99d68a,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Tests_passed,11cf940b261c7d7518c800415a4555583f9cba6badaf0c69aca36b68fde11ed7,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd,Merge_failed,bf2f503ef61f5dc7da7920c7f9d1d3b804ba5b08a904524e7ec4a945346ec1dd 52,refs/heads/master,a34ef7d3bb1c98d64ecda138b8d05fb1eea6990a,faf43c58c3f89da6a7f30bb9af6b36523be2b9e2,28051f0f13d2213d21c901bd2b18bad53da7ed46,,True,True,True,22,71,201,3,True,22,Tests_passed,603e0cbe82d0e2cf25158e29e799905ddf2f0de0059f1002e6fd14e136bf0883,True,Tests_passed,e2a85b4d359896140a3925257516c196338c3527182a6edb3426da6c0d53d181,True,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b20563c47f834a997d4f2a1272b192b2ed94637ed952148d839df9c5f3f804c0,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b20563c47f834a997d4f2a1272b192b2ed94637ed952148d839df9c5f3f804c0,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c,Tests_passed,b3aba2d0e9ece2a4e935bf446724b6e096f819b704ac83f71a0664e275cbbc0c diff --git a/results/reaper/merges_tested/apache/directory-kerby.csv b/results/reaper/merges_tested/apache/directory-kerby.csv index 3da639e02a..6743edc208 100644 --- a/results/reaper/merges_tested/apache/directory-kerby.csv +++ b/results/reaper/merges_tested/apache/directory-kerby.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 203,refs/heads/trunk,19c903e4fb5e8d5ba12148d6d4210c25698ea4ab,8790af24f7f0ffc5a208e1f0140400ba89a0a36c,8ae0b35429396f87a8f8160acb056e778f9166a9,,True,True,True,28,115,671.0,2,True,28,Tests_passed,9ee3cd3a554767a4e963d09e17a40a9eab30cbafd77adbf05a44f2836d24660f,True,Tests_passed,fd29de1545ea7d0216642478617cbddc1b61fc281cce4dca3e53ea79b7c53ac9,True,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_failed,26b7b27859bdd446e1f2525064ef9c06070eee06fa9124250753633ec8fd573a,Tests_failed,a70246abbd44b2a991e2cd5fbd84bf0f4d89b1e0a0456cf7128343cab6ba0e11,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_failed,26b7b27859bdd446e1f2525064ef9c06070eee06fa9124250753633ec8fd573a,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,4e7ca25b49aca51d10adef65bc042919264fbaaa0e4ba469488e8a6ac9e750d3,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f,Tests_passed,c616c07000a36875af8e35865978aadd4f70eda955909a0cfb9e53622e9c0e3f 226,refs/heads/trunk,2daee238dbcf01170a01936f0feddb65e7dd0726,df2539bed1b4fc59642979ade83abfd8809b53bd,44f40d11d8cf2d9017278d92aec5d9f48d3fb88d,,True,False,True,4,3,8.0,2,True,4,Tests_passed,66b814d0497c94eb54c444f56e9e953dc3ea268ac6cc1a203bced908cc5f0d84,True,Tests_passed,27352618feac3c7caa18496734a060a137f8bda57cdc3bdf06ff2a4e5427d130,True,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d5a54451ae15627b70efa617d0d9ab135d1d8f8e24e64ca39b3b5936aa1ac9dc,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,df34eed536cdf56d42f9c1eaf0b1937ea23ab8e65c390913a57f258617d3cb4e,Merge_failed,b6bee7985fa3c83a83cc995d0c59c234111ac5cdff370829d2bce06ec392550d,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,d4c3e57ae2c290b0f23fc922e89a6449738dec93ceb2f15b5a7aed7bd6cc5035,Merge_failed,b2eaad036c59db9f0b05607759afea5e0276f384f2f252edd97442c011fcad23,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930,Merge_failed,00e09525582f02a38afcb86038e75662893fd74921616f0a633df938442b0930 245,refs/heads/trunk,4832ef6c97920c89220f22d3e7f1998733af07e5,9425e8a4b902ddd2cd2b861e57d322d672f85306,6f15357c3250d5dfd5a53954a9401cc826974821,,True,True,True,47,186,945.0,2,True,47,Tests_passed,af8f856df0b77eddfd0906c277febc885823f592f119917d77d6b0a306a9481a,True,Tests_passed,f4100b3d6b9ca9befbd1fd54d212df013d77fdafd5641806a773c03ef4b10f14,True,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,d198f2d3c3bcbc2b7b96f7ae4f2cd4321ef823c8b16a8d8f396a6af1816963be,Tests_failed,33133cee30d46161554f3dd618dbdad49494094cb67562ec487a82a9be38bd84,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,d198f2d3c3bcbc2b7b96f7ae4f2cd4321ef823c8b16a8d8f396a6af1816963be,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f,Tests_passed,6ff37d3bb9a2e0dc5477a663883f05c1a88cafedd1b765c11c13ad711814028f diff --git a/results/reaper/merges_tested/apache/fop.csv b/results/reaper/merges_tested/apache/fop.csv index f6bf915004..d8eaf2756a 100644 --- a/results/reaper/merges_tested/apache/fop.csv +++ b/results/reaper/merges_tested/apache/fop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 175,refs/remotes/origin/pull/3,7403425be8d6fe84d9ebd9614109629fadc8a752,7cae529cc4d2b6f3e8084d1950fefd630f29ccfd,9978ac1d3a99a429627198759affdedd2b10cd1d,,True,True,Tests_passed,cd1ff9e568e7f297b54ff98013502d203e3a67096b2503f6db7c2da6e438eeb5,True,281,1150,4999.0,12,True,Tests_passed,292361e45e7524ae9746da64b485aeda42d21a864bb8e63435c970d82863268e,True,281,True,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,1bf457ed34cb24c60b5e6807182c983abdc7ad606ff364e7aa5c1327e156bbd2,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,06d8ee6440cde442becf271f50cf589c8bb97cc24bb663acbb097dfe52cfde7d,Merge_failed,2e250a32571a6089616203a9dcf4b4e998373d0207a243b0f177c0796c007b7d,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Tests_passed,ac7076484ec16dd699fc588e107c4a88db0641b4ed1420df81b8310120f36a1a,Merge_failed,c60b1d17d9202e31f2db0c32fec695029d187eb4789cfdd5529a67535c58f319,Merge_failed,23c47c41b29999c11cb25dc79a69ad8f41dd5a395fa287473d13de56e2309706,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,05d84bea5daa2f5df7fd55b53e0f76812a93c8482bc93c634b7e9208746b08dd,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1,Merge_failed,4cfe6c29b7156e589562f0f8f6fe197fec8ec31cf85b6635fa4cd7b7fd6c44a1 diff --git a/results/reaper/merges_tested/apache/geronimo-specs.csv b/results/reaper/merges_tested/apache/geronimo-specs.csv index 7102128c5e..32d1b4798d 100644 --- a/results/reaper/merges_tested/apache/geronimo-specs.csv +++ b/results/reaper/merges_tested/apache/geronimo-specs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 88,refs/remotes/origin/pull/17,229a0222332567f69c53b4bdac713238935e840c,8d5bb7178205a4171b69d0d352cff74a4f221439,8f32fef5f3dbd5c1f577d967fcfb41bbb8af497d,,True,True,True,7,10,143.0,2,True,7,Tests_passed,e8dcaa08c37afb37d4f0640e9083832b641b41a8d8191236b19ab68978d00182,True,Tests_passed,7147bed0aea305357e81b689c9f37b551abbc487a5304ac965f6391301784b31,True,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8999d89554b0214e00c8bb31db923de3c0a4f637dcb60e0e315caeb6c6bc618f,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,db3fadc461b96d53f4aa7d2974be7e96a62d5104282125b510e4287846e2e36b,Merge_failed,2a237adaa4b9e6847aeaad3b88ba5e8959f01b83acbd9d3706834e03bdd6db4d,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,4ed1822dbd8b9424e5f274dad2dfc6bde215e90dd1d9851ca00443712992d6fe,Merge_failed,3b513a2e4db24cce26a1331026ff0152b381023854477ddcb253b89992ae1700,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319,Merge_failed,8b62d26c69a84a5abf6186175a78c7b75bf77b3ff4596787cca062e1420b0319 diff --git a/results/reaper/merges_tested/apache/incubator-tamaya.csv b/results/reaper/merges_tested/apache/incubator-tamaya.csv index 77769b2917..5b25d78513 100644 --- a/results/reaper/merges_tested/apache/incubator-tamaya.csv +++ b/results/reaper/merges_tested/apache/incubator-tamaya.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/master,74a73954a03c9854e80b7bafd46332a5a034a2fe,3a50d2e6eb06b7463e85a6f872463c28bc1142b0,45f5bb90bb48e1dc083e6e67138c140112f1dcab,,True,True,True,84,182,633,14,True,84,Tests_passed,cd2b85b49101b8714f817a3d58806b56b1b37f418d85d6a300fe45b7db783b38,True,Tests_passed,56d347327d56a0d41a3b4d4b8005abe2d37de34f11b2506284a72f6ac2503a13,True,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_failed,ff04d4d55d481a7fb000561d2123f3f9095d209d8004b3965883226173c4fb3b,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,0fe74fd4a15901b1181eb4db2aeed1adc4d95b24cb6f48b5be8df3441504c911,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104,Tests_passed,7becdf719911e4a734a79e05f142c3ed03866552e0c99d7f0aa9a879ba330104 diff --git a/results/reaper/merges_tested/apache/jackrabbit-filevault.csv b/results/reaper/merges_tested/apache/jackrabbit-filevault.csv index f5800790d4..11747c5b4a 100644 --- a/results/reaper/merges_tested/apache/jackrabbit-filevault.csv +++ b/results/reaper/merges_tested/apache/jackrabbit-filevault.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 35,refs/remotes/origin/pull/274,7c0672367c10fbda249ffd0fdf233ab56d1f82fe,526977d56f5effce6cdb8a46b0dd5d4c92d30ce6,44ba240756901c4abde51fbb938c2011525507a5,,True,True,True,19,16,276,3,True,29,Tests_passed,23161bf888a978a734e378c371b9db01af025e885f9ecd711c1e3512921615b8,True,Tests_passed,9991f96811564fd8d5069f7e96b86abdcfe6038442c0adc6d4a0e07076098346,True,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,a6079316b4624f2bb04b3601f96ef1a007db2bef3b77ab0cec6bd7bd9002abf4,Merge_failed,868a5b1da7061b22594f867d78e5f7f2dfa04d8a00fab34ea05d2038af7521ea,Merge_failed,a3956a0a70dc8ba87e0290c2a2665a3d237268b2bd18afe4e8d40e313e58abc4,Merge_failed,a3956a0a70dc8ba87e0290c2a2665a3d237268b2bd18afe4e8d40e313e58abc4,Merge_failed,868a5b1da7061b22594f867d78e5f7f2dfa04d8a00fab34ea05d2038af7521ea,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,0901503d0d47c9e7d9bf5a96405ebd122c9345dee91606156380ca9a6fd2aa83,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e,Merge_failed,950a433ce1970f3817230507909c862603f94d1f41916e0eb410293d88431f0e 38,refs/remotes/origin/pull/318,c4842868060884add8b7232d8d30224ad6bd2952,d4140d0987608e07f0b0b0d718ea1abfb892d5c1,d462b815ba9cca13721e6f36e40251e2b74244f4,,True,True,True,4,15,56,2,True,4,Tests_passed,1d98f63ca51c4c0e6f13357dfbce768de31ab86bb198a047741f894789083255,True,Tests_passed,d3cf4a0af32f12478d370f5264340ba5314244ae695cbc869a90e2a2e8774b65,True,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,4969e185faf3b86cd00d72721731493bc321c6c2e379924f224e6b1d1d0c8f38,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,68f6934f63fbf7fbb2ee3b35de099fec76fbc219bf8be406f5d20af05408ac11,Tests_failed,0f9d5a1b31707f769d8f58ef3ebda7a47a7e17204fcaf9b60b17f932fcc017c6,Merge_failed,ce77c212da0dfcb5765d8558a5b241e7748f7ba64d1378dbc0191ee84c32e9aa,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,bb00a3c1c4e978ef5f589eeb721a7a9fc05c1011105d87ae07b2971a87a841c6,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835,Merge_failed,dc83770938a2df4736997fb03432a7153bf02d1558fb3baefa9d4eb9b073d835 diff --git a/results/reaper/merges_tested/apache/jackrabbit.csv b/results/reaper/merges_tested/apache/jackrabbit.csv index 7ab7f836cf..cc2457652b 100644 --- a/results/reaper/merges_tested/apache/jackrabbit.csv +++ b/results/reaper/merges_tested/apache/jackrabbit.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 52,refs/remotes/origin/pull/60,938dcd57bf4be8e13e43f8257203538c98b04026,ce510893a7dcccbbd8fdc6cd43f697853f572886,927eb4491d79d2860b094eff5649212395a6388d,,True,True,Tests_passed,3ec37f1cb7491062e01df35c8f6599b59f56587c160210ba150d96ef225210cf,True,8,72,524.0,5,True,Tests_passed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,True,10,True,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee,Merge_failed,79431d161be1115eca0b323bbecb087cf399e349cb30bc4034fd0269a6d572ee 78,refs/remotes/origin/pull/88,c980ab851ddaac027ad4237151e416167682a71b,df833def60f7ddaeb3388043b7617155a03faa0f,e0e0f4592be8d34c442b466bf94184cedf3b7437,,True,True,Tests_passed,2664596db516481df6480497e04bd6aaf6d460bdab6d08bf8ac19073971127b8,True,30,57,190.0,2,True,Tests_passed,982a484a16a3d6f5605f8cfb51395ed490fd1d9531ab41c635d7168e1be24ed5,True,30,True,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_failed,d3c9245810d5cb7abea852d565f14ca6506ee3b13a46830dc83a39f5c7a79378,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,166deb92532dd0915e1cf1f9e80dc921725f3a46e8e7f7bc10dfb017fe5565b0,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29,Tests_passed,4f19dde650a7185e613b9049f1274851a0db9e8227c939be987f7400e0beed29 diff --git a/results/reaper/merges_tested/apache/james-mime4j.csv b/results/reaper/merges_tested/apache/james-mime4j.csv index c820ceee5e..9852e80ad0 100644 --- a/results/reaper/merges_tested/apache/james-mime4j.csv +++ b/results/reaper/merges_tested/apache/james-mime4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2fe9d4d3f5929ea1e42f8c63595a3a8cf2cf3106,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,2e492ab771e58b46455553191c79b7f983343479,,True,True,True,62,200,748,4,True,64,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,True,Tests_passed,72c8f4d73bfced165770a81de141accd20ae6c51db59b7e921926fbae2327580,True,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,3a5ac708e868667aa08dab28cdc5f5c975f08b8d3147aab8c81c6d4b47c912e3,Tests_failed,11726dabee572e4ac7d65f68003932f7bcef21bd8792d79e60bf47a5890c8c1d,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,3a5ac708e868667aa08dab28cdc5f5c975f08b8d3147aab8c81c6d4b47c912e3,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb 2,refs/heads/master,0a0733fb6b0fac6ebab2a2bf2aea32a387a889ed,e5a2caca4d3b5b2694d7156cd42cb8e3f96541c4,293714fe2c91fed2b5c6a7fb351fa79c80e867e2,,True,True,True,7,15,46,2,True,7,Tests_passed,4938610b1e2de86cc71e85b0b31ca4c521bafc4aa24b3469a3af7aeca0edce90,True,Tests_passed,c8f1e41ffc2c675e72bacb41dd025c2073a095a729ec1f7fcc02094a7f5359e2,True,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_failed,ba66d74aaac86cac8467127b573bee718dac34e392a3cfa37e188e1a1fd5037b,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,ccca40fb1798ed83b8fd4fb8338da568bf16f194e9d36a7dadcdf58cb91eec49,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb,Tests_passed,98040d32d471e89d16eefb506b87bc39d53589a2b7776c214b092abeae2caefb diff --git a/results/reaper/merges_tested/apache/maven-enforcer.csv b/results/reaper/merges_tested/apache/maven-enforcer.csv index ca093ee492..1873e70f52 100644 --- a/results/reaper/merges_tested/apache/maven-enforcer.csv +++ b/results/reaper/merges_tested/apache/maven-enforcer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0f3207ac28155bce317658f813c6fb4022c1ce19,3c192e174a09cb3a4cb4793d4bc7a9b4b8ae6ddd,e48ef741173c57fa1b43a960db107b40cff49536,,True,True,True,18,59,280,2,True,18,Tests_passed,fca3e8aef5e88c65527ec6264547c226d8c481941fee173efb3b173fa64f9007,True,Tests_passed,dc8fc476507683e6bb9244dd9409d5b317b4fd0e6abef96a1e43a1d964ad851d,True,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Merge_timedout,,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_failed,cc93c30bec32e7cb63131cd3060fc0d001dcb18aceaf3b3856eadbf72ef79d49,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,f9c99a0c0079fde05863bd1d6dab7dec6425690553d69e7e482defe68174968c,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535,Tests_passed,088571296c4774854f2e9c194a1d9029c5124207b7ff1ce6bbf341c46240e535 14,refs/heads/master,f4f8c2559e4af34d6db68f39b0d2e71e3b31e27f,4c28fbb5d101ca8fdde06fa645e111597b60a1ca,fad4dcc7ea83a90a0a853a0356804bc6a2f2f997,,True,True,True,41,131,1448,2,True,41,Tests_passed,dd5bb3584700368b445dcd219fcc08dbcaf29d89ee969d422916502a7afb2630,True,Tests_passed,cfe5e98afb833b115c44d3747db282228182fd0c9d2342e1dfd076891c4d1409,True,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_failed,4d309f3ac1c221ed5e40b6b1400330f50c717144016c74f899af32fef2cc2003,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_failed,4d309f3ac1c221ed5e40b6b1400330f50c717144016c74f899af32fef2cc2003,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744,Tests_passed,2ea21cf1d19dc22957187138021722f50f332a49e50e4cebcd9eeeddc758d744 27,refs/remotes/origin/pull/29,888631f16e3736fdcf1e06a69a25c67cd8e47846,70ab749b34908d351cce877bc8b8b8635ae109bf,48508c51afe26c15d6c246be88e603831c8fb864,,True,True,True,63,218,2683,3,True,63,Tests_passed,716881147eda3d79cb24eb7d39dd4860d0c397066e1fed71463ae2faf6206af7,True,Tests_passed,8659d5da33f5a8cfdee61f191ba84449407127f7e8787a8a4985b4d3b7f90841,True,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,34696613502a688f4635fb1f216593a5500be2519d78da3844aef4a184656375,Merge_failed,f7ad80c97f9df6448a28c0a6fc2a29393a3c3c231a196189b5a9cd853946521a,Tests_failed,11d1a87d688f324ed040f94b1b960967ddebe13f890f823e4bdafd3ecaf75863,Merge_timedout,,Merge_failed,f7ad80c97f9df6448a28c0a6fc2a29393a3c3c231a196189b5a9cd853946521a,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,912f86236a96a689f22fb7630f45d2d0568c5fccf9baa8e3d62d0bb9dd5bbcba,Tests_failed,11d1a87d688f324ed040f94b1b960967ddebe13f890f823e4bdafd3ecaf75863,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef,Merge_failed,32d0d03bf591a78c2890838763f48d5a67b45d4d8c07636ed359710ac3de38ef diff --git a/results/reaper/merges_tested/apache/maven-plugin-tools.csv b/results/reaper/merges_tested/apache/maven-plugin-tools.csv index 2f38f657ae..7e50ab56a9 100644 --- a/results/reaper/merges_tested/apache/maven-plugin-tools.csv +++ b/results/reaper/merges_tested/apache/maven-plugin-tools.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/remotes/origin/pull/46,5fe527d2614d39b64e81881e52ff4fb88a0c6111,0b0daeeeada60052ab663d9b08122826c1e130d1,8f9ee789d272cf702aaf390004b78b73b78db4f1,,True,,Tests_passed,c2da2b9f750344257c06e4d547aa76e8678bc43746be03e970b70c2d338602a7,True,165,622,,7,True,Tests_passed,ec94dfb2d3ee664add509e4980d203c3bb86f42f604c133eafc5cc8e14d4d87c,True,166,True,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,9e6088178393a0fa09cb761f4edfeb0cf3048cfc289e2e25db02a520a6efbfd0,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_timedout,,Merge_failed,6d1b93745d06aa60fe8344696651c590da919cf9ad6d3a9bca3079949c89e951,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,e54a47c01d1d47e9a76fdff4ffcd77ccbeb574b84493e05d5d9791201048f96f,Merge_failed,a283b2c8ffcfc2af1bbb6e9e4dcd22ddf9183b9e1e7859b7fa04144fdd27d7ce,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,3fbbe2264795cf026698e4f8b376b46d5e37ecc40eaf8476c56d9ee704901a70,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615,Merge_failed,d9eefc175079cb4777fc890198a0e85385870a59b1d848014c650f824e72f615 18,refs/remotes/origin/pull/56,a859f5f2e195188a00c1af3b6ea86f3d5582f92f,85b7905d4edb8fc64a2aa129459a2f49f9da4c3a,95f76d2b303c15de01bbb29e3d1a16db4595e44c,,True,False,Tests_passed,84bddc5d5d99cd4b5388c925218f369ee755568371093cba2e166f058def7ec5,True,3,12,47.0,2,True,Tests_passed,026707d95189b6d2a29ee81e849a7d7823ac2553e546b972244082977c959eb7,True,3,True,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,24809d4351cae94e7f35bcb69997073875019aaf838d710d7aa2d57a40e178c5,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Tests_failed,d8cc62ce590b476121ee1f5c794026b61a4bc2b0af2ab7cce5ebd54bcdba0ff6,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,fc2bf670a0a63e81d6fb64f4f0c18fc9f5448db59d4546e0b1b3315099feb24f,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b 19,refs/remotes/origin/pull/58,48c578a3a9e45c2f052c7a5f1d98011719f947fb,a0c3695f8af6191b8291606ab2e3ffa1bc2d931a,bbc5fa4a6d4ba93d11fbe29e444dc31ab11e0cd4,,True,False,Tests_passed,830e3388d2dfcd2fd9dfa11fd64c69ca36f94ff75c1ab94a7ce0c2d2594a348a,True,4,5,19.0,2,True,Tests_passed,876db674b51ae3599d3e2558a8d84d0c68a2b5fe280d708c2e067006df0c1cb7,True,4,True,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,370bb801d5e81ffef363a1fe951fd92db78021d4ef638ec24f06ba3c98666f16,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,370bb801d5e81ffef363a1fe951fd92db78021d4ef638ec24f06ba3c98666f16,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e,Tests_passed,0572c79eb229abcd3c46edceebd0f6f292a6ee010b882651ccd5c89d68287c8e diff --git a/results/reaper/merges_tested/apache/metamodel.csv b/results/reaper/merges_tested/apache/metamodel.csv index 2091ae2d39..28bad15970 100644 --- a/results/reaper/merges_tested/apache/metamodel.csv +++ b/results/reaper/merges_tested/apache/metamodel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,292b40b8e2832d36c1cb78c845b6497211992518,56dd99fc519f8db5bf03906e01f4a89c3169df10,7e60c6066d3784efacc240e9a8dbfbff391eb172,,True,True,True,5,62,152.0,2,True,5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,True,Tests_passed,c1313624f5dafeb981796b2d8f7e96066fc00087decd626f4acf269564448775,True,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_failed,2658506b10a93eb0bd6683b1f6efca93fd25ef544a722532656149f0ac89f05b,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe,Tests_passed,5d9bd7a10a2a623487ddd19d0489914e7c4c568aa454bd4d7cbf915dcc723ebe 5,refs/heads/master,56dd99fc519f8db5bf03906e01f4a89c3169df10,60710cfd049b7e576b7af3244cd7b7463275ef07,a783e4fe2585da62d38c44417ca05fde86453666,,True,True,True,44,194,459.0,2,True,44,Tests_passed,ed0178fff437d8f023423547f8600f46e6a5cf4b881f07f5d515dfdf408d3c05,True,Tests_passed,4e632a4611a1124a74a0f6ecff98e2bde95ad7196477d4e003d4f9b3015e861e,True,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_failed,a58dc95d96c1a3dd9ddf16ee7c838d352feed1ce268c13890c607d37f0ed4a91,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,fa794a1d58ba40ba5607b2f008c2b9db398a04507f695f069f1dfea62053ccb5,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7,Tests_passed,8f9acfddc37ae09d12edaaa6402b015fa0b3e91ac3bc25eb80dcfbe44e926ab7 6,refs/heads/master,985d82cb4cbaae82e1a76f82231ce83adf0d2df2,5fcc525c238ecc294df465bcddc489fe57880bb5,4e1c8aa95f45af2370e489a05bb5fd8d978fb835,,True,True,True,63,179,313.0,2,True,63,Tests_passed,715c6736514bfb89044a117afacdbb50443e741c24c1b867a4ce9636b046273a,True,Tests_passed,2b3b2b3e99a5ccb17e80771fb5d075d13029b32653ec44ed99a8fd91a04f6584,True,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27,Tests_passed,800ebb68f986180db94515c69db2d3019e9f74d6f06f575bfd3554f8614c3e27 diff --git a/results/reaper/merges_tested/apache/olingo-odata2.csv b/results/reaper/merges_tested/apache/olingo-odata2.csv index a21f36df2e..13c7762b23 100644 --- a/results/reaper/merges_tested/apache/olingo-odata2.csv +++ b/results/reaper/merges_tested/apache/olingo-odata2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,843fba1449b367d5eef6fa69f4606bbd7232a9d9,352a82c3ccfd91ab45e21f83309c675886332bd3,21dfed3b6b399e4629729e35cc300104b74cb153,,True,True,Tests_passed,89082f64daa0c2b0bb5c32a9d370927326bad450c8c788a072bcb6fdf78bf04b,True,22,156,649,2,True,Tests_passed,9df2bfc43c74ccd58819140a1fc0c0dbd696f603f3f7ac2c121ada075f985e8c,True,22,True,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0,Tests_passed,d6e6982a821d2ced55776cae6f9c236cc51241c732361c7e4257ba9c095f02d0 10,refs/heads/master,13b7b4897e7a1e67852853e2dbefbdd1dc69d484,03858a15dc4ecd956cb2ab7cb6dcbb5082798de7,4ef73c4b401199a2b8239db46f2a7eba5be458bc,,True,True,Tests_passed,5f95ba56537213841f7f7851e33f1618b71da169da5c92f531b42c2d4fa053f4,True,3,4,4,2,True,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,True,3,True,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_failed,e21decef93ec67eea9f4750cfd72ad329c57af8738be09c5c6dbbddba0423c82,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7,Tests_passed,0a1ca29d311944b2d30b589184ce143dbd5524375236dbe9dea5a370cdbc24c7 11,refs/heads/master,438f7a95e6209aafb763d3790f260efd6067d0d7,5f81a5c4c2c79a26619528ed9587de27bf27b7e7,ac22319687de5c2da1f58e3667612803fd6ffd2a,,True,True,Tests_passed,4682f404c8742b3b82cf1d0bf2606c209a516c95ef3c94d54284e8cdf516462b,True,15,35,198,2,True,Tests_passed,851b72fe7096edaeb743b9293a4d773b933e02ea191da522e441440b5119a2a5,True,15,True,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_failed,3cfe3399c4c4abb7bcebcee41381a0b067adf57608e6f63db26ab5225f01cb47,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36,Tests_passed,0eae8a2ffd7c9a6d8922e7d3a651d1dfbb3377429788b82f4b3082e620059d36 diff --git a/results/reaper/merges_tested/apache/olingo-odata4.csv b/results/reaper/merges_tested/apache/olingo-odata4.csv index b4488e22b2..1763e49061 100644 --- a/results/reaper/merges_tested/apache/olingo-odata4.csv +++ b/results/reaper/merges_tested/apache/olingo-odata4.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,820b462f4957ee1e547f21de712c394c5eb159b9,ca876f1fb99b224369fb27056d462e22cec8700d,50ac6c8494ad496fc1c1b4632a32baaa692007e4,,True,True,Tests_passed,61d86800cd87baf765d7df257a0b35eafcd858cc659cd85d2b7b35dbb19be2e9,True,438,1878,20610.0,2,True,Tests_passed,ead63826e7e026b606bf36a5eb5734dc188954f5129f5b5cf4369a0c399bc269,True,438,True,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,d837e20cd0da05ada2782e797a8b7d82c9fb38a281c9175c491b00576a85aa35,Tests_failed,357105ca837167d83c97b8ff063c17fe9d66ce565242af573ceb19cbed0062b2,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,d837e20cd0da05ada2782e797a8b7d82c9fb38a281c9175c491b00576a85aa35,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef,Tests_failed,e584ed7b45c98adaf7bc15ed93a4ec9c042eb55ee26919d7b7643b654540c8ef 8,refs/heads/master,74587d98f5f9018129e9bd322bc58a30916d2d8c,9e94d9521f93879c554ccc8442c3ea82e8edffd1,a19ab7cb1d6153639b51c8b3f4c5dfffd338238b,,True,True,Tests_passed,0c7b6c1e8ae8fdbc12b699152bc83cd578997d53b8475675acec31bb22357418,True,21,75,634.0,4,True,Tests_passed,68742d3a961864bcae38e498f452a0f0cb2943eb40f1959803a2006cf36b6632,True,21,True,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_failed,3e1df2e63be471086412d9a2773772912c8cbf6abbf4ca4ccd712ceb77ce4bb5,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_failed,3e1df2e63be471086412d9a2773772912c8cbf6abbf4ca4ccd712ceb77ce4bb5,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1d9a7f3c26795e5a23179df89db9efe9d4434050d79dcff9407c6a2e6e0744e1,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76,Tests_passed,1cab64d618aaf3390cac436026a25557d6e3b65b8cfd6290398afdebbf73ed76 14,refs/heads/master,e839533bb43b3c12f41a9123c07792d024fd4143,ebdf0d3e3a604133e1a54e79aecd7299e6b7c55e,b09dde0b3991f458dec1e90e74e6fce0639cb849,,True,True,Tests_passed,14640901f09e2c3795a35995c1ae9d29ed4fbd539d97370fde97bc62c2803e87,True,14,74,304.0,3,True,Tests_passed,c1de20657882f11bf793b072424ff430c1c050fafe9682272419247dfaeef7a5,True,14,True,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,e8f9f559b95e055a3f20dd39b92fe699b247039b467200b27e099e16c5f009bf,Tests_failed,ce3f00a15232bd39cb724312f803168f24140f487e4ecce8169fe2a24a0ae709,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,e8f9f559b95e055a3f20dd39b92fe699b247039b467200b27e099e16c5f009bf,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,1dd851e03b1ca265c69d3b12872f943ea7b947e59cb30f3a9d4a5c4e2f2fd0ad,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc,Tests_passed,ef8a5cd832306465c7c39dc0ede7dda8d817d16adba932d907149354f9d2eccc diff --git a/results/reaper/merges_tested/apache/opennlp.csv b/results/reaper/merges_tested/apache/opennlp.csv index 9d5b70f5f1..6a405f2b6a 100644 --- a/results/reaper/merges_tested/apache/opennlp.csv +++ b/results/reaper/merges_tested/apache/opennlp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/101,6fceb69a6af56b3ccf80b333b25f884a20ef224e,62e6242804e4167f5c476ae34acc784009a1af0f,9a0d208129c66ce13e90edb9765e3ba3684d7b80,,True,True,Tests_passed,a86ef3da5c32de2e3b8da7f9fbdede66282481f54c61b66a51d37831045e3118,True,581,3034,27124.0,3,True,Tests_passed,8518d304966701bf30996be17b0430c6da27b4ae062d0f0847b09dd30bda240d,True,583,True,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,1f4acab7d852d1df2021d27455f3ddc9fb9a23e62ece721b6f1149d2f9efdc35,Merge_failed,cbbce31659829ca4eee79a747b67e122babf0ce8e2b3a94a7d36b082aba114ef,Merge_failed,37fc1da6794fa3ad3fc52f3d83e466065669b99eec149838529a320911449527,Merge_failed,08384497073f7555589a741d7a0f1b1a2bc2c5143e7c706b4548afb8457db29f,Merge_failed,cbbce31659829ca4eee79a747b67e122babf0ce8e2b3a94a7d36b082aba114ef,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,2ba8543576b5da6489629fa83d683e336877301aae26596c3d4e8f19440829d8,Merge_failed,37fc1da6794fa3ad3fc52f3d83e466065669b99eec149838529a320911449527,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,c3c706b5d7171da76f1b0f153aa9cf11db293e1d47bc7b9e91c6208f68f6baf8,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52,Merge_failed,b7b2322f8698e4e50fd87b6bc23f5e9bff428dc0de2741902a28b73b93deea52 9,refs/remotes/origin/pull/14,8240a2c66097f25303d9f4959b128db9bff1c840,c7d4346838f8dacac362afa0f532a3b715dc6320,43c388388cc93406cc029f8a3b807d09e0744b8d,,True,True,Tests_passed,0d4aeb7ca30285b8512ce9154dac1123228d15379ba506680eb86f6b0d5c1a05,True,402,1685,7921.0,10,True,Tests_passed,fd678101aba9c441df9f89c72444f6dbe88b9e6b65ac7d4a4f4b268f4e0205c5,True,402,True,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,c764bc836b9db5b98fd37e46818d90e6bcff6c28a98a21060b8acf17dcdd3546,Merge_failed,0aa231fd7d7c58affcbccc550a6cfed36d52cd3c2459a02a1e5dcfd2144bcb1b,Tests_failed,9afe1a2e5390e4c532899ade2517b8ff194b989b3ad1cb3ec316b1996a3864fa,Merge_timedout,,Merge_failed,0aa231fd7d7c58affcbccc550a6cfed36d52cd3c2459a02a1e5dcfd2144bcb1b,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,4da0a7c7d1dec1f2f67a73ad8f82be8b4f67b91ddbad6e2626185a3687e78118,Tests_failed,9afe1a2e5390e4c532899ade2517b8ff194b989b3ad1cb3ec316b1996a3864fa,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,685b8cdb29af1dc5238d0c4324d8a21847ea144a5278617f64611a275ed87c02,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558,Merge_failed,52664ab9c749e6f54492fdb07a79a1597b4a5caec5ac8b8126f02b7e11e4e558 10,refs/remotes/origin/pull/14,c7d4346838f8dacac362afa0f532a3b715dc6320,6a966b1696f68654f4d3a39cd74c114e3b6401cf,25724449667875591f829588e8652bbbe8739849,,True,True,Tests_passed,d876e7aab27b3082da9cf44039222e3842f1ce3bcd668106c133125378e4139f,True,11,33,127.0,19,True,Tests_passed,7ce16b91d26cec2b5d80bbb1949610977c47f3af39cf588c301511f4acc8796a,True,19,True,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,773b8d6fb39b0231031460d317ed14ba656d54282a56cb8eb1c9331d572c0e2f,Merge_failed,450aa47a18ddfc4f00a8143d04a2c21808d8b794835acbb8825e46362b493258,Tests_passed,2bbfccfe43d94a32c2ced6a2059e15d68988b24b25364d222430e9c4d6cdc125,Merge_failed,7edcb6259a4ca4fba4f31ab00273bd8c698949c7119734795b3a51d540099d0c,Merge_failed,450aa47a18ddfc4f00a8143d04a2c21808d8b794835acbb8825e46362b493258,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,6a433d55843ee0b21447ebfaae02f30e3c3a8d3a1ba63d23dafe45cf6d6ebf64,Merge_failed,7685b06d131fdf6f5069f9a5b179ae92141e20c666b7d771bb9a84ba23310e6e,Tests_passed,2bbfccfe43d94a32c2ced6a2059e15d68988b24b25364d222430e9c4d6cdc125,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Tests_passed,d09ead637e54e94c93798cd187de542a0ac78d0ed9e4b770ca264c736cbe0fa7,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd,Merge_failed,9178cfec585b4336924fbb24b8ae970fc021bf23645aabe28c3f0388bec8aebd diff --git a/results/reaper/merges_tested/apache/roller.csv b/results/reaper/merges_tested/apache/roller.csv index 1b6aa40782..40b74a91e3 100644 --- a/results/reaper/merges_tested/apache/roller.csv +++ b/results/reaper/merges_tested/apache/roller.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,1628c3a3c4425cb39d2aa5197cd94f817c9e935e,3495b5131c704a2705b373d018043d830df8c809,8475fdaed28dfdb21e5c94f5d5cb41f4caef3f5d,,True,True,True,243,996,1297.0,13,True,243,Tests_passed,8c8ea94403500c65be98f334e28d593c732f89781ca49a16386c097b38fb4b21,True,Tests_passed,3fa0a1fc81ba714c6bbcc20caeca44f871dacd96970dc9549ac9b2a5642cbf44,True,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,c89df9dec7ff67bd2f851b47866b074a60f0d8c19a95e7a7f05145df21124628,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,c89df9dec7ff67bd2f851b47866b074a60f0d8c19a95e7a7f05145df21124628,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a,Tests_failed,04f483f68370ca97f075fde190ca839e26ba5f0bf96fe8e8bb80b7d0e19ecd4a 93,refs/heads/master,4e955ce4618ef1484eaeb42e5aa42650f5abc616,ed48b479acea0fbee79c5ac1fcc0380d150cd06d,d456d54200e7c747ef0312ca190c2a15433b6b3d,,True,,True,2590,2108,,4,True,2590,Tests_passed,f74899072cafc24f821746c0aa5ed3980e86333f30290af9ca8bb204ac9469b8,True,Tests_passed,9bcfedea1bd9dacee52ea37b0461cac41da9dbff90ed51947b1035988fc61c4b,True,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,d9a4b57c9b8a24e529821351a33b089685ae929086e1c76e7e726e0464a47780,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,8349cc1020073a479dfde08dbae7aae4d3cfc8c34ed86f307c3ebe713eda7fd5,Merge_failed,1a92293bfb4ef9fbc3cc3f11d72353081af158bafecd909109ecec864a08b078,Merge_failed,b4ccdf7955915858e97671e6dcbc9a5b66c1478ea7a36fff2ddb2700f6c7e602,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,c24b3824774acb29026c6dafa9fd7a29f55626f95f17808ec564cc2042b8d6a7,Merge_failed,4996d1ca29060a1cf4042857a1801617d388be0e57349b0a27095d599d9c6f88,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,90edff75af043402ad2662e9b724d0db5fbad0279b90795cd902b63a67c05040,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402,Merge_failed,ddd10005b3659a3047fffaa036cf46442cfa1693cbd786cb63f149dcb82e1402 96,refs/heads/master,cd196fe541630c996d411fba01fa5981c09a8449,44b008d5d761e08eead9a643821b2d66684c7382,de461a7654d6b9fce2509a487ff0ebc88a4ea1d5,,True,,True,2707,3000,,5,True,2707,Tests_passed,a611028b34a2af115b64a34b6140ef71087d57478f0819b628e2f48069359452,True,Tests_passed,0dd4a1283c87ae5c02cdc81b379c1b7d61b884d69880236d629b6a5de62dc3b5,True,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,13d005481c2eb4934dc07da589ed3f80732acfbefebec97e32bc9462d6a770c6,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,d2f679a181ddf9d0452c9042a2b7fbdff9ab7c252918424d1af81db1ab9dd58a,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,53ff8c494e106242761524aee7952334fc748f8c5edbf9ddb876406938f1e558,Merge_failed,ce4ce88fc67a198659d1e5dee612c362634084d3b73cce6936871ec4246376f2,Merge_failed,13667a9dc7492462ca85b3449adaed0a05d49cec6b8553e1142b7b8c3bdf32fa,Merge_failed,b3ed0f444485c6108e077bb822beef1c892ca690d18e9f889ad1c56190197351,Merge_failed,287b2b8f1d1ff1837fd36280352fa825d284c1653597aaa71196f6421e9ca0b1,Merge_failed,13667a9dc7492462ca85b3449adaed0a05d49cec6b8553e1142b7b8c3bdf32fa,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,d2f679a181ddf9d0452c9042a2b7fbdff9ab7c252918424d1af81db1ab9dd58a,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,4186faf5bf9cb61cadde344d7018f2b30ce3ed4587e5b7a1424fa86d534935bb,Merge_failed,53ff8c494e106242761524aee7952334fc748f8c5edbf9ddb876406938f1e558,Merge_failed,6e3265e8e52dc53e3ec999b0886eeb3c7761b8650367f1b8f2f4f39714f4735e,Merge_failed,ba311a83cfc9cf4a54b42ab1fa4a07def4f757a62a441d4e215dc29331478936,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,13d005481c2eb4934dc07da589ed3f80732acfbefebec97e32bc9462d6a770c6,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3,Merge_failed,4233baba923a059688edfb8d854c10593741b1a91ad5d838b401534cb0d1bbe3 diff --git a/results/reaper/merges_tested/apache/shiro.csv b/results/reaper/merges_tested/apache/shiro.csv index ffa5aab189..fc2f0da6a9 100644 --- a/results/reaper/merges_tested/apache/shiro.csv +++ b/results/reaper/merges_tested/apache/shiro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 439,refs/heads/main,13806fc623aa64ab89b64821c1db55ee8e6468e9,99c55f65ddb70d7aa5b8f2d61051c0ccdb747ff7,29f6c0e2eb9052738d85f0f71f0583c5b97f5c99,,True,True,True,25,39,1940,2,True,25,Tests_passed,9f3e03715ecf6b2ddbcf89eb4fc754ef8f88093898cf95b5fb57a8733d3fd3fb,True,Tests_passed,a53a2fe3bc05c65017b3b6cc0d16134eac64e5bccb1e723356f8259f0d78cdd2,True,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,327b213bc6f4b8af855ca0e033584076cf39834ed4cb5aeeec11b817b11f5f3d,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,199b68c14d6459d66d30f994c9e94710ba7c86d35183cc36f0a76a37116dd8e9,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39,Tests_failed,b5d2d35b0ee1beda812d86deb88c44c7d2ee5a61ba25fceccc7ee73c9ee83c39 diff --git a/results/reaper/merges_tested/apache/tomcat-maven-plugin.csv b/results/reaper/merges_tested/apache/tomcat-maven-plugin.csv index ef239d7c7f..b5bfd3de9a 100644 --- a/results/reaper/merges_tested/apache/tomcat-maven-plugin.csv +++ b/results/reaper/merges_tested/apache/tomcat-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/22,74e25e53e896d6ce9e1d406a1397c47a62937192,70ff85fdef87332a616af86db5876b1612b9eec3,74790767f2ce49b7c2203d3adc5b2cc32ca9fdeb,,True,True,Tests_passed,37459137dd00217fd541e3e1b8481cbd017ff87b5e7241f8acf83c7c5b319ffc,True,101,145,13939,3,True,Tests_passed,62a16fce7b73a6c8e1bdc908cfa40124ccf126b4ff91663e7eafe4e8d8f0d000,True,101,True,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1f381a9efc67a796b0a55b378591785e574fdb6164dc9115ea00901ad47f00a1,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,1fd41b85b8fc2ed04932ec3c7cd87641eae8b0bd697216f28a908dd55df7688f,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250,Tests_passed,bd8534500f2a7453282056c43ac8d9936d3f77f183a6cbf88161b5efa1696250 diff --git a/results/reaper/merges_tested/appendium/flatpack.csv b/results/reaper/merges_tested/appendium/flatpack.csv index 90f11d5d4e..1f08268a7a 100644 --- a/results/reaper/merges_tested/appendium/flatpack.csv +++ b/results/reaper/merges_tested/appendium/flatpack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,5e09875d97db7038e3ba6af9468f5313d99b0082,4958463e5a0d1008a43fa9e44b8b4e653ca9c719,b9c4bd89e021b980bbb4809d0a7749ab4d12001f,,True,False,True,3,3,4,2,True,3,Tests_passed,8e935556279de81bdfb886820671c62a430cc8c315cead24cc588765449921ac,True,Tests_passed,101ca456068e58cebf4d2543931c88e218c292ee4e8550ae9d87c8cac4b85558,True,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ba7b61aecd90c720605fa751448c2cf70a0a7004db45ab8526256da4ec9c2af0,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097,Tests_passed,ebc884662798ea05aa98337ac846472733a6437d86cd79a6924f76dafc306097 diff --git a/results/reaper/merges_tested/appstatus/appstatus.csv b/results/reaper/merges_tested/appstatus/appstatus.csv index 3d3e569767..f49dd9ca55 100644 --- a/results/reaper/merges_tested/appstatus/appstatus.csv +++ b/results/reaper/merges_tested/appstatus/appstatus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/heads/master,c76bf77dfdbd3f235a7ab6dc304504a19e0947ae,b5f911a83e5319df2ff47603d24ab84b5c1cd930,08282fb20f2be3845592118435b9ae6f750ba2c4,,True,True,True,7,60,233,184,True,185,Tests_passed,0068eb6e8c396c3450fe57ff8866d29d5db0b689e6cbd8b31b007f9fdcf3cd84,True,Tests_passed,565af7ec27ba0172cfe94036b85cff7412f1e8a005516deb3094b8af9590442a,True,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,7ed8922ac73c7891f8ea4afbc08c014332d53294a6b9136b71fad615b17d80cd,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,b6be2f65453bfd1f1b96f17e65e75a2e6315f80399aa5aa0db2f977fecdc16f9,Merge_failed,7dcf2bbc3e7a5ed0798e00a07a22c2a2e56dd6420db1e3b8510946d9eada1c41,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,d92a238eb73cf0d0711c6a4c1d71051b8f7b400f59b15e55de666c82d3c6484f,Merge_failed,5dd14582cbad4fb848e0100a576563f391f3f5a79fbac5b8d1499923ab6b00c8,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,eced298f737f5e48147340f610d748109771a37a7b589f3d6dfbd88bb544cd5b,Merge_failed,cf8848fac1a010eef037c3e48e816b52ae9736476a98c80f56dafacd418b597d,Merge_failed,e6a0da9b536e2ac0057a2ae74e10604f858cb13d9a055d99921fa9bf5b45db7e,Merge_failed,72a84663ab42a35c7f24b44a9adb714bd7b0b9f692ec1ae859e4e5dc6af6fbc6,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6fedb6fed8ac5de4c6b2292ae4b61aa458cc63ba73b7f1faa8581c9a857deee3,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca,Merge_failed,6d4b009ee218fb47aa4fdc18a151d42d5cfac11405668b6469507c97902915ca diff --git a/results/reaper/merges_tested/arcbees/arcbees-archetypes.csv b/results/reaper/merges_tested/arcbees/arcbees-archetypes.csv index 40f2335bc5..46b8f07ae2 100644 --- a/results/reaper/merges_tested/arcbees/arcbees-archetypes.csv +++ b/results/reaper/merges_tested/arcbees/arcbees-archetypes.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,084676165de5efceeb6002f5fef9ab28411531ea,a28fc80a9d07b9eeb2eae944f59478c949983df1,e39e7ff7e6e62409ea54d2e9b6f5b05c209d3ebe,,True,True,True,132,276,692,3,True,132,Tests_passed,a92a1512f34dbf008ec12ced0cb44d2023b17e44fff1157adecc8c16e92ad0e2,True,Tests_passed,b36afc048802b58eb2bdafc8d28d8dee3ed0541678481f3a55a08d2573c14462,True,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,a0f65412de8b7d361062cdd991c0ff4b2a59261be0f8b32d85e41a20149e60dc,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,3f95e24842c292d61fb1d9170f9201ecff2b3da9ccf9150e3da958b18ec7c3d5,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1,Tests_passed,789a446202c85275e3ba3a14d616ed5c3e08210b09905822a3ece9a17fdc3dc1 diff --git a/results/reaper/merges_tested/arcbees/gwtchosen.csv b/results/reaper/merges_tested/arcbees/gwtchosen.csv index ca45f6f5c2..092cb29efd 100644 --- a/results/reaper/merges_tested/arcbees/gwtchosen.csv +++ b/results/reaper/merges_tested/arcbees/gwtchosen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,2f547d0ec294537953214e5e29b2cce8cf6ff440,d127b18331b2ee9b1fcc7e6be3a15def933e3553,b9f0d3709fa109e55a4adfd265bce8e95de0605f,,True,True,Tests_passed,6b576fb34c5b4e80dd0141a78d1bc5e5e7168230c11761f600f743955676fab4,True,6,8,83,2,True,Tests_passed,e35bc67f049a6ff6ceae4ec9c79906ba5424d80580c2d5ce367ba8c71d1aee46,True,6,True,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_failed,8a9ce0675021e6b7224be5f6ba17e860582e458fe864954c198560bd80f18d38,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d,Tests_passed,ef0754dd1a1e43079fb7263059643709b6b1d639c0388486f4f26dec042ed86d 10,refs/heads/master,81c336ac96ae1ef86e5d506d32d387cfe95287f1,a414b8d8c0ff536efa310e139664f8db260d3682,58f0e24814fceceb7d3c473721a551d4fa409718,,True,True,Tests_passed,8e8f7dd07c57187c30874a25b5c18283a2eb06555f291bfdab7a90f1cbbc80cf,True,21,58,478,4,True,Tests_passed,53757183f66cda8de20adc189468e712451bb4ce547755af8807532b204f588f,True,21,True,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_failed,8d4c71a57062b1d307f8cef5d848c94daf2a8df94f17c89cb460e7bd749edb33,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e,Tests_passed,8639a60c2ce4c0cc3a84e3ee743b6309eed3436017d00f12898518ab9d73755e 14,refs/heads/master,3a485493c2f30e08993762075a1f704f442ea5e8,b7f65bc9c3a9a395796dcd86e8128abd07b826a1,f86997364588510c6fc8446a820863105238c3ec,,True,True,Tests_passed,78004ef9ab96aee3e0c5ac7f42bb7a3212cd4cec2b6c5d0978d4eaa04091297e,True,107,609,18090,2,True,Tests_passed,add2e11112039c010d65bd1889ddc6ad9f840fd8beda61fa682c005c05a14eee,True,107,True,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,dda4ed9193317e8e3242622f5cb7b185e826384e53a06b23d6f009673792f6e3,Merge_failed,5af2095bd5a5a83884f3e2a0dfdc2fd01e505ea2765f6ef513b4dcde28c0bad2,Merge_failed,d7a40940b738d65bac590977f5bba997b221db7402a1439624e68b29d421b067,Tests_failed,e9d93312da802c54e79e92657544d60ebdfb3ebc488076eca4ff22b5b304627d,Merge_failed,5af2095bd5a5a83884f3e2a0dfdc2fd01e505ea2765f6ef513b4dcde28c0bad2,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,1fae28f98a05fff2aab992d556f07cefac7f2afce310bbacb116978fcf84424e,Merge_failed,312f58ab0eef0a59981e9a70c9775b235deec943308b458276c0e2f9ffe376b2,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038,Merge_failed,aa98bc5a27dd14543014253b815d62fc20ebb08c3b7deb820367c3ad8a863038 diff --git a/results/reaper/merges_tested/arcbees/universal-analytics.csv b/results/reaper/merges_tested/arcbees/universal-analytics.csv index 1bd5e99b48..f5ddea9bec 100644 --- a/results/reaper/merges_tested/arcbees/universal-analytics.csv +++ b/results/reaper/merges_tested/arcbees/universal-analytics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,d4259d6249da0e00f06f46da5c68e12a89dc7f80,94a02010f5d77d4472e4a618af3c5d74da5207b6,6621d617e75f83815f297d2e734b4f6952d1615f,,True,True,True,39,361,1600,8,True,39,Tests_passed,c7ce74e29e8e7352afd4c31fc2bfd7c332d2dcb12d76e6e88acd8bbca83f67ac,True,Tests_passed,5ca1de52e35b6501158fe73bceb17c0364a2ef6981074eaad08286c416d28f17,True,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,781bcf97efd2cc2798964ae6bf73ad40bd9a301f511a617fc10762d089399f6c,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,1b8ed382758bb730d09b76f819445a82cd80d72729328375794ed0a453f3fb1f,Merge_failed,3d2e138c88015ca3f0f7eb56e185f917508736ce7a5d6041c8fb1528def820cc,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,a7cfc97a6bc8f959d5a6d0057c2230bbcd8fb9e59dbca3f7a4a1ea7775e34d31,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,b681f3c257bb4ce4b747422ac1322b5c7dd442650da2a8daea8335bca718e6e0,Merge_failed,0421c467d1be38209523302e938274b149405e277f9dac718eac4c2ad1b9f328,Merge_failed,283e5a1320d3c1cafde80917fb93867c8d41d94f89b1319493bdb1fc66ad4a21,Tests_failed,99f2cea70bddbf358b202f8a28ec92f2c22141ca8add39c635e554f5ec809f78,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180,Merge_failed,f5f0fec9ec50a2684db083cc68de0ca7d8196f987f4213611adfab7621170180 diff --git a/results/reaper/merges_tested/ardesco/selenium-standalone-server-plugin.csv b/results/reaper/merges_tested/ardesco/selenium-standalone-server-plugin.csv index 92e5106cb7..e49f1f12d4 100644 --- a/results/reaper/merges_tested/ardesco/selenium-standalone-server-plugin.csv +++ b/results/reaper/merges_tested/ardesco/selenium-standalone-server-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,957d978135279c122dcfaf9d72ed5a89f487b0ae,2fbb7e4f756f0288d11b2cf4bf2ca6e25cbafc07,c14176511dd6db04b8b175f5c3cb30abd9929449,,True,True,Tests_passed,33de56f17f9a862cf5be309b20f7dac23da7a8121ac3bd88510a53417b0391d7,True,14,50,333,4,True,Tests_passed,506a90dc93cd6f4f00ce7df0c39bee07cb8eb9a14f493a3c3e0a1036a900fb56,True,14,True,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,9851f5b1e8a39aa126a579557b022b04931ddd9d4f7a859002a56f0f2ccf913d,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,673377ed588ca1778189c5e347c0cd48242902be5aa73156c70fcc23060f3f6e,Merge_failed,b253f395f8d734ee19571433b7e50539a5228e53929eb623bf1df90577a3693b,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,47f5fc76f9c1f75adf341f474ddae4e49eaa4d95d6bc395ae1018c435ffdf2ba,Merge_failed,2b5d3fe603de9b434b9f03b7dc1b3b83525b69b557708de3cfac5a8bd06ae311,Tests_failed,adeca2670c041011dd9497b46fa66331b258a047acaede7123e70deeb2753425,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2,Merge_failed,5fd8e57e6b52323a0048be8aa6392d7bfb00fad99d7d4d747ea96a15eef7acb2 diff --git a/results/reaper/merges_tested/arimus/jmimemagic.csv b/results/reaper/merges_tested/arimus/jmimemagic.csv index d2a9e81aac..f9ef9a7683 100644 --- a/results/reaper/merges_tested/arimus/jmimemagic.csv +++ b/results/reaper/merges_tested/arimus/jmimemagic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,c543655186711a1c141e3af8201ed0f45666dd5a,2f3cb6d930b665edfe70f06eeb03e76cc869bbe1,d2bad1e68bc2871c21c3baa67ac54f88aa7ab4f6,,True,False,True,2,1,18,2,True,2,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,True,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,True,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,979001eccde34158f1f6cd65cbc9d653bf43049328eed8d76ad400f4fb565f94,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_failed,affc0512dd5f97702796225b939faee8cfa753140035e339b3f43c76b2832d60,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Merge_failed,3cd325a7b715ba73f5ba2e10d3573ddef3313796e1d762998300ee5e45f037ff,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Merge_failed,e1357f7a3622d04ea7cdaa39142c8dbade4c6e544dc0fc474fd0f0039b9b0b27,Tests_passed,3b0a699729fcc510fce2c81f84cc67778fdf574e1e22d68e7ed4ade24084b962,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,1b7d22a1f6f3e79f2882e00dc542ceee84d3643843a9c762add3e64e396979b9,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e,Tests_passed,16b58193b3b6425c9ee937eb5722953e674631041500097337fc22b98e6e839e diff --git a/results/reaper/merges_tested/arnim/hdp.csv b/results/reaper/merges_tested/arnim/hdp.csv index c7d07c6615..5d5f6102ce 100644 --- a/results/reaper/merges_tested/arnim/hdp.csv +++ b/results/reaper/merges_tested/arnim/hdp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,57e634d310aa6445d6b27e3262801d235a809357,d47b8c4e62b612f326f1b31c4c0db125b6597622,ea7bd11d56e0b1869ec861ecb011fa7fa309f84b,,True,True,Tests_passed,7c8982c3e9b5f2cc621b9e64dc0a27347185b827460129b4525347fcd5cc3d6e,True,18,43,1077,3,True,Tests_passed,d8919e0a2d04c70dc26597739bc83021437dfba63ff751fd79589df88da8ccb0,True,18,True,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3,Merge_failed,e7c5748f739af93774dcbb0921985b5f2654e01050402c7686b4a0c95028dbd3 diff --git a/results/reaper/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv b/results/reaper/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv index 4f35c96246..de3c13b383 100644 --- a/results/reaper/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv +++ b/results/reaper/merges_tested/arnobroekhof/kafka-http-metrics-reporter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2def1e280114d209ed8a7314a8b236051b4c503b,85631073f159e2f624955db081c5759e6822c6ef,2371e6119d531a6405d6e89d7ec78a2aa4012365,,True,True,True,7,37,340,5,True,7,Tests_passed,df8c858ac71d05013d16bd16d82d10b3256166785586b6b22044608f55e9ff37,True,Tests_passed,03d8896cd387655bbc4eda5c37ad6f8305487eef241542fb3a87ee7f938714db,True,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,39f730c5f64333a92dcf2e502c274e8be4b14980d5933dd854523c56ad2805f2,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,6dcc8b0b29f434e5b85dffdd40538917c2fe0084288ad7b0f04964746938215d,Merge_failed,d0cd89544354f20cce3a5b73b5d30f7bfb7d6d0c6f0828e0dd37185180c92d6a,Merge_failed,f49acb5304a6152efa27021e7cdf65a15b7d278fa64d80af2bf44dfe3fc178de,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,4ffa54aacce705ab644433d1dc030da77bec119ff7bb91fb5a5c99ecf6c6d854,Merge_failed,fbf0086d8d826d660e093639659cae4748f177781a8868c16b3c64bd7c39c5f2,Merge_failed,f8530239006d2eac8ce1029e1b339c90727ca9bce14bf0047f7053d6e2cf92de,Merge_failed,c59ed1f818d6e557a8da7d5795631429d4195536f6aca8f615f98046ce3c7c0f,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,09b9ee961eec4e0f87e4208ef367469bfb67cec935900a61dd86a9210b1d3138,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa,Merge_failed,e6faaa2d68503354aee3ab80219875eb6df9a43ab992ae2e2b38a651adbab5aa diff --git a/results/reaper/merges_tested/arquillian/arquillian-container-jetty.csv b/results/reaper/merges_tested/arquillian/arquillian-container-jetty.csv index 5d8b4e5fec..e87e088ffd 100644 --- a/results/reaper/merges_tested/arquillian/arquillian-container-jetty.csv +++ b/results/reaper/merges_tested/arquillian/arquillian-container-jetty.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/87,39bdbff77e89dc772b812683a19a55b7db9ecb6a,38a562379eb854cc31391e754cf0e793fdf8e35a,e9c27acf0fa7891a0fa7b833da552ee7724ad8b1,,True,True,True,31,139,978,2,True,31,Tests_passed,de037d51ccfab8fd713240f1e405e9e0a45b3138f5d859d1519f61536bec14a2,True,Tests_passed,147af071ad6577bb1dd648880354c0ac645fd3ddfbedd1d03c602bf83635e014,True,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_failed,62865ba94f5477f30274dee864b138c46f296e2b6726f7b0dc611dc7930ff945,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,fe72251235dbf9f2283ae48fc565b730ed611fbde64c6c6ebc6baf0f995bb1fc,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437,Tests_passed,1d45c46c7d3521ad3a57846b72a34d85a34554746aee6ac4b3612715c356f437 diff --git a/results/reaper/merges_tested/arturmkrtchyan/iban4j.csv b/results/reaper/merges_tested/arturmkrtchyan/iban4j.csv index 83cc4d92ba..a26930ffda 100644 --- a/results/reaper/merges_tested/arturmkrtchyan/iban4j.csv +++ b/results/reaper/merges_tested/arturmkrtchyan/iban4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,52ace4f3cfdb442793c5a0b0f4b58c8fa5397c69,1a86e4dfcb4c9a3337cd3f7942da94284cdde8ae,23e67a9ce83f2af6a6059bd972ad515ede9166ca,,True,False,True,3,4,27,3,True,3,Tests_passed,eda661163865152bc92ced945c3214610bef32268d5aeeb7275f2b94e5958fdb,True,Tests_passed,ff90a9b8134d64dbfc5c0d1e6a42e7bd59071d6fcfc695e25e07f11811048f25,True,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,03a77adf5389d51a557f8f1cf54caf2b20126a152c2137d52b44879fc6d464f9,Tests_passed,328ad22c8cc79e9146b44a026ced4154eaa85d542733ab311110d3475567badf,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,03a77adf5389d51a557f8f1cf54caf2b20126a152c2137d52b44879fc6d464f9,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843,Tests_passed,6c0bec3b20234f98799593cf6c5c3ea06e9c058b54f8b3523a879314b6a00843 15,refs/heads/master,ee807e0a05fc291337dc0b8d5753265f55fed104,9de45a0291792726c86b1d8b843fa6b2fc7fb4f7,d1d3aa59e50447b135594902ef80877e5c852373,,True,False,True,6,18,71,2,True,6,Tests_passed,837a88b28f3967640d98a8a0aae019b256ec3aa12d8fef9c8745705e601a3c49,True,Tests_passed,2d0cbf9c6e73e33221c0a8342ccd3d5d38fa77dca15f10e2fec8590fd7f49006,True,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,c8b16bb4e0db3b5eb13b422624c3016d7eca9edeb7b572151a475263db7e3dd6,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Tests_failed,176fc8c75323f89e1166db637a3207a9f36ed241657fbc3a8edcf27cedbdf335,Merge_failed,34d9bc772257e017bdcd554d3f5c48872dee1ffb05a91639d19df54975bd05ff,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,16cbfd1caecb32e26bb8a2ecd9c0a07f8599ba37532873f1415ff3a4e5072060,Merge_failed,72db4acb8bd4666697b934b3ac6a54a4650bb2a4c606fac6906f220e6274e47a,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7d1768c125e45e3f10fe957dbc6c6e2ecf742f2d00873b56f41c5322716614ef,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935,Merge_failed,7ba9045bab134cea7dc8046e3e87cbd5e316bb1ef635285731a015c0a7118935 25,refs/remotes/origin/pull/102,66c4c0fe6fc398e325c12eeccdba1c0473c75990,90f325863915c17eff42735fc118b1c0dc9ef614,516d4773dcff39bdeac8792933b0124d974bff8b,,True,False,True,5,27,148,3,True,5,Tests_passed,ca4c778f951ac50fbd6611ac169682d35c37e820c762b27b7b759906b05b0483,True,Tests_passed,64bbb4448416d09f7e4c9f64b8e060ad89c0b167bc008ae60d75fbc61e762692,True,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,cf3193a76d1d6a52b25105d5c2f09b35be2d33381180304c37544085722fb526,Merge_failed,cd7de150bf5975a27788c726faef10e82a88bebb8252684060e1991759f2df0b,Merge_failed,559ae2d70c0a8bf97ed5104ec0017363863194128354d2fd10df94b3a21af2a8,Merge_failed,d39da41cb24ca804979237c6a8273ef3e0c293615669dd7fffad68a21dce15fb,Merge_failed,cd7de150bf5975a27788c726faef10e82a88bebb8252684060e1991759f2df0b,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,61ba15f8a1b3ab370a157140d11d90e476f92740eec9d177994e352e3f8aa0ee,Merge_failed,559ae2d70c0a8bf97ed5104ec0017363863194128354d2fd10df94b3a21af2a8,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,ad1408ddc99386e771bb9f87eea0f8d9dbfc4d5f7dc385781d48bd5c91ba9b95,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132,Merge_failed,0e855d30027f679c20ac069f845f89cc3bc62bdcd04ff20afacbb6780097c132 diff --git a/results/reaper/merges_tested/asciidoctor/asciidoclet.csv b/results/reaper/merges_tested/asciidoctor/asciidoclet.csv index 3dd1b9d663..6bae9f4855 100644 --- a/results/reaper/merges_tested/asciidoctor/asciidoclet.csv +++ b/results/reaper/merges_tested/asciidoctor/asciidoclet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,e31ec7a8acded7cc6ed731a391ddaf86d13329da,4b279a4f9b5f6719ef1d99014d6967eb460488e5,06a32ee38abd15691f802949c797e428c8b9f07b,,True,True,True,12,53,409,5,True,12,Tests_passed,c9f483e06f2176eda62d75ac4205364a082fcfaa36665f886377fc3ed3e7670a,True,Tests_passed,4aced6fc18d4fe0f7ec8e17b133463eb7d37f8a8f8912c5d285b1b30973d2dd3,True,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,cc4c9076a0a1c22a313d2687b73140cbe8b294f9bd7aaca404dbe4e22a687cca,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Tests_failed,c41572ffcdb9a004b932761848ae131e275cd1ccdb62446b018d5390a7a69bc6,Merge_failed,0481df96d87dc1f256d0f2a108874868478b46d778597f9662cdfe68d7aaae26,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,95a98deee5900f23eb6ff06f4b5d66dfa1bdb32034ccee2433dd3679d3c4ea77,Merge_failed,6e5e983462edc2e0cefe7144e44807905b5939f76b25b48678386bf9e78b23a2,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e73a92571884b5d3c456927019c53ee2dfe92ef059a30fd47ff2f3397475c00b,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61,Merge_failed,e9b89157c745de921a1a2b058efa00bacc69d3537ac3a9f0e2ed8c12534cab61 diff --git a/results/reaper/merges_tested/aseldawy/spatialhadoop2.csv b/results/reaper/merges_tested/aseldawy/spatialhadoop2.csv index f425aa8b80..54a7de24cb 100644 --- a/results/reaper/merges_tested/aseldawy/spatialhadoop2.csv +++ b/results/reaper/merges_tested/aseldawy/spatialhadoop2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,833f69b3184bfb8781abcacc04859fd8dbb01b0e,24b3b64b0443ce6d49e50ecd52934bddeee319b0,3d060e0c3804c23128a917d51d96876350d203b1,,True,True,True,4,9,169,3,True,4,Tests_passed,c92c2e0ffa0f0406331b6b4a7961cbf22ff143475c269aa9dbb022d0a8fc8cb7,True,Tests_passed,211649ad60b8a7b8ac004a571c67878435aa06379fbeed486874381cfe936cab,True,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_failed,2b34b6de605ffdc8bef8807147d9ff6294a6039ed225f6638304ac0cdbe975f1,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,e278e58788636fdc011f4c15cee3145e710371be9be9f72ce62435a923666b44,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d,Tests_passed,6304cb7b03eb2ea38440d5c380b9724179569c51e116cc9b317091dcbe95938d 5,refs/heads/master,83340231db8f7e94b9972fb90e6dbd379e7937fa,77dd45ad18995198d9763941a0ec5796e726635d,debeb83822e48a6ee582fdcc5390310f750779d6,,True,True,True,160,636,19545,6,True,160,Tests_passed,629d7efca8614c600a4fefb81b7b6094da185640f1023e431603472e2b4bb8d2,True,Tests_passed,855aacfc91ab198d43cc1449edf74ab696add0e0c4e5a48b5ad0c708c44db96b,True,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1a211c90422cba760ed28c0fb9a4d0f2a0e58b0686f3807694561949960be96f,Merge_failed,9e0cdff9ee6aaea6430bf9d56641c4b7e86eb9c63a9df473d101a9e61df73db0,Merge_failed,353e85ef1e0c83cedd9da86c148197c1660787c8d97a51381e1c86801098ad21,Tests_failed,4d2af375888cfa03c962fba552490ceec15f1022da34a2ec2490f8f6a31db601,Merge_failed,9e0cdff9ee6aaea6430bf9d56641c4b7e86eb9c63a9df473d101a9e61df73db0,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,aeb31c80c8feeba86f09dcec08ea3fe891d361f98a3f41e5e4e75e634633a071,Merge_failed,353e85ef1e0c83cedd9da86c148197c1660787c8d97a51381e1c86801098ad21,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,9755ff1b822200a6846067bc77906c0ca9c034e07ff7e763fcb3e9c3fd660ff7,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e,Merge_failed,1528123d29b1017ee2b983752cfd66df0dcd4f706636d37d147de5e86c540d6e 17,refs/heads/master,d00e0eab23794022e39ea6089db1c8235511ab10,0ffb6e0e745497e4d61554ea3b11407cdf4b4cf0,6d7775ab22ea31ffc8966ef4741bd0c4991446fb,,True,True,True,23,47,384,4,True,23,Tests_passed,0d2c9fccf5c35927d3fd80c38893f1a29ba0810d567632e9a910c33e76058fda,True,Tests_passed,edf8bf501749ab3edb444f8709e8da00af58de686c81402758e82ffe3d828a0f,True,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,48cabd70e88cc7a687920229e02a2cc0af6158398471137c9c943d5b4679f82d,Tests_failed,d66921ab61c0d8bd0f0c46dbc651208030eead10b1341ed49801fd371e63899e,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,48cabd70e88cc7a687920229e02a2cc0af6158398471137c9c943d5b4679f82d,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924,Tests_passed,63cf1d6502f052fd60517436aced10271a8263b42984cbd0d6bc70baa3d8a924 diff --git a/results/reaper/merges_tested/astefanutti/metrics-cdi.csv b/results/reaper/merges_tested/astefanutti/metrics-cdi.csv index adcbb58e30..a9b5147a87 100644 --- a/results/reaper/merges_tested/astefanutti/metrics-cdi.csv +++ b/results/reaper/merges_tested/astefanutti/metrics-cdi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,e3afc46398a8f613fbf841984a64a838d7b7898e,29e7bac497513de420543497612180331cc5d1b3,1def8a8aa23211109f40b06e979c0f64045e0bd5,,True,True,True,123,281,971,7,True,123,Tests_passed,ab773b5fd6bfa9d866a6f39016487e6dbed2e3793b9df7cd9d882b17165985aa,True,Tests_passed,b1c2545045a10b07384a65323023f020131d2b0c1c5cbdd77e843fb473e1637d,True,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_failed,f05e901bd0564fbc57ef81b5925d59c5a33ac2cc7a8226902ada878ee3959d0b,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,893abe44da484470312894fa0178d7be29d4c33e4b04f1c6e90eaa73a00c505a,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66,Tests_passed,540ea3eff8c8576059207c9c948e991d78d0f724bc1c045ab373ffcb6e9a4c66 diff --git a/results/reaper/merges_tested/astrapi69/jaulp.wicket.csv b/results/reaper/merges_tested/astrapi69/jaulp.wicket.csv index 2affa50e11..d51070b225 100644 --- a/results/reaper/merges_tested/astrapi69/jaulp.wicket.csv +++ b/results/reaper/merges_tested/astrapi69/jaulp.wicket.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/develop,f4a6f0e81a16add0005c7da1bc9ccc3188b974d5,b17cf26ca146d4d8eacaadc21b3f314ab1bbf488,ad14308fa5ce7ae64e07a37e30d973da77999c40,,True,True,True,31,165,850,10,True,31,Tests_passed,03679928af45d3cf429d0873a6c95e2f4e51195d4b0cac1ddae51a1e97581b66,True,Tests_passed,1c8f1af1715d3c95e0720e8dc3c09fd3f28985c6d6b378d2be39be54d32244a0,True,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,eb13a08a0ab6630fb2c7162e5679207c07418196228acdab5bfc1c6c1b61a25f,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,213c7d6609b3925ae62a5f20196367e1aa13415a1134949143c95b0f528e236c,Merge_failed,3353c85dfd422601c5fbb94dc3cd1e3a20aa5858a937ebfe7f416238ea1fa314,Merge_failed,afaf89a2e36aa97d6faf150f04d130e184ef5bfca8c42cd34592f67e6ee060d3,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,bcfa2773197488f7c86c493139bf8cb796ccba4ec5ebfe9b224173fd0496d9d4,Merge_failed,0c1f2d6657041e54d08d60e0985b557717dc694bdda1b22289892b31209a770b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,8ab25731a8399c9c8f39d672ac14761cfd3d2bb87e3b524d0a26de3d8f9d21c4,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b,Merge_failed,db2926b567655f6dc4ef611cd2931fda69ed10c4fa70564bdcf864da89f01f8b diff --git a/results/reaper/merges_tested/ata4/disunity.csv b/results/reaper/merges_tested/ata4/disunity.csv index 98764df124..e2c27f8a02 100644 --- a/results/reaper/merges_tested/ata4/disunity.csv +++ b/results/reaper/merges_tested/ata4/disunity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,dd5480db1fd9c27850fb0da3508c660a0e81cc35,4ba535e2e73db52bad92ffc409b890bc57beda2e,1f780886c2a9c467c435ac56858cf9520d5cd5bc,,True,True,Tests_passed,9210d8cf5e819f9ea82d1332a21a1b91dd85d629fef49a9df121b51b4e8cb1f0,True,242,336,13397,6,True,Tests_passed,4d9196122f458d04ba9168fb91fe2673041062cd9389a30e5a484f68fb7f8ad2,True,242,True,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,d392dfd1cc301317c906977eb6e88f4cc93fcc968f42a7bf3f5b67eb0c4276b8,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,641e3da696387291d4815af47713cfd4385561a1b5010d12a99d1b8145f63612,Merge_failed,f09d067b543c09a3d024e124a2a3386099054a8ce944bc71ae814eb68a5545ab,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,c74291a900df05eb1eae076fae81b8504eeb986cd2b66c10138caab84e17abba,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,462f185300cf0d3c7e404818f04c77636e3b034871953422712436c08a16ec63,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0,Merge_failed,abc43ec51849a5bbdd004d21c4b533012ea657a8ad267791519141b99101e2d0 diff --git a/results/reaper/merges_tested/atam4j/atam4j.csv b/results/reaper/merges_tested/atam4j/atam4j.csv index 9df2a68eb3..937920be19 100644 --- a/results/reaper/merges_tested/atam4j/atam4j.csv +++ b/results/reaper/merges_tested/atam4j/atam4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,71fcecb071270981bc92b14d2cc3b0e56828c011,ac72c93c78397f60ed7d24de967e1fe34a9b36b6,fb6e6e5d5b8dbcbc2679e18f3f491847f6dcc33e,,True,True,True,17,70,438,3,True,17,Tests_passed,205610f2f84c4fc3fe3a162a6cb8f4409067f27af6a1d5840c90980f844b4ea6,True,Tests_passed,1f646b266f7cb714e05397072ac2744a0b05b86dfef6de5740f8ea203e17e431,True,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,e765739003097850ccc9ac0cef5745cb6e631e2b3bc22d7aaeec90a9a7930f51,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,e9f1476d364c6c41316bc7ec7456383d731d43a194bb35f76cc6c7904ea92fcf,Merge_failed,fac1881ce2b066a48df0b110c11ed74736df2da572a272369fc412f593884bbc,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,d88c457cf7b5f27d58902f50a139d2260c05f96eecb8078b370e413b9b7ca9a1,Tests_failed,b4e5aa01faced64b5b78a60b396c18fb36c16e9574dda9506517406b427ce4a2,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,610efd8eb95c20e3c4bd06f4d1a573418ee3d1c6f3be011f92d9fcbf808155ca,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b,Merge_failed,3e62907a66970495bd77e5dea638b6ec82f8d3069b743dea117b985256a9a80b diff --git a/results/reaper/merges_tested/atmosphere/atmosphere-extensions.csv b/results/reaper/merges_tested/atmosphere/atmosphere-extensions.csv index 376f22efa3..1086ffc826 100644 --- a/results/reaper/merges_tested/atmosphere/atmosphere-extensions.csv +++ b/results/reaper/merges_tested/atmosphere/atmosphere-extensions.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/master,f57bf3445e3b89d5389a50ea01c32059af88569b,141fdf08301360228fcebba029f0b98f4e373822,ac485fa2ff1644f6fb602640526e0618bee6bac5,,True,True,True,13,38,219.0,2,True,13,Tests_passed,6bc20dc88b5f61894a398186d0f6f77133c9a58b670630e59fa759c11a926cb6,True,Tests_passed,eade686a70683750d4c3ef2aa5a7beaa39282b330ff7f6af647aa55006f668d7,True,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,eb9eb4cc212f27db8814eaeec45dcb0093109702ae5128b970cd7c140fd25cb7,Merge_failed,e9281c61d01d3851bcfbb705f9c7462e21426e6e8faa0739f8abf267de8ca37e,Merge_failed,2e0a9fd5c2d707f06401804c5f2a113fe2c374c65ec1040c5d104f6139974fb4,Merge_failed,e741f7d08f7594e269dafee35fdcd3bcefcd98af95036973a9fa2f7fb9319cbc,Merge_failed,e9281c61d01d3851bcfbb705f9c7462e21426e6e8faa0739f8abf267de8ca37e,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,530d129c7392f12404d4475975d613c5a53480edb6f561f33c9848d92753a31b,Merge_failed,2e0a9fd5c2d707f06401804c5f2a113fe2c374c65ec1040c5d104f6139974fb4,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61,Merge_failed,912123fdb768ffeb2dfc17142c71d080e453ada41c128e12bd716d7ebe28ba61 77,refs/remotes/origin/extensions-2.4.x,8fd31b3e8717249b185da0e271103a90b760e89b,7b84f67240d1fe92228648acbb9d67e4a0960ba7,3607c69f55516200dd452f86afc2751818f498ee,,True,True,True,42,115,886.0,28,True,44,Tests_passed,6f27fca37c4d9988982bf676fa9ebb9164f23efa3cfac7b1cd386c15f62c470f,True,Tests_passed,6031e123e91269536304aba4f3fbf17cb4abb736dfae882ac34014429e7b6cfa,True,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,5eaac6726137e4abcac5af959819ca7117d4cf6c34946ef68887e43f09a1f60b,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,3405b20ce96048e8d3b0cd4cd6d07d136977cc6de986167aed04fd77d9cc5804,Merge_failed,cdfa7e2dd00d7ed72bc49c7b20f7d96e309eae5ac46d478904ed1188c0aefcf6,Tests_passed,8c47a05302896fa4325b518b9c9e4c7b67edb666d98793b54e7be7ab9c648336,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,ba478956bc8335a69c49d8f205ff854751f3dcd087e74d5cda96b5d6b6ee99a9,Merge_failed,2c678f04f97c377ff6cfec77e2f8e730c4117ed6067d4f4fddea545c3c986c4a,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,2f72f3a40cf31e5f74383953f0a06c08d7ae1075c1707dc83480ec0ddb24a066,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210,Merge_failed,37b5bda2b7532a33ba569aaef4cb98b78f1137d596e0575f182c1a67b2926210 diff --git a/results/reaper/merges_tested/atorstling/bychan.csv b/results/reaper/merges_tested/atorstling/bychan.csv index 5905a53bf4..990749df01 100644 --- a/results/reaper/merges_tested/atorstling/bychan.csv +++ b/results/reaper/merges_tested/atorstling/bychan.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,96d59116bbca17ba5b72e31736f17cb431b19ad1,9783d0571b7a7c006f5c295b536dbfecf5178f12,00e0379193b04458c930e16f42d0870700df6c42,,True,True,True,14,57,172,2,True,14,Tests_passed,771bd4150cc0ef221c8bd7a389faa83049508c489b3b98638b44cf458ddbd6f2,True,Tests_passed,4c5eacf255995b4c85be64a931da3fd3fc548a32e0a53ea8546a36e066b4a0b1,True,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,d8874137ed3d43c6b00ec5af7cbb609988f45f51c435f667706a0b45f5300f42,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693,Tests_passed,3b103e8bf9da94c64ec82468f030e8fb87842e8478da01d2d01604ea850f4693 diff --git a/results/reaper/merges_tested/attoparser/attoparser.csv b/results/reaper/merges_tested/attoparser/attoparser.csv index 07e32d1c5f..ac8f352ff8 100644 --- a/results/reaper/merges_tested/attoparser/attoparser.csv +++ b/results/reaper/merges_tested/attoparser/attoparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,798b83b78f7a4821456d8ec3d36f9f86cbc1d5b0,2c0f34f7637d172a354518387ece1ef19c01fb4c,9ea8984c9828d2f35f6754195a5e23b740c546eb,,True,True,Tests_passed,2c12d47073f152e140db1f836dd074f563a67b2df0693a51124a5c5e166749fb,True,9,19,152,2,True,Tests_passed,3bb345124a68f0dfe2c0417135132e6bf662acadd2b2486482b55a30f46df361,True,9,True,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798,Tests_passed,231b93073dff7559ed612ae0f979781dae8ce4c6bade260c45f75f4ccd691798 diff --git a/results/reaper/merges_tested/augustt198/lumen.csv b/results/reaper/merges_tested/augustt198/lumen.csv index 6cb6a56a2f..91db0b7042 100644 --- a/results/reaper/merges_tested/augustt198/lumen.csv +++ b/results/reaper/merges_tested/augustt198/lumen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,7d97ea8fcd51dbe8b89640b5aa4df71836c06834,f8caae07c25e99ce557f4a4e7c99f17fe15071e3,91bfe976e4de8e35b136285351f8430cb99903be,,True,True,Tests_passed,055b804925b7fa8654ec1fe911a72480ecbf1416d03155b8436c1ac4a67b5f2f,True,26,45,457,2,True,Tests_passed,9ef8a67610a72565cf195ce3ee4d0505c784ab9afcbc08a01950b2bd6b89232d,True,26,True,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,8c09719eb7ad7e3bdf337bfe5e7a2bf38577862fdf08e7a9f39e6121aadba24f,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Tests_failed,a2e891b964d64fdc85a734f6036898f3bc8ffb7b661801ada16ed510a25ba067,Merge_failed,550e1d16add01b1aee7e046927111491e331d94df33380e1f64591baedf91ee2,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,241b319cadb9518aa7367b7b89fe7a01124d2e5616370fc29133e1272c18a57c,Tests_passed,a928809afc34062ed9ab079fdfab7e406b24ebd765ca6bdf751c2fa442ee675f,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e,Merge_failed,e6be99277022a6f3d6f681125804bb9bbf871b76a76c0a93dee926f02a940d1e 7,refs/heads/master,7907ebdef0dd0a755b3c28a61dfd4ba6148a6032,46af4dc176107e19c37f499b8a5191dbb0ffa946,96ad62efcb67b5a069a2a5a28b732bf5112769ef,,True,True,Tests_passed,ab34de40e656745185216b91ad638f0d52150108084047e1e5a940fa11b35013,True,14,41,151,4,True,Tests_passed,9c8fdc34f3a8c6f5c081ed9699bef273fb011e25a9a413b7df0798150ad4c453,True,14,True,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,4440089346bb1b237bfc5d3516f755696a5c24269e2f7b429030a42c81d580d9,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,4440089346bb1b237bfc5d3516f755696a5c24269e2f7b429030a42c81d580d9,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4,Tests_passed,48b09cff5a42e0b1552e98a2875e5c63e68f1a4ecb2d217c1401ec60b10b75d4 9,refs/heads/master,336a59cfb1dd6f232f142f86d94890533265dbef,7b6547886add415d92fb4065c6b029a287ee97fa,026ed6aab1381446623c1a46abb1bbab0c5c0363,,True,True,Tests_passed,f4236cca9188a4b5a4f89947d870d3b3725fc8955075b20a78038cb9f445ebf5,True,31,76,262,2,True,Tests_passed,5838f63cf9a8882cba64b5c061bf7a1da6f5e5533d57856797b2b5fb34c53a8a,True,31,True,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,0177157eab558530a7cfa8b21668850de46258d6ecad46bd60e071f1cf68d7da,Tests_passed,2ff90ff6f8c7ae1ee6437ffea50bf06bd0db1cb0af1d6568dda3407dcb87d214,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,0177157eab558530a7cfa8b21668850de46258d6ecad46bd60e071f1cf68d7da,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019,Tests_passed,d3e83693d158f468564be00301214d566efe01c4c45424c19f4a9e0c5a170019 diff --git a/results/reaper/merges_tested/aurbroszniowski/rainfall-core.csv b/results/reaper/merges_tested/aurbroszniowski/rainfall-core.csv index a454a5c0db..6bc8ef9b36 100644 --- a/results/reaper/merges_tested/aurbroszniowski/rainfall-core.csv +++ b/results/reaper/merges_tested/aurbroszniowski/rainfall-core.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/main,589fd0b34c60d3f1ea2ec291f0011b65df78d38e,07af041cab96d790028c519a111d33410917b893,53c5d6872600ef23d65e4f53907ad253b5ca110b,,True,True,Tests_passed,c50c6e180ec6e0db6067b23ccec2bbdfbfe9e06787e72bcd1cfd5f4c204a8709,True,12,31,332,2,True,Tests_passed,5c60ebf380b0a12b299c917200a084abfd0bde2c2c197a1376502874912b066a,True,12,True,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,a3d087c51acb72a69176e07228c3e3b2247a2553c5518a50603d55c94a319cb0,Tests_failed,43318037f579633933b70fec3382248335b61de40d364efc688e12e4b9e49beb,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,a3d087c51acb72a69176e07228c3e3b2247a2553c5518a50603d55c94a319cb0,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc,Tests_passed,2f1d9c57a81486926a24a49f50247fc959fa43cba605c3490dc447f5db42e2cc 32,refs/heads/main,7ac65a5f80090b7e18e9280be5ddb3a183d8da66,29a68d4ec812c2a6ca35b52f22f43c3ea4b67c39,8b883513acbe998713abbd743921ca455dc69445,,True,True,Tests_passed,ca603698c7f3f52f447d99d19e990cf7bbe01e9921a343c4f9bd25040ce9c5a7,True,21,50,999,2,True,Tests_passed,026bd25b9aa9406dee80143389a5178491827a84f4e277a99f8395b334ceb8bf,True,21,True,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_failed,c7c141d975834c095a87179787672f8ce58dd75a4af4802a92d338cec0f928e7,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,c7fa5688b692508c8794d56c720126ca4dc6ca6c559aa34bcf2304cee523a6b4,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044,Tests_passed,eff8bfb0e304f7f33f71395e9a0f6b81f1567c71b33876f740f0f5a77c38f044 diff --git a/results/reaper/merges_tested/avaje-common/avaje-agentloader.csv b/results/reaper/merges_tested/avaje-common/avaje-agentloader.csv index ec6fad6276..297b1ce616 100644 --- a/results/reaper/merges_tested/avaje-common/avaje-agentloader.csv +++ b/results/reaper/merges_tested/avaje-common/avaje-agentloader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,1406ac7a25bad7155a3ace629e63da4ba6d9c4c0,9fef8b5a77120ba7feb1d1d46e763bc4b1052d6c,6652713f4ba4337ca030fea6c306cc21c932fdae,,True,True,Tests_passed,b600ab30bf1a6c2c0338e1364d1953ab9794ed902bc23873aea1f3ef70cb90e5,True,4,15,61,3,True,Tests_passed,d9f63ef2754a04cb34a1ab4e47ebbfd76fbabe9b62d7ad695671c6e13959833e,True,4,True,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,31057f913a038aba6f24db1aba3ea9e6779116409a6c53c0356ccf87630c7abb,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,834fc8ccf5b1975e010a5489af3590f2eed5c64c029d93ff98cb4c13796c5ec3,Merge_failed,bc78ea94ab3adabaf81382511dfc87fd8184b1ebbc73d94f08f6089fc9ee4410,Merge_failed,04cd8cf1a2cedf2e4148d0670d6c3cf69368ce2eadf657bcc9889b6206c50f64,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,c8de3c85e4f4d2722c5fbce1fc3158eec49b07837371b2b88a478849f01f2953,Merge_failed,9542ddd18bb2530a5c7a3860bfa3dd23d656997036bc24dedac727ce850c3e8c,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9,Merge_failed,fda1ddcb5456bc694c9c8ac204535ce1cdb42e953f176bb8a124f20f688c33b9 diff --git a/results/reaper/merges_tested/awaisathar/dependensee.csv b/results/reaper/merges_tested/awaisathar/dependensee.csv index d998463a56..41463ec5ad 100644 --- a/results/reaper/merges_tested/awaisathar/dependensee.csv +++ b/results/reaper/merges_tested/awaisathar/dependensee.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,38b5080a19a4b08f68e6255427afa7d8d57caae4,55efd475ca9223eb2ac75021f4862487b70ab2c5,56277c0e14a8c2bef74e4be02bbd2d980f4d939b,,True,True,Tests_passed,4f38be01ee9da8e1497a2544f50925a20a119f2b13d80064095318e001670c27,True,7,30,182,4,True,Tests_passed,c2128c07d91497e2179ba4694ad88b57660e18859d979bffbb8beb43db6e96d0,True,7,True,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,83c811f3b7cf490047ff31c0c5b8755c89f0442a3c1cae13e1377d5e6cc493c5,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,2c23e39635c8853ee25ca1c5285a8fe4a5ffce5b92f4fd59b88c0f53d9d0c74f,Merge_failed,39a61c8804707e88e932d2e27475a0b484ddbb669c915260e8c286f913bee956,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,ee9e1b159741e41054f68cb740ee22b6649bd6b13878940d0cf660d7667964ac,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,c495fefe4b29c6ae0db1f851bcd36fbcbe4a85c1cd22aa4823f4105424725e37,Merge_failed,39e7135bc0c3bfb15094ab4385edc6d20eee03dd78db06572d6a64fa489723cc,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,5512c8341a0e9e97082b959c5cf6d1eaf5016922fc254c049410f0a5f0ea0583,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4,Merge_failed,9aef899cc29f3caa589e211ec7840c9150ba459740c44e80aa1ce91a3e026fa4 diff --git a/results/reaper/merges_tested/aweber/rabbitmq-flume-plugin.csv b/results/reaper/merges_tested/aweber/rabbitmq-flume-plugin.csv index b7d9370d92..05f6797831 100644 --- a/results/reaper/merges_tested/aweber/rabbitmq-flume-plugin.csv +++ b/results/reaper/merges_tested/aweber/rabbitmq-flume-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,93b744705965d180aa463a576f96eb6c2e19731b,642e116773e5d3495f3f95682e72cd77a7e391f8,c8e66e6ebdab6bbf07c30912f64625fd8e8187b8,,True,True,Tests_passed,b470b08641dd44116f4201fb4d577b3ff69300ab5a0b2949327b64f8a236787f,True,8,18,43,3,True,Tests_passed,c598958f04ce09f559db8ef634d8cdb3613f46e9129a23d9a37de862526480ee,True,8,True,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,7815bad9cf3117990c9d76eb95406230959dfee0be7c2208c7d95da68441ed68,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4,Tests_passed,62633c53d12e634874d5d149ee52a9acf79accea48b605b203612a455b7a7fd4 6,refs/heads/master,710a5fb3b85f30fc1992e135ee8b303591aa6bce,ce70045eb938a16a2e82de97bd5ab4c2ce8596e4,ed70b2c5c33b52017f2528a587894c01be750ed7,,True,False,Tests_passed,953e4267c911a5f5f59265a5187a225fe185af95331ad640f9667665c0e31303,True,7,25,90,2,True,Tests_passed,a65b763b8152207f8365bf179dabfe7ea74f093eb0a7419ad8207a5cd2cfbe06,True,7,True,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,61d3a4af38939851e31579448c1153ee40cf1a49b16b3552215c5b585272b435,Merge_failed,34578972ed590804e7ca4a407e652aa1dcbcddddc05feb039524bcc0fdaada06,Tests_passed,f2693c405f298391fefc0584c9939c994dec72b26584e5ac74a30be7f9877d4c,Tests_failed,426d2af38c8d404ec5dc4b01ee3cb99b871b6e5e89c2647000fd30eae8cf9645,Merge_failed,34578972ed590804e7ca4a407e652aa1dcbcddddc05feb039524bcc0fdaada06,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,9edd889e33fe5a4fe9a0952ddc7b359209dd2fe9287f62756a6061bfdb020c9a,Tests_passed,f2693c405f298391fefc0584c9939c994dec72b26584e5ac74a30be7f9877d4c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,b0a52161f8236f529421e51fd2713c1c8530d5fb2545e863054450602792cc2c,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239,Merge_failed,2cf5b25edae73bfda3f4e3c5b5906ba1ded2f1cc6cf5df3b73ed309f3d7c4239 9,refs/heads/master,ed70b2c5c33b52017f2528a587894c01be750ed7,658ff078b5639c973f02cdc7c718f9771f2cd03d,43ad0db59400c0e67e38c20837a11b15cfde6d1e,,True,False,Tests_passed,a65b763b8152207f8365bf179dabfe7ea74f093eb0a7419ad8207a5cd2cfbe06,True,3,2,10,3,True,Tests_passed,ac0a2babd5b4ee007fb2697cbaeda249fde7a90ddc8132d58adb03a183884c96,True,3,True,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,8d2c0d6540b471360f047124d73618cf3d4a7e339da50be058122e631f89475f,Merge_failed,d27f8b1cd3485cfbef06c1ed68fa8bfb1277b5bd2cfc13e0bb08ab4656962195,Merge_failed,4a5ef41e64bfe379398f9563387156ac549530da99a46b92b13bc9263466fbe7,Merge_failed,7a32dfea89ea738f75b97e52e32c39323672f9adcb4346da815c5bc93c123ca7,Merge_failed,d27f8b1cd3485cfbef06c1ed68fa8bfb1277b5bd2cfc13e0bb08ab4656962195,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,b8e9247632fe32428043020a123a62c7738defbeab809052ad37c9bc58efcb56,Merge_failed,35227745fb86db613ae88c5b0490ac79a2dc7633cdd149d2f473077faf81a080,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613,Merge_failed,e01f79eb3994d4ec23c8c1afc6ab6db0dba6338430f6ecb75996b8cc1cbd7613 diff --git a/results/reaper/merges_tested/aws/aws-cloudtrail-processing-library.csv b/results/reaper/merges_tested/aws/aws-cloudtrail-processing-library.csv index e57ad805df..ca3352d262 100644 --- a/results/reaper/merges_tested/aws/aws-cloudtrail-processing-library.csv +++ b/results/reaper/merges_tested/aws/aws-cloudtrail-processing-library.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/2,c91b62a4589a6dafb9a910dedcfaeff861fb05fd,443968050923b97dc46cb0b0d0279a8edb655d4a,2bb6a3307bd2fc1798a7b185caa369db8d230875,,True,True,Tests_passed,4961c7acb75cf36da8e171cb1b34fbff868d0ad11accaa318904f2b0b1e11c95,True,82,116,407,3,True,Tests_passed,b53ab54beeed37d469af2b8d6cab98809b561b3ab9ad7694d4001a128d28944a,True,82,True,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,05868520d3b2c2952d364ed03f78ced6734e71e86fdd88c2a0572990a5865bd6,Tests_passed,2a96fc34acea34d8c14b75ee0baa797699b7c38ed78a7627de0d5b0c25dbc846,Merge_failed,41957941ca7bfaa06466b953c3f6200a3b54f421ea2024614858099a5295f882,Merge_failed,ddaf65fbbef4f34fbdca687e1ca20ffcb6b4464b22ed42b4c6eb381bc241990e,Tests_passed,2a96fc34acea34d8c14b75ee0baa797699b7c38ed78a7627de0d5b0c25dbc846,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,aa8621e402e4bea0ade01c02a3f26365940155e5613091bd1cc4b6f94c54e111,Merge_failed,a261f5365515314c43f2b79b7c9efe52aabd58fabfa276d69f9802fdf773940d,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370,Merge_failed,d6e25a08c910690274af6c3dc75a2be3f2f729efb1adaa9ed02150c33b4ef370 3,refs/remotes/origin/pull/2,75fb2ff17d00bd2a2f1f478901a13de2149b3f15,eb47dbe7b5f96148b77d94f0a1471de1d01830a2,3aa119cc6425360f76cb96fb5c7f103db1c92ca8,,True,True,Tests_passed,751d4a43b21d8de56b21e3a148883a4cec30be4695c800a6a3e691999d5ac912,True,82,96,278,3,True,Tests_passed,f8343de806fb0573de66933baf08fc3bb54cd37f2a49addbe0b73575573eef59,True,82,True,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,740ee519d959a4077fedb1b023a31b858563d9d47ffece415399fce7e81df8ef,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,6514943e1d33b0af754808af85fe340226f10188c54055b0ecb62aa1a2beae98,Merge_failed,a6a782362e5023408d76622d584944f96c822ab4d24dd6e5a04a268b13499d24,Merge_failed,6b8dbc12ad1a45eeb74aad0e119ffd222b9ab0933f290f0763d673abdac8ede8,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,97ecd86bdbf815e5c111ba4c6d0caf77d07d46300646c3f94d87ef5da4f427da,Merge_failed,0acfe2cb0f0aeecda348798086df23987f0c7b4c75538ff49fcfff5fc664bc35,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51,Merge_failed,ff97affc6a69566521191d9839e345913858552d269919cb105a9ff97bbf5d51 diff --git a/results/reaper/merges_tested/awslabs/amazon-kinesis-client.csv b/results/reaper/merges_tested/awslabs/amazon-kinesis-client.csv index 0c1f40ecb7..52293ebbad 100644 --- a/results/reaper/merges_tested/awslabs/amazon-kinesis-client.csv +++ b/results/reaper/merges_tested/awslabs/amazon-kinesis-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,7f18330ebdefe2551ae88cdae2e41877d2cca213,7196a41cd43978f4ef354afd2d2239352056f82f,51787690d9d1315054671ff9ea8af875685811e1,,True,True,True,13,51,263,2,True,13,Tests_passed,849e6a431d6e9d8e96de3e6a18394b127757efcae39507dd244153d009fbc2df,True,Tests_passed,53fc8e63667511b40ecd7e6a2178ee4621bdf8acd3cc9a03d0ddebaa9344e56e,True,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,8b718262068eed1d609f8e3a8f88ebb4601ef6902b8c54304e5f856b4a86caa3,Tests_failed,00b9b54e2fa1bbe9cd56b907181e57bc03b050ca4dbc7aaad2e069f495d5f4a4,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,8b718262068eed1d609f8e3a8f88ebb4601ef6902b8c54304e5f856b4a86caa3,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,fdef491dc140c4978dea8c3487fe7e90b53c49e912ab50f8049f7215b8679852,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c,Tests_passed,7f9ddb87ee1bd6b3e3322d680edcf3d5304855bb8370b84d90cb292b940d356c 62,refs/remotes/origin/1.14.8,6fbfc21ad7d6a2722491806a411d168304167f7f,4f927da81c2bb64ac90d8d247dbbfa4347ee5fdc,ff004d75be17831f80dc6e58296a183823ed9904,,True,True,True,54,507,6591,4,True,54,Tests_passed,b4ef78da5574607a97d49f05c5d71a4cd41d260fd810bac8728871b68735b56f,True,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,True,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,55a4a5cc6f714f31b60021ddf5651c5be1166defa85a0f1d05e971d48a1f19da,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,55a4a5cc6f714f31b60021ddf5651c5be1166defa85a0f1d05e971d48a1f19da,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0,Tests_passed,038c426ad071b537b5d756c66c3432d71df38c25e4b03ce857bc5dde47e64fd0 84,refs/remotes/origin/1.14.8,4ec77b1705f1f089a1c973cd3e61398a6a4a6294,f1a50cd14bc50b1edf98ecac9c06c312e06437b7,317dc1ae847a0e473b017d5fee05ea1087d9e7c0,,True,True,True,28,150,2714,5,True,30,Tests_passed,6d2c316bc9c7268f92d82a734e37354af6d56d7122f2ac3c9a2af39e45ff4056,True,Tests_passed,6567c3e5914604e826f6eadba39e6e5345d128070e70c3334d92f16533e05a92,True,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,a48621536d7114ad03de90e4e23018b26aaf86ee7eead2e4986357a1a27e00db,Merge_failed,c44f5fdc66be3dc7578253c81936680c0afaa815006618a4c8aeafa6129b235e,Merge_failed,d4ea76ad450a752f340933d170c4fb0200bb6fe2d006a362e029a1e07b6d1025,Merge_failed,51aeb4144f3a5c9bba8dd38ce38f150dd4661dc9ec5b8ba5b4fde4bb3f1e86a4,Merge_failed,c44f5fdc66be3dc7578253c81936680c0afaa815006618a4c8aeafa6129b235e,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,f2811f599e023a4d3d1a9154ec739288889d292f22c22da8c06b2941ad525d30,Merge_failed,b0b4c2130f62ac172ada3f87cb888bf2203036792528e0cfc6c1eedf59b04cd4,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f,Merge_failed,2133665d1f87ebde51abcbd07ae82398539a938248709f1dd2de6c657cd1f90f diff --git a/results/reaper/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv b/results/reaper/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv index edcc6c985b..81ff7181ac 100644 --- a/results/reaper/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv +++ b/results/reaper/merges_tested/awslabs/amazon-sqs-java-messaging-lib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,016338972c443427e3b9f46c5e00f254a10c7095,dde1d7af4a90903d2b1c0a9bacd7ec30390680ce,13a3a50831d439af76cc6d0e4b3cc074ec3f47cb,,True,True,True,37,399,2427,7,True,38,Tests_passed,a1e829b040fc1933be67229019cb22ea3142ffaf616d4fdc00c74a39f3334adf,True,Tests_passed,37504941c14b349bef5e2c72270d8befe15473544105110ea0685b6771048dec,True,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,f44c6867e9bfbf7ac97fd4866a73d52815b86333288cbf340c55ae6991d5aa5b,Merge_failed,d93d0a131c88f6347f661d125c1f405a74958ac17cef3a627804a00690634ed8,Merge_failed,c1c54025ab2cba2bf1bafd2f1ae1edaaae6a24ab15cce843f976de165c692a78,Merge_failed,92822f419587855b5400b3935aadda8cdcda529513ab56f0d78e8583565b49e5,Merge_failed,d93d0a131c88f6347f661d125c1f405a74958ac17cef3a627804a00690634ed8,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,d7e0a1a937e49a760067ea362152db1b8156faab330b05a8ba1248cbca3e3ebf,Merge_failed,d3d1550d130aad3c7134d0b84101c2b78ae170fa706971d89ce0da863a7ac99c,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,dc6ebeeacf32a842e5e82b7e28e590d2cb6a1a23eda3cbeeb5542dcfed91c44f,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13,Merge_failed,c9132da800b08b7bc1f429d28e9e81a0e48288832baf485ef1f73d9633b33d13 24,refs/heads/master,04b2881401bb35ae6113c4802484135c1c3533ae,721cd7d882b4af5168f474d16a071d780ffa91dd,091d3e41238d823838d761c2c41532ca7e880f97,,True,True,True,56,144,583,2,True,56,Tests_passed,09114dcb420c91af75b3e08615a81b4afc454335ae2df7c939c660ba9be72594,True,Tests_passed,842420198bc8701ec5ba7c5a3bbde3d742c921a48e89eb417cc6ee8ea49e7ca9,True,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_failed,0af47479ff6767c9a1d7dc1e2c84f654bc3d11510e7c43240cdfa545ee9e0618,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_failed,f0e85fbb38221f5f7c8e2ec546d3f2a7a4be4b686ceec2dd6747e85aa365639c,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,58afa0e5cf788188d049991c194d2ca7cb416f3b218f98d6bac70427a09fefee,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab,Tests_passed,22e6ca95f08bd28a1bddf8e1c2c51627b79b48c104e52ab5c85fb9a7b21305ab 36,refs/remotes/origin/pull/38,c6da79ddbb4358e2342983dafdb177125a879391,93146b36a95ee9c9bba161115bc17ce7e835493e,6824b40e0ef908dd768eff93618270822c62ba65,,True,True,True,58,617,3575,2,True,58,Tests_passed,94f2cc2815c50a6d5518e2fe644a871572e3a0309c831e05424bd4e4441c86bc,True,Tests_passed,8763ddc63fe9b06f332f3edb97b52b79faabdd5fdec010df8502b6ab4930a42f,True,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,c4ceeb941e9c67af20badfd63ce3278ef22973e89acfe966d652555fcafd8c43,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,fb583b825bd73f9d841a0c2ea7ee776ba7ff648dd0348715938757e58fbe778d,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,a00b8d4fedd54eeafe88816ee976b977c1c1f4b78426b7eab493e7d55eceabbd,Tests_passed,8892be0e6c7aabe6950bf4417b10d5a624d0fa5f329355437265ecd66b2fab4d,Tests_passed,2293aca0b4078eec04438b2c0f94befc66d04a349f36bd3ccf86e458d0d7af0c,Merge_failed,be0506a75d04d4bd44a5294ae2e932f292f970967db1b86bacb077d04cac9bd2,Tests_passed,8892be0e6c7aabe6950bf4417b10d5a624d0fa5f329355437265ecd66b2fab4d,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,fb583b825bd73f9d841a0c2ea7ee776ba7ff648dd0348715938757e58fbe778d,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,5a8283da24dae3a545c8768dff3faeeea6e8952f747fd45cc70fa3b55b1461dc,Tests_passed,2293aca0b4078eec04438b2c0f94befc66d04a349f36bd3ccf86e458d0d7af0c,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,c4ceeb941e9c67af20badfd63ce3278ef22973e89acfe966d652555fcafd8c43,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87,Merge_failed,6f20f08add38a423055a276985fa38a2d404dcda9bfe89583bbb626e8419aa87 diff --git a/results/reaper/merges_tested/awslabs/dynamodb-geo.csv b/results/reaper/merges_tested/awslabs/dynamodb-geo.csv index db87ce4de6..2aa3f1ebee 100644 --- a/results/reaper/merges_tested/awslabs/dynamodb-geo.csv +++ b/results/reaper/merges_tested/awslabs/dynamodb-geo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,1d1b774cef3609a4e9f435c2ed8ea36359e058bd,f4d62cbb93f622c0565ff23a95908385d1d4a799,ef43ffecf577d610b6be671634c64bf1dc09adea,,True,True,True,5,13,95,2,True,5,Tests_passed,999c7d6c45f71b90674a9e41b7abc7f88cf4307059383432b586990243381013,True,Tests_passed,92b9ae4263d61671d401e712afa7c73976334d71e3a61b60b8cedb0a33449f7a,True,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,e89cc8059d250aa9f2173c8fdca55444dc6942b0caaf858bec1a671b73629bd2,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,26721d96b8ef7e89ff1ec84aa9fb6023ce288c46a10db9c7bf0fa0e4a5174be0,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667,Tests_passed,9f3c61bdfec461c32ca9746db98fd3fd17099848557176c4f35e68c765f72667 diff --git a/results/reaper/merges_tested/awslabs/kinesis-log4j-appender.csv b/results/reaper/merges_tested/awslabs/kinesis-log4j-appender.csv index bf40d17176..e9ce08c889 100644 --- a/results/reaper/merges_tested/awslabs/kinesis-log4j-appender.csv +++ b/results/reaper/merges_tested/awslabs/kinesis-log4j-appender.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4acb58fdc4040822d2f8bdcad0e89354a06a1157,3304473d0d47b00517e04e5942052f4205edca9a,cc0811dba8cb9210fa86aa57f2ac40d9e14ff244,,True,True,Tests_passed,a1eefa38c5061dbc9b605fd767ee746846b0e52f77fa831f49ae9d2b4cfd7868,True,7,17,155,3,True,Tests_passed,ff928199e1db91f59b72fde0191ccbe323b1e0fab491d8e8c9ee292aeb1a4bdb,True,7,True,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,9ad08c5441935c9d184ca9351b0fc0c6345cc90aff20132641615eea21f929c6,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,659ee35324ae5cac92b6be7d94d0207f5bc737993352e36d4f63c8ac7ab0285e,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec,Tests_passed,5e916d4ec3bcb97e49ab1a3a3fb74281c1b09f61b5396a3affe610fd0c7352ec diff --git a/results/reaper/merges_tested/azuread/azure-activedirectory-library-for-java.csv b/results/reaper/merges_tested/azuread/azure-activedirectory-library-for-java.csv index ea8942497e..930609478d 100644 --- a/results/reaper/merges_tested/azuread/azure-activedirectory-library-for-java.csv +++ b/results/reaper/merges_tested/azuread/azure-activedirectory-library-for-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/dev,48bdc8500618d5452013a4823bc8ba7a85515986,c8286c6389c70d2033e8ec7a35fa7ccf786cb1b7,663b8bd7b8b90d8af9e04b363d4f98d080f20f4f,,True,True,True,46,188,2646,4,True,47,Tests_passed,c96e970d3253b313b108b25d2e7ca3fda79bf6266f00605777b75ff0de8d54d5,True,Tests_passed,f5e9a243ca812af2f41770b5962f4b02ba899b5602a9d25f390b402a18cb3cb7,True,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,bc8b22f9f2383a1eb2bfc0c6280f85c8b04ebd98676d272bca155bc40539c5ba,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,4952e1cebedfff4c8947471801f592badc7a37e7a34b2f0bf8b0b14a547c5ded,Merge_timedout,,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,0f95487dcc4c46d73b310978b9a35cccc2d35b8214154fa9eb563b4a6a47e830,Merge_failed,402ae7d4e0228f680882ebbc286287b619375e595bdc9ed8d408a8a64f5711d7,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b 29,refs/heads/dev,ee1814c0ac36dfd7d0ebce404b446f5e02b76a5d,14c567ed46797dce0f8b6ca902a48718df869951,f6d775d5f5f0214f92878f5fccce6a99706fe5cd,,True,False,True,4,7,18,22,True,23,Tests_passed,cd13117767f6c627eb3b7559fdd1cbee26fbd22c1590445a110fd708e7c8c0c7,True,Tests_passed,2206f21f589e63424fe2dc371dcaff3e1ba36af280aef40c759a126dc2b3e453,True,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,10414df2641fe37a1a6c8af5e525fe93c48b23678f99056840af61131622993a,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,569884d3a1600c7f11c9734e5891059b3b4a00307c24c8299a8c51a8d0ace3b3,Merge_failed,22efdcec4e7afa2912d25eba54ff4f3a7a88c41e9c31f1ea3cd6f3e3e4a81ad2,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,b6c41dafa3207a2ffc7ef960a810845d9418ae4db2a036c1fbab1879c50aebc7,Merge_failed,b61e169e101a29838ee9e73aed8a56a3be88e03190f253b884be80ec1c24fb0f,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529 52,refs/heads/dev,547837a0347aed4d9fa8f1d631b822ea256421ba,897ee8a2bd8e2e56af2e0af434304816e82bfad5,34676f86d0e196f692b3daf21bac0c947f9dcf94,,True,True,True,26,80,363,12,True,33,Tests_passed,004a1a7f1f23f161957c9ab820e49e749d1a175832fdf66dca885d1fa7b145be,True,Tests_passed,25264399df92e7613fb6c4614ef6b0bf77c8852c66ae06f1c1332dde117c9128,True,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,973a4caf124a17835b67cac39ac06524986c228342db57526c97a79277faa213,Merge_failed,c64576d0cae7ccf0b7e22933355d79bfc23e6a9060c462bf06f8a4a1f23cd249,Merge_failed,3927bc766f9fb14e78b196d8473da30b6fe618bf807bd0e0b85382e2a252287b,Merge_timedout,,Merge_failed,c64576d0cae7ccf0b7e22933355d79bfc23e6a9060c462bf06f8a4a1f23cd249,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,103ea9e6d6b237d13421c43af6479c3d26c2ef7c250b86c67c166466361f22a5,Merge_failed,3de442734361077022556a43d9723e0f9b47572ab84998c2320e439c9a9fd139,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46,Merge_failed,30da7359482a2622dde817fef448629aba3341d3f9476fddf7626946081e3a46 diff --git a/results/reaper/merges_tested/b/kafka-websocket.csv b/results/reaper/merges_tested/b/kafka-websocket.csv index 5d3da7c3a2..c0330ab208 100644 --- a/results/reaper/merges_tested/b/kafka-websocket.csv +++ b/results/reaper/merges_tested/b/kafka-websocket.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,3e7fb0a946a78bee2f1ae85fcbdc36e3d85bc5d8,214dd17bdce8b4bb846f1906bbeed685bff07be9,c1cc4961a40a45b2b4fd1796eeda998ba5e6d617,,True,True,True,15,32,400,2,True,15,Tests_passed,2de6155d3b55b16d42dcebd7bfbdb5643fef262f33a5ab66f6ee22338a78d563,True,Tests_passed,b395ee4c0847300b9a2e4233f74ae41c237010fb93f1a9fa3326ecd7611cd0ed,True,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_failed,224551dccc1495143b99208718169e8173aa4712236f33dd9721fa4676c4098c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Merge_failed,8d9883c3081b9cd12ac36f0aed233e3a2498808401a727985684a835b6f6a78f,Tests_passed,0d353573d3e55e4f63d119ca3f1b5928298449af50c77275f0a021628c36cb0c,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7,Tests_passed,f5329833dd9621cca0f106137a63c7fe4c832c0377c4fb89b4f69287e1e6e3f7 diff --git a/results/reaper/merges_tested/barend/java-iban.csv b/results/reaper/merges_tested/barend/java-iban.csv index b84163e5a2..49b3ab6342 100644 --- a/results/reaper/merges_tested/barend/java-iban.csv +++ b/results/reaper/merges_tested/barend/java-iban.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/main,981e0311705b2f83cabb82c9c9e098952960b248,6f91a456f15385e0c713bf52e99249b7679222e8,97764aca73b79d78f8544cb2d6355501efcd0d2f,,True,False,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,True,5,30,168,4,True,Tests_passed,138260e0ef7fb7cebe0f1d9e127da546ec05033e2ef378c0e6b2dfbcdd24f6b4,True,5,True,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,69dd05809a336ccfa9267c41766e292fcb17c00af23cfca504726a01a0350fb5,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,de65cc873cd172aef52247335ab474571833c1d47551cd906f1afc5a3f1fb7de,Tests_passed,40e771693455d585b91d111247e81286ae1d30baac020a32fc06be1f79842ea5,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,2f28d3d17890592f5f6e32ecf70e36b5ffcbe15f7d0f69b486a8cd08c9012356,Merge_failed,2698bfdf2f5ff98ce559c3f9198dfead2708a992346732891ff2806461064ee2,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82,Merge_failed,7a1e8dbd2cce03a070e914a8553df9f0cf11198a32f33dc013daa1cfb7e87c82 diff --git a/results/reaper/merges_tested/basho/riak-java-client.csv b/results/reaper/merges_tested/basho/riak-java-client.csv index 38755f806e..43f0bd3ac4 100644 --- a/results/reaper/merges_tested/basho/riak-java-client.csv +++ b/results/reaper/merges_tested/basho/riak-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/develop,1cf7c917508a69d5ea12f3d5bebc3dab5984be23,e1c33ec9de33e6b395401183c18c60da5cad31a2,15da081ff85e6c899184b619b4bf87bb0728f4ea,,True,True,True,16,61,252,2,True,16,Tests_passed,3a228fafc2b902172c56310aa0b7e8b212d2ed676d56ca388c381af7c7be9baa,True,Tests_passed,8e3ba0cef7564135f171ddbe9b22eaec0c0f9aa01a6af618ec8b2bf6b34231f1,True,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_failed,56bc020f1539db12b3aafd53497c711b4f46c9fbb4109a66640c88ec3aeaea66,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5,Tests_passed,4947032f8499b1d78e139ce6fe33481854b60fa86fa4afcc33412f047861a7d5 diff --git a/results/reaper/merges_tested/bazhenov/load-test-tool.csv b/results/reaper/merges_tested/bazhenov/load-test-tool.csv index 6d17340915..853157b5e9 100644 --- a/results/reaper/merges_tested/bazhenov/load-test-tool.csv +++ b/results/reaper/merges_tested/bazhenov/load-test-tool.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,6593812db93b89deb415cd4e2728baf690b38487,34d51cd87873b3239c3fc65ee88f35468a23baea,63a868bfc12d00d726e6ecba2fd9be1b5ae29584,,True,False,Tests_passed,313f0c1ddaba97cbd2d795a390befa7e6f00f21d58ea17e4df27dd46c40a7328,True,2,1,8.0,17,True,Tests_passed,2394e1e6dba97558969834a69f14bb27c1062dfdd27c67cb2d4c5a418e1c0d68,True,17,True,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,ead356baef18eb94975767454fdc555baa489ecb7ca94e1acea0b3ddd919d8cc,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Tests_failed,ae7222ddd19b7e144650364a9a10ab4448991780a718b80c1a48467fbbd883e6,Merge_failed,3ff84ebb5fcdb413e40d0cb49edc52823326dd2467c1a6ab201718f0a1348dcd,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,6b2eb3bb6755c466f43c2e8cbecef0d6f0fa8d49efa77f0c0ffbbcf11b2b1b4c,Merge_failed,21332c439564860f195172a35894c12fc1a67530d1e217a411e48ad03e40e4a2,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225,Merge_failed,804c4572fe77685bc37252d3868d5aa8b01eaaf57cdf932d189262a0318ec225 diff --git a/results/reaper/merges_tested/beastmachine/ggplot.csv b/results/reaper/merges_tested/beastmachine/ggplot.csv index 088ca5c3da..cec664dc53 100644 --- a/results/reaper/merges_tested/beastmachine/ggplot.csv +++ b/results/reaper/merges_tested/beastmachine/ggplot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,e2841b05bab86e238732649229f3d0a2834badf7,5a94ad6e32c8175745c301c900a3184e83a6923c,ff2ab22bcb56d13c130004d312f0b56efd1f8ed2,,True,True,True,6,15,188,2,True,6,Tests_passed,a035e7a19867b9a5062fb37a9524b4745247c17f6f566cb42d5608cbf1931a4a,True,Tests_passed,0bb57dafc5ba5a54fa0b5aa060883bf862b8914b0dad133ed974d232eddfc10d,True,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,5e97975fa1ee062883fd625d36db6d0bf983a6951ddf50184661022b30b45348,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Tests_failed,461440b78a16fb516456a8e5a80d9c4c06c22a8c805fc428c8a6de418111952f,Merge_failed,64f80525816b5cbdc84cd187908e32e422ba95bda1b2c5f2bef99577881ee9a8,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,872d653526f587c42e64ffc55bfe81925e2724cd607bbb91d4beceb7e0e8f602,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,cf7dcf7c0d584f5ddf4706f486ffa237bade18138dca56a89916b466fa86fec3,Merge_failed,7c08d52cb1885b2ab5294ab5c7f8e5765573e02ed3c7aba8f2e4d51b3cd2a393,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,c4c7244abc27c34d851435d5d08f92c78b2f9bb153f1f377c123109ce2311018,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf,Merge_failed,a3a70459908e4107f86d2fc1deb31a74b6fe3eca9ce2fbb79153e36808803caf diff --git a/results/reaper/merges_tested/bedatadriven/jackson-datatype-jts.csv b/results/reaper/merges_tested/bedatadriven/jackson-datatype-jts.csv index cd5769f094..2d06b7c3cc 100644 --- a/results/reaper/merges_tested/bedatadriven/jackson-datatype-jts.csv +++ b/results/reaper/merges_tested/bedatadriven/jackson-datatype-jts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/5,1416f1af0698abdf85fed9076cf00896f176f3a8,980366ecfc5b313f23e9032c2cd766bd1905f777,9f80c5c8e0ca843d54cc23fcb5769a824f0b0ff7,,True,True,Tests_passed,a33534485efef0da7fa4ea4fb639e0acc16c6eea5069a81db41d5ba044c136af,True,3,4,13,2,True,Tests_passed,d1c22d1dc041af25a27710c793a4d2bf9c5ed4681c3df27570e7dbcc08bd456d,True,3,True,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,74cb1006fcada0fd6e0b9c25db6a64cdb3e6c872db4702d872d14957b27195b7,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Tests_failed,6eea65c340c77581b6d0f2601b9366fb865977a724fd1fc381f449ebeeee1cca,Merge_failed,ad155cae625529c79880034be77d771e3349ea3883b6ef58d624e926bf98fd71,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,1561e874abba516ed1baca89e07729a5084f7fd260c3568719dcb041cf7ec598,Tests_failed,1aaa8086705acd64ec2903d3fbb8cf8bfae1c737bf1bd84b1102ac7f125d7a4e,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04,Merge_failed,4c266deb49026f38a13382b8b97f862071379f05c9b43627d06ad74ea53d9c04 diff --git a/results/reaper/merges_tested/benas/easy-rules.csv b/results/reaper/merges_tested/benas/easy-rules.csv index 113138eb75..3bd330a73a 100644 --- a/results/reaper/merges_tested/benas/easy-rules.csv +++ b/results/reaper/merges_tested/benas/easy-rules.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/remotes/origin/pull/184,ba07071a49b4ef022c745d13c6502b38794ef956,192d3fb32413f101c07fdbc9f5965b41a47daea5,12ef53dec57066f111a7ce9f1e72765469d0fec4,,True,False,True,99,127,266,2,True,99,Tests_passed,8ae063bf60773dbe12a9b1ab6fdcc9c7f1c0867d34f285bbc7003b4ddf87ec5a,True,Tests_passed,48e3adb0e6bc49f758017df58201dac8c127af6c9196395f3d493e6f7cec23b1,True,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_failed,a384118e494cac4f78b8a22831567241cef52ea8722c43cfa8b8b10d447b48a2,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,b2c796b8a27226b5b6f5c2fe39e127e96390cae522a8414b6796e59227a08db4,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15,Tests_passed,c0a5448ee0b81a41edd8cd6e496d4cb61f1caccf2c2a71c50a4a034de0e06f15 32,refs/remotes/origin/pull/289,cc5de266d34bd622580059ef5de52d5e893c0b53,1967db34f27494adfbe443337a240891e96b50ad,b888b85119db7adde3d9399c9d9bd1d0079731f4,,True,False,True,4,6,13,3,True,4,Tests_passed,eda46100da055b1844a4bb18f2c5adad510930c2928460d2396afb8993500409,True,Tests_passed,ec8d986848f0c9e3b88548412c1332df3652820cb9578caf1cbb418bc0636e30,True,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,61d60f93ef0900a0209a83f92009f89d46755fb0ff4e42e880f7d7bc20820d44,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,3224e89bf539864fdab90426d1e7b9278e4da378a0b8e4aa736996733df48d33,Merge_failed,1f2f6764fce19fd3be081f0dbcebcd5a1166a68a8068e87db1f70755105a25a1,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,6276e65d3ff7f69ffd1db5f3e3464783836962d7bfb8c2c7e004a4f09cd2c33a,Tests_passed,221d24d174765befc62122d0cea7333e9642dfaf65ff7297ec9a4fd891c00aa1,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000,Merge_failed,283a79babd26e135fbed86bb3012864c8be8d115173e808817e421f835307000 diff --git a/results/reaper/merges_tested/benas/projector.csv b/results/reaper/merges_tested/benas/projector.csv index 96b1753f9d..e310747e0a 100644 --- a/results/reaper/merges_tested/benas/projector.csv +++ b/results/reaper/merges_tested/benas/projector.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,f088b5c59aefe6966218d6af783f02ec7508a6c6,a127d12133d0f2e3def0d99a999250ab6ed5d77a,52020bf4c023f00a76086ddd3b6f0a48eb69606f,,True,True,Tests_passed,d81081af6ef3c25acc3e63a9b8bd3c26de150dd9010cb876f5751813fbee2e7a,True,23,73,391,4,True,Tests_passed,c0c421cf9772eb05bde93d2d847ca3788a3e5bdb65b5d4e9af1eea167d4a13bb,True,23,True,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,b77ec165ba3526546a4b76eddd037b5a0e0541258c5bdd154373473128cbaf53,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,8ea8314c66d21214c4b665c125e3c5dcd8e0bf830a4451ae7e2b916106a2e4c3,Tests_passed,99e609f113965a1e761d8dc5fcfdb0aefa12055fc2c08b62e0fd30950a43e967,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,eccefcf90ef97c10c61c30ca81a3125938f67717a249967d92fecdca00e68500,Tests_passed,2ba5d1f8fd7edfb9c9a58835b7a42b49b2ab47d8d3ba7558f41cfee2bb71337a,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208,Merge_failed,4876e148507d64a5f003cce6c666c2d80f3027f0a71fe03178a2ebc070655208 diff --git a/results/reaper/merges_tested/benoker/dockingframes.csv b/results/reaper/merges_tested/benoker/dockingframes.csv index e3ab4d3e77..8ad19dd409 100644 --- a/results/reaper/merges_tested/benoker/dockingframes.csv +++ b/results/reaper/merges_tested/benoker/dockingframes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,28c12250682f5b704cef429c96db66bf5bbbd2f7,6e0be54923e64248ef27a7c87d32060e5572967f,e44263da6b4b620a8069aa52ef0741c34c74209f,,True,True,True,21,43,88.0,2,True,21,Tests_passed,418398278234696fdaad1bfb37763868c5c69468196339e2435b7c9ac741793f,True,Tests_passed,6b566795116abba3c328224fe56759d7a9f04be9be134f3ebcc22af4c1e02a48,True,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4,Tests_passed,c54518033d782bf5e7579f74e819a296a0d3363f1ec81555a9d6a4f841fdb3d4 9,refs/heads/master,75062c471a1608f1ad1c8998ee07674148a021af,3c4890188ceffc907e782b379c290399b82f432c,58a3104af288868069fde4095bd3b12be24a09b1,,True,True,True,153,271,559.0,2,True,153,Tests_passed,a116300d30f9540a1571bba3f665a46fc9e218251f98d4d2784770fa5f2c567f,True,Tests_passed,8c822c5739438e7557fe72912e91d45d945b1ac49c49f46596e4d758340e9a0b,True,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_failed,87427c04d6bdd41f4f9c037f0765d7ec12d97c52591a2b442a74aa97eb33dd81,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584,Tests_passed,3b1c17c1b37da5d9c5ba1abd11f3beee7252bf8f4c12298a446c88fab8e6c584 16,refs/heads/master,4eade0559bd870598985013ec714c63f8970d3f8,c8e2118f94c00cd54f79f74c078fa94c975583ed,40609b39f7233de8451abcbca8f44f7558092b96,,True,,True,861,2338,,8,True,861,Tests_passed,94593893294e898d96490b93aa520eca914ebcbc037a4271e9d8dce61dc57bf4,True,Tests_passed,8805ebcfc4e1cb032dc3eaccb8061cdc3cfc56099bbfd0a0d4570e71de2acaa1,True,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,69ae5d75b069ba7d020a961c267f004fe8b328ae912a21fc0eec4f6baa02b8eb,Merge_failed,4c9fac040cf0965674a2e404814f7f450e5d6e9dac9cfa4e05a70bd0677ec934,Merge_failed,bb80a26ba8f62507f910230e3e0d43024fa388a6f7330bd4f5894647099e6627,Merge_timedout,,Merge_failed,4c9fac040cf0965674a2e404814f7f450e5d6e9dac9cfa4e05a70bd0677ec934,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,e7dcc227020e7e2716ac451b0ad3a5bfc0429355f41dcc15368defb167aa331b,Merge_failed,358486b586b0c9de22688fc5299c06c3de77817e84b9b39c5e7801bd6b7dd219,Tests_passed,94593893294e898d96490b93aa520eca914ebcbc037a4271e9d8dce61dc57bf4,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,5efdadf9b8c67b8aa62cad5efdbd7627d17c18debee0f78d29dd0e4ab7a94b21,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c,Merge_failed,30b43e8087d4feb34159d73b0dc62ba44cfbf1cf80530bcd672634a504f6d31c diff --git a/results/reaper/merges_tested/bguerout/jongo.csv b/results/reaper/merges_tested/bguerout/jongo.csv index 8c41335177..b81f0a3887 100644 --- a/results/reaper/merges_tested/bguerout/jongo.csv +++ b/results/reaper/merges_tested/bguerout/jongo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6d3c0482f5827269fec259963ed50d35bcabe99f,ac96b9a926e3682bb89be0838e68453622edef10,9dbcd964b3d9e76a4a6b17e89e9ef8087882de3c,,True,True,True,161,267,1448,18,True,161,Tests_passed,4fd6c7e96f4b5562e703d020798f7269c6b1874a9810774d2c68f1925e464d75,True,Tests_passed,fafaa63243c3c3056a631852db042f71694c805928929625faff3397796f7a22,True,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2ba7df0859d90ab55b9fe2814798a460dfdf5d63a757a1acebcef454ae77e407,Merge_failed,9e990e3bf34b0add263255dbc1f8ec3462d0624e18b5ec42c9aa7ebb6f661d4d,Merge_failed,54bea01067f972b622b2357165151db017d802cb924e1c35484479a83372ce18,Merge_timedout,,Merge_failed,9e990e3bf34b0add263255dbc1f8ec3462d0624e18b5ec42c9aa7ebb6f661d4d,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2ad580f983f9ed3ee9cbc18e59a579c1a1c83c0b01e0c5fc6bc3afa68d4be398,Merge_failed,4c776607238d62bad5fac3e22f15e6cb5732191ca2d2222f508c99a556ba0d5d,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,a2f39b650bbb1a673a4eb2c7ad58e466651f3341c970e519d09b3fc2f5967f5c,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34,Merge_failed,2d83ed5892351010fe7df111001370711a32b32833b1d77ceecde64d4cb1fe34 5,refs/heads/master,697fc67ed565bbaf3b67d4ad5e8a19ca8c09e90c,468ca36d2cbf8216f91c3543aa60be4254469479,bdcc9aaa22f9470ce4d424736aabbc49c4857931,,True,True,True,39,99,1921,7,True,42,Tests_passed,8d773af9214d52f12790ff4fb133e81df8c5699668bcd88742e1f3e4d58cf2a6,True,Tests_passed,b2ca0ce4f00d3864211e434312373e07b732d8165795867063ce1b92f1608d1f,True,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,8e76cb6a448635dd1fe09fe138a948f98b94c6d7d347f64bfe9fb22e4cf666ee,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,2f44c4684153cba4983fe6526cce452b0a5eae01d0b6c8e637c5207ea84d2115,Merge_failed,e8ff09bb9589854ad60282c3a7128b06ea15d978552f5ba51daee6886faf2063,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,e0eaf2aa09e8a2d1fdd43859752b61a9d2e7200908dcd67ebf0d9eb068ae73fb,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,35da450546eb595b7c0ce859eb74120cf73e84a0eae411e6f2e74e180eb7d011,Merge_failed,b016ec99fbbdc9350bb9436a1a0c8acccbbc1cc4666e70afbc80556617f722c3,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d,Merge_failed,c4d398fc6339f9e85157f46065254a8285ed60fe5a23f86ec13357983c31135d 12,refs/heads/master,ef3b9719963e125da4191c6917e6453edd04c410,316f9770889fbc078acd5ab38e7e1c571ee496b8,0ea85896485fe8d84c11a0598cc82736f89eb0d5,,True,True,True,37,117,1415,4,True,37,Tests_passed,f846a27607108dd87a56e53917d67a5990e336a003b87a5559c086b5bffd64dd,True,Tests_passed,ac2ee6645dcf4f3b88c491934de35be1e2ed90cd18ef5173138cedefa9de2da9,True,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,62fca201e00867475ca4b4db41470a423a9736169a07c29cc58c7b28eaa1aa59,Merge_failed,028557e11726ca6009fa724f5fc7dd386d0a6f3c886eebec8f240720d0b6a8e6,Merge_failed,b9c5f40b263141090de5a01bf920d4405b226f92d0f29801e9c6d6d72638af70,Merge_failed,b1d4e890ae3141c9970715951915b6a246289e7d9b3aba2affdf6b47dfee1aeb,Merge_failed,028557e11726ca6009fa724f5fc7dd386d0a6f3c886eebec8f240720d0b6a8e6,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,15649ba0de4174d06777f8866a3cbc75624c35a15d07e26b080b99b448e5c0be,Merge_failed,db73f98e9d65a9250f8a6367ce895bf9276852ced4fa8cc2c43eea7695d1ceff,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1,Merge_failed,3608a78c4858d4836eb90660b03249aeb9f5ed1623b22af54f18a50a15faaba1 diff --git a/results/reaper/merges_tested/bitletorg/weupnp.csv b/results/reaper/merges_tested/bitletorg/weupnp.csv index d96462660d..115c53a33b 100644 --- a/results/reaper/merges_tested/bitletorg/weupnp.csv +++ b/results/reaper/merges_tested/bitletorg/weupnp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/1,9054d6dff4032b41ba55d23678931497ff2af75a,5c19ff9fed515e83b86f15acb8d095b2f5e0cf5e,14664d548c67775a219b9a863e67e51242bd5bac,,True,False,True,2,5,14,2,True,2,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,True,Tests_passed,e7e462d1ff0dd4d1ea6665e84491d4ec1e7d574a1d6de93cea91575b36300290,True,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,abd4e77e256c2ae47df2d738c7926f45886eb1d51543573a414e3f3156cde993,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Tests_failed,28b55b08566201dd36e78904b866d12057c8ce64f5d5a064b37c1c9325f22d49,Merge_failed,32e26cecc1193edcc7c2cd34320a07abb16bd2a1415c684edfda19e2f0d6c5ec,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,43ae16839c19f8dc33d2fa19cb95d53eaa0a8e72f76a61801a76d6566c52e600,Tests_passed,4918974135d9a644a27d2eff7bc05adec0bd0101f7cb3787ecac038702480939,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Tests_passed,95af82aeff9e93273063969eda2cdecdc511fdac464c2fb0ec247afe4db70666,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72,Merge_failed,ca88b0975ddb59b8a97335c5a3584f3da07ed90e7f75b39e7c0cf7f4b9ba0c72 diff --git a/results/reaper/merges_tested/bitzeche/zencoder-java.csv b/results/reaper/merges_tested/bitzeche/zencoder-java.csv index 0b1869b5cc..ba7f9598c5 100644 --- a/results/reaper/merges_tested/bitzeche/zencoder-java.csv +++ b/results/reaper/merges_tested/bitzeche/zencoder-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,fbdc46df52f91095d127c9df2b2223207aa84dc1,285373ebf744d569d4ef3d511ffa7e7a5e703719,22b5d5679795d9757dd040a193ea5c670b7898f7,,True,True,True,9,41,328,3,True,9,Tests_passed,5479ef98d11b7bd22d51c6773709b2334886b903b8a57508afad21ba1af3ed71,True,Tests_passed,5befcad6dcdb2242268da4f14997f8fec89a67b05c709a452c72577961c45108,True,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,38be400a0c7ecaca2be08ebd7c925aa4a974b315f47c0af64c3e178cd078296e,Merge_failed,5682b0fb46d54a6e5423ee907d4b0f1e67f93862cbab41f36f08865245b53777,Merge_failed,19b7b904d8f09bb8282e2f38e148cb523d0b912151135651031830a270d653db,Merge_failed,33b28977e1057789f7dfcf1460bb86b2d96322cc88e078604f1a1a0f6f6a8d73,Merge_failed,5682b0fb46d54a6e5423ee907d4b0f1e67f93862cbab41f36f08865245b53777,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8eb28b7cd510229e9d6f6cad13f98420d8d833c91de3434054b9f687e3d34be4,Merge_failed,19b7b904d8f09bb8282e2f38e148cb523d0b912151135651031830a270d653db,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,35d8674672b40ea2763a7d6fb65bf76c3c4179514a81d190406e41dcf53d1181,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38,Merge_failed,8aa71e81b10c071a837cc638fc4cc3365413d3ac20d023f66fe8def38dd34f38 10,refs/heads/master,116a8e2fb219900072f36ac16320fbbe459cac03,4a25777e403cce64e4e0b44006380f932d85843c,81aff4a5655d87bab53885f736501b0d1c3aa23b,,True,True,True,7,29,147,2,True,7,Tests_passed,10cfd377843a748955e24ef91b8f18e075813dcd815d591e1f9cd23fa43460fb,True,Tests_passed,e2fe6d4f35b12ce12831cd97bf9bfbb0ea6f638acc787c9088baff9554d26440,True,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,89f4bf9ac7514e95a39ee693cc514fc59370b2fb69cc172d80f590eb9e781e72,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f,Tests_passed,8fd1ebb5a94bf4bf5cd0d29710a0cb0c30e6a5dd82a6b97c6f1ebf9bd0d5286f diff --git a/results/reaper/merges_tested/bjornharrtell/jts2geojson.csv b/results/reaper/merges_tested/bjornharrtell/jts2geojson.csv index 1ec1d150aa..26f7e1a3cb 100644 --- a/results/reaper/merges_tested/bjornharrtell/jts2geojson.csv +++ b/results/reaper/merges_tested/bjornharrtell/jts2geojson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,afbe2cdddd2d776744547752f820f0d8c03ad755,f190b3781a786d8102f986dd5246cdbf3652b8a6,bfe0f485963079579c710e12acd36d34971c775b,,True,True,True,14,20,153,3,True,14,Tests_passed,e1d3a06eeb005ef9624875d7442754e74c46d02dd642a54a0ea7464fb57121a3,True,Tests_passed,136350a3b76cae98a566f5af6ff93532df288ba825c498edf98e528f3b48e9c8,True,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_failed,ccb84a77be5c1bb83c71f413f8d00942c9e810e02b081b53cfd27047e1a4d105,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,b8efc153ac89c0caa8f01170d1ec7b93e11454aba2fe0d3ef27cb955537ce039,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600,Tests_passed,4c6ab8fd8459a43e17026c7ee0a8390d866223dcb6596bfb2db3a1ce10293600 diff --git a/results/reaper/merges_tested/blockchain/api-v1-client-java.csv b/results/reaper/merges_tested/blockchain/api-v1-client-java.csv index 5f24d10a58..7a9df2374d 100644 --- a/results/reaper/merges_tested/blockchain/api-v1-client-java.csv +++ b/results/reaper/merges_tested/blockchain/api-v1-client-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,abdf54e6ab0b99eb8179d56e0598058243bcea55,14d5560b04fd84ba9c4173b6669a2b7d90354adf,225a34c40079ff8a5c44ef0da2fa674fa4bcea38,,True,True,True,12,41,406,2,True,12,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,True,Tests_passed,400509a7aadac2f2c6dbeac4fa83b871a9ed63fa9c197f18a5f586c8eab9523f,True,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,ae26565c3b47987dbb9a921750e6d9def70454777497eaa280e033394043dbc9,Tests_failed,00ff0c8ae898da356839cec84a16b4fb7ece04aa680cf2920f8d3cd8e27258fa,Tests_failed,a442417b380e0554bed108f42a092448caca7266834531d1d5e7048fbdd6892c,Tests_failed,7d44ca15c110f59345cf375666126ab3ecf4eedc028027db296b0b44d1b39a58,Tests_failed,00ff0c8ae898da356839cec84a16b4fb7ece04aa680cf2920f8d3cd8e27258fa,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,1986c53b0425468ccf96d4f503045c0df6b95a74fe07ff556da36c705606e4a4,Tests_failed,a442417b380e0554bed108f42a092448caca7266834531d1d5e7048fbdd6892c,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d,Merge_failed,2077df87eb4e36623c5eb80f9cc52c64077bb94bf09a8a6b70bf8dbe10c5202d 10,refs/remotes/origin/pull/36,e349598f954da532e51825f2580948d63d0bb743,3fb6d582999cfd32ce450a5f7bede6ad3704d08b,14d5560b04fd84ba9c4173b6669a2b7d90354adf,,True,True,True,11,37,332,2,True,11,Tests_passed,982ba1f18069e4e35900310214fc89dc60d0a05e75a76a6a49418e765fe69b07,True,Tests_passed,326c8c78ad07281d3f66c30b76d818499470888fadc5bd7b219393c46446bf14,True,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,8bf5c56890ce0c78978c8fa3dcb7f88cad797dda16517b779135ef400965a0c1,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Tests_failed,cf5f04cb95ee8406cd0bfe5053289bafc15048af1f2c7962cf72543b146a02ba,Tests_failed,d6a64ae5cb9d4f6c4d3c62d4de89d19a439ffbae8e67a38a654347fb8b615913,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,7d1d09dcb8425a4ea029cb446a6a321acae250b51e4d9741614713b67ed2025b,Tests_failed,dee28f348bd0c8a41a94d9f084c6a977d0f21f3edb1df8123a1743adb7150e06,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,83eb4349b10aa563376add58c052529ec6d77c938688bd1a9f911b5cdc381c78,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6,Merge_failed,fbaa65e37c9dbc132ec0bc0a3aa689ea97bd0395fda189a10c57e8e9d5cea2f6 diff --git a/results/reaper/merges_tested/bluebreezecf/sparkjobserverclient.csv b/results/reaper/merges_tested/bluebreezecf/sparkjobserverclient.csv index b8cf240022..d7832653f5 100644 --- a/results/reaper/merges_tested/bluebreezecf/sparkjobserverclient.csv +++ b/results/reaper/merges_tested/bluebreezecf/sparkjobserverclient.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,46f2d8d50ae406cbf93855eb99b88e0fe9003454,91c92ad05f63c8e1b472f6d9e0164eb92537e03f,5cd4602a8d657cccbf97ea489eea519446c0e401,,True,True,Tests_passed,8a7c2669ed7f66932c02dc0b26f2d9d5a0da8b3faadfc49a32f034b3c1ad6611,True,4,29,256,2,True,Tests_passed,434ad22f00ca5015e85fdea7ceb5d67365a5eefa83ef8620dfe92cc2fa5d31df,True,4,True,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,8d87cff099040d4ce7c4f95604f78b26393107712b13e6e17888f79b3be6d796,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,f714d0ab4f5b05f76db33d20eb519164d3f21c41321be017c0ea97a47d11fa56,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,1054f3604ba5de299298d99eca93057befa70d4ba7f6c9e3fe1e322c61b4725f,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76,Tests_passed,df738d6487a481b8fc2a9faf84e629cd4f6c8aa8fce55f50cc04ace36007ad76 11,refs/heads/master,b33358fc74b3dc49807f93670a4f96d863839aff,6afab29ab841f9395b75965af52e85f8533d3db5,f4b01c5d96331e1658b155a05657529768eaa8e9,,True,False,Tests_passed,774d79fd873ab931a6e1d9a684cf905020a0f2458e2ff69d5868922618807b6e,True,5,10,34,6,True,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,True,7,True,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2535e34195689d94c6c3248ce0956a66b1eaee1dcf491e5462e2987759fca28d,Merge_failed,1552d2c230f484b5091b4bfc6f587c6549087f590ce40b9fed5697c141a1bad4,Merge_failed,53f863c4ac6755a4f5398c74260cea022025cf5d1095d3d727eb57a21e5ca8d4,Merge_failed,3c0bcc61f898d47645b8c694c8d16b68f272db08e37b0c458a1856d5d0a59220,Merge_failed,1552d2c230f484b5091b4bfc6f587c6549087f590ce40b9fed5697c141a1bad4,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,909db81963769e27ad995fea080de2425b7b40b0004bf97611b595750a9fd08c,Merge_failed,53f863c4ac6755a4f5398c74260cea022025cf5d1095d3d727eb57a21e5ca8d4,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,2d3f47eaadbe8704f91a9571918d29216bc96a29c6fb5f824ae04e9402ff18d6,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083,Merge_failed,b6a563065e1e83f05ce63d8ff2055776f6a7e0758dba915b7f97936b4951b083 12,refs/heads/master,f4b01c5d96331e1658b155a05657529768eaa8e9,6a35cb34fb28f2241700043d7534bcbe01e4b604,701ea5337f1c1d46c44f34757ac85d1bf29a47d5,,True,True,Tests_passed,0f1543651a341d29653fd435d1f732cf99d314b52c56ae9002c04f25ba4c15ff,True,7,42,114,2,True,Tests_passed,e4cd90f8c081c2d823a2af404e8e0e98c2b17d6242188bdac8b9804dbd083a98,True,7,True,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,a12265e40d85310246355415baae618ede10d79c43201c8580652e98a60c28ca,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,a12265e40d85310246355415baae618ede10d79c43201c8580652e98a60c28ca,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,ef8d035107ec8d9cc73d5420e2ed6a2b99e4ef746f5d57e0a89e524c89ff5831,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f,Tests_passed,c3cdc765b7d71593b5afdb20915bae3cd33bf357e90b7fa9ea034d608eca3c2f diff --git a/results/reaper/merges_tested/bobharner/componentworld.csv b/results/reaper/merges_tested/bobharner/componentworld.csv index aba2482e50..a91949eaf6 100644 --- a/results/reaper/merges_tested/bobharner/componentworld.csv +++ b/results/reaper/merges_tested/bobharner/componentworld.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/back-to-maven,1a2ff04097bd33609bd1c4ea9aa833640357f362,831fafda54d270586421497d4c0036067a47838e,ff5f0c920c58135ce736d60598f8080b991b6095,,True,True,True,30,17,350,3,True,30,Tests_passed,446d6bff03c906d7fbf16009920c2d6eb262258abc08f32b836f2b2c650d8c22,True,Tests_passed,6d270490d1e754219ddf921a19de11ddaabf2a83d80e57db5116904bbcee7abb,True,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,c929b6baa3ee92bfd4fe6ea595ed7ae18aeaa1659183a216cda18e04102bc991,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,1ccf82ce5e23f2ec90495e8a2e3bcfd96ac8ff7a51fb12b6649613fe86b6c480,Merge_failed,6b461a8a8b6a5097d81ac39a204bd4885be5f32de98c964b62b9d1ecc752eb17,Merge_failed,98b3fe68742807b1a8e83521641659c2c9673234664b996713167eafa33a3435,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,5feda344267eafca69a49836d76e3cf9366621b91dfc866a66ed5bef571fa699,Merge_failed,7e9ecfa572928a11b4ced9da19dea056ba62f334a643cbef65d2d2b1e0df02d3,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,562f4b880f74d4ad174e5277c30877f8f92e6a83bbefb20a3ed639afe420e913,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c,Merge_failed,e86429d40f4c8666f952111b77f9ac9cb00775ecef7ee175b8ba28080d15cd9c diff --git a/results/reaper/merges_tested/boilit/ebm.csv b/results/reaper/merges_tested/boilit/ebm.csv index c7054f47c3..bb29abc6db 100644 --- a/results/reaper/merges_tested/boilit/ebm.csv +++ b/results/reaper/merges_tested/boilit/ebm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b29fc0d1313fff81549c25758b1cc7b1d8f8a610,49250bf09cdeb0eae3090090c1e73c5e87ee72b0,3dedd78526d1feb50991b74c94a9e962b0610fc1,,True,True,True,23,92,859,4,True,23,Tests_passed,fd4dfdca08d3015f825302ec21cabc87f93f120885734fb10f42ac2ce3fcb2de,True,Tests_passed,807672812daddb02e11e69ab92bf391754bd8dcfd4d208cbfa2c219132058223,True,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,e2b79305e52cabdbada8111d175f95eb60f7357f02fb8dd2f83bd0512da1eca2,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e,Tests_passed,a99a1ef27a9c10b29e0f0a8df37946547c899b6179ddac6469229f79e1dc0b3e diff --git a/results/reaper/merges_tested/brettflan/worldborder.csv b/results/reaper/merges_tested/brettflan/worldborder.csv index bf933f59e0..5f13e62778 100644 --- a/results/reaper/merges_tested/brettflan/worldborder.csv +++ b/results/reaper/merges_tested/brettflan/worldborder.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,e6564300c73bed2ff8b73101167a6172184faf8a,ec843cde03aac693186f75638b2ebdf865128dd2,8e68e83e3d68246ce0f54efae73522fde13aef82,,True,True,True,3,16,99,2,True,3,Tests_passed,5bb291cf17f6c5dbc48744bea4a1f0aa76522a2e11615549c5e6d4e3f8831d2f,True,Tests_passed,ae41a2c05501d2dd06f1ead0cdc8220c5e0f3f1217ce8eab69f7f65ff7f2569f,True,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,aed0db5a872a1f35b13ec59d5fe346bc16cd32d9738f409b07848d2c0738903d,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,aed0db5a872a1f35b13ec59d5fe346bc16cd32d9738f409b07848d2c0738903d,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7,Tests_passed,839acad28b7af4817ace148825bd3a893c38c3cbfb77abe366f482ca957e20f7 24,refs/remotes/origin/pull/173,fbf9066966d4b472136dcaf207400d77e2652ca5,c2a45b5876985665c80be37ff343d01f20399fe7,c1d99e560c227b2b5e3a5fb2f0d410159ff3d810,,True,False,True,8,41,148,2,True,8,Tests_passed,6598f969f1251c250c2c6a2be0a5ec85b5cd6b46d3a80eb7efafcdbe6fff175b,True,Tests_passed,64b77d515fd91002a7092ca06daef30aa8ab91c4a549fc7e42b0708e73eab6e5,True,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,885b204c7c3435cd14ee752a47115beae384df2374e9387f9c6d78bbc6316368,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5,Tests_passed,8841825fb871e4f7b70345734a85eca5d334ea41a63415dc5204808000002dd5 diff --git a/results/reaper/merges_tested/brettwooldridge/hikarijson.csv b/results/reaper/merges_tested/brettwooldridge/hikarijson.csv index 33f87a31d7..31286ea518 100644 --- a/results/reaper/merges_tested/brettwooldridge/hikarijson.csv +++ b/results/reaper/merges_tested/brettwooldridge/hikarijson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,f1b45352cf9c8510a94fd97c943d4fe526cc94ad,98fb6a09755102f18ced62474bc1d08093fe06af,dc0f7cdf4f2186ff65e8ac4fb1edd7b2930d6171,,True,True,True,7,23,186,3,True,7,Tests_passed,8d2a1271a18045a380a928f3f87fa85f72215fafeaa6cd022459005e346aa220,True,Tests_passed,618dc5d39d5479d4d406718de1ceb91417fc3d2ea9052ad15711cc34fc74e090,True,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,3d60a23aa6a36c42c76c04dffeef362638e5712c94aecba00c90c8f26854a10c,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Tests_failed,9289d2a851a28f6ce2c2a41c9f3d5adbca19b0b15c37ae20f9070b14e2a46273,Tests_failed,10ce6614c6e298e11a24f10e09eb97390856b8f1a588f6b9c3a92fee11bc8b7d,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8120a19fb9a4e0eec9188eaf6d13b3a34fcc995e1aa56a8b7a3e9b031a21add2,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,651ba4f1c0c92329b48ad72145386b4040247231c13f54f14534b5be631b9cc9,Merge_failed,8263c6dc5c01f362bca5d80c6331d8cd4cf7d1ee752b45b503af0cedcc200075,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,8bdf18cd7965ba65ecc0afbcb4cf232726e86f0f70d9859bee4085d67c271eaa,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41,Merge_failed,ae820d70cc4492141ee27050662213c4c8302ab098879a2f89129afe10e66b41 diff --git a/results/reaper/merges_tested/brettwooldridge/nuprocess.csv b/results/reaper/merges_tested/brettwooldridge/nuprocess.csv index e3298406c4..c77244dfb9 100644 --- a/results/reaper/merges_tested/brettwooldridge/nuprocess.csv +++ b/results/reaper/merges_tested/brettwooldridge/nuprocess.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/remotes/origin/pull/104,f2f0b7eab313c7df153843f68dc79075cb7126ee,9422f21da37be6d6ae3ad2c740e71153126cf6bf,bc948a455d20373831757e321763ad47a3e67853,,True,True,Tests_passed,093b107a086bfdc5455c1f14ef6712f77df09299774f3eb579fc1ad9927a05c6,True,20,58,1098,3,True,Tests_passed,ac59cdbc29b49aba0cd720f5c939b2d79f70cada85af0d19745d198a7a7bdb9e,True,20,True,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,ba838718ea0c9753d33b1efa843226dce5cba7bed62561841d974b78c71cd29c,Merge_failed,0284c0999a585bdb84e78263a77a109acdc982a9713c1265d59b97678b31059e,Merge_failed,ccd0a54188db0435a9419be114069fb72f5049f9b2a6bdd2f67baa75e7863f88,Merge_failed,0dec57dfb4e43d0d9dfd40b72b12bef40b374dc63a01df569675fa433e7bf787,Merge_failed,cc509cc801c82810ce3f564d20052682b07f94c0458fd117e42a388b262f8d12,Merge_failed,ccd0a54188db0435a9419be114069fb72f5049f9b2a6bdd2f67baa75e7863f88,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,aa077fa20260049e8ece2ca1db4d3249cc20d6a7c600da1c9546ac5aa5b48560,Merge_failed,ba838718ea0c9753d33b1efa843226dce5cba7bed62561841d974b78c71cd29c,Merge_failed,77caafe5f22aaadf5815e9ef25e0a2a800b8ca5981ce94e70f6004491e8318b6,Merge_failed,6339230cc7ce8e9ed9d104cde9866ced318722d55c4d2ae216b735229a8e63eb,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,c128c58acbe11e159e0542c8a07f168f0cb6c1f1a4580066598be0847d8ff565,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3,Merge_failed,da1a5ad4b2cbe675792ce9439bf961b059dd31c46823a54e0861ee09bba52bf3 32,refs/remotes/origin/pull/131,c18f600e9456192f1216d5f1e5cb8da32822bec0,014e357002becfa872b246373656ec1f8b5d9b25,9b42fc36d3c678939ffbdfc139bcae048fa96526,,True,True,Tests_passed,d78ceb58f5917736a3bf8715aac4a119be8619905a8060a617dd3510d5316a53,True,6,9,39,2,True,Tests_passed,e17e709961098ed93c9f2e67d78b96b5c8155e05f381dcedc2e92f67d7378390,True,6,True,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,4a96197e7a6cd3113209e78c39bc75daef22c4b7c5574fbe90aee8b4f213a30d,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,1df039dc0179d489cc27dcd6c4de08f6b0a32734f3bc6f3d26e867f5519f46a7,Merge_failed,6b7c1e09d7a16de88032f283577d44bff3c0f4a1782825cd7bf6ad70721c9487,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,040f7d468258791940b5bb0ed3b227e9960edaad628b119c3c04f024bc110443,Tests_passed,114cf6660dfe5ea74c86ef926aaebe41bc982a6c0aed55d542ab9b82f9be3e81,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3,Merge_failed,41cf6f55c04491be55a3d1d7cf6beed26803963c21f657302db8ef03dfbf96f3 diff --git a/results/reaper/merges_tested/brettwooldridge/sansorm.csv b/results/reaper/merges_tested/brettwooldridge/sansorm.csv index b6a9d361bf..3579023bf4 100644 --- a/results/reaper/merges_tested/brettwooldridge/sansorm.csv +++ b/results/reaper/merges_tested/brettwooldridge/sansorm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,d8492ff5c2ed8834177f8a7dc9205b220d59df9a,9ffe04fc1c96b399f085e0e4698c877acc9acac3,f80048ccf33888d323110805e8298d7ac8d4845f,,True,True,True,10,28,536,2,True,10,Tests_passed,a656b1ae42a43c794eda0ee84ca2c76bfdee59c672e13a6633c72da046e313a3,True,Tests_passed,c00e173656076dbeb6d741438caf5f0aca37a6c15d6e3adc5c395018793bc8d5,True,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,920af9d341e2f64140a8f62118b246fa869753dfaaf93aa8ec6d58064518b147,Merge_failed,928b1c3990b60be4b74784405d1bc13877066b9400a35c486b4f7e2affcb80d0,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,c3db415a8ea1da336eea6eb40f8cf52b7312b2f6dc55bffeedd23f659d08c1d6,Tests_passed,920af9d341e2f64140a8f62118b246fa869753dfaaf93aa8ec6d58064518b147,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605,Merge_failed,a39900b9cb720c25b5ce0b2fad5d558e22181f3645d26eb3c75013302bd75605 14,refs/heads/master,6e3a8b4303ad3c0778bd04f08ceacd024e9b67a7,0b4c876530d7f4b4962fe88142d03ace6ce4d58a,9d23c8e449cc138506f4c71454a3116bfd051d46,,True,False,True,4,15,81,2,True,4,Tests_passed,9a9a1099dcca43179a9602fd983d6223fa9ef507b60df10cd2138730eb1bae29,True,Tests_passed,a128b6699580ca29f9938c9b6b0233f0f8057045c755ce6db700d846229e8f32,True,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,4bfd29eb98bc856704a2483bf971c5bf0ff2973ccda9e76961659d73e4049057,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,a4ff579863fcea249015be0fc15aa8bc94061f1435ed33e70a85bf677a15ee78,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad,Tests_passed,3a9a567a2aab292bf50a0cd8da73ecfd20446dc308410c41d1d390db8ae06fad diff --git a/results/reaper/merges_tested/brettwooldridge/sparsebitset.csv b/results/reaper/merges_tested/brettwooldridge/sparsebitset.csv index feb18393da..312fffb75d 100644 --- a/results/reaper/merges_tested/brettwooldridge/sparsebitset.csv +++ b/results/reaper/merges_tested/brettwooldridge/sparsebitset.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/25,43cda6d2235f1133ae94cdfebce65d0dbaa4d83f,1f168799ce0dcac325cc7d787b8bb24465bdbfa0,8b32633706533a1fb828e05415dbdbc2c32f3a31,,True,True,Tests_passed,a54e1416719615f83999c52735a79585ce2eff4f501f620963eb6800e82e2770,True,7,86,270,3,True,Tests_passed,c8aa55b9556b30704d48f2bc849676a11897da893973dc603bc242943cfd0738,True,7,True,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,b9d12b06a107afd30cfb524158f4025941f73a29fef086396972740ba6981b51,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,426f5e18614476a5fc9646cfdbc8c815eb887dbb494af6e083e0ad80b55bf1ca,Merge_failed,2af4a7c10d8fb8c8eb300da9a578a226095b022e91b9c92466ab0471aa5a4a1a,Merge_failed,104998a4f122b93d46b9027d617f8267e6973ea90e4dbfe4890007311e2b49ce,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,4809ec42fcf03adc81529e2d2687b7f3630420d8ec1ae9ed02e41939926c0f95,Merge_failed,bbc0e976759ec252a74bc6e8a963550b76c30cd9952daa13718ffc312f70e875,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f,Merge_failed,7521663c9515379a2f02fbe83333bd0c2cb4cce79791b6bb71236d3ef79b879f diff --git a/results/reaper/merges_tested/brewinapps/ios-maven-plugin.csv b/results/reaper/merges_tested/brewinapps/ios-maven-plugin.csv index bf62cfbc0a..a6f4321ad7 100644 --- a/results/reaper/merges_tested/brewinapps/ios-maven-plugin.csv +++ b/results/reaper/merges_tested/brewinapps/ios-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/remotes/origin/pull/12,ccc17f78b72bd7d10a1e55e134f3eb6205a97180,f5b7f6ef62af71a4d9f953956d87c2a9eaadd25b,75e78cc2b436b169582ce05d7c0b6871c66424b1,,True,True,True,17,140,1466,2,True,17,Tests_passed,429b77e7e100fe4099b801c308b7c330955f0dc68a7105518f0bf26e2817fbd9,True,Tests_passed,360795bd1e13760e12a6c9fddc0e03f361a00b164389fd2559d9bc19a9d3c0b0,True,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,372529464b657ce5f91cee6fe1c5ba3bee9f84c2b649b6f37ebf107caacc3eff,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Tests_failed,f336987a4b15e8db1a9075a2ad46b3b64863e76289d87de94b980c4c770cf43f,Merge_failed,c7970d70a6c55d3b9e1bd506cfa8b78a265394af89cae2365d95c5c2bb8b7880,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,9ed4951f2b1e71e4f2e8dfc0dfa49d84d93a8b6fd9ee6c65fe37a63e409e779b,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,403d3cc19b32f117ddd2d7836a841b0e50bd8ceae02f63866435bb3fc7a9036a,Merge_failed,5ffb2d5c53aa3e9b1c63eac7fe8ceb4557b0fdbaf294716688a97618a6ba1717,Merge_failed,a84c69bc1dc20c16368316b800fea9530fbbb193e4645e7377a325511c618e39,Tests_passed,47691e79aa413f82a6fef0603223d7a0df732f7a4146a63599badd74e1d2d93e,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,56ff647f8ea04fc7c1297cff2e16dca09452a7a7df251abd9ec1ca13b568fed7,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025,Merge_failed,a6d0646a574574533669aa7c2a5bd47c36acc44e1eb7085dfb6096e479374025 24,refs/remotes/origin/pull/12,4c30de881d6668e081444b320c4e978f4f15b383,da159976509329c5f97a1d5e8ecbff50d2895ff1,b64053dfe9d01af92df8c2a42ee2b482de3fb13b,,True,True,True,3,31,94,3,True,3,Tests_passed,253e9808286a6121a8c27f14fea353fea5ca8cf142075b7d703fef49890b2c64,True,Tests_passed,7495918e494a8317e051ebc5114b2b05b10ed587fec06cd282c4265477dcfa6c,True,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,38c08bad96054762fcae9d72e227dac757f07723663857f662c5f5218d6e725a,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,38c08bad96054762fcae9d72e227dac757f07723663857f662c5f5218d6e725a,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d,Tests_passed,5b06251f4e45ad7d71386986f129297781fa88d8cf2e92b1d8533453ccf16e4d 36,refs/remotes/origin/pull/12,cc61aefc6be843b887a9284521d0dc01ea1104fc,bb2794e814ce5a650dbc766dc38f1b571dfc5752,ae66d294c7807568b5638e18affc4d16442034d7,,True,True,True,5,50,463,4,True,6,Tests_passed,5480ab8b5a3b07daaee76889131aa91ce4c61cdd09423aa247514a765b978993,True,Tests_passed,40cc5534c0fbddd001317c2a1301ec554fb6827131dbae0b9d113ad17b72a3f3,True,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,675113349950cd033a6dba99852ffca07cc497ab1c77c91697ad73c6827b4ec3,Merge_failed,97ec0f870085831f8f7bd41495c47f943c5fdad0fe524a77816c2ad3f9495d69,Merge_failed,a6a20ac9529cdc61653edd263238b89c877531f70654285325d593cdd6b6c44c,Merge_failed,b05dc8072c18401887639750240c50a87589390865b816a9fe0fc5ba6beeb12b,Merge_failed,97ec0f870085831f8f7bd41495c47f943c5fdad0fe524a77816c2ad3f9495d69,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,c36a09a4ebc11870a514f3891a34eae2e949d80ece22050800bfe2aa2e824175,Merge_failed,a22950d485bb9f77afe2b2afeacb73809e3de1dd29550e221b073e97a7bc0f66,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db,Merge_failed,e0d320805b01716e8c01765fe57d8bd291eecc670b215c09effe17561b09c5db diff --git a/results/reaper/merges_tested/brianm/config-magic.csv b/results/reaper/merges_tested/brianm/config-magic.csv index b1c1a91685..f6cc770026 100644 --- a/results/reaper/merges_tested/brianm/config-magic.csv +++ b/results/reaper/merges_tested/brianm/config-magic.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,a7953193ae2e296565ecee2809830b5abb3a3bb7,0b2b3049ac1f80ac94d49f7a449af8281ad462c2,9ec92abc876cc468ba6f972ee9d3bb7469a5b1cd,,True,True,True,15,61,536,12,True,23,Tests_passed,729c70a5cce401e65730c1a776367d40596d97439f28693e55cf802a8fe0b37b,True,Tests_passed,dab5f506370335878353bba304d83b48b05cccb3b206ff36072c9a5cc6d154f9,True,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,7748651d8c623b99b0ba0156fd1580659486c8f0c98c3a08aa3148900e318b2d,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,9080527ca16f981f294563c98199425e3b0f768ffe435df4f892eaf9eb65a7df,Merge_failed,a4242da1f03282f4da63a37349e4763bc2182e60bf4861d5c7065abd7aca3cfb,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,b123764ba7c914ea793d4551cce0a2d1008b4003e6d830bc516ba7fd546e5c2d,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,deb7a2d54d2adb30bd533d94d012acf4811163eee93cd653cc50598d198ca790,Tests_passed,c22bd8648b33803eeee92186f85161929b514059724468c900f044a2eda5252f,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,6a3cc45904740a565dcdcbac0023e8a1f86966e2b2889b85c9a07f240886f888,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a,Merge_failed,c681e8759dadaa1c29f1b1730335d5eea5545dde120ef8aea013c77310f1ab3a diff --git a/results/reaper/merges_tested/brianm/jdbi3.csv b/results/reaper/merges_tested/brianm/jdbi3.csv index 438790e520..b9bf747a54 100644 --- a/results/reaper/merges_tested/brianm/jdbi3.csv +++ b/results/reaper/merges_tested/brianm/jdbi3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9f40c034b7d4b1a262f723ec81a630d1ebeb31bd,d4bf1ba6bbff2c9a9726839d0dfbad1f154f0c07,536ef1ada584141d12aba9135f744404f007c842,,True,True,Tests_passed,a13deb9bb2aaaf9cd2f71dc901689920efd234f151b2cb716cfe559d27a9b83a,True,9,27,294,5,True,Tests_passed,35508aedfa7e6c36aca6730ac32b3f82c99929041227b69b611066caee59f314,True,9,True,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c863ff0e204e9538b6bc0a39c5074be19f4c15087647e5a2ec3a2f07ca462f1c,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,b7361d7f9f382d4456a0fa6d01ff67778a6f362d0edfcd3a42517d9af8b68d3e,Merge_failed,a94f67a0437569f1129cb6a302821a4f056586e85a1d0116481b787c9a513d92,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,48bf676150bfa45b50e86d62482b6a6bb47d864a9400f0653b07a11b0c683082,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,0bcb47231b3c936237cfc45de74b8b8ef5724d8355faaedbf43b9fcf6597dc88,Merge_failed,215365d0eb1a81aba8e0bba58836a0f1b62b3d2ecad525e922c7f8cae68500a2,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,c980e6155ba7651d91b8253df0b195d3f46ee7936679d4f2f509b096768cdeae,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a,Merge_failed,d7bdc0656f86cd560b013a56aa32a392cc8c55daeb59cba8cf186fe7bdca6b4a diff --git a/results/reaper/merges_tested/brianm/really-executable-jars-maven-plugin.csv b/results/reaper/merges_tested/brianm/really-executable-jars-maven-plugin.csv index 5c3d59a723..10ea781815 100644 --- a/results/reaper/merges_tested/brianm/really-executable-jars-maven-plugin.csv +++ b/results/reaper/merges_tested/brianm/really-executable-jars-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,913bd85a3e0137af536fc489fe7845625da4c99b,692acc3220ae529dde128d24a6fb920e599359e7,3ed2c7154ac04c734cfb7459ba5046483e34437a,,True,True,True,4,9,40,2,True,4,Tests_passed,5a9ba7434f61d3ba973df6c3f8ec363af8c30b7c64b36fcda65ed99883768681,True,Tests_passed,2016b6b4b0bc06d7d2024adceff138d02b32f0c452250912dc97978795f7a49a,True,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_failed,b4e6399513be3a03cc0a300d673f659ed47ad801ccb0ec35ce21a6e289f4659f,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,9cde753eb794a0daf4df6cfc68d99e93a869af5f189de1a67bf735fbf73ee139,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406,Tests_passed,7a38e514131de67fdc0035d8e87ec225113c5112c2d7c7c35c55c0d0b92a3406 diff --git a/results/reaper/merges_tested/brndnmtthws/hdfs.csv b/results/reaper/merges_tested/brndnmtthws/hdfs.csv index 4fbce9827d..91054b741b 100644 --- a/results/reaper/merges_tested/brndnmtthws/hdfs.csv +++ b/results/reaper/merges_tested/brndnmtthws/hdfs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/1,d6f056ab178425282ed8e44a58cee9213cda533f,8fdcb074fc50b725375557e1ed079ff19832d314,3fb64891400b15dc0b9f0dc62a931cb76b823049,,True,True,True,18,81,572,2,True,18,Tests_passed,93691cf300a3d0d105efa4804d05104a6b2170ad4ff5e217f5bd6493e12f245a,True,Tests_passed,774d398fbfa75bb3e5212e487f3b4167fcbd2bdeddfbb3809c2ce7f0ff6cf7b4,True,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,518f230a765da5df469f53f3ff81c94f47094f4f81a70948484903c903168c4a,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,668c74d0d704b0e95ec0f79a19583432dba1b5ca3fc1d0e0ebf331490ebfab9c,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,518f230a765da5df469f53f3ff81c94f47094f4f81a70948484903c903168c4a,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,668c74d0d704b0e95ec0f79a19583432dba1b5ca3fc1d0e0ebf331490ebfab9c,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53,Tests_passed,ba5c2ed728bdad1543e3eb1d36603bcc9b8b6c064698cafc56e5805b9acb4f53 21,refs/remotes/origin/pull/1,dbe229fa49b77424ba23ac7cbd9bdfb744b96b61,76b31c3b23c6f7d02fb73b82e87ced3aa578c655,446caa52b7b1d88f5688cd5c709a21f1510e014e,,True,True,True,10,35,326,2,True,10,Tests_passed,73398654e4e57252b6389935d28a5f8d5980976a78a61e6811e79808fc77f50e,True,Tests_passed,aeba9670d069361c084c78338773acffe2b38559688194426ec7d42b24b81317,True,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_failed,c7849adae565133fcbe6c856708dbf4f2c193e76bea0f360d36da8bd5b61f2af,Tests_passed,17c5f2974295206b7b88876968934fd7d7641bd90fbe06427ba10aa7706c146d,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_failed,c7849adae565133fcbe6c856708dbf4f2c193e76bea0f360d36da8bd5b61f2af,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,a43040939b34445a456f11355ad716a7fb90ccbba70dbcf37ca13340b0f5df5a,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc,Tests_passed,9b20d4f239b718f11bfeaa18c5886174e863a63b950eabdecd2adc0ccbaf0bbc 22,refs/remotes/origin/pull/1,812784211b2b5c66e974ff250e6e76e738e9b11f,5e3871f2cb13e280d91a6be28d14b4b6ce29da74,a1bfd285e3f7d5e530d6949387cae011dd0b48c2,,True,True,True,8,34,229,2,True,8,Tests_passed,9a30a6cd08133093185e491022fac02334f1ef21c3cc683f583e6e8a7ff89050,True,Tests_passed,1fa08c460aef0d159ce0433c4a879cfef63cd71729fde084e16b956daf57bc8c,True,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_failed,b697d9b715bd767aaf054192971a5378e8d8e40b3d2d5c060f7f5e3ddba02831,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_failed,b697d9b715bd767aaf054192971a5378e8d8e40b3d2d5c060f7f5e3ddba02831,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602,Tests_passed,bb2656d09441d0331ab1ae2668d8f4d22d797f7a0ad49a803661da5835108602 diff --git a/results/reaper/merges_tested/broadleafcommerce/broadleafcommerce.csv b/results/reaper/merges_tested/broadleafcommerce/broadleafcommerce.csv index 1dd411d923..7e139cfe48 100644 --- a/results/reaper/merges_tested/broadleafcommerce/broadleafcommerce.csv +++ b/results/reaper/merges_tested/broadleafcommerce/broadleafcommerce.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1715,refs/heads/develop-6.2.x,b1f36fd6868b726a6a22b89b4d54fd4593c92d43,ad773cad85edaf0c8d5c24b5c8119d54f1f2812c,0d98fa1d9b9cc200c4423bfb4c7e0408f73b0cfd,,True,True,True,313,1065,6810.0,17,True,313,Tests_passed,4501e99b53327d8b8588e9ab94b3ac63c0112bff8a8a87a97083066be4420d1a,True,Tests_passed,70622d608a072797781d81fffd6790e6cde411a60a485c25cb1d5b151aa5dbcf,True,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0b8ad975b0e523dfefcbe665b1da5d641d607877caf2b5e29186d65eb66a12e0,Merge_failed,0b8ad975b0e523dfefcbe665b1da5d641d607877caf2b5e29186d65eb66a12e0,Merge_failed,0b8ad975b0e523dfefcbe665b1da5d641d607877caf2b5e29186d65eb66a12e0,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,d2df9a2d6d8f797e4bc5a29b90bdae3950ea81fef54f868d87fdecf15108ab0a,Merge_failed,aea3477a29edce6bf84caa6bacbc7cd0795b582b72a104ea16d7e5d45b3ae3b6,Merge_failed,11e9fce7f0b5f1a4d261dd84757212e883fdce8946965c0411ccb06a7c7430d4,Merge_timedout,,Merge_failed,aea3477a29edce6bf84caa6bacbc7cd0795b582b72a104ea16d7e5d45b3ae3b6,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0b8ad975b0e523dfefcbe665b1da5d641d607877caf2b5e29186d65eb66a12e0,Merge_failed,0b8ad975b0e523dfefcbe665b1da5d641d607877caf2b5e29186d65eb66a12e0,Merge_failed,0b8ad975b0e523dfefcbe665b1da5d641d607877caf2b5e29186d65eb66a12e0,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0b37f481d7ab71f7db2a5680c6ebdafdc5919653281bf84e71fb2ce03c2baf9f,Merge_failed,75a343431b6bd5a034655a001eff554dfc798ef6d1aa64ad2a8f2869f633a6a9,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71,Merge_failed,0a261d4d2c049c5547cd0daf66bb4ec319dc3e39c8e8ef02f4eb76755ede2b71 3004,refs/remotes/origin/5020-QA-Searching-for-catalogs-using-percentage-cause-an-error,5b98c9eaa0c3d1420aab6cab1b92c4a333457c62,d1a42351c0c5391b49427ba7a0b216c7f5b14b43,48f5b0f737750ef45b8779ed24951995246e66f0,,True,True,True,3326,3375,8842.0,3,True,3326,Tests_passed,e4e11c6f253e2d914e9d344af3cd34c593212424b0bb62557731a77f78b08454,True,Tests_passed,1a6fee2e5dbfb83e9c260435c068ab59ed728c7dfa60e01d95dfc54e18e503fc,True,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,c48e24d437914b3ea97b1120c8a65de74bb066902f37e77fc74555ebb46e1dc9,Merge_timedout,,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,c48e24d437914b3ea97b1120c8a65de74bb066902f37e77fc74555ebb46e1dc9,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,ffcd2eb3345e955af60b08efa51d8ea14bd424ce1007067525273b7827fb4413,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129,Tests_passed,bed49f9fdabb3af2d870c56304c8423ef20266708bbbfe88c67e6a3af7c98129 3615,refs/remotes/origin/QA-5193_add_multiply_decimal_with_rounding,ed0d0e45a7058829f4dedc095561ef546839d21f,af94f77e1218f0fb5357f6dcf3a0438fb6cf84f8,ebb4bb93bc2881c57ee17e09dcea85f9f85c6e6d,,True,True,True,3301,5160,21421.0,4,True,3301,Tests_passed,e61fba4c0c89674620006b27ff750c2ff83711232bc84eef5868e15db59b97f7,True,Tests_passed,6144c01fc7bd9c34e852271007a32de09fea02cd5fae55eeb8c464d8a98cd79d,True,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,fbda1bd02f16496a90d7147956297ee1a4ef90812653884542347ce1c45de4eb,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,fbda1bd02f16496a90d7147956297ee1a4ef90812653884542347ce1c45de4eb,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,46a5df45a482011bb9b34f72a254c75338bcfa52369e8e80260be394e62b6fd6,Merge_timedout,,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,fbda1bd02f16496a90d7147956297ee1a4ef90812653884542347ce1c45de4eb,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,46a5df45a482011bb9b34f72a254c75338bcfa52369e8e80260be394e62b6fd6,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,fbda1bd02f16496a90d7147956297ee1a4ef90812653884542347ce1c45de4eb,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e,Tests_passed,ffd517b9f4d36f3c7549880fd2cd02403224740870f0b9103fa062a07151880e diff --git a/results/reaper/merges_tested/bronx/saci-vraptor.csv b/results/reaper/merges_tested/bronx/saci-vraptor.csv index 48645ac5fe..a2b0677a86 100644 --- a/results/reaper/merges_tested/bronx/saci-vraptor.csv +++ b/results/reaper/merges_tested/bronx/saci-vraptor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,cb9355ed085d8366a0317c7be599c1ffc0256a55,5bd3bdf950aaa203727ed98c937edab28c6429b3,f7da6af523ed9afda669349adfd8f1f2361594ab,,True,True,Tests_passed,e72316aa393100cdd1b4386d606e305b84124f9e5ea8f3adf4eb3557148b4751,True,11,21,907,2,True,Tests_passed,fd47b49850c946f8857dca98fcf3f4b35c0b3a5edce8ec54a2a9ec81071931cc,True,11,True,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_failed,cc7b00e9fb77cbc052cb3a307e3dd35f12c444e516bf0ccc9af4e221dbb900b7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,974bf6093fee18cfc7500816a88635dc4e461d31f86919c0cbafc6f1e11796f7,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,1bf729b64d308691fd71d73a91fe60d62f301e8fd458e3626b7a5444e4ea91ad,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af,Tests_passed,2f28b0c23b2d6a66d98804d51c7d03f694bf480ba11fe7ceeccc3f0580ce67af diff --git a/results/reaper/merges_tested/brooklyncentral/brooklyn-ambari.csv b/results/reaper/merges_tested/brooklyncentral/brooklyn-ambari.csv index bb05e19770..0617245f0b 100644 --- a/results/reaper/merges_tested/brooklyncentral/brooklyn-ambari.csv +++ b/results/reaper/merges_tested/brooklyncentral/brooklyn-ambari.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/master,a5ae8a689444a06ec389a2f6403ed32d4ffd1ca2,6623edeb58a6cb51c4e60a77645307ca43e4dbad,7c6ca7ff7afc2c25fa33c31cdc6693eec5cede72,,True,True,True,11,19,399,2,True,11,Tests_passed,8645ca8c12e1a091e2495d3d094d8fc4c750f15c375aa06c07e7960481918cd1,True,Tests_passed,5000b615374fdf2763bdc4248978d790c580d9bf132614e6cab3f66dbff5b8cb,True,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,77db74edc64dd7a028fa23e99a725d134112d93b3a170ba1192835d33943e24e,Tests_failed,3b35ba1c77f78db32203c038d6060fbeb681697279a58fa42dbc55d8066c1633,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,77db74edc64dd7a028fa23e99a725d134112d93b3a170ba1192835d33943e24e,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119,Tests_passed,0a3bc05da33c9c51b7b0db67173c9a15a3d9c1b494071e3a5e19d027452ce119 103,refs/heads/master,2b1a13acb9dd3617392ce7794dc7602908e46900,3b9261bbe998deeee80c9bb1aa5bb293b4367e14,503e498fda03565bedb43a9b7ee4b3fa9b3b5b88,,True,True,True,18,69,784,2,True,18,Tests_passed,f0dd30643fa21bafb6af4f12317388cffacc2f5fc20c84758027a88edb55bd49,True,Tests_passed,9aa221acf1421d39a4e3e841c443f151bdf14a8c982173ce48140c621e62ea01,True,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,12ef6fb7a32463d5cd5a56728e413198daa6a80db3212bcae957c066d7c8d3b6,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf,Tests_passed,e8ea0fdce7c50291a543758524aea7685af69d30fbc7f3fdb3ce1e51fffa1ddf diff --git a/results/reaper/merges_tested/brooklyncentral/clocker.csv b/results/reaper/merges_tested/brooklyncentral/clocker.csv index 0c5e3d9130..0a4134c60b 100644 --- a/results/reaper/merges_tested/brooklyncentral/clocker.csv +++ b/results/reaper/merges_tested/brooklyncentral/clocker.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 116,refs/heads/master,6a392f0a5a52d4b0c9e4e06388bf6a38bbb1b625,797d4c99f449a7b8c7eadb9fdc4d4b9c7c490cba,3c29d938a856b0aaa38936b5742328382947cdc3,,True,True,True,17,46,371,2,True,17,Tests_passed,c1c04e8aefec64b5a552d49340f7f5b31c5c2fd73a5306bdd69a950aa082ce93,True,Tests_passed,63ffc8407ac6c0370b0920beaef5423c04981fcff774db87d7f6df295b5b6a84,True,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,581592c7199d649a352b005cb1e4b9aa9069a9d0d376b6afba060a8b2b43d73d,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,581592c7199d649a352b005cb1e4b9aa9069a9d0d376b6afba060a8b2b43d73d,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88,Tests_passed,85f0c93fdfd88bc86d2e3afe07371726cd7c09a4416b995873a01186b5fa7f88 121,refs/heads/master,cbfb53b0dfa18585296f9f245310436d7b0a7c35,8ddf6384871980e1c167abe0e890b1337c863bff,fe6fdcc30b1dcee4c3452dc6f95793d8168c94d3,,True,True,True,6,18,131,2,True,6,Tests_passed,1d753f88e8b19faa593088894f51bfacbb5b76e3b591c134be9d8544d6e68cc8,True,Tests_passed,a862ac052a176185a30fe82ebe6870579db71fe106bdc82e54d33e02785b54f5,True,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,02aaf1c4aa02f1fc49cb6cb79eb9956d6ea8d6e84bb07019f38b50c391737c97,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,02aaf1c4aa02f1fc49cb6cb79eb9956d6ea8d6e84bb07019f38b50c391737c97,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00,Tests_passed,f3157db69e1cb018f883292b590aa8180c0839c5b71881256210ac4eb9a3ac00 124,refs/heads/master,9ee6e4afa42051b24cf142a5633f20e39540d6ad,a090d562efba0f121430c8bb2ad34f2864b9a8d4,537feda2d7787118f56e46df8bae45ea74e5c078,,True,True,True,53,238,2121,2,True,53,Tests_passed,fc79ea5815730a471ebdb772e0f16275dac24d1999407970aeb1dd0d78d63d67,True,Tests_passed,74370f83ceba6bec56d650c3d5045c30f1135612c25b49c8707e42ec79fec250,True,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_failed,308ea408874ede6274edf97b23aac844386b918a46fab6dccc19b2ed73725bec,Merge_timedout,,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_failed,308ea408874ede6274edf97b23aac844386b918a46fab6dccc19b2ed73725bec,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818,Tests_passed,f039673a4c4c4746a3f37b590ab5cb6a533418c8fecf2869286dd0fcfaa03818 diff --git a/results/reaper/merges_tested/brunoribeiro/sql-parser.csv b/results/reaper/merges_tested/brunoribeiro/sql-parser.csv index a16e56af7b..c3b03ffab7 100644 --- a/results/reaper/merges_tested/brunoribeiro/sql-parser.csv +++ b/results/reaper/merges_tested/brunoribeiro/sql-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,ec06c99726c4d7c4d5e94601535cf87c1f62f265,4c768844566b6f1d168a3efba5b26ed3f75fc91e,d298f8d193486310c8813234ec30a280f315c6b0,,True,True,True,23,48,383,2,True,23,Tests_passed,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,True,Tests_passed,9e5ca09cb1c6a5815ba01308d1e7c56f17d7c005ad15caa33aaa810bda44b5a8,True,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_failed,1caa0ba6fed62bb84d73e792e2abc267aa10319d5329aa2fc0e8b31ca3ffa1ed,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,cc0d62d8c5b97f86735c5fcdbaf2285826f82a7041ed4541c45981790be9fae7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7,Tests_passed,01fe834f7cd4a3efd0a0dae1def28cda30348e9a342f7ade04a04be5fd52abe7 22,refs/heads/master,c1630334b498c4225e461a5ceff425defa8a19c4,cb2a8621752755676d77838bf939d75f100e8a46,4c768844566b6f1d168a3efba5b26ed3f75fc91e,,True,True,True,33,81,517,3,True,33,Tests_passed,5ac8bab72a41d40712305539a62e052015af5ab082e9cb6cfb3be251598015bf,True,Tests_passed,efc4243a431828199adcd76eee29018e2e54b91c49334851ce45606d3c019f30,True,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,ce1aa258d4406a85653f1601d54b2482626ee8b5bfc72d1a8b90afd25c53dbad,Tests_failed,676e5c3aeb226d9224184cbf27d9bb2a68633d961dd5286c2c92ddc26de0bc1a,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,ce1aa258d4406a85653f1601d54b2482626ee8b5bfc72d1a8b90afd25c53dbad,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,2fb112ddf105f4b5722ff4e667901e2669b8252d4cf0e780cc2616081b437128,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184,Tests_passed,d58f2f226eef944ba5cb883025ce6bfca9f801ece5a18c372fe2a3907811f184 41,refs/heads/master,b41794d7af49d6c07e339f51eac8209f2a0bb9d1,b9f2366c231ac47575199cc0654635d5daa42f8a,2f6f0bd59c9cc4f98ef37cd79974ccedf4df063c,,True,True,True,26,81,1159,6,True,26,Tests_passed,9ce7f449c1040527adf06cddd6f6da828ae9541db40eb6e2a2da5380535a96ca,True,Tests_passed,7d40fae398405bcbdfd89d9512ef772288013a6bf9e9d383881f0596a1eae5d4,True,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,9e5ab73c3a123504c49f29c888bfa563004784ba45bb91ca1915bb0eb81a8885,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Tests_failed,d9fa2199d7e0c448f2178afb2b3937304e0cd398e4e5953cc273ad5ea9ae8785,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,7b246148fb1c7bba29cbeaf3ed2f0cebd25770b12b23b087d3a67b7f6e7602fb,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350 diff --git a/results/reaper/merges_tested/bryncooke/cdi-unit.csv b/results/reaper/merges_tested/bryncooke/cdi-unit.csv index f4e9cf6c62..b2c85d08ab 100644 --- a/results/reaper/merges_tested/bryncooke/cdi-unit.csv +++ b/results/reaper/merges_tested/bryncooke/cdi-unit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2af8a2a49d84164202df069beadd2041120415d1,472aca06eeb6b7b0859845da02053b0782c7c6fa,a02637bde4ca6947ca84a14958ae6988d6f587b6,,True,True,True,48,137,2037,3,True,48,Tests_passed,55d0d9406cdac4af8de163a41136d54577eb78393bde2699af269846ee033e52,True,Tests_passed,e64a5124920e28161f3c02cdf9ba827718afb9282834699f4461a82492edeccf,True,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,e4ccafd31cd299eaacbb9b37c1874b667d7d5dacac49d0249a84756f9eb567f0,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791,Tests_passed,bf09314919a32dd86df36a0e1851f64c12d3a60d44650a9db371b3d955d55791 diff --git a/results/reaper/merges_tested/bsblabs/embed-for-vaadin.csv b/results/reaper/merges_tested/bsblabs/embed-for-vaadin.csv index e1c3b6bc3c..9a4ec7d8e0 100644 --- a/results/reaper/merges_tested/bsblabs/embed-for-vaadin.csv +++ b/results/reaper/merges_tested/bsblabs/embed-for-vaadin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e1324f33636a9746384d621cddcea8cedd241318,b5e7156c005b7a106da3e82b051a4bb1fed5a7a7,2d7a5c65be3db9c5dd05443cb3299d0ddce63a3a,,True,True,Tests_passed,36da6b0742033a2e04186d78207c31ee8d3ae201e8de6c637c24ad09f5fc514b,True,19,129,468,17,True,Tests_passed,9d007c72e73932718f03e83a9cf9a30df50923e3552d94f2de4478057f4417bd,True,26,True,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,664df9508bf1fff05c1da32bb7736dfa7585649776cd3f51796814efaca3b0f5,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,990e5c906bd4600e008e1016c8e43689a44963d03f03222a04782cc67efbe8e0,Merge_failed,7549cec2a5a1004651adb5cffcfbf2b0e356393c839a9f8351ef640c2c0f705c,Merge_failed,ae09835815a2b413076351098cbf39c52e1346b05d96a3dea2ebb01afe261335,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,29b06f42b6e015d4dde24f1cb0126ea34a10f93d6ac8583f5e776c483102fbfb,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,97b22d10c597f8dcbb7a6950fb13df79c1f836da2ac041393bbe9cb7078d2703,Merge_failed,1240691a6fc4e9a0a4db23fec8cadb66e100a4959021a3f1a8cf2164a4c56b19,Merge_failed,a96dbfc6794e29386b91c4c776761d09d7abfa4771d14e973ecb76a3819b0de3,Merge_failed,6b26c2c9591cddfd41b1e757afc471c9150ac2b997e50b644eabefbd0b6565b5,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,3680e9e4e15d6777aa4cb1cafdad146c539de17c85dfbc7d3fb8d0070c2cc89e,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09,Merge_failed,b8bf07ed612082d010899768d50df6fecec2189314649780d7feede4f9d4ea09 diff --git a/results/reaper/merges_tested/bserdar/jcliff.csv b/results/reaper/merges_tested/bserdar/jcliff.csv index b9211dd0ff..5fc4a56197 100644 --- a/results/reaper/merges_tested/bserdar/jcliff.csv +++ b/results/reaper/merges_tested/bserdar/jcliff.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,206c63ba6f86b656ddf71caa32068a1f6c88b182,f2371218e88fcc234a2c1dc18632b6c222b86035,f1ff5fce7b5bb63e26b664efaed88ad08bb41c21,,True,False,Tests_passed,2aacb42f80fdd4db701140d6bf51313cc5aeaedde3fc4600cac3be9a0768f5f3,True,3,7,11,2,True,Tests_passed,5f46d7a96932089866b7b564ae519c208fdd76c293e0d4ab127ddb1dd723ef60,True,3,True,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,2e374151dfa848a779960688a45f1939e60784dc74ac85b76a59e5834fb8161c,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,2e374151dfa848a779960688a45f1939e60784dc74ac85b76a59e5834fb8161c,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,daf93292a45a11c2f6210d96f2cb73ea68b55fc8c4177ba020afcb50a8c39d31,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70,Tests_passed,88be5760d6147bcb2535d9c8a39f619891636af380a7981bcdc5bee8d9ddfd70 5,refs/heads/master,f92b40d0588bda3a035268bcdf9cbf0ac8e6acaa,f9cbdf1261bdf671b12271025acf11f887bf47c2,6e4ddbd168592ee1df3de326fce2d1e1f16c995f,,True,True,Tests_passed,cd8946a704702159be7623b35cf5229e744effe1c88eb74c1383f193415b3d6e,True,3,4,6,2,True,Tests_passed,54cb902b3f59390abb61d730bfde833e7a73604e9f60d356f87740cb43c2c899,True,3,True,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,2b84d0091b1d0a233c82328ecfbb98edea061a5edfac55651467c8550694afc9,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac,Tests_passed,cbfd8e835c295ad29d1ad6da0d4926543b4595b27adfef7ce0c4438b24fdd4ac 12,refs/heads/master,e881122648feaa70b9217e6f3b4470e591642522,24a48ca859dfb150e0bf3c78315dee35b77b03fa,4556c62f76d7ec19372cd483232da355c8fe029f,,True,True,Tests_passed,10f54eb9af6680f01e5808c424cf6ffc7854574104bad952950ec901f5ca2b8f,True,18,32,385,11,True,Tests_passed,524fa3ed4cef1bcd5d42483ca21f8c83489a3bfb235a1d53bbb7ebca3fa39981,True,21,True,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,686b9c72ab9ddd5f3e785d616ae522a6246e8e135dd88d893a29267525c3dc31,Merge_failed,2a65477ae899e30dc13ed18974bf1091f947624b4363e0f7f9450c5d9062667b,Merge_failed,0dec5ca7f8b65e7cd302e30dcc7cbd39bb20351106c109e0a58cce521294635c,Merge_failed,7f6edb51c7a9857fc84bd99da8f1e0da09738d437a3fcc7763f49c5bc33e0689,Merge_failed,2a65477ae899e30dc13ed18974bf1091f947624b4363e0f7f9450c5d9062667b,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,89a4ec9c4c531c0996b6fb9d074c408ea86ed5dd3e57fedf05b37ed987394dde,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,4632c9630fed1c1b0b1ef30254e761cf53782a0463618c192c08165f4a993363,Merge_failed,33502faa5322a88fe32de3ca923bc5a6928e16d1fb65fce4a57ead0ead6e6e45,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a,Merge_failed,37d0c0b911b482bf12ee2054dc0f4cc978667644c6861b0a839a9f7221e6db3a diff --git a/results/reaper/merges_tested/btrplace/scheduler.csv b/results/reaper/merges_tested/btrplace/scheduler.csv index 42ba7bcb9a..e75243590e 100644 --- a/results/reaper/merges_tested/btrplace/scheduler.csv +++ b/results/reaper/merges_tested/btrplace/scheduler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,8a939c1deed03406d77b6bcc81aae4dc91b2c9c6,4cc653c4f6cdec682044f25dc1d0fd1de277abea,aeac23d36a2933e852d4384eebde16c5e8ddbc87,,True,True,Tests_passed,548d217241f8573fd98b03bd5891696e810cb7aa38aef713bf347d2af3de371c,True,13,55,435,11,True,Tests_passed,85d0833db9a95a8184cdd49f242c84b35e280fba1fd6e04f75c98f56b1e72d71,True,22,True,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,4ee6b1e925c871208005d2b96f40bae21e6e499fe3bb5f1852ca3145a7ef2e55,Merge_failed,14a701f496b879018fd91580ed381fb52a1cb4e5d632e8a004901e54a958ce5a,Merge_failed,8edf110b13a642fc72efcb7e3c723439d909089ee1d5ace7fc5fab5ed42e9c80,Tests_failed,30aa888d4fcd804fea9e3ed15855c4f43161f9f3ea19d8d2ea18b50feab94b42,Merge_failed,14a701f496b879018fd91580ed381fb52a1cb4e5d632e8a004901e54a958ce5a,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,af2d63656979c5e02b5a0322b203fc9f41b48a5b8201400b36643ab92d87356a,Merge_failed,8edf110b13a642fc72efcb7e3c723439d909089ee1d5ace7fc5fab5ed42e9c80,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be,Merge_failed,421e152d449e6faffec7ff7e92127e1211eb46e64a2c50c9876c8d728996d7be 171,refs/heads/master,e98de3367896653a65052d04949c3d13f171d17d,6cd3ec8922c81f00b8ddba838c47c585fcf9ca25,f729a9d848a5e0ade380322464b3bf719357772a,,True,True,Tests_passed,5b56903c911ed6e7008bc1120895e8b07bdeb132887d6eec7f8c67b3d27595bd,True,23,66,1095,3,True,Tests_passed,b4622299446ab885d96cd8679127032bd920ccc385935298c45ce602b18120ea,True,23,True,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,5cc2e7713a6369c6414863974f848d1d423ee4c71c8cd15dab7d7323a799332d,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,4d54f49843f83c43d3eb0f1752f52d228f1c3283fd39a501321ae58a0211cc83,Merge_failed,8f98c17c6648d505315dfef750057ba027a113fc4a37eac472ee47e0afe452f5,Merge_failed,d25b856e2c54500065c6dd109ef956cc98473ec5214406dd1860a7d3b64f55d2,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,8df3e5dc61b1fbf369717791af0ab0794f319ab325faddcf78add998f5c548c2,Merge_failed,4ac642d174f1cea3c47d421e56690dc687b81cb5778a8f3e513dfa0bbbf065a3,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91,Merge_failed,092804064425e55f173aedce7907c0a7715f787291e70ef757eff7cb488e6f91 209,refs/heads/master,494fe356ec067a45acc636984541d591b85bce2e,7021a9359776d7d6be074eb06e66cd0bb4c59001,624bb8c0eddb64b725a2e7a9205dfb9afec3de39,,True,True,Tests_passed,130ecadfacd3cd7b2dbec0db26bdc46d05c5e97bd46426338ee6751b0c1a13a8,True,25,183,1317,2,True,Tests_passed,ef53b088e191af3e4426a507d86b31e35d8326cd9bd4a5ecd46a73bd8bf83e2e,True,25,True,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,f6c405ce03c0f4cf4c0024e98b02e5020546fc558a2aaee1a728b8e6689d4ee2,Tests_failed,82eeedbf118a5da6b6d0fe4c3a8cdf34901b4bd7142b38a1aa390518a028a10c,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,f6c405ce03c0f4cf4c0024e98b02e5020546fc558a2aaee1a728b8e6689d4ee2,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e,Tests_passed,b8bdd556b64648dc39f893bcdfb45f65087e2f86561885f5faf343e37539dc2e diff --git a/results/reaper/merges_tested/buddycloud/buddycloud-server-java.csv b/results/reaper/merges_tested/buddycloud/buddycloud-server-java.csv index f98aa4d7d9..0a217aa89d 100644 --- a/results/reaper/merges_tested/buddycloud/buddycloud-server-java.csv +++ b/results/reaper/merges_tested/buddycloud/buddycloud-server-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,48e4675ee2e4f2e1fe3a2603221fb47f0d124a7e,d312cf501be82762d6555dd9ef820c514e922abc,c6a9a1d0506b1d4bc81503dc312cee6cd1029e53,,True,False,True,11,27,127,3,True,11,Tests_passed,3bfbdf97ffdfbd44ab6db27e0c1f67468c7957de1aa58cdacc5f34b16cd2b779,True,Tests_passed,d79322cd4fed4bf1b668ef143bc4cfa164a61639abb0349e9ad3cf451e792f56,True,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,95618245606138ec89a3375126c37bc0c65798c4e94c7454a68f402aace67c47,Merge_failed,4326fb1a3331c2b67e4e557a332afe19cd68f9af18beda52bf89f517d3982b39,Tests_failed,8e5beb550328b9834a2d7cccb562e6b48ba19a3ee4515cd7a66610c7c90792e1,Merge_failed,4b4319bfa22db16a0815737f7e84ce799c845edc4803152930a49124d2bf826f,Merge_failed,4326fb1a3331c2b67e4e557a332afe19cd68f9af18beda52bf89f517d3982b39,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,bb7ae211a62de93c32742d5be4c5130f2f615df34bfa40b13e2f05dfc9c3a497,Tests_failed,8e5beb550328b9834a2d7cccb562e6b48ba19a3ee4515cd7a66610c7c90792e1,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,848b52ccc0e9c445b38506135d2cd3db91340e3e40adcc6dccd9c431fad92436,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f,Merge_failed,c0be4803ad324126624ec70c6808c6628b3cb51a920538ef749164b4419cd33f 17,refs/heads/master,80d0becca2d82332ee73da0bf55b44e2cfba532b,46b7ec012737f4e7c22276d1af7111b3146917f4,d0f7ff165853408e6cf9cafa61d64581d7020e17,,True,True,True,24,73,988,2,True,24,Tests_passed,96d9f15db399b7b58039f43a47e3da24b37376b6b7bdfbce007387e9bb709b01,True,Tests_passed,c0fd03b66a33b113124da4344cad3c1baf3cc4beb5c7ac9954e40c4afde31ac5,True,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,e5630208cb745e8f1a93f02fc0956eb0b39fbc71e7802113052349013f6952fc,Merge_failed,7cfb5395bc72664c0ec885381e2a822382f82bf9458112db48dd16d9e72a84b7,Tests_failed,f0dfe98e131de7abdaec5c0380b341ada92ed714fffc69c418da7967c649b2ad,Merge_failed,dc12fae86271d29ea6d352f30642b47c5d3ac8474825a46ec36984a1515d8ff6,Merge_failed,7cfb5395bc72664c0ec885381e2a822382f82bf9458112db48dd16d9e72a84b7,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,bfb9b24e421f795e9a9cd7ae81c936af0c786dfd0c14b00f446843969c39c06d,Tests_failed,f0dfe98e131de7abdaec5c0380b341ada92ed714fffc69c418da7967c649b2ad,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6,Merge_failed,12a5f5a4f1a659c458e5cc02ef5b55568290cfbb9b49a9a7d26ec0ad2f86bfe6 35,refs/heads/master,43c8b054e916bd4c564e9b91af3279d879db0042,a2516928ac92640f64c2d3f8ee4c9c3fbd91065b,5cbbc301e706559546b8b86a82504c2b4fda2a77,,True,True,True,45,598,2490,3,True,45,Tests_passed,d5ab9270d38ecb663beff1fc811a8b8809b57a115fd5ebad0fd06d967e36837a,True,Tests_passed,273016a3531ca74a9fc543c31f85a0342c5b85612880e3c91fff98d99306ffa1,True,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,dca8dde607775baf054d3b0ebffb7d6c346e3fb1233873df301038224c9fc1ea,Tests_failed,0c3eca50ef64e069d4dec5b4c1197752d5dc37053d8d35e4b17a449678069219,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,dca8dde607775baf054d3b0ebffb7d6c346e3fb1233873df301038224c9fc1ea,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,4b2e095d7d3d312db026d1ba588a29e7d5ff7fa2572c7c157e1a5acfaf3b5ec5,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184,Tests_failed,c287287fe587a7bd7a026c8e280282c66370cac7df78df184fbc37b0c0c54184 diff --git a/results/reaper/merges_tested/bujiio/buji-pac4j.csv b/results/reaper/merges_tested/bujiio/buji-pac4j.csv index 0780d93fc9..747fa63645 100644 --- a/results/reaper/merges_tested/bujiio/buji-pac4j.csv +++ b/results/reaper/merges_tested/bujiio/buji-pac4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,aa289156c694d3a1a3dfe4da2842a32139ba1bfa,b4d264f60a6af4c04656453144195ec809bf7099,77581e045fb71856d932cc8481de991e08c81117,,True,True,True,13,16,798,4,True,14,Tests_passed,5bc2095654a708f995ddb342048ab42e2dc091dc6c56b4d89fa76d508bdf802c,True,Tests_passed,5cdb2ec704233a9269ff4743c1d57d21d2684207fb4470d6c524916d30c7520e,True,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,1b48a3261b417e9e708b29ec824ffd0f875734196331b731ec67af18d9215253,Merge_failed,a24d6724429fe600a4d2d0474ce345c78e60f32b28503eb3233103f4af134ff7,Merge_failed,349a4c956bddc0c6d494950519ae0fed078f4580dda4d543c46eee0813b80cc2,Merge_failed,156ed6dfc820f3a672dbd81d0d4ae4aa3ca32b807de034b70623e7473eadf9d2,Merge_failed,a24d6724429fe600a4d2d0474ce345c78e60f32b28503eb3233103f4af134ff7,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,327203b53806c495895ad190d02ee885bf119d81b5f07199abcb2e6c2dcc2888,Merge_failed,a754f123a7e419a517f3361719be5048a531b8968c3f72bbb7343710dddce8c5,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56,Merge_failed,bbbd99cb62ba35b2e5db33e4309b2a03b6f25bed5e017a4dd191ea0a6e01ab56 35,refs/remotes/origin/pull/68,1c7eb2acf1643212c399c9485bd30e3fdd5d88a8,3adfb5dce2e27bf2b7f1946ec097a7af5e324c71,92702c61d9db078febf717bbeea5e237a4bf9d2f,,True,True,True,15,64,658,2,True,15,Tests_passed,6198764f3533235188bb2e6581b643063bf9eb96f6185322429a185816903c5c,True,Tests_passed,b1221a13d7bdfd0ebeab7f885fdf6b845ffb9490af9ab9d4cc6a16daf6b24fda,True,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,7539d06b12858c20a246d32e745298e7da80e446a3a0aa7858be24766da09010,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Tests_failed,b835e8fc74b722f0d1101d97f7a301b4c2e04b1ff06ccbaa64635a0bf60e8e65,Merge_failed,80cfd34097014facfefb2c1120a5c34b051d2ae2f489a2ab7f04b3603d339956,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,e5dccd6c3482aed6b7abc4cbfd97bea75e8e6c136db2572e33b71416ac680e7a,Merge_failed,91cf48d08c7cc4fffba7a40b329753f73c31ddf1d44d79858ef2eb5ecce9ac8b,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,619ec88be505149abc2c42d933b204b310f00994a8e9544339a6c30f4e3a105e,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c,Merge_failed,ec84d902b17027635a4d4f0a8be45a490ec88b8e9d60ea51aa6f5d54fbbeef6c diff --git a/results/reaper/merges_tested/buschmais/extended-objects.csv b/results/reaper/merges_tested/buschmais/extended-objects.csv index d631062757..9ef0c9351f 100644 --- a/results/reaper/merges_tested/buschmais/extended-objects.csv +++ b/results/reaper/merges_tested/buschmais/extended-objects.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,46ec306cf6bed6dbcfa790383ae80542ebb61324,8b434139ec272993f04775ae7c4c2b3d3597d90a,7c316187356cf8c77c63e56af510fefeeeda73ca,,True,True,True,135,284,1152,2,True,135,Tests_passed,74f567f50a2c83d24c13cf4678bd243ce56b64f2510237cc2af460cfb1252d1c,True,Tests_passed,184bd57cbc90be0e41f6a750b7226c079670824734f7fb14ebeadd0304a3bca8,True,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,e78f52c4bdc316083afb9c7daf65a0c72e0e93d2b1af4fe274dbb30b1bc473d0,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_passed,3794fb938441b1b273bdd5c7de555a0ced2bd088fdb00b9bd9a7a3ed32fa90d1,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4,Tests_failed,ba3962a3005e91243a314083e437873cd2383abe97cc4df48d543274db0cc0f4 diff --git a/results/reaper/merges_tested/bytedeco/javacpp.csv b/results/reaper/merges_tested/bytedeco/javacpp.csv index d7ea838f80..8595b633e8 100644 --- a/results/reaper/merges_tested/bytedeco/javacpp.csv +++ b/results/reaper/merges_tested/bytedeco/javacpp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,27be9c977a78d746890e5d5e0df1ed54502856cc,079d3d6dd4cd61f555d3b69501bcb0a16e3b71d6,7c53985d8e9d5311b478e903e80c7ff7c5fde277,,True,True,Tests_passed,886e3197039cc29085684c9af573bbcad613338107de59e79e75682da8eaad85,True,5,24,80,2,True,Tests_passed,2cabf6b5e6ee02ae1a4e92d3871b22b428d701acb7542bd90d0cd84bc5c776bf,True,5,True,Tests_timedout,f2578396dda9192bca0792c4fcc8629fb5b6f208e0feece68b61f1693950b746,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 10,refs/heads/master,0c2b518cb4bc81d77f33381473a1650c8da8dcbe,1d407797951ccaa09eb994e5401ebe123943cb5c,49b4f90556a344c1ab3b0cc35f1ac31c72039054,,True,True,Tests_passed,a38bd18827effdda15a694d6e2db5a91354000666798d401ecc3528f59474a74,True,3,12,33,2,True,Tests_passed,0141e4293d29d0c6e0cb1bfa9a44364d4c2d9c539535b2563a9f9917a47bdff5,True,3,True,Tests_timedout,261ef3ffcf4c85e51fdf322c6eeed1c596a282ccc72d72a6a03dd411dfd854b6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 13,refs/heads/master,4b738fa5c21984e5828f75c270ae17dab9c81b69,3380ee99b48a9e829339173307a35ac4363f1f44,7858f2ef7025b1947b30b5b59ab4554c5b594324,,True,True,Tests_passed,dbf014f98070d011d1a772484c47ae18ba016d2c0a3c00c27448a64672e67b0c,True,11,87,422,4,True,Tests_passed,90a3c4aab32d42d81b4861e9b5e8b280c3523f26a7719c6bde359dce73f51eda,True,11,True,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,71ae88aa8d63ad5d37e0b9d6b587c2b478de87bc75102e617ac67456265e4a27,Tests_failed,f1c0cb6781db6796b751ac59d30b6fd419ed2b95e5c2dd0f111e8ad5ffce8619,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,71ae88aa8d63ad5d37e0b9d6b587c2b478de87bc75102e617ac67456265e4a27,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407,Tests_passed,014f0d32ea86c813266b7aadddf67a7644c645d113943c60c926a245f0cd0407 diff --git a/results/reaper/merges_tested/caelum/vraptor-console.csv b/results/reaper/merges_tested/caelum/vraptor-console.csv index f87768050a..37fc03b8e8 100644 --- a/results/reaper/merges_tested/caelum/vraptor-console.csv +++ b/results/reaper/merges_tested/caelum/vraptor-console.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,75017316626095be7d4b6cbb4c1532561e1ff8a1,10d80abb189438236c5a5d5723c222ec28a69ee8,db3d6f9a2375d14d9a96c2281572a6741acb32bd,,True,True,Tests_passed,96a540f2c8b27352d25886f40f3478f5b1002c52e02d6129a9f63c86bb124927,True,5,8,40,2,True,Tests_passed,4ab414c3cb61a6dabbfc4c8be31374cf153b0441f0da8203d36f1c64939d8987,True,5,True,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,0a725314e82bc8b3f61fdab978411ab12eddeaba1addc5d75ca6ab6f2a78a827,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Tests_failed,53daea6c54a628f9e50bd4d6c0975b8a6f294f887eb5f4983b9d2966881b9860,Merge_failed,a1fa2f823f3d837954074a40e2515b855ed7afa35f82df06cba9227c79a41dc1,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,2cb4238523b82bc75a05c761886b244a10b2d4dbd4440138e7f172743086a349,Merge_failed,ad807156db648757f177a9a1afd2604b09d97be18ee0cf3856832a6a4bd433d6,Tests_passed,f598d3f75cd1d3b583a169693710cb9f9e3b3efa290d12cdb36e66c383baa99d,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,f384e26015005cee8f3d87f634b656f4f9fd16cda8cf8975305174d75c371cfc,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba,Merge_failed,a6a0ece8d5f5d14dafa255e2ce2a1536eafb29acf3651512ede3a6c2b0afa6ba diff --git a/results/reaper/merges_tested/caelum/vraptor-environment.csv b/results/reaper/merges_tested/caelum/vraptor-environment.csv index 2218880ea3..f157c1b709 100644 --- a/results/reaper/merges_tested/caelum/vraptor-environment.csv +++ b/results/reaper/merges_tested/caelum/vraptor-environment.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,57463c6eb5148d0640081dab2ba0099937ba72ed,f708e7975329930f818ed9ba45ec415748b2d73b,b95e39f1416ceff938c759f0684bdce789a93e59,,True,True,Tests_passed,011ec18143fe90baa19f61869023d2caaabc431a5473ed0b83a428e24551e0e8,True,17,40,415,4,True,Tests_passed,e8885593a15b29783e6b151351f0dfaa4c5235a1ca60b11cf91679b2c69aa5f2,True,17,True,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,9c8a55669205d9f3dbb68e5e9880ca9b4b588d77a0d8339ff8cd529986d202ea,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,2720cd2481515561bdaba21ca01454a9be41f3916d111c9c46a8feaba93a297a,Merge_failed,75789092c996755ad76221630747ba372647bd490122a6ddd93374dbccf2cd7b,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,1d131ff3e32794c1c1d840f8862c2682c7113973dd0b158e9ebadc2268202d76,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,9da92657a8a93ca20e78105784da0d196dfd62be27ea99304b26b980b5d3ace4,Merge_failed,c96aefe1057092540fe2252f3312302bb73eecd22fe6e0dc8e130c347c39cb1d,Merge_failed,112352105272526c53b8c397b1d23ec40b1906ee85c1d1ada79dde373f4b6a26,Merge_failed,cae65444d25b1f99f58de07fe15e01bf8a8505a600e9e946459871f716d54457,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,67d0b1b7a8f9c4e6840b0fe651a23949c97f47304487029fe31ea37efe4fd65a,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe,Merge_failed,3bd0cb8de288392edbb30a194c3080f3ad5b5cf6dd05a42688f83ab9f9a965fe diff --git a/results/reaper/merges_tested/campagnelaboratory/metar.csv b/results/reaper/merges_tested/campagnelaboratory/metar.csv index c3df694dc8..d6ce494256 100644 --- a/results/reaper/merges_tested/campagnelaboratory/metar.csv +++ b/results/reaper/merges_tested/campagnelaboratory/metar.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 47,refs/heads/master,941f6a100b2514ab3e75a50e6b26ad81da2a943c,ba9c27836ad3dcfcefb07396272c51189b7673ba,1eb014f526352b8eaa3b720d12f278219124cee1,,True,True,True,19,38,24936.0,293,True,304,Tests_passed,6305dbde732a595af3137d7b46d01ebd2f10497d8336aa3358315dc5e40ecf3b,True,Tests_passed,d3476aee4d1b965cd4592ef8d9422bcf67b9421a91d7aaf330150e4c0076a811,True,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,94afbc677e17dec9a965bf5fd807fcc6cc3e930db433a08cf92c76269fcc8d9e,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,2f9ca41b046d2a92364085252570c5ea38e7073f229c2377f627a430a0bcaf07,Merge_failed,817b83f5a0d59d08925b315c9f72a84a64994505d5bab5f0fc3efa3e4167c7e5,Merge_failed,0803d122d6fc74c588b437bd2f0711853652ad8a4cf96b470a8cad15ef1d5bb9,Merge_failed,37cf9e84c00f97c3feae8785ffe1991684de9eb1d99c38ba4f899ef6b039989e,Merge_failed,15cc07c760bb8452d2f56e5d6dcaf71acdb5b3f330bd5a921c8ec9b400639431,Merge_failed,63bb41ef637684db5914a1055d6f9319fdda3beaae7a9d2e129249c3a3dbf1d1,Merge_failed,9ce3e94c43e9155b5987aaa796ba6b0c1d8e6098ed615c6cd5e3f2ee40efeef9,Merge_failed,9ce3e94c43e9155b5987aaa796ba6b0c1d8e6098ed615c6cd5e3f2ee40efeef9,Merge_failed,63bb41ef637684db5914a1055d6f9319fdda3beaae7a9d2e129249c3a3dbf1d1,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,2f9ca41b046d2a92364085252570c5ea38e7073f229c2377f627a430a0bcaf07,Merge_failed,817b83f5a0d59d08925b315c9f72a84a64994505d5bab5f0fc3efa3e4167c7e5,Merge_failed,0803d122d6fc74c588b437bd2f0711853652ad8a4cf96b470a8cad15ef1d5bb9,Merge_failed,37cf9e84c00f97c3feae8785ffe1991684de9eb1d99c38ba4f899ef6b039989e,Merge_failed,6ea4c55494b4c435e2876b6df27f89ee5356744d025941af6d06e0f4cb968fb2,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,94afbc677e17dec9a965bf5fd807fcc6cc3e930db433a08cf92c76269fcc8d9e,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750,Merge_failed,329c03f4008142baff81b48604cfbc40976b00fc5b086da81cb14c61b3608750 65,refs/heads/master,d17d8d1403f28b9fcadb710d89aec0c5d80128bf,ca7e791311f80ffc48b9fd903d3ee54b5bb6a6c1,287ada0e339a049d2640b9e6c0f876a783609292,,True,,True,141,18159,,30,True,158,Tests_passed,8a33876aed0e9f7f05fd7c726a2f9a6cc82d49895ccf0a392bfe86d0e9e5f2f9,True,Tests_passed,da7ea378280a05735d484ae97b1218c2d7d45e8d609501f975f862a73d43a79f,True,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,050bd2ce6df29ce4817933ecfc43ffb85acce8c1d71754abec7b3b9b5cf8171f,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e4b89ec214db5f9a2a6b00385d4c145678f3fe3806631a9a6ddec31c1907877f,Merge_failed,c8d7faf78f8ae3c7fc79b446439664c0a2174c99f58c2492af3ff998a7050582,Merge_failed,8d842e107fc9c068d8d80c9dcb65ffad1bd8d0e0039fd944071b778dbf2005a6,Merge_failed,ba6c7786b4f1b4da842e20cb5fc1911a49cc8f506d7496316b16879d8d2d6aa7,Merge_failed,13cf756b0272755a7f2a385dccd4550a1185e1a900643b1a5a1af9d6780732c0,Merge_failed,3976bab08a65ae2d41f1e5e002cae269dd3f3ff89790496afa6b5da37dac72e5,Merge_failed,e7b085f99424a648fee23191072a6ca92138c1ea86174d6fc89457e5b816a726,Merge_failed,e7b085f99424a648fee23191072a6ca92138c1ea86174d6fc89457e5b816a726,Merge_failed,3976bab08a65ae2d41f1e5e002cae269dd3f3ff89790496afa6b5da37dac72e5,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e4b89ec214db5f9a2a6b00385d4c145678f3fe3806631a9a6ddec31c1907877f,Merge_failed,c8d7faf78f8ae3c7fc79b446439664c0a2174c99f58c2492af3ff998a7050582,Merge_failed,8d842e107fc9c068d8d80c9dcb65ffad1bd8d0e0039fd944071b778dbf2005a6,Merge_failed,ba6c7786b4f1b4da842e20cb5fc1911a49cc8f506d7496316b16879d8d2d6aa7,Merge_failed,e555d10aff3582a83aa9bad722590a62c3dc812da3536125b8f24d54570dfb26,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,050bd2ce6df29ce4817933ecfc43ffb85acce8c1d71754abec7b3b9b5cf8171f,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4,Merge_failed,e01567e675ae6cacc783571f8ef491da229d193f4352f8e86d14b027cb84f9a4 82,refs/heads/master,e15e027511bd3acc93ebaf5951d94cd4e2237802,0fb473afcb8ebf5c4e4a76a8fc643aa728d6a7af,dd61a838a1abffd31b66846af3db7e88910de966,,True,True,True,156,1518,42426.0,13,True,157,Tests_passed,106f6e8845027faaaefba96befc656f44560c0c8f6a24b6ea24ef24d3020495b,True,Tests_passed,3792d46956786148aa626758b254f951d116d2596bda97a4c79fea85a0d102ef,True,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,6fa0344426ff3f15b12089934a5057db632ce26a230941f9fb3cde6295b5dd21,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,0b2069066eda5487470f69243bf1638df221fa453faaf259c7b21493a520f438,Merge_failed,6c397ad89ce5a570020ede98b67fa73fb632d8b58b79506c2c6e1a7aec2f5c21,Merge_failed,5e4ad7103898d480285fba5972aeeca120ccf1181d36199940c6393f4ffb0b15,Merge_failed,4231ed54ef365397975b52df12d4f9599142a4d864ce239f6f590b05beb675ce,Merge_failed,bf8883025b0b9aa1404e619a6de8334a50f72471988ae7acdae783ff3cb5f048,Merge_failed,4acf3cb9fc131c4e3bd2c353dea4fb4a24445e17905af153a0563b1d6b790798,Merge_failed,f9e3528c19ba061bddf070210b4d397bba936e6b8c897223cc8a1fdb82a4483c,Merge_failed,f9e3528c19ba061bddf070210b4d397bba936e6b8c897223cc8a1fdb82a4483c,Merge_failed,4acf3cb9fc131c4e3bd2c353dea4fb4a24445e17905af153a0563b1d6b790798,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,0b2069066eda5487470f69243bf1638df221fa453faaf259c7b21493a520f438,Merge_failed,6c397ad89ce5a570020ede98b67fa73fb632d8b58b79506c2c6e1a7aec2f5c21,Merge_failed,5e4ad7103898d480285fba5972aeeca120ccf1181d36199940c6393f4ffb0b15,Merge_failed,4231ed54ef365397975b52df12d4f9599142a4d864ce239f6f590b05beb675ce,Merge_failed,6a9e3b803043c2d1088bcdc5d0005f187967cb609ba1cac41091dd54f297206b,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,6fa0344426ff3f15b12089934a5057db632ce26a230941f9fb3cde6295b5dd21,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460,Merge_failed,4633b2a87f6adea010ec95f7694d32cab155a8f5e76eed9fc8c84f52d7a71460 diff --git a/results/reaper/merges_tested/camsys/onebusaway-application-modules.csv b/results/reaper/merges_tested/camsys/onebusaway-application-modules.csv index 61ef406cee..f3c7afaf3b 100644 --- a/results/reaper/merges_tested/camsys/onebusaway-application-modules.csv +++ b/results/reaper/merges_tested/camsys/onebusaway-application-modules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 63,refs/heads/unified,e779e9fce1879efbf6a4241c6a704aec6c2faacf,f66fe0132c2d695835e1cbb85425e1eaad1b6836,6541bbbe23fe4e5be1da37c3f3711ac822f51530,,True,True,True,57,91,494.0,2,True,57,Tests_passed,e9fd9fc53bcd45c1e69d5c96aa8f8ce328e3e15ed4325633eb85eba2295e0cb7,True,Tests_passed,0b0cdf552093fcffe9a0076a9c7726926f85b46547898bdb01f9971c08cb5478,True,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,2deed109cb5bc55960dc540f861c7b5c70694ca8e976bec20c6e86ac54255d32,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,6ab758b4530459059e98840a75214c98dd4f7ff7a82193e617436360a2d329d8,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,deae9a7ad31312ef23fba4dea74b713cd2cb4a9660157d231a15e5a4384923a8,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2 65,refs/heads/unified,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,True,True,True,71,111,964.0,2,True,71,Tests_passed,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,True,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,True,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3 518,refs/remotes/origin/MTA-10-Update-the-sorting-in-the-results-returned-from-A-D-for-Location-call,341e39ee896661cc6161873b5471b8273e4a8078,7f3b9088a19497fb0ff56169ad139ea250e3e096,5d5d379aecadcf285ae16dea6fd3cca7fadddf6e,,True,True,True,10,18,112.0,2,True,10,Tests_passed,f580b32e91f27392d2346abc3e5ccb6e6c854d956ffbeba299ace1df5af50ba4,True,Tests_passed,ce5a75d6d881bcdc56bf379e8799f49fc81194356689b18cecb0003412846b5c,True,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,a7098b512b3ec0c6fd36334461dd142e2f4071442e4147751e46f0e0329bc3e3,Tests_failed,ffc17fbbffb8febcf90e871b50ee2f2b06121547305838bd327159cae4c1d945,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,a7098b512b3ec0c6fd36334461dd142e2f4071442e4147751e46f0e0329bc3e3,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,92941621a86ca36d0bb9719c8cf9f76b28be6db7a7c154562840a39bca4ef0bc,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5,Tests_passed,7c4a941a6496d7875137740f2bcd8ba9dbb06cc2011c99095c1c5c6017a905a5 diff --git a/results/reaper/merges_tested/camunda/camunda-archetypes.csv b/results/reaper/merges_tested/camunda/camunda-archetypes.csv index b1a738b076..e1cf07de39 100644 --- a/results/reaper/merges_tested/camunda/camunda-archetypes.csv +++ b/results/reaper/merges_tested/camunda/camunda-archetypes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,4bc11ca34e0b8a811a6d5f12d45eaddd2f646cc6,a82d4b5ccd4d730dc2544bd5ee00870a91f30f09,b031aef316b7324b624b71a198e41e9cd434e08b,,True,True,True,141,543,4307,23,True,147,Tests_passed,5b339b1582680df894e0747a589001c73a274ba807c9b7cdc51376bc6585ff9e,True,Tests_passed,ffd6854096cd1b0c1e25215dec348f4f44892c9cce2bd941cbdf9c830739b0bf,True,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,b2d6ae170cf5a29aa25a8d1761ea49aebeb03b5c753c28d8ae8ea26917ee2147,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,a8df1c2cee8d1ce9929447beec3482d2a895929586f7eafdcf0c17853b259f50,Merge_failed,c2f964f9673867d125aa2401bacf8c87682db279e9f179948a2037b2f9784796,Merge_failed,a91e861823b5f3e15c61681cb6a9a6a76ad032acfa893b6bf7169bdad1dc71c1,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,e3d2cedca60129eb495f0475947ffa5b4c0bc77c4a5fccf608f584328fcbcda9,Merge_failed,0e34751bd8042bea0b1d0836a7f8cbac841d57273378339d51d15faa934a1dc3,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,dad9e440a11aa31f2e7c399ab9f2e4fb7e9cd1739d814d2d22ad24d32b54d621,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8,Merge_failed,81e3cd7da259928a974ae2fd0c2f75708227f07378f322dd72a378c37c9884d8 21,refs/heads/master,4568e4d7cc92f7489d29195b61aa45fd1d0ab39f,ce64cdd06c37fadd78159299cc1867706ab010ce,f1781f86ec33dfa815c207b61046b40b8859bb0c,,True,True,True,10,21,152,9,True,10,Tests_passed,bff2ee374da3040068d7836862bbcd2527d6b72307259580616b4180b6bc1201,True,Tests_passed,1a4dc76b6e1af23767944975039d6f629e734bb96057c30e08637a5405879817,True,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,eec1631d3236d95d6f5d8d05513cede646dc56aa050f46b91eaadea021d374b9,Merge_failed,4c836ca67472bbb8874e38db2e1688df17b39c9b30c4832d8821d63cf2a54a37,Merge_failed,c64f8c17c30a88c6f35fa97e52364768869c14cb06ebdd93e1a9bac1f70d41e9,Merge_failed,601e6451b9221568da2a66bde28b8a1cfc828908b67b02fbbcba7bcdbd3a73ee,Merge_failed,4c836ca67472bbb8874e38db2e1688df17b39c9b30c4832d8821d63cf2a54a37,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8cf30e1245e79d70e43e420c0f2d71634dc816a2f17d4cd1ed7b519dcf79acdb,Merge_failed,2d28a1b7f69c539285fa62a9e461e2e08dde6340ea3be2684cafc54d83034cc1,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,8c0fd1a2ddd2f4c1ae673557013927758edf638a34b787e5f6ed2c52b4005a68,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc,Merge_failed,f50c2b1e4e2d63eac5fdfd7ba7bde1e15cf5ab1c787b40098b049eac836d34cc 23,refs/heads/master,a6522ef79660ae912bce81730cb8b8be465c144a,2567e559b74b676a3a51ee2d0d28fb3979ae906c,2f0e26c2b3849343dc9f38832f0537fd8ad2b2b7,,True,False,True,40,134,741,5,True,40,Tests_passed,66db1f1276690d52a7c9993c2ca21e326790c9c8c75ca28332f937fb1b35ccde,True,Tests_passed,3a9195befa738e4294b0ca4b0576d2014a456c857828db0c72f10d2bc4af4f83,True,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,794fb175c277044760c8e3bb41b384c46b6b67c4364f4d1a62595c8cbaca1578,Merge_failed,647c485823b22cecb1255625e40390458871ca288e1fdfce0802e046934c8d92,Merge_failed,e919e5a57a0aad39ae3e8680b31356c38b1448433df869e2b77939638d5c2ea5,Merge_failed,a07f1788354c123c6f2c1be2cd8dea4a28132d49211bcac7ff0a45a69862799a,Merge_failed,647c485823b22cecb1255625e40390458871ca288e1fdfce0802e046934c8d92,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,27c933622aba9c7633155201eaa6ffa1d0ebf7d81a70da9edd4a779c62816b19,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,9ba2fbe20eed6c48deffa663d9c14da502f7b27365015540acccccb31f8af539,Merge_failed,4b01b4d7abe4aaf085377fa2e3273b61a1d6e5cdb2b953f3dfbc265722c4e3d5,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,66314069505291039eafba187df8a4aa4500556b78d413635b2686304fc35590,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed,Merge_failed,755ee4e79e1d48f7dd8694f509b8c2b325832dafde9571643cf52426647920ed diff --git a/results/reaper/merges_tested/camunda/camunda-bpm-mockito.csv b/results/reaper/merges_tested/camunda/camunda-bpm-mockito.csv index 05d398f024..9146ada948 100644 --- a/results/reaper/merges_tested/camunda/camunda-bpm-mockito.csv +++ b/results/reaper/merges_tested/camunda/camunda-bpm-mockito.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 38,refs/remotes/origin/pull/294,78b4cb3c2f263d88d6ec38ce5df1aaaca2175cd2,0621a6e79bb2af209a81808c0afd690394f90c17,afd1a51e6f4d944a2c09a89b57b1d40a7b2af707,,True,True,True,41,34,421,2,True,41,Tests_passed,1775965d40e66ff2cd6e7f10c5a402f67d2283c17120f618c8629c663000f6da,True,Tests_passed,57bbc1555ee7071519b7368b068f666e3768dd801d48a729f76964814fd11b79,True,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Merge_failed,b030a19a044be027bd668a9e491063ff3cea0991a79a81d0104f290b4a5166cc,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Merge_failed,556c3b7e8479b78f4e94ad01ab8c8bd1930ab5702ab6e7cb2559f20db4d5776d,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28,Tests_passed,4d6f1f4cea098a867097eb372bd939791fe2565c45099fbdd044c930a9ac3c28 43,refs/remotes/origin/pull/84,3b9d3c98b5b6e2dd753097976e21ee5e3ca2ae0b,f86608325b39b5c68f406056fce6b8bfd30fd593,982b05589592f024e3fbf0af3a31862d804eeddb,,True,True,True,11,40,211,4,True,13,Tests_passed,b7be287fbaa90321d59d6fdb858dcf30099b5351e82c2eae99dbb59f38b01a53,True,Tests_passed,ed78dec0f4c077fef2fdc6ed29d89dc8975b4c0668167aeedb1c9419156074c7,True,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,101228a6d06446b22f705edf27ba7ad51e8e18856131f038a4ab083031b180a1,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Tests_failed,2c8f8957d45786c9dcc3719bee51f4880c4c8f2d631fcf4ef8acdca61effcfc8,Merge_failed,8cfff927e838a13a6e10cf49c1c40ef5d7432d5e1d4e636a3ad71896a24cfdaa,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,93603ad80736fc96d246f327f61cee06794624d85ab10e4a80db2ffba30a8b96,Tests_passed,0060ec0f4ac11b8469f921b6e4d3f64aa849e4528848bcc7c0a6ed4f2cb98727,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177,Merge_failed,65390be84ae7bf3670ef2c703ae5079628503505d8c3d0600885298e955f9177 diff --git a/results/reaper/merges_tested/carbonado/carbonado.csv b/results/reaper/merges_tested/carbonado/carbonado.csv index 0adbb8d4ff..154765eabd 100644 --- a/results/reaper/merges_tested/carbonado/carbonado.csv +++ b/results/reaper/merges_tested/carbonado/carbonado.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/v1.3,13f58b778c5559b24f1b371cfb54ad80a5ba4b3f,32d20be647d80ec3509bfa3d7040b0d21cd8cb83,51d486867a0f610f034f1934e6d494e5d302f383,,True,True,Tests_passed,82df07c66438f8489a5a423933744d5c482ab95f513a5d209ca1a3d7b3bdabb4,True,13,22,111,2,True,Tests_passed,e0b92a6b14b8106114997025ce66478e7ac034d77a22a2febcd6a777a46aa261,True,13,True,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Merge_timedout,,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,7e7a10fcc69eb9f6bc65bfd4d079d0e80c24882bbf7d379502fab1286b0df36f,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b,Tests_passed,2ef07fc800503856c90fa0b60559fa0acd1a4d84b4b52da86394ba5f902d734b diff --git a/results/reaper/merges_tested/carlossg/glacier-cli.csv b/results/reaper/merges_tested/carlossg/glacier-cli.csv index 9a56a79692..0e1b9daed0 100644 --- a/results/reaper/merges_tested/carlossg/glacier-cli.csv +++ b/results/reaper/merges_tested/carlossg/glacier-cli.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/11,71a1f6f512bc099e47cfccb15b46b33a3053afa1,ec9c094a73a35264837116dc831a5f7689a3b895,486498aba8bbeced3e5c3833793f3f2ad2c4d160,,True,True,True,3,5,123,2,True,3,Tests_passed,35dc813e0f3d097838b989d9cb45010c9a703def19508b0e51098ff9b1896086,True,Tests_passed,b10b46b7195fdef8f61e44bdfbe39b95da78828e512e520188049f1b70832483,True,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,a2b32d99c3882bf06491815901c3bce3e258af93f729b3ed4d75a1381878446f,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Tests_failed,572f50867b5c3e6f61ecc32f6b74ad19c8d9ee928984640ebd7541c2b4675d6a,Tests_passed,a506a80569ed22e7f7f84d79f675ca60d9724fc4c575b10fd00fd02a36471889,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,4199bf2e6b57444c2427faa44b418f04920332381242e919f28e6b28bd1a9d26,Merge_failed,3bb659dba2fe78d27d1fe58e6f50217ab5abd50a4a5cf1c4037016457cf7e53c,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091,Merge_failed,510c19cb243b318b899e8a830b67c956c79a62f330baca5e3f10a17e8572c091 diff --git a/results/reaper/merges_tested/cdi-spec/cdi-tck.csv b/results/reaper/merges_tested/cdi-spec/cdi-tck.csv index 9bd3c406b4..38bbc8d613 100644 --- a/results/reaper/merges_tested/cdi-spec/cdi-tck.csv +++ b/results/reaper/merges_tested/cdi-spec/cdi-tck.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,d3b387c66f86d5594ff36573b593a928791d01dc,c252b4f509588a578ae033d522f35a45fc360a1e,f69448340df0a4dc54b658a796152b9952fbabec,,True,True,True,35,47,154,40,True,62,Tests_passed,26783a61133cdbd45413ecdc6e0c5e6673e016005d25ce1f1afd8870956b711f,True,Tests_passed,7fe74134ccd40a6f84eafc84eb0011bc94ffd0b9c2885b07aa9ad8da26b27784,True,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,3365611d4efbbba176412742ae3ce9a83baed75ce415e78d6af7e0501c8d2399,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,0b52e4c75a7475a363d9749014b41ac993966f3225c212e23e5ba64dfbf8a54b,Merge_failed,67ec3c6ce062fe5af578d6c507706341abaa06c80011f87d7dc059b8151595fb,Merge_failed,df3002936ee2d2dadba5ef48b1d7888f8dc1fe1309af5e90e5e32c8898b734f0,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,0046bab0a0375f4c7806ea75ca58c9fd793c5b2429c3878b76db53214a64eaf0,Merge_failed,780c9e7cd71f39236a20e92c8a5006c8f9d51aec5bb41648ae2c12c1d0e71ff5,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,2f576d85469e796394b40ff5f4f6a0fa4abf7bed43c7edf8c5b41d9746b3fcff,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580,Merge_failed,674d99418c9a528079b16a84be5f391f9ce7d583ef95ee9028c1f192d4ce7580 64,refs/remotes/origin/pull/277,48659940f253d34e5194ef4c5935000aa5d5ce22,e4080c2d06bfcb70bbc5f7736872fdbba5816627,44676c8c5e55c881984b0239ef55b4f739a6997e,,True,True,True,2335,4115,11836,3,True,2335,Tests_passed,5bb66ea9a468b6b77b9f6978323f8d6360e8995b8464652afb89f9b53f4ad807,True,Tests_passed,1246d11058ba644e2d796d7bd3e75bdf346c6102fdf4f7ac344b418a78b4c737,True,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,67f2f6a3e0e2db1293866fcae2d9ef76b9ec718814039d1ad17da223f6b9e0dd,Merge_timedout,,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,67f2f6a3e0e2db1293866fcae2d9ef76b9ec718814039d1ad17da223f6b9e0dd,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f,Tests_passed,0a1c3cce3d8a3332dd8df82cbf9b83ffcf9e2b40cf71a8edd1b2cefcbaba114f 66,refs/remotes/origin/pull/285,c4af67dee1c6fa62be9e5a1dc2a10f773a8dce15,bc99abc83782e4d52c6da6a77171c366c33c7471,1c3beac3cacccc303c575d3ff38318e8579fcb65,,True,True,True,23,31,50,391,True,418,Tests_passed,ea9d628abb863aa70a3951af8ced00e7f923ff77d7c4f4e12352ea2e8411fce2,True,Tests_passed,7c6e3949a3b8911b0b5613380045a5c1a124ba4680b08f516e96f2b6309880e6,True,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,368b65d2658f52cb6370f0a175340471b2b6a46a9a2e87fc5eb9df50f89982ab,Merge_failed,a4da883d1afd67f6bf713b6620e3f00a1cce3ffc374553139be8561f4fa81f20,Merge_failed,e38ce8de77d1ec974e9ee70c249a55ed33f281879ed3e2c81fc5c49326161d3f,Merge_failed,cd0187cbb64e165cab635c8cb6b3a2545d299234f447d6324d3fdfacd4d77331,Merge_failed,a4da883d1afd67f6bf713b6620e3f00a1cce3ffc374553139be8561f4fa81f20,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,49752cce0ad01d674feae27763642ef90ee4ff7fc0510d1474237992f250b732,Merge_failed,428dde72fa7977e1e8fa1dc4648f042860c554975ddd250b736cc319d9e773cb,Merge_failed,e38ce8de77d1ec974e9ee70c249a55ed33f281879ed3e2c81fc5c49326161d3f,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10,Merge_failed,aa06bf359f974871efa07a912f5c89ceaadf1da4f18bd5a3bd14cd8f7f79cc10 diff --git a/results/reaper/merges_tested/cglib/cglib.csv b/results/reaper/merges_tested/cglib/cglib.csv index 9ef0663418..93ec25201a 100644 --- a/results/reaper/merges_tested/cglib/cglib.csv +++ b/results/reaper/merges_tested/cglib/cglib.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,03335449852523a223137862737f81c47d2581e7,ad455b4bc7da8ff08bf1a5045ce401b8aeef021a,89375d8f9ef7b3a890708356844d9bcc0d7d2bf0,,True,True,True,5,17,91,2,True,5,Tests_passed,7234f8af8b6fac8501bdcfe7b3ca20c4cd45326b613ff50989e7a7e04ada6fd0,True,Tests_passed,c0203c38b14ee1f94f5d2ca777e11d74ee48f11df5c1dbab8bfea0c3a502ef08,True,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_failed,2898eae629f6191da3a0808be5590e4cfda466192820b13d0faa90271e4951c2,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda,Tests_passed,05af1e71d035e6564461bab7b4a101fef71224ad341b918140265d6453255cda 42,refs/remotes/origin/pull/77,70ed4f1600014e4aedf97de2d19c9a73783d1fcf,e88d13d8fdca7e8bf4da9dfeba4a4fc361d56113,c4076b6f1b308955fa1c0c60b5f8cde22e38ee9e,,True,True,True,2,1,3,2,True,2,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,True,Tests_passed,b6fd36f9ada4b37c058c700fea7b6cfaaa8865da0a799b02e795de32e9d556a1,True,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13,Tests_passed,27325caa2c7c06a454e3131ac545d7714bb1590db79da2390fd1ac0984cb8a13 diff --git a/results/reaper/merges_tested/chargebee/chargebee-java.csv b/results/reaper/merges_tested/chargebee/chargebee-java.csv index b81ab8896f..f3baebcc1c 100644 --- a/results/reaper/merges_tested/chargebee/chargebee-java.csv +++ b/results/reaper/merges_tested/chargebee/chargebee-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,b47838aa7464aabbcb32bd96e45c2e10885ed506,ac23f06365cf60ea21823dc94cba9226a29cf77e,096e73976c6a0a90af0f725ab32ff6645a4cba38,,True,False,Tests_passed,ae31f471ec77ec167d1face8a31600a7f643e65090773f772274a27e66228cee,True,4,9,56,5,True,Tests_passed,8a92bed26569c6fe1a9441bc2b9085d42865cb03f62d9fa79bd4bbcd704ececd,True,6,True,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,ce1eb580fdc3c6fe0dad058ebc665727afa72c262e85981226580cd1a684299f,Merge_failed,7cceb2c72521dde5c550d9d108a8d3e805dc8ee90819f365d7f657dc8a2c3096,Merge_failed,bb236351f2241127ee3bc1636a31aaecfce819c86985e10c4d2e58c5763a7e97,Merge_failed,ffc95777d0a44ff21fce27674ef52040d8090798a056cc64df2156429ef6cbe9,Merge_failed,7cceb2c72521dde5c550d9d108a8d3e805dc8ee90819f365d7f657dc8a2c3096,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,06857a5817530c497c0fa33440f259e7a422d561dc3cb8fffd982b00a42af510,Merge_failed,9cde54b30aec9d8fffcad9b72f1f9b4ca87de0c6fea027c63797bf33d3fac9a3,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4,Merge_failed,b3fc914763c3a8a852f8121944a93b1fd9bbeb03222b472e8c23ddd2a95330c4 34,refs/heads/master,0add5bcc4f9f339049d14a211e05e03546386fdb,0e60c0b862b9e980a479372812ceef2ebb555ed8,11156f634da00fe3852d459eff3cea67fa65b5ad,,True,True,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,True,23,75,240,2,True,Tests_passed,a9d631a4875e15e4d09d93d8b45fb9d661f2ba725aad49da243fc328e1b92e26,True,23,True,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_failed,9f1c3e04540c925f3590d2cc59d6740ceae4f5263c4dcf49cdbc68cbbe1379e9,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc,Tests_passed,e568e0f0ebcd56cf8379919628c30fe257a5b85091ce00abd1ddc795c23b41dc 37,refs/remotes/origin/chargebee-v1,76dbc6098e61e649ba7abdd90e651a88e0e5b3dc,76c7be5b96a1b2256e3bbb0fb3f281715742833d,abaa6d1cc82e796d2cd6693db0fc6a366236c2ff,,True,True,Tests_passed,0ab62eb57cdf3d5fab8d418d09ec8d9e5a3b446eb7ead5e95787d6785b9d3298,True,21,77,1509,12,True,Tests_passed,72dab33b6c07420f73d43e637167d3c851634ee46bd28ea26192104b6c720116,True,32,True,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,b1afe0c4d90c96287cab14452831ee07b2f9ac9118d5cf24408c20718e0ac455,Merge_failed,0700e60d0c333ada62dc19fedd4eb819fd1b57897368e1ebf06cdc2b5fde7de8,Merge_failed,b437bb897af5b46593e4126bc4980d89aa0b28f226b5b7d235bdb97734886f1c,Merge_failed,40fa4ac7bc33c89624e25603432f2ea61757ecae1028c0a9a7ea4fc4c0bafee3,Merge_failed,0700e60d0c333ada62dc19fedd4eb819fd1b57897368e1ebf06cdc2b5fde7de8,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,ed1a61e46ba1e8a055b2769bdc2909bc1c3f63c652b877a41a84cc7ac5492d8f,Merge_failed,3c2fe120e3b67a39148713b2271313901d9a7c286cbd5d4052ad03ceeb872405,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b,Merge_failed,a19ecafb2e7c7e57008272df03b5d4b2a4cdc21190069a0dfcc71485253d894b diff --git a/results/reaper/merges_tested/chat-wane/lseq.csv b/results/reaper/merges_tested/chat-wane/lseq.csv index e08031f0ba..089636643e 100644 --- a/results/reaper/merges_tested/chat-wane/lseq.csv +++ b/results/reaper/merges_tested/chat-wane/lseq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,916d8a5efc2654df3f31715ed05eea52f7d09957,cd69de37ea8aec0bad1e5a4114a4a243f1b66442,86932f013055275c558f7f964225bf8e70b98281,,True,True,True,58,217,3102,7,True,59,Tests_passed,57a196317ef2c7724708d82306b7196eac574a44a99f04d277efe6d2d37511bc,True,Tests_passed,a51dca367610fc8df1b2476584962c82e0e4063a598405ba5ebbfc9926d28ecb,True,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bb76d4dafc96cb8a12f3c33ae792da766fe7d9a16ee5b6d74642b9d92402726c,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,c9edd0af6e769d396aeea0b46845f6378915226f36068778a39ba3a28b73673f,Merge_failed,abcabb3916461fcb662d05ef70dcec27cffd58ae2cea4c73abbfa8c0b95c473a,Merge_failed,6453ddde039fb5c55d872f519070aecded1cc3949b51e79e2d30741064e34e1a,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,bceb618608ba639d61130dd16407e276ba8d00771f195c75ddd6792c229a339d,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,89ff484f6013936a71750f532b8174df5f471373d1e7dd8d8635fac6e42cb163,Merge_failed,ea07a4a17363607c93e37274cfca73b4224951763028f39ea4f16e58af2dca4c,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,e3149708ba3f7239b153d959b07ed4832ebd86a124ac0d9ff0b0853631bdc945,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097,Merge_failed,85a134b334fc22c126a82f31c27d3b16dc7ba857e8283e17d0b5ee3d359cf097 diff --git a/results/reaper/merges_tested/chrisvest/stormpot.csv b/results/reaper/merges_tested/chrisvest/stormpot.csv index 3b889eaba5..b5824b1b1c 100644 --- a/results/reaper/merges_tested/chrisvest/stormpot.csv +++ b/results/reaper/merges_tested/chrisvest/stormpot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/3.2,375e8c807ffca5524e6333b5ba602e2ce430300f,5d5d75105eb5407939194035646bb312a0bc0769,58cab5d53fc9267a54c392c1cf72bcd98b268379,,True,True,True,51,512,3234,6,True,51,Tests_passed,bdf643a5e41853b19b664f4ed5658e33ebe16e2316bf0f9e896873a23c9a31e5,True,Tests_passed,5accb39e8d00069cb07512aa018a56f63c11f53c47234f5689e604a840703d4f,True,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,dacdcd5c85338c05554894549274e56f328207b8e934008180336206071a006b,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,7cb1f3a1cf71c33621e6ce922c409d5e63ba1bb3d2f1fcce8b1244f4946d343f,Merge_failed,1658d6a108e34730c783cec7a947c3233611f55593fcf0793814b1e00e109f13,Merge_failed,ef3042e9a78050bcfb9e028a10de0ae385d26aa2432ebd4d85de056e30548646,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,386d220f1c10cd353796d000d2741bfd03dfe5b2c41dfbbbb3b45cc8036c9811,Merge_failed,eec72d5c542b15e33bbce16fdd0caeb5b7c3c1e94725dcca3cd7011163140d7d,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762,Merge_failed,cbbcab6feaf8ccd641b962f95a07c5eab8e38be559ead5ffddc046342a55b762 diff --git a/results/reaper/merges_tested/chrsan/css-selectors.csv b/results/reaper/merges_tested/chrsan/css-selectors.csv index 3cbb03a610..72348743be 100644 --- a/results/reaper/merges_tested/chrsan/css-selectors.csv +++ b/results/reaper/merges_tested/chrsan/css-selectors.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/12,6de5c5581c473a31e83c02743caad4df4be15eec,0f725a05d197ffc54c091362bf84c34ad9654b06,c19f67760b6fa3cabf1d05ae991f5cf2e70e883c,,True,True,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,True,29,131,1223,5,True,Tests_passed,e0f4b83e5f0ce1efc3805b0f5c09a36937b4d8afc8bdaca76fb012ba6cb106ef,True,29,True,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,5e0fd4f6bb2c88782f8f658c47c2692cd972c9af8632521df459eef12bb9fe2f,Merge_failed,e1fc46348f6ce8123aa0c1fb8f7e8cf0e4844a3324017ae0b817041a0f2fb5eb,Merge_failed,7b27376842c96f57392565bc6b75df0aeb09ea0235abf91eed140955d1aeabe2,Merge_failed,7e839f9d010f71c029f76daf1d0a4a42556a4c9f6d253e5d35c2210b427bd87d,Merge_failed,e1fc46348f6ce8123aa0c1fb8f7e8cf0e4844a3324017ae0b817041a0f2fb5eb,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,a7e6c2fb4ff5d196e04ecc9b7f44ae40a786a2e90ee0fd45d9e8a2772aab8e4d,Merge_failed,00c766b9cf863497e31322112fbf7955dfa5e72404fc6241d44ac11ed2995d5b,Merge_failed,61e55842ef769c14110dd03da4968a29f1f53cd21448850241baec46ee4ed282,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Tests_passed,cc2e8edbd541c6ccb5706f08b79321fbc7b09b612d4226fe3b0c2c9c91381d9b,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1,Merge_failed,55003f6e4d881af9707c56cbd0131957662805053dac8d251bdb0d1f4f8f79b1 3,refs/remotes/origin/pull/12,0f725a05d197ffc54c091362bf84c34ad9654b06,861fa596d6df2e2e03f9378e39ffbd0b0515ef55,5f66d39ef4d3578146c81f4827bfde4dc7a0430a,,True,True,Tests_passed,ed83ca9bae0f7458caea0c624c0f1424a988fac9d675e50a98201d6810d933d1,True,26,117,1079,2,True,Tests_passed,2d12a444fd1c5795985ba1c35d320d06da697c105efb83a32b17c6b977aded3d,True,26,True,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,972ec74cb616cd1039fe798cb0bad8aa523909bbce7696be023d66f85bcb163c,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b,Tests_passed,e9975dc068c80b3165043c7f5d7e4813556a9f74aef52fc203fc562d680dab9b diff --git a/results/reaper/merges_tested/cinovo/cloudconductor-server.csv b/results/reaper/merges_tested/cinovo/cloudconductor-server.csv index be1f0504e4..31aa58d541 100644 --- a/results/reaper/merges_tested/cinovo/cloudconductor-server.csv +++ b/results/reaper/merges_tested/cinovo/cloudconductor-server.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/heads/master,55b31adbcbc6413b1b147d6f6259f51de37e0ec0,b46ef94a0f9ae76f8429f039d017382aea3d436b,aba0b48f889789c170da5aa32b6d0b7efdf3f8a4,,True,True,True,42,127,2498,3,True,43,Tests_passed,6cacf7dbf53b39aa3770644110fc38907c57ccc773ab879ef5ad22747ce91c99,True,Tests_passed,106ecc9375dd4f1c373ab73abcec7a3f20ced722c9abe452949e5b70b632df70,True,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,c05b869ba27779f70397aeb5fd79be3f7ebc43a9b981217703a150152e19d7a5,Merge_failed,74603d6fd51deb0a954f22d2e781458f1ae37efc494d70ed5738fb68d376f342,Tests_passed,9fd49e7afeecfa7ff5df8608471873a58bea6961d20e5711210b8d04191c2149,Merge_failed,ebc7b42a808cb9f8013255ce71b3b4e7edd66674072d59f7f200c552a4e3606f,Merge_failed,74603d6fd51deb0a954f22d2e781458f1ae37efc494d70ed5738fb68d376f342,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,df0d82f3cff733d257239c0fca96ac69f2b6b9e85214049f5adf84cbb68a1549,Tests_passed,9fd49e7afeecfa7ff5df8608471873a58bea6961d20e5711210b8d04191c2149,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,48937f248a0f019574425c15b1c945514a67d3828e4abae505be39a6f066c471,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c,Merge_failed,bb691051ec68d0081cf2f2d3c88128f848ce37e76d5ac8c8bf0dbf7539cc2e5c 69,refs/heads/master,5d364913a33784a026527743d51403af2a85044d,9b07fcdfd959835f66caf79868a8c5fc19eb51ac,51cc03e9d7130262015491537d4eb314d182f22f,,True,True,True,22,82,518,5,True,22,Tests_passed,bf96c5b1260da1152ef373c993b8904f61268593901ffbac6e523ef1dff0db8a,True,Tests_passed,3dbcfa915bb9a89aac99ed9547e9241036ff4a7f98827753312738ef443ce2a4,True,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,8cdd792312fa5c90fe309de431dc7f4db0565d329c4c74ddcbc8725b16669bcf,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,d2256b177962c36d492de4f863be8089ce222d1503b80df9f5bf1ace1ce84d82,Merge_failed,678b6acc002e0f3a1926b96c888b831865b7f7de93a3304ed427e3cb88b64ca8,Merge_failed,47d67015c3415e6da351d026b86f4091300d6f57981b535dbb71c842df8ed779,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,51234c7b5bbb1f60047b9a8571528f7ed51d138a94a3c500987e37a353267688,Merge_failed,4e534a2c4ebbe5418a653457370f776b3f59d3575ceb57a4204df811fe09bfa1,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,31d53e8e579477509ef926ca5a36bc1fa58ec6ff76cbd3c7de92398be414b912,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c,Merge_failed,02dff45b786e9c6a5e317d70282b313251fbc3dc4044b45f7a395adb024ecc6c diff --git a/results/reaper/merges_tested/circuitsoftgroup/slackmc.csv b/results/reaper/merges_tested/circuitsoftgroup/slackmc.csv index daae9edfcc..11e72e799d 100644 --- a/results/reaper/merges_tested/circuitsoftgroup/slackmc.csv +++ b/results/reaper/merges_tested/circuitsoftgroup/slackmc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6e2ed14486ced20af34a942ad5955026e20adae7,0649a0bbae0099b51d62062d8d5e649f68d3206a,b6d96b761a6927d80ca8864ea8f151076dbb0c99,,True,True,Tests_passed,db2ae016191cb6c8f16dda043af47ded9cf665d776d3f00a5b449e4440ffca39,True,10,107,574,3,True,Tests_passed,0b810c113bda7a4fa2af72f33b73eb47773cb8b086c587a079788ad1327177a9,True,10,True,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,54363e06249b0eac2c8169965dd0d6d0b7c74f9ffcf00fb8dcc442fa33ea80b3,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,5b4614ee3643b55d0f2ec0c275ead8b62a13a85e1697ce2c9c15861423bdd878,Merge_failed,c686545a0e0c162a0ca690fae6f83d90b34d7423e1b5ecdfbbf852d9ddb443c2,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d37793e18f8900f39c02b6a7b84e564882aa517a3cbbe2e5b4b13ebe81acfbd5,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,148eb54e16706ff54bd5013c6e9fdab00ba7e085eff5f762152fad59b0657ac4,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,d071214b6277dae93a7b5d593e18646b7b2cb65ea4664a7655fb75e8fc6328dc,Merge_failed,7a72879db80d481363f92b1fa897b6686d9a9049c5ad9497394f8666b4241a5a,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb,Merge_failed,f28acb20840717e013153de3874417db09811af0195195d3e06a81d7f66c9bfb diff --git a/results/reaper/merges_tested/citysearch/web-widgets.csv b/results/reaper/merges_tested/citysearch/web-widgets.csv index 69958c30df..f516cd2905 100644 --- a/results/reaper/merges_tested/citysearch/web-widgets.csv +++ b/results/reaper/merges_tested/citysearch/web-widgets.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,309d4d30fcf2e785389d98854afe76ce753cef63,aaf7b3ab36f01b80b8f4ce821b6aea7e677903ea,f3d2b8d302d53caf03877c3182d56cf5d2c81417,,True,True,True,20,72,660,2,True,20,Tests_passed,51cf28e04439b5ff95ebc169d765dfbf2bf7d3b63da99d857197180105cc54a9,True,Tests_passed,70f5ccf567095aa86a7da7ce32dce5ae27f8a3f80b9144aab7f1f4129abf4a3f,True,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,b1949eadfd94ab6052ec63599c16571931cb79e9c22c42b513578e602f9ddc4d,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85,Tests_passed,a463d1773179934c7efee88e2628036584f71a6e4aae18142a421c849d713e85 25,refs/heads/master,71ba63c2a251a56fad55dc7a6f3ccd5251202b75,b3e6dc0ae716c1fe53e8b89a001496a20d7be4ea,7d84f1eb05db21372023c26c9e51599baf9ae1fb,,True,False,True,3,9,52,2,True,3,Tests_passed,c3796b843343149c102373c45d82bd6a2f28427707d9d257ada448f67be6548d,True,Tests_passed,a3ca30040b09b6b7f45c46785cf94f0b0f1b141cb072a00ea3ea13654c5cc2ac,True,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,65f448438b03eed7b26477a2ed84230a1226c0e5d6b900e3dcc8f04c7e5755b4,Tests_failed,147ac388afc86632dc4703efd5312574f3bdae6d3430a40d82368f7cf2b25388,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,65f448438b03eed7b26477a2ed84230a1226c0e5d6b900e3dcc8f04c7e5755b4,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45,Tests_passed,ade9305bb0b7fdd304ab21b2e4913eb92c305c9e639278c98609777e2d278e45 28,refs/heads/master,08c7993177d5a8ec8bc446c5c55d20e84e30b8dc,83e1a58f56b18111f244080be7afe40fe32f4b9d,dd02e8f3e456ce1415ee3c9906ab4b93600e49ab,,True,True,True,98,139,7661,7,True,98,Tests_passed,c1c300e900698c22602017fee24cea0499afef7486445ceea76b22f8d5658898,True,Tests_passed,72bd0588b70e915d074d8f308b946843920d5d0b7cd474ea69bb9523167eff9d,True,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,01b1fcbbd9277b7ef3f6d94d5431da2396782c207eba4816788c23312f752146,Merge_failed,76b02530678f5c948c21e354b63bd4e214aa49bd90b6e2783baae12c20ec4eec,Merge_failed,a1d3f073b66b44cc8ced172293d372fb68c60bd17aa016b7610ffc398bf6e777,Merge_failed,a1d3f073b66b44cc8ced172293d372fb68c60bd17aa016b7610ffc398bf6e777,Merge_failed,76b02530678f5c948c21e354b63bd4e214aa49bd90b6e2783baae12c20ec4eec,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,e62c7a8dc65997514cca1e9d317d26a05e3d1936bc74042710c894d53f5ba7f2,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0,Merge_failed,9fcce1a866adc9fcf782d813150cc8da9ff4e4465783ddd3db3393d8d44317d0 diff --git a/results/reaper/merges_tested/citytechinc/cq-component-maven-plugin.csv b/results/reaper/merges_tested/citytechinc/cq-component-maven-plugin.csv index 7372c0b922..d7b3265bdf 100644 --- a/results/reaper/merges_tested/citytechinc/cq-component-maven-plugin.csv +++ b/results/reaper/merges_tested/citytechinc/cq-component-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 89,refs/heads/develop,00fe3900c26b1ee640a39462e0badd10949d33a5,cd09e00ba23122bf606d2e90c87a5b08983344a4,032498aaac1baa96c0e3b9c29742bd340ca6d282,,True,True,True,4,20,75,2,True,4,Tests_passed,c6e24f6aa9edfe1b0dc74507cbfc3565e2a5e7b6732583ed03a8e63d4a842180,True,Tests_passed,5706b56eefa4ecc886cd6a82142153430bf8a7497ee615d8bb4dcca38cc25dd2,True,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2,Tests_passed,79768eef5d818406e1bac175b4958bf044c2c412a518cee84e61367b490766d2 123,refs/heads/develop,16db663469b71596e26c87ce12b67c53668ceda9,46269600b8dce4a29aeece5678d092bafd69d18b,bbf64b98f412dfde1c4d3e5c2aeb72cf949245a6,,True,True,True,196,532,10804,6,True,196,Tests_passed,3ce7a1d4f26a44cde835fd91dc7610975164647a231c0427359a6037ff15364e,True,Tests_passed,de33f0e4a918e2390c033edbb1e1353ce93da629445903aebec53134b048f289,True,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,fb1aebfa6fc8ec746f70ac81857375b7b2248193b6e8f243beeb156f3b3919a4,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,a31534475056639e88f8c669b815cff55a8b3a916b848da06d08482494964381,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,66ca5be6582ad0c8da2a2c1c2165c0732e98280c6214abb85889670bc3053906,Merge_failed,15b9b280d34df33a460eea7c385209c2d8e70289f2f84162a3745cd127bc7868,Merge_failed,f4952c5a0f47c26ac1a956e99ff34090d0087343daf2c7078e20f2923ace4fbf,Merge_failed,f4952c5a0f47c26ac1a956e99ff34090d0087343daf2c7078e20f2923ace4fbf,Merge_failed,15b9b280d34df33a460eea7c385209c2d8e70289f2f84162a3745cd127bc7868,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,a31534475056639e88f8c669b815cff55a8b3a916b848da06d08482494964381,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,600ed093e2a915a72dd37204cb4da81060db0d6290b2efa89a00f5eae22f08f8,Merge_failed,854b40e782008b00a9c9f8fd13c9331af773f1a50b9ba488b21ef11f54a534e3,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,fb1aebfa6fc8ec746f70ac81857375b7b2248193b6e8f243beeb156f3b3919a4,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7,Merge_failed,4498c0f1556ff59b9f627208d87ed45b3d21dae6ca493ea49b8eccd6e12b9db7 124,refs/heads/develop,07c0f64ada9b04b6050f7897c803cfb942b15eb3,958e33b6a8f72d2a4b33b0075deed86a8ab10470,ea5f8c3ea53b554edf413546644d374cb16a6891,,True,True,True,194,493,10134,9,True,194,Tests_passed,6323adcae533126b0b16ea9a55272aadb4df863c4bcfc2fbb89a6acaa3bcf37c,True,Tests_passed,5c91796420098f4ea2bffb47c284f74ff49a702543122a27ae6c29b5822915ae,True,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,72f5e3de2e31cf1b15ae233cb164a39bbc61d68c7391e33e0831f9fdc67a5006,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,cdba59480d908351fa7ab72549e1c09e9c150c2e790820adc6869163487ed769,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,59df892dcbb22887882e5b9735c864bc31a9466471c09a06a0afb42e981d2c29,Merge_failed,f55a12518296850abf52568372127d2b79ea24ece75e82229508105351ccca8b,Merge_failed,224ad5fbab1f6acec3856578073810c9b451cf4ea1573aa162802ba311728775,Merge_failed,a8e4f145dba7cc6aeeb348c5a21c8b619b51fa52b54b2cfcc981780ec050a276,Merge_failed,a8e4f145dba7cc6aeeb348c5a21c8b619b51fa52b54b2cfcc981780ec050a276,Merge_failed,224ad5fbab1f6acec3856578073810c9b451cf4ea1573aa162802ba311728775,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,cdba59480d908351fa7ab72549e1c09e9c150c2e790820adc6869163487ed769,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,9f3738f9b8ecec0dea7a5b60142a2d6a1855205f70bf2795aba19756f8ee2b59,Merge_failed,59df892dcbb22887882e5b9735c864bc31a9466471c09a06a0afb42e981d2c29,Merge_failed,c665fafc2733582ec52d2b6b4637336b73c37f9136c31f668a0942fc7ffe68fa,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,72f5e3de2e31cf1b15ae233cb164a39bbc61d68c7391e33e0831f9fdc67a5006,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e,Merge_failed,a00beb78e09a7c70789b69df3116840cdf2c4dad22434449caeb9049a468de8e diff --git a/results/reaper/merges_tested/cjwizard/cjwizard.csv b/results/reaper/merges_tested/cjwizard/cjwizard.csv index f462ac8ce9..8b3cd8c4fd 100644 --- a/results/reaper/merges_tested/cjwizard/cjwizard.csv +++ b/results/reaper/merges_tested/cjwizard/cjwizard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,8,14,68,2,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,True,8,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,9dce46a060df063a8f904c5b27e0451c45573303b682add3a3098b5fd6d8b717,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de diff --git a/results/reaper/merges_tested/clickntap/vimeo.csv b/results/reaper/merges_tested/clickntap/vimeo.csv index 7f28d2ee42..f410b9772a 100644 --- a/results/reaper/merges_tested/clickntap/vimeo.csv +++ b/results/reaper/merges_tested/clickntap/vimeo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cedaf74fc799691641f83a34a19f8ad479e77108,f40afce905a0cd5b0ff539eae41729e8788038a9,e546bda5980616e4d60bd30fdd5e8773759621b4,,True,True,True,4,20,70,2,True,4,Tests_passed,e857b022fc34a03c41fb289a8695e8b29ee23cab8b116c90ae3274862c6212f7,True,Tests_passed,5f2cbde4460700db3bbdd235693598aeb321bdd37b9d86f5013bacbbe205ce3e,True,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,9e13090c0b25113a7f789bd1c46eafecc4a8d41b8fcc534cfe330f05bcb201e2,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Merge_failed,5eefa8a16ff22a879e5ce4fb7267583708be3981c82f5bfd24b0ecae573e7e10,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d,Tests_passed,d3b15ac8402e91ac9bc182b20c894a49f19afaea4d0328755891f9c00c75e86d 6,refs/heads/master,85bd093b588e15e1a22c68cd6a4c83b1ed012a5b,848a750f0c470aa6e8633d1a4b4ee7e8f88237ea,f29fe6c5a056097b2d0939cfe5912efdb62d5c59,,True,True,True,3,19,60,2,True,3,Tests_passed,24b22e030c6fe598bb6bbcb2b77cf7de939acb3753ae1f693b534d6edd2b806e,True,Tests_passed,275d01bfcfa8afddabcd250075d0acb268f3912f9ec0e92f549e56896308729a,True,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,d4ec8e10059123878ff93da10903ec387ce525e17a7ede52806763b5b3cd86f1,Tests_failed,74bb45786f76dd33087b92cc4bde204035144a65292e522848bd978f01dea088,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,d4ec8e10059123878ff93da10903ec387ce525e17a7ede52806763b5b3cd86f1,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5,Tests_passed,29d9ae37f391424a51b9ab6ab0505017f25250c2e447ff5a448aac18d84199e5 10,refs/heads/master,768543130e4fbffc7c050024fd643024c83d53a6,15e178c9a22a613ce53d386c8dfabe572c3b68e5,f566947b83a1381d990cac87b0cffbfc0c5194ab,,True,True,True,2,34,91,2,True,2,Tests_passed,1e3981bdf5df70839f98c8a1c301725d9a6071243b3385dd06dbd0116586f832,True,Tests_passed,bb8fd632a4b1240236bfb0c6ee261f3901e7080ba9b8924136c102f4a9c3023f,True,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,599375de407ea150bc78179dc2bbfda9f7785296f7361b1f1f74a795becbeff5,Tests_failed,d538c0136a747483c440443598e461d42f445aebd135ed5b1abec4fcb610ec5e,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,599375de407ea150bc78179dc2bbfda9f7785296f7361b1f1f74a795becbeff5,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,d177e7d0983c6425bfcb52f3f0c107a61e97314df96946664c35897a8eb51fe9,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe,Tests_passed,b5818099461fff4f51787df4f5a9f7c95c4bb53cf34fb8a9b49434c0d66d1bbe diff --git a/results/reaper/merges_tested/clojure/clojure.csv b/results/reaper/merges_tested/clojure/clojure.csv index 2f6b354e47..fc262ab8af 100644 --- a/results/reaper/merges_tested/clojure/clojure.csv +++ b/results/reaper/merges_tested/clojure/clojure.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,42f68bc7688db3a24565dfcdc1cba92dd8a99159,ad7d9c46992cac0e812ce3dd47584c9bb2fda11f,46be47c9f51ef10d0082f1bd39ffff1008682861,,True,True,True,5,49,137,2,True,5,Tests_passed,6e436259330ad74709cdcb01ed36d1d248e1410fd3d14b54c4f2adffa3030ff6,True,Tests_passed,124976a36feeda7dd8c82724cc6f128e836c84144aef72764e2acde809534d81,True,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,fdf50a939478e32540c6d31ba0b32c7bd5c7cd612d072a7b3bd0a9980ff54ad9,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,fdf50a939478e32540c6d31ba0b32c7bd5c7cd612d072a7b3bd0a9980ff54ad9,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,650725e741a63b62f009b455c050594f60df4de0cdc1d6341cbd1fd87d6c712a,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8,Tests_passed,af12f39287cc99318f7e4f5477a892173becc1a0769facf79d1d9699ec4530f8 50,refs/remotes/origin/dev-array-type-syms,158b0454a144656a57487e181fbc1f8a76b8960c,c066a61f16526c14dfe44cced136e80950c2e109,28f3ea21ce9251bcf65e9a5cddca4eaeb85c66b2,,True,False,True,6,15,159,2,True,6,Tests_passed,686c3b58841b6dadec224751da89741f4582fcd66dd7bfe781f3efef46386d81,True,Tests_passed,372a96a23d4916ac17c58b5177983fe426dcb58b05d61da23100d18673022af5,True,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,a178efc63c9757162b5e56324ef4e3b0c55059bec3f0cf8838821be1af0405fa,Tests_failed,e23fbf010cf1fc3348fc28c17e78c9e26ddebbd0fc873eb8c59cae0378e3b967,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,a178efc63c9757162b5e56324ef4e3b0c55059bec3f0cf8838821be1af0405fa,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57,Tests_passed,21044dbfb319b86912f1fc836d76a20134f6331ff945b0b1023b3dfb403d5f57 52,refs/remotes/origin/dev-array-type-syms,1852e4708497dbef2a7ffd4ce4744678b1f6dfcf,118ecac78085b5081a8e640258bc472097418b16,9313810d6150f97285d3a2c99f50fe157869c83d,,True,False,True,3,6,28,2,True,3,Tests_passed,0559390ff8be2b5fdd3d845eed115597b09b63d5b361c737d62594c1960eb8d1,True,Tests_passed,b0d2fb41514eb2d872989a5cccbc7c31ddff1d29c03c33c51205ba0719bf0c60,True,Tests_timedout,928117466d27183cf04a1f6f7bd91c9e056db356b76d3c47343f0c8325071bef,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/reaper/merges_tested/cloudfoundry/cf-java-client.csv b/results/reaper/merges_tested/cloudfoundry/cf-java-client.csv index aa8279de3e..c39b6c6a88 100644 --- a/results/reaper/merges_tested/cloudfoundry/cf-java-client.csv +++ b/results/reaper/merges_tested/cloudfoundry/cf-java-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,891f35daf3bb24fc4e713fe8534cc7362ce8b553,996a8155a4f17a313ec31190f7dd846f18a9a556,628c05f5d2c7c1f4b3c9f0262e50343aca70b02b,,True,True,Tests_passed,24a5728440908f34e272f131854d3ec678e9ba8c8fdffef7594ccdfe87ffac81,True,7,162,1148.0,3,True,Tests_passed,c88d314b8fc10594878428924b382e4184f2b45970b88162f2ec1e3c01ea6c3a,True,7,True,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_failed,ac1225cfee205afe5be6cf096ee91e8d09c1e4ece6038bfb80c724d75f2cf2e6,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_failed,ac1225cfee205afe5be6cf096ee91e8d09c1e4ece6038bfb80c724d75f2cf2e6,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677,Tests_passed,1e1574df0b20052b480840aea06107c9fcac89ff8bcb06978b041643d2ce0677 10,refs/heads/main,4b00808f2f6b8f0132798bdafe86b15e57104a02,abaed48b1f1ff3ebaf3b3399ba59ab6628c1da67,8b8a56a3eaf700fd8eeeab55e61a1926c6a76747,,True,True,Tests_passed,47882e2a69fd4ece47e4d83db41780c6ffd759a44e2769a902e74a6f9cb507f3,True,1156,7179,107110.0,2,True,Tests_passed,bfed0a443f3964d768940eef782a6b65567016142aa4b68778204d136e32d4d8,True,1156,True,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,a43f216aac3ac56f7ed6a788de1e592d2f7f7c45c3fe7adc08328cff9d3c62da,Tests_failed,b0d9b9ea864cde0944d7ab47950f0258032e70b8fcab8ed236db3becddc24674,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,a43f216aac3ac56f7ed6a788de1e592d2f7f7c45c3fe7adc08328cff9d3c62da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da,Tests_passed,f7b81710451ce7f3957aacdf52a7b9effc71694ccdef9305feecca598893d9da 24,refs/heads/main,e82ba668cd951790588e2e82cf38f3e5850fe014,8b99869c583947534a81d6ee00faf55414eb86eb,d007f964021e978786960c136a32a670d61e177d,,True,True,Tests_passed,3cd61a61103ff006aa0bbb5f18650a7ba7c3e480ad51d6ec4dd36cff186a6eb2,True,2510,2581,5312.0,31,True,Tests_passed,4a7300e01b8739043afad2d17d18b40482c8d51bb3e4e8d65923e021d28830cb,True,2524,True,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Merge_failed,250b03f95f6cd178d58197fa98351302d2e9812ba5ceb4fd4c22ce57d9393e57,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_failed,35e7aca5d0a88ffad7ed4b334055ba510ca58d57f8404c42f0f1cbe8cca8c089,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Merge_failed,250b03f95f6cd178d58197fa98351302d2e9812ba5ceb4fd4c22ce57d9393e57,Tests_failed,35e7aca5d0a88ffad7ed4b334055ba510ca58d57f8404c42f0f1cbe8cca8c089,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b,Tests_passed,8731388784e9652349cab531e847d1fc797b73ab089341ce9e5a12f515a4393b diff --git a/results/reaper/merges_tested/cloudslab/cloudsim.csv b/results/reaper/merges_tested/cloudslab/cloudsim.csv index 2e52165a31..0ebf4baa6c 100644 --- a/results/reaper/merges_tested/cloudslab/cloudsim.csv +++ b/results/reaper/merges_tested/cloudslab/cloudsim.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,e0205e647461340fcbdf2de516d1cd0ad9fd1154,e0334f468311935d4d6bd424f3e0cfadf04fa8a6,c1ffe5a99703df9a2a03eb738a62b4e06146d732,,True,True,True,6,16,33,8,True,8,Tests_passed,1e5a990cd6230bd1349487409b1f854537dcfc974c057a9fdbacf61e4157aef7,True,Tests_passed,98721d9325e48626d8685176f77677fc4d81ccd4a5add362fbdff9d9dc06fd37,True,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,ff7f9960b0649308b3876d513052bb8925e676b0dc8ae12fae7ebccedad06fd2,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,ae204d2622ff03d2afe0121b924607314dc7c732e2cc217874213699bd6a4cf7,Merge_failed,a977a6c1de67b049eca07fff181f5a462bd27479c3225c87b4054c0ce25de441,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,6908330f859111461621351c451fef064a2522ef39aeb30e84056427995e7cfa,Merge_failed,66b5b2cf9eaad4a6bc6991a067fcac125ae223de9b3fe4f3af7775017612090a,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada,Merge_failed,4a3d80f493bae21f327856079bbc192f6301fccc36454deaf1bb6017dc433ada diff --git a/results/reaper/merges_tested/cloudslang/score.csv b/results/reaper/merges_tested/cloudslang/score.csv index 6fa292e11b..969d194906 100644 --- a/results/reaper/merges_tested/cloudslang/score.csv +++ b/results/reaper/merges_tested/cloudslang/score.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,4f8ad3c2a0d651ccf999d4f65275113de84766b3,1a5906925d71a294a180455b0b3a579ce3201447,4eb7d0b731257d0537755f851cf21a752c342827,,True,True,True,46,64,230,2,True,46,Tests_passed,6473427f0754c0108c77e9813529afe904eddbcc92f4176f15bc16d4c8318a35,True,Tests_passed,2cedb69b7341ca64d71a46ed1e3a62aee9ba7a2a887007e8e8bbc12adfa9526b,True,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,89d5a7ce59e3154daafbc87975eb7c8d33467cd9e1e4be921d4f86f4084ad335,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,cbcb6ee422255c31241fea1db76a62839e165823f7570debef6d4716ef6a6668,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,02c2505ae8fd47eefcfe71b36b455c0e4680d35bd02392cd40804c4f5d7709c1,Merge_failed,d8855b1c38f989b02e90b631b8296467adf23d01999ca952ad034b0d59139952,Merge_failed,f58dfbefd0380abd47eb154acf54f4214bf843510a847fa69515dc000dccde37,Tests_failed,16716e53fd3df40911a8aab534af7f05e7ca93585f5e0a378094030c0a3226a8,Merge_failed,d8855b1c38f989b02e90b631b8296467adf23d01999ca952ad034b0d59139952,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,cbcb6ee422255c31241fea1db76a62839e165823f7570debef6d4716ef6a6668,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,eca2edd43274dc0d07c91bb1fec55c5b81a924c7b23fca1ed13106348d57794c,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,89d5a7ce59e3154daafbc87975eb7c8d33467cd9e1e4be921d4f86f4084ad335,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36,Merge_failed,84499838ce00ea6d0f2b39a1451c671c2d083a1962ab281064d51546c577dc36 58,refs/heads/master,d014f50de7cf160caef749e8319ba6bfe009ba44,00990fbde5fb1f02e18c012a9cba5768632d026d,13f1238413977f1b1d7f6e135b50713cf1e78808,,True,True,True,65,150,1108,2,True,66,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,True,Tests_passed,9eb4846f364456790989af128dc751e4d4b43305cbbadde41ab0cae4e7a32e75,True,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,f8054ff5f3013fdc3c6f7871b774c429f50f1cf522df60a24c9f47026d10cc2d,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff,Tests_passed,9c499b99f2d2e0d1671f67be459fd89b57eded30dbdfb3de19116154d9b4b3ff 59,refs/heads/master,00990fbde5fb1f02e18c012a9cba5768632d026d,91c4e43c8a262a9929e9711c7899163b724109b5,2c3ec3f1a8a2e769934a5a11ddaf0e3bb2c9b2f9,,True,True,True,79,126,1421,2,True,79,Tests_passed,221bd7d00c73838f7bf2b2b570bdb2f1ae31d739630e199f75e2e3215aea3873,True,Tests_passed,894de89263641acd12c1d060259d8067f32bdefec9752a39200c1a5be810d21b,True,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_failed,a7e0db2450dbc8518dc960f633fbdd5b23ecef7b9f62442128445de625b02bd2,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d,Tests_passed,2c90c04bc29bf03f5ba97495d6d10e46981d3aa98a9e4417466693b1d1e8448d diff --git a/results/reaper/merges_tested/clusterbench/clusterbench.csv b/results/reaper/merges_tested/clusterbench/clusterbench.csv index b8ffc8715c..b00f320aea 100644 --- a/results/reaper/merges_tested/clusterbench/clusterbench.csv +++ b/results/reaper/merges_tested/clusterbench/clusterbench.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 62,refs/heads/main,d7e0961e12b218d6f6a33e30d294867c2775cdf2,4fbef42fa22ec89c8a038d6a8bfbc736de3e4ab8,8717c2df174c541b961f56a69cd858e16cb8811b,,True,True,True,12,19,228,2,True,12,Tests_passed,b04dfeb3ce64b9f20cf42139b6fee86b7c62196c003afd7eca052ed642d39c97,True,Tests_passed,6bff210ab6f75a1f9a4255f23f123458d18025bfa0ea3b51566e9a3bf2657167,True,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_failed,adce8efcdee4169e641c4d53ea3766dfcb4ce3b0df866309c8de2750fc58306d,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0,Tests_passed,c3af2bc101a8bd3da6dee5b0da4b597aa8daab82a52949fd684ab390c15267e0 64,refs/heads/main,e218cea656fa222ca1ecf2d6fcad6f185b3ec399,19152bf8782512305b25e7fefd2fcf17527e759a,ceca9cb677db82e8317dc707e09ddf5b5facc1d0,,True,True,True,14,38,145,2,True,14,Tests_passed,d001ac878bb52de0ad9138acdb51b9e4031616e8ebdc15ef2e905e5676585f2d,True,Tests_passed,944b1e2c32707514e6366f503de83de50bb1cd14001df37664706f42ed85a3b8,True,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_failed,1c1193300e3b63c27dde8066c58b08372c4311a3c5ceebce2d9f74249c71a1d9,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a,Tests_passed,e17e38f4f4afcae3d84425d7cdc1c69306cd8d5a9394c314b00eed90ba34a38a diff --git a/results/reaper/merges_tested/code4craft/termblog.csv b/results/reaper/merges_tested/code4craft/termblog.csv index 5275891ca9..db0168dcca 100644 --- a/results/reaper/merges_tested/code4craft/termblog.csv +++ b/results/reaper/merges_tested/code4craft/termblog.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,794189f4401f172745bbc2ab1e17edf70a476b66,8d34534c9a05de46cf723f8cbb6dbaf9235597c3,df6ff5a8611c4a01e4da45590158b0de3b285882,,True,True,Tests_passed,17532e417f82faf1ad9f23d8b44387ab4fed6c8936b0a741b4433a1e011516db,True,115,33,3910,4,True,Tests_passed,0c73c7a54957b0fab91aaf3b35afd8a76805edb13db411143ba69ca517f3f45d,True,115,True,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,c144f95b69e512355210ba1f780da789e90dcae765aadb4aea60838bdbf48d68,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,920bb270126c8a585dd26403b553487e048858896d15ab40463a001a972ccde9,Merge_failed,793316272118c1a0b2d8cad0de1985c01d24100aaeba3fe2aef6d719cec87a34,Merge_failed,b94ba38f667defcc36c5b2d615161ec8091293c123dcbda4c07ff42ca1a017d4,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,f861f05035bb7ba7dcd5a5daeb18e639c8e985613e1720be14bd145653c8e514,Merge_failed,307557f9bce695e15e06546afcc5f291ae17a578d466b86bfc8518b1a35a8708,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2,Merge_failed,19f814ade9d722339ec7bf682dc8a95b09c8f82a94068bc4163bdf3a3e0a51a2 diff --git a/results/reaper/merges_tested/code4craft/webmagic.csv b/results/reaper/merges_tested/code4craft/webmagic.csv index 7a5b62dfa5..97d2f3d950 100644 --- a/results/reaper/merges_tested/code4craft/webmagic.csv +++ b/results/reaper/merges_tested/code4craft/webmagic.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 123,refs/heads/develop,2913da47637694b5d56bc3773caca473707b6aba,928f98dd93bf3a0ebcb14cb663b5cd924c59f1e7,5883ed93d759e6eb23d736a0929a84ca0cad5a3c,,True,True,True,2,1,1,2,True,2,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,True,Tests_passed,828d4f95b1410834e3ee25ac9f08d9ee632ecc6adda374b305146dbc44f89bba,True,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,4cefa1fa6916912620d8b38900d395a43fa4e7e42995d07eea88a6a5dbd2caaf,Tests_passed,5a074626ba9003a53bca3810b3d40e7e75fc6bd7cf63c8cda1e781caaea06ed6,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,4cefa1fa6916912620d8b38900d395a43fa4e7e42995d07eea88a6a5dbd2caaf,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554,Tests_passed,69b9acf2513b726bd8392e42c40a22d4f1d0dbd555932e803a19febf1260a554 163,refs/heads/develop,a2fba8caa2684e3b2915c8c73577f5db2f9b7c01,4a4b57046bbeca4208fa487d208ae04422cfcd3f,fb693a4ac41667ba70f2d7c11c73b364fa569e67,,True,True,True,69,89,2060,44,True,96,Tests_passed,883a19f4764d32063f3515ec097c60bb3313da52d6bb36d49c0a925034b8d92e,True,Tests_passed,836e7dde384ff636bce4d694d302586a609a2fa32acbf534980d029856f16204,True,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,11631b5943c563260b712705fa030a630299ce39595b160dcfa9e747f02b2f75,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,0348cb732c924878ff56d79480b7cb5ed80ccc03aee780844487ab6fc80bab42,Merge_failed,b2fb358e486f4f805b800cd232bb0ad0587c5c116bd57ad280e1baf5962ffb93,Merge_failed,1e906ac44e844517b3ea7b12018e6854ede4c98d9340f3147e1f3b7ba3d2a46b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,f04ad4ff876107933a349cdf71b2c27719d0ee2aeae72208c80af515d931fadc,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,bb66ec256429f744a381d9761df927d1056c06cf05399f01c0b0c2121f654dcd,Merge_failed,e9a47a77d84740f02e8e3b1b4a0f42ee9ab03ccebba00a50734b5bd74448f13b,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,707852e70d37eb084f0421aa5df3bbcd2f40d1b241afc0758393c73ebb377b1a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a,Merge_failed,c82f3aeada39e090074ca398518db5b0404e8fc9c3d93ea3e5fffc65cc5b243a diff --git a/results/reaper/merges_tested/codecentric/jmeter-graph-maven-plugin.csv b/results/reaper/merges_tested/codecentric/jmeter-graph-maven-plugin.csv index 2b3d49e52e..ed4aac6a25 100644 --- a/results/reaper/merges_tested/codecentric/jmeter-graph-maven-plugin.csv +++ b/results/reaper/merges_tested/codecentric/jmeter-graph-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/1,1a548b68d5c5dcb7e618bcefcdbbcd8dc00d209f,9d653ec06f567a6b301d02ba565f3d9023294c3c,5bc5f4eba31dc83188cf4af9f335f896115251eb,,True,True,True,4,23,251,2,True,4,Tests_passed,4c193d173ab4262128254e8fb4c7d2b9b1051a02d58936349182abbfe644622e,True,Tests_passed,034e70b63886cc1931e5863ecbad3608e754b773eb924845492f25c601dfb81a,True,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,e9b0b8e4e5bd600b93c81a336893ac8b5da6f3190c701a21df0ac47bc9c17a99,Merge_failed,f4a27384f0b4ae3c7658a6bf2a518ce08994e81dba08728c2671093e1dd9ca3b,Merge_failed,08bacb763dceb3fffe64abb928d5113f257c552154c8b71f43fb8154bde394af,Tests_failed,66e7aced202ffdeddb501ac1ea0985c6187dcc7d48ef2f3ac0cc7d992b30cf4b,Merge_failed,f4a27384f0b4ae3c7658a6bf2a518ce08994e81dba08728c2671093e1dd9ca3b,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,d1fd6d16897ea99ef7f8339ceb50477e91b6a32fcdc9b9218329cf5ce14fd594,Merge_failed,08bacb763dceb3fffe64abb928d5113f257c552154c8b71f43fb8154bde394af,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd,Merge_failed,8da268f978468d0a2ee38d5258c47bd6d3a11e18129402fef64c5bc03c335fbd 4,refs/remotes/origin/pull/1,9d653ec06f567a6b301d02ba565f3d9023294c3c,59d801302875318e01477fb567789668477b5f98,c92922c382f7f67ee01722e4d05e54d323bdcb4e,,True,True,True,4,23,257,2,True,4,Tests_passed,3de1eb6cbe6aae4d61cc88763c3177533caa5fc7d5b50456e0cf2abf306b490d,True,Tests_passed,e5c0e89ff132330aaf8e8f7ce661d9efaccc878188eb622b92ffb4cfb148cab1,True,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,aa98e31a0193594abc09ad8431adc9bd9d875b782f3deb0318c620d8bd8c0869,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,9842c53d96ea8af2d4ac53c8bec8de792ea013deaad6fbf9d6cb1341ac988a51,Merge_failed,d591040f7af07fc8bbc4d28a8060edb304b157fe0958c8730b8bbfb42fc19c03,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,792c46a47f56f03d7f81308a0c47ef52ff75669a65cdb6e81dfac539c7f8db0f,Merge_failed,e7df0a2578ef2be1b36b196941575e5f0d3354a866ba0184946c64c6ef5346c3,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,cfdc8e2e7b0469a6fce753034f55c8b7379ead9d77c77b27a3c071c80a68bac2,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a,Merge_failed,8692227a1574f247d2d326061ff56ce1821ce9bb1fd76651560e55239b151b6a diff --git a/results/reaper/merges_tested/codedance/silken.csv b/results/reaper/merges_tested/codedance/silken.csv index c55f233223..9f270dc7c2 100644 --- a/results/reaper/merges_tested/codedance/silken.csv +++ b/results/reaper/merges_tested/codedance/silken.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/8,9f4e8c6f1edd9ad3116ca992b5e530bf16334716,75b5e700533904b1dd44024425e96e1b4a03f4fa,bc7c2090c0f18b962b4ef84b77001749a50e1d53,,True,True,True,15,84,493,3,True,15,Tests_passed,27d1dcc005566892b9f568d440e6b95ed5cc4888bf10b67928cbb6fcc10f8485,True,Tests_passed,22be67c4b2255616e85093565c79c180d005403203f7ee1ebc60510eb0e48891,True,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,e1aeebbd5d0be941701f43fc6c55812644b6b15e59a87a16da95941417caa7ad,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Tests_failed,e889d1d5c8d133874dba2aeee77ca2070d03a55c7385317a2cd813867c3183fe,Merge_failed,fb762698d9fd410f796ea110d381c653feb694ab31fa2c167d0d2d5d728f4bd8,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,f99e30ea618cf49696ea95817ab409b94ccfe6c174f59fd7728d80b87188d177,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,1287bebec4399725013a9cc3d9ad61c9e233792a3c22833f1b8cb0bbf2edf5ce,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,b3144631da47b82eebf2c78b49d79afe305ca25209a7a9d2f55d8ababe88de6a,Merge_failed,4817d01ce3547cab1e5317d6aa842ddc2c17f79e6e1e67b5f02e0613f7b81891,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb,Merge_failed,2689dca4c538705a510928db69614579462c57e8b74bb19e752d3d02578c3feb diff --git a/results/reaper/merges_tested/codeine-cd/codeine.csv b/results/reaper/merges_tested/codeine-cd/codeine.csv index 31cc63495d..301032f09f 100644 --- a/results/reaper/merges_tested/codeine-cd/codeine.csv +++ b/results/reaper/merges_tested/codeine-cd/codeine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 109,refs/remotes/origin/pull/252,e2d8cb4d560d49a12ffb9d53efd7bf10d1867e38,2ad519701f97ad01ab0c14e9a42166ec4d86b41c,ede7bcf188bba00a4fd167385cbab6661e64b26a,,True,True,True,12,32,903.0,2,True,12,Tests_passed,6fec22c803c70894e82950145f11cf498bba0d5edb682e5e79edd77b5d0f320b,True,Tests_passed,26430d5f2bb7fe88008dc5f809d79f6868682100907b4146add2432266275416,True,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,4f6d08032d23cd608dfafb0cf43cb54eddeb40dcb081fc3355ef9220619bbc90,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Tests_failed,781f4ee526970db229f4331c1080039e21bf13b00501e0bcef8c5d2f9db991e4,Merge_failed,b738d1c1879ecb9ffd2e21b13e1d2bf87c94d706fa6b16d55abedc9b8d884d54,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,2d1938a702d7049ea4fa7d42c7d4cd781380d89e0c206f058d25c4c4e7ba4d4d,Tests_passed,9ce9579f01ad6147a7da3c70de9bd333f00736aef4e43dcee6bc10743e8c295f,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed,Merge_failed,fdd165d6e5d933e395f37fb9a777a86d2f3d4e84d47542e34c9f2640739272ed diff --git a/results/reaper/merges_tested/codelibs/elasticsearch-dataformat.csv b/results/reaper/merges_tested/codelibs/elasticsearch-dataformat.csv index 912caf88f9..15fc0a9fbf 100644 --- a/results/reaper/merges_tested/codelibs/elasticsearch-dataformat.csv +++ b/results/reaper/merges_tested/codelibs/elasticsearch-dataformat.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/remotes/origin/pull/62,e0575ef213f2503660bbaa5274bcb5e9c7cd2275,975bbf35cb5cb933eb60be8508ba69efdd2b7d6e,a3630230efb687cedfcd063913f645d6cc061046,,True,True,True,8,33,579,7,True,9,Tests_passed,5290cd89f4aaf67c224a07677e9ea27c4ee05956a1d0f44f95d2db7b2d637655,True,Tests_passed,f714438fd07bfc44c3ad825546d97561c8477a89426bcd3a31607b5d97c4d919,True,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,b7e7296763b6ef09a53e98be3921d095450d98ae93c5f66d8052ae77adee81d3,Merge_failed,61bea218edcab7e9ac674665ae95963e61a6363611c9ff124559a90b74351155,Merge_failed,004a1b02b6a9f265631f56eaa30327259118976a1115fb4339dca4898ce374f4,Merge_failed,af9887ee4cdf762736a2d2e16c5b7d8493dfb267232346c62d43b381597da789,Merge_failed,61bea218edcab7e9ac674665ae95963e61a6363611c9ff124559a90b74351155,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,a98c5258471850bd12379b1c4c859ddd2ec9ee9cd0043e2dad7f7bf157af60e7,Merge_failed,6e053d308eddcc9c80dc8a606cc93982ce12b6f3e67e097cc9ff048197d98a23,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb,Merge_failed,1d7ac4d63566b80b7742a564f5225aed9691f5fd31f8a646bd60587ea91379bb 23,refs/remotes/origin/pull/63,7f6410361b640207341ac3b31112ad48aa23d64e,62100f1df607cdade1df3fd04f9daafe61cf1f47,204caf84298cf53c61e45b4c5ac34ac07e901e31,,True,True,True,4,33,97,8,True,9,Tests_passed,d20f8040e6a043326853f6ef8136328d7507f1cb3227af41444cd544b17bf7d5,True,Tests_passed,08dc3b66991e3b9477921a049920006a75c5049117808e931546e7f92c02db88,True,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,77217716027282e8123a61f8a68e13998a075afba453da9a7143ff35e7d77f4f,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,85a0087200faa9873202ec5fc873e16927b27f217b94ab874853706c07e7b9f0,Merge_failed,72c32b188605acfd95c00d9fed7c5d35c9bd603fc8b41cc4c193d6934b9d8279,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,f94d20836b6fcedf7cc393c01d15756f49be87538fc16cc8c0bc935a5c9cbf61,Merge_failed,042b94c11fbc1f6a54cc203502cd0f946d92818efbb348311897ebb9599df1d4,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40,Merge_failed,e0b51b3a3a9e30ec930543e10957101abc20c8ccab27f213a5da25d1b35b7f40 diff --git a/results/reaper/merges_tested/codelibs/elasticsearch-dynarank.csv b/results/reaper/merges_tested/codelibs/elasticsearch-dynarank.csv index c0c39a1518..cca80428d4 100644 --- a/results/reaper/merges_tested/codelibs/elasticsearch-dynarank.csv +++ b/results/reaper/merges_tested/codelibs/elasticsearch-dynarank.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,2abe9cc9725a9ec581c0b25f4b6b8465be6ca2bd,bd20a839f948602a01cb0a05c7f27378cd38720e,f66429f2dd399ad0ea0dc65127321e8da4b2b0ce,,True,False,Tests_passed,013bc7dc36297c07aedfb0a9da4d4995f274e522c71fff4420ef5ad15cef957b,True,5,10,130,2,True,Tests_passed,93fea829e37aa9e397a61e6b342963c471f765dc6e05976753c275cbd5e0e596,True,5,True,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_failed,424b1dca1a519335df172b117f5bdd431b69266efd897390e4f13d5a9dff2480,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,e56692e7f41c8902826df5d4dd5af7549681a5cd0c89bb3a225e0255489b0c21,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3,Tests_passed,603cf518be7ff7e1bd31a5770221e7e33d89ff695cce2c248b61e9200c6a95e3 diff --git a/results/reaper/merges_tested/codelibs/elasticsearch-reindexing.csv b/results/reaper/merges_tested/codelibs/elasticsearch-reindexing.csv index 8b7ff0a039..69d317656e 100644 --- a/results/reaper/merges_tested/codelibs/elasticsearch-reindexing.csv +++ b/results/reaper/merges_tested/codelibs/elasticsearch-reindexing.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5b0dea22a41d4c5684434fd59b989e7aa048b8a7,86d6547781fa856053b7c8778c5b072f3e2d13a6,5c2c406690744fde187e3edafb28a1842fbff021,,True,True,True,6,30,166,2,True,6,Tests_passed,83e00b83a7e4a61b49b8ed9e26e4072bd03640091211bd9e858e15d845c6660f,True,Tests_passed,0aa14c38fce9fa50766a74b92bf454681320be7f16c2c7735cc3eda958eae19a,True,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,8746c9510f02874603b19cdde052ca946afd2efaee06fc26aa79abe2d7d650de,Merge_failed,aadbb16cae6dd64f441a2580ed41d0c68477263f63b525be8f751651302d7dab,Merge_failed,ed1b5561aed4970ce66f58f6f10335d7c6706a9c2f374e070afadc5d6c49526d,Merge_failed,98b596d38c2ed76a19262972f1346f750c3d898d0236d3cda13785537ddd90d6,Merge_failed,aadbb16cae6dd64f441a2580ed41d0c68477263f63b525be8f751651302d7dab,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,e45a7e5ff6072a5204a2b558097cbd78a1b6fc49dbba477f33f275addc745074,Merge_failed,ed1b5561aed4970ce66f58f6f10335d7c6706a9c2f374e070afadc5d6c49526d,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2,Merge_failed,939f9a641bd413a66fcb5ace9171a9da32d1bc557b291aac45613cd6cc1e45f2 3,refs/heads/master,86d6547781fa856053b7c8778c5b072f3e2d13a6,c1654eb26efa5e84e1ee5ba545723b4f8d5c56c9,27a389ca858f7c681aeb7ca647e71b8195143cbf,,True,True,True,5,19,126,5,True,7,Tests_passed,968b77301b0cc1b36d9601389345cea395bb679451638d91006e5bbb14b8f915,True,Tests_passed,c1f00f7a4ee79a1242c4ac77a4a37045d5cc77e65bafc1acad96bb4638064469,True,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,13984e7942474b392a10e7675ee4dabcb552ec531d0320ae8df3ba4e98509792,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Tests_failed,e85f61c02255f31557e6788bb5815e22a018b752400fc412e55e9033cbda71e1,Tests_passed,fcd2e9b58ae4083e64a7c81599cddc2ce84fca95288a58669a69d4bf388496fa,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,12dd06ecd1bdcf8954370347969cb5336b027105c6c06a1ef96e24ba36693f7d,Merge_failed,42b6f03924c41961a3ae6d8d43aecb2b1659539dc5e52f8ec8b500edc92cc49c,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9,Merge_failed,ddf4e20cc49b29c7e7c1b0dac7011511b2312d7bd87ed2841ce3294c291ec9e9 diff --git a/results/reaper/merges_tested/codingpedia/demo-rest-jersey-spring.csv b/results/reaper/merges_tested/codingpedia/demo-rest-jersey-spring.csv index 30f858ccb7..6f7094cf79 100644 --- a/results/reaper/merges_tested/codingpedia/demo-rest-jersey-spring.csv +++ b/results/reaper/merges_tested/codingpedia/demo-rest-jersey-spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,158fc9108d0e0e0b32f9ba636048bc9901ee9e7a,ce83bed1e5da5b643f9967bab4470cfbebbfd897,05f5ee2f97b64ffb774cb8c4e0bc5b4c92374ced,,True,True,Tests_passed,acc2d476fc2ba686990e348d54362cd0bc845263cf2288ad429ad61cc65c0a23,True,15,36,229,2,True,Tests_passed,3539dfced015a9491ab87e00b89700d5a91dd009831772f5952d0b5cebf40daa,True,15,True,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_failed,c5183c9bf9499ee63e00e5a3f9acb628cecf47efe4a2e50ebb7930a3527b45a2,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979,Tests_passed,85a92fde8a40cfea29376322035b87fd8f37b7e49ca56a799dfe7a1a8a2af979 diff --git a/results/reaper/merges_tested/cognifide/sling-dynamic-include.csv b/results/reaper/merges_tested/cognifide/sling-dynamic-include.csv index 2c3a284f43..dc97bb2727 100644 --- a/results/reaper/merges_tested/cognifide/sling-dynamic-include.csv +++ b/results/reaper/merges_tested/cognifide/sling-dynamic-include.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,4ede3baa98d3f20b494ca339783b40903ee9054d,93f68ae098594bf234f2d5249bbf2a4ac2516c04,883b0fe25d50ae895901c4650f23bfe15a78836a,,True,True,Tests_passed,95320c9357acf85011ac02378bd82948e49eee6d42f01917b0b7568d5591b1d3,True,20,34,891,3,True,Tests_passed,53ea631dfcfde5849e453b83a8dc19c3ab5492d3cb7355eb782a5be4f0137e97,True,20,True,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_timedout,,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90,Merge_failed,89dd85c78aa6ff85905b12103079dfb16f909cf28f51c3f0251bd8a019449f90 diff --git a/results/reaper/merges_tested/cognitect-labs/transducers-java.csv b/results/reaper/merges_tested/cognitect-labs/transducers-java.csv index 3cf1a91694..4b8082ee54 100644 --- a/results/reaper/merges_tested/cognitect-labs/transducers-java.csv +++ b/results/reaper/merges_tested/cognitect-labs/transducers-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/java8,b13061ed151598fd886572abbcf5576d8f701d44,37b7aace2623152cab33db7390d2546ca8901436,a1897ce7865dcc6ffeea78e1c3bfed26f713bcc7,,True,True,Tests_passed,3955c23c9230ace087f77163a8f346abe008dfffc19ae9cfbff967f519d547e9,True,18,17,1859,3,True,Tests_passed,4abb9548c02cfe5493ca83356fe2614e5e8b555a3afd8d0de166dc3c8edbdd30,True,18,True,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391,Merge_failed,88432ef02d60765c167cfda5313e5683892543a906a55f8d6ff8a0ad2c417391 diff --git a/results/reaper/merges_tested/cognitect/transit-java.csv b/results/reaper/merges_tested/cognitect/transit-java.csv index edfd7af931..c64a91be77 100644 --- a/results/reaper/merges_tested/cognitect/transit-java.csv +++ b/results/reaper/merges_tested/cognitect/transit-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,641ef0f68dcd139f4bdbb55b8618f6f6d26a0257,f4146b0a0d72a3b5bb2a0363a88b670428da2241,49f9534927b70ce5882b160d216f49a951753b81,,True,True,True,18,64,429,3,True,18,Tests_passed,76823149f28ada25ff05f29753e70d69a36f35131754456f64575bc992bae96f,True,Tests_passed,2aa09c053c09ef2ad21d8c23667d174d13d9343d850f201bbeb27e1644d5837d,True,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_failed,9c7bed53f5dc935eb55b1780445cacec14f2a215b4808316b02fbc88ba3258c3,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,c1104bc64c994876a98db829d124b59e9a81724a9595d803e90aa0c78d3d0324,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d,Tests_passed,41e8de2d724dc22973145ad5e563f64ddb560213a1014578ca0ae5f0be7ad80d diff --git a/results/reaper/merges_tested/comatoes/ftl-profile-editor.csv b/results/reaper/merges_tested/comatoes/ftl-profile-editor.csv index 5a85734b0f..454ed3b79b 100644 --- a/results/reaper/merges_tested/comatoes/ftl-profile-editor.csv +++ b/results/reaper/merges_tested/comatoes/ftl-profile-editor.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,1845e9c1c92e2b70412718e5195dd212ecd4fecd,e87fe65818e726d317ec93c036d48205ed914f09,78e3251c443f913ab978b81ece93cc1a5baecf68,,True,True,True,5,79,569,2,True,5,Tests_passed,79603597fac5720c5097080f02983ecf83b9f72e626a8023b104f4c17ef37889,True,Tests_passed,d4517c9f122990fb4c41419ae39dcd3d606af8ab148e88cbf1ada64a1b54bfb4,True,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_failed,4fac1465b518113edb4d5e1cfd1e913772c9402607c020af1f946bd844eb0319,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_failed,4fac1465b518113edb4d5e1cfd1e913772c9402607c020af1f946bd844eb0319,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648,Tests_passed,7d9a9190f5b147abf0f2d764402c78eba809709a5698c9eb95f47829fd84c648 10,refs/heads/master,e87fe65818e726d317ec93c036d48205ed914f09,025d675787b49b2cdf34ee216d205248afa45f47,0e45353030b440fd729284b632da85770d40b73c,,True,True,True,6,68,825,2,True,6,Tests_passed,02a8c8a970b3f22d0251013d33c814db2609c1b0400441fd3b103054537fa8ec,True,Tests_passed,c98eef96740827a9a7d2b7f4e8807d20866c469c7d6259673fd538466c641c3e,True,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,87c963c092bca9004dd8d18fc1d1f750f9c22b23ae89920e3da6990acdb9da76,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,b4481a94ff8057373f1a2fb4c9a9a479cab1bf5e6dd3be2e0d6eb86668fbfa3d,Merge_failed,bc07f218860e878536a2d6105e7f51c2954c1bc08356b711006b0450a8fdfd94,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,5a3283fd7340229cf3cad070c4b9e80be8e1c73fa28ebf4c81a1d23d0fcc776a,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,05705ed2d6afa16d8cdb77e8eb203131b99edb4dd8c9dd5713cb5dba5a179127,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,267dfb230d660b11b87966c49a8af829e2735473bae2be369996259adfd7cfec,Merge_failed,8ee833c767c668fc82ae6d705656fe9b440c8d2533974b27a7a7bfd8af310d01,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,c7d7869ad984075a83d64962ac279e782cb616e3ae99c47c4d6ad6311ff1ac43,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0,Merge_failed,998bc8f071869b61f8ef7e539f359a54e556829db251758b557abbed6ecd62c0 diff --git a/results/reaper/merges_tested/comcast/jrugged.csv b/results/reaper/merges_tested/comcast/jrugged.csv index 9ef84c4099..a6bbf949e1 100644 --- a/results/reaper/merges_tested/comcast/jrugged.csv +++ b/results/reaper/merges_tested/comcast/jrugged.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,01f77a72310610356739f066c6babf6bf29940db,ad2d4eb4c563ccf75a7790afbbbd7810ff0fa598,6c99d15ec7ecfe7a60fa9dbaf0624b4ee9630bcc,,True,False,True,3,3,5,2,True,3,Tests_passed,fbc679085039c61cef7947bd9a3577d1658c9181d7c6d4c2f1bc7c20d657355e,True,Tests_passed,7d8eef2c5a6a0b42ef7cf6a48c3cf277644647dd15e10d9a7a261b108f5baf72,True,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,b6aa9ae8a5303a16d651c4e67e3366a5a3fae98ac9b0a954bbafdc778a6e0fb7,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Tests_failed,8e3b8f5be243eb74e2b455e6b7b0cb5f57dc53433b114c5ee44eb9129f1b763e,Merge_failed,8f163630f9aa7c2210fd3557a5c68052df1d11a745c9a002d8868889379d44a7,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,26571ae064aa479207050a6a3903d26f2bb5a023fc4ba0082fdff4d1158dec70,Tests_passed,cb277d2033a86681d1a2d0b6937ed9c97a68d8ca6028994e50f1fdd863c35420,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4,Merge_failed,4acf6d5d98ea63b8554578dedf05951253a8f19a8589981f80ebaff0a43e47e4 18,refs/heads/master,f11acdfa7bb956c59d015f08588206bf9dbaef44,8d63723f5e9840d4fed8e77d2939e096a75149a0,a644c8635542c6eb8b2d0d39bb31f9e1cdc5da67,,True,True,True,4,85,608,3,True,4,Tests_passed,77aa2df30169e2cafff723d5b2d921b064eddc12336ea26ac6b53a1b66364975,True,Tests_passed,3aa5fa419d57e6995042ce7d07065b1b4a5da3f8892d7d2f7270a4889247fd34,True,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,0ff2141201cf5bbdfb9a25e46dbb54d4201981d15fbec7c4851a6c2c12d138d9,Tests_failed,a2e72e90a159a955034100fca1e9640cf96ec975ba8d1b590508c801473af755,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,0ff2141201cf5bbdfb9a25e46dbb54d4201981d15fbec7c4851a6c2c12d138d9,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab,Tests_passed,fba0f093c87d2d53c98ca91a2c960f6042ce50dd3a217df76695a95794883dab 42,refs/remotes/origin/pull/60,b543562fa2bcab669d46b7f016fbfa63a3e2f53e,d4613afe47264601e58cb5c05d544e4c5867e4e0,f7dea133a9c7315155f1d3ec94f8f53856be8a87,,True,True,True,3,2,920,2,True,3,Tests_passed,e0da480819df40c9a042a86e5c581a33ae080206933b20919d734642b3fbb225,True,Tests_passed,14c96b80454766496a4b8fc5883c856983ec1592640b1899df975bddf9c78a17,True,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,2f2147698207f1dfee8f62321c185a4c02e2fe8f12affd11d8a35fa9f6ccaf7b,Merge_failed,f5caf32318e1d349696e2f5bdf52bc129dbb4845bf40e0e372b2de5151a7a2dc,Tests_passed,235d79d85d0e23bdb6ebfb50b588c09161fd82a14e0de8a6140b2896aa5baa7a,Tests_failed,2d5d0a90eb3b88fff21593d331ee72c84aa87f9c4926093801daa4ab980d69f9,Merge_failed,f5caf32318e1d349696e2f5bdf52bc129dbb4845bf40e0e372b2de5151a7a2dc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,e54a320fda5e2519998ac12fd128c497b6c76bb44d730ef48b4530df8a81f439,Tests_passed,235d79d85d0e23bdb6ebfb50b588c09161fd82a14e0de8a6140b2896aa5baa7a,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Tests_passed,8723076050c9c0d5987545623d8a81226124c4b15d69dd9dbf54259e41ec9efc,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa,Merge_failed,6d81694d680bffabc7a29874c588841449f02329cc007d6efb4805c1eeaf9baa diff --git a/results/reaper/merges_tested/commons-rdf/commons-rdf.csv b/results/reaper/merges_tested/commons-rdf/commons-rdf.csv index 3b474a3924..c04e10b502 100644 --- a/results/reaper/merges_tested/commons-rdf/commons-rdf.csv +++ b/results/reaper/merges_tested/commons-rdf/commons-rdf.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/old-master-before-asf,29010e4d6ddaf879cba34a09ef8ee544807dda74,3b2bebb64cf90441e45195b0e1149e404721b0a1,4109a6845b76b87be4c4bd31d1b2e163c3deb53f,,True,True,True,32,53,2753,2,True,32,Tests_passed,ab0af18d642914460ffdaa92a083f35d162b065cc76a048eaa9734427cb3518d,True,Tests_passed,0213e949de4a354507edba344ac281ebb3a29bc449d997097c2d1b66ec9e1aa1,True,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,ab0af18d642914460ffdaa92a083f35d162b065cc76a048eaa9734427cb3518d,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Tests_passed,1f1115fd652450e5a84820f91b7ca971370d8ed83d9a980b3d23c5e3cf616ba6,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,ab0af18d642914460ffdaa92a083f35d162b065cc76a048eaa9734427cb3518d,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61,Merge_failed,5d431d27b4774c75ffd4242ceccf9967ad5e601124257efdaccbceb4525cdf61 17,refs/heads/old-master-before-asf,c3d344324564a68fdf91b0f2bca3574c3cf80951,e6b93fc8680e0d2cbba50b83c15767e6a4e64916,f3bf1b79225f243e7ebf6ebd0c8d455cc64aca00,,True,True,True,11,25,488,3,True,11,Tests_passed,1305c48cfffbe5937d39e24e5cdf779fafeb79cbb9980fa54894dc43b21a4a72,True,Tests_passed,7426c88b5b0e09b51b09236e85e057f3660fb247ba15748b8a50539fc0ddc9fb,True,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,1fbd8f8192179fd1292403d9f3d8f997659772b3df12b800e6cc6a40c33177fe,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,b59051ac3312cf15737719f7e02feed92a99a46c9028af4f2a21d78977ecc2fe,Merge_failed,687a1e3c4b7abfda8f8f7c371e88103bdd10981832e30d01b4a4af30e68ada2c,Merge_failed,e68778d651d8efbf5d25ae7bad23145fc0d83df8cb270978306bf039a11c6270,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,0f3e2b2cb7ced4622a748e18881e78a0e0c70a6c71589dbb78d19f12b30f7b4c,Merge_failed,4a4b644b5da003cb748989e4dd2e8b07a74887e2ae543da8674e8a69d1cea41d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Tests_passed,c87be1305244badc570d3504f3f7b6d4d1c032ba2acf2b9646835b0fbf0f5912,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d,Merge_failed,2a42cce0b12266de57b300dbbe35581a993974736d774b9d308620fb133a460d 27,refs/heads/old-master-before-asf,38ed7a436af8a8a0c3faa882066fe076c18bcf50,3712be9b3eec705d0ae4cc1e7fe27fcd79b4c0ad,f9cc0cc0ed7b8a23f46fdba49ed50cb839b6e8b5,,True,True,True,11,30,326,9,True,11,Tests_passed,7f3d6682dff05724cc89015bf3f23fddf04a99a241d9275a3a6a6fd7ea5359b6,True,Tests_passed,59f246f4b6cd42b3d76bb2d1f11f49361c7e0f52da8e3972b5f3b4896b554c78,True,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,42270310e9ce1ee59f4b269c4f01b4bf0d4e182e65101374955755a76fb9e09b,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,1089e1e44de00778b49de3661b90e27588679019577d2f34459a6284b6392559,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,c3713013dac3e7fa5ae00d5bc61b70385769152ab377103dea3cf90c059bc20b,Merge_failed,0658e504d95f807257d52bea3fc2a84de7fd4e1fd7c84dc8cb3790012ed74a8f,Merge_failed,317cb9882f6987a267f4076e59a9db2cd43db679df1354632ff76bdea4c925ff,Merge_failed,25a05c2783b1a7052a09a3af037c4ddf9f944423f1a8a8d75ad7bb97881e0fb1,Merge_failed,0658e504d95f807257d52bea3fc2a84de7fd4e1fd7c84dc8cb3790012ed74a8f,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,1089e1e44de00778b49de3661b90e27588679019577d2f34459a6284b6392559,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,57aafd89745ffe611a60c820e6fdec98c51cde7a39779d0e613c879a1bba0e50,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,8f59962ec846178495d345910052bbf0f4c9b4bb9289ee772dcc86bde0f45115,Merge_failed,317cb9882f6987a267f4076e59a9db2cd43db679df1354632ff76bdea4c925ff,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,42270310e9ce1ee59f4b269c4f01b4bf0d4e182e65101374955755a76fb9e09b,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb,Merge_failed,0f513a9e9a00b03aa97e48403c6e142068cff206ba5de61abea473d5dcc3c5bb diff --git a/results/reaper/merges_tested/connorlinfoot/cratesplus.csv b/results/reaper/merges_tested/connorlinfoot/cratesplus.csv index 6b7c10693b..38afdbc65b 100644 --- a/results/reaper/merges_tested/connorlinfoot/cratesplus.csv +++ b/results/reaper/merges_tested/connorlinfoot/cratesplus.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,bc3274f6d0f3b06e70c50127666937fb75b179ae,d7fe737bb391bcdbf0c751cd2502e600fbd64665,afb0d0cb08ed065f89eb302cf00250c30c4aa9c9,,True,True,True,59,324,4066,2,True,59,Tests_passed,e028ee105adf8b84118cedc88ada70e1fc61f5f784e98e2757de3fe4bb992e2e,True,Tests_passed,148abb23eb48c0181962462b817a168e07e33b0221ba36af569be127a36347b3,True,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,b69c69eaf2c90d4ca2baa0ffa0c503358c05cba06086de802b81360b2e130916,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,b69c69eaf2c90d4ca2baa0ffa0c503358c05cba06086de802b81360b2e130916,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b,Tests_passed,cb08d6a935df511184167f7bd8d28e5573b304a8610233b0638a48f4c2cf305b 9,refs/heads/master,50dfeb59338bf094290dbcd1bbea1112ec966900,3e1450cf764cf02d72f03b9490f9b10fa0ae7a8b,6e15f7b0367e0ae03b9e5727d2812247d8b81c4a,,True,True,True,19,75,374,3,True,19,Tests_passed,cb4d31e39601ab5685a8f26dd8fb87628d4f9e8865210400252c74471cdb4227,True,Tests_passed,6e6ddcfb87b6fed2d8f4681bfe9cd527c094efb7f1dc6abda6e33f308a84c912,True,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,dc6ebc980ffd787da495df7720bd1fd30f2d718bb32975e704621ed7d558840b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,3a76cd21838be6aa724d28ce14503b39445d8a0542dc46bb53b917fe1ff9710b,Merge_failed,6cd2d3ba4d34ec3f00c495f4d946301e9e8245ae1b4c2e8a3a9f8e98aefa311b,Merge_failed,389b63b0afe6441013a6eeb71ad5da1351f9268217aec0fa47387f9bca36992d,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,396831111bf429561c7bab45482d28cb88e77058f7da13665f5469e49793407d,Merge_failed,39753fde25f9bb3fc3a3335bbbc999e034851515f545b9599b8626a79c3425e5,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f,Merge_failed,83cca6504031fe9510c59bd626afb97d2e3eb851769f42bad259ccfd541bb76f diff --git a/results/reaper/merges_tested/conveyal/osm-lib.csv b/results/reaper/merges_tested/conveyal/osm-lib.csv index 9f24b8b617..b6fff49519 100644 --- a/results/reaper/merges_tested/conveyal/osm-lib.csv +++ b/results/reaper/merges_tested/conveyal/osm-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,8796ed51f2727a30b1ccff02c8aeaa6331ec318c,c8179fedabe4dc5feea6a566503f3cccda960c4c,9a5ec234ce7670842376e81bca25dd7cdabb9d34,,True,True,True,20,66,851,2,True,20,Tests_passed,1458569d8764a7e02a17b4d489479d50594ccaef09beb9f574335db3b54f1afe,True,Tests_passed,def300512b18c9960f9b8d8f3bd7d2661dfbfc43c0406b648973b6a989483aa2,True,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_failed,6fa0a2f9780edd204386344f127aae185ef737869bc587285d18ab64ec494b2d,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,a5d5f91a209c3659d250b0b80bbf8cbce1d635a78d864208473665c04c180c87,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3,Tests_passed,6c924996a85709ecb039ad02f451197f664ecf90c6324abee96be9e61edb26d3 diff --git a/results/reaper/merges_tested/corentin59/artnetstack.csv b/results/reaper/merges_tested/corentin59/artnetstack.csv index f8639293c3..09349e42cc 100644 --- a/results/reaper/merges_tested/corentin59/artnetstack.csv +++ b/results/reaper/merges_tested/corentin59/artnetstack.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,4c05f24b011bfa8d8bd18c6cad1d179708564fd3,d498a98bd7b4d4d96c03aaf6680e030a2dd52421,cda7b85e6e79a675b6687c4953e4f5928603e5a3,,True,,Tests_passed,bec0187f96d2e95f9668ff62a44341afa224be4baed4e174574ae132c4e41b63,True,18,115,,2,True,Tests_passed,8581d1091849bb3f11043edd95aa0d68665614a554e8ea613d4fb54dd9f95d66,True,18,True,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,5078138233e94f23de7a8de1b16acd0890bae668efd901138d88dc70249147a3,Merge_failed,fdd6aaa9b567e372f42d1e0c8b43e30e84d71fc8ecc11277134a274d8585459c,Tests_passed,ad220dfa19ffa97a450682861e2e81b90d09ae356a33b80f0130ca767eaf3cec,Tests_failed,8d0cab360479525bf167795d567d2c031947262ae47d696b83302083caa469ac,Merge_failed,fdd6aaa9b567e372f42d1e0c8b43e30e84d71fc8ecc11277134a274d8585459c,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,62e4301d86e8219959758545bfb485caa9f90c2c0b4865a16d0e38223e3cb5da,Tests_passed,ad220dfa19ffa97a450682861e2e81b90d09ae356a33b80f0130ca767eaf3cec,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,624258d395a24d4a637bc67760aae4ed36985cd2bd1068ae9f45221bd019d415,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93,Merge_failed,c26cbb9205dc24063f7ce80453828d207e23c98107ceb874b46db7e1821b8b93 4,refs/heads/master,f470681d57c8830ab18bf74db45fc67e8baecaf8,d1d1e64965cb8027fb1819b4e8657ba3f37e49c0,d10b58945b2d4ae6a7e82a83269a919bcf207f90,,True,True,Tests_passed,28b20d05bc3cb4d4de0fb2257adee1e81d3e6ee164542fc82ab54e8767ae96f6,True,20,272,1142.0,2,True,Tests_passed,a1e0dc9acf01b695c5708a7f79fb83f12b10c6140df734c66c9924bc1d1e39e3,True,20,True,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,719b241a1ffb75b4b03fed8254e81f1e14a229a4241a9b7c465905cd386be384,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Tests_failed,f758074615116886006b0ddf5897af8be30a193f592308b2f4e8b5ca52ce7aea,Tests_passed,084dd5d73ca5f16bfc15d9f1bf2f0adc404eb487f6ced7cd0e019d1bd3b8389a,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,017ba4f154ef572529d41d5b75adde586ec817436c89f81a270cf6862aa8aba4,Tests_failed,b8d053ace26c04fd0fa36ab71fd553d0f23b84caf17f1d50b95c911af0c70568,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,4da13589b04fe797481ea5ab78465b089f562d74ad701eeab0c01abc393db9d8,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07,Merge_failed,ccbdb92a14dc27c05e104057ee31a6ae8479e3a41d92743eae600a9a2bc99f07 diff --git a/results/reaper/merges_tested/corfudb/corfudb.csv b/results/reaper/merges_tested/corfudb/corfudb.csv index 01bc29bff3..43dab2a65c 100644 --- a/results/reaper/merges_tested/corfudb/corfudb.csv +++ b/results/reaper/merges_tested/corfudb/corfudb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 398,refs/heads/master,233e1eb18c40db72da1f101cea0b4935f8c6c880,a9e1a15d2d269f429b31d8ac197850e0321c4652,c18f2955cf32966675b363096e39f18027c51a4f,,True,True,Tests_passed,d32babc3b8fd3692ba30a7c61d343a42143192f774d57fdc34a66b8aff34d17c,True,27,79,884,2,True,Tests_passed,d9b2dc09d92de5db60297c5d088220370fc8132dbc4de8973016030ba4e01a88,True,27,True,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,04550d800ccc1af2167d29f9747451fac5ad3271f00ab3242fe0d8984925d712,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Merge_failed,e492f46c54bf3ed3421d22a9152a4402792da65cc8308746d289913810be6ea5,Tests_passed,c8784e6fd1a1b30f897ee5f1b3848cb6c764b421635d5aa7f55840e51e581a55,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,0fda0b6a9c6923b0f0c7574c0389a59d5655c358440555549cd3a8099f764abb,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464,Merge_failed,3347c300c47ce7ad929ebf3cd20103263a237794003bb58808e52660f826e464 455,refs/heads/master,2463c3fc8f627aca24297a819fe158332733834a,89818e738f6884adc7f855022327e29a7087769d,3766c6c4793a3f1978284963cda11a0ca55b3521,,True,True,Tests_passed,3adb8ffe8f46d99e317807107603f6a1e87f569ee5b9bc782975f9624856e18c,True,2,7,21,2,True,Tests_passed,884de4926aac4cb5917e9913270b7ee2f954d9eded0b034a3809137133037740,True,2,True,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78,Tests_passed,8528199bf58cab5c497c0435b0cfab08172713866644848b3f2168ccfccd2b78 479,refs/heads/master,35572bc9c913d566b6748b9829a3a6e54237c1c5,fdf97dd73069b84fc6e47bcb1c44b44afbc0adb2,7ade8588dfcb25c1b5521da236af1fb88544b5b0,,True,True,Tests_passed,529772ecae46d7b7fd59e6f6b1eeae67165acd2eb2184aa7c06a87ad2b7b65dc,True,28,97,1000,2,True,Tests_passed,15fa725613c562664ea1152214266a98a6408e0937227eb99c6642631ef2d54c,True,28,True,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_failed,b8cfbf02d41b3e3a5f373bc10454830d2543d1c409b051109902f2a0f6c2c99f,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214,Tests_passed,3296bf49b27250f761ff5515ae43129ed3c23e10d15f6c2e64cad25691bd9214 diff --git a/results/reaper/merges_tested/couchbase/couchbasemock.csv b/results/reaper/merges_tested/couchbase/couchbasemock.csv index e1b817ea46..a1f8482b4d 100644 --- a/results/reaper/merges_tested/couchbase/couchbasemock.csv +++ b/results/reaper/merges_tested/couchbase/couchbasemock.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/34,3d1fb1a06b418be9e80484d252cb722d0d285bbd,ccefd6269985a9732f7f38345b7566fd5a486812,0324c7ab70c7ec2e655b35beda22a73940a4379d,,True,True,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,True,8,7,17,3,True,Tests_passed,a5d6eeec2e2d55d22da79bb32fe886e34e124223a1ce8b66e9ad0ed4e8eb7cf9,True,8,True,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,5c238f19efadf8fcf9612c5e27b6ed10116dce5fdc7964135cb6ac1d75f7c332,Tests_failed,542757a60580bda20ddfa14da0018d8130229bac820a7531e678bb5510e1fb7e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,5c238f19efadf8fcf9612c5e27b6ed10116dce5fdc7964135cb6ac1d75f7c332,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e,Tests_passed,be73c1548afb5975f1487c1922a37c62beda59bbf58e64bdadfd57d021380e5e 5,refs/remotes/origin/pull/34,8a2592ff627f404c008bc22f5a62773f787b288a,2585b651a9a91599b3e264ed630242e734bce980,b49b3867e48f677ac07e870e440f1e5c3793cd5f,,True,True,Tests_passed,38b4ed1436a351259c499525cc437d9d2cd6e677bb774b7b4e4f41f2dca2e3ff,True,9,20,133,12,True,Tests_passed,df0a161946aabca831ea842e5365e622b1ec60c703e209c03dccfbb59d215c66,True,12,True,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,697aad2461df12c1c41dabea8cb0eecc9e8624b23ab33a925e15b162da87fc15,Merge_failed,86e4fd59162620bdb2b4945091e805aae036d714d1ae55bef1c0d585ca983293,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,93ad73906967f62d1d5d2171e124a2feac821c4222471fa9755a8c41ee554065,Merge_failed,b39f9564d8e8199c0cc74ecdccea3b1f29b650a1566007c32282603aee575997,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329,Merge_failed,5d453f7be80a1c519b9dbf4330ce532527d1e73db342a2cb6540c9cf96440329 diff --git a/results/reaper/merges_tested/coutume/imageonmap.csv b/results/reaper/merges_tested/coutume/imageonmap.csv index 81e3b49820..788b3c8e6f 100644 --- a/results/reaper/merges_tested/coutume/imageonmap.csv +++ b/results/reaper/merges_tested/coutume/imageonmap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/indev,094905324ef45772cf98c7887958202acf69e581,ac51032e1a0426cc4e40b525433cca4e270a9273,a45638b86c302cc93967a737e87b6e2c8412c186,,True,True,True,15,38,776.0,2,True,15,Tests_passed,27dd1f4dc5b5b025019eaddfbbd70028792f943ddbb8505ef61e1d54113d26aa,True,Tests_passed,776e10b34c839faf6745b02462fa65f4a39ee8c91093f0d199c0d070f4663f5a,True,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,e842c2919add05a9c80a0d08383c90a0b78c1f59ecba222f8b87a7e5d003ff5e,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_failed,eeb00898c31f0f28a25a859a3827b5edd9c54f0bb54b2b4398958c2c9f550873,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5,Tests_passed,2559ca0ea3a84bf1f3e225cb70c15f8eabce9de9f5861c3e1d2b08c476713cd5 10,refs/heads/indev,20d2a60d290241fc58462ebe8d9b886ff0ac93cb,e0dc356f36cbbf679e07f1de439ddf26d7a363fe,fdcb028b209fb15f56cef22b81b64bffaf183472,,True,True,True,8,15,645.0,2,True,8,Tests_passed,cf4b9d0d3f4c5fd925533b67ed5288f9a8f3ebf0ab80d53ba0c2d718c3a619cc,True,Tests_passed,0c0c78629e56752a86c531962a5a970c7cbae4eef2fc471c83a51477503dd034,True,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_failed,e695e8984c4e75df390ee0da1e93bcb0a89e784c9900f361da3814f2f3632fb1,Tests_failed,5270fe41ff544cf6be0652d68e4ac70909f4023d2e3605a82f3d5e818736d2a9,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_failed,e695e8984c4e75df390ee0da1e93bcb0a89e784c9900f361da3814f2f3632fb1,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f,Tests_passed,fae4a43a3f7a5f30975a4402e374c2d5e1879316e94de6356535b7c7234b375f 58,refs/heads/indev,3ace5f5edf302738f9c7d705ce9c81f718c800af,ce61923268b7a5ebab17d98a6bdbf6ffffbf0aba,a5d019373601989c9a028df7d1d803257ae527c3,,True,True,True,65,206,6824.0,4,True,65,Tests_passed,0211f2b9f3cd82c72a429148cd4359a1948a8d368fa3cd7781a2bb93bc6b0850,True,Tests_passed,6c60143b6060fba9991739474ab7de40bc8c7b4998d4334e7b70bee1b41a56e3,True,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,2da2915a600393daa0136dc674535b7315c667a6ca233a89713e95c2147d14b0,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,2ce7da23fb2b7facfaea32ff744a9c3aabe4443f744335a22cb946f00fc70002,Merge_failed,49c1a49881325a4933b8e87def48272bc7185000abfa4c09b26ddf78c4cafdfb,Merge_failed,d7748b7596054ccaef4bdf99a17c8425ebb8d103c412ad1ac8bf28afdb588ab6,Merge_failed,aa45d55e3f47a96d80d7b53e053603f4c0c298ad901354b71c4c1395bfe60028,Merge_failed,49c1a49881325a4933b8e87def48272bc7185000abfa4c09b26ddf78c4cafdfb,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,2da2915a600393daa0136dc674535b7315c667a6ca233a89713e95c2147d14b0,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,ef6867007135e9ca422bfab3f5dffcdeb1f4b09ace10774ae40be62aa017edad,Merge_failed,d7748b7596054ccaef4bdf99a17c8425ebb8d103c412ad1ac8bf28afdb588ab6,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26,Merge_failed,c4d7f7efe720f8f00404e80ad848040683bad6fd7ab14e23f058f54564492a26 diff --git a/results/reaper/merges_tested/coverity/coverity-security-library.csv b/results/reaper/merges_tested/coverity/coverity-security-library.csv index 38d48eefad..a82792370d 100644 --- a/results/reaper/merges_tested/coverity/coverity-security-library.csv +++ b/results/reaper/merges_tested/coverity/coverity-security-library.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/develop,87f5b259742c8db2aec081be12efedf6c3b76577,06b372aebec440bc64141af4a83ad077b8b4ba45,8656ab536af9a8547ed58a3178170bf3f482813f,,True,True,True,30,48,2981,2,True,30,Tests_passed,e98057c6694e44a17de3da44397ae4eb571296c7882d93ff6e393118019cf105,True,Tests_passed,5b84b4fbfb4e112f3ffebd65df62dbc17215bad3b7df9f061e15fbfbf143b11a,True,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,8e1c351e5cda54b4004c136f0aefe1f3916a3184b16f780d293c0b0fe1d66b94,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,afd78f8dbd8e4fe93f405f4809e31390e62d7fa1020c5893dfeea7a329fb919e,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334,Tests_passed,ffd204fa39482b535f56cbdd1e1c035402b1d5de1b6e6866b07bcf2ff307e334 diff --git a/results/reaper/merges_tested/cowtowncoder/java-classmate.csv b/results/reaper/merges_tested/cowtowncoder/java-classmate.csv index 6da85ebe49..665d97f7e7 100644 --- a/results/reaper/merges_tested/cowtowncoder/java-classmate.csv +++ b/results/reaper/merges_tested/cowtowncoder/java-classmate.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,6b9713af4e397bea11a445ee7ece81b8bc00f4bb,41e2e3f410c7fa9a0d3524766afde09a0634da50,80c4619726409b85810c4cbbb82344b5211944d7,,True,True,True,9,25,79,2,True,9,Tests_passed,282870724817032d7bf04fb78c33b64ecfd59bd1b4c278a0f882079863d945f7,True,Tests_passed,a098e050a85b2ce66541dc2a13e5c7769fadf7245d4785ac48c8d5f2e1aad541,True,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,8089f42c2d2bfd1e3302d349e3a6af6de71529fcff08b7ef138709847bfe270d,Tests_failed,5e797b625098bdc0334bd795c1adadf7481997d32e9580426fb25f640b75cc93,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,8089f42c2d2bfd1e3302d349e3a6af6de71529fcff08b7ef138709847bfe270d,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3,Tests_passed,52213b8033893c339d0430ef593758bd72815136b998191070106eb560de20f3 13,refs/heads/master,b6f993cddcb4cac4f1b8aa250f3e020e9727aaea,8aebf88f4c8bb9773a3fbdf1ca906bc83caf01b4,6f670f7db7b053c4690402fbfa60ace167b9e0d9,,True,True,True,13,21,68,2,True,13,Tests_passed,13426d420a43d9ae3c0924aeb207bd43e3993b9d4f9deb9d081420c8f1a72a21,True,Tests_passed,d9a6105f540e37aa74b7a1708f6432accc8f3f08835fc490da4afacf4e25421d,True,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_failed,808a35339aa2bb1e6963bb8c870ffd7c9db3d46f9d20c62d521253511c8fb3e9,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,32912562c9add455055a873b2afffad1f180ca74c0c3744db2316eb1cf41c8ae,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,008060ac18052239fa781b56f42b742e4b44146d2bcd18dec1c74320febd710e,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5,Tests_passed,902118eeda9080b687abfa1b6dbdfbece87d4d750d06af83d5218c2a96c480f5 diff --git a/results/reaper/merges_tested/cowtowncoder/java-merge-sort.csv b/results/reaper/merges_tested/cowtowncoder/java-merge-sort.csv index e1d6e28b9c..b1d8e8cce8 100644 --- a/results/reaper/merges_tested/cowtowncoder/java-merge-sort.csv +++ b/results/reaper/merges_tested/cowtowncoder/java-merge-sort.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,259857f3675ea88d0f2d6361904e085ed91dafe7,37c22d00607f5618cab9a81eeb00dad848e041c2,af0c5ae57383b584ca1eca7cd5bcab218ca3046d,,True,True,Tests_passed,360643ef385c697e8e3adaeeea9449caecc7c3d799cb76850143b9d23d57398f,True,4,13,131,2,True,Tests_passed,19fad57bd5b751c6b2304ab92cb545eb13a5a2b98993b055dc04b9d9fa623537,True,4,True,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,76bd571361992cc33259e32b3ff7f5bd2fa7ecffff6edb7c3b891a7359dc6d49,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,fc928bb26193d9cdbebaa9169ed828062970280499a7b5b5297e23ecdfbd299e,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71,Tests_passed,e2ce9d1f5cb44cd33d734013336b8079092923cdc54971beb48f195167795d71 diff --git a/results/reaper/merges_tested/cowtowncoder/java-uuid-generator.csv b/results/reaper/merges_tested/cowtowncoder/java-uuid-generator.csv index 35dd1bb3e0..0622bf3ded 100644 --- a/results/reaper/merges_tested/cowtowncoder/java-uuid-generator.csv +++ b/results/reaper/merges_tested/cowtowncoder/java-uuid-generator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,47f4b70d8392a721d18827121cde1be0179484c9,2a9673cf1473ed5f0abf901df6ab79687bb62029,54db1d59909096e3d6c843f2d5338b18a93f6df1,,True,True,Tests_passed,44c7ba77106e5af0b0728e09032143b11c7b810bc83a3567838b528e0ea4179e,True,9,15,103,2,True,Tests_passed,78de4abb536eb2e184a2147ca779b6cc7b102fd3977af97be2ed570e3ad57d23,True,9,True,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,a9c1fda0cbe0a3089ec87b69fe3e7034698bf9b494868786bc73bfa4bfab11db,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,3539d37f7c39af08d6aa92ee96bfe369c1efc3a38fb6113f04a08b0e4692c210,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8,Tests_passed,e10f7412c2bebf77a21217fa4a6c87a1b3bbb782b7bb3cf8566a997df3e918e8 15,refs/remotes/origin/pull/58,34ea9b33399f186391b0bfa1534c86a03b9d192a,3ef02dc8ee07859861f5fd73f28912e600c118ee,3d604642fdfc43763f18d805ed474b697483cca6,,True,True,Tests_passed,2942c980314fc487e7ccb25ec1c26de2d8115bfeb143a4e6bc74b1d8a27723e7,True,8,21,143,2,True,Tests_passed,ce17c516360aa49452b0ce953eb45b4e82c85578c8544b278b0828d13d6bc302,True,8,True,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,8e7d7bfa4490c397a6500c67fac4dffd1b19d8113e971f3311c9ecac1c8544d6,Merge_failed,5a3ba75f345bcd0ca9dd6b96e1a370a4f4251f5419c38b644f0762a5170810d7,Merge_failed,863d451334684e1d216db00e050063e709276e0ae7b00725a1bde6849c346c09,Tests_failed,c975d4fb6b1b55fd2ce7be8f0129e24d4566a8a089326ee5958920188fa03528,Merge_failed,5a3ba75f345bcd0ca9dd6b96e1a370a4f4251f5419c38b644f0762a5170810d7,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,4f53b3564320d28c6e3fd11f2a6379b4477c4f96d3166e1e5ddd13111239ef36,Merge_failed,863d451334684e1d216db00e050063e709276e0ae7b00725a1bde6849c346c09,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15,Merge_failed,3eb52931f365575c96776c8b347a0a19ebc2e2040491e1c6c18aa3fa4f9f1f15 17,refs/remotes/origin/pull/70,48e9a51d19fecb5e51db498c1caa70acc5102efb,556338152c101ae1f6cc0b88297dcb5ffe23d3e8,18b8a5e8a288c87882bd2fb9a4d087a392f9035f,,True,True,Tests_passed,a740b9fd3436b07556e168f6e57efde4008e703bd6a2970b84c639239334efde,True,17,51,182,4,True,Tests_passed,50b90578f7b3f31d9441d3cbe42266d7093e4186c9681e540e5e944ccdd830fd,True,17,True,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,e4f06d46c02fb8a16613a3d92ed2b12206e69b40e5b03029f2a296b0957e82cb,Tests_passed,97cfc44cf8b9e3ec0e8e1519d07da83ec4590fd7f4764febda964c17df7712a2,Merge_failed,7247c6ae2321ab4f9e48ea2d097be22b25332cb98eca2dfec3a5ef101c6e9bfe,Merge_failed,c4a1b34d9ed1d57e95c7cb118e0aa2d29e085600357b0ba71a9cb3d8fd402c14,Tests_passed,97cfc44cf8b9e3ec0e8e1519d07da83ec4590fd7f4764febda964c17df7712a2,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,a608fc1a1e752b2cb70d14ea047269e3fd11496d9e6ac0bd1a75d665dae182d0,Merge_failed,7247c6ae2321ab4f9e48ea2d097be22b25332cb98eca2dfec3a5ef101c6e9bfe,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,5bca0e9a43ff3da876b568879df754abef963dd89b95b40fb35808f3a0160fff,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34,Merge_failed,d6320cfa2612ec151f4db92ebc2ee0d6ee05bb12dfc45303c6f41434db225c34 diff --git a/results/reaper/merges_tested/craigwblake/redline.csv b/results/reaper/merges_tested/craigwblake/redline.csv index cfa4e6a20a..0d9cfb7aa7 100644 --- a/results/reaper/merges_tested/craigwblake/redline.csv +++ b/results/reaper/merges_tested/craigwblake/redline.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,93d8982d66c56a3d198aaf792b4c5737295aedbd,d1720810ea8a53f15e01332d4d8cf31ad46bb381,71e1ca243fa959797728bb09c0abf3c6c2d9a697,,True,True,Tests_passed,d2d8a0203ef4aaa9877fcec35430e310efb7a665f2dee1effe6a7adefdfae625,True,25,124,829,3,True,Tests_passed,9ed3135958ce290c0bbc1910c1f3756206ae48b0787154dd6998e8cfe34c084b,True,25,True,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,7627d34b8ad0e5a3a8cda6409653016e055d00793f9a8332acf2c2ecd1f06509,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Tests_failed,f5932d025d6bbcfd68d6f2e7a138a1c0b425cf878fa51248e14daa2f9610ad04,Merge_failed,c5567b5344d326ead1096e9e00878bbe35fbf16774db07294f156cbc7222e561,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,f1730bda25aa5948d498c8a4630e4fcc08ba9575901918747a713db7ff032455,Tests_passed,4f719be244ba573bd76b27c80f03b5e0fad2d3d8a58ed8313fa06a33bc6a21cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,ca395715caaa49fbab32623a7d49e10675dd29a69599e7c646eec16512879d16,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf,Merge_failed,e8c843873108ace0ba5820bc7ed438a897895ac30182f7863ed1730743e7e4cf 30,refs/heads/master,993ab936856160b99794328a5b05243bf03fccbd,e751112e9417df5a2e187d59e44ef088ca45e8b4,22eb21c34edc63f037d70e908f0b630301587bcb,,True,True,Tests_passed,ca24ae175bd85ae6336e6397ae7337c40bcb7e8b15071a380eb9c578254c433c,True,15,83,655,3,True,Tests_passed,496481dc54adb23b6e92ba61a6fd6e50160d1c9c8b00ad0c7cf3a6d20ceaa8fc,True,15,True,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,351dbba28dfec721d7a17c3195606399052a09ebc46f1e108520cb260def5b01,Tests_failed,58abdee0f3e49a2224ee24b58a4b188f89acb05296afa2a80dc878ef93418109,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,351dbba28dfec721d7a17c3195606399052a09ebc46f1e108520cb260def5b01,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73,Tests_passed,eab9d44f46c4be0028c15a9515b102e782c54910e2a1b5b9710c09f66fde1e73 35,refs/heads/master,244c28ec8ed99f02ecd9132e5e8b93634e74d68d,3cc029d6a8440a80fb78ad66ca1f595bd74d49d4,aafc9b1b1e9f273f77fcbcc3db10af2ebb0f0571,,True,True,Tests_passed,ca92b305fb66a39bc0b75b7156bb535930aeada34f747fbaa1b9589972793af3,True,6,18,98,2,True,Tests_passed,e5b0bba3a3ce596b7598ed0e6c4b18329d6081ec693e40bf5e9ff420f2d0cd34,True,6,True,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,ed1535c2a70e0e7a2baa09fb89048ea2a8824740fbec1e6d8221df64b66b98a1,Tests_failed,174a2b929f49b5d6eb8c7130014c263b51622e7159534312adbf90efe402647a,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,ed1535c2a70e0e7a2baa09fb89048ea2a8824740fbec1e6d8221df64b66b98a1,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd,Tests_passed,a1720b206450111ca4b8c8475c59b80bdb5f181fe19b36a8af908f7b1012d5fd diff --git a/results/reaper/merges_tested/creswick/cjwizard.csv b/results/reaper/merges_tested/creswick/cjwizard.csv index 6de2543dcb..9e6572047b 100644 --- a/results/reaper/merges_tested/creswick/cjwizard.csv +++ b/results/reaper/merges_tested/creswick/cjwizard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,341c6c5f8dd3b1d0daafcc4bde69ad53ac42a27b,ac9264381cc5aebce6d533d8e74376010c7b905f,682ae13dd2157b32d109359fc996387b84296580,,True,True,True,8,14,68,2,True,8,Tests_passed,500d13b7b80101655175a928e24695c0f31be138f841b4de49abba269dc38904,True,Tests_passed,689d46ddcf2bdfa930e6300295ba90d03251c64362bc8b5ce0a8824da79af9ab,True,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,cd45f567d70d20010dc1d49d108579f90b6fb34d0bd1df297dc423ee21f45c13,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de,Tests_passed,294c0bbc421146620d69843d3b2de6cbf2340315dca37d03f38b9f961cdba9de diff --git a/results/reaper/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv b/results/reaper/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv index 073bae6a7c..9c54c69175 100644 --- a/results/reaper/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv +++ b/results/reaper/merges_tested/cribbstechnologies/java-mandrill-wrapper.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,0cf79745f1072e02d4b78a76f3dd4a9d1aa1fe64,a63955a74321ab748247b5bd60b0766aa7c5ec2c,4da8cd42c2f2c9a7191d65645100747c130c98a3,,True,True,Tests_passed,c6365930a58e59b9ecff062edbcaf498004dbd587fd97476b39d799033fc5e17,True,34,86,3348,3,True,Tests_passed,9c7627e1dd0f82f779c9e09a47da7d018a3cbe4ac985e3bacc276f309a751384,True,34,True,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,1dfb7f8c6110e9810b7a834625d42c9a4e912791e6018325faf3779a0393913e,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,2411f3d3f7e375f52d6ebcd7925911366876878c727091151bfa14ad2fcfdfc7,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,4acbd576b3d223a713bdf9c21dbf22e373d91220bedc7668e6a2c13fe9d75540,Merge_failed,e70f02aaa82047a30a48ed3be22b1b0e7aa04844bc333a7fb78b75d2c7239143,Merge_failed,217c0b61dd642750ad71c0ed676a0f456bccab394a446f68d4df46f89a0338b1,Merge_failed,be4021fd1d0f2ecd886779570553d49c6f51168190305bde05418ef2a303bde5,Merge_failed,e70f02aaa82047a30a48ed3be22b1b0e7aa04844bc333a7fb78b75d2c7239143,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,2411f3d3f7e375f52d6ebcd7925911366876878c727091151bfa14ad2fcfdfc7,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,308012c58bc0375b5dbf9d07bdc75e314af4be36a078cbe320a12ce3e8b3f6a9,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,e3c10d6f31fdd2d83f998c3a1fb1252b23627f38999f4087477f716c369135bf,Merge_failed,217c0b61dd642750ad71c0ed676a0f456bccab394a446f68d4df46f89a0338b1,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,1dfb7f8c6110e9810b7a834625d42c9a4e912791e6018325faf3779a0393913e,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002,Merge_failed,72d970ea4de742179b766482464409136d2c658533e83117ccc1a5a28070e002 15,refs/heads/master,0b7df0edc68a40c8d79c903cb86e247f7ec190b4,56a8b97dd8be278ed2636077bc5f1b929d0229b7,3887e2c173f89684b82ab5002499c435ebf3a60f,,True,True,Tests_passed,086872243a2eef8176f0ffb013f0f4aed0ba3e060a3a6dce8b9e7c7a098fee47,True,15,33,197,2,True,Tests_passed,fa4dce8419a625b5abb82d41d22a3f2fdcd3bb917dcdd00a9fcc11ce5eacc377,True,15,True,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,09c3bb6eafccd803ab7252a8d6aba33f7957080130a576722e74321ffc116f14,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,3e64f4da593c58b85fb845b645717f38ec5684ebd033af1b895d494184967113,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2,Tests_passed,956c5d2ef46a725c0a8391bf7a98ae6702c03bd13e044ad8badc23dd2f6a14a2 diff --git a/results/reaper/merges_tested/cternes/openkeepass.csv b/results/reaper/merges_tested/cternes/openkeepass.csv index 4870993e6f..403e80d161 100644 --- a/results/reaper/merges_tested/cternes/openkeepass.csv +++ b/results/reaper/merges_tested/cternes/openkeepass.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,3dc44ae983c2022ca0544609982fcac1ec1bff0c,49246bc507a0deb31455f5d4c7cc546ae499762c,8e941ebfb37052ae520280bf59f2bda5345fb1a8,,True,True,True,87,208,8979,30,True,88,Tests_passed,6c07885bef7c255bd6436bffe865b56d94e687fc1db6989938b8c705e8cea00a,True,Tests_passed,1fc7776b5a6fcad1f8d1c10a2c307066152a77431574721f7d904811ce80061c,True,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,4501a27626d86dd6f20a934414ea9029c6ff0e889b905cfde2ed18c7b4e93d22,Merge_failed,767ddecacfcb9086c4c739ef8f8a5934fac0c258b348730c337ad9a472483987,Merge_failed,acab791f581413ff0c5c0712e1218a6325b3cf9ac5e910ebd1795ddb14f989b8,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,411001be634e9a4b1797afeb07421a55ef692ae499e3382586f42174e0904a1b,Merge_failed,f426819b229aac3f8507881e7e251d2ebd692b039d3e052085dd6e6be4b7cfce,Merge_failed,99e589cf9f425868e9765109ad3d33d2574c9dd590e71245b9959678cabaf231,Merge_failed,5e1e0621487fc287b4829767e365aea49405aa6bf4e6c0729ddbdf45d600c17d,Merge_failed,056bc28afd412ffe9b7bed975260513c8b4a387987b8cf6d9c0759ce84d7523b,Merge_failed,99e589cf9f425868e9765109ad3d33d2574c9dd590e71245b9959678cabaf231,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,767ddecacfcb9086c4c739ef8f8a5934fac0c258b348730c337ad9a472483987,Merge_failed,acab791f581413ff0c5c0712e1218a6325b3cf9ac5e910ebd1795ddb14f989b8,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,d11497842d48639ed01cc179d3c3b5aabbd631c778098aecab3a920e5c9b5826,Merge_failed,411001be634e9a4b1797afeb07421a55ef692ae499e3382586f42174e0904a1b,Merge_failed,be4f600c8659b9b33c8b496b897980a01e7c7420e6b49e537f3b648950456080,Merge_failed,874f6d263e7bd3eb36cb7ee4e81b7cee58fb1979acef28a4542e75bbf6865734,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,4501a27626d86dd6f20a934414ea9029c6ff0e889b905cfde2ed18c7b4e93d22,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a,Merge_failed,ca07c06751b557301c3b78f4965346bc40c651c7ba14121990fb99db32d4e79a 12,refs/heads/master,0691954e63c3576146e86809bff0c0c2b77a0f6f,6218ade3f2e50f22e5e263714197f176e856c5a2,18ba96ffbe2acabe644a155ef8c650548f3c7062,,True,True,True,38,119,767,3,True,38,Tests_passed,836933c08f60ae54c30f2e09ddc4c575aeb57ed7d1af55b8930d4eabae3e99f5,True,Tests_passed,027deee34b639e0ba83921c7135dd06ab6d20889838dda37e4edf841ad8711ae,True,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,19ce7a4296517faa89f86279bf3a90fd977c882d51305bf75abbbf2c99f133c5,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Tests_failed,e6a4f25f27dde16ec7b1430d8b6a056c83eb278028d1337aaded5ffe4eee5e15,Tests_passed,e7ae6a8cb4d4e83730fa942c5ca01e12fdfbabc8d96c2b0783447df327a561f9,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,d406fc0d0f684390df947eaaa6a457be4f6c4b53ac80f5683815e0159aeb86f7,Tests_passed,d2edc3f954b676094bdbd90496d15415149fdc055b515f13bd4297c0c3b7fb3e,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442,Merge_failed,b718ac1a85c0f860b2f88e5513047dd688ee586eaa08f7c94d3a39e20d46a442 13,refs/heads/master,6218ade3f2e50f22e5e263714197f176e856c5a2,fe31fe2af3107170ed8d4fd59fcf2574d318ea39,5c22299664a6d192d178ee10a622eb9b67eb2d05,,True,True,True,42,132,952,4,True,42,Tests_passed,d315b473170630c6e9408e496eeca7955dec1065a27c1e2eed5739b26048224e,True,Tests_passed,a94a4d302b0556d51bdd85c2ccfe8d56bff0ea47d6da5a22acf17e690efa6520,True,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,85a4fc1581d16c52dc84bc4ef177407952b5f886017e4cd12a1d3d454c51344b,Merge_failed,a654419dd5b83b46fba6798f5d6342472aee3b66521e231126fd1ae577c87219,Merge_failed,6a72b313e616d2a7d12f06852cd76f874405921ad3c24358a9327af4a44eedd5,Tests_failed,ff8e0a97e2159c0c7a678910112e3f750f10d27a063e4f02f94b55adaadd5b37,Merge_failed,a654419dd5b83b46fba6798f5d6342472aee3b66521e231126fd1ae577c87219,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,58296e3c33744533ee69e6407a3d69da59cd592c4702f0f3ed093a6a6b5025d6,Merge_failed,6a72b313e616d2a7d12f06852cd76f874405921ad3c24358a9327af4a44eedd5,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b,Merge_failed,7012566bd01a2cd8b23ce8b5e76401ec67bf47f61cec9b770b8d020f6382844b diff --git a/results/reaper/merges_tested/ctran/tinyradius.csv b/results/reaper/merges_tested/ctran/tinyradius.csv index 1ce8926912..2c60b627c7 100644 --- a/results/reaper/merges_tested/ctran/tinyradius.csv +++ b/results/reaper/merges_tested/ctran/tinyradius.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/20,28644bdc78775695857aec787d220e81399454e6,4332168d74101944750e404a65f01664532e1b2f,82d5baf8774ce22e2301d5c856cecd9aa7348553,,True,True,True,10,37,271,2,True,10,Tests_passed,1d380689633a029030220c020d6280aa62adedd1cba5035502ac3ecb62ba0730,True,Tests_passed,ea373092ad708087253cb44417aa7b84052b06f4e89078ad3b80c7124716bc98,True,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,29d0be610578a63837ea4a5e3df8692f1fbcf0959656816f9d1eabd1b2ca185c,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a,Tests_passed,57420deb41151483d463eb40fa46ba8cd03b8b337fb8c544063b70370e70433a diff --git a/results/reaper/merges_tested/dabsquared/gitlab-plugin.csv b/results/reaper/merges_tested/dabsquared/gitlab-plugin.csv index e2fd488b3d..954230e357 100644 --- a/results/reaper/merges_tested/dabsquared/gitlab-plugin.csv +++ b/results/reaper/merges_tested/dabsquared/gitlab-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 120,refs/heads/master,387517997c283739cbe1f4c0de882e6be6dd8b12,5e908e92ec4140e3795beb1fde7214e5c4b80fad,f2815dcb0482755e4185d2691a3a0cf37b862b26,,True,True,True,28,105,546,6,True,28,Tests_passed,d2e431db6dd60bcf45fa6b5b3a59a3f5e2723f60478937424e6e7afdebf6c637,True,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,True,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,3d60a84a5466022c80f802d3a48d5ba484081bc51ef521694164792036302d00,Merge_failed,482ed14a32d690f2b50c7c36af6db3ec30ce94192a550bcd517b68f22a8a9269,Merge_failed,ac70c0db4dc504ca6286a3ff01e06dee316eff985d1218810c9f1a586573c870,Tests_failed,b086eb9b4a1a842998b84a03c94363c52c4581498a328cfacf8b7ddf3c528e1a,Merge_failed,482ed14a32d690f2b50c7c36af6db3ec30ce94192a550bcd517b68f22a8a9269,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,ee031e043b04e2d8becaa043ab4a981a0a9c1d59e6c4bd4e67d62d2f5969ebf4,Merge_failed,ac70c0db4dc504ca6286a3ff01e06dee316eff985d1218810c9f1a586573c870,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,d83b177ba4012fbf04109866dc974ca6c758d2fd1b85d0eaeb3c7b9913e6bf2d,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c,Merge_failed,4dfa5573ee62a645bd8da54957bad5bfed001b3fe979afe93c1c0b043861f15c 121,refs/heads/master,f2815dcb0482755e4185d2691a3a0cf37b862b26,49b97dfa8f9fdc0f172af04491ba5dbd1b2b5f5b,45e754db357692047e481500269a3b3be764dd82,,True,True,True,37,159,728,2,True,37,Tests_passed,71762fef9b65436d81101674ba3e728166bf44a8c376453ea883e96b58c9e0e3,True,Tests_passed,abf6299d51eceec06b0287b2c14b80ee7337f3589c6adc121e448779569735bb,True,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_failed,481a016496d4c1b9dc5c7a3960fa16080b08010172214e9e1f8a25cc32255c25,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,562e29e330951452dfbdfacd1a66d1fa45bab0025ba49d3b4775bc4d30a4508c,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263,Tests_passed,abbb7432b1901391fb35f36e2a4673db96ad697521090e1aa7e1adc3ad3e3263 125,refs/heads/master,4cecd03592555739b0e9b6310e7d229582527f21,40e6fb8c47dd3148b8716bf90537fbf5a84e3f56,e24861f4982caea7fed85b15fe84506974676b66,,True,True,True,36,158,718,3,True,36,Tests_passed,292b21a7aeda554f52250089c6d3cfd8f9bbb811b6ce0c54dc4e82b3884e8b7b,True,Tests_passed,647d17d3b6965be9b758ef3cc996c61adcae249560587a967a52cb70abfc2c24,True,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,3058202bc1379f6e51330f9735e4081f11d26e198106cc6f727ad2544a9114dc,Tests_failed,a0126f7aadc4d09d86bab93a07af4c7fc319ad34175305e9356c1f2378f0f5e4,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,3058202bc1379f6e51330f9735e4081f11d26e198106cc6f727ad2544a9114dc,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e,Tests_passed,57b1f960ee24471f67566a34ea46624f1cdad2b11941a2b0280bded13883224e diff --git a/results/reaper/merges_tested/dakusui/jcunit.csv b/results/reaper/merges_tested/dakusui/jcunit.csv index efd78ace37..b04e873d30 100644 --- a/results/reaper/merges_tested/dakusui/jcunit.csv +++ b/results/reaper/merges_tested/dakusui/jcunit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/0.10.x-develop,0b4c454e4929b27376cf7647170b7eda141f0f67,a0017f094773a8fc9960921077d3c51bab03a7f2,a3671fd83d32bd11f6a4237aeffd72a76ce0f88a,,True,True,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,True,15,39,165,2,True,Tests_passed,de3ccb8a126feb0d01758f2c3bec55924c15c3597f1116bf6a0f4ec1cdc220ac,True,15,True,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,e4cdeaa0cd0badeb84479973b4b9eb766456119fb5be1f4d604ea8fcd39ee09d,Tests_failed,bbde49d3ed9246efec561be5e832844c4bb1dc750da52b873419abc0a30c835b,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,e4cdeaa0cd0badeb84479973b4b9eb766456119fb5be1f4d604ea8fcd39ee09d,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27,Tests_passed,55b28f85f9374e28d6350c74dfbd4cb31e24dd604c132186db85488f770f9f27 10,refs/heads/0.10.x-develop,462dfb4cb47c28e87efb37d8632033bd845ed3d9,28f9a999c09c0119b65ab215a5ea093e6f7c8dbe,a584486c1c005a50517b0de771bf255121370db1,,True,True,Tests_passed,231ec8bc3c38afbf2aab2cdd33c9e1995584808bc42d707791013156f611c830,True,15,42,180,2,True,Tests_passed,de3ccb8a126feb0d01758f2c3bec55924c15c3597f1116bf6a0f4ec1cdc220ac,True,15,True,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,f077cfa33b90dfaf2c715809d3fac6eb0f24de092ec31c721c7306402f7476d6,Merge_failed,4dcdbde9177094681168b2ec2da13064670f4d68800cfe8b47edd6e845a1e4cb,Merge_failed,d2447d0b12d06888ef62d9af8d9976582c8a36d28ef08fb584cb350ddfe69f8e,Tests_failed,a59fac4990e325fb81504290a4fec0787de778bc244ed9e510a5ce0ca0e79476,Merge_failed,4dcdbde9177094681168b2ec2da13064670f4d68800cfe8b47edd6e845a1e4cb,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,d2ee6f4f0729b047d35f5beb5237013ac90523bdbc2c838dd15203beadc74d31,Merge_failed,d2447d0b12d06888ef62d9af8d9976582c8a36d28ef08fb584cb350ddfe69f8e,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1,Merge_failed,1eb5f9b8a12715cf96300328076ced77b1f5b874976e3f27076e0d130574a7e1 18,refs/heads/0.10.x-develop,15193c8f28c1605de53c0717f91511ca5517e3e4,fd78062d33228c439fa17c0887b18e49c59c8477,c61777098216cf5d8391d69cc8aec415d12566d0,,True,True,Tests_passed,4aab9d44b898ba5df5ab8e173c486007a78c0d51a644ad0c7c75a8b717a2aec9,True,17,67,862,11,True,Tests_passed,a1abd535e15561a2d55b376052f57d8c5887dbe74fe0ebe9db2f2e9ae28ab332,True,24,True,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,7e66ff1c3868338644fa00b4fe7671c7d91379eeb2d67def989009c4d6480eb4,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,d8fc01497e7e0f39934ff1fe46f6e65411e453134feab2934cc75977b5913b48,Merge_failed,6bb8be2541f01d76914f0f3e3c4cb404b173729a21cacd8afd133230a7c78bcf,Merge_failed,ac1171942e0c185e04cc9fb910471f0d3ec8824516499b7ac37bad047eb883aa,Merge_failed,a55b52d2da843cfd561db705e5fe2ef09ec6989d0efcda3d06c4ebe8bd21fd56,Merge_failed,6bb8be2541f01d76914f0f3e3c4cb404b173729a21cacd8afd133230a7c78bcf,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,7e66ff1c3868338644fa00b4fe7671c7d91379eeb2d67def989009c4d6480eb4,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b97edd9b0a71b769f750b71af470175d9bb394b164663ff163fc086a86c2c824,Merge_failed,ac1171942e0c185e04cc9fb910471f0d3ec8824516499b7ac37bad047eb883aa,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a,Merge_failed,b39a5ed158e6e7c814a905a0a3cf0df340ad2fd1ab4ae838ea44d6b520ea174a diff --git a/results/reaper/merges_tested/danielflower/maven-gitlog-plugin.csv b/results/reaper/merges_tested/danielflower/maven-gitlog-plugin.csv index 2695b4d3bc..5ab8117ed8 100644 --- a/results/reaper/merges_tested/danielflower/maven-gitlog-plugin.csv +++ b/results/reaper/merges_tested/danielflower/maven-gitlog-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,37784d6f29f5c446fcc52dc2d7416efb51123a03,8fc7b8b26476fda7cc389de7dcbc43f743071541,9895edb225fbdc2d839b66a6fa5222a97da99566,,True,True,Tests_passed,1c6e5bdf01dc535820c82ed91bb7d2c99b2c13553fccf7457e768fd8a9367a9f,True,15,43,151.0,3,True,Tests_passed,86bbbb2f169f85319e7cb5ea8deab5825c0dd48692d10d4af44835ab1ef37706,True,15,True,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,7a545a22bdefb1d09ef9012fb580e554b03569c0edaf47d61a02eb8a896cb798,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,7a545a22bdefb1d09ef9012fb580e554b03569c0edaf47d61a02eb8a896cb798,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879,Tests_passed,e6e1ec68c375d6f9f8e7d5c0447357ed40225c13544a16c8c4576bdcc6f45879 14,refs/heads/master,0bce3a1367ac611fc90a265cee3fc6de53c75943,3330e18f01f39361c7cfbb21d26d44c8f9c21a00,2007bf5f639ec25ca7b30b77ffd3f9701923a57e,,True,True,Tests_passed,3d7af16377c293a7d23528eb1afdfe603d662751e175bdf24be4c61e18051ed5,True,5,15,264.0,2,True,Tests_passed,4e15b33f4310230925b7a35e55d0ddeb1ea0073f6e1bd2387fa5d5a13b400f08,True,5,True,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,c1a62f63f057a022f6fbfcd9fb9cf5473fb81a3054a9f649aac2b4e6420ef3b8,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,c75557219c0bdb3ecf1d179f3955073ce44f6e31b81f9a62ce93bf5c3ef24615,Merge_failed,7cde07cc9766886ff6e170bd545a063f67383bb8a05570e9c453a732d115f10d,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,d8aa325463536df9f46d56f347633a457d1c7a5ff8834b175739770091e83706,Tests_passed,eaf3c2954522367f41e5f31003afbde9930b299681e99cf9b5ab6b9ef422eb3f,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Tests_passed,1c383aa299d5079dd7068038ce5bcdbf0f45ee7db45a4a2403ac524768fb9ffd,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e,Merge_failed,6286e544182aefbc5fd0476c0eefb86bcade16c13b3dd8f0053da1737666f74e diff --git a/results/reaper/merges_tested/danielgronau/highj.csv b/results/reaper/merges_tested/danielgronau/highj.csv index 59401dd456..b010f5c52a 100644 --- a/results/reaper/merges_tested/danielgronau/highj.csv +++ b/results/reaper/merges_tested/danielgronau/highj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,57cae0eb2d9be81f18f7e6f05cb69e68cd731c7d,a0478ba744b7beb5b2c71dea640a6cf6b26f5594,83e3f970c0a9563ba289bc1d35204dfbdfa624b9,,True,True,True,254,698,1975,4,True,254,Tests_passed,293ed24c2bdf911155197dcdcd4b66c5add192b0f3ce37628a1a917f45bdbd8e,True,Tests_passed,69a85ed3e02b92d8bdcb0fe8cd66a630995461d02088a6af88c4c53dfda957b0,True,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Merge_timedout,,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,70e9f185da8d720d97491f9cff927f7fd2e41f5840461fee9b5215892385950a,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,73732c254c9cb08792cd0b2c683a06f8be154bd3b15144645af368422f46133d,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488,Tests_passed,0918de2bcd29006bf411ccaffee0d667a713217cfa2b55620a8a374049404488 diff --git a/results/reaper/merges_tested/danielnorberg/auto-matter.csv b/results/reaper/merges_tested/danielnorberg/auto-matter.csv index bfc3e0e938..a7e2e39988 100644 --- a/results/reaper/merges_tested/danielnorberg/auto-matter.csv +++ b/results/reaper/merges_tested/danielnorberg/auto-matter.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,a076352517d328fcb10a4cb9d1dd25e823f47e1a,32b943613299e13becc4ae5ab310d3f911776964,978b269eba9f5fdd9c4b88a98d6236fd03c0e8ab,,True,True,True,26,72,716,8,True,27,Tests_passed,77c4cbc9f7f4215fad0b8f58abf46244e7ab064ac85ad7c8c13e918590a00280,True,Tests_passed,40e78e274138c689c534014176d9606b965135bb2e47197a9b1b77166d19dfb3,True,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0dc994035403edb4259cd0c3e6fb470a6e18fdc0c560ad9f23a8229dac5ec3a7,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,1595a4e90182371ff02cb073ae63964c5c91b6b65fd8df066b28e1a5505885f5,Merge_failed,e95673932913e85db805ec3e6007693f20d8a544bb3654308c8c50340313b343,Merge_failed,fdd5ab79253c0e93daab32da78491d4a2fa1ac58c6a3ce20aa0be6be77a529e2,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,662a4e305c2ef760d58f9e26426d481d94b4b0f9429af40ddad614a8b8649f3b,Merge_failed,489931d6f9048e1e9f1ca3ec0037757d86a9f08d02f430d2c0a95cdad59ce854,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,0efc02b87277b9cc25b1568b9753ca6620d497d4c456ae4bb9fd02972848dcc9,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d,Merge_failed,ae6bc8e9bbb70fb634587e62564a6d84b43e8fe8e4f5b165f76b38852672658d 43,refs/heads/master,5739d194fb360dde65820538263efddba683785f,d002f08a59d0dad558abc9f19aaf03e462e7122c,64a1cc5bdb1ea9c61ab848161777795b79f04481,,True,True,True,29,128,1828,3,True,29,Tests_passed,54e831d7d264a09f9599d207f90cc863f99c119247a6811b81b1ff421fc3ce44,True,Tests_passed,8abef44feb5149d6ab652405c4e3109d47859112401e3f6141980d4e3609d248,True,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,2c4778bb8468490a35324d2833280eacdec9aad91af98b225d4a652dac7d1dfc,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,cb4f9f5ab3dbd8615bcf9298b41dc28fe81a54f2946db82477ac3a3e6afde913,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,b9b9d767a5fc2f8e17c61826b98c9b23727317b1a5a2f3fe18a29ea37e407a1b,Merge_failed,a8a26570fa37d815be9dfe24933463e8313293dc8e1386590bb9e67ac2504f99,Merge_failed,414fd83640077bf0271219297d4afbafe3e1658073280ee397b6f981f56a3493,Merge_failed,9c4f8c70e6696f4ee907771dc0ceb634c02cb1728e703ce79bd99694578dcf11,Merge_failed,a8a26570fa37d815be9dfe24933463e8313293dc8e1386590bb9e67ac2504f99,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,cb4f9f5ab3dbd8615bcf9298b41dc28fe81a54f2946db82477ac3a3e6afde913,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,32d7d5a43310df47e68683c6afb9e617e12ea77ffded784d58f9db143162073b,Merge_failed,414fd83640077bf0271219297d4afbafe3e1658073280ee397b6f981f56a3493,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,2c4778bb8468490a35324d2833280eacdec9aad91af98b225d4a652dac7d1dfc,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f,Merge_failed,7e2d2741c35add8c689ac20a72f6d16b368c0676d581acbcdb2d114609bef42f 68,refs/heads/master,196291d257be7fb635992246199269775461b27e,01f1a7ae713492e3b4058411bf08efe1bece95c4,fbae6cf23b6184e19ed13032359085d744a71023,,True,True,True,3,15,104,2,True,3,Tests_passed,5333bcb74efeeaeda31f1d7b9d27538b2e79100394bc8520ebe7cc7921e8e4eb,True,Tests_passed,468f5632374e6fd1bacbecf908585493c3ffc47a8777d4abdbacaa9ad4275cec,True,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,d9b517574a6869442522d48b1a945b6f859443f8020e4f3c5506444764c712c0,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,725f73917d6a28d47ce2099b86e482ecba7cb5b67fc8399f0f99bd3b8c05b7d6,Tests_failed,419573f72fa1fd5d198b3f459ef162b877ea06c0acb18b4d0dbde26a5b501b14,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,725f73917d6a28d47ce2099b86e482ecba7cb5b67fc8399f0f99bd3b8c05b7d6,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,d9b517574a6869442522d48b1a945b6f859443f8020e4f3c5506444764c712c0,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5,Tests_passed,a904b05fb74e06c450899fd83d52fb9a375772fd93123ccf000c7a42ad36e2a5 diff --git a/results/reaper/merges_tested/dankurka/gwtphonegap.csv b/results/reaper/merges_tested/dankurka/gwtphonegap.csv index 837e153075..a5a2f11728 100644 --- a/results/reaper/merges_tested/dankurka/gwtphonegap.csv +++ b/results/reaper/merges_tested/dankurka/gwtphonegap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,e19aa67e33166f958e2cb1181d5811cbde2ff6ad,72aa0c929b6fb675fa29d56a0daf0405caf85906,9037a4172b06032e5133e95f0fc4f0fc9c3651b5,,True,True,True,21,63,419,2,True,21,Tests_passed,28b9675d2af90cfc8a0741471a1ba40af03a39fbfeb06b5ae912d0259bc27665,True,Tests_passed,6152f84e95cd50a4fa5d733320cacb3af9ded85e38b0f27aa14be15ef42da51b,True,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,b8e26278e5cddf0af3c37d17525b3002d0b2f21e7786758d150f93a582ad37d3,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,75cdc872089dfbca804c88e2e08bf17dcdf8b41042c1d38242c5fb765d496b72,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12,Tests_passed,d95b29d1a5f203aa23639002173bc99a40cfa2d1a45cb8278f9b0a9f94e10b12 41,refs/heads/master,b4738dff72d699a21141f607b91dff8fd2266f04,b176e68f80a0e6f4e02adb6a2d873ccd1b381874,0dbc30a752e59c1117b2b4a72f94d30533160b7a,,True,False,True,2,1,7,3,True,3,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,True,Tests_passed,b0ff3dc74b18b798b476ed91375324bbf9d559f1b337c376c7098b0582c29c63,True,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Merge_failed,0a4827deb8d7aaa49d1dac8657a3608846d5ffceb4ce751d798cbeaa32f008dd,Tests_passed,f2d80d77384484caedae2a8f63a64637f01a24f27a1ba16d90f1a9266410f439,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Merge_failed,0a4827deb8d7aaa49d1dac8657a3608846d5ffceb4ce751d798cbeaa32f008dd,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,f2d80d77384484caedae2a8f63a64637f01a24f27a1ba16d90f1a9266410f439,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7,Tests_passed,2df7dd2418eedc9c3526cc9fa5f72bb170996bd13fe66e398e9b199ad94335e7 43,refs/heads/master,0dbc30a752e59c1117b2b4a72f94d30533160b7a,d9fb6e9c684f0b2d3f228edd4fdcd4927d10c078,001a376762dd43609c0c11def14f2b0ef77754ed,,True,True,True,7,17,571,12,True,16,Tests_passed,fafcce3af877a7aba26588138f2923c756aa539aae59e586d9d94c5ecc1f045b,True,Tests_passed,4672f13c281b75a7a82405ef4e47fef0f336028323131312f0b4d9bfc128ac35,True,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,0b26c38bf7835411fd2ecf10f9695ea80d2e63cb8942975b598cbccd435687d5,Merge_failed,08691d8e85bb5d81577307cbb36a8867804c5ac7a74efd3c3b5e7ed77278de4e,Merge_failed,877e7dc43890bbe798be3d44617490be0f3628edf95d8ca275eeb91f80244961,Merge_failed,d51bb44529415a7592427b7bc4f259a0154baa256e2c770b3fa8cd7fb3e01421,Merge_failed,08691d8e85bb5d81577307cbb36a8867804c5ac7a74efd3c3b5e7ed77278de4e,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,d817c19bdfbfcd169c7bd7e9683a2f50caffcca3f64d51f5e84bedaa510ad533,Merge_failed,877e7dc43890bbe798be3d44617490be0f3628edf95d8ca275eeb91f80244961,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba,Merge_failed,5f90163f0cf9541dd49b85ee24de858091d6330e32e6e3c53bea099512a65bba diff --git a/results/reaper/merges_tested/dankurka/mgwt.csv b/results/reaper/merges_tested/dankurka/mgwt.csv index b44b3ff482..3e02c2e8b3 100644 --- a/results/reaper/merges_tested/dankurka/mgwt.csv +++ b/results/reaper/merges_tested/dankurka/mgwt.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,74856a7a070dde80f5ef866eb6de0ec77d4c6baf,49d43a7d9cb9aff1d7409edc47a858653f1773f9,39d049502be0f9b1ecc7dc572b93c5e112d75f08,,True,True,True,25,62,137,2,True,25,Tests_passed,3e8368c81eaa5de1031f85deaefdbb715cfca6abc82d04133f9ee629a9a9cbca,True,Tests_passed,885e081f41745970e619b1b47a3fc5b497a8d2fbb9bfc43bde26c26c5be6d7ce,True,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,821def53ed549e07dfa5d5e8fedc9e112ceda9e32adf39179c091204a727a55c,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,fe517f1c48bb4877a80018c41aabf3dd324ab886078d2456b5c8dd7db20bdf21,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb,Tests_passed,6a4fe20990f0463cd71e6a8947d5a98cc9b9c4a189bd08deda897cfd61df95fb 24,refs/heads/master,d956e42a28a4d3a0293b3a014c3d111e9f9ddb37,d6995585788e8c18392697ef3006157646cab2bb,15f1a389e0096140e2e31609b5a8eb8ca5514582,,True,True,True,57,84,885,2,True,57,Tests_passed,54f80e0cec2be7f46bc038fdfef88ec110946518c31473ec7928b05f863fc034,True,Tests_passed,7358a0be9ed48e8cd3c6507d78d35b0c0182fbe93fd335a933e4e38cfcb2a957,True,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,e0ddbea18206d00f0cfbf4371c7e218a475c7c725d4dd989bf6a380e4d95ddd6,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,e0ddbea18206d00f0cfbf4371c7e218a475c7c725d4dd989bf6a380e4d95ddd6,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8,Tests_passed,fcc76aae767da972d00691f3e32664b5dd665e53169e984057ce5a13ecca44c8 108,refs/heads/master,8db3e82c37cbb95d1a0b0d374373234f25a7ab58,010e4540b4f3002a8b62144da4ba637fff522186,8577c4421c4d29dc64704f0f9a7ba629456ac8be,,True,True,True,1062,1825,22241,2,True,1065,Tests_passed,a03c16b73d6406af18cd5333475047a93a632c3c1a964b7f2d4e30360ed1f010,True,Tests_passed,1dc1f316cad97360068ec402f16fc75d815e91b8e8bfa0d5c4e79ada9acc2065,True,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,d4bc4879d5cfd80ab80b8dd94057044117d139f5f680cf23106d589a6b106d6f,Tests_failed,629297a2d691b8e085f5ee589d4947c0aa2dc3f29332e5389b3793624da6e1b1,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,d4bc4879d5cfd80ab80b8dd94057044117d139f5f680cf23106d589a6b106d6f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f,Tests_passed,c11fa5a3bc5366c1895383d0d208ade256b775536821e449a086d9efadabe40f diff --git a/results/reaper/merges_tested/darcy-framework/darcy-ui.csv b/results/reaper/merges_tested/darcy-framework/darcy-ui.csv index a7fde9881e..db183a8932 100644 --- a/results/reaper/merges_tested/darcy-framework/darcy-ui.csv +++ b/results/reaper/merges_tested/darcy-framework/darcy-ui.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,2b85384321014d352afe7bb43e8b0381ceee9585,8795cbf2b5163c4af38c9c3391e126514c6591c8,583f308198fedb6474dd9db08b9e9b43ad3c8c9f,,True,True,True,43,118,2013,2,True,43,Tests_passed,13747875c69679aebf3a001e9726b6b683a213dfe9804d72dea6c1fd833dfe4d,True,Tests_passed,1352358b99932d811af9fad293c2eb6982bba457ffc728f00e326f045e1cc9e2,True,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,8d75478d9eca4261ff5e04a64c34203a3c673f01a77cc744a84fc0dd6c5611c5,Merge_failed,2ab30e8ac278e43efa87031c8dc4c37d610174b775f905d9960b1b810a6cb656,Tests_passed,d68d54fbd43b87ca8b72655bfa4127f22ff323c0c331812384c2eecff4ca62fc,Tests_failed,65722539b595d54ebf4b137f54c8305ce41bdaf91aad6d47c373e687f4267bba,Merge_failed,2ab30e8ac278e43efa87031c8dc4c37d610174b775f905d9960b1b810a6cb656,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,d7a1ca72a0ca6e3a3d28eed86d6151387283eae69bf68e26be75f33e77fe2e93,Tests_passed,d68d54fbd43b87ca8b72655bfa4127f22ff323c0c331812384c2eecff4ca62fc,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972,Merge_failed,c7b1354948bd7e9cff6ab98430f94e6d8d24dc836029802283949dba2f73b972 29,refs/heads/master,5e1d93a56c5c0ba82cfa8adcd706b1fc0214493a,3c9c0fdf31a278bbd8c65071ef901aaa731c0bc9,9ee241447d187a0dc5bfd5d05c9c89fdd196205d,,True,True,True,6,9,95,2,True,7,Tests_passed,12eedf2cdaa4653d0c84a03ff15518a526bb15fc690d073248b54b19fd5d689d,True,Tests_passed,97486b57bf593bf5c7c5c2c12f1dae25eb306ee1219502ccf54bc0f376457cbb,True,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,70a5eb4204f75505c73ab3ef840e144b2b292d82f1115aa84ca73390ede142a7,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,2ce79117ac6e5d7412efe54c83d6833c58751a338b09891d839ae67f678e0ca3,Merge_failed,ae21c9fe75b9ed27dcb09062bf006f292db0e78665a949484b07b84db9dd07b8,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,9b9bdacebfd235f47ecd2e95b4e1a7ab2165fdfe972bc24a9513f46924699124,Tests_passed,75371c847b993b67faa0f7d070845ecded1113014cb6520334def7a413f81f79,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935,Merge_failed,c094f7d5175c9b6488bf23646f17cdc6a8d3f09d65eab6d78ca24c47335f9935 diff --git a/results/reaper/merges_tested/datanucleus/datanucleus-core.csv b/results/reaper/merges_tested/datanucleus/datanucleus-core.csv index 541d3c2cf5..15a9d690b8 100644 --- a/results/reaper/merges_tested/datanucleus/datanucleus-core.csv +++ b/results/reaper/merges_tested/datanucleus/datanucleus-core.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,8bff557466f08b633c5e33856b83518ca6ab1a60,3828238f6d5647f4d38692745ee1cee610700ca7,95c9e42c5d1c33906f3b3bf8dd1218577ad2d8fe,,True,False,True,2,1,10.0,2,True,2,Tests_passed,781c23b0f581e0170e248f4c68c6fb707713644e2e114e271a338bc81b72ec22,True,Tests_passed,238863cbf8b631ff4466907b2733c4402699ad2ab404f9167deb36a043e37be6,True,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,87b585e824fd58878ca8e11dbd73a6f4f67d7dbe80755330c5619540516db72a,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,8d7b6aa9ab010e23e96ea9f6c1e83398ace48c9676ba982e27eca64d16895f7f,Merge_failed,a4e848f503a62e8f5b76c15a2cb72dbefafa4228a4df6fe0d29bff0dd4ad5424,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,297fbaf82d7572f39be9063a58bac1689dba9a12701bf6ea6586ab2b66f7b7b7,Tests_passed,61a645f3714513342466bd89d4607b96b1eccefe0ba29ec38975ebdc18d9802f,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0,Merge_failed,e63c5221fdca8a667173c612e40a98d4bc033e9401a53639332ef870c678a9c0 diff --git a/results/reaper/merges_tested/datanucleus/datanucleus-rdbms.csv b/results/reaper/merges_tested/datanucleus/datanucleus-rdbms.csv index d41eb598ed..9a2ed776f3 100644 --- a/results/reaper/merges_tested/datanucleus/datanucleus-rdbms.csv +++ b/results/reaper/merges_tested/datanucleus/datanucleus-rdbms.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b4f243ee7357b22c82759725b42e2532be164f33,fe9b306cf2bcf248e8aee28dd6772411b4399ef6,cccfc1ac759e7bc84cb1476b1f8e6757f3cc3ecb,,True,True,True,8,30,260.0,2,True,8,Tests_passed,12799ab22c7d2de31e7dc17a9759c720538743e04c7f023b46d07eb740b76481,True,Tests_passed,b7d24e454edd062be367e1646d65cd6412b0ae3300c4e33fca452ada14bc70e9,True,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,ab9ef23635948c90c41b334bdd6d1d0a3d5cf428177c163dca062d7e27fbb40a,Merge_failed,4cada42deab5f39efe998cd1c0f02b8e83f7c8b4229c4bce3f49ad987f415070,Tests_passed,d9559b5709173872a3fb29511e1aa074f42d05ebe6dd31c17b675621b8a40840,Merge_failed,b8199e8300b3dc179a960997fcc414e8feec104307169149f76d9779a4536e5f,Merge_failed,4cada42deab5f39efe998cd1c0f02b8e83f7c8b4229c4bce3f49ad987f415070,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,f816fee23d31d19cf533cd73fb8687c27b00f1a10250a9affec842ccb03d3208,Tests_passed,d9559b5709173872a3fb29511e1aa074f42d05ebe6dd31c17b675621b8a40840,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a,Merge_failed,1fbda8b33117a95dc582438177d3f7424d74e18a680237ef689ff452ead39b1a 14,refs/heads/master,8b0f2651b6768a96482214f18b37ed8e7db530ef,90bc13f2a6e17c7342db60332ffbfbc57352e46f,1e531d71634ca9c6c04014e18d22be290fcaa95b,,True,False,True,2,3,7.0,2,True,2,Tests_passed,bfa4017456838c35160dfabad2fb9e4f83ea05a13206de95c7d1a60119f7beb7,True,Tests_passed,3524b702f68ea620a94b34751a753bc714565ba1c5b8a6a9ac779d58e457825d,True,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,7bbc376c24dfc2aa08e160a79f77b9907eeff27a30e5e1de1437301b7fad6d18,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130,Tests_passed,b38313ae2965a614ad03c769fd83b63085f554f18c4a38ea32f81a71ccc0b130 diff --git a/results/reaper/merges_tested/datastax/java-driver.csv b/results/reaper/merges_tested/datastax/java-driver.csv index efaafc8a68..bd7ebe5c7f 100644 --- a/results/reaper/merges_tested/datastax/java-driver.csv +++ b/results/reaper/merges_tested/datastax/java-driver.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,explanation,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/4.x,92097f197dedd7f9036a0b56123cddca8103a1ec,5e1e5107c91c3546e5cc81a29cbccdbbaff0f82b,1c0a0be3b09cb3c699190478b9f108abfdb2e4e7,,True,True,True,56.0,157,1089.0,14,True,56,Tests_passed,bcb24373a437cec9d2da9ff9d2732d8e4069ab5a92da2b0ecccc218dd63e4053,True,Tests_passed,b84c6625ac3f317c109c4872c331b713107274c2758bf1a376e501e9a43043e0,,True,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,3c95e55900b7afc5da4d22e3b4b3585492bf0926b706ae12bfa73b542ef9c190,Merge_failed,37d2e51b0fd5b4c195e788de2f372b43b93f23dda69404de7cd5b2317d90df0f,Merge_failed,cf253f0c5d763ec4f026208872e8ad96b7a6d2d330bf1468cf0d8327576abbee,Merge_failed,0827f472ee9e7ee6991f24b541ca03d2baee40660ebfb36d75df4808f8d2091e,Merge_failed,37d2e51b0fd5b4c195e788de2f372b43b93f23dda69404de7cd5b2317d90df0f,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,670fc893cfe9e22e688eaf2e7b6322c4e1fc806bb5efad0dafa653cb4efb42e1,Merge_failed,d736ba646fb6fe20df158b4fa840e402488c4631fc810833a88ccb232d0c1a7a,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43,Merge_failed,ad4b3771ebf68234b582175471a4d2769cda49549fdb759232f80141ce49bf43 59,refs/remotes/origin/1.0,e54b132914323677d786da896064b553effd4761,bcfcf986a50695f1f0be1e502ce2f8270ab9dad5,b9f7e9d52d9c64fad86e63544d3690adc7be2b7b,,True,True,True,59.0,154,167.0,2,True,59,Tests_passed,c1662fbff0b27e2316672af4999c4ceb6102bb3ec9a550abf5c8365e99e4c5b1,True,Tests_passed,fc31509a0b01490f3a1a02fface6db2eb4521a184a80846920828f7c18bccad1,,True,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,db645da9fc6a438c098ddbc031a5b5787796e6cef7e9ab965f6c5fd4d7b68273,Tests_failed,8ad676ff79513022124c6272af617a3c29bfadfb8f4b4c3e13cc9f6c059d8b2d,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,db645da9fc6a438c098ddbc031a5b5787796e6cef7e9ab965f6c5fd4d7b68273,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694,Tests_passed,b132791f3c3a5227c600d15d7fb3b34f4e93bf8252d8163df1eb84f6fd972694 63,refs/remotes/origin/1.0,089aacb75cc86c67b8d2f650ade1fe041e66323d,51d99f49daa0c54d9ec3ef4977e2e14ef9ffaf6c,2d2715d7cb1af85c19d0aef4b0cf1b3b79acf999,,True,True,True,11.0,56,203.0,2,True,11,Tests_passed,176cd4143b964065be4e28cc7399aa7837621991e12edbe8b3577ae691c5d5b8,True,Tests_passed,cc91796f7640f7d31523266cbdf6ce323ab7349aa96ca04ca9b9c4f6e9e21704,,True,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_failed,ab139cd3511b564dd7a35b31979c50eb3202bce94b94c51f0defc34697de443b,Tests_failed,41a2002305f5ef59e0626210d1cacb2ea89fb8cf3431e4f6c5ec866211184c9c,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_failed,ab139cd3511b564dd7a35b31979c50eb3202bce94b94c51f0defc34697de443b,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a,Tests_passed,525715b1083b3550efdd7589a1ba0e3b0a837d74a0f86d1d12676a4d77bfe73a diff --git a/results/reaper/merges_tested/datumbox/datumbox-framework.csv b/results/reaper/merges_tested/datumbox/datumbox-framework.csv index 5507643f2a..b8807d0b9f 100644 --- a/results/reaper/merges_tested/datumbox/datumbox-framework.csv +++ b/results/reaper/merges_tested/datumbox/datumbox-framework.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/develop,5e74399e9e7d77bd82dc672ac73d17ac124f2eef,1f17e05fc3a9ae66322a9f33d34f40e2fc0de7ff,173ec6e155639b676c0ab57b22e17e5696039899,,True,True,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,True,85,607,4493,2,True,Tests_passed,cb67313a5f1acd7c804d0d6b530db5601ceeb99f67ce9350af8a88bd6ad9a5b3,True,85,True,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_failed,b15f9f4f92b8995269e43c18e6a2aeda2054147b05b85e35db3766b8f83ff626,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,4a3fd5921521fecb329726c1797b9ed65b0fcd85686629fe0bad9e1a7ffb43d7,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Merge_failed,c2385560e2e10a91d9bcebd4afb5ef8a7bf41c7cf146e3983b0f31c9fdb6b70f,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e,Tests_passed,44e120f2f46d37b4e3231a6ae4b445526f7473c6104c35d3cf8df3154fb5e91e 18,refs/remotes/origin/mapdb3,e58101b86b800b4bbef36028d92bc74110f5fcaa,c83114fbb7a24f2f88cc996420b296caf6e5f1a2,6aed0cb71dfb7cd387b2533fe355aea3325a25de,,True,True,Tests_passed,f544b09b754b3503d2c6d3a9c174ed961e1ff1678701aeeb0a14b975b2f79fbd,True,5,22,83,2,True,Tests_passed,894a2e225c371cb83d4319cc5bb9862d977f8e1e442b94da136fc13d051f52fc,True,5,True,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,ff3189f33e8676526ac3e0c69df7b1991d7ce303d20be182ad5e89dda0c7837a,Tests_failed,77dd28aba083256eaa4409a4892c4249c225d488cc2e8dcb6f7380b8793850f4,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,ff3189f33e8676526ac3e0c69df7b1991d7ce303d20be182ad5e89dda0c7837a,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e,Tests_passed,01b16a216d9e9f5d6db5322f2439b2091e65ee58b96afe3c6df682550968cf1e 21,refs/remotes/origin/mapdb3,75d43855a05020bda5a864cda7e1603998732742,d5f0e5adaf3b9edde9e6e4afb9b5ea54b249bd2c,1c7d7caf2e188f3494dd8218bf07653771a4e3c5,,True,True,Tests_passed,ea3107bbd3e9e7b101d553831092f44ab68b7781a4d37f999246da472584a6b7,True,8,34,494,2,True,Tests_passed,4500883973eaaa087db6032f513572127627983976703343adb4b56ea42a67db,True,8,True,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,8dc956c6b5cd484984dfc5f3e86ef9cf874933c0a50f2eee1068fc47e8f21553,Tests_passed,8e443b71bd634ef9af7e781e9356def82c26559ab17265350ee7a10d33f1c7f9,Tests_passed,6a5d45c70ee223560a85d1fe78b4604ef6009cc3f2675386a79ecabfe686cc5c,Tests_failed,2b211c506fd3dc71f41e9166d0ed7f3892db9c5dbff7bb814e757d2b924992fc,Tests_passed,8e443b71bd634ef9af7e781e9356def82c26559ab17265350ee7a10d33f1c7f9,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,03767a20964a3a373cd881069f37db88a3481f59b6491c3b3fadeb04398dee86,Tests_passed,6a5d45c70ee223560a85d1fe78b4604ef6009cc3f2675386a79ecabfe686cc5c,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7,Merge_failed,4163b9c3687ac2fd5cfddb73a97d61279f6f37698133d5e2a66fbbfcaa38a5f7 diff --git a/results/reaper/merges_tested/davidb/scala-maven-plugin.csv b/results/reaper/merges_tested/davidb/scala-maven-plugin.csv index ade7e37d2d..a3779eede9 100644 --- a/results/reaper/merges_tested/davidb/scala-maven-plugin.csv +++ b/results/reaper/merges_tested/davidb/scala-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,2116bb65fa84f7474c6f0d65e91c34e2b0b756fa,85c8870ef9fd59b4d2ac0a3cfd8ea801ffac12e5,256825aee5165fee9dd1a7cdc2e5b97282c23e68,,True,True,True,8,10,875,3,True,8,Tests_passed,60a088cf0215ba1788dbe7ee9241480535489bf690df8a0475d39ae73fc0d485,True,Tests_passed,5354b3a5a6842e5a31966099849f9b4b21ed8fbaf0b9cacc021ce7e0bcd7b56a,True,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0935ab7116e9a06d30bb603e17f62cd972b0ed8235a1957dfd978dbac04f1275,Tests_failed,f32e61d319aee49a0cca24ec6c5e875ff024d4dc9f21c02aaf4eef522c17683e,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0935ab7116e9a06d30bb603e17f62cd972b0ed8235a1957dfd978dbac04f1275,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa,Tests_passed,0d2138ddc73571dc88dfa05624c856d4e326b167d3e3900fdc3639fd6752deaa 117,refs/remotes/origin/pull/322,c74fda72e2ad911abeef339d9503dbff1b4926e2,4c96c81343ff125d9d49ab19285a63dc2518a032,2c9ef6494c144cd7b23ce44fa64ef84fcb6f02fe,,True,True,True,23,139,1226,3,True,23,Tests_passed,250b5c4ca9c1651c23dd24f33423a2c65ccd3fc6be8cf6122f2194ab7bdcf7ba,True,Tests_passed,fc805a2095666ac7e4c49269e7d023d59111cc91b86643412ac81606dea2bb63,True,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,fbb71acf8904bfc3281edc293ee6737529715cc45d783abcc5a9456215fca24a,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Tests_failed,cb912c5d9bd087b5c31e83a7449d1eeb5d31466f6b637aca6e2fdc31da172179,Merge_failed,a9dce9828c51cfb429ebd60a8cb4b78b5e44ab32882c28907e6fca70721bf028,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,f0ef12b15e6728f40ee43552537e6281670c262c1b0d6d0285d94df0ccc62e52,Tests_failed,8fa3c3deb3a08fee714aaa3bceaffb74c6611c771141c7ea3de566bb3f90b84e,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Tests_passed,285eb9220b481a0bc77de1b6df41ee104456ec3d234a7a380353527b2dc181d8,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431,Merge_failed,3aafdb547ff009125a30e82418829e17b8f8b8d4b01e2b019d022785ddeb8431 diff --git a/results/reaper/merges_tested/davidmoten/geo.csv b/results/reaper/merges_tested/davidmoten/geo.csv index f57ef9bb46..e1fc7b8df7 100644 --- a/results/reaper/merges_tested/davidmoten/geo.csv +++ b/results/reaper/merges_tested/davidmoten/geo.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,d280483edeeabc57247e1753ac0c161039f6e604,20107eeab64668b6f8793a293b0b1d293b4af69c,fffc34fcbd3cec7c8ce0ea88d7f3435fa020d3b7,,True,True,Tests_passed,f485549a8998ccdbde26be431a12323ab5c63de3b2b22a742c3b85e66197d985,True,15,50,3795,2,True,Tests_passed,65b8a4dd6b915f61048b24974e4c01f04cf2f65cf0fc76d00573b0c938d03d35,True,15,True,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,9ed8ca123c6e56174a5dbcf94e4ff275688ab0f9a397de3b2ab7bc47e574206f,Merge_failed,bdb829dee348c52ebb7071d38ad5c10b1b2a96b1315926873640bfddc60ecd31,Tests_passed,93592619783dd7ad61989d9169196fb2907f87306a29c702dbea7db6a257247d,Tests_failed,e1de3e52c534d383b166f676a6e009fc574371c7e2b7b713388ea99a17324a05,Merge_failed,bdb829dee348c52ebb7071d38ad5c10b1b2a96b1315926873640bfddc60ecd31,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,13f87350c2495f601ae6248eff7c03f7ece0cf219756f0e943adf565bc1c0eb5,Merge_failed,5510801a99fa2740d04bf3fa8d6fb14fcdd9786ef5a6ada2cb5be9e570176416,Tests_passed,93592619783dd7ad61989d9169196fb2907f87306a29c702dbea7db6a257247d,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,90be8ec3732fd02f807acb1074278c84b1e94e689518b1bf3069bb78717cb822,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1,Merge_failed,f8f9221fe5efeedd7d6b32ecc7919880bf259b49b68bb77dd0f442cb536455c1 18,refs/heads/master,7427c57b931e1c9548227a7a0ea10dbead15edef,faab400a3cdc78dc7f9ef221d79129043c414baa,54f7ed3a72afe1ab1626269655ad64d824d7a5e2,,True,True,Tests_passed,cc78c9a90f15cc1af397195afbcf2b287a34dc4f4e134f09c31fb54756d78c6a,True,10,32,133,3,True,Tests_passed,db69dc60d0c8900ab08d3cb70719f8e82fb9b22d2f9e46c62d1ccef4cceb15a7,True,10,True,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,e907c6272ee7e4fa03cbc3df0d9460fb5af0ead7957e61ea2f6fef87f35b4ad2,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Tests_passed,017d1dc473e42e9664eda365ecea2440c5d0042015fe51140b882ef3a323f62d,Merge_failed,d8204c8a37d5980a4738c31f8fd6b44468c334a2bf4627c27601eb8010e71b3e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,4b0dd50bc64858993f073d28b21b2c03613db0f1e7db03df802c04da13b0d6dc,Tests_passed,4828b94783c79a392f7e1415ae2616887bda512b9866f8c87457f31707700263,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e,Merge_failed,d7bd7a3f8493ff8ac56bcfe5e8fe11f3b8e9a7b055a7f0509c1f9e105b89062e diff --git a/results/reaper/merges_tested/davidmoten/rtree.csv b/results/reaper/merges_tested/davidmoten/rtree.csv index 68ab599954..8b9f4259d5 100644 --- a/results/reaper/merges_tested/davidmoten/rtree.csv +++ b/results/reaper/merges_tested/davidmoten/rtree.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,dd478c4ea8eeeede9848bc596dda5454a648541d,5671a0f6b7ac05c2b09f66facb7068ee40ef2113,ef97ceedf041d60b1cd421c8d16cec707b120960,,True,True,True,10,60,189,3,True,10,Tests_passed,7eda454d833a50fd276efca4f4f90170d87db6c427c9b75db01e5ae7bf1620bc,True,Tests_passed,3e286b168432f16fa4ea261527e79de4300088f4807386b4e493b15b239438a0,True,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,0094c489e959cc1130a5d27c96da03b2a300638f995f381324193109ac25e500,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,a40378ca43e93179c6cee0544ef5d1962a8090e846fbfb45921bd2dc5d3ad217,Merge_failed,b3e39f6ccc2a4b2eb6b6a790c66ca9464bc0950381ef178e6099119b1d0e3bc9,Merge_failed,844f4a538c443a564f97e63874d0a3d08c224a561dd9b59b893f4502e07b9a3d,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,7757b45d31b6a32ee372c44509eac0f080603ac63476841f72c75e581d5c4ad7,Merge_failed,91dafbc58246c3632823520bb920acfbfa65865fca67ebdc05349cf32e28ba98,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644,Merge_failed,2be35b7374437258747ec136352dd9097c1699ff04a35559ab45dd3284b2c644 diff --git a/results/reaper/merges_tested/davidmoten/rxjava-extras.csv b/results/reaper/merges_tested/davidmoten/rxjava-extras.csv index 0f4e514d81..6a5a53e113 100644 --- a/results/reaper/merges_tested/davidmoten/rxjava-extras.csv +++ b/results/reaper/merges_tested/davidmoten/rxjava-extras.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 44,refs/heads/master,f26ebf28972a5e850b038932360c89bd703d5a63,30a492f6aa66bfbe6dbf5f37a1fd20a575a49d46,ede7921057b88302676cb975e159b6240079b81a,,True,False,True,3,3,17,2,True,3,Tests_passed,f4c07085564a583cb7c3985b3b73bae3b6b4e6640e0e9edcebd133a546a8cee4,True,Tests_passed,fc004f335bf0a19fb93780b64f594b07cafe5454d681267cff5cb1e4d5284342,True,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_failed,2fe834683fa60c7b3d0d76d1352808b08dfc4db1eeda9e39869ecf48c85639c7,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,9c75a2a29f0b9ba31f31560214924179c6d6823d12866352c6ae76001034923d,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613,Tests_passed,6f27b0052a628030e510457c2e0e354fad19108462cb7771fa016a548d01a613 diff --git a/results/reaper/merges_tested/davidmoten/rxjava-file.csv b/results/reaper/merges_tested/davidmoten/rxjava-file.csv index 2b96f30be1..16c6061c08 100644 --- a/results/reaper/merges_tested/davidmoten/rxjava-file.csv +++ b/results/reaper/merges_tested/davidmoten/rxjava-file.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cb7c3d9a00024b03b9d23c6d5ad47ba35b3e092e,672a094ac3efa58a30de76fd0ebb66f0e07450ae,af848d22b776b5286ab49c817ec42ee8f333f940,,True,True,Tests_passed,dcc2b58567e5bf759ea07a21e0163bd5957e0b7c9189627297b898951d4542e7,True,5,17,99,4,True,Tests_passed,282a203f50ab8926da46ad1785286bf5281b892b1b5fbf86676795578f114e76,True,6,True,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,09c3e588bd05e96b4a500b2a747a0c2774f3dfaee8d6b6f6251e11a40d2e389e,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,1a422dffcf66d98e073cc65b72b61bee7eda9dc87039ff2224f23997e18756f7,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,cd2d7e5a54375eebdec2d2c82d1b8e01ff42a11bcbfcfa0955182303a3883756,Merge_failed,d8ba378dc47ab36fdb61c374502fe2da5a5fc32372c1e991d16993d974b7eef7,Merge_failed,0f166e0cc6b39a00ee476fe68e7e21f546269f2d8292715939671d48fe3d9b85,Merge_failed,fa5e5b39a470c80f47bc0b9cf7bbb3ea52238a54d0d40e0bfadd6801119b2ecd,Merge_failed,d8ba378dc47ab36fdb61c374502fe2da5a5fc32372c1e991d16993d974b7eef7,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,1a422dffcf66d98e073cc65b72b61bee7eda9dc87039ff2224f23997e18756f7,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,90eefdb5a7a3d6b846e77d5fd6d881565e1b6ab10aea370407f001be07812342,Merge_failed,dbe089b8ff94146c15104c55213e2eb1f2df95e566e9ed12d6d1852cb57d3217,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,09c3e588bd05e96b4a500b2a747a0c2774f3dfaee8d6b6f6251e11a40d2e389e,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d,Merge_failed,e0836711af02b0f1fec638ed594dde3d19e48660e573178ddeff89e1258f6a4d 5,refs/heads/master,c7c2b3aa06bf4f2d022360aa6a0270798ea3590a,dda511e5d55e736906986d7fc3041896b04de9f1,d40c31053d8f9bec3b3d62465884559649ec1dd3,,True,True,Tests_passed,0318cbf469e559fb1528941c75de16ced0613ce7a205e71aa16ea9a0686e4304,True,7,56,328,4,True,Tests_passed,96452bd1137dada929286aedefb343a7d23babb3ef6e7c1850478aff8c67472d,True,7,True,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,229d330da1d567006a68610ab0f717f4e7ef547c057b301c9bacf7d40f98e9ef,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,a2bc0a570772e66814134889d1383ecc64eefb8af97b697139ad0ee7004a5e53,Merge_failed,c37ce5611a35a039a411677fbde986d929741326d7962b06711940d6d8a6f151,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,3051f1b428321b8f22e505d8b00388509e205d6f605e233b8fc620563aded984,Merge_failed,7f09b8ee03df48a32558138badaa2d26b8a96310faefd379cdbfb487e8990be0,Tests_passed,6d6cd894902bcdc136bf7df9aae8eadf68f2317d85e18dd33af0f4460ef3af12,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,c2fc903c8e4d154c0586ed43fc000130d1eb28c7629c624b4a50bfa39c382095,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0,Merge_failed,33b6846466688e47474e7772e1a7e5e33907701b5f206aa043f2863eb6cb95c0 diff --git a/results/reaper/merges_tested/davidmoten/rxjava-jdbc.csv b/results/reaper/merges_tested/davidmoten/rxjava-jdbc.csv index 01fe9a1c19..6f93003661 100644 --- a/results/reaper/merges_tested/davidmoten/rxjava-jdbc.csv +++ b/results/reaper/merges_tested/davidmoten/rxjava-jdbc.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,d9e6ede39af87c9bd5b4a6033e321c7ad4ccbd68,91ca77ae28a0c8e1db63e401895eb8802b913568,645a7d003e27be87a372430978f9ce55d2d7e676,,True,True,True,26,98,810,3,True,26,Tests_passed,20a4933eb905e10bf5afaca5411eb8d3d0c6884e8224591f2d315b6e3bae608e,True,Tests_passed,c0b93d1f95903fb4c02956b9ab2b41eafb618800ceab2cab8c16d7488bddf834,True,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,2e41975b9d51b4fbf8abf7c70aee80172f2ef79b8910e30cad21441f36133f39,Tests_failed,86c1384a62dcaeb06309e9d23f71c5b3e0ee45cbcbca2f7f0ded44ec3be48bcf,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,2e41975b9d51b4fbf8abf7c70aee80172f2ef79b8910e30cad21441f36133f39,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,507187aca416dcdeb595f466c5061d462d100a70664cc5305850eb640818af52,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14,Tests_passed,4058b475ce157f290d6534647782d65c16c13e1e7b55597a60a08ce8c3d0cc14 36,refs/heads/master,d14cea6ff1fd8032ddd006f555ae2f599bc85015,2a14e99e2eb35aec8476030458a4952b48260de2,9a3f632e59b95ee08fa175127269cdaad5e09fd7,,True,True,True,14,30,614,2,True,14,Tests_passed,230362b3fe1e8a8c8e2edab7824b2d519e4ec12c2faa1c2f3cefd9c13555306c,True,Tests_passed,179efcd744e1ad3859053044fb2cbc29691d5e9f5ce0080c4265e54ca3b9307f,True,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,0feea6749ef3176c911755ec77534121b92a6bcc6ed13fc0fb41ccbf00ce7745,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148,Tests_passed,b27dda7ddeb242360430c898ed884235d91b50461a0c2fb9ddf78d23fbb1c148 diff --git a/results/reaper/merges_tested/davidmoten/rxjava-slf4j.csv b/results/reaper/merges_tested/davidmoten/rxjava-slf4j.csv index c1991156e9..877411f506 100644 --- a/results/reaper/merges_tested/davidmoten/rxjava-slf4j.csv +++ b/results/reaper/merges_tested/davidmoten/rxjava-slf4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,fbe2fde40ff49bfd3c7454e4e9a21c33f1929f5f,a5182bc62d261c1cb8ec42d0260602248151876e,e0e2a3a97fbb66f524ff624a52ea40629de09bb4,,True,True,True,3,8,673,2,True,3,Tests_passed,9ed5426a2f180bf448bba74a95e7d90a7d5276710f0f6c79e7f5a59ede9a5953,True,Tests_passed,5f3b4e55baceaf572ffeed201f7d4830bdd03d13dccf990b0024bfb9ed1b3bd4,True,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,ef684bd36a5ac9b2f1d34819f1f1d49aec0110b2fcef94bebdc203ec386bf93b,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Tests_passed,91825fc16de546044d6cbe1fdc600161b0e525f25a998de2521fc0633b61d602,Merge_failed,c09a6f5b71fc8ce5d0b5a0452b879d4ff19c8d772809ff04d3bc7c8fd01d2d8a,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,91012bfb1c21dfaa8d8ab3c8a868738d36c6ed91ff5111f683738caec6d79aa2,Merge_failed,d7e6366444860a2feb770a61962c65700ddd4e7dbaa29ed893156cdb2685a007,Merge_failed,2bbb8442a4941b809d530a2e2a4d953b0266c892cb9f368da9d5f433f2d3867c,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,f0a9e43f395d9fa84d6ad09bc6973e5967f6da993c2202e621a5db706f5105d7,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d,Merge_failed,4cde420dfa945145b3ab45c245b56b9a25abab2834ea35d3b4d3e4c1e4ae6c9d diff --git a/results/reaper/merges_tested/dbaeli/conf4j.csv b/results/reaper/merges_tested/dbaeli/conf4j.csv index 1537cc9e08..5ccd3b0805 100644 --- a/results/reaper/merges_tested/dbaeli/conf4j.csv +++ b/results/reaper/merges_tested/dbaeli/conf4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,aa63090d1c2b404d752cbc1369184db7766ae53f,a720763413c0f438b8ce65dcbb19cc4ca0e2b057,c4880a9bbc645b96354db770fe69c7c6c891a96f,,True,,True,13,38,,3,True,13,Tests_passed,292d070cf4a8dfa4c851b6228b97178f47454eef92b57f42994f4bdf7af283ac,True,Tests_passed,517245c84132729ae6157e74769ba0d570782d45706e2e85978bf253e918f84e,True,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_failed,eda096073f7d01646941b78bd9f6e7854fa33f9a55d6549a64cb5358eda42872,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,df7adb029e012bc17dd8650849039bf907ec72d1de744da2bc437430f31ff218,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,e1f8472cbd5e41447e95faa9b845bc597c9e9d7f5b0fb951703484face3dc0f3,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9,Tests_passed,fd9f39732598227f58cf5e63278145a4445ddc55cd72e86451aa5cf4dd4213f9 diff --git a/results/reaper/merges_tested/dbaeli/ez18n.csv b/results/reaper/merges_tested/dbaeli/ez18n.csv index b7d453e5dc..d0d7a6eefd 100644 --- a/results/reaper/merges_tested/dbaeli/ez18n.csv +++ b/results/reaper/merges_tested/dbaeli/ez18n.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,acee2a6039d3810a8424f77fb7b72017b31bd92d,b7cadc87f3b62d0e6ebf49608417a50f8666da7b,5c913b3a4e8dfeb9b9c1d268fc5684f327ffcfad,,True,,True,20,12,,2,True,20,Tests_passed,21c6ab0738fd31764a062cc042512ab56e788e185d49b740351ce545bdda8876,True,Tests_passed,b841f396d1a9c547184733966766702278a7563ac24838816532764ef68abfba,True,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,5eb9e68bc4aa05f033bf5fb8fb243ee170fae82e97b4bc14f47fe3593aaab4d8,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181,Tests_passed,ee168d3f290a43538759eb7d3db4da4db891fbf824ccac585117db61d73ec181 diff --git a/results/reaper/merges_tested/dblock/jenkins-ansicolor-plugin.csv b/results/reaper/merges_tested/dblock/jenkins-ansicolor-plugin.csv index 1393dc0aae..0e6454ef4f 100644 --- a/results/reaper/merges_tested/dblock/jenkins-ansicolor-plugin.csv +++ b/results/reaper/merges_tested/dblock/jenkins-ansicolor-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 39,refs/heads/master,8383277430b4034662ab125edca8e76621b1e240,ebd0ac2c904e88dcff5e9440560846476b70eac6,518711af7d86fedfe00ccea08f9e9a2d53e72ae4,,True,False,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,True,3.0,2,3.0,7,True,Tests_passed,a4bee8680284c7a209ebaf204490cf121bda5091554e5c9bb309dbef8cb55a2a,True,8,True,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,d6f93781b321cc7eba5ea8a390827b10594ce08f984d0cf4c21f2a122280c2d6,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,3d352aedf64e45d3f985224894551db42a75a286cec941be6d3d5b7e960b4c0c,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Merge_failed,2db01af6751306f760c9ca83cc68280cff2a75047a00359f96ae406a3ea63c62,Tests_passed,981d2a0c7ae48ede47526da326509beff0b2f2ef2764a67561e6d55a6e036664,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9,Tests_passed,f8b4354e23ddfc0e7ebb82be769beb5d60df7a5f244968902802c6a402a866e9 diff --git a/results/reaper/merges_tested/dblock/oshi.csv b/results/reaper/merges_tested/dblock/oshi.csv index 8fb103298a..a665a1a0f4 100644 --- a/results/reaper/merges_tested/dblock/oshi.csv +++ b/results/reaper/merges_tested/dblock/oshi.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,987020e7df7c7bc094e5b051f423b6e3ad397ed2,6927b5d40eec5bfe8222973bfb944525acfc55b8,5699a09928eca1e6ecea5b658c9b3901da2501f0,,True,True,True,19,111,1352,2,True,19,Tests_passed,68006c4dc8cba9b1768730a2a6c470da757582b520468c68b80acb1b8f3d61f6,True,Tests_passed,876407d0e18995dda187cfc79c68267490460c97bff8aa3a9fff3175121645b6,True,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,99dbe34c867304f2589fc34ae4061a9086d3e86fa9e52648d2a9fdebc7f51dc9,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,99dbe34c867304f2589fc34ae4061a9086d3e86fa9e52648d2a9fdebc7f51dc9,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7,Tests_passed,6cb44ebd54cc1a27c4b6552ced0c4eec6e6b373cc75ebdfde3db07a0b9e3c2b7 34,refs/heads/master,7de1f90a6aa5317e87e60c690c16565eda7d3b09,7d0e1a4d9d90b3ebb916e69a71dbe767423ba4a9,74d7f29da9cc3b2da6cf73f746e2c2a282905f12,,True,True,True,54,404,5892,5,True,54,Tests_passed,5a7132f58b18c6f1bb6593edb7e4d75bd647c0c121341e88d3c01b88e094031f,True,Tests_passed,7b058140dca0f282834f7053414c14e4eb116312b0d61c2c3e4f3addf1d93366,True,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,752283a4d00ec1c14ec57425583a37b58495e82588c6f594a7e18757d7b8bb63,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Tests_failed,039615f08f5c744ddfe65fefcac754882f486958f64816c2a7f73a9d6e572ce1,Merge_failed,47ad9f0b686d0b5bc0041c7193f661b4f5a33b3ed5cf593869a3a71b6d5206ed,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,0b44ad6acaf4aedaf688786186fbf8f72060980f6d0d37af884469685c27706f,Merge_failed,17253708fcf5c17845d35099ef00752ad15eb1f47db537a8831aeb2dd67082b9,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a074a5c0ae3b80b111a2be5d56b59ac2fd72a6d21e215914ac17113007a548a6,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac,Merge_failed,a73b4be06f1177f83b462854cc0b31bd19800b2b9f51d66cdf1266734734e7ac diff --git a/results/reaper/merges_tested/dcm4che/dcm4che.csv b/results/reaper/merges_tested/dcm4che/dcm4che.csv index a41699b7db..c9b2dbffba 100644 --- a/results/reaper/merges_tested/dcm4che/dcm4che.csv +++ b/results/reaper/merges_tested/dcm4che/dcm4che.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,f75864c454f5acdc33ba375f7f2c049ec765bd37,666474daa259e84068a610e1c0654464e03dae4c,9dcf35d34f8aef3053a12499f62eb70faa77dfd5,,True,True,Tests_passed,9ea0be03ae519ccbd1bf3b38ef34f3688ec6aeff4ccea7b9515cc95fc916f053,True,268,774,24103,8,True,Tests_passed,c27aad28c36cf90f1f61d7177347c3a4d8ed514607a89939fa4ce62003f2ccdb,True,268,True,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,a058d4d3c1b75ad3950c0f5a8715e74cd1fe511df709086abe5e992fd41ff101,Merge_failed,f9ca58955d117cbc8e7944cd349f8f0cb6c172e36ede8e85db27e985e581db91,Merge_failed,a7bf894cee046d9dbd509ed26b1439ecc99f4494460775e65a3e68be010a658d,Merge_failed,bfa786cc651b8b241d574ceda3618126dc8c1f15b1fa917464d8dc4033596afc,Merge_failed,f9ca58955d117cbc8e7944cd349f8f0cb6c172e36ede8e85db27e985e581db91,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,ce840f7acb15292a24fb55b9b5982075db451a3c2cb60d38dd8178bb10f32d63,Merge_failed,a807f0896fafad011c81f95987692ea760b920948e1b16e5d96b758340e585da,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,cee222482a79a3752a67345ef0a9c845b4539abe3e7a844545320fa805735d12,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9,Merge_failed,21a04d9ce3b566179532572cfef7ee316ca48614554d8f2de23c8c4a8a6adcd9 19,refs/heads/master,fa3362aa6435c3879b060d7db032c553f914b869,05ca041d775372ed4798fcc759c438adf02ad08d,e584877aba94468467c3bb179171d85bc06aaf4b,,True,True,Tests_passed,a79abd72ed158dd2f603aea5df2d2b853f82fd6d1e16010e75c94507bfdc64c7,True,129,173,711,2,True,Tests_passed,dc3f698605c57770a47c5a6b5af5000fa3a3104d354c32d5b5bb6cea2f34e0a8,True,129,True,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,fdd3d2588e057dc9216624227ab2a189343ee8da297f8db7e4d1bdae13ba8fe6,Tests_failed,4046b9f09a462d9813d0001e9146ce6ddb2cf92dd30146f464800033a66f2e79,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,fdd3d2588e057dc9216624227ab2a189343ee8da297f8db7e4d1bdae13ba8fe6,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,81362a20696a6f8faa054c6dfbf897632a409d389d207a1beca027b5aca94c0d,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8,Tests_passed,337a09182155d1178896afb9d5c8221d917450b0805f8e0317757a74bbecafd8 24,refs/heads/master,39a46b5bc5f7ae3b1298aad7e0e1befa615f1404,6d74b1b9476cc790cb8d03b36778c23aa8d22683,2100085fea8f1cda915761b752b2183075b3b7f6,,True,True,Tests_passed,8a2de182eb01a279e8710048e221e264e08398d7fd975e11347ef637ac03082f,True,198,499,4097,2,True,Tests_passed,494f4b2e62b4e63ff42553a52f1484d49f8a33b975df8f457a9e4827633574f1,True,198,True,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,1e3df9e7240804ab573f7707acb9e7f187514136bf7381f0c27dff574ce52b79,Merge_failed,9a644d99109027af500899240fc803c25d297076353aeaf57c17943105083e39,Tests_passed,7b2259c648aef9ad189e6de7055697529b5ae9d26410be11d8c35547029ebdbc,Merge_failed,d897acb8eb169c31189f12063e70bcd20a2ebe9c464ef9538c33c30be0ec39c8,Merge_failed,9a644d99109027af500899240fc803c25d297076353aeaf57c17943105083e39,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,843fdae3a86d9c3f692e946a8191e462261c9e06038cd52134b1b8b1a971d0ad,Tests_passed,7b2259c648aef9ad189e6de7055697529b5ae9d26410be11d8c35547029ebdbc,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709,Merge_failed,a87891aad4342996f74e717b4666a0f92b97c0aafbeaebf685ec68c514405709 diff --git a/results/reaper/merges_tested/deemopen/zkui.csv b/results/reaper/merges_tested/deemopen/zkui.csv index 0ab75ef52f..8fc2de44f1 100644 --- a/results/reaper/merges_tested/deemopen/zkui.csv +++ b/results/reaper/merges_tested/deemopen/zkui.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/remotes/origin/pull/41,2843e7c28f7d41968a890a2dfe0beafae6f9a2bf,a5fdaec8e4cf1372a1405fe9d3e1fba099ed4e1a,1b3e7c133ab76a26c9c5b3653679d77d0cd6358d,,True,True,Tests_passed,4d7ed55ba79333acc6e479655571c5d872a6655fe3f89191d8d1de1c731915f0,True,19,79,508,3,True,Tests_passed,da227242290d3f32093a77341357e3051c107dc3d912ad8e3e77394641e28162,True,19,True,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,109bcc155f93f4c7318760ac764d0a2a4cbd44b5bf7871f2c6be98c40704e0f4,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Tests_failed,8ac7873650a0138d29417f2066c72baaebed3c15831f67e1684bfa699a69536d,Merge_failed,87385c3c39e0cf8f384953d8309359bb976bb2efb0c4973024ff28e1b2493498,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,b14ea75bd37183a1ccf65a6b6347eab48c4306349098a167166dbb5a4e3c94d9,Tests_failed,ffebe6d28949a12f2314abf0a090790984423f9ed842aef0fe2271dcdc938519,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1,Merge_failed,6d17990373a6f5b8e6f5274b69769b188fbc1986e1a8ab327c10868d521e2ff1 diff --git a/results/reaper/merges_tested/dennisjzh/gwtmobile-ui.csv b/results/reaper/merges_tested/dennisjzh/gwtmobile-ui.csv index 7f702622c5..adedcd5a6f 100644 --- a/results/reaper/merges_tested/dennisjzh/gwtmobile-ui.csv +++ b/results/reaper/merges_tested/dennisjzh/gwtmobile-ui.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b1d29b7602f643ed5c7dd04acaa1d63631910a61,d64644d33bd0f11ce6e3b9c5b5118a19f7cac75a,a10abd5c23e2010d995a19a390e58459cec4f361,,True,True,Tests_passed,9be271cb89f6b1c4789f148708c0c7d2b1de15153fd705b9b5008801fd497bc1,True,68,496,3765,5,True,Tests_passed,11678f44f2f3da590d24dfd1fb40c603b963413bce96e02f0bd8bc07dda2a615,True,69,True,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,36988666a03dbd5bac826eef8542d642fc7097ad04f69bed816496a0d182ea60,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,abd7352279cb6408e6293a2a5825197039fdefd5508782ff2cf6ac9d257cd5f8,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,2313780fbb55d2895c594d5e073905cab07e061acc5c8d7c6b7a0662a1925501,Merge_failed,2da4b74261ddb4dac20d2c0a5e810eb79564e0321a2511d11cb13defebe5f140,Merge_failed,f1c6e27ef470219dd1443395bc62e5952bc0c73bee5da2024660e6ba42fdbb73,Merge_failed,ec4a34298d996122b7d8e744d397bc91bb7aa24bd84884f1053479740c93049a,Merge_timedout,,Merge_failed,f1c6e27ef470219dd1443395bc62e5952bc0c73bee5da2024660e6ba42fdbb73,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,abd7352279cb6408e6293a2a5825197039fdefd5508782ff2cf6ac9d257cd5f8,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,ec8e207a4445678b6b00ed3c70aa5203e9fb5bb0c6edff8c2cdd4a7138c25dea,Merge_failed,2313780fbb55d2895c594d5e073905cab07e061acc5c8d7c6b7a0662a1925501,Merge_failed,b1769ccc2779110209f714d61348c9e3877f231b66a5f9ac65398573efb3f63b,Merge_failed,ec4a34298d996122b7d8e744d397bc91bb7aa24bd84884f1053479740c93049a,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,36988666a03dbd5bac826eef8542d642fc7097ad04f69bed816496a0d182ea60,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535,Merge_failed,7e73858c1f89eaf6d2806a8ef698c363760fd3a5312f63c62fe8225585b1d535 7,refs/heads/master,a0fa55093e7066a5356535bdbcc382f78daf23ef,c138b79d228f266a79b3e1059e0d717cb3059574,48843d4966dddb16e0af6ec69b8ed200638b2e0d,,True,True,Tests_passed,21d70804264e5add543795452bc2179fa93b8e1e75f40701605d7717678013bd,True,8,22,273,2,True,Tests_passed,13ef0184078bd2cfca4da13fadf9e95ae83842fd291ac6e2f8c5caadf845836d,True,8,True,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,db1dcd6b0b6725e3f83baaa680de8b91cb63efb7e307449742ea07c9e8c571f1,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,0ca33fa4feefa66bc4839397782afb93b65ec03b2b82323c18e1caea5387ae5d,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b,Tests_passed,97d42871ef71c52e73e870744b9ceeb4f7b26b5fc92bb22f04371ad57cd16d8b diff --git a/results/reaper/merges_tested/dfabulich/sitemapgen4j.csv b/results/reaper/merges_tested/dfabulich/sitemapgen4j.csv index 91335e8963..84e0c17179 100644 --- a/results/reaper/merges_tested/dfabulich/sitemapgen4j.csv +++ b/results/reaper/merges_tested/dfabulich/sitemapgen4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,a46ea9ffe51e0f77969a39cecfb2fc9fd479b19b,5ea973b161dd9f9606305784c087afdfc1e71803,54138163cee4508b3f2b28c461e75c6b20c9d7fe,,True,True,True,17,81,631,4,True,17,Tests_passed,2f9c9c6d06d8a0c22de8f31b953d81d872c52de2484c19312142667e68393c25,True,Tests_passed,95b879c19e25cf8b5540b01982587d2f63b8af67ee159e81f51b8e57f8abe004,True,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,0ad9817cb18b335b4a646bffda834be0aa577fec80e34242631f09e7d238ab78,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,abcb094f5de5b3c7f22fc6528590c8331059ae073759bb5b57734d9a9cf2a17c,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f,Tests_passed,dd0e764ab0f97149cf86ff2f93ce033bdc60fee566ae8ce5f259560b54cb5b2f diff --git a/results/reaper/merges_tested/dgarijo/widoco.csv b/results/reaper/merges_tested/dgarijo/widoco.csv index 5d9da37d30..ce18e96503 100644 --- a/results/reaper/merges_tested/dgarijo/widoco.csv +++ b/results/reaper/merges_tested/dgarijo/widoco.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 109,refs/heads/master,dfa60976ada8bdced21ff043fe763dd86314b7cc,d57b8de32106b44b9ca3e00ecab1b20998a4a703,6f217334138887945085c9b24924f881f8cb1232,,True,True,True,11,123,885.0,2,True,11,Tests_passed,36d963fc2e67f2073cda9b2cffc2917f0059b4d2396f16ca33b45731994fcad3,True,Tests_passed,9772c3d82fc1f914621d7cff668b1c14da39d1ad3c4fd9c3c4e9ad0cab75f4b9,True,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,f1400af762691284f6ae1453549d42bb18427913582350db6e79a455fea2e1e4,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,b3433dca6c43028113bcf7634cf1dd7c9caa16ea68695e9aad1ed30a3529061f,Merge_failed,124e4a7e87e6c1c32d3de9723db06309d5e9b4ea9eb02b994ec69a9c68a69d63,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,66b888631afef1f5229f2a255732abb53d6e422a69f03e3a5d63c64681b91bd4,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,794896f17a68e92c9704124e27f1984ff8b8b9f2c7d724f41f1ed098a7919ae7,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b,Merge_failed,219ff06726a3f01ea8abbbc1067bb580a1b293c3e6e174b4ca5b4bafee9b020b diff --git a/results/reaper/merges_tested/dgradecak/alfresco-mvc.csv b/results/reaper/merges_tested/dgradecak/alfresco-mvc.csv index d679d1710c..23c75d9a19 100644 --- a/results/reaper/merges_tested/dgradecak/alfresco-mvc.csv +++ b/results/reaper/merges_tested/dgradecak/alfresco-mvc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,042d59bed8b1651367380523918f4e1145c9d9c0,ee2bb44d6352d83a1f6e322f464b326e90fc571b,18d4beb52eda96ae1898937be0539732b0757254,,True,True,True,47,101,1976,7,True,47,Tests_passed,bbdefa6792386b5057bca2cb5075bbfea0a5a9469e7bbc2f630500f7b532cd23,True,Tests_passed,cb7f688e83e2a7f7af20a83a98379bd5aa1fd11f425f5606771bcf27efe0a9d5,True,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,b76a640c49ae347c444620dd1e075f5864f232b5e5a2c74f5ec64235390e3957,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,25ee4db9cbb1181c979a6bd58ef2d592cb8d963df24aa120cb18d559fc1dd75e,Merge_failed,49d0eb5111a9200963af3c883afa5beb4bfaffe5ca4b0903ca909d89a5464de5,Merge_failed,c8fb685a155366b27b732b2c0568508d1091dbbb4e38f2267a49b13b9f4202e0,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,678d51b5fb840a99ea955f62f14981c872561a9fedd76c4e753d5e298693bba2,Merge_failed,0099f6ad0056ce31cd2e11b336a8f1c29c2506470dce09fd5bcc20ada05ed319,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,961224c3b2d8f03142c6acbaa57d8ac66704723f18242483233de01fbe48f0fa,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f,Merge_failed,d2564132e97865bee026553c71f92de0ffd2c0da85916cd790fd08b5a8ec030f diff --git a/results/reaper/merges_tested/dieselpoint/norm.csv b/results/reaper/merges_tested/dieselpoint/norm.csv index 22a432a474..8a43466f4e 100644 --- a/results/reaper/merges_tested/dieselpoint/norm.csv +++ b/results/reaper/merges_tested/dieselpoint/norm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,f09183b3a52d7713dcc6a1b6036bcd3819f947c9,bb4c6525f96b050686cd07f699eed6eff08ec003,8acf20e0ce8d99523927b4fcc4eb90b92a0a621f,,True,True,True,3,7,14,2,True,3,Tests_passed,002068f268c446f8615ab6f7bf2b705e06e8b168de21f0021ce115be246c40c5,True,Tests_passed,b81a7154da85ddc115baf5dda5a5b37eb97e608ce390a64d013a260c116cf302,True,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,13ca96e9b6a6a70cb227118fbc3dcc2df35e433c66549412f0e2e643ffa1453e,Tests_failed,8415999c99d855aefbe6258db23b3c6fd4009c8434541b525e5534c7e193bbd1,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,13ca96e9b6a6a70cb227118fbc3dcc2df35e433c66549412f0e2e643ffa1453e,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939,Tests_passed,19433507716024f5f22e26b58c6c7da9f5f603d9c534849ece60abdbde9e0939 30,refs/heads/master,f8d53daf63a983bf21265165ea8b129400f132ec,a4a52133ef089e488bea27496ff0be716a6cc477,d1d69a623dedc255fbe98a446e1f29054bd475f4,,True,True,True,10,23,1228,2,True,10,Tests_passed,f3e3b7ae5e0ebc970955a30e835d301ab79715f6ac40edc3d2bf63894b96068e,True,Tests_passed,d0fe1f6b5e869dae8d572c51fe962ec3d395520e39fd9f3c9fe0e28fac10f4ce,True,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,165eaf1384bdeae0a034ca29e0531e3c7744af60f8457329a6eb6849362bd609,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Tests_failed,85c7c80c4bf82aafdf00a83093f1074e8474d8e7edf2aa40569f2defaeaf0259,Merge_failed,b0c4b48d34b409c7066dcfe7b890f76096ba0a9978640a611c1ae0a27eed77fa,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,6a9c00b944276a4e117657f9b0fbd9bcf695b609c354cfdbe4d777771f77e96d,Tests_failed,8b99dd83c9325d40021ae753c61abdce0abc5ae91dc8ed7f173f1cd8d5520685,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,ce47b78581fc6890e5e754cd690bd3be1b21e3d6e1d8fb98ff335af960929341,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2,Merge_failed,41f59653c64a834439372a5649798e66a14dd517fbae248513cd578572597ac2 diff --git a/results/reaper/merges_tested/digidotcom/xbeejavalibrary.csv b/results/reaper/merges_tested/digidotcom/xbeejavalibrary.csv index c1995794ca..25e3102df7 100644 --- a/results/reaper/merges_tested/digidotcom/xbeejavalibrary.csv +++ b/results/reaper/merges_tested/digidotcom/xbeejavalibrary.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,6279f85f74a80a9f651b3fdd0228fa0ec737060d,b359ecc56ceb9719bf00ade9d4beee4fef6fe3c8,96eead5f9fa275c93be11b9af8317c777828cebe,,True,True,True,72,492,20450,2,True,72,Tests_passed,e8b67e8e0794fc762fd35cc628592f7615cbc9629588f6523206ff57a045e8c8,True,Tests_passed,8b6d9cf1e529a48406b0b9ff6ae9b670bc6606ee103607e77c765da736e1faae,True,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,ccf012fac1cb6ddc6d72d7c7509f35e1bfe6fbfb9d44084427ada7f380cbe431,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Tests_failed,a2eb7275b4ddfc74a98d77ae9671fdc3633cdff589a006a8ed1edfeed86618a6,Merge_failed,4f040140ead4d4b7cf2664f430f93d344257ebb9035984cf4f6352d427f5cdcc,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,6671f3ccffe7964c37b15266d288c8b00ed37c8a65ade2f2f8a5e8c623101dae,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,818c77623363649d66973154d69b71fb248a89c38f77418c0f479718b685c8a8,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,d6e813adcf06913e0e2270dbf25de8e46e50b080897c894c48587e19c41977bd,Tests_failed,18b25ed0cdb25f1dc8b4045543c373d905f2e421dc7b208a1693af69653b1818,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,9222539152d28f37424f0e98fe6a06db9999e9357690988577fe6d15b46ff606,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433,Merge_failed,7f8e6e2bd3552781d77146351621e8d5bebc2f643b70926db0292574a415f433 21,refs/heads/master,7436990c0ba30d4245bba56cbc344978648ec7f5,4527eb45f37d38903ffa14ca88e32d90cf76ef3e,5a4db57de99d7aea4d5b49c1ccaca0102ec8aad5,,True,True,True,82,856,4405,5,True,82,Tests_passed,a3ba4f24d3de1e57f6d778a991eee71f6ea9ed7153caa769795e4e2518eb58c6,True,Tests_passed,1c563d9ade3c33ca7680ab33db9275749aed0962733351b398a9b79d6cc31f26,True,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b48b121140ec80022aaad82c7632925a40ba9ef8b1d8dd83f5c91f85975261c0,Merge_failed,6a9c8209ba0556ffd61b662eff7d5aefe94a78444ca0b335065d81c2a3e89834,Merge_failed,6a553f0dcbbbb8ed7c4a4719fa487e0aee096411b5b33a59196ca0b9f9419c81,Merge_failed,67ff9099150eb4bb7804c1d476f5e02f0f393583c04e9d2d44b4f8003a2eb812,Merge_failed,6a9c8209ba0556ffd61b662eff7d5aefe94a78444ca0b335065d81c2a3e89834,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,4d1a005131715f274bea69273d62e5622da77c75f11b6544d1f7270dad1e5b78,Merge_failed,6a553f0dcbbbb8ed7c4a4719fa487e0aee096411b5b33a59196ca0b9f9419c81,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,f715cbf44bf42c6a15f2c2e31850e5a67d7589ee01c4f7ce1d8001928ec39b6b,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441,Merge_failed,b1be7b6310bb68afe82b28d2e3b39187bf031efaed2803af50176a5a3b986441 26,refs/heads/master,b93d1fb5307232991a8db9db216ae99239edf483,819a383ff8d1fa8b05025856e6d1b4d878bee24d,ae2b691756e0a7f63e8931027da33c97ee20a74c,,True,True,True,20,292,2505,3,True,20,Tests_passed,26f83063a5a074f6f96a59bc19eab5764e75a8653e359575e2ecde82bfe00f29,True,Tests_passed,9c8342bfd33f9833b579a1eb1b19d9465ef0e2ba4d49abe791753099316f6992,True,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,3a85f172e740bbe3841a553a2c0dfd6c18fdaa2578f1b217b2dc4b13dfb3a4eb,Merge_failed,33fa0ba18590e729e3b87e5b320819d4514ab1460f18101ebf5ab1d3f2d53eac,Merge_failed,a428477d1e1fbe9f3b23befa63a9829bb3ee602dfd4906c70e927a0068ae5e46,Tests_failed,448519ba1337d3d9a7f2be6a1d31bbc4a80f4fba9f4e008f01d1e6bba768e4e8,Merge_failed,33fa0ba18590e729e3b87e5b320819d4514ab1460f18101ebf5ab1d3f2d53eac,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,3d4a00373529266d56afd3308aabd952e85e39080c8825eba811e2147d670f80,Merge_failed,a428477d1e1fbe9f3b23befa63a9829bb3ee602dfd4906c70e927a0068ae5e46,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,74f141b9dc27430cfab7fc362d09a864a3ec0856ffed19dd0d878f9d2756fdbb,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43,Merge_failed,c511b49946414edc298cd3f2e37194e01aa1a87e5ea68df22a99128d9feaab43 diff --git a/results/reaper/merges_tested/digital-preservation/droid.csv b/results/reaper/merges_tested/digital-preservation/droid.csv index 2bbf16eb66..388c77b06b 100644 --- a/results/reaper/merges_tested/digital-preservation/droid.csv +++ b/results/reaper/merges_tested/digital-preservation/droid.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,806b8defec13350fd40018aa550f83f8622a9bad,29819eda1f7c9cfa8590e1fec829be57c39e4713,c2b98114e7404662914b9eea5af0ef8d624b6404,,True,True,True,615.0,705,1618.0,4,True,615,Tests_passed,c38b8fea3b86c1e05f000a64aafd85eaba0fa2e5db27becdf81aa3562eeb9b1a,True,Tests_passed,d161e475a61c86a36284af59b8b3b616f09ad3d6fa14fdd1d0f9b6aea4719e5b,True,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,f5025cf9d8642ad0e13ef89d8ec5d3760ce2f03710e56d17a971968b665f4303,Merge_failed,6e12868af89b0bc293e862b02ecbce1558c4e240237876053cc8ef7799f9e052,Merge_failed,a27efb642973e9becaa4502493c61ad1019aa426391e8efc3757a3d0bac47335,Merge_failed,a27efb642973e9becaa4502493c61ad1019aa426391e8efc3757a3d0bac47335,Merge_failed,6e12868af89b0bc293e862b02ecbce1558c4e240237876053cc8ef7799f9e052,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,9373cf085b658ac560aff16046f8aadb8ef5e64ad72def85735143c984fc4686,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65,Merge_failed,d62982a75b89e8c4c0348d7bda607abab3c2599c21d04f885b566c42b5270c65 437,refs/remotes/origin/pull/907,884dcf7cf3988311f20fd94dd84ead7a9b6ecf2f,2fdeab05e76191e920e91aadf0c4add3a3169f40,d2a137537d96599342213ac9976c7cff38aefb20,,True,True,True,28.0,59,251.0,49,True,53,Tests_passed,8266dbd6e11343bcccae65c3b897ae0931b6c2299ae13f5f18c706af7247d7dd,True,Tests_passed,7f1ec6c6f28c70f39259ba7653ac31cf9abad3b42c7d894064296403763d364a,True,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,b7a3409120feffe51b50bccb9cd6d8d39910c63944ac25316e8b39934287d0cb,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,5210112feb538390b5341dfa342e1d360d94538999e3f1cc376bfad0b5759645,Merge_failed,f0e060643c4e4f268de0f1bc1ec9400c7be29b2775ddc688a87f26efadbb1a78,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,259f9471876da22cb168c6c1301c0122a5d1fd36c2b6d9eb0b2504484e9b58aa,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,2e138a473a9e51cf49e373f11756b427d2be2688b765cb7874288dbdf020211b,Merge_failed,f1bcbea1560623452d2d318fa15813ec5ccd3a66d5c73ba1eb7933bf379e0460,Merge_failed,e06f3853544cf5ef92a99829bdba3ba7e95c4f1212ae8dbf3f06a4d37f5047ee,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,777acd1fc051fac0f6c52cc81cd977e6bc8a5dd2d33ab0e643d28f3f0506c786,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b,Merge_failed,573583c29cf9416942cd7b327966f97428403b6f267c5bec26fd36f7e804963b diff --git a/results/reaper/merges_tested/dius/java-faker.csv b/results/reaper/merges_tested/dius/java-faker.csv index d6acc76527..82f24368ce 100644 --- a/results/reaper/merges_tested/dius/java-faker.csv +++ b/results/reaper/merges_tested/dius/java-faker.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6f72cb24c50fa83d23a92aad65bcd57efc6bd650,f5efa7048f29bbf3f7a7423e4ac0e8b1a645928e,1d884a03d6cebf07de6fcd24d416f4b187f1d83b,,True,True,Tests_passed,084a0323468c37a50b9c51507abb885e92ae649c3c1130143bf844ccc74bea50,True,14,24,375.0,5,True,Tests_passed,45060dd0675364853a53d39266d32f2c103162231ce9cb842af279462831eb23,True,14,True,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,0aa3783a701cb76150c1ee98b9725469f3c0a882b39c2022ac47c1014f4df648,Tests_failed,1c5b66a8bfb8b2bcb0bd5c91bb8059c8db8597d526fde6adb408c3c819d2488c,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,0aa3783a701cb76150c1ee98b9725469f3c0a882b39c2022ac47c1014f4df648,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e,Tests_passed,908b5cfebd20d38677df694586e8a5ec1dd74dd6e0b6f060f3006cff37312a3e 9,refs/heads/master,b60f23a54a511cf7e24c09366b2957219b448125,6312699f5ed6492f3b9005d849d4a57376f21f7f,aaaf8d9e4783a7e5a2d693f5b870fd2a3756238c,,True,True,Tests_passed,fa34cdba4acbfbc63ab111a36e7fa1aeaf7eb053684af45ff584fb4e3e62cf9b,True,11,18,894.0,4,True,Tests_passed,618d84f9fcf8ceb73a5ae82b6493c069870273a2e24386289433ecc72afa4760,True,11,True,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,05bd0d2ab3662829240207139bcc1831111eca79c247ba1d9442c90738797774,Tests_failed,6a645b7a00e9703125cee940a8f1dc257bca12861be0a342758ce420e45523a4,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,05bd0d2ab3662829240207139bcc1831111eca79c247ba1d9442c90738797774,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1,Tests_passed,50c9e9d35a65150c4ab36616341e0cdd249ae8f1e3adac6635a41592cd6e0fe1 11,refs/heads/master,aaaf8d9e4783a7e5a2d693f5b870fd2a3756238c,e09c6d4d31b373f8e68fc6c8d00353b77d472730,4fce1fad9e76780fa24aa3d4af22a29aef538593,,True,True,Tests_passed,8e427c885ce76d15d2d7826ecd19f0e7727c62ad7500939d51b845590c92e60b,True,42,68,1228.0,5,True,Tests_passed,0f262510f19962c54027ac5eca7ac64b688e9b1ac113b91acc43dd608df404bb,True,42,True,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,14c26c6250e5c20768aa6febaa2ca54e3273ebd6f71f10c0689bbbcb154b414e,Merge_failed,13536c220a4b533b58470d03f6802dac1e12fb6c72f8c29e2d29dbc3218f5d34,Merge_failed,994fe419e004a802a2fd4d5736d0b3a3704b9124b2c00ce3b66bca06ed906c3c,Merge_failed,0a2222e659eafdf79cfb74902b818f21a62fd2fbc089360f0e4ddd737ac41912,Merge_failed,13536c220a4b533b58470d03f6802dac1e12fb6c72f8c29e2d29dbc3218f5d34,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,12cc80b93159ebd6ce18c4fe872aa70000dcf772dc6baa97a45937548fd798cc,Merge_failed,994fe419e004a802a2fd4d5736d0b3a3704b9124b2c00ce3b66bca06ed906c3c,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,3eb897e56a36ebd67ad2f9a3cb8ca38e06bab1ac19a44578848ca3d3cda00e4f,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56,Merge_failed,68f41352e38cb3f973bc6c8809b77d77517a5c01519679fd204d9fade6255d56 diff --git a/results/reaper/merges_tested/dkunzler/esperandro.csv b/results/reaper/merges_tested/dkunzler/esperandro.csv index 02a5fdb531..8f6d73d505 100644 --- a/results/reaper/merges_tested/dkunzler/esperandro.csv +++ b/results/reaper/merges_tested/dkunzler/esperandro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,a504784178f32a425ca7bd38f97b9a77a2eb6dfa,e156637fdb31048b51adc5755955513eb79dd2bf,ea419131fe919ea4348d96d36120dd6691b9c4c4,,True,True,Tests_passed,918de87a6baf9ecfd333d88564636d8efde9d724ba231dcc737ac5794e9225f4,True,63,294,1208,16,True,Tests_passed,ae1837beeb423f43a5d7c85097ee3cb8768f1243faac88ba40af58233fc5ec95,True,68,True,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,d733da41ac521e1c851db1807df4390ad8013cae50f7ac93420671b14c592d36,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,17cd4b1c2c5ec36b0fb026d0597b0cf63aecfea3d80988d8d56e6347a268c819,Merge_failed,109773588707330c1e6e0b45eccd556c6c571fa2ed64a37d6f8600ba323b19fb,Merge_failed,0834e2520efea0f88a8fa724f841c103ae50113a60325931ab340b74740f0142,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,cab6d67826f483968487e6de1cef99cb56af4eb190d33fea1d6f4eb26227c818,Merge_failed,00b770a9a2f970fc5cbef9d537fdddabe76f3083938b354d121aed9d5fadf85b,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302,Merge_failed,2da1894c0c98f9a73e3f30d710bf1a1bc7574497fc926161bb2a8db0aa237302 diff --git a/results/reaper/merges_tested/docopt/docopt.java.csv b/results/reaper/merges_tested/docopt/docopt.java.csv index 5e664bd101..7eef27b23e 100644 --- a/results/reaper/merges_tested/docopt/docopt.java.csv +++ b/results/reaper/merges_tested/docopt/docopt.java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,2802ccf5c458dc747b15d3ceaa89889d41a4d0d6,2d23774813b99bb9edd75bbe7e9cd6370ac5f7ee,85e1eff2c7d4b171c5dc2139e484ed4dfe7d443b,,True,True,Tests_passed,06b2ab0fbb0ed241e3c5d54cc447839d3ad1540efd29e12e625b54b6e85a1a72,True,6,109,474,2,True,Tests_passed,ba91a7277eb2fef18a6cc6e603c9908577fb1b96f951dc260979fe67c29e10df,True,6,True,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b389e60baf2c2922876741920cf4de0cedeeb041e945266b0b9c2d9eb5f3c42f,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,2639434219ab08d3931d129dbe96bdaff133a861078796b5c021de3dc11fe309,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,b214a77bb2b4287cec1df5fd30d738a170f5aa0a49816ee4daac65f2873e5124,Tests_passed,12dc3caf138a1b9893142f45f89da9095aeab846dd571b558dfba1cbab617c74,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Tests_passed,1222731aaf9c9bd2d90d45e64610099c41661006062c90bf0574b4d6939e685c,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175,Merge_failed,ac8912c240fafac346d7b713ef6a5c7b0f422b2334ecce97493aaa8d02519175 diff --git a/results/reaper/merges_tested/doctau/garbagecat.csv b/results/reaper/merges_tested/doctau/garbagecat.csv index bb3a640670..fa5e715bb2 100644 --- a/results/reaper/merges_tested/doctau/garbagecat.csv +++ b/results/reaper/merges_tested/doctau/garbagecat.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,4af1d9c4fc71246add443b99af9cc47e5464aa89,e7c37428ea20228556d3ef1e8fec5c553d47547d,269f0a1387d1586db729ca9194436a2e9fda7c8c,,True,False,True,3,5,13,26,True,26,Tests_passed,d042669a1907ed474f7983458cac03651aad805d1d9ca218d4a9d18f8e3dd9c6,True,Tests_passed,bf6e7fd09d4b305d78e471aa512b3e256fb613dcd894e901375d61e95fdf5b9d,True,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ea135dd2ba5c6de3093dbdaf3941515173fae2c2dd7c8757c664fa5690018d66,Merge_failed,b956596156bfd972ed274386197dfbae2ed9ea9e3b809e2464f733ec13a2e233,Merge_failed,31fd950be1d2f6b2466affdd7aeecb6fa085cbbc2ea1a56aab83a2685f742638,Merge_failed,2bf0e68e5259188c82bc81ff20e078be20944111323af3db08c6acaf350248f5,Merge_failed,b956596156bfd972ed274386197dfbae2ed9ea9e3b809e2464f733ec13a2e233,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,088c5160da6215d593038fdbde877c6f8e0852203df038803fbae1e110ef6cb3,Merge_failed,31fd950be1d2f6b2466affdd7aeecb6fa085cbbc2ea1a56aab83a2685f742638,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,ed8f2beb0f931aa7fb0f7e9fbe00118263f4f387c99f1f790d51be66865e37aa,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b,Merge_failed,06619a2f55aa9eecadfb90f3944f2830d5d24e8efa9d0e9ed82a53c0dbf1232b 8,refs/heads/master,583416b443b6e9679f87705f5b98f0f42e3cd19d,9a6da251a0d88bbd1607fbefb75a2ddc2393d51e,b9db442fb05065af24a43906a02bd4201e9d265a,,True,True,True,14,91,795,3,True,14,Tests_passed,24a27151170cdb00180e48414ce3d9433c051aacadbb769d6b1a0836d5392dee,True,Tests_passed,3b63e37caf69facfed7fdef20d99533c34e7ab252e24647184698a58014f58f7,True,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,d2bccb4adfe40fa75578f77e396fe8908393032e4a0d59ef6229df9067b1a8fd,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,35d1366b2805181122d3aec3b037f6afde80a37fe89c61b668f6685706f99ce6,Merge_failed,3740231529c46399f86ba4d2093745e22ecefe931257e7c4418eb5650a226903,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,ae04cc7b3073b3b659eb535c583b05652fb73d875c85d05afa1ecbe6e1fbc6d8,Merge_failed,b366cbcdd728fb013bdb1f01eb8f60de74c37e0cb148595cd3e4aa08aea6e0f5,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e,Merge_failed,3266f7d0e58c58324a6913f330067ae7d8f9863ec6d089145b32779d87f4249e diff --git a/results/reaper/merges_tested/documents4j/documents4j.csv b/results/reaper/merges_tested/documents4j/documents4j.csv index 2f38c771ff..a390297103 100644 --- a/results/reaper/merges_tested/documents4j/documents4j.csv +++ b/results/reaper/merges_tested/documents4j/documents4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,True,36,44,655,2,True,36,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f diff --git a/results/reaper/merges_tested/douglasrodrigo/bfmapper.csv b/results/reaper/merges_tested/douglasrodrigo/bfmapper.csv index 59ae21b987..e20513aeab 100644 --- a/results/reaper/merges_tested/douglasrodrigo/bfmapper.csv +++ b/results/reaper/merges_tested/douglasrodrigo/bfmapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b0056fd6f8d833d7f7dd54543504f344787b53b2,6639eadfdbdaa63fe81a02bdb3f78ec38123d758,bf85cfee8a96e9e85ab29ea2d1021ec97dbe5e58,two initial commits,True,False,True,62,8,244,3,True,62,Tests_passed,b591f19e6b53b09c3202cffe91eebab9c80d020f7afac058e8384079d15f571f,True,Tests_passed,96efdb52c0f05045d148e13b2e2642ca1330633388aa85c73f3b213d10dcb7c1,True,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Merge_failed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7,Tests_passed,650149c06b8b49f027387045517cbfa85c0d356f32c30a034c064eb2313a96b7 diff --git a/results/reaper/merges_tested/dozedoff/similarimage.csv b/results/reaper/merges_tested/dozedoff/similarimage.csv index 04398c9279..d4fa1a7b7a 100644 --- a/results/reaper/merges_tested/dozedoff/similarimage.csv +++ b/results/reaper/merges_tested/dozedoff/similarimage.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/develop,5f69834a3348fc078da6db2a849edd3440126844,e2ca5ae1cc6c201aca9ed4c3bcd8f29f748de4b4,f1023bd8dd3be8a8ca144a9597e3221061226dc7,,True,True,Tests_passed,cb5fe5d0d0679ff725e5cdd29099fd6b25f23ac7019daeebf3c1eaf6ad2bb334,True,6,46,237,2,True,Tests_passed,b0e8b0da1d6331a5bf4559d3a15c3488d8780d560d567dfdbb10fb8d3301908d,True,6,True,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,b68861db1ec760bce19b456ab5352a0dc26dc5e394499a8a6b27d04dca3b09b7,Merge_failed,b0ee3d8e554d675343781e918dee587164e4794527253296af025cb947c3623f,Merge_failed,3582c0a835dfd4b9e8218a8974e08cb5045f34357af6d812428b510a89b9a6e3,Merge_failed,3007855a734060a53e7ff0467b49fcf01d7c8198025d16c3a63b0b4f8c38232d,Merge_failed,b0ee3d8e554d675343781e918dee587164e4794527253296af025cb947c3623f,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,4ac5e0649de4c3e9ba243512c97fd08cfe128a0104822c1bd492f9b4a50afa47,Merge_failed,3ec15eaf61864a73c442a45d516900dd14be7b1188ae2bdfb522c93b3fff691d,Merge_failed,3582c0a835dfd4b9e8218a8974e08cb5045f34357af6d812428b510a89b9a6e3,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420,Merge_failed,89a6cb404a2423aeb7c38d7d7ed7a518f7878b3ef8ca018a97c43b9d81772420 24,refs/heads/develop,8137e10d6d6882c6461a20848c0699404328c767,65dc547c6168c01e2399106e022edf1aa6bc8711,33070ec5138938496f3349197d8e0f0d84bce790,,True,True,Tests_passed,4a5639825ed45d13ad085d24d4b845a17db97c219feb349cd5be18d964332041,True,11,59,364,3,True,Tests_passed,dbfb2449c2152c7cccad58a1aadc3f8196ecbb40e832a6423e8cb0d2aeb265b4,True,11,True,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,d0ef92d365b73e8beb51d1ab0a2d228feba105727f1917bc53b8f7a41e88efb4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Tests_failed,9d4b9d111ae563d40d7b8ceb1aa39ade0e7e4e4e92d795ca45a2b35c413edda4,Merge_failed,8bac4ae7e2dc6c7b91863066ad9ebfaa3b571c11a2afba73a9c022a4b50f6720,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,9eadde18136d4315f6d395459c13dd7b245f38bec3c1545fee3898b06d56458b,Tests_passed,53182af80ecec212cf47fac4873a85c3ae06ad63c01534354727e3ea53a7f20c,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3,Merge_failed,2733e4e80482f68a2f60546f7a0ae273dace5ceccd9e7280a8168e2e1d2857f3 diff --git a/results/reaper/merges_tested/driesschulten/dozer-model.csv b/results/reaper/merges_tested/driesschulten/dozer-model.csv index ad8a5ce3cc..f81539d651 100644 --- a/results/reaper/merges_tested/driesschulten/dozer-model.csv +++ b/results/reaper/merges_tested/driesschulten/dozer-model.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,b9bf37c27199cb309f63a58a902be3730ba67f07,a392ef24a10e13721a6a04123350a19f17b81a02,95a465b3f6607140536011100231e2af4be9fc04,,True,True,Tests_passed,dd9c88dbd85666dd685fff0a8febc3ec69ef0a17eadc466b8c1110dc72ee7750,True,5,25,181,7,True,Tests_passed,9566f2a6ea13883d96f366c1444d84188af8fb5055d6b99e6c05c2e1054a7c5a,True,9,True,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,2d1046826cecbcedaafda3e09113bd2c6e5a94970b5498be152caec893a15ed2,Merge_failed,ce8da56636b37eb6bc38fdd9ecd4f0925d915f7bc5aca1a82e34253f02a39819,Merge_failed,0fefa0257ba196fd722060467638b39a6053b82cc5f511502770bdc8ac3e264e,Tests_passed,170d5b3f1cb555bd0b279d2f38183f6ed34f6f1ec52ebaccd799dc65353bb8b7,Merge_failed,ce8da56636b37eb6bc38fdd9ecd4f0925d915f7bc5aca1a82e34253f02a39819,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,061b08fffd071be46c2b12dbaddfa94803d3f106bc0c81ba756f481d6db87503,Merge_failed,0fefa0257ba196fd722060467638b39a6053b82cc5f511502770bdc8ac3e264e,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f,Merge_failed,5aa093bac6337caa18afeb8e59e8a4e4f69db58965d979a490db506df52dc22f 9,refs/remotes/origin/hibernate3,c7260c73f58d242b6181dfb05d588bbd0b23d5a1,1ad2803395b57bb2caf6d866f8afc1e8283712c8,00dc759c0edb8defa788bf42ef8888fb40e913a1,,True,True,Tests_passed,cbdffd8a86739d9a1c7ddbe2698323e4a6ed294312a141d82cc14bd61e879b8c,True,12,32,104,4,True,Tests_passed,d688e4dbbe71181e65399e6d5440602208e3ef8f9c48251c74165fb95ac5f353,True,12,True,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8bff437674b2a1923b335a5236bdc465a1fcc7000fbf10746b3a8b972bb24a3e,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Tests_failed,8cbf56ff12e76d6183bfcf18ca1b4e17b3dcd09cc95a615edb7ab0ea134e1f66,Tests_failed,532687da8e96c63fc0248ab2c2ad7145d842deb7877bdbc952b4d12c0c086827,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,86d0551959c198a203a04caed42f694297b391e6cc974cf92dca4032f9611bc8,Tests_failed,d91802429fb90733ab76fb2af71ba637866bf9a40fe74f1836d804b797f469da,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1,Merge_failed,8ce10cc421778e373956064178d5032f7c2928914bb9607e67e8d9e7e75f20d1 17,refs/remotes/origin/hibernate3,393c355622cd121e1f1a292f2afad5490603357b,3acca52d1af519bd1e79060fc1bca0d4e040fbc1,f3402ee476995f820d0ed87c3d8493906a334811,,True,True,Tests_passed,fa439a1422305359981aaf3c98f7c79d745657b8d6c2c03c3370f44354eb7cae,True,12,38,166,3,True,Tests_passed,b1f9ac7f18e0974bc92c8e58478409d05bed760eee94a10528c16e00c213806e,True,12,True,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,9c1661e20b9f68341378931f9f049b25adb9fe80e67de772be4f6df428e48541,Tests_failed,94cf3547f72a03bb83885a7453becc2815de05d63a95abbaa611a6b9277d6fc8,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,9c1661e20b9f68341378931f9f049b25adb9fe80e67de772be4f6df428e48541,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d,Tests_passed,ea4c76b877a09b46cf96b036d454841d19823cd7430dc2c2d083e05a91c7eb1d diff --git a/results/reaper/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv b/results/reaper/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv index 64f4bf7749..9276ec391c 100644 --- a/results/reaper/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv +++ b/results/reaper/merges_tested/droolsjbpm/droolsjbpm-knowledge.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/7.x,b7c5e5eb55c90c36520b89c88d4b0886e458cb5e,7a2dc873c017d5e6ee34dafdd7d5e177463a3756,7fd75d8287091e6a2b6d2bd549ca526ef47778e9,,True,True,True,69,221,2772,2,True,69,Tests_passed,6baaa34ffb4c33c1c88ace172efcc35d9d205bd27b962d508958501d653ace5b,True,Tests_passed,429bf44be992718b907b1acb0af1bf9f706328051fd4fcbdfad948f164a41354,True,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_failed,b5606bf79546409679dd187002b8afb3b48a6f30ba52e52246a32cdca4a03fa1,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,e638de6a0ecae5afc4c66221f30186e0178e61e5e0a72729b9a7e3450348b5a9,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530,Tests_passed,1b37fbb8ffddd7e3f207a01edf48d6ecc13701c67df5050a06b3cc8a4a56e530 diff --git a/results/reaper/merges_tested/dropwizard/dropwizard-elasticsearch.csv b/results/reaper/merges_tested/dropwizard/dropwizard-elasticsearch.csv index 5fb01fbbc5..f47d91dd10 100644 --- a/results/reaper/merges_tested/dropwizard/dropwizard-elasticsearch.csv +++ b/results/reaper/merges_tested/dropwizard/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,True,13,58,227,5,True,13,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,0a66b38321a70768c7f2a5a3b2ea115e8de82c63c465b5357d6356c76605d9a2,Merge_failed,b5bec5ff58eaf8910fef70949a53df1a55bb44112fa4f0ac6a6f83700add1cda,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08 diff --git a/results/reaper/merges_tested/dropwizard/dropwizard-flyway.csv b/results/reaper/merges_tested/dropwizard/dropwizard-flyway.csv index 1d574d258e..5de10959be 100644 --- a/results/reaper/merges_tested/dropwizard/dropwizard-flyway.csv +++ b/results/reaper/merges_tested/dropwizard/dropwizard-flyway.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,True,8,90,644,2,True,8,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Tests_failed,d12539a09967979d56c10f69e8f4cd18e9ff47375eb87ad62086cd8677525006,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,b8e1d01d40238d7cc4f1ef6647931f2626e443173c14b0294769196984842bb0,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4 diff --git a/results/reaper/merges_tested/druid-io/druid-api.csv b/results/reaper/merges_tested/druid-io/druid-api.csv index 812014a81b..3b58230920 100644 --- a/results/reaper/merges_tested/druid-io/druid-api.csv +++ b/results/reaper/merges_tested/druid-io/druid-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ac15c8e6c4baa07aecc2208f13952c0adcce489c,7ed6284ffe6bd5542a2d9060c96e8ff55515c99f,f1486a2f94d2ba816ec5495a0518768ddaa429a6,,True,True,True,14,41,709,2,True,14,Tests_passed,424ff64fcb36e661b96cf7154f4680b4de82167844ebcb395a40756cbdc0ab45,True,Tests_passed,ca3f47c8223d6b93221232b342ae43abc8217f8150e27ab31e47a3d1c85dbc39,True,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,e998ebcbfcb4592765b8a6a68671c94fe0287d1d1591e6bb633d7c47d7a60f87,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321,Tests_passed,9e73cad2ed26b48a870565dcb19ddd43b7c3e0285c6e575767b58a7b37512321 diff --git a/results/reaper/merges_tested/dschulten/hydra-java.csv b/results/reaper/merges_tested/dschulten/hydra-java.csv index 7b2af99329..1949d8be99 100644 --- a/results/reaper/merges_tested/dschulten/hydra-java.csv +++ b/results/reaper/merges_tested/dschulten/hydra-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,99ad5cffd98a9cdfa439c08e7b131c184f72d9eb,f7f84299e02364513f7fdbd16fb1d844ce9bf6d0,28406ae3bb54f42c7b3be38871e33f94aedf6cc0,,True,True,True,2,3,7,5,True,5,Tests_passed,c8e2113564643be4863b70121e5d15843cc6ab363cf3c954a6701f91e3b6a91c,True,Tests_passed,059befbf1865aaf95c6911c49579036ec5c0dff7cc50d118eb6c348304075c8d,True,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,9aa158033aa79a6881600f529be36d386b05433c6bbc54be21d59e89a4a60550,Tests_failed,d273d86e474681d198d703ced0a683443d9c98b4daf8ec4c472bbd22839aaeb8,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,9aa158033aa79a6881600f529be36d386b05433c6bbc54be21d59e89a4a60550,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85,Tests_passed,4b305fe511e233893707a4325988f4949c121215dd8cd8d31746e36ecbf8ff85 22,refs/heads/master,31477c32b5705e46811843bfede533dae9682322,fad819e0f8ca98108ceaf081a108c18f51eedaf8,320e7b3e13f86b6aae1424df7a17bb67d75d96f1,,True,False,True,2,2,4,5,True,5,Tests_passed,e76023079412f3860140021a6b4f64fc5853c8c3068942a9bdf226a2522560e5,True,Tests_passed,6fa12531d9406c631dfbb6f1a9944961a505e6d176c485c10b0f7f7d9d02af0e,True,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,9f32ce54e0339718fa9b37244c9f4cdaec80c25b9a97808ddae2e0e4937e1ee1,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Tests_failed,79e2c0461f6f937a6dabec287b42c2f87c3377e49f21206d8bc37ed9354f8f15,Merge_failed,a98990fb1843676894be9ad241be1db152e47a61ea5308299b6a0a6a655717c4,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,f813eaeabfe8070132a0a40573a8d6046b8a7b5eea2a9d09cf36aa944c287ce4,Merge_failed,12c60575a1def60c64e71cc96d57d44b770c7222c6dce707c96ed5f33b1b2f79,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3,Merge_failed,852c1329e7fd3e8cc4f691a5e96eab93b0476596d42cad6ac5fed9c4e053dce3 diff --git a/results/reaper/merges_tested/dspace/dspace.csv b/results/reaper/merges_tested/dspace/dspace.csv index 290c4d2e74..6439294259 100644 --- a/results/reaper/merges_tested/dspace/dspace.csv +++ b/results/reaper/merges_tested/dspace/dspace.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,e9204416db86218eb4f08c36935411381c19c5b7,6aaabb2dd3974460048b6b98d85f796f97952b45,af0ead1a70e10b45f8453fb5c1920971cdcd549e,,True,True,Tests_passed,4d9576d9a07b3e597964657f433a77fd4c4b708b79b2fbc3dcc8610e51fa0bb8,True,59,247,1302.0,2,True,Tests_passed,5c9ae2fd30b6c22458c58b51f335d07a75b862d45afdead13b85d337f663727a,True,59,True,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Merge_timedout,,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9,Tests_passed,bf85a7bbcf4b5913d9d2928829ef5eeef2fd3c7d2fbe0252561c078b492b14d9 8,refs/heads/main,78013143efc8aa6609c8303afa0148f25f10d0a8,c74e769d24ad9dec223150174c5cf57e3fe3cd1b,c1d8303041dd7b1631505d3b4f3d7af8ff96bb4f,,True,True,Tests_passed,bde2997e758e6f90c101d28c3cada6b44684a2f18e0fb4f474d087901787d0b7,True,40,157,1509.0,3,True,Tests_passed,76b8256177062c0abe5171b24490bdf8be2258b28f0312096f50a3d6148ef618,True,40,True,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,d6747d3e08e6e9c65afb29e75c3177395d69e1c43ba214997179e1917d9c27ff,Tests_passed,961aedb3912a3ee59c3b1274cd7cacd5c04a381119a167bd0e7db01b23a6479e,Merge_failed,6e855086ca4335f49b498c378d7047b3182c19b8b2ac0ef4410e8114be0f5bdc,Merge_failed,6e855086ca4335f49b498c378d7047b3182c19b8b2ac0ef4410e8114be0f5bdc,Tests_passed,961aedb3912a3ee59c3b1274cd7cacd5c04a381119a167bd0e7db01b23a6479e,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,d13c0d4c218f1749a7a237e74afde8a565012379cc356333a71b127524439d3b,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,70219ae83387baad8298f48089dd0154ce245b1885ef29d056629cf537d0fb2f,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94,Merge_failed,5e3e076747ca86beda279e27e00710c7cf51da2463d867e34dba740237a97a94 24,refs/heads/main,eb50fa03eb2a64323bc3f71bad4fa9d2cbf71935,ec0853ddad290f20cf4b7d647891df2011f1eafb,c538b9cbedd2d7ab7ab88b912a5eeb75a180e10d,,True,True,Tests_passed,d150650126df1ff1743d6a2afac1287148fbc01dbdb35207da7a8abbca31288d,True,1053,4461,94559.0,7,True,Tests_passed,aaa450861e836d6db6ff99e9dc7dd0077300c2e920ea58bda586855da9f1e2e7,True,1053,True,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,4626b627bacf35ff0a77a801a9983ee7c6a359ceb56652a9e0e9ea3c6d6032ab,Merge_failed,f265ff3f2afd47ef2fd57411846510e2f6320fa96a3be513551ac4033a76337a,Merge_failed,8926f5c75a9adc138e8c0fa57a3db81f2ad97be425a2408e76596a6a563e0e24,Merge_failed,8926f5c75a9adc138e8c0fa57a3db81f2ad97be425a2408e76596a6a563e0e24,Merge_failed,f265ff3f2afd47ef2fd57411846510e2f6320fa96a3be513551ac4033a76337a,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,f76c78b4b9496b41527a0f8fd6cd8c442f872f04a17b5e554d86a23b7134dfa6,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,cf9bfb803d2d324a259e10771a5bdd9dfd0cf618000f3c3360fbb26a48615b17,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3,Merge_failed,34d11e429651d01caae4d3162cadc0958152476f9d05ceebd871467c1f57a6b3 diff --git a/results/reaper/merges_tested/dtrott/maven-protoc-plugin.csv b/results/reaper/merges_tested/dtrott/maven-protoc-plugin.csv index ed683e049e..318b95c4a7 100644 --- a/results/reaper/merges_tested/dtrott/maven-protoc-plugin.csv +++ b/results/reaper/merges_tested/dtrott/maven-protoc-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/10,281edcc995e2f5511028659d923d7fe3d64cb2f1,eac96db995e348d51598234bdebbf4087d128a81,46b12f14c32aeed746f09c5c2ff308cf77bdebf4,,True,True,Tests_passed,bce0079b1987d97312ee662acf26b668a1d73e3aa79b664e6ab7f4637e0dc2aa,True,32,149,1141,5,True,Tests_passed,6f90a9557c293d3c569ec672e125b7ca2340b796016cef75236cdc8bbcb32068,True,32,True,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,5523ea576afef1b75aa6e8b7c65d08c3183c93fdcb1182543821b46b13e711ab,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,03e0391d7f2de8ed4ffb2950ce569f630b468eae95f35b62fa037a1a372a8524,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,6d1ccf76c96b6ea5dcd63b26a79b2835bd5035474c68b62e288a9b571d9ee698,Merge_failed,0d7349baaff2fc5efc3ae011df1a7b948e4aa767d5ab5c791759c6c39739396b,Merge_failed,6b405e6981e6c20f634fe8850fa2db5aed73c809fafbf9ef72fdba19a2923326,Merge_failed,2702353157d3c86a432a4327eff0f8c606826da5cb921522270dc80c53fc6a22,Tests_failed,4e268538635389327c2dd1e6fff4f55484b668b5d62dea7d71bcde0d3e7cdc85,Merge_failed,6b405e6981e6c20f634fe8850fa2db5aed73c809fafbf9ef72fdba19a2923326,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,03e0391d7f2de8ed4ffb2950ce569f630b468eae95f35b62fa037a1a372a8524,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,7149167bc33445f59f01ba6e25c9ce0da21f58fa932d96211f72b4a37f9b35a1,Merge_failed,6d1ccf76c96b6ea5dcd63b26a79b2835bd5035474c68b62e288a9b571d9ee698,Merge_failed,1bca0089ee6f08435a008cf4fe91130e6eece4f4d0c0c788e5bac6159ab7f9ed,Merge_failed,2702353157d3c86a432a4327eff0f8c606826da5cb921522270dc80c53fc6a22,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,5523ea576afef1b75aa6e8b7c65d08c3183c93fdcb1182543821b46b13e711ab,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7,Merge_failed,3a9ae1ec389e7e4c33d6b7c7a4ff9ef10a1e0cac8aec2fa0457713baac9559a7 10,refs/remotes/origin/pull/10,0cab1f593acdfed0347285c8518987a96711236f,3fc1708da72ad61c9066cca02c03bad8d68d4a4c,405ccd79c722155c0065f7d0f5eb676ac6855e66,,True,True,Tests_passed,07855a510bd356318e5f80a1951ec8054b6d6c05fad7abc9b0cbebb9cea21f9d,True,23,78,606,2,True,Tests_passed,8d6433aba4f09d54a08af06fa7bd22278f17464e23b971f1ba2c7e313a58fb1e,True,23,True,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,4ec3e2fe1204736edae2d265bb631e7bb4c8579d548ee2b1795cb66bbb26c5ae,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Tests_failed,d765b3588a9593c9ace208badccad4d6885c3b3c87bd7c9bdd4890f49d8e2dc3,Merge_failed,fbc8a8495704caae14d160b4f99320c96911b2bdf483a0bfddc9e26798916085,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,7c2bf186dc092648593013e54f9477e704ec1e02489dfa23b4a664292bbb0214,Tests_passed,ea0017a59e3a71d60ddd68c517b2e614aa24c39ab7acdee5045c168054c53446,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,ea113f4e62021f31d0e19c0a99fbafcb805bec0cd419da5d57ea940b539f9783,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7,Merge_failed,5f5f16c0f5bde7e7c3bf4650b67f2880adf00e974e5cb5a008f3fe122ef5d4b7 diff --git a/results/reaper/merges_tested/dtrules/dtrules.csv b/results/reaper/merges_tested/dtrules/dtrules.csv index 372571ec19..0775fd3a46 100644 --- a/results/reaper/merges_tested/dtrules/dtrules.csv +++ b/results/reaper/merges_tested/dtrules/dtrules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/5.0-SNAPSHOT,6f91cbdda5d9d2ff783833d2b7fd43fcefb81f12,e48a828c7ee4c90f9077beed380282eca16b196d,d83934d0d79aaa1c1dbd84b4009c05f05e222654,,True,True,True,184,425,26318.0,4,True,184,Tests_passed,6a30be910fdeac9495bd74619a2772a404a12c528a7d804d61ce11840206cb53,True,Tests_passed,c859fa4729382e964d1b8bbd783a4c502c1f2eb4351b20d41be3bdc867a261ae,True,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,6219c070ced46b4eda40de8bbcefdc919a7883210a628e38e618e07f98fda474,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,ffe40fedf3731d3a9e934d8d6c88930d979c51846c56c53db6f2a7e3bc315ab8,Merge_timedout,,Merge_failed,8f92c74eb478b16649c9f94859469c265768b8aa5dbaec9561791de29f872311,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,bd7851b893afcb0536892bbb9df1bb5d59a1073b3cf8cea27da30358b95f10f7,Merge_timedout,,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a,Merge_failed,e0d33ef0815b450ab795c3cacaf18193352da28176b401b45305e2f50bc8b21a 2,refs/heads/5.0-SNAPSHOT,79860cfaaaa993a462d330d489cb94c6d6681b55,5c7bc9ee0a942e4a87e176187e536413050b1b78,aeabdcb763051da30a6c5fd76031f602bc09e333,,True,False,True,2,1,2.0,100,True,100,Tests_passed,5a55dad98b62bf39b51533cc13be9581a2d9a66d7004d4742cd01efc90e40d15,True,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,True,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,9f3cb6a2bb8176fe6f31dd43ad7f9e5b7907446804670d4c9aa2e72d5d41f25e,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,9f3cb6a2bb8176fe6f31dd43ad7f9e5b7907446804670d4c9aa2e72d5d41f25e,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69,Tests_passed,0d583d86648752111d93e4e5458e80b2bd2462cbb2f32d032272102293f28f69 4,refs/heads/5.0-SNAPSHOT,d096b2548a64863a658995b9e1f2f863d8fa45c1,2cdcfa7edac6d4f4081a6a58b89562e974ab4c21,0b8779e73c8704fb3d5ff3458cedd1e978928ce9,,True,True,True,121,392,23893.0,5,True,121,Tests_passed,70513f50e8915d8b931525c81c81a2fed1fda3049b94141ba0ca9da4665ddf26,True,Tests_passed,44dbbb236cad84abdce2d44f67d5de08e197f1d1c63a3eea7a06135a744e801f,True,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,9e74392b29577d595f2ea13baec005a0bd2577dfb8d21a9c70a13bfb6127d987,Merge_failed,5dd2b4a81f5c9b95ba19f8dc01d20e2f609a380062449497cb34fe314ccab0ca,Merge_failed,67cd3115ca07a71a06d85e12772561e8b259a4c622b880c5276db7fb5f1a086a,Merge_timedout,,Merge_failed,5dd2b4a81f5c9b95ba19f8dc01d20e2f609a380062449497cb34fe314ccab0ca,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,0ccf909a60e99161283760598000a9e829cea7f0bbbfcfe35a4318258df4d882,Merge_failed,67cd3115ca07a71a06d85e12772561e8b259a4c622b880c5276db7fb5f1a086a,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53,Merge_failed,936cc175682fbde8803a7d36c25e8f0f7e5f80cb8c3551ff37f7a4b72078cf53 diff --git a/results/reaper/merges_tested/duesenklipper/wicket-safemodel.csv b/results/reaper/merges_tested/duesenklipper/wicket-safemodel.csv index 34a5933080..a0bb050af3 100644 --- a/results/reaper/merges_tested/duesenklipper/wicket-safemodel.csv +++ b/results/reaper/merges_tested/duesenklipper/wicket-safemodel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/wicket-1.5,09940b84110f272a498b0956740d17684d48f1c3,fb62ed543a7b7e36412f501ffe1eb4906cb92dc1,eede8623fdeb4c0b07d4a37c6da1e5abe23fe37d,,True,True,True,5,16,90,3,True,5,Tests_passed,b4f0103eb7ebd57aa6c32cc98b88decf44f436d2ed182f2c409c58c4c84c6801,True,Tests_passed,13cee4d48a55de96ca5dafac1489d9a4af378733434f92b701cfc22eecf1c794,True,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,5e349304cfc4b2683eb4966c9b8e370593d115f0948c9e4eded54962c5fe4e21,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,369fef66ec15a5957089ca27b9dc122d6a8c84d0a4a00a671f948e6545de3703,Merge_failed,f5e33990cce875384ec3b1eccff19c1d0470cb564af57dfa369af746e29ec423,Merge_failed,9251f13a594d6d076723c85a957e835a0a3e71462a1fe642a2c706549040b602,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,6018247b4ba7d628ee254f36d751f165eec652aa080ab707dcf269c6e1f15611,Merge_failed,c54e3fc61b232e0a5fc62144cbe48641fe95de1b48b761304b903b9e29c86535,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1,Merge_failed,f1cf7d41e9325f75b179bb7fb93743a189827c181a9a8ebe051bde263f6e6be1 diff --git a/results/reaper/merges_tested/dvcama/lodview.csv b/results/reaper/merges_tested/dvcama/lodview.csv index 0e4ea6d6b6..bb7ad3f94f 100644 --- a/results/reaper/merges_tested/dvcama/lodview.csv +++ b/results/reaper/merges_tested/dvcama/lodview.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ce117080514feaa63100345095aa4954a9d6d4bc,39f794baac72a3024ff3ca69a0b0fd9c1e830ad0,9cd0988f15b5adec4454a0527c1933d3154ad4c4,,True,True,Tests_passed,c43a1da7c4910dad4f7b2434f912ea7792c11c595b890a549052d491d0f60e13,True,11,29,177,5,True,Tests_passed,b460c7acdf763d86f5421153fbd3bdd971e932294f8a8542d98ad55658633e55,True,12,True,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a803fdcddc819cd727fdac19418fb634e2915672bfa0e3f6e657568708b7e2e4,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,f41d2ee1605055bfbb4c0eccafd78708098a0cf28190e105e135fbbf57a97604,Merge_failed,524bed0813e5305908e8f1c0cee5a8e88be2dd05d7a7b17dcdd63c4ca94d7d0d,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,a6d1bf3967eaaf8fa72c46e9afe9b81d5cb92761fc55aa207d43f430453f7727,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,331fadef1887b5d7896c90db0081139907512540dd63b7c7dd2e337098a616ec,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217,Merge_failed,b0f91bb00270d6e1c0c0a2ee87ce018f9011e6a3767ca8ec9665ac2ac3e61217 6,refs/heads/master,954530ea8d3843332cd8dcbf232fad2c8567e10f,9101df822fa35ba15a3705443ea84a02a8f425c6,29e42df9a0e2263c2f38d020a2050a6d6dfcc222,,True,True,Tests_passed,d8b800bea264e18b852d88a33288db484b55614f40e2ba10be24e31297333d2c,True,14,62,212,2,True,Tests_passed,e24d9a07690accf8cbe4d2c756c269a741d5c01ee91f2579f62f7073c30c5a02,True,14,True,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,b9a618318901f6e9c153ee309eed318858660d6be027a2b8a7d5dd42276746e7,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a,Tests_passed,1b6879cd68735392360607cf9feaf2cbfd761a2944a87af67f9686ccea900e2a 10,refs/heads/master,e9b0969167486f088981703db0c645fa71f71cf1,7ce43c381012c20615a3ca84fa732d67d284192c,3552af92fdebf6a6c3cc9abc7ce07bbb83f36961,,True,True,Tests_passed,4a440f82e351f4e65a861a8b8bc8735e82e9ef3ee45dba6ee5d7ead4559bee01,True,9,57,130,2,True,Tests_passed,cf0a71e801412051b5fef593eee10a876f3f93892b3935e016c8929dace8c440,True,9,True,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7,Tests_passed,dc093e9abf8f27f2ac146c3624d2c6167e9fb6cd8ba8baf764763b2cea2a8fb7 diff --git a/results/reaper/merges_tested/dvdme/forecastio-lib-java.csv b/results/reaper/merges_tested/dvdme/forecastio-lib-java.csv index ad1780f496..37c109cec7 100644 --- a/results/reaper/merges_tested/dvdme/forecastio-lib-java.csv +++ b/results/reaper/merges_tested/dvdme/forecastio-lib-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,60570820cae9c489f6fb00a1c64a73ea7fdfdfae,c5157ff590ecd99bf07058d779a52818af0ce056,de802a0f9736572038a2147ec3cc804f0ef3cf76,,True,False,True,5,11,70.0,2,True,5,Tests_passed,cde9a0c15a1347cc20c80cfeec748d3e382696333655b691085cdbcf8fd314e6,True,Tests_passed,6575b7205c3762dc567541e31b58be4586b9db00c23c4275aa28ee71529688fa,True,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_failed,9b4be2ece491d0250c4ff5e1cd7e242bad152e0711f3d882f15581ce212b08eb,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,50c826c1cd4d656cd1105fafa60f7a0c5419b820b0d442aeb660b32f33a98453,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1,Tests_passed,71f30684ce7e4eccbf526367625a74ab4c0d89a954813df1fa869f16b07b7dd1 11,refs/heads/master,4f50017151d1ed7529bf4c2e59510aafc2ef3d77,8dbb0c0d246cdde682967433e825c311bf3ad5b2,d110489d89521d07d5d8ec2bd5df5c80567d30b0,,True,False,True,2,2,23.0,2,True,2,Tests_passed,810378e6ad405e11440814a73d6f050da62bee1765cb9c7823a3912931e66d5e,True,Tests_passed,22ed544db2dca14c9697339c75e25da5b414d3605855cf519aa3636c037b1776,True,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,938f9487bfd9d1e9e19b555fa0ba5af4c7210ea1c4effff6039251aef6408880,Tests_failed,0ca0dbc0fad8fb0c40b3d2318b6aaf10395f0384c544f9135bc8354f7dcde84a,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,938f9487bfd9d1e9e19b555fa0ba5af4c7210ea1c4effff6039251aef6408880,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde,Tests_passed,f52a4a281e19b34f4d497fc6b4a7a1e976d13b7479dc7a3e353c641128273bde 14,refs/heads/master,a800a19565c4d574b03a3f11ff3376b1f47aa80b,09c7bd29d1d27da59e7d0058118a146ffe07f8e6,e964933a3b6e30ed7e965fbb68425c0e622cb4bc,,True,True,True,4,18,46.0,2,True,4,Tests_passed,cbf9122dd30d113ba17fca4e605b05459f586f78d6070377a310a74ac372c18f,True,Tests_passed,ca46666d807a1d4f9b5570d9337fc2b2cb7755de6404d2ff11876a1af552848a,True,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,207b8e2afad69fd55f4f71000525642429ce7034bcf54e0b9a5036d1066483d1,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,207b8e2afad69fd55f4f71000525642429ce7034bcf54e0b9a5036d1066483d1,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,0ee7a8bbcb0132c5b2a69eef39b2913e5cca576a5d7f25412806a250ea60d50f,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2,Tests_passed,d7101d852fd33e8d312fac8126dfa75e7a0ed825ba83c2ee1ec47258472652f2 diff --git a/results/reaper/merges_tested/dwslab/dwslib.csv b/results/reaper/merges_tested/dwslab/dwslib.csv index abd751f7c4..e6dd81bc69 100644 --- a/results/reaper/merges_tested/dwslab/dwslib.csv +++ b/results/reaper/merges_tested/dwslab/dwslib.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,b42af2c0ddfe2c92c1194ed0d7b581525f382ffc,8559f65bc3c3c04ec5ada926d95a416fa8a5ed46,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,Tests_passed,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,True,6,9,166,5,True,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,True,8,True,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,ab4d0b464a7c8d688be4d837b11c8bc807eb1e41c733575bd7ef40d938710cd7,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,a0e258ba5478c5c735f97db728dc19f0f876eb4b6ae74f97cbe2bc3241107a63,Merge_failed,b8f987e324d544fbaa86aeca4473f5c61e97af19005c28e8cca9d34444fad2f3,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c 4,refs/remotes/origin/pull/1,83dc42bd1fb663dcb6e293c7d9a951d373248c12,8cd70aed31c7b4ec1cc67f682b036236a4836e38,511361742f20e57a67560054d0ff634ec2c3e411,,True,True,Tests_passed,3f5d60309b958ff710c71b4b883f440b923429a953a2f0c6170fe9e4541bc247,True,6,9,166,5,True,Tests_passed,41304879a7a0d1b7e739bb4130cbe4092b4a3af69404869a4568eaf34959bd5c,True,8,True,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,ab4d0b464a7c8d688be4d837b11c8bc807eb1e41c733575bd7ef40d938710cd7,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,8fa0f74ee6df80b5c0de55133db4444a0c12e712af582993e6521cc7dd13cdab,Merge_failed,2833970bc2612b5a8c14cc441c8cafe19c09e774dfa36c06b5f33f91d4aede73,Merge_failed,71cb39fdb68d1f43d24ca1be74877dc28ad30f1b7f41ef33bf8bab239bc4d825,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,8fcd4cf8abf6e2b715725b325671b460a6da722708cbc1db005884a7ce2abca4,Merge_failed,b8f987e324d544fbaa86aeca4473f5c61e97af19005c28e8cca9d34444fad2f3,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c,Merge_failed,b5a247fab4b52dcbea837e25edd43c4c626c1e1aa9120fecdc04e98b2a8b337c diff --git a/results/reaper/merges_tested/dynjs/dynjs.csv b/results/reaper/merges_tested/dynjs/dynjs.csv index 5b5ffdf6c4..f212e6976d 100644 --- a/results/reaper/merges_tested/dynjs/dynjs.csv +++ b/results/reaper/merges_tested/dynjs/dynjs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,ee2219fc8b7178f9df605277b89200011093a534,b0f3e1e3217792abd2cec6e18bf7e376f56ae1d1,cf7bbe9e06fd28c686ecbc47ba59bfa25c854e47,,True,True,Tests_passed,1a5cac1a138de84dfc3aca1145091ab3248fcce4c3e5839282e8540dd71cb981,True,227,923,9393,4,True,Tests_passed,2b963c0b558bb7d88d02e3bf7feecc8edd731b36f4e00b825eb47ecf1acd951a,True,227,True,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,f4f343135b420ca94b1018e5a4a89afad72d98a772be88658b3980f7e62de380,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502,Tests_passed,675e6a74c34f7ff21f6ebb19d6556c9f9a1d8b3e88a22754141dd727fee5f502 26,refs/heads/master,a98c081265982db02dec1543679620aae7783b47,014bdb874bfdf7b2dd631b6f33bb55ecf5e52010,b827311d06a240018788dfdbbc7bb4a4de4e102e,,True,True,Tests_passed,41e1d8b083ade11bef615501df36902cec3c371a5a6aafb5620398d16e1ebf08,True,22,83,997,6,True,Tests_passed,03be4818c742ac9f174f694f827d9ca0f035f6ca62706437eaa30318a8910f76,True,22,True,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,631ad6b062121948904898083cbf1ce6f1a19feb0f7616c5e6fb0485a363c72d,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,631ad6b062121948904898083cbf1ce6f1a19feb0f7616c5e6fb0485a363c72d,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097,Tests_passed,8b900532a37c3679be85592613a54d6ca85adc47b93cfbedb4ca78da31fb7097 200,refs/remotes/origin/pull/154,2c3aed23807abb8b7cde4101d94d8fb693b13be2,58262908cc2185c202bab66fb86d95b4a47aeea8,3a193c195adfb290b80ed42226dd13be4462fa09,,True,True,Tests_passed,53130362358d4c070f7407d68becab67f765ebd1c9cdf774a2258fb39b019692,True,208,450,5168,6,True,Tests_passed,b3eea15dbab93ebf68b4e443fdc704f796b3aa3dc01ccb1bcda0a7f7d5045163,True,208,True,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,18450eaf13ef90506504f6e6a8f0053c029a54bdfdb3b67810066cf82db4bad1,Merge_failed,40f8cba6123ac6fc47c4c2cda0537ad2b8ab849d66f08933477a70b41c69171d,Tests_passed,27ca8f22822bcf95f8ca37fa1fe8f124893315505ead2d8d285bd4678fff4390,Merge_failed,25029ce101398070c80672480456206fc2fd6ef4f65cae7e4da472750a6a8aad,Merge_failed,40f8cba6123ac6fc47c4c2cda0537ad2b8ab849d66f08933477a70b41c69171d,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,e55ad9468a2306eb98708d1fd32a852e2466dc5896029db8838c4f24c80fb816,Tests_passed,27ca8f22822bcf95f8ca37fa1fe8f124893315505ead2d8d285bd4678fff4390,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,aa5d7b822396266e7b6f1398a064fdd8933c4119d972d2dcc1c827049d267039,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a,Merge_failed,be3ae02758097282972afebe3adf9d484e724fb6bded0f48ba0f6bf9708f987a diff --git a/results/reaper/merges_tested/e-mzungu/rjc.csv b/results/reaper/merges_tested/e-mzungu/rjc.csv index d75bb28bcd..415fa8260b 100644 --- a/results/reaper/merges_tested/e-mzungu/rjc.csv +++ b/results/reaper/merges_tested/e-mzungu/rjc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,3afc92b5e097f29763b600a8192f557f66752039,31a91e743de4b0de8bb25f306134117e887c6364,653b9123f2057024bca7cb4333d6f26060231bf5,,True,True,True,10,68,339,2,True,10,Tests_passed,508940ed4108d08289048940b0c9f0524c5d3e0085b4459c1ea1ecf7b4234486,True,Tests_passed,3c298e1930b87e25093586c38d4f790f64ae1aa480c2bee9029bc00d3387a0c7,True,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,88438f8d58fadb73e75beab0fc6a98c6fb7f98cdbcbd25f2291a61de7d396d4e,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Tests_failed,bb6da254f8d5178b3a151e28169177c6930134fe9936263c9b11c0243a3d3138,Tests_passed,ccc5c3069efb05e1dbe563ab3673554843d7bc7cac8f3dcaca71abb2d98522f1,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,0927d5377b4ef3956f8ec4482ba00452026e038ad2050ceb191b7b83308e8ea9,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,8ac1a05b6145ba6f68a3f3fb8993eb1c7c9f9daca75dc1d348ead0d9309ba3b9,Merge_failed,167a8a41c89a50a3b64902e029b2057ef148ed1b29a8228bd798d69fa8a142b6,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,35f8004eae27516b7fdb608bed41238570e0d1f07f057d3e4cda9e3201d9f7ca,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b,Merge_failed,975014225da45a2b9723f7e9a932ef6d2f58659b58035848fc0dcaa47223ea2b diff --git a/results/reaper/merges_tested/eaftan/hprof-parser.csv b/results/reaper/merges_tested/eaftan/hprof-parser.csv index ab246cf6d3..3b9d0f5ed6 100644 --- a/results/reaper/merges_tested/eaftan/hprof-parser.csv +++ b/results/reaper/merges_tested/eaftan/hprof-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,3668fd734f79c2b949f0703654dfda812c800707,cd2019e5a76d7b2fffdf3cd2faa7738caefc47a2,4b860f8b50791fad8ca96f54899a20dc34d3ff04,,True,True,Tests_passed,5a222e78e931916fdf6bc576d04d4a197d0240ee1b97abd912d80bfbaba8ed5b,True,5,55,301,2,True,Tests_passed,8c1c891754ff5c8b94684cbe76d185011952bb913f4b4abba77ed5c39df42285,True,5,True,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_failed,ee639548fb0f39a770e1cd8d09de0861377b6f89705464579bdcc63806bc5fc7,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,921cb67f8bca9ca8278b36900be41fbc4cecb73bcb035804925c12aa5de7bfb6,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223,Tests_passed,a3369b1145eab1f05cccb232ce94518ee015ab00ba462a01ead821af5b464223 diff --git a/results/reaper/merges_tested/easetech/easytest-core.csv b/results/reaper/merges_tested/easetech/easytest-core.csv index 36569cbb35..b88d0933db 100644 --- a/results/reaper/merges_tested/easetech/easytest-core.csv +++ b/results/reaper/merges_tested/easetech/easytest-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,4446e601096aa1bcdad3b88c6814cdbd5162a6cc,b93fb76bb3d52991f492354d7b60e7cbf0d50430,2fe840c6d539ce0afdf0bf55e50b5de25b1c3d75,,True,True,True,30.0,105,321.0,2,True,30,Tests_passed,535d28373b48c00b2bf19758056905e385d2cf0aefdfe165ef0ccb303b83118d,True,Tests_passed,54985f92d8620d6f1d5ccb2515850cb0aa8432c9d53e9b50b9c0d2055617e839,True,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_failed,78b4e0c38c003acaaa3688da60e2a72eae25d49f05824dc9be233c3dc7bd2570,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_failed,78b4e0c38c003acaaa3688da60e2a72eae25d49f05824dc9be233c3dc7bd2570,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7,Tests_passed,7d1f35dc3701cfa4469eeb77d86a28000f78ddeea6300cecaa16530aacc8a3f7 7,refs/heads/master,38eb005d4af26d4efac55ee553a324707ca75486,0f668972d2ea34b04685aa7d8ea4dc20924e1dad,0671ea4bf8142f1731e00ac44c10b73abce310d4,,True,True,True,20.0,79,265.0,4,True,20,Tests_passed,9251f95f877e91999a10b5e5d5cbaa6399c9e608b994e19cd3d317d04f07b032,True,Tests_passed,640b135b2fcfa2a26afe641df242f6c416b7642895fdb16e6ab9f5da7967f1ae,True,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_failed,bbb08dc4182042bb9077f9a693da810758b7b54d1a4c3ca9f3b759237c2b96a1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,4780a060a9eb4de8b11de8bf82b1edf1e4b5b67b0059e2afbe236d766384aeb1,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,d6ed36edeee792bf68a333fe93137a62fda097a1bf6c0d9fa29c39d265166283,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2,Tests_passed,74e49084f047e5a681d08b34401ee4fcc6e851d5db499654464efc9e686624c2 9,refs/heads/master,6e79bb2e0be82c7275b311de37af11a665452928,18072b1256c9b409789af05143f9f396a348ad4c,3ea91ab06b0126adc71a59a28d9956a9408a8a76,,True,True,True,19.0,73,213.0,5,True,19,Tests_passed,7303bc2e2514d2044169872f413198a74ff3690cb624d583ab605b0a2e14ebc4,True,Tests_passed,00cd69be234e5e2200f9e110c743381f38c2c2d8db42814e271fd7235ef8ad13,True,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_failed,db939278ce4442a2729461bc018725da17c4a914b093708b466a94eae2600aea,Tests_failed,4d8472273767ed1c9270b2037ac3b09090a729d5a987e224d3e85491a7323574,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_failed,db939278ce4442a2729461bc018725da17c4a914b093708b466a94eae2600aea,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde,Tests_passed,e3eeaa4dbdc3f23cec3da7b3a190ade329b60ec54d242a2b22d2303d19474cde diff --git a/results/reaper/merges_tested/ebay/xcelite.csv b/results/reaper/merges_tested/ebay/xcelite.csv index bab1d202cc..9ef4022228 100644 --- a/results/reaper/merges_tested/ebay/xcelite.csv +++ b/results/reaper/merges_tested/ebay/xcelite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,40e1d22a1ff208cd99f014eac25fe2a51f1cc6df,bbccda650a890b30b8d5c0d8a6d66f03410fd4bd,9d35e9ae77230c74d655add3c90aaf8f12b235b9,,True,True,True,32,185,1748,6,True,33,Tests_passed,fef4029c160fe05d9304222e308a66e3638074ad5c551451281b70331d407c5c,True,Tests_passed,058de228a3943c458a8060ffa41d569491948f475c927805c9fbbcd394ea0e32,True,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,dd072898d1a0cbe648ee46231953e634b4072648a9e350f0a23f4083a6483464,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,1c78627a73d7c9f10b39a0a0217d04e6b369f4c5cc8ba345f9faa8bcc8133ee0,Merge_failed,80b6baf42292210754186205546c996005e35197d8ae1779637e530a934abc91,Merge_failed,6db6a01bf1d72e6e0425741985d8e3e6c970e2709181dd7e31c17a46d6242382,Tests_failed,57f5f7a549f593af2c20ad73cfecda8e408b17e2b0c8df824e05883ceba27207,Tests_failed,cfd1d34d44565ba00828c705c3a749a561c385aebed251b10e096293475e6d82,Merge_failed,6db6a01bf1d72e6e0425741985d8e3e6c970e2709181dd7e31c17a46d6242382,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,dd072898d1a0cbe648ee46231953e634b4072648a9e350f0a23f4083a6483464,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,56199d8450b142c7afd842fd341fba6302f3d8f12a50a780c3e27872b74143ab,Merge_failed,1c78627a73d7c9f10b39a0a0217d04e6b369f4c5cc8ba345f9faa8bcc8133ee0,Merge_failed,2d84842a63ddce1df21f93aa3e146875c8a2efdaf4ab04a0883ae3caf011c294,Tests_failed,57f5f7a549f593af2c20ad73cfecda8e408b17e2b0c8df824e05883ceba27207,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255,Merge_failed,c6e5fc5ce52df94eaa3526d4a439511ed559f29b684f9f31cc4fae4534d4e255 14,refs/heads/master,e43a4a1bda8dfa082dadd823d9b125c1b97e9378,46654b2fc1e9bd680156663055a6f185a5faca69,8330785c9980d941bab29ae076a6db86a0bbc97c,,True,True,True,71,101,1423,5,True,71,Tests_passed,f90a42e7f2cf5ed9742998c4692fce28ac487ecadad12315d48e5a849dce4c46,True,Tests_passed,cfce61083c42a4471bdebda5cd8d255ce282066e5067c0af88b8713ccdedc230,True,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,5b700d3946e447c3eea43f2172289943ba7184e2223daef00b1acdde8813759d,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Tests_failed,d92e8b39ddf4d6f5b3f7434fe047302d802f3e15dcba136c12435c7981f2e5e4,Merge_failed,81a1956b0be90aa1eff29f115b3f464c564722fe565f7cf756fab493968c28ce,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,8b908b3ac6ca8db3c31d1305e9a937b9490585a9162066df357f45dc18bd5455,Merge_failed,62fa4e246971ccb40eaad2ebe67db278460aaaa0ca1403373d32cd8d412cc919,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,0160152b4d9c81780bc2af262a15e8cc90e187509f6101033c67a4b7b4f1aaad,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d,Merge_failed,81e0c8fefd1fb7b5a29722183b073f4a1701ef0d1d5ac3b4e96cb2aaf36c5a0d 20,refs/heads/master,66cde34b01ea5ac3a5db132e6f11a8038db98a84,3ff819b2d7577c611765146688057fcf2f6e74ec,7aeaeb356b01124e9aa6bdc9093f75ba3a5cebd6,,True,True,True,58,151,3205,5,True,58,Tests_passed,998a8f39658f1d26d573007760e97f82d246ad0ba0f1c328febf1c1296777389,True,Tests_passed,267ed23ed879fd65afb1fdde91d763b0369ba240744020c172b1ab2a68710812,True,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,b06bb2954b432ea9abb30670cbfb73ae040e4fbe743b7cd08fd9af6e60eba0ab,Merge_failed,04e704239316954bee9af810d010750e638bd03a93cf761ba0f7b1328cc0f176,Merge_failed,6c3a36672d0c5aa6663651861285305141f0b6b2c79442e24382841e477a057c,Tests_failed,cb99c20a0df077f0aa71e34cd65a1087f694257febbabd1343c76d65cdb71598,Merge_failed,04e704239316954bee9af810d010750e638bd03a93cf761ba0f7b1328cc0f176,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,b5fdeb76197a80edc3de13788a3948b222f7b118f9fb98cf159999a2c6064191,Merge_failed,6c3a36672d0c5aa6663651861285305141f0b6b2c79442e24382841e477a057c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,3c474665468e4ae9986ba9fcc27d3ba9f42c3d80e7151716ef745f60d1eb855c,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7,Merge_failed,6d5ab4e85d34f16d93c85df2f30f94c7778d32c8c892535c3da9b06799d258e7 diff --git a/results/reaper/merges_tested/edwardcapriolo/nibiru.csv b/results/reaper/merges_tested/edwardcapriolo/nibiru.csv index 0da3e6e5b1..d5cef8fbb0 100644 --- a/results/reaper/merges_tested/edwardcapriolo/nibiru.csv +++ b/results/reaper/merges_tested/edwardcapriolo/nibiru.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,bb6150cffd19a67941797bb3a08739c24879fb3c,8bedb7731007d3d3d8db24a0d67df0c0d09def18,7de5733c62c302475108df8f50ccf722fdfb4cc3,,True,True,True,48,158,1174,5,True,48,Tests_passed,c808d2b2d57bb7d2d4f26ff7121fb99409f51a15a42aad87c64ca1a4130b0442,True,Tests_passed,b97a78992177a8b155faded63c13955104a84ed12fbf04d25c77b26a1c6f5c5f,True,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,17f4980eb3f395fae234c36379ae08a7750aa4b958943636771ecc9624fa10d8,Merge_failed,491f0a7c8f6508e9a4996e6b0e9f61daed9538a9d91b11e5ba1f25dc8d0cb6b9,Tests_failed,641440b235df1831f116611c54450ee241aa762b6d669c40ab7d28628c234b70,Merge_timedout,,Merge_failed,491f0a7c8f6508e9a4996e6b0e9f61daed9538a9d91b11e5ba1f25dc8d0cb6b9,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,c89acad9d9740a54d4343640fc1a678d9373611aef749a698eedf7ceb4812afd,Tests_failed,641440b235df1831f116611c54450ee241aa762b6d669c40ab7d28628c234b70,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,f41b30eefe44ba2583f8eabeaf3eda2c9eac737bb0cd9737077dec8677c04d5f,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371,Merge_failed,edd6b6a755f7222809c9f65968559712bc79dad55232b3e0524cfb63738b7371 23,refs/heads/master,d4ad3fb0016120d5ff27b81f991adc2f98fff89a,9b75f2cf605b3da94473a9f7ab419ded5fbe43bb,6f38f28681cc5223d14ce5fe344c96ccdda32114,,True,True,True,14,46,224,2,True,14,Tests_passed,9bc55f49034361ce4f416cdbf492b4719b35b22649d07f6fc4bb627c5f341112,True,Tests_passed,f2ea64a4377d3741da1193a261091344807606998fbc4af1d01ecdcdbb71c228,True,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,0869c120b2ebfa98a3ee7b51f70d40ebfb02d71ffd75b8ddf53b0e0cb0565d71,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c,Tests_passed,edb41434a6346ccb61e548a5585367e5f8759d830944b77522599e391592904c diff --git a/results/reaper/merges_tested/egineering-llc/collectd-fast-jmx.csv b/results/reaper/merges_tested/egineering-llc/collectd-fast-jmx.csv index 2f0e583de8..6bb432d078 100644 --- a/results/reaper/merges_tested/egineering-llc/collectd-fast-jmx.csv +++ b/results/reaper/merges_tested/egineering-llc/collectd-fast-jmx.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,da86adcc3eae767206ff283909d43d4a94cdd8b6,292d4b40fc4f7ce235ce8055efce4b5c272c8a07,b4562fd17641bb0a03449bea9ea4651d6ffc9f5d,,True,False,Tests_passed,c5b1f3bf2be7ec9cfe42c76b3634ea618b20bb92761fd92f0c63d7ea91c71e15,True,3,7,32,2,True,Tests_passed,96c4a5b285385e95748c2e79bd97cf6fcd80f2716d6d3728dee6b8d59eedc4a4,True,3,True,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_failed,cb72ffc0e807bfe83cd517c2a8feb1ae247bd9e88eaae3e8fa4209b105381c33,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8 7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,3,6,204,2,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,True,3,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170 diff --git a/results/reaper/merges_tested/ehcache/sizeof.csv b/results/reaper/merges_tested/ehcache/sizeof.csv index 64a60afebc..f77b0c6fe5 100644 --- a/results/reaper/merges_tested/ehcache/sizeof.csv +++ b/results/reaper/merges_tested/ehcache/sizeof.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,0e8fcbf4ca3b391acc623d6d0c07908db180b4b6,f50d8bdf1403cb9855223cbe33ac479fa1606221,d632def2a5dae8f942dbc10546f2f0379387b088,,True,True,True,11,43,491,2,True,11,Tests_passed,c0861911e4977f4a47d09ab8a73cd15979a92df7f966acbe3152eb3984807696,True,Tests_passed,b8be5c75a518f100d73e3ca0c25cd4ec9102ed9694f988c7ae3df48acd146342,True,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,0d545e01ecf0ee94d6c446e9773023e1d176d4e4a01e124963e98ba1146d3f56,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da,Tests_passed,ffec8d8a35a7af9e9537aedc214953addff8ea7d0cdd2fae391029b9896201da diff --git a/results/reaper/merges_tested/einsamhauer/disthene-reader.csv b/results/reaper/merges_tested/einsamhauer/disthene-reader.csv index cc3c5964ce..a176c023ae 100644 --- a/results/reaper/merges_tested/einsamhauer/disthene-reader.csv +++ b/results/reaper/merges_tested/einsamhauer/disthene-reader.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,8d8c28bd2a9238ebbc6ff483aa18b2632e27806b,abf2f0ef5b03fd5eaf513e5935f24ea6ed719e20,5bb6dc15f0e17f31029f175da1ab15c047bc9a4b,,True,True,True,159,641,3085,12,True,160,Tests_passed,548452c738e1fc81241c3aec5491614e904cb69fbb8bdba4a758db263fb1b9cf,True,Tests_passed,bc17cdfc30fdaea86c59f60630e2d6932f13c7c81f990e8619bd236c596b0c24,True,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ddae62cea325581966160f952c45b1734cfc22c6932fcd21362446ca9996060d,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,4523bcc9ac8da0c79930e42144bfabcde16915e1083e2eae214bdbfd14f21efa,Merge_failed,bb1c09b804eb62fe50e82c1b01c6948eee0baa6f841612b810ae915d75495b4f,Merge_failed,9a14d0039f768ec41d88ba1409c392d80a384da5027ed87067c290c12d731ed0,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,991127d2347d3d58e875965ff4f0969d6678b15e1ced07732bada368b9638b3b,Merge_failed,8ff0feaaf88a8ecafa45ea7dec6d0502e615547fc66274db38135bf94ac72bf0,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,0172edafafa0c6b160460f7e4cd9cc96d6f29b69596b8e1d6a31694e9deb191c,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b,Merge_failed,ee3b7a7706e6e9dd672aebb129bb508f4ec89ac7dde73dedcabd01003232881b 18,refs/remotes/origin/pull/28,be61bfb7079f3f19e2a9c9729ad00229a15383fe,28ea18ad767f7c82cf0ad7cac92e770b97911831,7ce50658fe88b87e3f2bed25c968640be69870f7,,True,False,True,2,1,5,2,True,2,Tests_passed,cf4a441b39e375044556479b404fc87315331e6f9a33417bf533b5f763b47626,True,Tests_passed,27af42f5f8b973fdf39768c78cd880b8ca2d1566099f5519a0ffd46b0bc5ce46,True,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,105448a7c6dc6f675fd06e77030c35dcd17dbf2c88fd38608a4e1c4139a1ae3f,Tests_passed,cf4a441b39e375044556479b404fc87315331e6f9a33417bf533b5f763b47626,Merge_failed,025addab3e843c59e5bbd61c3014cb9a90b18cbb77193a0cd07c31cdbab8c54d,Merge_failed,3a972b54ae60c8076de37d7be21af32b912fa186653247d7ba7662e3fff2d66c,Tests_passed,cf4a441b39e375044556479b404fc87315331e6f9a33417bf533b5f763b47626,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,ab0ea58284e9762346b909fba09fc8e4621f6dfcc502af8b1cda626491230d4d,Merge_failed,025addab3e843c59e5bbd61c3014cb9a90b18cbb77193a0cd07c31cdbab8c54d,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f,Merge_failed,d062a1c3f4f221c212f0c1c537a27561aeaf6b5c5db3e21d6e8b122484b7a27f 22,refs/remotes/origin/pull/28,28a8ab2adb083fdca0b512255193aeb06dc1726a,031fc9316c6f71e2fe74af3cb62037e47384fa47,0dddcad8b99c0821ce21ee0e335bb0d60333d19b,,True,True,True,12,38,336,4,True,13,Tests_passed,4c37a5b37135c7dc9e9cfedc5a29c8ca8876e41c715ea7d07d152f7d5b9e388f,True,Tests_passed,61905a9d89e702fd7d4f8b8d2ac435d227f5c1b14fd5a285eaab26a6281ba93a,True,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ac2058a72cb01f1802fac5da7920aedd0e0420c94da4601d9c82ef462672b5a0,Merge_failed,e8098d4c865fe5dd61e321d0a4bfc0823f8692b88f59e0617353f7dcdf824e7b,Merge_failed,5d4fd99c133847518e1793aca40b57cb6317db923ab5ef71dae4eb5b093d7d24,Merge_failed,a68933b13c7cb9e15f93aae4d028e468218e2a881ab72af0de6dfb28d2ce1778,Merge_failed,e8098d4c865fe5dd61e321d0a4bfc0823f8692b88f59e0617353f7dcdf824e7b,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,ee2622221445f5f5a241291e1869b786c19666d60bcb17ce91f1a17e0e1e69e6,Merge_failed,6ae13687a71be9b841a036dd9aedfcf069efb8109d16e7b7527ced820ecdba57,Merge_failed,5d4fd99c133847518e1793aca40b57cb6317db923ab5ef71dae4eb5b093d7d24,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,84a4786acd092a790b49435fadbb1a361a7bbc3f08ea72dea1583e42e44142af,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280,Merge_failed,3e9b9a47e99b8213eead66f55fd97b7a6fb3333ba5ebefd16a9cb8c935101280 diff --git a/results/reaper/merges_tested/einsamhauer/disthene.csv b/results/reaper/merges_tested/einsamhauer/disthene.csv index c55b0ad7ac..06ba078ec5 100644 --- a/results/reaper/merges_tested/einsamhauer/disthene.csv +++ b/results/reaper/merges_tested/einsamhauer/disthene.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,8c23ce22f44dfa88b1093a590f68cddbb7856da7,8d7751c6304a42dc11dcd3d204abb4ea45de8e16,9505994746edf1fcdce2084d4f57befccde1ff41,,True,True,Tests_passed,87ea9ff829fca26e11810ba5daed0179d9aa8828a4f060ba831e096dea3f2655,True,52,393,2564,8,True,Tests_passed,807bd2f4a2c235586ab2afd847f64cc8592617c1b024e05ef083d6c43b48090c,True,52,True,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,7dbba322bd5fa96da5eeb7d88119da8f5ecae0776189d72ca92a58b74362a292,Merge_failed,0752c7d4b0df80155e0a77bf7d3a3448d0fb49c4d4d131b5edd1c6b42d333dce,Merge_failed,f74aa19ca5932bc752614baeb86f7fc61638de5c286cd731d550f9c5a0da162b,Merge_failed,ec0043022953821c8299da81099f881ba43509fe2260720d15bdc88485068f20,Merge_failed,0752c7d4b0df80155e0a77bf7d3a3448d0fb49c4d4d131b5edd1c6b42d333dce,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,914bd2bc9b79d5c896942a441d9768eefc5c45223d9043bb431a17f487587842,Merge_failed,ea3da5520b3b251d5ee507182dbfb6647ffed71cba9bfa4d833897df5044543a,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,3613972d7fb1a7029fdafd0226bdd437bc1c71cc2b1c87448482ad5d312d8317,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195,Merge_failed,637695ef90df5f3c0b795cf7325b17bb8b3cf5ac20b4bde01caddfa058850195 12,refs/heads/master,981e50d964a248b47b78104d0d9caf678e8abd81,efdf6e7a36f19e438ad2f1aa1803174b3b82b9cc,aee2eb5552e5e0723c23d8aa943b8c2a39fd3648,,True,False,Tests_passed,671812d6d3b15e4a4445abe235ec243d84ae6e7e79e1e8a344912bb3800bfd2e,True,2,1,2,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,True,3,True,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_failed,1d8e4a52f61a9c7c0512a6f59e52747d804e1ca78b8877c6e53bd8630efbca3b,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,440238cb79b761a572f2a3ba4b630c54fe27eb776b8743f92c8cf0559b9f71bf,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd,Tests_passed,aae2f48dfad66bd5bc49eebb6d667a69ef6065a4a2ea7c193f9f416d436acfdd diff --git a/results/reaper/merges_tested/eirslett/frontend-maven-plugin.csv b/results/reaper/merges_tested/eirslett/frontend-maven-plugin.csv index 080150f9e5..7a3e7649de 100644 --- a/results/reaper/merges_tested/eirslett/frontend-maven-plugin.csv +++ b/results/reaper/merges_tested/eirslett/frontend-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,374f2be4451a2e49c234736ca7e22067722c1c6e,d059da07326c358227ed34c76469fafae4005b71,26740c875cde63eb0faa1abd801408cc62f9533e,,True,True,True,98,268,13006,3,True,98,Tests_passed,1d6e431e99a211d008cfea7c5642e88547d86c338587caef4f32bec54618680e,True,Tests_passed,c1d8bfa45a86a8698fd813896b461bb4d90fbe674fe658df70de12a80d48e63c,True,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,1bbc8da9a774bf9f7f73687a69bfc3b8116a5955e759d712916a43e929094d78,Tests_passed,ccdf200805a8fb5616551e5bac2675b360a652690b5ca003daa9a198e324c79c,Tests_passed,e29f570687ee54f1d67a09c1a2a23565be76f179b559dd54539678e8b3088f18,Tests_failed,e5a6157a97537c5f6094dd753022be31792561018968d88488766fedb08a9e6e,Tests_passed,ccdf200805a8fb5616551e5bac2675b360a652690b5ca003daa9a198e324c79c,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,7af4fac796e2d3ffe802f8108e8efeb8fc258bab3c3bc7bc6891a36ade5b03ad,Tests_passed,e29f570687ee54f1d67a09c1a2a23565be76f179b559dd54539678e8b3088f18,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,90f1a7c061258917bf982014ae180e99c3330e9cfb278691919a73f80fc04366,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326,Merge_failed,628ef69c4b913b8d5706c767a6cd0ba0384b74e1b25de894c356e35240fbb326 90,refs/heads/master,bd47851ce5a12bee22e36c45e18ca8839271431b,04666aef48b8e3e9b5f3dd0e5e7d7e411bc7b2fa,e568debb5af86abf8467af1ae0c1220d178e941b,,True,True,True,41,137,2590,2,True,41,Tests_passed,58551b7e6a308379cb1ef1bb69ad9a67159fa5b610ede1f8146b998caa62451b,True,Tests_passed,7309ab1651e6c83267289a05f1ad228860ed371ffaec7a3cdf69e37009325624,True,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,b6e7b236d1b0b64103acf9574442f8b89a7feb28d54f60e478cc2775342d0112,Tests_failed,c40a7b69d3f0015a93f9b1330aaa22c8db871be46a28f4d115a28a4e8a780e6a,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,b6e7b236d1b0b64103acf9574442f8b89a7feb28d54f60e478cc2775342d0112,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7,Tests_passed,9af7d2296cf866a2492f5146269172fe54f196b580c893051552cd947ee3e5a7 120,refs/heads/master,ff8a15cb812818112592c0bbb4121af3b5ad0844,76120dea4ac1cdd8a770632e9ea35b5a0ecdf278,e0d5fc7377a636cbdecdf55c3752ec94b9ed9ca2,,True,True,True,23,77,406,2,True,23,Tests_passed,24c0277a5a1f4e7973d1c72f9dd3467bf99ad5e4e659b805ef20b7f8b30a06c0,True,Tests_passed,b97d0e88054d86d0392ac5e4db99979b9591274a3dd5824770fba969ef4ef0d9,True,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,b51b96897cfa26870dfaae8101e6b097bc8f91b7ef6dae91ec08553a0b79201b,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,b51b96897cfa26870dfaae8101e6b097bc8f91b7ef6dae91ec08553a0b79201b,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1,Tests_passed,2dd61733236ed20efaa3ef5240640f4a8e0a5eff433c1b03980aee381e1cd1d1 diff --git a/results/reaper/merges_tested/ekryd/sortpom.csv b/results/reaper/merges_tested/ekryd/sortpom.csv index 67c4086fa4..86064cacaf 100644 --- a/results/reaper/merges_tested/ekryd/sortpom.csv +++ b/results/reaper/merges_tested/ekryd/sortpom.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/heads/master,cb19c8c127c6959d2c605f3b05ad8d992e0a8f09,138e3ac1ec94003f9c65ff99447d82ec463edf32,5bb68340866b21585cf35b2b4917da3e432c17bf,,True,True,True,23,53,1115,3,True,23,Tests_passed,da5a379b4f05d39db884ef205a7fc4dd52d6ea9e479774827e21893c0f7110a7,True,Tests_passed,c2ae68e74f305703ae8ae2774a6dbd88a41fa9e37754cb54de5c2a5b58351b39,True,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c,Tests_passed,aa768375cdc709765d959c2f4818a55520711e83a0e8384bbebb1a8f4b61339c 85,refs/heads/master,f19edf0092007b36d73316707be71448afdc40cf,65db6732963f71b39434913dd4015b9fd96e9a20,64311fe38c9acefaec6dcd3ae2428168c0cb0441,,True,True,True,11,16,102,2,True,11,Tests_passed,d548b7d60a51a877438902662082d6b568f9ad2cfe3b263786713b30a4ceff69,True,Tests_passed,4db3df2452de700e6b3009d88e249c8565c470c8f20fc92e260ce8282112f85d,True,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_failed,152c9f6a414e466fd36ef5aca7969edd77329873fbf03b6e01358f5194de5aad,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2,Tests_passed,13e6dd4eb9869c291a52fd8fe6eb6b0e4429db6adbf0a62cf3ac3514e4c17be2 187,refs/heads/master,b918df820e139af36241be955991b9e5a69d361a,8b2e212fc24f5e3d4d9850233dceaec5d20b9dcb,c532af1c326ce6b77d672c091b4db512136b446a,,True,True,True,46,88,1131,2,True,46,Tests_passed,c8af9bb7fbdb095c5b93a7c16c94bebec833e43dc61cdf91c27c1368566ad391,True,Tests_passed,41049ac91e34d60f32c8c4301f480451170e55077dff49d9a57131f32be08884,True,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_failed,e5190abee35827e3af6704388fe945aa6b292c2358799d5bf2d460ad684eef52,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f,Tests_passed,a9f07bb3e9a7c66ae3c07ab2ba2351bd125559299bd2db9ad2ff3ba90506122f diff --git a/results/reaper/merges_tested/ekt/biblio-transformation-engine.csv b/results/reaper/merges_tested/ekt/biblio-transformation-engine.csv index ea1c115922..38abe1749e 100644 --- a/results/reaper/merges_tested/ekt/biblio-transformation-engine.csv +++ b/results/reaper/merges_tested/ekt/biblio-transformation-engine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/version-0.10.0,e1a8fcececc66007b4a770ff37f17a5eafe79718,e2cac286ffa6742f7365f3cd58f83038c0986451,a01da4c16a61a3e9e1de11655011de6c1ca71a5d,,True,True,True,24,82,858,5,True,24,Tests_passed,487d31ee43db08b0917b31521a41d78f4394c1d23fbb64cb5db020086aa4c630,True,Tests_passed,a8d98f83950ad6acb0c5df1a951382458845fa670dc3a9dc5792d0253be1f3b5,True,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,0892aa8ea8e411a83ddac03c373bf07c2e1c7af4a41c965f308efbc42fb23aed,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,9fb627ac3b2d025075fabfa7e9b79c2d9e89bd37b2380ac52fd2b2beee4a4067,Merge_failed,9ae28e1be65fbf6f32fdb773d538b0721c3a03d63bfc0fb582f6b7f913f483ee,Merge_failed,aff2657a9c3f898a1c97d8ab960718c0d39bc6807b3656c8bdafcb1bfdec7e88,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,402606eccf1bc908020e22ae924dfd654732b702a551e2796957ca03e89e4ab5,Merge_failed,fbef72efdff05f86326dced689510e65abffe3e579335f72d19655de0ca1a484,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab,Merge_failed,d3b8ab62e32cce68fc7e13c89d8680d24b2f13254e046cd5b46638dda06b8bab diff --git a/results/reaper/merges_tested/electronicchartcentre/java-vector-tile.csv b/results/reaper/merges_tested/electronicchartcentre/java-vector-tile.csv index 16958250cc..960f124ada 100644 --- a/results/reaper/merges_tested/electronicchartcentre/java-vector-tile.csv +++ b/results/reaper/merges_tested/electronicchartcentre/java-vector-tile.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,51ae3d6f9532a95ef8ca01c471eaaab0129ed881,dec357737d60018e79e3a67e14673e7264db0eae,24fa5942cfe7b919b1de6ba54b447073e1814a1f,,True,True,Tests_passed,a930f825c0b2ea2f6e55d2bc2d95883ba38a8552f5ba33db3dfc57a06143923e,True,10,211,6682,5,True,Tests_passed,2c9c2346887d51244f97d74637cd2bd3c5e5e1c13bc12f74f5a68622fffa264e,True,10,True,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,034ff9aa9a182d47a319365c144f0e2b87c5c74d721c1e0eefe2058cd414a4b7,Merge_failed,dc6d6ffdd053f5eed5a1162c54bdaa8dd7b0a4efd7bb1703f454027a060bc716,Merge_failed,bae7d0b303be890a5216a24b97b0e13f31b715559dd224db56f6c297a50e2184,Merge_failed,efaca69b6147285d9943e1f9c37b2a10827c8f1f33dda5ce2ca48052ba0a02bd,Merge_failed,dc6d6ffdd053f5eed5a1162c54bdaa8dd7b0a4efd7bb1703f454027a060bc716,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,0c24fa3dbdec6cc569a3804a62789c9110aaf2bc1242c1915c9da70ce711d00b,Merge_failed,8a80d8199db807ef98fa73fb8986854a655e2f1f24a54d5df9ecc41c63f0c8fd,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860,Merge_failed,def523db75347aa85a934a4d1bb3065c8ed8562fae48b58ff3bfdf536b79e860 20,refs/heads/master,293520399db5206524d7695f666682cf60ddf05f,da7c0a0c0d0f7ffd2766dda1f15d147bd41b5a03,2e44156f767570103439d8b484fcca031790d28a,,True,True,Tests_passed,8b6a4e0cd1e494b230a33db9822d306e2e6b646db3c4e395b07ee348d3bac6b2,True,6,26,154,2,True,Tests_passed,4c45468c0045fce3d00a1f5759af9da8ec9b12ea7709a326e22a3ad8aeec4f46,True,6,True,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,b16ab951f06551ff27c69b845ff2d16b82c3679093d81b61c8939101dfdc59b9,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1,Tests_passed,2c480597e44bb814e9b9178c4c499d1e729efd361844d69b2823aa43e2aa3be1 diff --git a/results/reaper/merges_tested/elisarver/selophane.csv b/results/reaper/merges_tested/elisarver/selophane.csv index 36a4d244af..dcc8693709 100644 --- a/results/reaper/merges_tested/elisarver/selophane.csv +++ b/results/reaper/merges_tested/elisarver/selophane.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,56eb40e68919920ba7f973b114536e4620788ed5,9bfa023e2de211afa8960e0d54108439a72c3379,95e696bedd0c7d5f5b183791800a3aa271eb232f,,True,True,True,4,6,19,2,True,4,Tests_passed,cef4989f2763609d5690282b0c2335cc2505a0ac36b81cefcb25a1bb2a09d0c0,True,Tests_passed,f54fed560023f8bd449a8d9c5010b8732c89e1e57aac2ad9207b7ee9ee93eaf3,True,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_failed,c2209098bd06d31f872d7b7d33bfffe6c24bfa4a7f679464216977a7c5267c0c,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1c1a7eceefa31ee9fe8b30866a3f1e4f81b6b2475f123443e682733cc0447a1e,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d,Tests_passed,1dc169a07ed7d0e7d652a6f326157687d4d42de0e3bd6e195bc953d32ac8264d 10,refs/heads/master,5f1ad31005888993ca93522dd2b14f142d2004e3,38590df24c6b4e9bba214261e6d312d6264d1130,ee7b5147aebd6355418268cd81b675566b81bdb9,,True,True,True,58,90,1590,6,True,59,Tests_passed,dbb198c2438d1b7ff836fe505c4421c9d01a2e0e3d519694a4c92269837f418f,True,Tests_passed,64fd0481d44a9d2764d1666101934c6ac10ed13f04a8fb185ef5923d722f5627,True,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,c504da4fa7bf92ad8dc9c5aebc5ad3bd8d9caf5fb81fb0f3dfc4eba2bdafcced,Merge_failed,dcce9fc1a179abcd2b15bedc24e47e432e7b6f4ef242eef1cd8fa5b0a5331455,Merge_failed,9f90183a80003748c418c1db1045243ff68fe7d4206f200b3b7ee35366d7ce1b,Merge_failed,f914d50ae5428b8155e1e05fe22c69b3d2416a87625bc25799851eb92d176652,Merge_failed,dcce9fc1a179abcd2b15bedc24e47e432e7b6f4ef242eef1cd8fa5b0a5331455,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,597273b412abdc923a30ac42adbb1e276212b7a50fa3ff28e4ca9c2ffed3ba07,Merge_failed,9f90183a80003748c418c1db1045243ff68fe7d4206f200b3b7ee35366d7ce1b,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,d682e53b16832dabfce28991bac2754eba101089af8b32a80a0f8e006659f795,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709,Merge_failed,6a0c83d2e66cf3a4f0f11b2e7dab453eaba4d1bc12bc1e4b882e782f4902d709 12,refs/remotes/origin/pull/14,4ecc6000170804f1ce07031d285aad8efaeb4256,dab74114914d8747c1acc2ac757c398e30e70791,4d9325b46bbb4b16f28842be0dfb4295df74c118,,True,True,True,32,62,346,3,True,32,Tests_passed,4b3325529f7cb75ce37396c6a07b876314291bfa96979a02b4581f08e947e441,True,Tests_passed,7707f55aa892910f7c1d8d68742895cba19f7d77e5c525473d1ce1b8b8d63967,True,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,aa2d80ad6293ea82d344fefb116fcb9169ed0e874d307f18338e9c8d10e62d89,Tests_failed,38959f604a9b210ee9a13932e9fabb27084b824d26287cf73fde21ab0c82d9b8,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,aa2d80ad6293ea82d344fefb116fcb9169ed0e874d307f18338e9c8d10e62d89,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56,Tests_failed,1ce3f551cdd07657f255992b3ddbf9f1ecc8765ada08f22ceeb5e8400f9cbb56 diff --git a/results/reaper/merges_tested/emicklei/rendersnake.csv b/results/reaper/merges_tested/emicklei/rendersnake.csv index 10e6f5ec83..2657578cb0 100644 --- a/results/reaper/merges_tested/emicklei/rendersnake.csv +++ b/results/reaper/merges_tested/emicklei/rendersnake.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9541c886359597f23b41f86c5f5ca95dc4d59a51,eddec186e79131f4569769a86a0f9d9aaf2344b9,d238d52e4129a95a4a3f9314c4eab95f008955de,,True,True,True,311,656,49552,2,True,311,Tests_passed,378531769f40766716ac1acb132c5927c194fbc2ec68458723cc569a9486a04c,True,Tests_passed,f3a7559545782aedd0cd3fa04210190213db3796a482964b15128c1a8c0b2fd6,True,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,ad2b2c034d3943ae47fc2b8c9e1063c9378d9a6e40b179bd14540010ff06edb3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,1aa8a9bbcbc66cc8390984d2c0f3c610fd816727a24afefd460132491a0a4a96,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3,Tests_passed,2842497ae1f79d9d85246cd465108ed34ef77eaca53b0b92e4a0b170041888e3 diff --git a/results/reaper/merges_tested/engine-alpha/engine-alpha.csv b/results/reaper/merges_tested/engine-alpha/engine-alpha.csv index ca5cbc42c5..217d151c64 100644 --- a/results/reaper/merges_tested/engine-alpha/engine-alpha.csv +++ b/results/reaper/merges_tested/engine-alpha/engine-alpha.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/remotes/origin/pull/45,7d935a6d1499926397b0398ced92dafd1a327b9a,6934f3ffe87a4be23eac32bcfb2af067b9d6126e,b7b724e78cd51dfd08e67bcc7062c1a1d4f43d04,,True,True,True,10,43,161.0,2,True,10,Tests_passed,23d0d5a49d372d5023e420f3f6d5ae933e322fc456661d3186399d070a8ed048,True,Tests_passed,8766dba53940ed639f72a60a7513406198fb3d0522fef7c112fc835b8c726035,True,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,906989f77937d02f9aabeb338d343e10c5f0830dc4d996ecb3c917c2e75616de,Merge_failed,4ff4003f6b24a730689148ed8951ac488d94133cf06404073c126797ffc42b3e,Tests_passed,ad783c1d5b77b4209f2894f33974112fcdb7c1f9a881d2cd0a6476731f2c91a5,Tests_passed,722a258096f3e81cbdae663767e860c6c882470d841315a5604b292880a9ac8e,Merge_failed,4ff4003f6b24a730689148ed8951ac488d94133cf06404073c126797ffc42b3e,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,9ca9334ca158db589a30bd886bb1af4df97d748a80120836133041acef7e5669,Tests_passed,ad783c1d5b77b4209f2894f33974112fcdb7c1f9a881d2cd0a6476731f2c91a5,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Tests_passed,3c4c9267def9da8ebfb346248b39d6ae4629e4e5897db23de57290da151cf7a7,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a,Merge_failed,735d06d9956c5eb289be6bcacca64af028b8ea236d3bd8bddb1e27e141a8e66a 54,refs/remotes/origin/pull/46,ac8d5c637116ce3b88e46a1b0c30fb182d93e49b,a5fcdfef0794ea44d7094526279857f614784f3f,a959ad427a8b29c48f2d7b68e5fe32240a3b4413,,True,True,True,8,28,106.0,2,True,8,Tests_passed,00f2f2edaffc4af622c215fdf7bc3b8851d9be1bf38acda316222d9e3a90f5fa,True,Tests_passed,c960383e7a57030afff2d0ac1b8999f083a7187b4c80c274554600335a29ae62,True,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,63ac31e453521a87a82c9654ab6bf13cff41e9d8ac211ea980d51c84eb4a5258,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0,Tests_passed,824fbffb2067bcdd261b9496c8d44e2f6f248ca6aa74d725db96a40a3d4ec3b0 diff --git a/results/reaper/merges_tested/englishtown/vertx-elasticsearch-service.csv b/results/reaper/merges_tested/englishtown/vertx-elasticsearch-service.csv index 4c2be9f5bb..459986ba61 100644 --- a/results/reaper/merges_tested/englishtown/vertx-elasticsearch-service.csv +++ b/results/reaper/merges_tested/englishtown/vertx-elasticsearch-service.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/develop,cf3917c8b163b40e711a9e4fb2b603afa1ce895a,0dc42f08ac8011449cdd6e459ff13920b4e05d2c,7f0e9a4245b30624120e0bb30a0bcd7955815616,,True,True,True,15,51,145,2,True,15,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,True,Tests_passed,9c8dadc43d2ac91389065e3ca9bf523e3935bc4e238de7b9a72b4b2e4e2c5704,True,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,7f1d9c1cdd07ccf57b288ed3ec8cd581dd42d928699b1118ba40523ebfe749cb,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,7f1d9c1cdd07ccf57b288ed3ec8cd581dd42d928699b1118ba40523ebfe749cb,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9 27,refs/heads/develop,93c7adc9b131682ead437c867f95a1fc354d3333,eccecd447573468cb83867a7c5406809de2693e5,24a5c26a6f40b32f5cf20211fb1d455e3b4653b1,,True,True,True,5,28,211,4,True,5,Tests_passed,a21eefb561e742d03b247b4615acf710d1682f58e717a30ea4582867de439653,True,Tests_passed,cb8916d8d080e09d6f8fd4a30789361c4b45076cb8d80f957ce88dd1c01ba711,True,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,e8d66bd8a9eef3f2c94342ea32d3657220b6bbe15dcc7c8dc55f362fa17a480d,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,2ec50b1c116d3ad08c3af6052f20d758f29cb6b2d36fc8daecbafdbfb6e13d64,Merge_failed,696f0299700942243e2d23fd98ff3ffaffb60d2cd083b54c37b2a1ca61902b1a,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,dd1a5767a9152e7af2d46bed5522bd45113c0ef04ba0051395fa332d85e59eb6,Tests_passed,c8ef592077e7aff0b24c96735d70d2bb3c26606bdace4ef9de5f8ea8eae549c9,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce,Merge_failed,4de04de76505c8a2a81e4f51ff33b47a5c41f6b389edee67a8acd6784daa33ce 36,refs/remotes/origin/pull/15,3745c464a47721706f5d344d3cda60fbb5e5f233,1cb4a4fe6792040eb508cab9da700e55eff81963,cf3917c8b163b40e711a9e4fb2b603afa1ce895a,,True,True,True,18,53,345,3,True,18,Tests_passed,0fd99f7b1e2c688735b909b7a9690b61f7a7a7bba576e3252c70e9c344bf4f2d,True,Tests_passed,041e46d2a76e30d9d0d93b7bbfe39332c98a73c972969fdf2f8440ab3106e2f9,True,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,f51f45d220723cdf9819b511d59e0be29a7206baa146067c27c8c749b2ef400e,Tests_failed,063579c6bfe25a7e3625dae9c3d954947a2af0a5ccbaaf1dee97458dded25451,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,f51f45d220723cdf9819b511d59e0be29a7206baa146067c27c8c749b2ef400e,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b,Tests_passed,fc848b518d7949793be708626fa0617639345bf16b3ba102f5b2d9f015abf40b diff --git a/results/reaper/merges_tested/entertailion/fling.csv b/results/reaper/merges_tested/entertailion/fling.csv index a19cee5989..d1381c20ab 100644 --- a/results/reaper/merges_tested/entertailion/fling.csv +++ b/results/reaper/merges_tested/entertailion/fling.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e008cc1cee6c339a24627ec7e00cc5be46f916ee,3704388c693a2a7cd10d61bb994c0874d003afcb,a4124a4ad635d102c78fcfce196713a40477586f,,True,True,True,5,73,394,3,True,5,Tests_passed,45da5b4c590a5bd7fee5cccca2d4dc1cef38870097cc473e0a841e0e45f1296f,True,Tests_passed,4ead57055be8e8c276029bd3541c33bcedb26fe32588dacbc5b49fffe1dc0ce1,True,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,1bd2fee6fb6cb8d155d14f04533f07ed4683a901d03820192e94a515414a7758,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,a00c977d01185d13230d2a2c8af05ad54cdb4065ffed5ce71dbd87cfc9b47497,Merge_failed,e874cfa05edbf52b26722d38be8a1e004009c8b912f11b9ee719b953c5ad2d16,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,0cc22e74004c23361c833fe5ff3d7f8b118d2f143f211b7db41ea6033f88443c,Merge_failed,d755f0aace9b6fd7a6b5a812d5eaaa43caa3bae628541557ceec4628f4f31ce0,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8,Merge_failed,39d2e3612ca587f0ddbbc3af2248df560e3b43624a5b467715afc37c5850e6c8 diff --git a/results/reaper/merges_tested/erudika/para.csv b/results/reaper/merges_tested/erudika/para.csv index 872593c933..eae40ad88d 100644 --- a/results/reaper/merges_tested/erudika/para.csv +++ b/results/reaper/merges_tested/erudika/para.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,f23fd5855ed00257a78a115e484beec4b32bc3b5,5f848ab478afd2ee38622ecea00733f5dd70a1c8,ebb0518a083d5b7b53e8d1d86002c44f51a77fa2,,True,True,Tests_passed,1a73eadb2df66b4bc004f3e0ba73027b5e977352eaaf7ec9fc5176838fb7d10b,True,15,136,1141,2,True,Tests_passed,f90e628f0b86e045d6cdac71f155eeb351945fb2e67fa57e395e0c32daccb019,True,15,True,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_failed,89fdeecff3d137e710d0b60f6d6fdc50e7ba71ed6a8217d5df05b12ebdca53ff,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_failed,b7e9652e1294dac7b3a9776cd80c3af780f989c268c9399e04e1abcc5ca3b732,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,5b640f9713eace8489a44a1ad6fac19332f6abbf81b07f0edf322107be0088c6,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104,Tests_passed,9ce93eab447b1e2d005e316df8ecf34ab389a8c98aac2fd7c8435f0afe939104 21,refs/heads/master,a9e67cc8b39eb9b5112786e5ecb1422afc8fd4d8,55e20414dd9dc7697b18f8632dda5f49995cf6e4,f8e479e040f5e6e8c72300dc3bc30a476bddded4,,True,True,Tests_passed,2cf8e2554ab3d38c4b4c7f22c4d522daa1e3ccb2eed74874e40cbb9fcfd1c175,True,11,110,837,2,True,Tests_passed,4f8765ca97baea489eb4d4543362d1896df82d39c9662d81ca317b86ce013758,True,11,True,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,025d5c9f1d915ad716ac0dd3b400828a5abbe11669ce04ff9bbc8691e3322f48,Tests_failed,ae66c8fff2bc6218ba01fd27a7f8749b352bf06288cd8374f41429b19ff8bf58,Tests_failed,e29019740c628d9cf7e20c43de946fa6a02a7b6855355ecd281e1f588251353e,Tests_failed,b422502e4856d9f471b3503f0c367d459f4afdd4a33a1827fcb1b5d3b0f2e21b,Tests_failed,ae66c8fff2bc6218ba01fd27a7f8749b352bf06288cd8374f41429b19ff8bf58,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,bf459772f1734e8cae9ba38c251203dcf562e55775563dfdfc4ab910a45d0628,Tests_failed,e29019740c628d9cf7e20c43de946fa6a02a7b6855355ecd281e1f588251353e,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711,Merge_failed,b6f0b11ec430af345a137856bce5e3267b6338d34e72c5e335a8e14933ccb711 24,refs/heads/master,64c16f69950b8cd73e8b27612633a2888d1c375f,e4e5d80f8330c1fe24469ae9b7081d2e8b8ca9ae,caef0cb424e9628c3467ba3e228c9d3f34ea3316,,True,True,Tests_passed,9dba176ccde8ef931eff6f15bad977b84b950226e6de268fde9756a85d8073a4,True,11,32,1540,2,True,Tests_passed,091e1056478d505196d3f28c8a557eacf4be6ed112d69b8dc4857c8190495fef,True,11,True,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_failed,ba8deff1287959cb3732591bfe7634b8834281ef63c1abb33b1ac3b797b51fd7,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_failed,ba8deff1287959cb3732591bfe7634b8834281ef63c1abb33b1ac3b797b51fd7,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d,Tests_passed,8cce89bb498c20e8b7506401463a835e9bc2bd96c135c2ae89f429ff25db5e0d diff --git a/results/reaper/merges_tested/esapi/esapi-java-legacy.csv b/results/reaper/merges_tested/esapi/esapi-java-legacy.csv index 25c4d612bc..ee6520f341 100644 --- a/results/reaper/merges_tested/esapi/esapi-java-legacy.csv +++ b/results/reaper/merges_tested/esapi/esapi-java-legacy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/develop,0b0da0ce6155e38a0e4fc469b6911107e399b60c,77c5f26cbbf28c6c963cbabd4b1163ebaeed3a70,6452cc9eb369a4b8068a1327632606a1343749d2,,True,True,True,19,106,607,6,True,19,Tests_passed,948738cf294ffc4276624b0a05a6d1e5fffc3b987c58b9b63fa5d829690d70f5,True,Tests_passed,83f61fce67d88c5b88d57799fdb0fd310e491f5e87792e568c956d0f376e8c8c,True,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,807b5a9b20265f3e7134aa64bce423b1f473da9c52bb350c65bdaa246c80f873,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,12b3def08cca437f67f6fb7abbf0236ea81112327155d3c7b1e34f5cce51cbb7,Merge_failed,a26d9f00fb26931b1dc15f45cbf4738c38f3c4b8587f498a29e8f4119f06550a,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df649ecf3a556fc3b5ca759601209cb429b37dcd0f43074c232591470b19f0ab,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,107b7f6d0f804339535240bd0477266cb8090293916c79c5aef0bf29ddb286ca,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133,Merge_failed,df408abdcf54be51962e5bf284606eca30325b2ab131da6134b8e54ff8e8c133 33,refs/heads/develop,09a027f874dd8d9b98378cbedbbc18976c4d632d,d1a9e34e06778e9e509bd171d6ba54dd616ed087,0f9ab8a0431032431e88fce454e735833f1ae698,,True,True,True,21,92,474,3,True,21,Tests_passed,03ea28123b2796b943d98210f0486c2241aeda31ef613b66918298368313c70b,True,Tests_passed,7a49d721ad15f5437d8b94a104b9bbe60bc539b90c33fb34d13a3dc404edc0e1,True,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,982c687e171899ff7d311ebe28816d405e17f7f2062a51f3989c8b4ab1d55def,Merge_failed,ba69d9086b9bf5dcc5c681392bcafec1cc68111ef2c5a6cca199709c8f5b33a4,Merge_failed,e514099ab1cf9e4c5b27da1406ca20bfcb508c4fd33c26e891fd88e709a3bcd3,Merge_failed,e514099ab1cf9e4c5b27da1406ca20bfcb508c4fd33c26e891fd88e709a3bcd3,Merge_failed,ba69d9086b9bf5dcc5c681392bcafec1cc68111ef2c5a6cca199709c8f5b33a4,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,bd2b1c1b32db494e1d412a7f889cc131e53ef604386e136f84acd5539e10d96c,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5,Merge_failed,ade739a0da4c8d5e1d389ec0d60be746d51048939da09c84be9eabd6203848e5 143,refs/remotes/origin/pull/714,12a5696c9cff9dd655b5d89e1635417dd6985f09,21a16f350749034c369ecb7a763b0a5c3d9c88b3,232c27d61eb1ae4807868af990383947ce4bcd56,,True,True,True,312,2699,57620,10,True,312,Tests_passed,9f72b26031742f18ab503c4f7570960b1e8a1a2ecbc1adf9ca1b9ac77e91de63,True,Tests_passed,9fb60b9d56a8994b3d045a0996a1ff1e57d2ec73f37b71e94a7c02138e1d6b0b,True,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,470fe3d3bb7bd0a32d5e16e00b8f3fa129a67f8a012192492e390dc98fbde91d,Merge_failed,723dac407becd0d02f0c2879126752ffd1a3045bdcc57c50ffda05ff0cc274d9,Merge_failed,a2367b34fc105533c94d24cd41d9e0a7efe8d24253264a65ae76ae799b01aeba,Merge_failed,a2367b34fc105533c94d24cd41d9e0a7efe8d24253264a65ae76ae799b01aeba,Merge_failed,723dac407becd0d02f0c2879126752ffd1a3045bdcc57c50ffda05ff0cc274d9,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,0cca273b03385dce9bdfb997f644bca7f0c65568e936910d4134a3996128a6f1,Merge_failed,53b1a97405e11440dfccff1e7fff88337f3e09d2a51ad8c403d61fe5ed830921,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,d2bac8bf137a54dd00c058c4bd1232e0967da9b4769757e7bfacaaffc2974955,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43,Merge_failed,aaf1f76f3e3421b3d26cbd20f194a58032c1fc365e3a32e64d12b0fc898f8a43 diff --git a/results/reaper/merges_tested/eskatos/asadmin.csv b/results/reaper/merges_tested/eskatos/asadmin.csv index d8b1365b73..21692a96ef 100644 --- a/results/reaper/merges_tested/eskatos/asadmin.csv +++ b/results/reaper/merges_tested/eskatos/asadmin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,6fb154963dfd021025038412792ef1dcc5399017,9c8a4553a27a6f727e039fbddd1cf9d32c173368,0383186b3106763ba62c548ef170fc26149839c4,,True,True,Tests_passed,1ac65393efa5367508a3c7738d8dd00f346a52724489864da6d80e2893f9b065,True,34,73,669,4,True,Tests_passed,14faa9c7f724b81054087c29a30b315459988d6c6c44d10079bd3a1c0d1dce4d,True,34,True,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,0d392409d46e8102560a03f2319a08e58a8eded186b836a18ba5553539888a6e,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_timedout,,Merge_failed,5941a0f0e126f8a7964be98acde8fe0fe407205ec0dfb99653331c18347c277f,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,1992e2bc12fb16b96b495a11fa86d0d094a9b781f2ff2f897cd6f0378681459c,Merge_failed,757df9523461e5d84c26f000d662258bbcda2440b0c4eaaa6e6b80bfb3820c4d,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,d32a9474e923fa379f2e224b578f51f86d7f2523c0d3b36c813ef69a48002e5b,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52,Merge_failed,4185da0b4c11b25bfd96c1d86338ba092f05e1d33283cab00a98657429806d52 diff --git a/results/reaper/merges_tested/evil-co/nbt-lib.csv b/results/reaper/merges_tested/evil-co/nbt-lib.csv index 8675f6ef68..1c058f7d4b 100644 --- a/results/reaper/merges_tested/evil-co/nbt-lib.csv +++ b/results/reaper/merges_tested/evil-co/nbt-lib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,637ae9e87d7feae16db8dcb39b5d40ada9950583,5114126caf920b3f91194892f3812cc1de4d71a7,06e34c4a95cf30b65feaaf9c3803a9071af42180,,True,True,Tests_passed,a6eccb8f88bbffcd341121c2fa8103534e9e9268e97a1b114ac1119fdc3a9cbd,True,8,11,341,2,True,Tests_passed,da025bd2ac4a52ad189aee1eeedb6c4573cc9f9808490d42f95f2aa37321e16e,True,8,True,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_failed,c71d20d10427343d5e5ebe6cca51e30234b820e6130fe44bbd586b7d26580a31,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,be9098d5deb6315a7f2d63a8caf08bece986fa3a4120924f9976c132eab62dd8,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc,Tests_passed,8acf3731d6ed5125e53ffad88b05d8b1e63d4f50b2a2c7bdda7096fbb03bb4cc diff --git a/results/reaper/merges_tested/evolute-pt/dbtransfer.csv b/results/reaper/merges_tested/evolute-pt/dbtransfer.csv index bbb42ff967..d09f0024b7 100644 --- a/results/reaper/merges_tested/evolute-pt/dbtransfer.csv +++ b/results/reaper/merges_tested/evolute-pt/dbtransfer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/14,4f86b711a6e540041abc183eabc4592e211cfcf8,b1a2e5cb5c94b95c6604d080ac3471fb15305b4a,b660bb89c629f2ece0737128ea94e140ec06fbc0,,True,False,Tests_passed,a71352f49d3419dab667d2e40e17c40a532d28f2e06bdd32bb17e824ef6caa3e,True,4,7,21,2,True,Tests_passed,184660a7f31b1e22fad3e93100deff29b2ed6a5a730cd29fbdd3eaf9c3875e26,True,4,True,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_failed,27200d30760a0b6929e7755315524627147a4e1c0b8eaaa560ce7e774c981cd0,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,503fbd25632e4349c460c227357d6bda54d69308aca7932934c595b8f63e83f4,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,77b3ec749f0c6dd0f3ae89d39dcdb4640557a9705560732706c56e37523a42ff,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71,Tests_passed,d9e2bc26b2154e32877c0434d0d6b0d6a5537f2ae289481705e5cb8d63bc1a71 diff --git a/results/reaper/merges_tested/facebook/jcommon.csv b/results/reaper/merges_tested/facebook/jcommon.csv index 61d1c850f8..6f52fe5ce0 100644 --- a/results/reaper/merges_tested/facebook/jcommon.csv +++ b/results/reaper/merges_tested/facebook/jcommon.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,a6c08d81e3186d83a020f84b01b134fc48f3822a,11b32f0c28057eedf224655fa2019b0c3fb19536,6ccd11e9354e9c0ea8f9f329e658a69f1af5a610,,True,False,True,2,1,15,56,True,56,Tests_passed,5468675109d3dfa10e88e500bc51a153c17161b39f5b41e9dbd65f2c606d8303,True,Tests_passed,384911a66b6903164e7bfc2476520ea51a4bcf77ac3e2b1cbb65bbbecd4a58a3,True,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,34b0252300999fa6857f47c7d59a966a031b61a8f9fbf03b9fc612aaadc3f9db,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,393c6952d1b8f7123bf8886830538d2d803ffbea86ca376ea51b75715e701853,Merge_failed,d2a689361d7a9889c5a2896b8b620e4553b7d4c7fa3e37d09968dd1c36b3b909,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,9c50931100d9fa906210b5024fe4619638b5119368458a853b7275de0bdcc889,Merge_failed,bdec5252613665af98970b208917afe83fd67938dd4f2ff492cf70d6399e4bb0,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc,Merge_failed,370e1b1795cfc0bcbbc6137b0dfc67a36b6000172034f1f102672d9dc3d3abcc diff --git a/results/reaper/merges_tested/farin/jcloisterzone.csv b/results/reaper/merges_tested/farin/jcloisterzone.csv index 3eba638e30..150df5dc04 100644 --- a/results/reaper/merges_tested/farin/jcloisterzone.csv +++ b/results/reaper/merges_tested/farin/jcloisterzone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4a38e3b9265bc7b704f645b82c81f9465009dc62,47bf0439e3ef6eb0d4c104bfa9eced2294ae515c,f86c2db9ab9a7c5480d1e5911d0e116c63911319,,True,True,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,True,29,67,592,2,True,Tests_passed,055a8425e5685bb883817ae5da8591e993b411baa04a3634d1dc1036e5fa34fa,True,29,True,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_failed,29c966452cbb03da496614c69c5227c8d27912347c829af913b039f0e865e493,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8,Tests_passed,2d24324a909acc8f0db79382eaabe09ca5341aab7486be85c4df948ef52797a8 2,refs/heads/master,47bf0439e3ef6eb0d4c104bfa9eced2294ae515c,a79e330a70d1a29451cfc48fcbeb618f6a33e594,a20e50f591287886a6d1a962452b3d79ab3bdb6d,,True,True,Tests_passed,44cc1c3a7f1de6b3ab261fd6eede3fe012d05ae4fe47e2796290499c0ee55580,True,36,79,651,4,True,Tests_passed,044f967d9ade98aa8f6ffdf20b26d778a371a8b5df187af89c4c14475f1f0104,True,36,True,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_failed,f9e0d7879a12183abcef867fe0ebfb8dc5a5c8844b6c5707221950dfc36b6b33,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55,Tests_passed,98457b49a8358e5d60923598a3b7036601519b0a5af9125721fe2f1c19c4fe55 156,refs/remotes/origin/pull/419,6535bd1add08898ebe26bc9440e47be238cf8241,90bb6ff516d02ff4770a66fad9eb615e3f45518d,29a156154c75ad7bf5a3af6e2e5db3eaeb1af76a,,True,True,Tests_passed,7f8efc01a7d6c14f2c9bdcdc3d6fc4e8829b19179127ed660da680e46f78dfa1,True,14,50,214,2,True,Tests_passed,82bf027066a9bf71dd35564e10ca05eeed8a2ac1558dc926bd69196ec845cf95,True,14,True,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,4378d4f9eb9267caa63e2273432b0276179de1f04e450a64b14ba240a9599f8a,Merge_failed,8e9f59ba095064b01e1c65e3cee4ef1ca639bcde8918d227cd138984d38e3435,Merge_failed,ad8687387b5bb22e9ffe17c3b98067a4b138d51243a555764a7beb8ecbf24a1e,Merge_failed,ad8687387b5bb22e9ffe17c3b98067a4b138d51243a555764a7beb8ecbf24a1e,Merge_failed,8e9f59ba095064b01e1c65e3cee4ef1ca639bcde8918d227cd138984d38e3435,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,a7e2d4533a00f3bd19ac57d49005d79aed3c65914af12018fa7a76befd140319,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,2ddca67c87512f97309e403c51b930ddecae7791acb33e7a4e84e9c2e8b36749,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828,Merge_failed,fd4e533972b7824a372107478d50dc0fa34d6220b0ebd665235666c6fb1df828 diff --git a/results/reaper/merges_tested/fasseg/exp4j.csv b/results/reaper/merges_tested/fasseg/exp4j.csv index 72b2a349ab..3ed2ace67b 100644 --- a/results/reaper/merges_tested/fasseg/exp4j.csv +++ b/results/reaper/merges_tested/fasseg/exp4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,499418fcd998f1155c9242ebc2b1baa514f54ec1,e977f199cc1222cd5232582a03a3742324710b9a,6ca71ae2c1f99466f126ab3424ae22ed3dc8f198,,True,True,True,17,117,1048,4,True,17,Tests_passed,0bdb4b325ffaff0988f885c69fb4c6719882026b73862ff035d5d7cf9dd9e8d8,True,Tests_passed,095effd58983b8c6ff6c19c666c26d82524aa122a5748640a1d9d9e581340836,True,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,b01a1d65c6c5ae6a7addf828e85896251cbddf8540d04abe0e6ab02cb3e60f06,Tests_failed,eb9be2c846d7194cfa743ae71ae3758004cc2e030ebdd42f3003615f05c980b5,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,b01a1d65c6c5ae6a7addf828e85896251cbddf8540d04abe0e6ab02cb3e60f06,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,9076912f8f97a71cda6492ebcbbfd855c68ba4f9960635bcd1218ecd23d236bc,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198,Tests_passed,bbdd8ee9531453dcb809d40c43af28bb8ce6268b02413395d3e361c1a99ad198 7,refs/heads/master,15b49d5d40377b24b54bee4a471f08c883e766d2,fbb3fbee150c17f024f199f5d9e2af4fa20703d4,3bada4e6c2bf4d0ebff48bfadd83af396b08696e,,True,True,True,5,5,211,2,True,5,Tests_passed,f590985f298f0dd963d16428e619bd365719c4c4cd11f5334a4b6be0614a206c,True,Tests_passed,f523669315bc819e4dc25fe4c1d51d9ada4748303b60a3ab186be5500748adb0,True,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_failed,6bf5f44a2d424d6ef00961200ea1c12b9dfed6d54aa2cbc5c0bccd6049c38cc6,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,4cfb6383fe6bc3ff4a6e142a1129c10c916b18dec0a47c64d3cfe255ed69d6d7,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c,Tests_passed,963b984e347bf5dc3b639cc7f6fce0f5b6b9bef9a6d342a6eca7f52fde87401c 11,refs/heads/master,cd6db04298f44c4d63cf91a1838ef3258a485243,e75c1e6e4397135bb5ac97e893a736bd3fb069a3,dae7f1f99afef0fea313b0ce1e43f0c3c3766e33,,True,True,True,4,6,293,2,True,4,Tests_passed,8c67d71414eabf69f4b7a86d69ce9db3b4b4469b1848b2f643b4ed0afb775097,True,Tests_passed,ddbca3163464bd9e5f132ea9444498ddd5ba8ea63574e050d7630a662383337f,True,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,e24e7ae75c130fda38fee80c87df81a463939301d09713ba6e69e5ab2806db7b,Tests_passed,90ae3f006ac8efb50f6d79e3eabba135ea6496239f0af09d55003b0084b10a98,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,e24e7ae75c130fda38fee80c87df81a463939301d09713ba6e69e5ab2806db7b,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb,Tests_passed,51ae3d4ba0e33df5ca5f2cc70a7f1ac42dfe1452e84dc2ba6a9199c8403b0fdb diff --git a/results/reaper/merges_tested/fasterxml/aalto-xml.csv b/results/reaper/merges_tested/fasterxml/aalto-xml.csv index f0d0d9f1e2..03c472fef2 100644 --- a/results/reaper/merges_tested/fasterxml/aalto-xml.csv +++ b/results/reaper/merges_tested/fasterxml/aalto-xml.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f70a6b8de7f5bbe434fa3bd241c9604158c53697,e4030f9ee15b2e31c519b15bd9edd686b10d50a7,82a326c36d6a1bf4786ea022b52430ade8eed5d9,,True,True,Tests_passed,2603c7889b7b6e3e51f0c13518ba764d41d640891ef2f65db65f36f258ac8b04,True,1438,1573,531315,2,True,Tests_passed,a6126ab6a880662be87d0115e3dc9c2edff7165314ce51a666aed16a3d362382,True,1438,True,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,87f954a3d7c35d54c79244519c332bcb501b09090129f6c32f471148f6aa7240,Tests_failed,adfe7a91e73a14ffa3971a1f2abf160dcd2b77526014ad3e61601fdc5f916c3b,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,87f954a3d7c35d54c79244519c332bcb501b09090129f6c32f471148f6aa7240,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0,Tests_passed,6ff06149ab50dd12f17e794bce372d7a0adc0d9a273b3c67c61f032ac909a0b0 10,refs/heads/master,54a12f2108b75732fa22fa0cfaa5853a3ee2e014,31da778078ca3624abe46673529e50b4d41c327c,f93f3ccfa0cfc2e96c41a451acbcf17f16d28ec9,,True,True,Tests_passed,7cc2fe66c6b2aca9da8f23877d414c4bea43bfdab3b32338988fc0cda4cf2e40,True,58,697,15326,3,True,Tests_passed,bbc497b7aaaccb351a2bdced2042511ab13ed08e55de4a299c157df7300d5436,True,58,True,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_failed,5059c1ebe34124da36ed059290398228c9f4121027adda25c8bff0c219ebbb0f,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,ea38bd1c54f8c74b1f723a555cb6f00541981982c12687b0fe8739d55203b97a,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874,Tests_passed,d51ce03cf27ed6f4a934b76f5fbd8db47f7562a744088c295a12a8d373d40874 diff --git a/results/reaper/merges_tested/fasterxml/jackson-annotations.csv b/results/reaper/merges_tested/fasterxml/jackson-annotations.csv index 4f72fee681..1f3ae4dd3d 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-annotations.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-annotations.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 58,refs/heads/2.17,12d6f59721b3449119b2d904732a7272183279c3,e54d0bddebc289d3338d5b0ab2896365ff17c724,00ec002b7c61c7ff0377cf9a2e9a213d35f17653,,True,True,True,6,21,194,3,True,6,Tests_passed,bc48bb5fb6091b6e60850ebad38d78a159fadee443c7718e97216f141b371240,True,Tests_passed,3e45c22dda87c4997db4b641fed0daefe96e5b57ed741e2f288d2ff882fd8418,True,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Merge_timedout,,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,3355000569b3fb8ce49620823fb7180213a1cf74d89c9807acfbd7bf343c331a,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04,Tests_passed,6d515428cd57350d559c7278c7f936f529e6e970c2be76281742793996a16d04 83,refs/remotes/origin/master,ea746ea4efb59e14f6af514696b63ffc2ddface2,2c63ffe80138755675acc5cb0b94a3aa2347c660,b1245811a100097c0db00af73df45dbac387991a,,True,True,True,39,218,874,3,True,39,Tests_passed,6716d8d98ce62783e39c068d948d58871a2efacb15f953e63282acdb88bbaceb,True,Tests_passed,bcb5a2a4fb808ec240fbff8596c061f8a722648ab0b22eac567e46248198682a,True,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,31aae69e3962d074268b0c1e09dc57ea2d762f0399108ef297cc8537871491ca,Merge_failed,8215ff101ff15a7552df991e62067654938fcd018425e3f362f5cdaefc962bf9,Merge_failed,e5628cf531079d321dc1a1f3d714b953a050c63b6c70a0cad4d6b496e874ab04,Merge_failed,e5628cf531079d321dc1a1f3d714b953a050c63b6c70a0cad4d6b496e874ab04,Merge_failed,8215ff101ff15a7552df991e62067654938fcd018425e3f362f5cdaefc962bf9,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,1b93d5dd8962383d4cd1d0675a5c241591efb4fe06b28e93ee84ce21d52d8501,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e,Merge_failed,5f0aa6d47e2f5e7b8e918d9a53474e435c1f6f3cfe02958b00235d1fed9bdc8e 89,refs/remotes/origin/master,79b31c49abd82ad6802f9b3075d700de2af26ab2,c58f2dfabf288b7861740595bbfffd76fe95c7ad,b7ed5e83ebd286dc955f054933af406ac6a07ef4,,True,True,True,40,220,885,3,True,40,Tests_passed,41796e02e31a7675e086aa000b34f3346782615d4f5444384c168874e3c2eb6b,True,Tests_passed,d15055024ec6aec818f5d248a202a119e925e208c0d89dcca6f5b69f9290875d,True,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Merge_timedout,,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b,Tests_passed,1d163b2f79f6ec59c0d5316b53828907341446b3725950d8c7c1a94eadd8042b diff --git a/results/reaper/merges_tested/fasterxml/jackson-core.csv b/results/reaper/merges_tested/fasterxml/jackson-core.csv index 55d1581c78..d7e10d0f3a 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-core.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/2.17,a7dbd72e79d67d93fb8b6bffb4b1cef145d9e949,ff4952da71389247f5bf0beb6ae7b8a8e2163ac3,8989acff37761790c44a6a7e99e79e7ba68a4ba6,,True,True,Tests_passed,784630bf86f432d2aa6bd1852d3f3425f7433acd780e2f3f0deb0ddd2e597d6e,True,15,45,258,3,True,Tests_passed,7e87afa02ce4300494ac55c579e8290b08ad7ddf5be345a792ce583f0d8f0e16,True,15,True,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_failed,9e91c39acb28f01c3c65cfd585343de965c520d4d89d682f92ebb2d6937f0d93,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712,Tests_passed,38b95c158e8d836d22a9723a39446d7513e31c31ec86d10308349c36f7451712 45,refs/heads/2.17,6eddff3df4dd75bc1a84dd96561bc3f4011d1fc9,91186369d50c7502a4688077f717d385319fc380,9aee3c40c0906bd5b0fc56b794497e00cbb2a4bb,,True,True,Tests_passed,4fd93858b19f2fe046a820ef7128faf569ba511ac950d0fda86ecaa0aebf2b72,True,280,1499,11714,6,True,Tests_passed,324dd383f6ac3e7091bdcf7a6d74dd9abe0e0b66795525d8dd0edece67520868,True,281,True,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Merge_timedout,,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69,Tests_passed,8d421053e2043e0b6ff575dd0f1584999437175cf453edee9ded8f879b9adf69 53,refs/heads/2.17,452a4e303117793f2c28cef137a9d0fe38a772d3,926876f0eccd80ccebc73392ed87a70848e21f3e,35df70f03042615f56a3c49e9eee4d1e0ee8a19e,,True,False,Tests_passed,9673714a202664f6c079d3da1f25191e5d8da3db17e07593904277307f4eb519,True,3,4,14,2,True,Tests_passed,9c863a84f7d9074e628a6665197a9d5dc552700d00bdbf8a4900cebcd359a5b1,True,3,True,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_failed,9b3df85a7114585c0e081fdf0a224a75e4d7168c502a8d91d4b1d26ca4a1f963,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4,Tests_passed,ee01a61851c533942c7244dd8afa60d908b4fb694f30b1b03a4232bcc9d8f1d4 diff --git a/results/reaper/merges_tested/fasterxml/jackson-dataformat-avro.csv b/results/reaper/merges_tested/fasterxml/jackson-dataformat-avro.csv index cc643ca114..1d78771663 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-dataformat-avro.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-dataformat-avro.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,8a73a14551e402c3993e2ecd2c690bf54c5e2134,a893c4c717b1e36e2d29ea61c96d8e7a159298bc,5ec8c0022a993aeaa66f992d59f7578225111410,,True,True,True,9,48,251,5,True,10,Tests_passed,9162c70845c55c9e4a78b2f48740e15cda68591c4ba2858dae89b731c87e16f1,True,Tests_passed,a94f18403d255016df80f52abb023e38b18deb3f07fcdee3a3608bc51353ffdb,True,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,f9d6021a68f179b99ab2ba6964576393b7350df48818911d477af5744e3f21d3,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,d44c7fc8b3cd2a645685592547c781a5f6cfa8954134e03b51ac5dd56bbad609,Merge_failed,33ee68a1168f928c7c5ed4cda524cd4a18ee1be7b640b27781c84a1ef5f5ce34,Merge_failed,1ace3b22060cd73929a5a7bd21327d17c900b744f5f3b1e4a086a3cfd51ac923,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,31405568cf0fa0931430f9c29fd495fceead39d0d3c1d68ddce8c7f614164f77,Merge_failed,d42eb8dc99b04544c26b423b00a7dabd49d62e0ade9d03570f06510902eaf63a,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4,Merge_failed,ddec62da255bea0ce388aa215fc42d44fa3d3a379196b85073f12472fea388e4 diff --git a/results/reaper/merges_tested/fasterxml/jackson-dataformat-cbor.csv b/results/reaper/merges_tested/fasterxml/jackson-dataformat-cbor.csv index c84518c1af..203f1e0a2a 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-dataformat-cbor.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-dataformat-cbor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,322be047e0f277689edc5b67a1bac8f95cb872da,814deeab98870e3693b2b6ee6367726c7d597f67,23f798831374aac0e6d88681392012dd27853d4a,,True,True,True,10,32,272,4,True,10,Tests_passed,6dcd7fa89d907f32c2b3ef0e654c1d2b223d39df35912298310a9566e713c553,True,Tests_passed,fb11f5108fc8dd6d040be110f58983ed3cfa398cc08a50917d98a08d36ee5af0,True,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,cfc6b37dd2c0497592e42981831535d3c093150edf824a122d0ef743bf634534,Merge_failed,9fc8991b7b7699e673eddfb5e3c7f7c1cea2989bb9af7a82da827d3752ba674b,Merge_failed,b3be6a879b5d2b969616a3cf4d6da1c454b5e2b292f776279393692a8b5434d7,Merge_failed,182aa1b28e83ab41f1008185d478bb466372570b023ab10826cb6a44af8b9979,Merge_failed,9fc8991b7b7699e673eddfb5e3c7f7c1cea2989bb9af7a82da827d3752ba674b,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,1c876c32696311abd2245a40d3f482368a9925170c9627bc4537c171bd9f3238,Merge_failed,0acb166ddda1ce9dce127efbfbee63e641d8b5a1dc2b4ae4c96e76bed7434da8,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897,Merge_failed,e4d0f7db22dc65d062657bd7e7dff5c659884558bf3e74850b839bd6d5781897 6,refs/heads/master,a671acb0bbd66df72cb8acd9885801b47063dd75,c3979dd1f7ac324d66110da1447e9b27bc8b6ad6,0caaef68fc59d26cd32a6f4a2395f54f63630485,,True,True,True,3,5,92,2,True,3,Tests_passed,870c680dfaa9fdf6988d23aaf3ad22c63aab7cedefc74e2ae081a11c7b3b2519,True,Tests_passed,3f48bed992736c6a5c121660c706e069a230dcfa7def2eefa1f716b3af13aaab,True,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_failed,925e9998e376d8d51638c279317d7402f0a228dc3c8cd214729ea0376df950bb,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,cd702b2706efc5ee3d537e6469eb864b474eb6e3659ea8b9ce48daf9a5a38c74,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,20fc061b73a8538198b6a9f498e030db9b642dc4353d34f5385a92eda0839aac,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31,Tests_passed,a899dfcc77ea8339cd2c724a823437e2c1e34030fdd37f1df786fcffedbb3c31 10,refs/heads/master,17a63ada108ac3c16efd1b17885423cda74a60d5,8766a3edb89a284b8dffb0d69f91e5cb4c2bc35c,ee746dc9c799ac051cbb933e439ccbf7c35b719c,,True,True,True,14,125,818,4,True,14,Tests_passed,e5af86805b625650a06ea94ccd32710734de6b9516b4c00d99a0b1be4c885cc3,True,Tests_passed,60a0b9b8d71081097fc16cd0977fc132f701e87d09f179580dfac7ab870ce981,True,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,aba76af40fb476fb70e6adb1d3797409113a8d0d6a7ef9c14750501564df7560,Merge_failed,a0c377f58eb9cfe1faf64750c3d98d860186c8d1af8f1e27511502507aae323f,Merge_failed,8b66b8f437cb7acf4efa5ea1138590d2fdf95635f904ee677907dc335a37dc4f,Merge_failed,0d8ad1fddada84514b2bb0c21d5c3b5b2780bb04b6f094bfbad9946375d6ea61,Merge_failed,a0c377f58eb9cfe1faf64750c3d98d860186c8d1af8f1e27511502507aae323f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,5713ee1b7c8d87fc8b942e54624e56ba14287bba013589083d02ace03a9145b5,Merge_failed,e5da7770ef62dcee05684d7b5cc4c909249d223e9ec1f2d05b3d769d7ab39a77,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f,Merge_failed,de91d8197fdf7698f230f04039b240c29776a4f148cde383a75f53051314603f diff --git a/results/reaper/merges_tested/fasterxml/jackson-dataformat-xml.csv b/results/reaper/merges_tested/fasterxml/jackson-dataformat-xml.csv index 3c8c2b1204..7a89637c44 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-dataformat-xml.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-dataformat-xml.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 140,refs/heads/2.17,fc385bcdf62f4f3d6cd64470fad796be36bcd449,0d30430d78918a3e01bec62a5192a584cc56ce88,09db8e1ce1d2ecf0ad4ad4b0d8335999f42577be,,True,True,True,17.0,72,409.0,4,True,17,Tests_passed,3119c49e4ec878189770b999aa0bf5f6f53ba26b2dfcb0bce391d3538e69bf40,True,Tests_passed,9588420cd4abc570bec4f2c72bf54597076d6efa6c9c796e25f877ae5fec74ad,True,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4747bc5022457ea9769707ed4704badf2abae9f170fe5f1e1e12aff581a47bbf,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,dbc7c3c19dde7096e77999e7aa78d995d88eb483a6d0c30dfe1cf3168e0b9dda,Merge_failed,9063d305f11772650546cbc13eb614ad77e8ce3bf2b264751e0b403e4d20a921,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,cbfe6c457830cde5aeedf5e3febb39e789edaf8dbae26f906b9728b3adbec254,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487,Merge_failed,4debdda834bc996cf8365287c8964bd31f538de8de971c50ca3df3022ffa5487 141,refs/heads/2.17,e2c043d220496a5f8744b7d0d08fee2c0b740e30,a78aec20fa08d6e79d0b3b651ec50ec1595967ed,79a4b57f2bbe08ce46e6dabb0a8b76f4a787141c,,True,True,True,18.0,73,460.0,3,True,18,Tests_passed,b2159ef4d68e61acc270d912f270934cd1540d433efafa8dd096a72905626ad7,True,Tests_passed,7a4f479e40fafe26dc0a15d6f490fc17e7b456f85c31d0b644bf83fef242e3ed,True,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70,Tests_passed,2fbbc253f1ebe48c2579a23f4acaa753d136db4d3b11cb5a6af256d5c92f3f70 142,refs/heads/2.17,a78aec20fa08d6e79d0b3b651ec50ec1595967ed,98a9ff25a121e0129ac8b068b7b8ac97b8b35495,23ab583c46a6a20b0c1232ebb91b16d4058c7502,,True,True,True,17.0,73,422.0,4,True,17,Tests_passed,3f8552f9184cec21e3e968d0b2fd1706e553baf18220f52f82139c9791e849f1,True,Tests_passed,85f8000b10fcaf46799cb5b0a287c984ee5f20785e6fce74fa985745e6d45ed5,True,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,e5a41042ee40627af98e57178619fea97073588271419cf39849b0f2f27eeec5,Merge_failed,a6d1e9e5463c60d724239d7ca9873e5901cc34595ad4825d7d0e8ad33a0c3f60,Merge_failed,634079426b8726fb7b2f648a44a887c4b643a21fc1cf35377aa94a5fbfbda09d,Merge_failed,634079426b8726fb7b2f648a44a887c4b643a21fc1cf35377aa94a5fbfbda09d,Merge_failed,a6d1e9e5463c60d724239d7ca9873e5901cc34595ad4825d7d0e8ad33a0c3f60,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,e7960e12ce6970f5f9db79552b9a851a3fbdb066457f54302e4603fc741196fe,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796,Merge_failed,d0292928d6be3ec2fb8d1d072bc7a09d2ded1175e07e9464b7de98c27fe34796 diff --git a/results/reaper/merges_tested/fasterxml/jackson-datatype-guava.csv b/results/reaper/merges_tested/fasterxml/jackson-datatype-guava.csv index 28a9b010fe..e36d2c2708 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-datatype-guava.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-datatype-guava.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,d99575655de8749879e2a231027eca2f15996bf4,3eb649f103eaa43cbb0428acb7bbf275f1207133,4399c5d04f3e301c1a48ddbd8ac54539b322ecf9,,True,True,True,21,108,643,4,True,21,Tests_passed,59893b28cfe4df29206b4679624a3fbfc8b0ddcdbf1c419be09eb1b78753de7d,True,Tests_passed,37f0be32b4edfd3256b3b82b6ee7d07ea1dcdd5056a62c6d9fef948b20e2bb74,True,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,ccc4c71e749ba0129762b534fbf79f0261569de63df8cb04b0d52ba045c19ea9,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,18c002ffca48c98d13402c43414730ef5509c3fc097bae1ca6fc2505d5a63f1b,Merge_failed,66d37469133934af734cb3a85f41f3a0febbc8a8a1d66c8c2602d8943ea65956,Merge_failed,7429b02199db460b5e4dd1bd2f9d936e7bbf873c0775f4f60a5c903d6a8ec445,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,f371597b2d347c8d75d297f19720fc307866dd07a1bd1fc74e0f1b067556b5ce,Merge_failed,ff7695218b12a224217ab788b7fb0f2263da723390d742647324f9d28c5071e8,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a,Merge_failed,17c293b0cdecf2dd589877a085315747ca77cb8fd438d75af6b030db5bbcf16a 30,refs/heads/master,3ee74a3b1dfa156c398cf910fda03bd37cc40b59,73816433ae4fd6a78782ee96ff370a5c98ad4d95,db9d8217cf96b503afe6a768c365cfb3fda0cfad,,True,True,True,15,91,510,5,True,15,Tests_passed,b28086949a90489954a9658a6fccad6998c843913e80aa006c4d28727ab93439,True,Tests_passed,fec56d30cf92e07f54e2ba8619f01ff1ed8d22738ff170ded7e4d503f17e0678,True,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,6cb06f4432a842d43a8a8ae0b8cc3fdf60600e4af9078d18476c4a278dd07087,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8705263facb3b93ebfc73f80613b4ed1d50871cc9f0f6cb6b3def67e58080f0f,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,41fcda8011e2a7c982f5efbe2f210df93961dd49047d8be532da3bb83c1514cc,Merge_failed,0bc8c1c6a98071d626972b77f287c1bc5015561b17851d73ee39c78c1350dc4a,Merge_failed,a07c9337d62db190109ce7150082a5d488591e5d96d1e4c433e00413af90f5b5,Merge_failed,8c2d3095e1ed99095059b3398baef3d61b3f3c00af9ff212ba1be41d4459302d,Merge_failed,b495e7d871e6addb35a3cc2faf7f51dd5e9d61e9f19de53ccbd1d8f761be1bfe,Merge_failed,a07c9337d62db190109ce7150082a5d488591e5d96d1e4c433e00413af90f5b5,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8705263facb3b93ebfc73f80613b4ed1d50871cc9f0f6cb6b3def67e58080f0f,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,cece9bf3ae931a6d9950b00e644b9d3da46dd97d334165eaf0b6c8ca92dbd285,Merge_failed,41fcda8011e2a7c982f5efbe2f210df93961dd49047d8be532da3bb83c1514cc,Merge_failed,b388df0124d1148c1b856c1149c0303bb07601d15e41d950412a6750cd9ddd74,Merge_failed,66d51e3c986e2ee4c861202a8d64bb48711b3d8ee385bf9fb73e59ff2134f205,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,6cb06f4432a842d43a8a8ae0b8cc3fdf60600e4af9078d18476c4a278dd07087,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264,Merge_failed,8be1e7db5507ff2c77cad75a91d27ffff2af117a8a1c9b5ea1bed16327993264 32,refs/heads/master,b08f5a2dad867c4665d7e5d56926d52545ee32ae,c41fb771807eada9b6418cd2e56832e80062c6b8,d48a4b867d15c4467e81b5d3515be729a502c9e5,,True,True,True,12,69,467,4,True,14,Tests_passed,b0025829a3127e7979b829b73dae64a5eb52d9bbfe7421de6653b0d2d5a8cc57,True,Tests_passed,336df0717e946924212d13b8c6df7c14efddca55d0064077ee66283ddafa43c8,True,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,08471b507f240268f1fad34e141a7bfc9372af37f30c90df748b6c98538d0f44,Merge_failed,4f3bdd1300fba8513639ca48d23ae8d00676f18021610704b04f19dd03329791,Tests_passed,0e39acd8df8b8a77b86b6e613d5783803f49105b5d2e0b8828ba00d5d67eb822,Merge_failed,0caa6e632b938fee45e95895b9dc5145030b19c170ae9f7c6ee9e8f0bc61563a,Merge_failed,4f3bdd1300fba8513639ca48d23ae8d00676f18021610704b04f19dd03329791,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,19ae223a39e3c1fc0ddc671df83480e40f729fb69f4190091860372b5efa0383,Tests_passed,0e39acd8df8b8a77b86b6e613d5783803f49105b5d2e0b8828ba00d5d67eb822,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284,Merge_failed,6262b21a5343f51a0dab16a6edfa9956edb2305517d8b7ce1d23b7856eff2284 diff --git a/results/reaper/merges_tested/fasterxml/jackson-datatype-hibernate.csv b/results/reaper/merges_tested/fasterxml/jackson-datatype-hibernate.csv index 70b6b3aaa1..f8ab4f206d 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-datatype-hibernate.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-datatype-hibernate.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 46,refs/heads/master,c6625bac0b3ce44c9bbbd46015ce6ced07bcce04,256eba41b901a903c11f13f2d880e729ab49ed30,a33127007537099bfcc869a056ad9de500753406,,True,True,True,16,54,741,3,True,16,Tests_passed,78f49b71e3fc770648e2fb701ee021859cd9412b50f40b6c3b76aab41485d0f5,True,Tests_passed,9862e0e45b13e07eb22c0f3eefe23f46c425dd234f98577465b8d90f2e5b4156,True,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_failed,086ddb81a6178d11c338d1d9be78b96f6fbf67c6435668d78300b6d71c1ba2f8,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,52c7f5cabb00b10c3319337af3563c83e6ce7c5f217d51743758471b464c5848,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07,Tests_passed,af7dc3e31135b090b106c9050c36e0a4e8716a0953618db824a03efd49e67d07 52,refs/heads/master,ec355d58fef047aba272302f7b8ed876a648c8d2,d2652d9386e6e9caddc4dda60c8334ebc17b8473,fc4ab3f3618c09dab8bd008eb50d867ebf565c64,,True,True,True,32,169,1289,9,True,32,Tests_passed,ef21352311ddeda5a68c679e599ee6558780a893cde3d21f70ee157f96323f2b,True,Tests_passed,8f3435e16361464351727dbfb96852c0f304aff3c363d5374463cd43a9a5b776,True,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,9d3ad5531196a295c127a27050e1e7f8d0dc714954d79f233f34a68ec133748e,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,79eb2a3f427305e7cd17f9f7ed5a9d4279e7f7a4c429e7e90caee1d9e628c3fc,Merge_failed,952bff311429b8e31991a9887a4d7d3009af781e4e79d6692a99b8eacf9f7022,Merge_failed,3f9d07e67757ea360618dada522f74dcca4d3085f1ff3bdc489c33add12460ae,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,19c2eaf92802bb3c65f37ef9177468e8490d28928a39c9a5898f845de32a0ce8,Merge_failed,7f1a99949247fb66ff50b71835ba7515a48f7d1802421f1afe5b7939c2c30ba1,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,23d3a3517dc6102520dd33e1a9a3d92bcb5291950cde812a81c1debd87700028,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731,Merge_failed,1d49eb40ea245846e40ca997bb23c828199967d32ec718cc24ccd13942147731 55,refs/heads/master,19bf759f45db96683b7e07c370723518318b9a12,139ec0c2747ce3471734cf1d39d808d8095076ff,f4f71542669f8ebc129ee190e860e08d31b07c22,,True,True,True,29,104,668,7,True,29,Tests_passed,072ed923e047d64f99bb6ed5b30c427ea353c896757e92cbdd2f4cbbdd2b56b6,True,Tests_passed,06339768615a31ae57656a750b277d00fbfe06ae5af38a310f5d50c88b4fb9f7,True,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,436cb919753b13fc09e653fd7421b148a76806247a2d6201432d8683d50c1dc2,Merge_failed,501b845d9cb4ffabd5df9615027aaeedcff6c0dc6252f039ae50dd3a35826b5f,Merge_failed,f4066ef6b46716cc8a5fb68c1dc693896a71df65803710e91eab4d5654b0f30d,Merge_failed,230f7d57878866663dab05e8fcd7c1feda79d1a1fe328ec168028aab459b0b19,Merge_failed,501b845d9cb4ffabd5df9615027aaeedcff6c0dc6252f039ae50dd3a35826b5f,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,e1a6a7df3910e5d3d7e425695d5dc58a85d63f5d7905bd00d8f1519db3e177eb,Merge_failed,ef66d064b8914adfa92c22d94231f90ca791c2c04985b0dcb915d8af1b34b22e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,78d609219529dfc1bcd09b126589ea64218b37422dc5635f275c8da8cd14345b,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e,Merge_failed,d20330e89954849260934bc047f27199e729bf388918dfc4adc365591cd44f8e diff --git a/results/reaper/merges_tested/fasterxml/jackson-datatype-joda.csv b/results/reaper/merges_tested/fasterxml/jackson-datatype-joda.csv index b77ddefd31..8f5aa30b11 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-datatype-joda.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-datatype-joda.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/2.17,1545b5fceda7c70bcdda4cfdbb5200e75b6b93ce,61c7d1f9ca063d644487a3e95007bdecddf27173,96c8a8402b2509bd16813c21d2429de1ea93eb79,,True,True,Tests_passed,e147970ff6c5d7db790988b572741ab5abbd37542f4332260307d7b760ff2f57,True,17,50,269,5,True,Tests_passed,e1a06fa8fe396be17e7cf5df1df01a857901797b2e16c8cbffb77896230c2b45,True,17,True,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,bcf0fcb937881987a33a2b9b20e3966a097b179c3f2518a0d012d54a3fd1b1cb,Merge_failed,d3ccbe764eb6b5a2e946063c5706fa4e336c6ba7b694b43c81442acba091b32b,Merge_failed,6b002af03fe02fc3015e25984d04065fd8293f782490ab4cf6f5bd364b084bdf,Merge_failed,4b90276bc24761c7957b740d3a4ebd0596918d695a566e82e54ac2936f206724,Merge_failed,d3ccbe764eb6b5a2e946063c5706fa4e336c6ba7b694b43c81442acba091b32b,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,59dc054954ad3e0e6524c2df1b6cec98918fa19fbebf346322984e71ec7080f9,Merge_failed,205a77df08adc383b65cdb0f21318b6f2b5feeee5775232bbd94e08338241098,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,4ee84d711d3ed4ee2bd9d2972747a2cd0dd210b4ac9d0b7025fb02ea6271454a,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9,Merge_failed,5665d8778cf2a2e9e414fb2a7cfb5bdd2b7c114be6cd448463ba62419c1adef9 59,refs/heads/2.17,f5cad0fe66ab6090c676f778acb305e8dd6e87ec,db7ba1a4007f49abe9c3675e2ad8c116380cd8af,88439bea90371817c81e9a0f4bb71e14f3366c3d,,True,True,Tests_passed,2b230a38089e5be4d7fe9122730070748e0c68c98ef8bedcc27c5dc41863c448,True,18,20,70,3,True,Tests_passed,1a8fb7623fb2a22ba8eb2e41bca5b5bc0e978d3a57fecedad02e27f108e5166f,True,18,True,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,5d9504509f2e11c35c8e0881e36b97488cf1eeea38948bd188999b9db790b5d6,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,33a66a6a8e65fe95658e32ae85c974e8e5cd7ad939727833470ce436d0f57b23,Merge_failed,dcb082b35304a707abec77a447e5087323e52ac36ed6f9766fae1c804b5bb8b1,Merge_failed,068d09cc6752153acf7d44dd79a97a0df326b68ea724c66497f7e7829a5532fb,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,287af51b82e642ad9dcdfdddec7dc8fdbc40fa4314c4078f167ff68826733c0b,Merge_failed,418bc44f9419536545d1c598924055bd6f537374140f100c0b35e89dc2b3d888,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3,Merge_failed,994a0c462c799f2602c8884a81ce27120926654587ff1e3329d692b761cb9ac3 66,refs/heads/2.17,4e6c26633974375e34bbc9152a952284ce4fead6,393dae28fba2b05122a26058270855d81c32efe6,75e8ef7f139e323a9af80858ab5eeb47a0871149,,True,True,Tests_passed,7f5e87ff97a8a78f056771e576674d262abdcb443a50d0fadd3e8f07500adfa3,True,44,241,1344,2,True,Tests_passed,426d6029fad5d20ec2505145e387b3ccff6aa90cfb0b7081155b238914e89a70,True,44,True,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,b26a214638c8a2a62eac2b346f86535db6728f0ed2174e7cb9c58570007b5f8a,Tests_failed,8fe2c059a56351c7dba77cf625111987b67583de2894bbcfed8167e2b5cd9a4d,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,b26a214638c8a2a62eac2b346f86535db6728f0ed2174e7cb9c58570007b5f8a,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7,Tests_failed,f2fcf197f9a5cee1d30cb39c737365eb111ca88057c6f68ecff9b25b1924fbe7 diff --git a/results/reaper/merges_tested/fasterxml/jackson-datatype-jsr310.csv b/results/reaper/merges_tested/fasterxml/jackson-datatype-jsr310.csv index bab1028a68..947e2b63d2 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-datatype-jsr310.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-datatype-jsr310.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,e9c6de6bfabbc10ed960b8eba3b1804805431f66,3a7976ac9c9a7c5ac0ba508d059e5ebd1933b8ff,79a7250d9bea32183ed2c6c613923c31b7ae0a8d,,True,True,Tests_passed,0befcdd32f4954544456bc64babda797d4acb93daf1ceb7b50245e3168fb92ae,True,75,370,2268,5,True,Tests_passed,231541ba6d07710e22b074a731cdac87dea49b2d47d8e5a0e728aa9320abd712,True,75,True,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,aaddeef16eb52738ff74adf522e4a64a1c8a12012fc54b7702c39ebea044d325,Merge_failed,4dcf9ae8d5733eb26e2623ffafbfca68270c4890422b414e1137c5634571159c,Merge_failed,829a250f973211f6bed8c645856d31c038e6ce87cb6577efc26496111ead5e48,Merge_failed,a53fb9d061f155adde6506f45fccca8314ae93c7cd7cb68ecd12e282252a085c,Merge_failed,4dcf9ae8d5733eb26e2623ffafbfca68270c4890422b414e1137c5634571159c,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,ef4af3007029e38ca9044c3e39965c8f7a35fdbc146c7988f0766afbc53d05ed,Merge_failed,5c1d1c6ecd1ab0c52c550911b591cb2eddc8d7c9f2c2b2d6895d9c74f8d8461c,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,f195d71daec0a62483264e76b82a2904209ed9143d25e46870c4c58fa451bf83,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10,Merge_failed,7dadd59e3583270952e609e06914a09118a8231e9e12246c169b1fcb5f573d10 33,refs/heads/master,dedccf4c3baa8d6d7aed9423504ca1087302483b,af5a5ba93758ff328e2c11f9712f40deff7eb095,bffc44b7f9a039fe2776850e320c8dcfe1ed1fd6,,True,True,Tests_passed,9a1b4bff4524f1a5dccc4aa69745209770e73c621cc13e4196b9a93da7ef5d1a,True,46,92,2216,2,True,Tests_passed,d866e15d67a3c0c158d2feb92399a64c99ce0897847ec56dc12cd641759f74be,True,46,True,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,d93823422600c76dcee87fab803749c20d32e334cd32eba0365000c4ab010c33,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,ad04c66d4229b25a90113729d9a43bf412995de2d0258c47574ac61180e72a5f,Merge_failed,947ac43ea185fcbde95601b5ed0086f2e042d2aa7e753a74bafc098cfccdf234,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,8934e39154ae9b6cbbaec1041df0d42e9d2d2e9b10bcb2520c40183e9ec7f15f,Tests_passed,6d280ad27c80dffeeb17b398c1471e1beb7f2f222425fb88a506e202c07f9667,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a,Merge_failed,bb14afe0cbee191cc6c4267f4aa0d13c55db1eca97681433c8b6cd4d8d26ae0a diff --git a/results/reaper/merges_tested/fasterxml/jackson-module-afterburner.csv b/results/reaper/merges_tested/fasterxml/jackson-module-afterburner.csv index c4f9f988c7..bb9b939d47 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-module-afterburner.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-module-afterburner.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,cf754766cc0776745ea9bb9bd7fd5d18d58f67ce,bda2f9b194e7b5e0d1f001e1aaf951504f96f1c9,3f73cf73874dca6b827382c13078890bd0dd86c7,,True,True,Tests_passed,2550d26473506dbecde5f79aff09f9a9d20b1391b6d9b7694137abca35877ea8,True,46,239,1565,2,True,Tests_passed,cffbc0103e9800c62680ebd96f61171caeda23facbf7f4ad829dd781ad855458,True,46,True,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,3420f656b31fd64b717592082549e80980f5a7f84c490fa44b11e68a12cac512,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28,Tests_passed,be91f6d83f95185f217d5039be3a34a2d6dcb1ef0ad53ca2b31d64ec19c3af28 diff --git a/results/reaper/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv b/results/reaper/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv index 92b664f88e..b8b551900a 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-module-jaxb-annotations.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/2.8,e6d155829ae3829ad4ab08939671bc78aed86db3,cf5a4220e89cde4b4a71f7431dc97a918c205654,be331f8e2a40e0aa5bb058e63a05fdddf4f88232,,True,True,Tests_passed,e5c740aca7bbabab5e43bc941179d316fd53a50764f491823344323d9bf2a58e,True,7,25,187,4,True,Tests_passed,0637219c19337a52f0d08bb3bfd4e0301d3221f981410f2b5840c4821184d610,True,7,True,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,477286331842ef19072a9ec478fc8f3f57263ceb43d3094d1093732d2492b31c,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,b3c053eeef43d2e3adeff6d78a6c6287a1daa9b62999157c00bbfc6c7f1b9e88,Merge_failed,2e94b1522c4a52796ae2f3c36908da42b95c2a8c5b9931a30734af659a459729,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,0f42a9ff32490c5fe6f04f1e18615a34a0a144faf1120666addacc55b293febc,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2,Merge_failed,56001818cc0b6cf2a3273e1460d99277b43ba2e453faee19e1a28e05059c02a2 diff --git a/results/reaper/merges_tested/fasterxml/jackson-module-mrbean.csv b/results/reaper/merges_tested/fasterxml/jackson-module-mrbean.csv index bd034bc326..71b4b629a1 100644 --- a/results/reaper/merges_tested/fasterxml/jackson-module-mrbean.csv +++ b/results/reaper/merges_tested/fasterxml/jackson-module-mrbean.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,98089dd68e02c743964636260303bbe67895c07c,a6928de6aa37cff1c03804063c8c31a45b7d768d,05bc1fa15947a884a43f54dd5f9b6cb975256bce,,True,True,True,13,30,252,4,True,13,Tests_passed,11376e5aa6419e491a2e950cbbbff1db3d23b61abd964ba7fd8eaf253f4e1c3e,True,Tests_passed,d96a6d92de59fd8c055f60c4bbf7f6ad36b072c7f6e2c3d5c1e9ab7a6ab588ad,True,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,0ef0b4af868cc83680705284e68d61f8018b8a05ad8364163d203f5ad89319f9,Merge_failed,aab2e971cb6f5ad8da8e3c687f0e54ad249d6001e757997582239b3a28cfd18e,Merge_failed,e85da5d8198bae04b1d957c42f0e2911eedd6b7eba121094b5ebfe57ac35b884,Merge_failed,853cc692f27c0179162e1382577418b0884fc21b341f795e9aa1127e95cbf7e5,Merge_failed,aab2e971cb6f5ad8da8e3c687f0e54ad249d6001e757997582239b3a28cfd18e,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,3c2258e29d8f1ecd8a1999035de9407c050aeb13c784301eaa572ac2a5d7dca2,Merge_failed,94500c16b05a6e68dda781c2bf03770e779e4172255361e01757bb1ffc2b1fc4,Merge_failed,3cc082575219d482ef2f4df82dba8917ea6d0d0654fe9f9bf0f71bdc53dad385,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032,Merge_failed,86437dbd14e82587f2994dd58d52ffd94af6f3ccf4bd46f7c426ce48e90cc032 6,refs/heads/master,9e3869a0b016bf011f31ea195e628ae7e1223a1e,6479b6edc0b5a9633b4b811a4e44a9bb6dc6190d,8bb0db5f44968c24a61fbf7e2306daf15c2a990d,,True,True,True,5,10,97,2,True,5,Tests_passed,f2c40be298c72a6ed9ddc06f0497517212f20caf48b62e233318afac29106c07,True,Tests_passed,05e7a888ae08f5534a401210cd64c10e5776de1dabf7519b74d4f4e8a4b7cc4b,True,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_failed,ac31eb4d908ff4b5bbd1761719d9cf9233f416136a684e34da450ee6aff66be9,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,929fb159408b693ce9a05deeabe8d75ea35d44d32c39498d029cfed4bb8b1dc7,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,f052b7d9d57d7c41c680fd5a462ec660423423e922fcefa1e0d5756199f3c642,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed,Tests_passed,e8be5fa4fb71ee6841c89e04f15d5d9e58fe786b4684e72ae9f2faea44b40aed diff --git a/results/reaper/merges_tested/feedzai/pdb.csv b/results/reaper/merges_tested/feedzai/pdb.csv index b046321879..5438f5fd44 100644 --- a/results/reaper/merges_tested/feedzai/pdb.csv +++ b/results/reaper/merges_tested/feedzai/pdb.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,011ba2e9425f5451db1da70cccfba32722de0eac,d626297e911d4770e18d5cd19c8260edbe70d8a5,1f1c20edee25d2785f036d51720a028e3ec3b565,,True,True,True,15,43,360,2,True,15,Tests_passed,86cd9e7ac57139b7ba419f4718d7af7c7246cf17aa51dbf884b11043e7cc7c7c,True,Tests_passed,a34ef601f7600e32a81c7131b2d414fe0cb90b88c0301195d54a6b6478034227,True,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,64a89aae3b43cb1689b4ef0e3d9f4cb534c6e9351c74a09328413f8416f71a7d,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf,Tests_passed,c7f168ded946bf8ea9a1fcfdf6167294935143b946e2bdd896577458d82cadcf diff --git a/results/reaper/merges_tested/fenixedu/fenixedu-academic.csv b/results/reaper/merges_tested/fenixedu/fenixedu-academic.csv index 496ed37a65..90f720ff5e 100644 --- a/results/reaper/merges_tested/fenixedu/fenixedu-academic.csv +++ b/results/reaper/merges_tested/fenixedu/fenixedu-academic.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,0ebb833b3f09a28a19b06f2f137a2cbbd6080b78,8e69c9359a86a8b672dc97e17b053c94468c2736,ba82fa2ef5b9423d11833443e683b92f581c5438,,True,True,True,5,20,97.0,2,True,5,Tests_passed,6327a726a6c9736e5e15c6f241b94b4f31a6e6f69a85463970ab45980c53f733,True,Tests_passed,afd04356df09ebd82258a1709999e03578a6288e09641bcb92a00f301d6dcb6a,True,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,8ac3798ecede997434565324d5072d90aad3bd0f090502ac3af58bda2bdc00a7,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,3152efe730c48340a952e6447cb4a9be3b0f35c8077c15ccfcc9be24fe576443,Tests_failed,977b2850c1d7b199c558eedee3557318001fdf55e71e1ff1cc5dfe1d36900127,Merge_failed,a53b43f886689bdd15fc4ac7501da66d57efb21ee162873229c732bcf2c6a5ba,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,2e3009a7c7553804e2f8a50bfa7b0db76e3279fdd4f8d2f005a0aaf82674c89f,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,29855b528f85b351feec9fb2bc79c9d612c8bb2ee1c664203e4192d4018164cb,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825,Merge_failed,d9a65900a3761db9879a067e41075244a4bedc8328c6e2be1ec0258745b04825 52,refs/heads/master,176ccf0de6bc088492471d379bdc8d6c1c558262,2d87cf466828cbdd13d92d330fb5f05bf6456af9,db39d6a21db511d9bd2615232f62e27dde268f29,,True,False,True,4,6,29.0,2,True,4,Tests_passed,81af69d53e2686a8b6b38ffdd271b29330b80b5933955523a5a3386353aa982e,True,Tests_passed,4a1955ad3582af2f6c6ef32946694d67ff2184a2aa2f9c48cb23dcaaf93a427a,True,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Merge_timedout,,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53,Tests_passed,8eb2538a5b89392fb4158cd453cc80c1deeaf7540880bf21438ee35212a1de53 130,refs/heads/master,14cc234c622171cb5e799b67f7a2a5754153af6a,e99b5466f2221a2586f6e8de6abe3fb789e57477,78a7750f480fc9d4b3747014d7a1a7f335fd5f06,,True,,True,46,98,,2,True,46,Tests_passed,161211d4df3aa3ab4aad325fc0e6728b787f8a7a5f4ad2fe96d5b850ba521d81,True,Tests_passed,f1e4b3a0aa53cb69dd2f746d27b643587ddce3ff752461ba997581aa638c3652,True,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d,Tests_passed,e12ebe3ee2faac96279af3b1a8d74051212e30702b0185ca4eaeb72234447e8d diff --git a/results/reaper/merges_tested/fernandezpablo85/scribe-java.csv b/results/reaper/merges_tested/fernandezpablo85/scribe-java.csv index 5bcdfb0aab..42685f8259 100644 --- a/results/reaper/merges_tested/fernandezpablo85/scribe-java.csv +++ b/results/reaper/merges_tested/fernandezpablo85/scribe-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,50e7c96ccb48ff2a1cc4838d3e673b867072cf84,acb09724868ad29da24ab9ce210418c606922428,7bb59c36799a635f526206af010136669f23c33f,,True,True,True,75,201,2737,2,True,75,Tests_passed,2dcd261d6a6b7d73264acd8ac94897675278847032598f4c3ebf6324d39baaea,True,Tests_passed,86f4672580f209ac3633d8ff343fce7cf914e78fe22002482bee3cb1f60f3be8,True,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_failed,0a74cb609b531d95569cf19e6b959feae67eec927a0b5b7082306fb622c3960a,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_failed,86a1b2089db55335e88910309c8bd6b2c3ac7ad1fd09c169d1f60fc053868a74,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e,Tests_passed,cfe21f618daad4810ccef7455f57bbcd73732a65db72cd5badbbb898ee13fa4e 6,refs/heads/master,3b0c0e14ec2b6bf6f7adcac3ecb46c68caa26356,6007a9e712c4b7219d86a4e945835fdcd875943d,3f1cd63ae5c41dacffced9fc0d73446af9f1ca89,,True,True,True,47,123,2150,2,True,47,Tests_passed,5f4672078016a5b34965b94b52b65e71f09f516b32fa5861d65a5cabb5e81947,True,Tests_passed,63c3b896197a3bf80f4d79f734ae11d7fc1970f0427244abc2230b2e547183c5,True,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_failed,817d5b645b8640ec1d6c5ee7105e521e3c6202a2cb27bf5b30d4c5166c02c195,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6,Tests_passed,fa87f4ebd4f94fe97d0f1a51cd86be75c2b14308321dd96f241f0620eb8155b6 21,refs/heads/master,665092d619617b44711bf80f0652c19ce0e32a87,82f38333b9fd53291f32f29638ee473c578f9900,523769736fb350efd9c3db9a3a48cfe1785dd5ce,,True,True,True,26,60,581,2,True,26,Tests_passed,9cc82caedb284f53c5d8621c44c5402136ca9f972e18950daa8f49ca35278ee0,True,Tests_passed,a66507f002b88eaef352a5c641fc08d66b4e8d0c00609d4165efb82a620bab34,True,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,2b5666f9a1de6c2e861fadf450e8421922c413adf4000a8fae8bf0e8f02abf8a,Tests_failed,f803e6ee04a752858655771f5c693ab55d9dd6dd26a5267f7286cdf6f6e947a1,Tests_failed,18b89899ddf07b7167af0bf24e38d783900955affd6348814c3d648c2416bf01,Tests_failed,5a391e1c68eb328a6153f307ff34c2dee03ddc2886d4e1e3ad130550912e41f6,Tests_failed,f803e6ee04a752858655771f5c693ab55d9dd6dd26a5267f7286cdf6f6e947a1,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,3f81c23bc7f5fc0f077f5704089d241181f9881b4fc2db093e350a0082f1485f,Tests_failed,18b89899ddf07b7167af0bf24e38d783900955affd6348814c3d648c2416bf01,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed,Merge_failed,5efb6796990e007d2fb5b797e9f029479ac22f555d597d912d6a9341a5b5efed diff --git a/results/reaper/merges_tested/feroult/yawp.csv b/results/reaper/merges_tested/feroult/yawp.csv index 7edec59f94..523fa247e1 100644 --- a/results/reaper/merges_tested/feroult/yawp.csv +++ b/results/reaper/merges_tested/feroult/yawp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,918dcec5fbd9a540c7c2cb692da4499f2b4944aa,0dc78eb60b4ed1f34da66c301831a15a2c4a5059,26c18a007dc026508e0bd5f45aa4ab35940f3b27,,True,True,True,42,126,655,3,True,42,Tests_passed,b4507cae6c372722ba00b5478eee022eb582a41e66f8f48aa81dd1172054b23a,True,Tests_passed,f073c7b9de70d3e10e893181c9cd38c44ef25dd12a534ab4cb519163d3b0de4a,True,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ed8ee39b5f38a73902442b3f1a007f11928b14602d96fa7596c42b0764ab11a6,Merge_failed,917a180bcdc1ac682fbfdd0cf29d0427ae5bc92699a39c3bd1bd0c3df8d2d861,Merge_failed,6285132ea0e6ee6b8dcb3810af4a271cbad161bc8b15f46d682de76c4f5a9cc2,Merge_failed,f628366e40438740bd4579037f5dc2bf08aab46bc2a5d538dbc8591b9472c339,Merge_failed,917a180bcdc1ac682fbfdd0cf29d0427ae5bc92699a39c3bd1bd0c3df8d2d861,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,e3acb39c96524db7210f91e113db700cc01cfe31d5afb63ffd28c575edd696e7,Merge_failed,6285132ea0e6ee6b8dcb3810af4a271cbad161bc8b15f46d682de76c4f5a9cc2,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c,Merge_failed,ba9925afc12a5a2c8b2237e9fd8065fa527da94228cd9ccc0a0d27493c00963c 70,refs/heads/master,98f9faa81b829792ab6746cb581f07f88f5619a5,7364aedcccb1e7d0fb4bb75ca2487a9396423574,aac6d5321cbc12d7efaba2fa7e2c79e21bbc8991,,True,True,True,85,294,4011,3,True,85,Tests_passed,40cbb88e57ec5f59c25db37dc6ead22533dcd2497d256eeb180e40c53f6a0f20,True,Tests_passed,93fddb0ac5f7aba49c0ec4326118afdf1bc689a1c35a60dec28fd61c62bcaa10,True,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,dc9585880402ab115e4b27bb70bbd157cf21e60f5c8a5d466ae6a9edf5630c0a,Tests_failed,7b6ef53ca88e52124492174a9f506f79deb8e9a337b3480ef183447881acd163,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,dc9585880402ab115e4b27bb70bbd157cf21e60f5c8a5d466ae6a9edf5630c0a,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866,Tests_passed,a0ac514d15fe74f704a7745197103dd0ef13a4188693b49599efd253d8d2a866 71,refs/heads/master,853c2071a2c006ca115b1d5f6c9b5d6d3b042aa5,71726b765557751e8ed35b5a34ee50e1ea6f827f,60a46c4d8cb70b1ea8e5fb7ccd63c969db701fac,,True,True,True,7,16,69,3,True,7,Tests_passed,6f961d469715d70ac28e7d1f143ab44a984869071af71dd0acf5070c5642e6ab,True,Tests_passed,75b090639b13f9a961bf63ec0bfad6c5dea318b330bbcec2e38a83eb8856bbab,True,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,7962f53a3e3c7493e3ef53ffb8e355198f7db3b3d357acb8e405a64bfdf658a8,Tests_failed,5fbda8795117ab989076a3b35243dc39eaedea575e6216a53086ba515e8f95a3,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,7962f53a3e3c7493e3ef53ffb8e355198f7db3b3d357acb8e405a64bfdf658a8,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523,Tests_passed,332f9449c814e5423866ec71f1d996cb666798f7ea11de37c1030410ded8a523 diff --git a/results/reaper/merges_tested/feuyeux/jax-rs2-atup.csv b/results/reaper/merges_tested/feuyeux/jax-rs2-atup.csv index 9f1d2b6c6e..54c044459a 100644 --- a/results/reaper/merges_tested/feuyeux/jax-rs2-atup.csv +++ b/results/reaper/merges_tested/feuyeux/jax-rs2-atup.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,b05c8c331560c1ab4be5c43c20912dbaa3d93839,7da8cbd0d675798ef263ae8655827bb2abd93ede,8776ddbbff972b7a828cf087b1e5089640f3d090,,True,True,Tests_passed,db8ca669464eb0ae2b24297266e483b4759e0f39b6dd265f997c2f2af75cadc3,True,61,248,1253,17,True,Tests_passed,1314c746cc3c6e983d8b017760da4d5b83b440e82acc9bbc0a39e59eac7f7286,True,71,True,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,4582f043c8ab0f51f6e8923cbdfaa827add918e4be843c66034bfd689f149742,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,e3a61eef8df016d4aee66cf062bd68aeed4ce799e9ca63f071aa05d8bde9f914,Merge_failed,28ffff57cd5b9705e980fbfdb15ebe4511e3a6b3f06cbc3e1ba477f2c35bf89f,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,93533125dc55460fa046f3f06fe9ba6dde57ce015bfbcb37bafbd056e681aba3,Merge_failed,52e75248bc57595b6a2ce5313a3e7dc5f0381956eaac7ce4474e3d8f8a326103,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173,Merge_failed,3517f40c86ef0be8817ed2acdabd2de10c769e8278147f3fef4adcf86b7e5173 diff --git a/results/reaper/merges_tested/fex-team/fis-velocity-tools.csv b/results/reaper/merges_tested/fex-team/fis-velocity-tools.csv index c498155b34..635d7d9517 100644 --- a/results/reaper/merges_tested/fex-team/fis-velocity-tools.csv +++ b/results/reaper/merges_tested/fex-team/fis-velocity-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/remotes/origin/pull/25,203daa57c2464ed7b348cf79a71c4e18ad29610a,f6c512bcca04ce3c4805d6998f81599fd314d848,ad06e07408c1bc9b31f597320399d53c4077b92b,,True,True,True,6,10,67,3,True,6,Tests_passed,f01110f2675603fba17aa7473a5da69047c68d399535a3a3e2d43edc97f83285,True,Tests_passed,0dcaf2e0568bed6e479652e0a3efb4c64f931c8c738b6f2cfb9fff25346895cc,True,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,811cfce7dc9171c2720b046db6239f4388e7ee566f1a49570f480d0f39eb48ea,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,2672c2f254200054cf85be631b353e844c77eaef566ca5a7342c9855a6c513d7,Merge_failed,440d8daf494556f8674c21062a959397475679f148e412908fad6eb326c91646,Merge_failed,d87b4f25dfa827cad8fb68713d72bdfc796cb99e9f74f8b6b72f365e12102d1b,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,dc5abf7b92c66c3e8295c2c4674c8b98b88ba517b400db035bf890207b327fbd,Merge_failed,3b76eba51de804fa8ab5c74720a5d3f0ef966512647613075882815fa70f0713,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5,Merge_failed,3a5a5dfaca4bccbfbc74cb9c731f1a797080e2e809f2e9036f89bbbb3d89acc5 diff --git a/results/reaper/merges_tested/fiji/trackmate.csv b/results/reaper/merges_tested/fiji/trackmate.csv index bc1983acfd..a907cf83fb 100644 --- a/results/reaper/merges_tested/fiji/trackmate.csv +++ b/results/reaper/merges_tested/fiji/trackmate.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,1792dcc505c244bf846950c12a8f802d79ba418f,e13e6198437f3aec3d70270485a0c27e6b4b12f2,6ddda4bfb299499875c437baa0b89a18e81de96a,,True,True,True,29,103,1522.0,2,True,29,Tests_passed,d211b82c8abb67f0967efcb8472b0c302f63c7ae67e95197439cb6bfc97c5cea,True,Tests_passed,340b6313632310b6ebdc02fdfcac50867af1fda576e1f7fcac443e7860d70af0,True,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,bb0837060560895afd55f808cead5f746ce5b8b3f26de960fbd39a110612fcd9,Tests_failed,8b0c7b277d2d5c595237bc758cba5e276d22e9c03bf2d45695d48d7426385be0,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,bb0837060560895afd55f808cead5f746ce5b8b3f26de960fbd39a110612fcd9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9,Tests_passed,6496f57f7b6f681dfcac17529d4e8c084cfab6bfcbec9d44def13c719485cae9 48,refs/heads/master,31e749c77fd17fb77bb36433506765f44784035d,f5291051efe7a525211ef3072fd924485a2e2793,2733e4e2236984e2eb9e14aff6a79fb858282958,,True,True,True,34,80,1085.0,37,True,64,Tests_passed,cfec539e9b563f5ae03a4a5cbfc8ccd594257b58bab47e069240447a7eeba03d,True,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,True,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,0b8af7826d26a19a6ab8cac21897eef18265b6f4cbd10aa2d4f6393eb4800052,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,10ad5fba9849379dfd4c2a2fa3dec2260c7167820388775b11bc87f61eb8c37e,Merge_failed,a773a6d0e07bcbf31f6153fb673a34d4f28c21c3afa50dde912b7207adf3e9dc,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,f838d21f64546cbff40619a025e36b25cee02b6ce22aa15e747d877108376489,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,75f24db7c803426ec3c2edc67d63f8aed22753879fa548b3bfeea43d5d98db19,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,eae7dce39debd7aabb677864cf7fed590e29e590a691654975739b6d1faf54a5,Merge_failed,f1eed3913abab479e8ad24d6d31e2166eee8448e372db9cf3804057e407f3431,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,a3f90fb91a686764a7413104ca2da4886b6d5524605bb95e3bdb8825b3dd05ad,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54,Merge_failed,79b3cd496bef2a4b3480b15bc7ec9af0b7e6274a0fae424d6876025dcb6e0c54 50,refs/heads/master,2beaa31e3425255f0ca66f2c9d979617c650a723,e9fd83ec1cee916c0233327a36de928f90aaec7a,8bf380780e7eccce6e2c16ca7d4fb574dae7e168,,True,True,True,42,504,2238.0,3,True,42,Tests_passed,4e680ca253195254752355cb666ac01b1cbdfcc2aa5eb5b553421cf7c8dcd03c,True,Tests_passed,a583e0967625b14206f1bb953b9d0041ea91dc8d97e7c0349ced1a8ed49b6cc7,True,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,c65b7c6f3ca593981fb4fe2fa048393d26d6df8ffea35a2163360ddcd2688496,Tests_failed,b9a96b66f72417a470a9ebbdc1f8cb193d3881d8b57cc864e8922aacd3b6bc7e,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,c65b7c6f3ca593981fb4fe2fa048393d26d6df8ffea35a2163360ddcd2688496,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22,Tests_passed,941e06a41929b3c135af6537c79ab55aa10dd99da354bc4d7d9b2ef58bbefe22 diff --git a/results/reaper/merges_tested/fiji/trainable_segmentation.csv b/results/reaper/merges_tested/fiji/trainable_segmentation.csv index 7afc330bec..5019597cf8 100644 --- a/results/reaper/merges_tested/fiji/trainable_segmentation.csv +++ b/results/reaper/merges_tested/fiji/trainable_segmentation.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ea4db9f554493e5fc9cdaffa8a2bbdcb18aa9cbe,be1c5a8c175ead77e194dab6a24779ecd64e90ed,5264eb25effaad7d1bbac8047286684326f31012,,True,False,True,5,7,18.0,2,True,5,Tests_passed,f252b4adf27afaf2e4c8a119af0e9bc1dc50cfb77b53fa4207be5572dd745421,True,Tests_passed,9ff69e96818c4ce8e3c04a97f04c32b5a63e1d7c821be80ea1342c7aaae1f391,True,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,73b1d68af93044932cc4083dc5e495872493bfd758a863bc7356a639417b016f,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,73b1d68af93044932cc4083dc5e495872493bfd758a863bc7356a639417b016f,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3,Tests_passed,4c174402050ffd365e95574a7059bc238f0c6914c75bacf000027bfdbbedb7f3 3,refs/heads/master,5d0af9b16565e370fe5f8f53577f8c9cdea8304d,0bc26fa993ddb0b234a47ab147f74d3c55e25889,c7fccb4aa5101ab3c68532df85888a87659266d1,,True,True,True,4,7,10.0,2,True,4,Tests_passed,6f77a735a2ecfbfcf601669602412bc9de61c7cf7ffb15859f79e8bb22a8e49e,True,Tests_passed,e2f2e7d0e792a06528581939dba6d38179af6f26f02fdf606160f94da9f124bb,True,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_failed,2cb63ce01d49707a07f2f4c2dfb07add135ab61640eb12fb9283ba36c99b0d7f,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,cc3db4015419acd95af84007c239ec2855cced35c1157eb34a56996facbc8c36,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750,Tests_passed,502070edab668fc5bbb769a79a630c82dc0bd4b11be906e4048da98d895c7750 diff --git a/results/reaper/merges_tested/fincatto/nfe.csv b/results/reaper/merges_tested/fincatto/nfe.csv index 3dcb9084c0..c9835922a6 100644 --- a/results/reaper/merges_tested/fincatto/nfe.csv +++ b/results/reaper/merges_tested/fincatto/nfe.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 67,refs/heads/master,a4be269d5dc77dafeedaa7986ce331f1dac5bfae,91de0e91f16bc8ceb36eef115e342774e4e44f51,ae6fef661e7b04999477b190b5bfddf3426d6e90,,True,True,True,437,2293,7936,2,True,437,Tests_passed,3ca6ae5a0b04b7a5c9748d94372e1ff76ef8e4cbc03009e0b039d0fba61ff913,True,Tests_passed,33a2d20dcaca871905024ca83f0cbdcd7d9cb6bdd682603a43ac5e91a0b70913,True,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,52e229022366dbaf092cf46a32ca7ffae182259467fc4a409e9882548892203e,Merge_failed,378559cf01166f5b7610a4e385bee3168aab40935d3dc1057ff44b43db9672b9,Merge_failed,5a5d5f850614930bd987a81805df70d72c012c18f160f20c6767cb95fdaf0175,Merge_failed,fbc00d5c7bf75b25385189ae593df60d573bd1f6a35a074649ebc4d5aeec9d7a,Merge_failed,378559cf01166f5b7610a4e385bee3168aab40935d3dc1057ff44b43db9672b9,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,f8e389580c6305ce0658817d9a88e85140ffd255a9a2961287614345ec8a7953,Merge_failed,5a5d5f850614930bd987a81805df70d72c012c18f160f20c6767cb95fdaf0175,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,b8f3570accf730cecd4b35b55d29655d8f2bdf8d269e5ca14264a0b185d3a836,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3,Merge_failed,5c7326f5bee4a8cc7fea99b75dd2bdd7ccc6331d56f87ffe7145a3785c2487f3 71,refs/heads/master,7219068602d38887a94aaa6f8d725f045c7c33e8,e909fdc75bab2eb78544de31668dada9a6a527a5,2cb8efa13415bc59cfcc4e97f0e4c108e655f5f8,,True,True,True,376,1988,6490,2,True,376,Tests_passed,508ae5728a5736d2ce3113b1dddc288ca658dd6e56b16add2195e2f477dea8b1,True,Tests_passed,3ca6ae5a0b04b7a5c9748d94372e1ff76ef8e4cbc03009e0b039d0fba61ff913,True,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,66f0037f8ba08e27ab3f5102fd1e53fdb774838d4a9f5ae709728e6f1ec22ce0,Merge_failed,12222d7d91af20e14144e21287ee1f29f707ec499c042f379e8feba0159c418e,Merge_failed,d22d5fd0ce867c597ea7de4abca15c0a02d8adff8bb1016ee06340337d52988a,Merge_failed,01d4d74a6ce23ba1a8750c13305ea4acbfef054da7d2c2c1d6331879f1dc3651,Merge_failed,12222d7d91af20e14144e21287ee1f29f707ec499c042f379e8feba0159c418e,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,ac0be931062306a9e300d0620bd243e9e7261508f4df71b460d12e4c399f2538,Merge_failed,d22d5fd0ce867c597ea7de4abca15c0a02d8adff8bb1016ee06340337d52988a,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585,Merge_failed,d94a2ca3409d001634e0eea86488fcd5050b5cedeba098ede2a5891f7362e585 117,refs/heads/master,bd66db2a724bf9440ab00d35648dc3877ea6a75e,6cf3332a23a45eb14035f20a5a9731016a7c94db,5e458f91eea0a89f236a8ef2f3b3b2bcaeebb2d0,,True,True,True,110,234,16474,2,True,110,Tests_passed,626d40c732ddbc9283f39caad1000977e663dfea6cb985f3b9a3a997b6a9b35e,True,Tests_passed,94c06119e4bca82454db29ca26bb8d3442ef54c92f761c58b9e6f3c108e7795c,True,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,80b9d8779a218583b22618ec4e0c41530320f97b9d659ddd152a64c511ee93e5,Tests_failed,df5961391bdd2ee9f84f37511d34992a71f04e45c3b5edfd5d8791a2ee5e98d6,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,80b9d8779a218583b22618ec4e0c41530320f97b9d659ddd152a64c511ee93e5,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd5413493c57bfa96566bdd207854431a2e91823959c245691b03f87d2868e89,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba,Tests_passed,cd2ea986407426adbc89b6f3e13d6b117be09f4dc8e29b99dde3f977e13768ba diff --git a/results/reaper/merges_tested/findwise/hydra.csv b/results/reaper/merges_tested/findwise/hydra.csv index 9f48705ca5..a1d2176246 100644 --- a/results/reaper/merges_tested/findwise/hydra.csv +++ b/results/reaper/merges_tested/findwise/hydra.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,cbbf7a2c0667ae20a79b268cd19c0c0d1ed4f450,cb868c7dc9560c3f38faf1d3d8945636b05fd79b,,True,True,True,46,283,2673.0,3,True,46,Tests_passed,436235402f88fc0cf418aa6f303517f941ba338e8e17115c17179d64242a9238,True,Tests_passed,59be9bd8ba036993f0c98c79370c56d759530d1feef4c5f418ee9d9033766657,True,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,e9b8e1d3e639a4412b2e6ba74a45ece9d31bc4792fa69d46a8bc15e1ec2dcf3d,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,e9b8e1d3e639a4412b2e6ba74a45ece9d31bc4792fa69d46a8bc15e1ec2dcf3d,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9 227,refs/remotes/origin/pull/260,df0e251a4325ded7eb9baef25fb1c5cfd1be3fa5,837f3bd1c230fb42327721f55818b0a9a722afad,76fe21c315cbb3d2fe159a62b4ee9cf85f0ef062,,True,True,True,37,175,2858.0,4,True,37,Tests_passed,e74cb388ba7be6229d3ed2a38c9eef7430917042d9a099e7ef1df811123715ca,True,Tests_passed,a6e2e040e3054e59a88e188e1b4237440125a1f058a7cc9ffa8e440296a836b9,True,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,a2376caa4a260e03b9f6b94798ea81cbd9a7b18fd4d186f76815435da0745be7,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,d252f4d5259001a032861383675b3cf7b28ce44a8a8535c82da4bb6ff9cdd30e,Merge_failed,c7d91362ed2b6cf33f83b4ea9ec2388f5524845d959d5941be2a3282b017f20c,Merge_failed,1adc93ac18a8663f9aad259e3be237f38e328ee82b20b228ab6335e3b3e9adef,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,8f47e6e350fd90a28ed371faca38e6c6da7c7ebdd6e03869726b20c06389013e,Merge_failed,10d2dcd821e40f97e3c1534b3b3dd5f327f3d8de1b6fd01eec548889305ac2ec,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,67715df80645946c2ebe6a510c86ac34bb199c9e7a23e537b9909d60134a25f9,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f,Merge_failed,0874f51468fd6a391666b2fda491677de1f16911bec6b208174d843ab40a945f diff --git a/results/reaper/merges_tested/finraos/jtaf-xcore.csv b/results/reaper/merges_tested/finraos/jtaf-xcore.csv index 404c3377b1..7850c682ff 100644 --- a/results/reaper/merges_tested/finraos/jtaf-xcore.csv +++ b/results/reaper/merges_tested/finraos/jtaf-xcore.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,9165bd1b60aa447fe40c713040bab897a9b2af1b,b6653fad72ff311b1f98414c4cc547be0e908ea2,e3545e4d595e66e89cdb0fa1003a4580179a8062,,True,True,Tests_passed,01ee66c96d1b5e793eafa82f3c2d4f47a00f98c722dd479a7575e769f5229682,True,125,584,3062,7,True,Tests_passed,a23c571e24986e8041bcfbf3acbc3087095e1ef9d45f7985558dcd4e0c8dcf92,True,125,True,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e14683a7cdd27a98d3ae63d05b0dcd1bef3f04d1e2cd2841cd3fe426ded266fd,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,262a52cbdfeb5afc79716602d956d89bfc526f195e617149ac94c71bb747d85c,Tests_passed,e851f8aecc05837c366d1719090adf035dfffaaf03b05cbd908449e8bac07cf1,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,e085e1642123b209de091cba8b1832dbb8c5a3b8a15e296417875431ac1ae549,Tests_passed,784c7bfa1b49670a4b32455c1e143c01b3be20958fa100248b634123ac2e9529,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,dd22572067dbc988e7410b0cabf8773423bb0dedfe98fa43bb146086a019ea86,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2,Merge_failed,d26cb044db375a6ac65731c5c38474a546f816893c3badecfffd360ccef40fa2 5,refs/heads/master,9e7c6643c2bf965761e910898998bddf16bd6106,7abc9dafbe88ba1b6dc83a5fd0bba5c93e4f91df,d809ab958c031380500dba1b61769a2ab2e5a9cc,,True,True,Tests_passed,427725a7b34f9f1d2cf912f0d01d85e6bbcce347dfc924f03216c920a4f9b3fc,True,118,547,2944,4,True,Tests_passed,c4bfff1591bfa1f40d11296c725f4ddc62704302f2f86ef00d3be88fcd1bbefb,True,119,True,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,ea2386eb043aac4d2a4a94e31c9a4ac624107c861e535cee298e8a9d2a12273a,Merge_failed,99ec65ceee0b4699542365b4492fc75a202c2ef628cd8d9bff537e6b156a2871,Tests_passed,19a27df6e0d0a3c7c923bc51638587b5478d9b5f03ace3ab36994e3946b012e9,Tests_failed,b296981f0244fe0a8c6ca65d63c2e46f5e23600632b64d2e7f9cbc96303b5f99,Merge_failed,99ec65ceee0b4699542365b4492fc75a202c2ef628cd8d9bff537e6b156a2871,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,b42fc23021085ae0bb216bbd889d231b33448ee8a566388f0f1a0c3414be0e22,Tests_passed,19a27df6e0d0a3c7c923bc51638587b5478d9b5f03ace3ab36994e3946b012e9,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,dfc851a9048c3ccc7e1582331b78acbf7d38ea803faaed51029921fa0ff72236,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573,Merge_failed,306900234937974c2a00cef0dc9f6e41d2660dceb29478dab28423883454a573 7,refs/heads/master,0097c94a20ea815ed971d051e268137dc3bcdd2a,db31b6024fa26af7a08364636374e2c9938fe0d3,6c27aeabea418e13310b69b72c2ec9c22a6aedd2,,True,True,Tests_passed,5bd7195e44ad136edbe5a044a06f1d92d7e7843c7f3c024fd845e7c51c0dc42d,True,119,560,1497,4,True,Tests_passed,6c1efd375021f20136a2f4da8bb04731153d56d27c3b1211d30a6db01997d411,True,119,True,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,40377ce233b0798ae4db38dbaa3f51d3ddd483bd4386ae5203b62ef74b6957fc,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,40377ce233b0798ae4db38dbaa3f51d3ddd483bd4386ae5203b62ef74b6957fc,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea,Tests_passed,9b6862e87c9eac5b9771c7d7d19312127f39ba1c8d6e6dddcdd812da333592ea diff --git a/results/reaper/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv b/results/reaper/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv index 2f944cb111..8b8a57e06b 100644 --- a/results/reaper/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv +++ b/results/reaper/merges_tested/fit2cloud/qingcloud-api-java-wrapper.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f96e05486c8dd41084214f4b838a87f178be0aaf,5447d306ea80a0456d238bfb9efbf00f751888ec,0a428f6e1666a631634281f20d25247cc5113391,,True,True,Tests_passed,fabc06883f3f15ecebc660147510299fb0202b9e403e0f6cfdf7b36ee7bd85a3,True,15,50,393,4,True,Tests_passed,be577c7ab7725fb84c2ece1e68b42ad70e3305cdc1a4f05914713a7bb4586935,True,19,True,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,723e791ba41f0fbc31c821bbda7ab42e4e56dabd7b9794ea2bd8f32f1925e564,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,723e791ba41f0fbc31c821bbda7ab42e4e56dabd7b9794ea2bd8f32f1925e564,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,a82c4cbea790a529ee7e8dad88b879c7eb6238e2f34e2602d5b458a22a66a8e3,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf,Tests_passed,73cf998442d431a6de3cd65b317e577746fdbaff732d36b7864c1b8f734e3fbf 7,refs/heads/master,995c25dc87eca84847991a1217944c665e69a7e8,90602c52df891bdf08c0679cc136d4eb55fc0416,3535f3bd940d81277f5f4f4c0677664370f0ea5c,,True,True,Tests_passed,2e0a5ff305606962941f26297bd7e52c44df441b71a370d21cf81559923c5c1e,True,12,21,370,2,True,Tests_passed,807337aed3817eebcaa308e4df75bedeb82a9f5c67c2590e56392762b74238dd,True,12,True,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_failed,b623cfc2d946b38ad3df6b7080dc3b777699993bca702b7a65e17525c4f09e63,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,733d62932eb12633139a22761f822100c3072d368523b2bec7443b6ab06a57a9,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,2bc4fecd2359d072319cdb27c6cdd6eee9c9eff9915395eeed9f9f90e3c120ad,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3,Tests_passed,a262536adf7b953314adb76e0658246ae96e4289dbd7329273c7e45667a53db3 diff --git a/results/reaper/merges_tested/flaptor/indextank-java.csv b/results/reaper/merges_tested/flaptor/indextank-java.csv index e34e202732..f513c09d89 100644 --- a/results/reaper/merges_tested/flaptor/indextank-java.csv +++ b/results/reaper/merges_tested/flaptor/indextank-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,d850b46a2e92c56a63af99d7380b11e97c36e3eb,78aa405f383682e8c44a2071f95f0c59651fee89,315857eb3fb000eed355fcac261719f1d46901cc,,True,True,Tests_passed,aee0e6024df8606fec1a4cd9996240adaafac8195f5175e037633d19c2e4557b,True,7,28,128,3,True,Tests_passed,0fddcefa37afb2540571f98ef5380c2dd5f9114995e4b2f63c106542f40c67dd,True,7,True,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_failed,51866e7309dca25e3038479870bd8c1d49555600a779f8640b603ca9b03355d3,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_failed,17f33437f30cdda974111cdeba0220ea6f46654b0abbd6f2e27533458995b7c4,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,dfd2162ca39b39241d494a8fac8f72ffbfccae0fb54c9a0d3eb46050ced13ce8,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a,Tests_passed,f6461be31b98b4aeaf4503af098f37513ca8913ab1cbf47af366b6a49a320a0a diff --git a/results/reaper/merges_tested/flaxsearch/luwak.csv b/results/reaper/merges_tested/flaxsearch/luwak.csv index 0e9d38605e..4ae281796a 100644 --- a/results/reaper/merges_tested/flaxsearch/luwak.csv +++ b/results/reaper/merges_tested/flaxsearch/luwak.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,a9360739280ff9153d8de5ff4cb89162499c67d6,81a6c412d1cdcbbf6752f3ed2faa0af5690f187c,b4064f200ded716e75b3eea6865456063a1421bd,,True,True,True,18,83,1043.0,2,True,18,Tests_passed,484cf409762fedd7e0921683fba26711e84908a5dabbb352c5061290db7eacaf,True,Tests_passed,0f589386b3ce2ed8d0032408f9840339676edc270028b2a15e662ef2d1f5be4c,True,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,4c7bc9ed250f1088d81ff3d6c15c707d4cf13451b8b29a282e84ad6541ea7f42,Merge_failed,31f1ca8a1b58d9266d870fb68c7c585ec1c244b413a93dc3ce526e0d8d863567,Tests_passed,7f171a8e5f93f7404164beade8f494fc28a24cc87d29fa07e0e8ab78feb2dd12,Merge_failed,06b6081ade9b6295de0087e4d9dd1880f61e4327376ac0c426cf269384939db1,Merge_failed,31f1ca8a1b58d9266d870fb68c7c585ec1c244b413a93dc3ce526e0d8d863567,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,988429e39c4d15b9df2cc98a61ce6393bf3c8d401a961a294950a5af4f60729a,Tests_passed,7f171a8e5f93f7404164beade8f494fc28a24cc87d29fa07e0e8ab78feb2dd12,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae,Merge_failed,2d75a62eedf24ec9b0776ca701cf21fb9fee403c01f7086bfee769db5d371fae 17,refs/heads/master,3127e7cacfec616e0b6ea7bee472cd3c4b8b829f,d539a1fc858a5648876a4a2acc4d932edd7fa8c8,6722dda66a7cd580c807685aa878112d2125760f,,True,True,True,24,35,874.0,5,True,26,Tests_passed,6db383e9fedb451f78b9f5d55b750156fab3a24247b65f1e8c47db9840142756,True,Tests_passed,d7fd89093d3dc5657abc40afaa5363b4d75852f97cce3a9900dc1b4635852757,True,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,db19623b134d4e675c42ea5e568594465fea5528ca97c388ee6c47e40c6b092e,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,be3277489fd3152dd3a4e6cc2ba8cef2dcb96cd6d252ddd6ce6127b4df39bc8c,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,73c977005152d1b48b7c1c8893bcba77c523d7bb6532049fe6d53f42ee0bd74f,Merge_failed,a6650ecd8b9e4648c69aa666c86fdad0de2d408bde9219902da6868811e809be,Merge_failed,a7651937d6208e8261e2d0328d92cd7331bae7d0a0b3dc8d7f71cb8e537f5f57,Merge_failed,d35a6644a412305c73b5dac763f1584cbe697b7b1a92345e4cca0ab97a646ff6,Merge_failed,a6650ecd8b9e4648c69aa666c86fdad0de2d408bde9219902da6868811e809be,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,be3277489fd3152dd3a4e6cc2ba8cef2dcb96cd6d252ddd6ce6127b4df39bc8c,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,4c7cf6770453f6563cfcc75a30bf225916c275d6c9d1221e46d697a55470f89b,Merge_failed,a7651937d6208e8261e2d0328d92cd7331bae7d0a0b3dc8d7f71cb8e537f5f57,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,db19623b134d4e675c42ea5e568594465fea5528ca97c388ee6c47e40c6b092e,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12,Merge_failed,772f3eb28128e9770ee72e849adede02387024e4c011b240efefd68260f4dd12 19,refs/heads/master,cad281c6da899e58fb7963f4e1c4bd46f06b27e9,1962beb0736dff5c917362a1f9cae378e3c46254,d375175e2c957bac8151d37997d8ea2a6f98b938,,True,True,True,24,40,878.0,3,True,24,Tests_passed,2b4432ecf9d7ce9f76481f5d36e4c03d406a47a5872a4599ae2311287c7317c6,True,Tests_passed,65c73f75a459f9350aea1536569eb1af8887a0520b8b06292123f6e39a60cb68,True,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,e8d7840775d908b5721a2a0ed9cbd8b2ed100cab4b54acf718f64b243f2ed5ce,Merge_failed,9dd742bc1f8f9f5687a4d04bfb01ff1d2871eb2a307b6d23c993c760833e31e7,Tests_passed,3e53a27ca0f0b6e858557e513af21567997a30f48db942ee41da8ba102e1630e,Tests_failed,0ae7844776dc54af0b8e0c9113f00397fe153eeda137bf929efe8c44be0a6e68,Merge_failed,9dd742bc1f8f9f5687a4d04bfb01ff1d2871eb2a307b6d23c993c760833e31e7,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,752e8cb995f932546bf60e2edc2381b01bdd1872e73207388121c79f11c39d1f,Tests_passed,3e53a27ca0f0b6e858557e513af21567997a30f48db942ee41da8ba102e1630e,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56,Merge_failed,d03c2f9bb220dc1031014e2c01b497dfd8eb1cb1d246e30ef1648c0fed728b56 diff --git a/results/reaper/merges_tested/flipkart-incubator/zjsonpatch.csv b/results/reaper/merges_tested/flipkart-incubator/zjsonpatch.csv index 513f83b15e..a8233962ab 100644 --- a/results/reaper/merges_tested/flipkart-incubator/zjsonpatch.csv +++ b/results/reaper/merges_tested/flipkart-incubator/zjsonpatch.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,3a4c27d3b02856e9dbcbf917a764336d78883c73,2fb50aea7397183773b990af9634d166c392013c,9f367408ddade0f2cbb1f562975941da12a66f9f,,True,True,Tests_passed,d2807689bd36eca627ebdd7f02ebeee1c698eaf338af8882be4486ab8ecf7afc,True,9,40,141,2,True,Tests_passed,f0c803aba2709414567dbb301a52f53280070459dd93d888db95ecf7b55fbac4,True,9,True,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,961e44f675357bb03c3c2805736cd586de3ff72b9f05f5c5b37c340909b20c8a,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749,Tests_passed,64d1043ba06d8d2b7fc2165ecf0c615708420a62ff4725b9fa4de9abe2159749 27,refs/heads/master,822884f65e0b7c5da938e75c1941be8f9a5c41f7,a7c1de97405028ca3fe0078d57b6599a46354604,852ed479032275abf1673ee97e40a1082afb2857,,True,True,Tests_passed,7459b25c8c570b4dcd17b7f2381656b46cf97f67622e851449b50fa30cbdc962,True,5,14,96,2,True,Tests_passed,c243d55566836a5c9d115253cd733783cc91d5e9eb745d62711d3182e9381807,True,5,True,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,b53f12d42d827e1bb56f9133ca7fc6bca676ebbf3529cb93c83241d7f097fb78,Tests_failed,4ab7a0c7ba39bface283335e5c6444265370ae8b0231de72596629b06e987b56,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,b53f12d42d827e1bb56f9133ca7fc6bca676ebbf3529cb93c83241d7f097fb78,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,1a3689de9f7061122a0c4a68e52977f1d01ccde471ca11b9b43caa75eac7d2ad,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b,Tests_passed,7f4d6fb5bc435a9e8587f1f4e9fb01d26908b2a456c3f3c48fa054cfbe37018b 50,refs/remotes/origin/pull/73,feb9d9bbcca397901e4d0a3e40706f8f165df1be,8a5931d17aeaf15c5a5cf7334ba777d56a9fef0e,cdda139dbd971f0e0332b12248d6c8825062f225,,True,True,Tests_passed,17e2369e28f8291013c8514e2e5b6d860c6b2924e8f44f2c4cfdf0435d54b8b0,True,44,92,824,3,True,Tests_passed,6e6c88e3a340b8e5ac13122171283fb23376c7f16732f3ae1e4427b29f58f5d8,True,44,True,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,1fb28c561749a12990fe8efefb0da1c0196fa4e36eee6543c8b0380fd1c78c64,Merge_failed,31e8c6d8c4f73481f30b5b598500c380eecfe4fd95483b024b8e97d2d50e11a9,Merge_failed,a9b1f56536cd4747730c73c5012a41e18e5ae28fd212bacf4da7aa1d4c34231e,Merge_failed,fe44e07b78e6f2725f751977338bbd87a7db1dd7cf62df3e71cc497f0f353203,Merge_failed,31e8c6d8c4f73481f30b5b598500c380eecfe4fd95483b024b8e97d2d50e11a9,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,0e5c19f81a3a322e43f3d1dfddd2aeb1d86f9457104cc43f830ae1745ea870c2,Merge_failed,68124386243284904371a0d26884960cae13be34f18d9784aa857bd75ddd36c6,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e,Merge_failed,313eab503b05c85bee6e18071312b26842fa7175446eeb98e4c0990de0839a6e diff --git a/results/reaper/merges_tested/fluentlenium/fluentlenium.csv b/results/reaper/merges_tested/fluentlenium/fluentlenium.csv index c12c897e20..01dc06d142 100644 --- a/results/reaper/merges_tested/fluentlenium/fluentlenium.csv +++ b/results/reaper/merges_tested/fluentlenium/fluentlenium.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/develop,830bfb6878380410b593f893bc36b29c1831e8c2,5084054c90e52eac508c270dd1d769f13a7a92cd,fb62ab5343eb698c93774da9ab82da32a28b48df,,True,True,True,47,137,317,2,True,47,Tests_passed,12fbc66a1ca2725f6283b44a8ca94b135147826a2fde2fbc129fcaaed0dadc7b,True,Tests_passed,a5f8b8f1dd9b0b537f1cc94a5adaa5326aa2dfadc6a037294f4a459be2915ed6,True,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,39a23f27cbf10fc2ba17ba3ad6343bc730fdac55c7330d4b7928ea28422372b5,Tests_failed,a0ebebb45a9ea59b173a91c31868974211a0a0a0772546ed0402a03fc0b14a61,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,39a23f27cbf10fc2ba17ba3ad6343bc730fdac55c7330d4b7928ea28422372b5,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b,Tests_passed,563c7afbc8274bb9f9d876926d9c5daae33325f80c36ef3036bbb5b6af02f27b 202,refs/heads/develop,6e596eb139bcc79b4575b86d302525a665cc128a,b88d0c2d51b84d28435aa4053df0214adb6ddd03,d93f4094c7593de9893d74795adec0ee2f482a21,,True,True,True,167,814,5278,2,True,167,Tests_passed,de0d4dea042724e8723b1bffe82dc049a283ad2400eb8d91c4d537d5f6275ab7,True,Tests_passed,f2b9df7d68bfb97adca1d4ae5dc4b521826666ca2766a21dc75c0a425fc2a1d4,True,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,3a06540064cc260325e4f5f6c845e7923db92608150cf9ac248402befe37e85b,Merge_timedout,,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,3a06540064cc260325e4f5f6c845e7923db92608150cf9ac248402befe37e85b,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8,Tests_passed,ec5897c0930f70d6b5c1cc567d8c24180ab5d74b5850212c4b227144f71294d8 212,refs/heads/develop,66d1ddb3128c56fa065ebd928b1831cf2cb21da5,f06fb97fe45e2f108baf78eca6173bc37686c677,16c62e8d0e54dadee5c744aae310af8dcd00ffba,,True,True,True,20,28,4261,185,True,199,Tests_passed,bd766fcf9f99d293e12c41092b12c75766c943cf09c0e1a6dc4f2b151c50ff19,True,Tests_passed,952edbfcf95b9128836c6a74dd9338f01938614bd37e45dd849cca2228ec77e7,True,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_failed,6e1b29a28232d5391059d0c7a583cece9b03f45131c56d62f9f9e5a9dbe4b874,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b,Tests_passed,ed1134461c14100394293dbd2aaca28378cd1b5399595aad46f013ad6fa3c82b diff --git a/results/reaper/merges_tested/flyingsaucerproject/flyingsaucer.csv b/results/reaper/merges_tested/flyingsaucerproject/flyingsaucer.csv index 874d95f751..5774edcc2d 100644 --- a/results/reaper/merges_tested/flyingsaucerproject/flyingsaucer.csv +++ b/results/reaper/merges_tested/flyingsaucerproject/flyingsaucer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/main,fd481a7b6628dc246a537b748a9aa3c11ce66e13,6e8b9e04f82daf7acc981639ee9017338fe9b88d,1f5882cd4c7ad76898e12bc405aae431842534d1,,True,True,True,180,3269,50348.0,3,True,180,Tests_passed,d01336b8943c79b9b3d24433b32a452bc4ce7aedea19c42494b6550a479d0a5a,True,Tests_passed,fab4bf83cfbd7b795bcd8c51de6e367e82852bc756b29a2e6c78d8d34fae5d7e,True,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,b6b5df9fd00ba487c81dd81880beb34327dc03d55df7f19b60640e9903da43a9,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,e4092c73a3ae9d5f34756d0a7d58a1e74b6d9b3a4937cd7b4ff7e6dfb4d87a2c,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,b700910fc2b985b323f936053f64bfbade1f7a2450a366f1b83bc97b0609c86d,Merge_failed,6352489c3b02c2ed3ea6f5bd75ac7de0dce3d0f4109f58991104ea721ae104cd,Merge_failed,b0554652623d304de033d1073326391aa1f6761a2156453c4b4cc28801600398,Merge_failed,549229dd61cbaa463a160bc13f6dc1b6e8d1f6c0ec2670440737b20c1cbd5366,Merge_failed,6352489c3b02c2ed3ea6f5bd75ac7de0dce3d0f4109f58991104ea721ae104cd,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,e4092c73a3ae9d5f34756d0a7d58a1e74b6d9b3a4937cd7b4ff7e6dfb4d87a2c,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d7a708b1d967addb24bceea40d0084d3b2043a66289ee3405d062f56e22750fa,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,6f61e7d8f7b9239e78852cea614474dc1682be6f8bebbf14c5607c19faca72e5,Merge_failed,b0554652623d304de033d1073326391aa1f6761a2156453c4b4cc28801600398,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,b6b5df9fd00ba487c81dd81880beb34327dc03d55df7f19b60640e9903da43a9,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf,Merge_failed,d5a89b71313a45215bef830a3f0aebf7f1bca52920ed02e0e1983bdffd8dcdbf 76,refs/heads/main,9b83c56a8c1de53c9ea1c2a3141e48b36bb2d3e0,d68f357e0e9dd92841971a30f6e070cf3df002b9,e6104cd3d85a4932ca5b88b7576cf0318b86b044,,True,True,True,67,385,4216.0,2,True,67,Tests_passed,14e16b548038b2e7d34eb122a62efe84cf7185dfa50ef9e5db147da681cf0f4b,True,Tests_passed,6b650919b1c5bbe887b0bc71a3581f08b1edf1163ee0091f967cfadc411ab90a,True,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,22089bd40825e5533d0da6b30fdb26ab488f11287a6dfe5734decb4880350155,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,22089bd40825e5533d0da6b30fdb26ab488f11287a6dfe5734decb4880350155,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,11ce3c2a5b4ae6271867fc5be7ea853b3eb36ab7442d83c1ffd8fbff506af61d,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917,Tests_passed,81b41ac81e9ed3b324ed0c2216717ef1f4d3b5c2d708f92d567d3923b85f9917 79,refs/heads/main,b2ef06a76fefd6cd69ba13fc251afe583f77c0b2,0a03f0cbae52f5623a94bd67e6788817c8d9aa47,e1df2c4ef25c45e536c90c552319710837af248b,,True,True,True,66,370,4012.0,2,True,66,Tests_passed,b2018e3733f06f60f60b1e75c8aca8366c6b4394950a5b6ed2cea4773530ece4,True,Tests_passed,8fd0d591146abefe962f1adad8b23d1e4855ad2ddeb23072eebd4d13ec78892d,True,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,80b1037f7560c8bb59647b327d757698910819dd6b9b18e6d0bf6fe9d0a365f1,Tests_failed,a942b130a9edf2d4d7df338ad7fd335819e3de9c87a1e1d2a51a31452746cf70,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,80b1037f7560c8bb59647b327d757698910819dd6b9b18e6d0bf6fe9d0a365f1,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,43e0944a7caadf3e82b52afd1155b0b32360ab86e576ad7ff268b6e45f6411f4,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0,Tests_passed,ff9c16ddca94b87eca88edc32ee119b5595d430b43f5d665e58cf56e1c1a55e0 diff --git a/results/reaper/merges_tested/fmcarvalho/htmlflow.csv b/results/reaper/merges_tested/fmcarvalho/htmlflow.csv index fb903294b7..5bb104ba2a 100644 --- a/results/reaper/merges_tested/fmcarvalho/htmlflow.csv +++ b/results/reaper/merges_tested/fmcarvalho/htmlflow.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,a89a8fa0e3425befa5503896bca392ce1bac437e,d5ce30d0c44ba34fcb4846c193cd06320362516a,91c5c4b27e1d315ebdd7690049050e7fe79addc3,,True,True,True,51,239,3010,11,True,54,Tests_passed,858aded6720e1a3da234601906cc10bb95833c0c7520e26a847f1f14df0fc567,True,Tests_passed,ffa0a1a959ca0c5738576d4f617e728cd3c05208795cc0f2433903933568691c,True,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,b73e9cc4fa516c1dc9821a1fed589e12da3f825be2e7377c2c004930fde2692e,Merge_failed,c54cb640897c41d7add344934e7b7a8f9e208e380b0e3e86f9ea18a814228846,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,b6f0568f107d758c0cb31d06bc3061d10ebd0bfd69bebccd32eea372030d9638,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,2aa83a7d539935f1861c5c647dcb4e13ea11677fa61fc7fa5d692ccd0ebb2ddc,Merge_failed,6b3f458df5faf465e9052b5424a00c06df3228bea735c2988e405cfad0550113,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f9aa4a91b8c15912c12be40629f14ba1fbb98ae298d084c6ae534c0a0db0aa3b,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06,Merge_failed,f47c68ee41fbb907e2d78a81928bf779fc49de5c21a076efc817dcd26a932b06 diff --git a/results/reaper/merges_tested/fommil/matrix-toolkits-java.csv b/results/reaper/merges_tested/fommil/matrix-toolkits-java.csv index c6e084be73..e95f8b6e5b 100644 --- a/results/reaper/merges_tested/fommil/matrix-toolkits-java.csv +++ b/results/reaper/merges_tested/fommil/matrix-toolkits-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,affdb7b35e8a309c4691e94a9f265dcfa9f34094,52744544515f2b8b56cedc2901398610f08b235f,98234e974d0467722d7188001e704bfeb518d848,,True,True,True,17,72,383,4,True,17,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,True,Tests_passed,4ed79d826944a4fb6d09a63127fa6cda76769d97219f58c809f738be2040f0b3,True,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_failed,c2f4f3aac99754826962e420c427f4649b9b52f8011c572bbe7efaa27629f6d8,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_failed,b338db5424fc919aec83baa87d312cf2e9ece62c06329488d6991a813555a3aa,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f,Tests_passed,2fb82f35ddd219c95bb139cefa01d5e6f335f0752340f76316cb93e1a1084b7f 2,refs/heads/master,52744544515f2b8b56cedc2901398610f08b235f,55c0157b50769b802dddae37defe735649a760ba,f6cdc9896a9aad1de0bb7916cde285fd1d1e0e29,,True,True,True,10,24,286,2,True,10,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,True,Tests_passed,908a3dd301c07f0391dbc95078706bb9ddf1ba6131221dd82fc4aeaeb80eac53,True,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_failed,57faf72903fff28a17b40099bef64c996d5257e0d722f44182ebd24df19d7e44,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_failed,57faf72903fff28a17b40099bef64c996d5257e0d722f44182ebd24df19d7e44,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328,Tests_passed,f7fa7b7fe9d4c834fdb1c94d340e91af3e59146dc025b7196a6562eb14482328 3,refs/heads/master,55c0157b50769b802dddae37defe735649a760ba,ab12647475cd734fc95ba3725ad053652ff04713,ebb7411aedda4dcbee97eded6958f3f41633fbbc,,True,True,True,15,50,109,2,True,15,Tests_passed,6b26a17cd2b000b0f926e66ee8ec5038ba1d54557f9d7bddb9c44600e35f4dbe,True,Tests_passed,d10059262183890ce5129a078ecf62a8ff50c9ecb193b0e8d429715a3c34856a,True,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,0880f40a4828879194569f700febe428488fa78cd3c73f1c490fcf42bf0b8416,Tests_failed,3464094b8fad932cd37bd55a4a8af668601f2b115cf88b0894c49a0ecd7160a9,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,0880f40a4828879194569f700febe428488fa78cd3c73f1c490fcf42bf0b8416,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830,Tests_passed,471db9658f6a91fd85aaad6b8785374fdf212bcfbfd99fbe6646f1aa9444c830 diff --git a/results/reaper/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv b/results/reaper/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv index dbe44bac69..e6597b232d 100644 --- a/results/reaper/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv +++ b/results/reaper/merges_tested/forcedotcom/analytics-cloud-dataset-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/4,bb64fe4fe44310042573ff697a10286c76181f27,7f5853b50212f8f062a683dc590025d23e195449,5bfe592ac634bb45f48175f5c455b69568bfe54a,,True,True,Tests_passed,2d56ceca7685cd0d42383dffc1b8bc5b472c543fea43865ca8db7d668984d509,True,9,33,128,2,True,Tests_passed,0c0a3402ebd89cd9cf6f7f799c9bed85b79283578da63ff3c8c1c5565e8d9470,True,9,True,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,b8c015f0d53f1e62c6071956b66bd4c7b301ab1c45f88baec5279bf58959e046,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,1ad224c4ca3d46b567c3bbbd63c73edc0ab1278baedaa21f30ca73d974d0441b,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90,Tests_passed,252bfb2e7cb1856c2909d1870f6d8a84336a6930f50bdefb2caa361f13b01c90 diff --git a/results/reaper/merges_tested/forcedotcom/sitecrawler.csv b/results/reaper/merges_tested/forcedotcom/sitecrawler.csv index af68341bb0..0656d1dfaf 100644 --- a/results/reaper/merges_tested/forcedotcom/sitecrawler.csv +++ b/results/reaper/merges_tested/forcedotcom/sitecrawler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/remotes/origin/develop,bb56b3dd8e132d8d625dab3ee71ed828754cdde0,e581ac9a860103411577fc1e43f419202fc8d8ac,db6e75c0cf7dde53d208b30dfad7ca1eaf3e3896,,True,True,True,13,79,1175,3,True,13,Tests_passed,79fd9ded833ef95cff46349527c8002380321b3fa12371969023f7119fb65ecc,True,Tests_passed,64ab76e3afa4e811164c11715aaa520e84b189be22918dc67de3ffb6dbb0f930,True,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,198451b2a698f649956e8b1062a032242016267bd2cb4ff3b67440e370c7e0fd,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,235025f90acbeec11c19436916c6c1ebc5dda3205c079d8f2e6bffac774a4ec2,Merge_failed,5b383d513ee9800f18493e1c55d5c284d863fa835de27a92e53b578b3f2b8d0a,Merge_failed,01d6df52c40d77f1ef0803047800b33fe72005b3afc07717a82f1343f5c237ac,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,592eec475d9f53ef4957bb210fb999ae0f19cbd9162450effd88a1847e3b4961,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,6c40c9e21091c943ea4c9de10d618fddd9771a0009f9951022b52bafdc7b10f3,Merge_failed,44a60ff206fae99ef5bb78aab688a6e94dd6b977a3d3387329ae4957e5078df0,Merge_failed,9a69a5806aa087385659401a15c759af2e62c8cab3beb5c8514719997024a943,Merge_failed,f94943e3c1f3a307e66290fda52d77e707fb7f53e91c7075bf9749434b75ad8d,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,25e38365df2320005e622338ad1386faf28509b81464daa23dadadfe5642fcfa,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a,Merge_failed,fc34860020c2ced7e83108cf9b29576b3995936a44ef622f817f3e42dcd1792a diff --git a/results/reaper/merges_tested/forcedotcom/wsc.csv b/results/reaper/merges_tested/forcedotcom/wsc.csv index 80ac2c23e9..f7eeced8b5 100644 --- a/results/reaper/merges_tested/forcedotcom/wsc.csv +++ b/results/reaper/merges_tested/forcedotcom/wsc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 95,refs/heads/master,9394831a11e1e6b561c8f02e04d1c5a526038567,33d423017258526e56b667c2359dc340cd613db2,88a50b3f22bd2798afc8ab485fa4e3e9566b7208,,True,True,True,152.0,177,645.0,2,True,152,Tests_passed,9f158c53799e42581b0b1496756f35b3342d28b68cfb39af26c98cc3cc2f5613,True,Tests_passed,a5e3adb2aa160d93a654d779f4116e387adcdf894e1292ac4167f9eff488fd2d,True,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,89cf5d15285ee364e24311bb28380bf4b6b51fc41634955ff82dcbda1956994d,Tests_failed,e0f65d5ee81e00ae80067189de8f897959d555e7e7146e99993214f734aa1dd6,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,89cf5d15285ee364e24311bb28380bf4b6b51fc41634955ff82dcbda1956994d,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56,Tests_passed,8857eb9f995379a454b14ac7ee957b94f32279c959344915c006d55235479a56 134,refs/heads/master,69d39ed6fe26f04b1132ff17984ae3c77ef7ed77,a0b230e5c07ce66c36d64a638227d33d67816a9c,bd5c0c1c03c5f26f32d35a1febe16979c797b1a4,,True,True,True,9.0,21,191.0,2,True,9,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,True,Tests_passed,5bcf3ea9f25ab6a08f5642e6472c7501bcc89809154b3281fb2634639c2b1eee,True,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,256ac177f35453f19c1350b66da2a006a2b9dd620adfab34ae2dfa6509b5fa9b,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,5055baa4aaaff3fe10d7bfa859f45b4e1fd20d830e829067246067ad56adcbee,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572,Tests_passed,94f699c1906a8ca66f4fd59e3193ca5a36a2cd46d0b3170d6e91f2e26112f572 136,refs/heads/master,a0b230e5c07ce66c36d64a638227d33d67816a9c,58664bac8717aafa09c5c5edcfa9ef7fd4dcb240,0b145011bccd9bc1c48dfec1c7efcd435f773631,,True,True,True,7.0,24,107.0,4,True,7,Tests_passed,438a10d07d96e44d3954bb9b72ebc8822f08f01c1668c7409e0c89a6ef4bed69,True,Tests_passed,d095c7e06529062e27178dc5e6deda1c21fc216ccd9f76c8d8906eca03ddd226,True,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,3d2134acdb470840fb10b18f0521ea33ed4847bac67caae7ad6aada95fb1b9c2,Tests_failed,088b443a24841dfe582be8f0578be8139bf5053624671e9b790604bd8d2134c5,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,3d2134acdb470840fb10b18f0521ea33ed4847bac67caae7ad6aada95fb1b9c2,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,1ed0c48c474cf75fca3072edc53b85784c2f253a439705d67f2c4313da65758e,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c,Tests_passed,bd81cc8d7a5096357b4c33f7e2b3015e92d11f72e3f28a026ecf72cb0c17712c diff --git a/results/reaper/merges_tested/fordfrog/apgdiff.csv b/results/reaper/merges_tested/fordfrog/apgdiff.csv index d616fd58df..978203760e 100644 --- a/results/reaper/merges_tested/fordfrog/apgdiff.csv +++ b/results/reaper/merges_tested/fordfrog/apgdiff.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/develop,a42c3242b6e78aa612e362f409e373225a9c4a2e,6523c52d919cb5fd73af3ef718f691740b19db1b,6c6defaa50aad109de8a85b37202591c0b98f784,,True,True,Tests_passed,4e41691763649629f374a62af1412666df1a6255fccdcdc44d73f98c82dc74e1,True,50,103,1852,4,True,Tests_passed,f5df258ffb7207cf731fdafb93675b62bcc7601bd3f5da9051bba37f37784130,True,50,True,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,22243ee00dca01dda8337b1f988cc40435d63a4c06cc5ad9a49ab82037b8dc37,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6dca7c0f41be616b80403179230b371dcb790262dad5a6004d617eddb9007143,Merge_failed,30f1d33b7f3de209d5e8abbae5a3c970d13654070eff3587fd10f47aa422704b,Merge_failed,23f9adc346fe1a0769f6c88c097e4836d4390c8b3836e4d65b6e05741a727796,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,7977690ebd5b042d236e43be39e34b866321121c3af6400990f587c6f0d9cd4e,Merge_failed,848305acd4c5249d542ca829e5a226bc2540f4ecf22e0fa52a18059d9f79d57d,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,5f6798f9a5618aa378f2b9e04b504432f9b9e62e7c2fc8e8cf83ca7ebade505e,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4,Merge_failed,6520ba0ede706b7239681806deae52b18799dcead17d0e97af95083dc94166b4 8,refs/heads/develop,6184333a9bab436893e9d501b6cdba86b0c4b0c8,08ee99018d9269125e8d30382462c49b5966e516,735c05c6868a3d66f47b4df6fba5b6ff55050ad7,,True,True,Tests_passed,032b520742e378c3eb65f8f15373b743be99de30c12f47944213d4942bb90fd7,True,15,27,920,43,True,Tests_passed,a9b9a234327abc3026092a0c25abbc1bd4b994feca7eb437ee6fa729fe5c4726,True,53,True,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,ed12be1f136e227fcba3179df2def03b2b357be6f06978cff176f50da6e57c56,Merge_failed,7bb52ad5ed6f46a0768e8a340ff3c0d48ab91de8599f0edf9365435f1e8f6741,Merge_failed,6a51bf11e0642c77a569ee2b97b0db9ff03b57287e12f028ba2a0466bc2e4b56,Tests_failed,5b6aecde65ff5410d59b3816042c7c7ea804adb1549313fdc3d4ae1c2238b8a1,Merge_failed,7bb52ad5ed6f46a0768e8a340ff3c0d48ab91de8599f0edf9365435f1e8f6741,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,ecb502e464e4bfe48892ad4fe7c9a3c77df5540012cf30823c388217f70ab5c4,Merge_failed,6a51bf11e0642c77a569ee2b97b0db9ff03b57287e12f028ba2a0466bc2e4b56,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a,Merge_failed,96a049d16a7b0f222ed841331ef066c0e48ac1b1e539d09d743760e783623b4a 48,refs/remotes/origin/pull/222,e87c0a43d2a289df3bcc87b2530487bfc9953a26,605490c47760c1a87c180a1794e9343351174022,735c05c6868a3d66f47b4df6fba5b6ff55050ad7,,True,True,Tests_passed,9e17cb536367852e21b8fb3685cc6e402da5fcb16a26fad08c36fe646007fe40,True,60,134,1830,5,True,Tests_passed,a9b9a234327abc3026092a0c25abbc1bd4b994feca7eb437ee6fa729fe5c4726,True,60,True,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,257ce6af90580975d79b267ca28d3afcc96fa08e107d57d3d9b17bc744a3cfe8,Merge_failed,a8007fe08d0e91f267cf63d999c488985a3615b280fe99b996e3a6fc6004cd48,Merge_failed,ad87fe17313b2a54531d85229298c048b43712ec693059d897188104c1b4c061,Merge_failed,92d6c6a722bcedc198facf75d623942ba08515a6691212d13fc180fd682df3d0,Merge_failed,a8007fe08d0e91f267cf63d999c488985a3615b280fe99b996e3a6fc6004cd48,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,75b84c94d2812314ba83e9e71f0eb1ec56b5f646c13a12d831c55ace5ebcb1b4,Merge_failed,ad87fe17313b2a54531d85229298c048b43712ec693059d897188104c1b4c061,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,9b03560309740ef4f6c81d1b22a1acd7e9907ef173d31b3e76f41c4fd9433d29,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8,Merge_failed,45ef5b979f35a059ae8f72482c0592aac382b45e0c0718e69ffeb8ddad43a1c8 diff --git a/results/reaper/merges_tested/frankbille/scoreboard.csv b/results/reaper/merges_tested/frankbille/scoreboard.csv index c08e74bf80..ba5069baa5 100644 --- a/results/reaper/merges_tested/frankbille/scoreboard.csv +++ b/results/reaper/merges_tested/frankbille/scoreboard.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,e33b43a29231d1fbf2ebf0be8661de9de8482a77,cb6bd0992da7d98546caae3fb7587f0670348c41,c4feef892a21c76d26d8da136804a0d88a30948b,,True,True,True,190,232,3683,7,True,190,Tests_passed,ffaf9868364327ac5d8b8d0f71b084c30d0e492b0c42b0ce56a53a5aff1ee1a3,True,Tests_passed,99f160235372631dbdfa95e84fd57b631bc31fc07eadf9c39106873234433098,True,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,25f8bf37f599dfc3a7105707adf00a83e1ba5fdfb228cfaaf853a29298e79006,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,a7fd4a0a657101f3be65f82524c269256e32e8b119f84ac70bf29f63fbab4b79,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,a7fd4a0a657101f3be65f82524c269256e32e8b119f84ac70bf29f63fbab4b79,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,25f8bf37f599dfc3a7105707adf00a83e1ba5fdfb228cfaaf853a29298e79006,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133,Tests_passed,5f9b55bb687510a231a24bccd6aeb355f79f8e28c8e3154b9ac9ac56ade49133 21,refs/heads/master,579ea54251bad446fdac546dc20fa813a3525b46,6c9298023a14f62bd50384b4fdc49213749a315e,5b07cabc7b31fa27c7e862f86e7226a91117d4d4,,True,True,True,21,58,530,4,True,21,Tests_passed,bda8a39b930cf2440a92798e14de49522715efb16cc182a83b00107c88fd7631,True,Tests_passed,7bd91f92b03e3a34b367b9555fd2b2db9eb8841e0067703386f1f7215561209d,True,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,15701243fe47888c0094f83d53076858acbebeca79a8cb9a85563822452ba52a,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,69e8ee0532fe611dcdbcc03a168da87e62449ab8225674b2d0aa2fba84a35d74,Merge_failed,5888d1c2d1ce500a43d3d717a054e0096332a06eac7d62760b240867cdae3563,Merge_failed,13dbc39a6d5658ea0083399ab68a1b310a8a99cd25ef42a696dfdb39bd9a7fd3,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,27ce3628e99c90b91b5381c784f6fb6dee6f2555aa0ef85d1ce83fe4e6772a31,Merge_failed,7b7b379fe65284ee969e3715c020347d0c546e22922cd49c73531f70f0abca41,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,3a06e35a762982f4abf4674d321dcd728732da4329ea14697024203ab15bf773,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf,Merge_failed,f62cbc727b16f04fcc783a45f5e2155c4ffbe2010101313ca4f8089b5f61dacf 27,refs/heads/master,890ecd0bdb07d80650ee9df19efd535085970431,bd29f82198c11fa6e8b42486d36e7c3e476bfe64,abe84a82f4ddf9e7b532becdad70072fb0b464c9,,True,True,True,59,106,3790,2,True,59,Tests_passed,8e394f1854cde6b05527bd81d4718b96bd1337b284e7c043d71e89a2026c6f32,True,Tests_passed,86f9f543ee41aba1e304e739b274d01872f5639f0d5045175dc85edca24bad5c,True,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,6360e019af5e546807436b5cec23510bc5ca2301eb76a822142174ab291a1214,Merge_failed,f88ebbecdfb29e5400d80b6c3346909cfd4649bc59f5b69d1357b85095fc3d6a,Tests_failed,6b1bd19bd3a944d68e5e5f61b923924b5b9b15f29ebe25ab64606ff0354a7beb,Tests_failed,09a7695c21a9dc279cc8a933daa3a6bd1215ce11642c520013c377a9cc0383d7,Merge_failed,f88ebbecdfb29e5400d80b6c3346909cfd4649bc59f5b69d1357b85095fc3d6a,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,ff5a3f4c10d2a8655216dada8c0585eeb866738dca0e56b68250d7837775fc0a,Tests_failed,6b1bd19bd3a944d68e5e5f61b923924b5b9b15f29ebe25ab64606ff0354a7beb,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570,Merge_failed,f2793cafb0860f0f17264649680a867a0c60bda0ec0c7a5501b0cb27276f6570 diff --git a/results/reaper/merges_tested/freehep/freehep-vectorgraphics.csv b/results/reaper/merges_tested/freehep/freehep-vectorgraphics.csv index 4f20772ec8..b77c1fdfad 100644 --- a/results/reaper/merges_tested/freehep/freehep-vectorgraphics.csv +++ b/results/reaper/merges_tested/freehep/freehep-vectorgraphics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/50,5477c71d3adde8d7029035133d94c44e32eb9083,0c94a082a4516d72c89cf6a860096325f391ee13,176d281f6570afa2f72f50b692bcecd63edfc140,,True,False,True,4,15,97.0,2,True,4,Tests_passed,d83d176ae5862505c73da986a5bd6bc2b8003e0e16666832ac550998607c6899,True,Tests_passed,fccd14e100c3f44856fdc57b1b82e3d5204b6a404264f35733c3ac57369732ec,True,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,5119dd46dbff4b4503af306a540d71c19aeabbb4484ffbe43c8a7d2f68d035b9,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,9262832b8f77468e4b1253d3e4f81a453a639fca972d5310c2ee179819c665ee,Merge_failed,77ad29153a41456a23f6b60fcd142a9379e7ccbf6c71541bf6715f7de1268811,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,bf418f05b300ca1c15bb25229372ac235aebe34b0c369e9884f7e0b15a29f967,Merge_failed,97c9ca2e54923820f678069fb3c6283539af10db989df0671060ba40e3a2c487,Merge_failed,0089de0f2f4a355f19224875032005e040a2108947f900cf4f1c36efa53cb2f0,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1,Merge_failed,f64d5ce02be3fec6d52b19596e5f3db0488a90f956bdc9d4b052333b142097a1 diff --git a/results/reaper/merges_tested/frizbog/gedcom4j.csv b/results/reaper/merges_tested/frizbog/gedcom4j.csv index 66246f518a..11ab00548c 100644 --- a/results/reaper/merges_tested/frizbog/gedcom4j.csv +++ b/results/reaper/merges_tested/frizbog/gedcom4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,dd044dc5d9b0969c4e6b6be853d35c02c10df487,04d73516cb7c31f070d2dd51ebb6333a96d5b6fa,c1542505ba6dec5d30768eee726256c54fb9e5ad,,True,True,True,380,2682,36167,13,True,386,Tests_passed,48db079634314b266fc84ad28103e88c76c7d893ac415fea28ea35343a5a8237,True,Tests_passed,b756e1a78c5cbda01016d20f8b5f633a929ef3760159b2ab690fdb43af936337,True,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,380b4e1e6034b2a59dd48de32eedbe90b4257370957b84eabe36c8d259462634,Merge_failed,32e04593f649b0d5cc006990f96f1333328127ee80d96a7f6afe4596f5ea9b48,Merge_failed,69e79c544da4f6ada05dbca3e304661e3cb9abcdc317c7b05804e36d2e2264bc,Merge_failed,69e79c544da4f6ada05dbca3e304661e3cb9abcdc317c7b05804e36d2e2264bc,Merge_failed,32e04593f649b0d5cc006990f96f1333328127ee80d96a7f6afe4596f5ea9b48,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,8302a34eccbbc5f83d94f3c6bdadefd6893b556fd7bba20d443d1ab1ec4364b4,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7,Merge_failed,315cce524ee100fd388f0a2087af71c7ff51cd635fe1e98f161d8bd0292ad0c7 12,refs/heads/master,11c8b3f6955f298ade7583d2fa0d000b282e597f,cc87e520a8fb31791ef6f69c87ee6aba8247ccbd,7c93589357fcbf3c1e8dbfb7fd6ffc0158e94c04,,True,True,True,293,2906,38766,6,True,296,Tests_passed,c0289db9626674ba122dc0f9c353412e50329ef520fd84ea9f400c3a0b7dfbfc,True,Tests_passed,c08160c1250a318b3a848595a32f8b0c4fdd8309513fc7c40d815013d7ff920b,True,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,cb79a7cad84c59f537e0d35013388697fefccba1d6dd72a21178f119060c9139,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Tests_failed,22efdfa9c05eaeb1fb34d77cd8ec69021b7ff4e09ec1fcd7e98f33a6db0c3225,Merge_failed,fc72976aee0f79352064497b36e207a9b2d4d14b8b7cf658c106c2b2e150fbcd,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,cab25af86c67ee1357fb7b12ac4a7c829ce1ecf873450691dbbedfb3dbad3ad4,Merge_failed,1c4f4ab86d0f257e28ba874b8ac0a7697503649a0dbbb6a9617477e52bfa53ff,Merge_failed,b34f668a9c67946bdc69a473afc6005354381713db9e477ec056c740b331f22e,Merge_failed,2a198a2b9b1b1b979ff7f4fb9b647a543e1789306140baf44638383df1271802,Merge_failed,063fb33c54a4502f94b3f4fa3ba5739594e27458228258fb9f00448c4912b897,Merge_failed,e48cf208626f32e763f2f4f3c8323ccfc87a22069b07d8179935790085967304,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4c39952833b22561bdebb16c932ec58d2fecb4af4c0c31c84c9fcfaf0a4f2303,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3,Merge_failed,4f8a40041bd6bf5e5816933e78102c08e1daf652510797635973606530bc44b3 15,refs/heads/master,9a01e3a39a34ee91718fc14ac5a9136a06bf8795,162c2313a948f4bdff04629e031e59bce8b79a8c,1f96d69b7438337c6f9eb54dcb2ad24296e54e73,,True,True,True,19,39,370,2,True,19,Tests_passed,9722a6e19319f1211cb3efdf92392d45aa1a1ff4f2f969118b385a468a008ce0,True,Tests_passed,872b12da90e7acc2df6f11500cdaaf734c934f7674a020e1b3d7721f3d412b4b,True,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,56de9e3a3c674ad2fdf832f793e3d2332b4ca6cb453dd2ff80cbb72fc72c5db1,Tests_failed,44a48106c25bf9909a1d58f6ea090bda7b1a20b615cbb7d11a2082a26cce4d5d,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,56de9e3a3c674ad2fdf832f793e3d2332b4ca6cb453dd2ff80cbb72fc72c5db1,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd,Tests_passed,8183a91d69497df6475d5231fa6af4ff53c57b4b176dd6855048441bd79a7ebd diff --git a/results/reaper/merges_tested/fusesource/hawtjni.csv b/results/reaper/merges_tested/fusesource/hawtjni.csv index beaab1e8d4..5e42509d99 100644 --- a/results/reaper/merges_tested/fusesource/hawtjni.csv +++ b/results/reaper/merges_tested/fusesource/hawtjni.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,8678713caf00652f4f7d52e36b8b384cf611dde5,d145a1dea37bbd8f98c9f1e6f21d756f849d7979,2c64ed4134de9b3cefd9423382a59f60c8f3ad25,,True,True,True,15,70,1139,2,True,15,Tests_passed,d1466a3d12f3064c8dd90f83120c547f0dc7aff845d8f8cbc2663e64511dbd8b,True,Tests_passed,b6fb7066bb00778949dff10fb3844eb8efd49a0bae9a4e6d3607d2a1044d0f81,True,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_failed,ce547a0cb8364caf47f370f7c636cf1195ed536e12ecb136d365ef25f3fec943,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,0e1a9ce8ab7dbb355f7430d68e460f30f48cd41c5ba59f202919df2cd059a2d4,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830,Tests_passed,1f8bd58c8e23a0fd93f49003a6f01e33238142077e089f65325896e3172be830 4,refs/heads/master,906aa158c24d3603aca6f3766b7fa0da306d23d6,c5130eb900279531f67d4734ccf1ad2f2ad95a70,9d38df2f4a25ee55fbb0dc921fb2004b33c59541,,True,True,True,13,61,326,2,True,13,Tests_passed,2a9987b7df1476825e0d322905a5b3bffd4d134677aafeca0a2e9f6f07333b66,True,Tests_passed,8120b6e8cc58b54032e7b4441c7c39a303b879e17bb4ad17e2ab85aef6c7bc4a,True,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,6b20a2096e549989a1fb11aa820f1150d52f18556af46b7fe222bc17a2097fe5,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,6b20a2096e549989a1fb11aa820f1150d52f18556af46b7fe222bc17a2097fe5,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438,Tests_passed,c4a2e637084f70113f8c04150a6353e68a7a82bcf8a7db3b28de5495fdd42438 5,refs/heads/master,9d38df2f4a25ee55fbb0dc921fb2004b33c59541,1c42406ec55ed1955d2fc573e3002e5fa557c984,8f464d07bc9a807acf33f0f2e355065471f15235,,True,True,True,18,81,515,5,True,18,Tests_passed,8e3c79b32f7de971a09ab76d918c6833500772705c09a13affa9b631b80dd0a5,True,Tests_passed,e0cd29b3ffcdb8bcafbdc84880176716886f5c63d4d559fd8a6895b9c53655ca,True,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,98165938821cdc194c73ff5c86dc29ce2917e4cf878f2b9cd86881d74c3d2c24,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,bbf578954b2f1aeb7e85eeb7237d50e306cb1f497bf5a3d3e6d9d53ac4f1fd4d,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,12aadd5871f2cd411695d090819f703d5c5314210410d77a1257a9e2574a28d3,Merge_failed,7a9f24769acd48e3e5f161fae1a24c0f360fb00fac86ac0db2baa0ac98a33f45,Merge_failed,cfb903330042996b3b5b886f2c280f9dbfd782277be0baa73207d833a0d97e00,Tests_failed,aa9f21f6b4c3ba1f9fa64ab69a6085b36f889cd013ca3c45aa897b5328eb2e88,Merge_failed,7a9f24769acd48e3e5f161fae1a24c0f360fb00fac86ac0db2baa0ac98a33f45,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,bbf578954b2f1aeb7e85eeb7237d50e306cb1f497bf5a3d3e6d9d53ac4f1fd4d,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,3eee1b6a93f87eb88b3f778a3258fcbaed58ff687163765a490017f52241ddac,Merge_failed,cfb903330042996b3b5b886f2c280f9dbfd782277be0baa73207d833a0d97e00,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,98165938821cdc194c73ff5c86dc29ce2917e4cf878f2b9cd86881d74c3d2c24,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9,Merge_failed,4595cc6a40f21dbb29b8b4b8395065f85d58b58d276958dd3f4a4a90b3558bb9 diff --git a/results/reaper/merges_tested/fusesource/jansi-native.csv b/results/reaper/merges_tested/fusesource/jansi-native.csv index d2f5fdb66b..2cd192556c 100644 --- a/results/reaper/merges_tested/fusesource/jansi-native.csv +++ b/results/reaper/merges_tested/fusesource/jansi-native.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7b45d3462ff7a1b20bd1b0f281c9e23277b852e4,5f76e86c28c80eb8b03e1713e9eb0ea3099b965d,216892efe74cea133993c5afabc154b576357412,,True,False,True,5,7,48,2,True,5,Tests_passed,a8aec9a53e59265118e01bcc03d6461f39e00d7cfac69a6eda96a64cf7576c9d,True,Tests_passed,e73edec4426c6bece1f9f127aee911dad6f683a40083320d74c05448742568a1,True,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,9e45d4aa63afe3c14a8eaa210c9d8a4d6d58044c7b5880f9cf7d3062d49f7d7a,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,9e45d4aa63afe3c14a8eaa210c9d8a4d6d58044c7b5880f9cf7d3062d49f7d7a,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865,Tests_passed,3299f4246a05cc18401b200e2e42b84d40b10a0e0042c89bc03257fc74caa865 6,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,True,14,41,2080,2,True,14,Tests_passed,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,True,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,True,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,bcd03031a2f084a5e33a73be1d2d1f520d72df44aa9f3c1d485d042b76287df8,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Tests_failed,f82a6f26707e51ee65e5f267e9bfd72aa34c192d7af752a580c4c8ac4f7a39b1,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,57e270ad851e7142b3e5ed234ead3ede78785e0269153ca0b1e9a9b5aa914405,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652 diff --git a/results/reaper/merges_tested/fusesource/jansi.csv b/results/reaper/merges_tested/fusesource/jansi.csv index 6a292c6449..09acd9956f 100644 --- a/results/reaper/merges_tested/fusesource/jansi.csv +++ b/results/reaper/merges_tested/fusesource/jansi.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,769ebe03655169b2eb380600912a55ac88b13efb,3ce698726b353dd06acaa76777c6c2451415b850,f33497c0117b556e39fe806581e717292e6862ef,,True,True,True,10,45,369,2,True,10,Tests_passed,eb53ff36ade260ad3f7acf3dc544dc05825940bc27ae944c64c042528a4aaef2,True,Tests_passed,c2b438d44c637de6fb7b3a0b6c0613047999314b77dc417abe36c0a576b8ab2c,True,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9914333f66fe419702cb8a0e63bcd00acc1f605e6cf2aa4121f3a3d6f8933156,Tests_failed,f35e4eff1fedec62bb65bc046bf473df00b228332c0e00437c28b248e7e74873,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9914333f66fe419702cb8a0e63bcd00acc1f605e6cf2aa4121f3a3d6f8933156,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d,Tests_passed,9234574291831c67d3230e4c38b36fbc8472643a768d01b4f046ea625de62e1d 21,refs/heads/master,eeda18cb05122abe48b284dca969e2c060a0c009,b84df55b6c6a0688cf8ad790d4a3ac952ea6b9d0,5a3a670c911e4491195b6d162d456dead1497824,,True,True,True,9,24,127,2,True,9,Tests_passed,7f122577588d32b76e3e566b52d4fc21d998de86bdf889f9a50d85f9a2cbc729,True,Tests_passed,c12ff958e6fd5092a2a7a12d26ba20de99771366aac098b4ff19173d624180a5,True,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,ac29640fb1e96782ca82c247d990e9ba922f931dd231c4c3b6c4b2d93867c583,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,7949e6f43118ab6e7d6816e1017348a0cff042325a3f21b7a92ad8be333944da,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb,Tests_passed,c71fecd7cf3ff1f8352f39ef1f24abc355a3bb7994c6cb2b23ace37f5586fdbb 46,refs/heads/master,f4065227fc55a377db6a889b3fe73daceba5baa9,bb86e0e79bec850167ddfd8c4a86fb9ffef704e5,5a81868efd1b58f1876dda0da0358433097a8c0e,,True,True,True,14,41,2080,2,True,14,Tests_passed,8723aa7b2c29e02d4a834748bb52e52b61f3a85889e0dfa7bcdfde8d00cf7c21,True,Tests_passed,387fb40b0909b6e721da03e1dbaf2819aa827adb252286c7aefdc30f682cf4ed,True,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,bcd03031a2f084a5e33a73be1d2d1f520d72df44aa9f3c1d485d042b76287df8,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Tests_failed,f82a6f26707e51ee65e5f267e9bfd72aa34c192d7af752a580c4c8ac4f7a39b1,Merge_failed,2f8c30ec7c96fa58aae0ee8a2e9aebbabc99953043a47fa056a3863a531bd1cb,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,180c166c7c15b4aaf3182b49d9c8553c98e36d220078758c261b91642fa06dd5,Tests_passed,1b466d00847be2edd832754e862e7ac0c6f868f3fd615d25d571b2bfcce295ee,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Tests_passed,60eaaa0352e1cf4cf2bca68bbd0f467dd86c0e6376548b234f5904cacb9c77b3,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652,Merge_failed,2496c2ff5f27ef0bf2222da27ddcfc18b4e2a49a1d880c7b48a1599d40f61652 diff --git a/results/reaper/merges_tested/galenframework/galen.csv b/results/reaper/merges_tested/galenframework/galen.csv index 50c59044de..ce8e35703d 100644 --- a/results/reaper/merges_tested/galenframework/galen.csv +++ b/results/reaper/merges_tested/galenframework/galen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9f0a13079558fe495b6ea2a9b7f46e818639b4e1,807a06e637a1abf53be4575182fce01811c045e4,bf409f4ff5aa1ad3a51195230112967f38a5a5b3,,True,True,True,527,1096,33791,3,True,527,Tests_passed,0a7c40482c731031373bba526988e79a8c19193592fbeadfd4f83d0d41daae32,True,Tests_passed,195d52203e15eb03a676063ed8305852d13f390a953ac5053fabf21a8b3ffe8b,True,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,3e6621f855de6efcbbdcab621c81d847e88b8a050c5dc7e57ae575f0d2f4c3b1,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3,Tests_passed,8eb1286c41d9821d1ba77835ec303ef82b483c4833e593853ad5446e78bcafa3 2,refs/heads/master,fc7692383bdfad5d1c7cc7239be1060df5eec466,df924fc4c603b447cc8ff8e52e499557ae7f414e,05399c5c34f4e19190c6c8ce7f508d81324caf88,,True,True,True,514,999,26455,4,True,514,Tests_passed,8bc400d3901b9f6402041e8bb6c9e2e7216ac9b7d5456371d395f839adb50037,True,Tests_passed,f12d5357d22170a884813159cb3e86b7dc11e27f9a45b6e06ff5a0c56cdbdf99,True,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,8eaf0da6c848fffb7f4073cf3ca9096d9c2584c9ee9689bb7087ad34ac9c7c6c,Tests_failed,e8217d3ecd957a2d5a515a332f5f731fa34681a52f950a84a319bfd3d5b9defb,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,8eaf0da6c848fffb7f4073cf3ca9096d9c2584c9ee9689bb7087ad34ac9c7c6c,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,86a969ac0a05cf8a3b7fbde64324b05836dbc2b6402134b4a637a31d867f6de6,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd,Tests_passed,5d5b64276dc7aba8abac36a107d4ebf9af038bdec84e6de29e6a46708a999bdd 10,refs/heads/master,a1f212b188bb97b3692edf01df89bb56b62e907b,ddbda5269b86ee322fa22caca856fc24fc6e6b68,8bf7914f5baa69adbb1a10c5b19637987b9b6b6f,,True,True,True,63,107,3169,2,True,63,Tests_passed,31cf23a2574cb0ca476cba61bece8f1edf261ddf088686395e83d2aa8c676b50,True,Tests_passed,59adf33ccf8b1e89f521c312fca0587f79ed6b631d61afb53b481f5578d0fd75,True,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,3557d358d11dfeecc7140c08830896d7c3e5ac0ce9489ca8316da29b5947d384,Tests_failed,43f57e6cb63a5cd2d6a1f366ff3788e351ae76d0705140ce8c4c7460a0e43b3c,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,3557d358d11dfeecc7140c08830896d7c3e5ac0ce9489ca8316da29b5947d384,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9,Tests_passed,55b754a4283bdeb99024dc4e0e1526ca85c833f525f75ffe59727d6d6bece6f9 diff --git a/results/reaper/merges_tested/garbagemule/mobarena.csv b/results/reaper/merges_tested/garbagemule/mobarena.csv index ccb5e22b88..d42950a294 100644 --- a/results/reaper/merges_tested/garbagemule/mobarena.csv +++ b/results/reaper/merges_tested/garbagemule/mobarena.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 44,refs/remotes/origin/1.8,b34dc0d5acb744a0b1d9c997f986a9ffce06ac3d,cd7aa71f5709f0a36d381307379ebbca4dd6434a,b08c74afbd996e0af858ef8bcbf45e53d1c6cba8,,True,True,True,143,453,7800.0,3,True,143,Tests_passed,dc98c2ebb01b5dc31e61d4df14c3e59d7590dfbf3c46f89aed42e8da73feb60f,True,Tests_passed,df1af5298f136e6e242ff37f0cfd4f3090f4dbc6c9cb7a9f0e1b7fef9cd352cb,True,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,3c2f5016e4165bc9df55829658e2e8e89fae1e45313afa1ff8f1a6f610b28562,Tests_failed,c955db5546369e17a8fae94a6f5cb62b064137befd542cc979d080fc97cc563a,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,3c2f5016e4165bc9df55829658e2e8e89fae1e45313afa1ff8f1a6f610b28562,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f,Tests_failed,f572f27202b6f418e871229de88cae616be41454ba2d91a26f135b5969080f1f 77,refs/remotes/origin/pull/693,c0c07ed2230ad53326afe6a227c61ef7275a9cd9,5c8c1939640d29a1aff926a01d07ed59746d320f,6be130daf1af0f3fd0f9842177cc3ceac12f0fa5,,True,True,True,6,16,48.0,2,True,6,Tests_passed,6d6e5550abe40a46bd748cf20f4082f0f661eebb7edd7bcf872334bc77f55774,True,Tests_passed,bcb0a8938973b55d69531353df104c3a6f9716e3ff4431e5f37085ca9acf2719,True,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,31360513ad0b59eda1476cb95bd847df1d58553b11fa3398a84724adeedbd64c,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,d5af3729a299a3733aede7d597a283c465f703361504fbd0180682df8486da79,Merge_failed,390f0c01f644f750bcf4cccaf06e4fae66c8a459bcaa8883b041e7e07e674c94,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,ad7bb65904f04e2eedd3bf5081f9d246a8241dfe1f44ad2475d0bb01280fe7d9,Merge_failed,27c32adaf7b3bb94e56938ae4efa7a8aecb46a9e740061fe24e14929d962c6e0,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c,Merge_failed,479755893492d30516343a445606831d511e05850202f00d47e3a73a6760a05c 79,refs/remotes/origin/pull/714,bad2700bdab561919b585cad9810fde8e939bbfc,bbed0c5ab1e6b0bf2c2a299b19fdeb244463a072,ec644df05bde1a877d5fc55757966105d6ecd355,,True,True,True,12,54,183.0,4,True,12,Tests_passed,c1b4cd88c9e28783794fe639c42be0d2be6c1ac9d8e2f74c466d969cc1c79ac6,True,Tests_passed,2360db5f65edc9a20e0bc0f5e07dcef258a34a471bb4f1e77993e4752a132383,True,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,86808f774e5a9378c11cde3f88aa4bb965d99763a1c1cdcd556cc24bb576fa59,Merge_failed,d6119d98486db4ff12a6472a1bc5576fa8b49a07e5e3610b19b89bea5a40abe3,Merge_failed,8c45cb4436bfc7a9036ea5e796d13cb452cf371bfc4413caeb858d582eca645c,Merge_failed,e4ff858d120d5e4793dcb4f22990cedb53a2ba01ee6bcbe9228168d65804b102,Merge_failed,d6119d98486db4ff12a6472a1bc5576fa8b49a07e5e3610b19b89bea5a40abe3,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,66206dd6906ea9b09488e0ffe336b81223dac4dea0858aeae1995121b93fd787,Merge_failed,dc566fce3fece3d4606cef4aebb12cb4a44d426a8ef3747b04cbf7bd41838506,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,6035fa070814afaa1853f6a6e4fc1f5ad5e59422f22c3c2167bd76126c2acfa2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2,Merge_failed,80b915b82eb1b5bc71854fb692b17f2472b5e38a39f4a9e16d6838c1ebaff4f2 diff --git a/results/reaper/merges_tested/gatein/gatein-api-java.csv b/results/reaper/merges_tested/gatein/gatein-api-java.csv index 58ec71f5ca..07a35e0b42 100644 --- a/results/reaper/merges_tested/gatein/gatein-api-java.csv +++ b/results/reaper/merges_tested/gatein/gatein-api-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,1ae0553ab8dd0574e86a2b073e35f3a0331ada3c,8693b9e5c6ab2b2f04acc311a0bfa37ad157c391,dc25033b5792eb3b2692252bedb363bafb2a6ad3,,True,True,Tests_passed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,True,60,114,7232,8,True,Tests_passed,6312f583ebbaa3f8b7089e2ab24f513bb713c54a8f32df638ce77c6aa0b3fa68,True,63,True,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,40c6f8a01d5f775e60fdcb0c3059bb9d51a5f28d7348bf21a39227f1880ac561,Merge_failed,3637776fb81c90d198db373adddbd7247abd403fe7f5b0c5931f5642b5c9c207,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,f4b28598fdd7f78c85dc0b53ef453dfd81ab80f190c28beed620967f0231431f,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,fc0e0c4d1c4a3483c0561cad3c473bc11021a65873742b8be360ae8bd419c7dd,Merge_failed,ddbf41505967fe1ba2b8d74b0dc4811e3d64955d8dec5e1bb1d76a886210a5e7,Merge_failed,5c6a4cb502477986ed12c0df6c951f5429d27bf2535b06ba444bbc967322fef6,Merge_failed,cbae781406296177def2e9dc1a729e6d4e3ebd99d1c30230a06ed107950d706b,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083,Merge_failed,6fe695dd5a72091da21dfe9f3293fd7921f35127384a79246b5fe8e91740a083 diff --git a/results/reaper/merges_tested/gbif/name-parser.csv b/results/reaper/merges_tested/gbif/name-parser.csv index de2d731596..6493fd277a 100644 --- a/results/reaper/merges_tested/gbif/name-parser.csv +++ b/results/reaper/merges_tested/gbif/name-parser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,3c1d815c087b4201c84f5bae97c9760487776e06,4213386167ea41f8e4b31a116b56c6b868341217,c03e7b1b10faf892ecb30d6022dd671b4b994f5d,,True,True,True,12,14,73,13,True,15,Tests_passed,75ef1e0f8caad0b8daf6b1e6d4d538dcd89f6ed7f0086603fbb623e947dbf978,True,Tests_passed,adc5a433af359ddc5ba1eed1784bddfe805e1c57c80f652e9cb5975bc50a180b,True,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,7fc3903196138c8f1169ae97e733808c1959f1c9077d929ac746aa3f2ab9b4b4,Merge_failed,66af3e919dac573336dd2eede3de3f19aff8f16d4181d0c05c1e1706cafc764e,Merge_failed,6d32e44f61101c328e60477189e9a2197b42bb364a8f10fb312ad933fcf13468,Merge_failed,5cacd9f9297d950fb3eb5e093cec36235b43f4158ef7d9199be4233d2ac8c0e4,Merge_failed,66af3e919dac573336dd2eede3de3f19aff8f16d4181d0c05c1e1706cafc764e,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,7e11e8a7b18b4e787bf68249d8287d85b71cb84180f2915ab1c570ef013f3821,Merge_failed,57a49352be629c8b031fae767f851536d7a0bb3fdb49eee851690e5e73b7b0d0,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,97bc7a90f9d9a61d8f49060183faa3b7a091293e0be6fc9e3974c78b4624c033,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387,Merge_failed,8c61579a2d4214e69f923e7ad80c9c08c900509a529a0879e5b9829886b66387 4,refs/heads/master,d8417e10fb442f6cf0342569ee1de8cc5257facd,79712709a91e47093fde22401fcfb87290790597,b42bacaf155d146e60825185902d264d5981afa4,,True,True,True,19,58,2802,3,True,19,Tests_passed,8807934239dfe00ccc91427e0eceb97c944420517562c1fc306ef1969a00ff67,True,Tests_passed,b0a1ae7e75622b7ddbf87f39c53d8ebe7a7baaa893bd1e117e10d0bc0a712c86,True,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_failed,5c5c5c1885a6cf535863fc7ce18eb9abdd6190b72a56dce3206c02752ca61582,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,7797ce3b4c4d8529e8890eee8f02b6273a6c954d9298f2656e91564dfdd64ae9,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681,Tests_passed,4719f704c990f42cfaa5c6fd4da308ec8e9d6178c0d2a9c3024a925cacf18681 diff --git a/results/reaper/merges_tested/geisbruch/hadoopcryptocompressor.csv b/results/reaper/merges_tested/geisbruch/hadoopcryptocompressor.csv index 8a267c4e0c..8c6de89b01 100644 --- a/results/reaper/merges_tested/geisbruch/hadoopcryptocompressor.csv +++ b/results/reaper/merges_tested/geisbruch/hadoopcryptocompressor.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,fd94be7cfc23758491ddcbf03b92de026f2d7647,a7b200a263560412b9c08d113781e98511fb4923,00fedf4f5ab1e7a3b82dae331e279dbb0ee83c82,,True,True,True,11,62,1207,5,True,12,Tests_passed,762eda49ab01ba756106731bfdb94dfc6b68170400e872a221b8e366814ca8d7,True,Tests_passed,3a5f70430f6227b6ae7bc15ff16665f2f7d701c96e37b8fce50c5c6f62f0f12f,True,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,4648693aa675469e5046fa33f61b4423b08b4f2f4c3aaf553be3e5c0556485c7,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,484239bd1efbe04612fb3bd46e2f50dbacd1d525d136b20cd5bbace47f5aa1a4,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,827af8618e7dd7ecf7cf6c7506c56ec4caa3a137057b2e2e03cab83cf8eab4f8,Merge_failed,5a9eb66e9907691cb1e9c7dbbff07e6896707faf574c7379ee8abff1ef583af4,Merge_failed,87debe1a4ca71416e1e91ca90ec6b08268fad99c2f42a8cc5d4fd82e6b3ac9a1,Merge_failed,fa9b21bcb5bfd48f5e43bb3985488db5253528f21f334139cca9e952d8d35926,Merge_failed,7abbbc28e2fb0371dd2f5172dc8e014b588fb83b6c1fec8801928633d5a8602f,Merge_failed,87debe1a4ca71416e1e91ca90ec6b08268fad99c2f42a8cc5d4fd82e6b3ac9a1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,484239bd1efbe04612fb3bd46e2f50dbacd1d525d136b20cd5bbace47f5aa1a4,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,fd316521727e8fdc2cf77b31cdf8ae9e8a817841cff30194361fcd9a634f4650,Merge_failed,827af8618e7dd7ecf7cf6c7506c56ec4caa3a137057b2e2e03cab83cf8eab4f8,Merge_failed,8d4ac47d02bfbdbe3b6d7f33a79ee14c55427f8d873b7fb77ed3cc8b5e27b488,Merge_failed,4d52b7b9f0e43468b44f9625bd576d955b11695948da2ee800a881edf055d3d4,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,4648693aa675469e5046fa33f61b4423b08b4f2f4c3aaf553be3e5c0556485c7,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1,Merge_failed,242a001a0695e3270063aaf774c7fa0f2a2f9fc95101dbddd8f1495f78bb11f1 4,refs/heads/master,f98ce134b844a7864b43803c6e7ffc3f1b7d4e5c,9ca8d7782c731dda67fef1419c27b82e7e80617b,72132711af2ae9fbd4426f72c37afab61afa92a6,,True,True,True,16,52,863,16,True,27,Tests_passed,74efbe59af6439cd5139bbbee8aec9360084924944dd2737dd2e3a5c7a4c124b,True,Tests_passed,cfcdea3830c463505a71359096886b29a5f6aa119e1038e81291733961ffbf5d,True,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,bcd0042e77d9366f9b487ed4dfeffca59eb795f2168c464ee9c82f6d422e3f13,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,d7f22c7864302d4e697f8d933ec7b402b331d2ef3c9c351cf8a28d710ab2807b,Merge_failed,964bc66528ebb89c190d5a76fb277807adddda6a105d5a7e737231be90196450,Merge_failed,13354156c6140888b049cd87796c1c7005c650329f3d0bf9c398b1458e45fcda,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,c6f76e030138146b45af9fd67763c9e5a9e75def198fe07412426e3558c627b0,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,274351c39d97c01a77168e57ed819dee72ba919148505e7e9ab82d2584ac9665,Merge_failed,517bcdbd3d68dd185d8a89982f625b3a443c00ab10220cbcd2e443155c2a6028,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,1a3edbe8a2f5793278ee40afa125fa936b5c22617de0690a201a943135050c49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49,Merge_failed,868a976a94605e619cebdaa04eec6e2f44db8ef9c54cc9ed9e683f0ae4379d49 diff --git a/results/reaper/merges_tested/geoffreywiseman/moo.csv b/results/reaper/merges_tested/geoffreywiseman/moo.csv index f7d7151117..a227acd3ed 100644 --- a/results/reaper/merges_tested/geoffreywiseman/moo.csv +++ b/results/reaper/merges_tested/geoffreywiseman/moo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,c87b8cb339acf2e0e5d38ed55775bd9b6a3c3d1f,736976881b149b25ed7c051198933e47d3a99494,dfd80886d7f9acf8e4de719d2876e668dac92d1d,,True,True,True,18,90,428,3,True,18,Tests_passed,4f41e2065e911154cb29000823a47712b4316f475a3bcc2b6d32e1fcf0f1541f,True,Tests_passed,b29e2909ad9d5f27a7d9927a070901bb936df4cc568e1672a9e19996a1ff39c8,True,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,d154e8dfdce5acfd29d0157810b80d5b2235717f6695a391e123e4a92207c0c5,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,14be6ddc97fe0b86417f6c664aa6a07a1bb0845973d2cd2a447b76f4ae907c59,Merge_failed,ba8a69a5e10b5157ab281d5c4962aee263096d450d1dabec8d0244f9f5e4b788,Merge_failed,a9fbc59e9a0113d5cdb421e59cdbebae82860eb0f45c45db459b8a9f17261567,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,0cfc7f7fefe6c07b16d6c763ac775f8518406401227d6223dc40ef722991cbf6,Merge_failed,669a31d4ee910ffccbebc8b0474bfc3342fd582fc9dd4db469d57e2ae0779913,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,ff31a62bcb588762439423ae44e8a85f969216312fd7f566e5a163434d767d50,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0,Merge_failed,a5a96e1aac21b96ada9835dfc3f601514d5c0c7f442a65c54f098d9ff0077da0 diff --git a/results/reaper/merges_tested/geosolutions-it/geoserver-manager.csv b/results/reaper/merges_tested/geosolutions-it/geoserver-manager.csv index 1ee9a4b095..90e6962b13 100644 --- a/results/reaper/merges_tested/geosolutions-it/geoserver-manager.csv +++ b/results/reaper/merges_tested/geosolutions-it/geoserver-manager.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/master,8073671631cb3f2be2ce5c96fbafe1c35d81b2bb,471c860007c6c0a9853ce3d3cd5e2dacdf97d18d,b7bef77052a50b347d59119b1c5b91d34c5bda73,,True,True,Tests_passed,9798888e4606350edbc1dc604512533f1afcd3d102315e815a89cc028c12699a,True,9,16,437,2,True,Tests_passed,28cd9894526d49360f3c978d4fc4869f4dca39c0b6377c35d38d5c46cc2265c9,True,9,True,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,0a363ff6c6da54176aee3ed437aff12f495cbd08930db684a4398a258eb9a1e0,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,267c24c1210f67f07626bbbc1a73c459769280ce48d98b000f62c1c59cafc7d2,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d,Tests_passed,abe8e0d9dfb6f42b5e31ea7720fc1f7454130bba0ec95b8bfa0d7065e05e7a3d 51,refs/heads/master,352e241e0bf2b9c4a7d640dd5ca7795e1b5d303a,c54b8a92a8116c25ec615fa6dcd25c3785e9ea03,04449f8bdb8d9599a319397e13fb2341573302be,,True,True,Tests_passed,2ca0be9b8b1bdf7a68155dbfb7b569b52d36146cea9e2cf58f0e0cbf8b78e5fc,True,24,220,1770,26,True,Tests_passed,b8c911ed8bf31c3bc89b9f46c56d9f99884da8360a5b4d4d12b8e2ac4b3c05b6,True,34,True,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,7d2a516ff6aa94e6de3c9189c3f0b81500dda79c378cd9beab86e4ad7f8b5343,Merge_failed,cda10caedfc68a17f38fb5af7541d574bb35f6e9b2a7334662e01b1d274d4621,Merge_failed,74690a3311fc10d1c053ab778855896a60152007b9c3f0c9d06c99991e5881d8,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,f86f47b73adb50b91630b2b922dd65b716c84218816cf82aa4f5bd25b327741f,Merge_failed,d6cfdf36b386ac7aee6aaccdc55c835a3ff7f17537a73f2746f8ac6c6366d0c3,Merge_failed,f561b849b73f43daf915387d46ebd4ce3b077a602b238f1f99cb9d4c633dcbc2,Merge_failed,382daaf40c6dc28e7fc4e6d9df132193156a54942609a0bb4b2a4de37be0a852,Merge_failed,f7b167b1df0c19763a901ab299042eae4cef6c636d47d303bf321a3698f3d73b,Merge_failed,f561b849b73f43daf915387d46ebd4ce3b077a602b238f1f99cb9d4c633dcbc2,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,cda10caedfc68a17f38fb5af7541d574bb35f6e9b2a7334662e01b1d274d4621,Merge_failed,74690a3311fc10d1c053ab778855896a60152007b9c3f0c9d06c99991e5881d8,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,43130aa681b3573f370e95f5b98a4e1d3aa3e042bfee44d9b5f4d25fab82d65b,Merge_failed,f86f47b73adb50b91630b2b922dd65b716c84218816cf82aa4f5bd25b327741f,Merge_failed,43ee67606feab9b68da488ef362df0061d6297be10a583002941f747f8403176,Merge_failed,382daaf40c6dc28e7fc4e6d9df132193156a54942609a0bb4b2a4de37be0a852,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,7d2a516ff6aa94e6de3c9189c3f0b81500dda79c378cd9beab86e4ad7f8b5343,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65,Merge_failed,735d6759ae96892ae92d7a95628e8dcbaa10b13eccf576a633b59ab70882ed65 74,refs/remotes/origin/pull/198,1c845f11708c837e4eb5351a309618b68c316935,255fd8eb4bee0b7c0ab9a23eee956e3e96afb40e,c588f2c66ba1fd1aaa5c0fbebdf6d345df42f321,,True,True,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,True,7,20,638,43,True,Tests_passed,8c492f196f2ebe9a4e7672745155c099a9f300e5c84c666f31b3a28a6639c1b7,True,46,True,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,1856c14246b46db38b3c9eda4fee4bb0a666873b945c8e6183ff2693c3e9d835,Merge_failed,de3b1e35606ba09d240da3bc458462f41d62afba06b97037b1c303ae698f31e8,Merge_failed,1827547d9b78c91a91105667e2b40c2ce77a21071342218cc330f8c5d2924477,Merge_failed,e46c1f5f00f546bff51f9594184e75728681f817e00f917bf9069fecaadec52d,Merge_failed,de3b1e35606ba09d240da3bc458462f41d62afba06b97037b1c303ae698f31e8,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,06e9f37db86b93fa57cccfeee5ffcfc975705d77482a393fe47863232033b18a,Merge_failed,7b2870486229755e43094f831d059cedaf2e6348e60f0627f25acdf864a1cd88,Merge_failed,db1a9cb0d7da7be5d49ac2d03674f9f79e310b77f6f2d4a63bf39980f7e21800,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Tests_passed,8a84b74f6509b24fe4428871fc8303d201ece7c25bf29b23a36cef56cbc45004,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869,Merge_failed,2ceb14b6e82f529dff311f806529bed7adc03113f14b781ab04e852dd7e9d869 diff --git a/results/reaper/merges_tested/gephi/gephi.csv b/results/reaper/merges_tested/gephi/gephi.csv index c918587444..70aef32c23 100644 --- a/results/reaper/merges_tested/gephi/gephi.csv +++ b/results/reaper/merges_tested/gephi/gephi.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 248,refs/heads/master,08f9c3e0263df0310cbb975b00b4eab67ffb2a77,9924b0b871a4131c1fec18beacf956f5f839a332,4c342a71593161d772e8e399718bf748252bc907,,True,,True,480.0,1436,,3,True,480,Tests_passed,d4cde71ecb1eb6ce94e44bef35daadc6bafacda78024ab43331fbc26b31a8d22,True,Tests_passed,b05cd9f6c499aa650d215ecdc0ce4adc0bb38f7a546f495836e61f1b022d5bfd,True,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_failed,072f4ab06fa1c253e92b8085c164dc51a8b423ee9af7669deab70d8733e6cf5f,Merge_timedout,,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_failed,072f4ab06fa1c253e92b8085c164dc51a8b423ee9af7669deab70d8733e6cf5f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,359249168a1271b40c885fb3a9d230f3a8a9e1befea5a88a74db0030bd66825f,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c,Tests_passed,ad688851488c37af8d7d76f79be40fd96fd885737053bdbc82d65ac59c65457c 665,refs/remotes/origin/2589-project-api-refactoring,87974b308b2ac710f0158c9a51d6a762596e78b3,1660bc7ee98f1549d56433037258956800317efb,ec3695325f10b5ff72318f3edc5ed4e1b78bd82b,,True,,True,246.0,632,,4,True,244,Tests_passed,bb91ed8b75bbdb36540718c2722d5a3ad833a90e1ef499297fbbab0f903daebf,True,Tests_passed,d16751225f8182699bd44e6731a67ca0aa0f8878b422b1dfa74cb21057586fa3,True,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,f8cf39aac08ca8ef4833584f95d445c489adeebb2ce1b2c104acd93211521a69,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,4ee3f50481c942a59506d58984bd753d630bcf692384c6b8065ef803c8bd3062,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0,Tests_passed,c8d3c7524928053a62f8c257f4bd4aea16a22dcbc377f8e02ee08595b132e9c0 681,refs/remotes/origin/pull/2608,e161809510d2c809c5d9c338bdf90fbe1c32a3ad,f613c0a4ca67c34de37ec9818e8bfe7241d1d9d9,ca58408c314e068c070699f87f910ca253c9b011,,True,,True,1031.0,2546,,4,True,1031,Tests_passed,be104a52cf31665df637e7d15453eec6b81072fe5d02018d323baa7fa310917c,True,Tests_passed,0f769759c85fcd263a1421431d82cd406b16e38be1df08996caaf6017bb796f3,True,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,b78aa20e43be7d979814cb512cb277d84cf876d15d73e530424ce14254d77a48,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,3ecb2345437bbdaea31a8ed8d3b2c3c85a8048ef9492679910d64c5255b7ad53,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,a381fad5f4013f5b6c118b886d01f6c32deb1021833a675b544c83b37c5f6142,Merge_failed,dc80184a4c3540c8587580105a1ae3df34a650784d29b0ff810369cbeb0ccd05,Merge_failed,547a05b624e47220eb56d9253e5057dfd6d8b4a455df34c5fff284f532cbd014,Merge_timedout,,Merge_failed,dc80184a4c3540c8587580105a1ae3df34a650784d29b0ff810369cbeb0ccd05,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,3ecb2345437bbdaea31a8ed8d3b2c3c85a8048ef9492679910d64c5255b7ad53,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,ac629ae16bfad11fa5377dd647b6d6b841cd0629736bbb0fce2adc95b6c06872,Merge_failed,547a05b624e47220eb56d9253e5057dfd6d8b4a455df34c5fff284f532cbd014,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,b78aa20e43be7d979814cb512cb277d84cf876d15d73e530424ce14254d77a48,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc,Merge_failed,117e29e5d77bcc63c870ad155f00c95c9121fa096a804788ca5056ce427829bc diff --git a/results/reaper/merges_tested/getbridge/bridge-java.csv b/results/reaper/merges_tested/getbridge/bridge-java.csv index 1f45355877..a515e62a3e 100644 --- a/results/reaper/merges_tested/getbridge/bridge-java.csv +++ b/results/reaper/merges_tested/getbridge/bridge-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,35d226d99b31bc824c3a3460ec0611c8572a081c,39385be68dcbf46eacf42c29320fa09a9c27a642,de36e6eace5a1de9121d9fdbb234ecd27efdfe7c,,True,True,Tests_passed,091b3765abe2aa56d7f5c1573af9354f930e9de2c7177c89868b711905761bae,True,12,40,942,3,True,Tests_passed,ca47144f2183cde325593f9303d1592b1ac5cd08e659f0e9cee28823d1bccecb,True,12,True,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,7c36de8f2681f99e91b43c5160b3d238ee7542eaa03f122405b303be8e2f6a4f,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,25d9988fac354423e5f8451b1174a5145a9670c259edf490a7be9cdd24bc13aa,Merge_failed,b5e9362106b7b70c978ec254ffd0f681975d2e9fb2e23a84f4c323fbccd75099,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,a0734f4a7963bb6e921452d7dd07d41194469dee3a93f724028a465e44af004a,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,bb3c2132c25fbd4d989225b4b53d88a422902c6f4fe534a298aea06a1628ab4e,Merge_failed,38fb5479c59d57aabfc8e03869b3e869a5aeaac0a785a1b60bb20acb9c3b9139,Merge_failed,cab497cd10a734c87c7961750f6a411cd83f96f44865b2bac08115cc3aedfa34,Merge_failed,5f42239f4fbe9344a115088a47eddbcaedd1b1a62016f35a561ed79b1ccea4a6,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,86390b3f689ba2e0e7943045c3cc2585859a41dd7c348b4ec1ae089aaa8dac2b,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89,Merge_failed,3c1711e9c72b55e76943b9bbcb1dfa5ea80d33d0906f7f418a5d492d4d556a89 diff --git a/results/reaper/merges_tested/ghillairet/emfjson.csv b/results/reaper/merges_tested/ghillairet/emfjson.csv index b5fdef7d21..eaea84362d 100644 --- a/results/reaper/merges_tested/ghillairet/emfjson.csv +++ b/results/reaper/merges_tested/ghillairet/emfjson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,7aebd6f36990fc52abeb4c10e24f8d987b5be744,e7d28b22ce7e16623e9950d7677c18282e71212b,5bad44904199431d01d5568985e8e28e01951ad1,,True,True,True,34,719,2696,3,True,34,Tests_passed,f19df67228bdc9287b0a7ac458d47f1ca553f3bde7e4c938429e94f304083360,True,Tests_passed,c14394d99e13a4ee10a4a19d6f93ec7ee9a74c8d3c5e9388ecd2b0b2decd0518,True,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,b9d7a70ce8896be7b942bcb4238f0c4871a45849e607a0fa7d23d8ece3c351b1,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,5ed38c52965c4a5bb89647375af1809e5726bd1ded03e025b3faaa1dc59f2372,Tests_passed,b37409e7a5bf790773b93f1f24747bd91cc6adbe907c5df6f046a28c7e4c1058,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,3a8b37ad2b921966f8fbf053ef534e8a3dfff567cdbd5a45d96ae1d10dad583d,Tests_passed,e5620d8a42c841d4fd105ada2ea693d9ae5e95421af36df18dd7a27e5fc59077,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94,Merge_failed,ad7c3c336d23683819180c8eeb47a9cc81a7e05d2c213dcc0b4c806ce0f0fa94 diff --git a/results/reaper/merges_tested/giltene/jhiccup.csv b/results/reaper/merges_tested/giltene/jhiccup.csv index e493598e27..3fd9abf661 100644 --- a/results/reaper/merges_tested/giltene/jhiccup.csv +++ b/results/reaper/merges_tested/giltene/jhiccup.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,d16d4676cb1f00ad992149606cab5c8c72dc8c9c,b7cd7f85004b8ed6ee2b8f3c0293d6b1bd22a254,253be6118ea66939ad5f033ac06e07f5f429d2c3,,True,True,Tests_passed,1589cbf80c943f530f7837c017761e1552e518d9e056b74286a312191a47815a,True,7,28,96,3,True,Tests_passed,8e2a585005b065b3dfb63f16b9f6d5aa03677ec10aed46a6581c380794d68648,True,7,True,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,e6e209ca7da34daa1fc28cda4d10ea95a60137a6ce7549ea18a44a69103cefb7,Tests_failed,6b8f458bf1f9b54205f2105bca07ada6a7404c9c8733751a088e04c912b4c7c3,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,e6e209ca7da34daa1fc28cda4d10ea95a60137a6ce7549ea18a44a69103cefb7,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,21e00de774af48d23b5a218f7d3fefddfd7d7177b1bbe703ac81808057a816dd,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a,Tests_passed,0462571be69ae1e14f13e1b5c5a7b5bd5e3107730676d40066e1cae34a24da0a 24,refs/heads/master,d7891ccaab5a84dd05d0c5272609b89ebd1b0a22,cff9ba508b79a8ea7cb050c77e5d3b67a5e85ebf,04d63c4409f7fc55c85c4ed96274252b4613f0f8,,True,True,Tests_passed,0fdfad91f0832933588e70df22f37fc4f9ca0841640e1f006a0d742cec42d1da,True,6,8,14,2,True,Tests_passed,26f21b04480af7c661e3a78bbd4daa51958edb2a85d3c57b60141aa7893523e7,True,6,True,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d272627d7069e0ec0d8b99220e31c45430758035b42b2ee5dfdb53d6914a9696,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,8276eb8d994d6bd9458fc22908123684b787dddebbe551e27d9a956da751f0b8,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202,Tests_passed,d17d6034e8ce35c6d04ad6d33335dbf87f558d8dc256b7eb7fd0e6de165d9202 diff --git a/results/reaper/merges_tested/gini/dropwizard-gelf.csv b/results/reaper/merges_tested/gini/dropwizard-gelf.csv index 96a74f05a9..e776c1d746 100644 --- a/results/reaper/merges_tested/gini/dropwizard-gelf.csv +++ b/results/reaper/merges_tested/gini/dropwizard-gelf.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,b1cd41cdb5bfe0b33d5db7718beaa984692e83ce,f6e7bbc12ed553c961d6500d003758b558eb2eb6,7bd73b3b895934e2745d4e86a224ee5de6cfe403,,True,True,Tests_passed,8acdc5b2078b573101ecca3d863d9838fdc65edb266090772b12cafedd52ecf6,True,9,20,57,4,True,Tests_passed,c445b3a0de324fdbf75ddcada0e1df47625412c029afc67ebde4c0afbbf4511a,True,9,True,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,7a93f13f1e4280edcbd8412cce3f92aaf82a9a5df884102a0ed302d64d4925bd,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,5d567941153a325083d50c3cd83b92f336177fc09ed043bfc88eb08eef0a6e41,Merge_failed,dfb2b1ba7d1f2183880da9c1640a5668df3af0ea1af23c0fed41c218c717ed6a,Merge_failed,4ae1d072ac94084ac92b00c932fa97e437ade12939ccd4e9a40fc92fab5a41e1,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,94f3a835bf9bb8601f7e7a2faec3870f347c7e9e1d24fd196e9ef1df8ccd845c,Merge_failed,9f140cc7f2258ce2969398904642668f60e503191ff338d2f19ada81fcb721ef,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134,Merge_failed,9ca87e0ecf949cbeb35e7cff6be8fb929c867b5d55a0b54422952c94277bf134 diff --git a/results/reaper/merges_tested/gitools/gitools.csv b/results/reaper/merges_tested/gitools/gitools.csv index 0eb9023c2f..1682d31db9 100644 --- a/results/reaper/merges_tested/gitools/gitools.csv +++ b/results/reaper/merges_tested/gitools/gitools.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/develop,ae8c217d5c1c1382749dfaf6a80bc597515b50ae,d91dae59889794ed2bdd72642c465f972f88db3d,92399c10ae77960eb1b64ace0ba25817f582baa9,,True,True,Tests_passed,dc1c77d709db16dfe891fd84a0310e86b7170e3ec460820ab7d5876cf5076c19,True,107,331,1564,5,True,Tests_passed,cabfd84345f258409a1e6cc666c85b51e7f48a9e133db1b9fd4ea7a9cbca129c,True,111,True,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,bcd55ab8e5de19216df6bcf142b519d908891363647e0494eadf09a3990c774d,Merge_failed,9319c4c9e8d94923245d50b7fe69e1e413a0ebd4e412e68f8dbd9dde2cf4c2ec,Merge_failed,88113bc54e2f7cc74d8ee0a2898c45724c5d6e1d502ce74b97e8a25dbec70794,Merge_failed,c2377bde5190cbcd94ff2a7bec9b7420998553b2e868782a19367d6430c2378a,Merge_failed,9319c4c9e8d94923245d50b7fe69e1e413a0ebd4e412e68f8dbd9dde2cf4c2ec,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,bcd55ab8e5de19216df6bcf142b519d908891363647e0494eadf09a3990c774d,Merge_failed,ca7e9ba9a563759f32c70d0b4e364ce1f80f91bbe5e05d612eca9bdff34931a5,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,b2b0e053e851de5c9ff139a68dddbf9230b30e0bb839d6a36cdb3172db4c5c6c,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3,Merge_failed,23f777885bc93c3bdfe80cee2a89dea7bb8a81a69727468bd281219d93177de3 21,refs/heads/develop,0b5eaca790bcfa8fb61281c4f6fbc18561a7d352,2c205ff3eb4ad5d20267dad46887f539655a4e7a,1fdc1af81d078557ff92260ddf19d6ca529fcbc7,,True,True,Tests_passed,30d64da2a6878ce1c31d683fcba8c91c65eabad8fb558d09ca053336aa413ae1,True,35,92,671,2,True,Tests_passed,b6738abf256ed5bb7d92db23d1dab0a007b41f94dd8ef21a62dee264f4129c32,True,35,True,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,65543665735681087371d884b0c6198b2397db5e06664e34159449763dd9eae1,Merge_failed,19a961a38cc1483936b794f47367f153d42fab469bcd45a69259bf64fc4a1647,Tests_passed,14f90f8622ada9404add6afd14888b8097ddc9dfbae490c4a81690ca4c0ffb83,Merge_failed,22411332415672e9fd6552926516241bd06749bb194831e33b05407e63a649a6,Merge_failed,19a961a38cc1483936b794f47367f153d42fab469bcd45a69259bf64fc4a1647,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,c6de59c438781b9a8c683053c514a58507910af7c6c0448f78cec84fff079879,Tests_passed,14f90f8622ada9404add6afd14888b8097ddc9dfbae490c4a81690ca4c0ffb83,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb,Merge_failed,53927e00f7366a83071ddf20e6bd008f84edfa199427f12409def67dfb67ecbb 24,refs/heads/develop,6f133251f129797ec4871b6c6ba906a1be415129,84d46ebaef9debb9dcb9bc698e6d1baa08f606bf,49c8589ffe0ae331e160f07773147a4515d3e2c9,,True,True,Tests_passed,5b69781563d564698a18b96021be3c0186346b00daa16cb4cb437a972e0307d2,True,22,87,290,2,True,Tests_passed,339f12b265cfbbe386f83d6c519225e9c6376716dcc9153a7b15a46b507b98a1,True,22,True,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,acced8cafbb270986920a4af4be367c523064e0717d0c3b758c4b072f93a3b03,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,acced8cafbb270986920a4af4be367c523064e0717d0c3b758c4b072f93a3b03,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705,Tests_passed,074b41a601e46325278ebccb8729633d789b58029a4156f39896cb15e37a7705 diff --git a/results/reaper/merges_tested/giusepperizzo/nerd4java.csv b/results/reaper/merges_tested/giusepperizzo/nerd4java.csv index d01ae4309d..a20814f4aa 100644 --- a/results/reaper/merges_tested/giusepperizzo/nerd4java.csv +++ b/results/reaper/merges_tested/giusepperizzo/nerd4java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,2aadca9519e8fb2a4deeebc9b9ea84c80ea99bc6,601cd85d90c07c437fe308ece191569491a4bd60,7d6f9ef82321090583acc0f9df5d0fa8963f3ae0,,True,True,Tests_passed,cf61ee6aea03216e56e36dcd3383e236dff6bd0530d5132733d2f098179ac981,True,2,2,52,2,True,Tests_passed,b2ab4c6a026133cfba798cba574544d9beee86dd3a5b3d8e284b0e8de6800723,True,2,True,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,d4e851ac9c705a1b332555f4bfbc6740436c74f555838997f643989afd921dee,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead,Tests_passed,39a5ee808c845e36e088ee8b1aed23c257c03b9bd1fdf899690fdcf6fa032ead diff --git a/results/reaper/merges_tested/glamdring/aardwark.csv b/results/reaper/merges_tested/glamdring/aardwark.csv index 41e998585b..d53fa91c25 100644 --- a/results/reaper/merges_tested/glamdring/aardwark.csv +++ b/results/reaper/merges_tested/glamdring/aardwark.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,816b3dcbe225e44aad654576e877b58b79f10df4,3ad4b9fb5759883439e0b8b2fa746ca1ae34bf15,0d3190e5ce36843e2991ae5fa4ee2e482f7043fc,,True,True,Tests_passed,5b30f75c1f524f2567c06f93d0cccbb6d1d01187a7663be37f38e1a459c0d67d,True,4,18,111,2,True,Tests_passed,5bd66791b9fc8fcbcdce120dd7a2e78be0e63aae887e637f68456fd224b9dd8d,True,4,True,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,a601d508a3e4ee4bd270696328ee37ec82fa0aa9f9789281ac426b053135cb7b,Merge_failed,f561c15d2b1aa605bc79f1e94b0484696683c6113360d805ffa1d74770648cfa,Tests_passed,6ad8c979f0dc29a9859d011a5009b02a4caffe2b2e608f9e3fd708096ce48751,Tests_failed,c67090533b818138d93d4aa6fecf7620c92afc4d30008c895ea5bb807209d86b,Merge_failed,f561c15d2b1aa605bc79f1e94b0484696683c6113360d805ffa1d74770648cfa,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,9a1a2421c60256fcd91695963533a969f654b9e2ef85f45e97d713415b57336f,Tests_passed,6ad8c979f0dc29a9859d011a5009b02a4caffe2b2e608f9e3fd708096ce48751,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,ef10770380bf3e8d37bd6dd9a67737377b786964d023aa08ee3b64309630e267,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722,Merge_failed,d0f86bf37e754301a7e5ac5a23f8f8aedcd1efd0ed1e4214d654b625d9937722 5,refs/heads/master,8bab377cc754b72f9b0d1181a98227787b43758a,12af56162aaf2449a6fd642ba890112a38f4e7d0,4bdde8ed558c76923d845169a63b03ed35162761,,True,True,Tests_passed,7cf3e7509213b3a5efc6e8e5ce377cb7dd31333d087e92390d0555bf621b34e9,True,4,42,208,3,True,Tests_passed,b183aaa6130ecdc7cf137a384d50d096599a2374722fa163b181c20d20252c61,True,4,True,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,4f7241f3fd33c9fe3e20b08b277a43ecbf1a53196bf2b03be6e83a52e521de6e,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,ed3e0e1b261da130c758f645813f5862c012848b683eaec93aa6c00b9b0bb351,Merge_failed,a83acc620d07cf99c37263ace4b016e2f83ba3836545648d4b7b780fc6b2b206,Merge_failed,db520828820334bcbee61bbd196bb9dad56923d61a81dbaef9e59a18eddd63db,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,f4b208686e03053ebfc2403a67683af0c8bca7103d09563b2fd8eec71088069b,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,2c86c694c76c565ab816b18f8616280cead675094b31c8d3f9a487dab4ff5cf2,Merge_failed,24fc2fbcced7c590d3a4937192d5dd08727295e70cdc7d752791fb63647d34d6,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,d9bb18604d38ad45b750dbed7d89ca2c9dadaa8a3e847036c0e668e96f8fa007,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401,Merge_failed,790625fd94afc1dae5b85d36ba4a4d5c3b1cff733b0151db7fecfd428d033401 diff --git a/results/reaper/merges_tested/glenkpeterson/fp4java7.csv b/results/reaper/merges_tested/glenkpeterson/fp4java7.csv index edac8edbbc..23059194d0 100644 --- a/results/reaper/merges_tested/glenkpeterson/fp4java7.csv +++ b/results/reaper/merges_tested/glenkpeterson/fp4java7.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,27ff032312795971580bf0955e9546a1d3671d5fb0908690dc0410dbb0e76168,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa 10,refs/heads/main,6244c5c7af67fe2de6cd4e29b383bf25ffd623af,de5a30ec5f888ceca9893d2d79b8312c20c7645b,6b90238ab238a893c094f7c2a01a8ee9db0db058,,True,True,True,50,157,5024,5,True,50,Tests_passed,a8889e5ef497004555b9a61ca759fd48806200f4d886c022f06109148a1eaee6,True,Tests_passed,a147b9381cae45a6bc8186814735c2d136291ecb56cdacb886f6b739858accc1,True,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,664938212d500c1f5fb5e4b2c5d65bdfed867c0b3c2f4e5605852d33a11c83dc,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,1b0215ebe916dada18bf241f4cb4c5811ff44f0656e404ea69628f12310003ce,Merge_failed,446e88d0665b5b3edf0ca440b686134f0869c146f7f09ef04a7c1fa261dda92a,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,5d456342549d7dbaceeb6eab8ae3fc395701fa665de889f6813490cf808770a9,Merge_failed,8874ddfac000ebb635c63fa28e33f7e6f2e65577e6b38e7e4ed3b81612949c39,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354 13,refs/heads/main,4ddc1a633e1da26cd56fbd4a20936283cc0ac731,2e76297a322a0736fea62aed0a0c0684d2b6035f,37b3c6fede124aa6d2d672c136562a6fea231837,,True,True,True,101,997,9329,6,True,102,Tests_passed,9555f7d749d34d31d3e05a8b53cc75204bbd8650b5a0d571b46e1557c0d07423,True,Tests_passed,0f460be226a3d0f59ee8d9e947e3bc981254f6027b027f41cb29cec8a713a8c4,True,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,b4f7d8a6a0472b59fe62643f210b488b7fe8a50abbcc51b99f50472084309e90,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,7bb4dc3612443020d97109901daaed259e331fa123f2f1d8910bc0851856f042,Merge_failed,6933963a2a93f448cb60003deac8234a5cd13a8b8eae2e6fc01b62b34ff6c19b,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,5963d52466d5547139c6570e39cd6714e3d0816ededfb7c8f627e2e0e54cc13c,Merge_failed,d9fce9541286153ee42caec7d6573138f90d73b0fe4fa24166c3f48399f95f46,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5 diff --git a/results/reaper/merges_tested/glenkpeterson/j-cicle.csv b/results/reaper/merges_tested/glenkpeterson/j-cicle.csv index d1448fe757..cae1df5b62 100644 --- a/results/reaper/merges_tested/glenkpeterson/j-cicle.csv +++ b/results/reaper/merges_tested/glenkpeterson/j-cicle.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,3132a5d74058033d3effa9681735028eea63e64fed17dc7a7d0a0ba53bd231cb,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa 10,refs/heads/main,6244c5c7af67fe2de6cd4e29b383bf25ffd623af,de5a30ec5f888ceca9893d2d79b8312c20c7645b,6b90238ab238a893c094f7c2a01a8ee9db0db058,,True,True,True,50,157,5024,5,True,50,Tests_passed,a8889e5ef497004555b9a61ca759fd48806200f4d886c022f06109148a1eaee6,True,Tests_passed,a147b9381cae45a6bc8186814735c2d136291ecb56cdacb886f6b739858accc1,True,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,664938212d500c1f5fb5e4b2c5d65bdfed867c0b3c2f4e5605852d33a11c83dc,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,1b0215ebe916dada18bf241f4cb4c5811ff44f0656e404ea69628f12310003ce,Merge_failed,446e88d0665b5b3edf0ca440b686134f0869c146f7f09ef04a7c1fa261dda92a,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,526e0f559471080b0e65ab66b2236ea4e1ea1d8d0f926d41e09f1d8065a57e6c,Merge_failed,8874ddfac000ebb635c63fa28e33f7e6f2e65577e6b38e7e4ed3b81612949c39,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354 13,refs/heads/main,4ddc1a633e1da26cd56fbd4a20936283cc0ac731,2e76297a322a0736fea62aed0a0c0684d2b6035f,37b3c6fede124aa6d2d672c136562a6fea231837,,True,True,True,101,997,9329,6,True,102,Tests_passed,9555f7d749d34d31d3e05a8b53cc75204bbd8650b5a0d571b46e1557c0d07423,True,Tests_passed,0f460be226a3d0f59ee8d9e947e3bc981254f6027b027f41cb29cec8a713a8c4,True,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,b4f7d8a6a0472b59fe62643f210b488b7fe8a50abbcc51b99f50472084309e90,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,7bb4dc3612443020d97109901daaed259e331fa123f2f1d8910bc0851856f042,Merge_failed,6933963a2a93f448cb60003deac8234a5cd13a8b8eae2e6fc01b62b34ff6c19b,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,e0bfa6095b322b942347d66f67930ce12c3cc64d192dceefb5abefa97ebb9ccd,Merge_failed,d9fce9541286153ee42caec7d6573138f90d73b0fe4fa24166c3f48399f95f46,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5 diff --git a/results/reaper/merges_tested/glenkpeterson/j-sicle.csv b/results/reaper/merges_tested/glenkpeterson/j-sicle.csv index bf0d109315..11ed355785 100644 --- a/results/reaper/merges_tested/glenkpeterson/j-sicle.csv +++ b/results/reaper/merges_tested/glenkpeterson/j-sicle.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,bf4de20006b5405bf4c84c50a037ef0b28a060ab,c94ae5639d1dfae52b406160ca217b9e00e8035b,eac0d64b2eb9496967334f635cdb270cffb2197b,,True,True,True,279,1632,6468,15,True,280,Tests_passed,b3361709aea94502c808d6ebc34bebc1adae2d3b789bd1a3dd60ad2e6ff42c1a,True,Tests_passed,6f6231f63afcdab19d520927e0e145e67f3bb7d78d4c143de51b2203c3060f81,True,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,38ee2d7274f4001e2a878dad523a21e16f5dc7886d69465b3e849a42fce1ba81,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,9cefd2b7754f29b8cc4e6674af86fc0af5343d8aae6bbdf6f7b1a5d895212b10,Merge_failed,8702767e23e3966c16bdce819bab859f7caf7e2146c1329981d5685fb582a2f3,Merge_failed,feca951a6fe94165b4baf39086b77f2c753e6deeb7936c5fd0260081053fd2a1,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,e46b2aa761eebda18a387bac72b5e12bd04710fe4b420030fd9bfac53dd89223,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,06a9ac014ebb925f23dccaec2d86e8c03c58c63d03169872ec53db8f965364ff,Merge_failed,bd3055751b11c4847039980165ce12f7ee87c204e98f85c8ff3df0e92e53a16f,Merge_failed,31e00884b3d9abcd9100d95c354e69464257469353db9f5c1b4fcda8641360b6,Merge_failed,ceb58d76ec8683dd815927957d62220b95ca73612d24d5300dfecac8e299596b,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,9b944848893e7e709493b63fc0ff07bcd4f138ef25a2b06140c49b6dea137807,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa,Merge_failed,a1bb8e74da1453fa192b0771827b968c68428c1072facb1faab246ac6a5c94fa 10,refs/heads/main,6244c5c7af67fe2de6cd4e29b383bf25ffd623af,de5a30ec5f888ceca9893d2d79b8312c20c7645b,6b90238ab238a893c094f7c2a01a8ee9db0db058,,True,True,True,50,157,5024,5,True,50,Tests_passed,a8889e5ef497004555b9a61ca759fd48806200f4d886c022f06109148a1eaee6,True,Tests_passed,a147b9381cae45a6bc8186814735c2d136291ecb56cdacb886f6b739858accc1,True,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,664938212d500c1f5fb5e4b2c5d65bdfed867c0b3c2f4e5605852d33a11c83dc,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,1b0215ebe916dada18bf241f4cb4c5811ff44f0656e404ea69628f12310003ce,Merge_failed,446e88d0665b5b3edf0ca440b686134f0869c146f7f09ef04a7c1fa261dda92a,Merge_failed,689e97a92982d9db0600dc6cce174c4d55e2504aec105a76e744b751bf2fd5a9,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0a14fb7c39a41f31f40f6eae84aff385e15f9aa5e9206182964bffa0441c49f9,Merge_failed,8874ddfac000ebb635c63fa28e33f7e6f2e65577e6b38e7e4ed3b81612949c39,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,0c785ffa137f3e8eceb856d8352806f02a8f7c943c6b4e6fc74ba5332d9aeb41,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354,Merge_failed,afa0e50de496cf914a9a4163bed5f87f613d687148022b691de2e6d9a30f9354 13,refs/heads/main,4ddc1a633e1da26cd56fbd4a20936283cc0ac731,2e76297a322a0736fea62aed0a0c0684d2b6035f,37b3c6fede124aa6d2d672c136562a6fea231837,,True,True,True,101,997,9329,6,True,102,Tests_passed,9555f7d749d34d31d3e05a8b53cc75204bbd8650b5a0d571b46e1557c0d07423,True,Tests_passed,0f460be226a3d0f59ee8d9e947e3bc981254f6027b027f41cb29cec8a713a8c4,True,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,b4f7d8a6a0472b59fe62643f210b488b7fe8a50abbcc51b99f50472084309e90,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,7bb4dc3612443020d97109901daaed259e331fa123f2f1d8910bc0851856f042,Merge_failed,6933963a2a93f448cb60003deac8234a5cd13a8b8eae2e6fc01b62b34ff6c19b,Merge_failed,fe501fd2a29d118a10ec017453dcf1b15222782f3615a0401bb3277c472ba886,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,59646566ce4a54c0de387df338a7875e52432f89a814a116d0f5fac1f340bfdd,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,150fc52e332b35d99524acea7293b479f7e70f6817eaa6789f25c936d2bffe34,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,25a4b1846f4ff2f7aa25ef1cd2775ff18cc524347918b066c4012043fbb8357e,Merge_failed,d9fce9541286153ee42caec7d6573138f90d73b0fe4fa24166c3f48399f95f46,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,4a12e2a65d534ded79e3c647920f997b8de1700d6fae3480a5d152af483dd528,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5,Merge_failed,77e33e026490b6675b751ecfa198cb259bdc5d67773d946452d7a04af41df1f5 diff --git a/results/reaper/merges_tested/glowroot/glowroot.csv b/results/reaper/merges_tested/glowroot/glowroot.csv index c0bb48ef4d..99968c349c 100644 --- a/results/reaper/merges_tested/glowroot/glowroot.csv +++ b/results/reaper/merges_tested/glowroot/glowroot.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/1013,e8c978e053f83b6550d4c4102fcd7c99cbb5c8fd,e7eb1160a6246dd879aec61388cc67a24ae818a7,9d20a168dba0481c8cc15326f4079ed7040a7ae3,,True,True,True,488,647,1660,2,True,488,Tests_passed,0ab3b477a2229db3d6a48621d52b0f051bdef817cbebc3531fc948935ba56196,True,Tests_passed,a4c343af08bd19dfae9f98ab6ebeadb4fdac8b86bbea09ca1656ebb6cd24e6ff,True,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Merge_timedout,,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7,Tests_passed,269fc3eb6dec831d10d7ff2f49d67c9bffe7310f6f340865b080ec998a90d1f7 12,refs/remotes/origin/pull/724,5edc6961f8576c72256fe9d28b358dc6e35ff997,dbcbb453a0db7c77cf8cf7a43797d4b9e2d214f7,b65d9a9f8972dca4e392c61a329110a32d3826ce,,True,True,True,437,1583,8291,4,True,437,Tests_passed,29c8903501e26b98c7b7c54ee02b034c3c6bb59aa0fdb3b13ab5e21657d06a62,True,Tests_passed,1496169c6b0ff819f6c459675878b405b429592a0a7889bdf6fafa87a9f8683d,True,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef,Tests_failed,6196699e0cdfc8d71d4b542547b4217ddcd33c92e18d2ebac0f2a26dcefff6ef 14,refs/remotes/origin/pull/747,cd742cbab46c2c628a0482b2a85bd1d9c2c926e1,c2bf1564766df2aa8a4ccf36577e49da20b34ea6,e61c50a4a8a844c0b417a241ba6b09f13534dbf7,,True,True,True,430,1537,8064,2,True,430,Tests_passed,f69b67b67f7accd2d0d77f95ecbb6a5a4bef413dc0d8b0cf7e07ecc45652c6c2,True,Tests_passed,8c410534ba97335b002e95a13dcdb0f5c5acab77ea77a2f98bd3775f086532c2,True,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,5877e2d3d4589f2c46b22071dc2c2f3fa3f58a260b4f40204543ac593827bdff,Merge_failed,3cd016f91dc75047275a5942d34f1d2fb848a3a8c176f459c9e3912f02f25018,Merge_failed,3b2d50486d6b165e8f00b5606617bf5c79e5bfde2123e9016ff778e6eca0b67b,Merge_failed,3b2d50486d6b165e8f00b5606617bf5c79e5bfde2123e9016ff778e6eca0b67b,Merge_failed,3cd016f91dc75047275a5942d34f1d2fb848a3a8c176f459c9e3912f02f25018,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,d969868b2fe5e9faf65377b7cae2e28408f34fd9de56588369dc7871b13c5418,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a,Merge_failed,c9a7f30c6dacace75c50f66e7d128f8a98458d2512eac2a6c2efd14cacf2841a diff --git a/results/reaper/merges_tested/gooddata/gooddata-cl.csv b/results/reaper/merges_tested/gooddata/gooddata-cl.csv index ceedd4a739..7e92c3c3ae 100644 --- a/results/reaper/merges_tested/gooddata/gooddata-cl.csv +++ b/results/reaper/merges_tested/gooddata/gooddata-cl.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 79,refs/heads/master,3e4b6e9be621f2a3369afc42471e3c73fbc02c87,34ff195bdae97dcd61e7593c9ba401163fa564ce,e426b4467358bd5e9b7b1abf11e99ccfe1281642,,True,True,True,4,15,99.0,2,True,4,Tests_passed,a1e27c7f29163bf05fe9187dad4a39d6dcab9bcb8cef4c2d9cdd47cd0d50979d,True,Tests_passed,91a5fdd8dc7355a7336b42a01cd5cc3c0dadcfa42e82c289b69b4470c3234d51,True,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,46fa6fc92de1b37a82287e04d502936e1591665e619a987e0ceb2643035afa95,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,46fa6fc92de1b37a82287e04d502936e1591665e619a987e0ceb2643035afa95,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,08b615ef05a4d70eb8030c5d122112e22bcb70aaf011e93015271f157606ba32,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5,Tests_passed,280fc9bc90f21eabd3eecc136d43c4c8c30060d752da70d3f2b920701dca05c5 83,refs/heads/master,6d9e980fafb82e19229dc2b8cce0bce82e06b6fe,f10188e01fc145bd6ecfa6af3c7a523ddf0534b7,68d3bcfe5371c392e10d369e32bfbe42e9e9146a,,True,True,True,33,308,1334.0,2,True,33,Tests_passed,79d09df689fe367cf74d1d5b7797427adf97db6fbd876876f22bf726599141af,True,Tests_passed,413887506a531e1dc2b013cadda43765008816ec83677a7d66767873e1959354,True,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_failed,0868b4fa71aeb4e0ef71cae9156409b1e9c3fe137f499bc14f7becbe00593417,Tests_failed,9d4fa608a98543986b720c91df7b3c40e7502254e2315a44e70bdd53869e53d4,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_failed,0868b4fa71aeb4e0ef71cae9156409b1e9c3fe137f499bc14f7becbe00593417,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,72e24caa347586fc93b4f44e424d7aa877e0a0919a843104bfbe717de0a41979,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e,Tests_passed,8005af711a7e3fe959486fb7b8b91fb6b5d41d00cf9fa01db95668833723b35e 85,refs/heads/master,4f5b49dd22c7b737534066e11c28d8c1dfb781c7,3819363e5e3d428510525ca3fdd574615ec157ee,f50305973ee77d0d4c8c27b2302d60c0f6bebea7,,True,,True,47,179,,3,True,47,Tests_passed,93b1f2ee7dcdd18adc1339a3a51eecd8835b78ef328e5f7731df424cfa6383c6,True,Tests_passed,61e3e0816e06f2960d6298d8e72547dc748524c628193adfd730a25abb4b5f67,True,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,9626ec4f3a0ae55d32f6e46736a29c8a7830244c0fa75296323cdca2c3731711,Merge_failed,9cf97de2557c616ee0ca91259681e7823c6c5a3697f1c0681d2ddf20584dd89e,Tests_passed,55475e0967a54452a128da339c7b04c8bdedded5cc9520ec5f6505a533f22865,Tests_failed,fce85b75550e8e613c474aa10094b9c8e7a394f439b8a0c964a45f0704dbcbe1,Merge_failed,9cf97de2557c616ee0ca91259681e7823c6c5a3697f1c0681d2ddf20584dd89e,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,9d47130cd6294181d9d6802fb91ac58f8f579cc10bc5d3ce21e0f25f3782860f,Tests_passed,55475e0967a54452a128da339c7b04c8bdedded5cc9520ec5f6505a533f22865,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56,Merge_failed,8bfb5d07e637996cc2c9385eca66ca945620df100236885cbdc59a7253968c56 diff --git a/results/reaper/merges_tested/google/closure-stylesheets.csv b/results/reaper/merges_tested/google/closure-stylesheets.csv index 2c5a1837b4..47c94332b7 100644 --- a/results/reaper/merges_tested/google/closure-stylesheets.csv +++ b/results/reaper/merges_tested/google/closure-stylesheets.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/79,db92c42dd890921c3f05b3a5ad70436b6d77f9b4,f7fe702fc889653584011e04580f2a17acfe3384,d2c0cce5c11891c086a3d055ec84e96d5b9cb559,,True,True,Tests_passed,d1cb7d86dc008c515bc6d50dad932d23ba24e7b120494ac95899a207fd332ce4,True,162,2577,11090,5,True,Tests_passed,a5fa43b88ad30c2a5aa421ca7c3bf481a28d6397e415a3fea44e55f0fe02d386,True,162,True,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_failed,971e253b4153e9f7cafa7e5672ad217affe6bd874e3877833344868e6f436f65,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,5db565a44ef73f13d748845745506985d65909fe6af04782a5a5fbbe8fedeb97,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd,Tests_passed,06c47e64e68edbe9c8ac89e05450b3e7077a7893accff2f15d2b44605f4fd8cd diff --git a/results/reaper/merges_tested/google/compile-testing.csv b/results/reaper/merges_tested/google/compile-testing.csv index 3fc58c7829..5ab968b44d 100644 --- a/results/reaper/merges_tested/google/compile-testing.csv +++ b/results/reaper/merges_tested/google/compile-testing.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/main,b62b506d4e7f5029d1ef67d56893f9219e1cf998,51077bb186720fb68249f9bd09de051fc0c53f19,20ae93d1383ea0db964cadc4aa16f9808210bd51,,True,True,True,5,21,88,2,True,5,Tests_passed,76d4410648ed69ff2d49805dabcb5bdd48a316db0c1a6ebce8e9c2c14178f46c,True,Tests_passed,556b5df16f7a7d10131c4f868bee154788743d703d307d461a1b78024286bab0,True,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,ad34eda740e27fa42e0bf44da8238416c65a9d32e02e1a22dc03a58425d3406c,Tests_passed,31d883c9e0ae87b5bf9d8748899e18a5f356c0e0ad4f27bd1abf0f184e4b8573,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,ad34eda740e27fa42e0bf44da8238416c65a9d32e02e1a22dc03a58425d3406c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c,Tests_passed,fdf0099bba010f66940d128ba4847c057954551373b6bf674e2b9fc7beb7fe7c 36,refs/heads/main,608e1cb92ab715862a2f545cf3c57e6d35ea8216,68793277942607913ed80406a80bc85e5f704d93,e4526c30efb60151257f09ebc7195b2c850acfbf,,True,True,True,14,64,548,2,True,14,Tests_passed,255f5503903ef25b5c4b1e70e49d93440bd497b95b73d207b44cc4e2a7c55e97,True,Tests_passed,6e32f9694974e9b09a3c3d28bcbb2a22632453716e92279cfb2dbb4170850915,True,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,fc29f1f7ea14f6d80b25f5d80bb72c8339f6dcb83a6734a2b561234b2a84c39b,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,2777ba35e93e405f30548acbe3e64e7d3c2aa7eefa15ae1e4f54f0669343be31,Merge_failed,b85a0f7aba6584e6a1b665e595982a762eff279e566d9c6ffa8ae39cc43f6431,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,41a372faf0dfedbaf29f85ff72bcfc13d3a6e1c9ffe6d4e6d9f3e10f343b0f2f,Tests_failed,2bdbe7f672bdac7ffbdada6a581ba8d49855b0ed95bcb5115c230ad77cfe5144,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33,Merge_failed,ab285754f55fb794f29b19fd1f93ac927eb56651090c0525323de1630caacf33 diff --git a/results/reaper/merges_tested/google/error-prone.csv b/results/reaper/merges_tested/google/error-prone.csv index 2f1aee4a7d..51331b6e2c 100644 --- a/results/reaper/merges_tested/google/error-prone.csv +++ b/results/reaper/merges_tested/google/error-prone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 142,refs/remotes/origin/pull/2946,c77eec536553d66d9500dcad5f962cce744b89d7,d5721137f8f37f138befd87fbc6b02ef6b53221c,f546548a41de98d6e4da4e513ce7b791de55057d,,True,,True,609,1609,,2,True,609,Tests_passed,12f9ae7410c5a659f000b2b3f715dc434e3e42351458e8abaac2600612f810da,True,Tests_passed,31660ff72321a7f63d2da283f013dbef6199e426164e076c9b6f9c890afe2ea5,True,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,c6b26a5321911fba857702c15ec4808123e4f6c8719ff6da6788199806392fc7,Merge_failed,ff4f24cee99ff1a1ee27585f15dafe204202e3f61703b9d39b173418138d3a8e,Merge_failed,a8d37777fc6a09fe65bb668a1545419ecc1bae803253bd9fa542f52e0a9bb745,Tests_failed,478515016b452c09640d72e7be9868b5d69ca9d2cc620aa46e017866ef547ef5,Merge_failed,ff4f24cee99ff1a1ee27585f15dafe204202e3f61703b9d39b173418138d3a8e,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,c158fca1364033c0fc2f4440f8c76a09a303b0e1e2a20d066c123e0d321a6ae0,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,973d60ba3186db47a4c20c6fcf52d9d56316b7f67d0517b76ae7385868069312,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2,Merge_failed,083a68d6996a84952676028f744ce4af90635f9182229b896cb42dce8c2977d2 148,refs/remotes/origin/pull/3037,7c82fb57c57be56bc8276821c37372d1f2c3b8c0,67e44eb939e948219dbd6a44e80f1453bf64dd76,bc5c994d5cdbdd9e06afd636c21c99e82ff3246f,,True,True,True,5,11,47.0,3,True,5,Tests_passed,f6e7391365b398d6e0949117d67df87c22cced148659b875a80e83f5a8a9378f,True,Tests_passed,d23dbee252084f2200a601c21af777c87250b538b39c22f7c9bda9265453dce3,True,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,8c1c887aa3a90b51389033d85a621c235896337274fd0ab17dedd0f497b1fcdd,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Merge_failed,6f83f991d7d43b47c728c122e400a01a00d66b2c0597d7109e3ad754052236ea,Tests_passed,87a11673ff06eeb4ac53eeac5a4ef105ac2b54c17ccfff28f31727481dd31197,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,3a0f7882df8e4a3b69d1f683ec57ef3dd91f6f49736d96d3fc50918afc08cf7f,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e,Merge_failed,e4e66a4a76ec3d54cbe1aea5e30a2182170900f4b74c995315c8be7abd94eb4e 153,refs/remotes/origin/pull/3837,2ecedd4f92f9056fea2dfd73b790f6d422e10943,89e2ba9efbc6a3f1ff0bf78183a6f7b95971a5ab,1c1f0f873a82cf657eaaebeab878e017de42474f,,True,True,True,116,340,5226.0,3,True,116,Tests_passed,62029fe52a5c266c6db910d12de7b0a7a5859f1ee38b4e8f3b8bba79fd638d21,True,Tests_passed,529130b74ed59c904a22c1e470f718811f65e37a81ac139ab66214488e530569,True,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_failed,b1eeec0cb917bea78ef72f160aa67934c6a98f739e7d971bf1a5e5ad43d8b2af,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace,Tests_passed,1c3fd1dda34bb14b08f75d563eeb8d4ba330dc2916036e08a50031adb8cccace diff --git a/results/reaper/merges_tested/google/guice.csv b/results/reaper/merges_tested/google/guice.csv index e13cc33853..66c4abacd8 100644 --- a/results/reaper/merges_tested/google/guice.csv +++ b/results/reaper/merges_tested/google/guice.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 91,refs/remotes/origin/pull/1337,ffe30c7e3aaed880abdd03d3b9c1a87a723ba163,64180387bbb3e154427a2a37ec32a8fe5fdb3cda,338d0039c1e30038f22f0d5544842c1e87406a8a,,True,True,True,300,1899,27721,3,True,300,Tests_passed,6ed1fc4f6c90560a2535b2cb804e7a565acb6250f2d6c2286d1a8e56a020519b,True,Tests_passed,33471759706ea8d0fb998310a24a6ddee14321e3408978c76b19f5213b2c4dfb,True,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,1d4430f8e61c48f2eb391218ad5bda11c8c90e6a4618e1546fe30905eb3da570,Merge_failed,1dee3e6a0c5915156de28efd35129b8c4fba03a68684844a39118f9c0dffbc66,Merge_failed,0eaa006f6ccbbfe262a1e9e6efb1ed1cb2114d9c926f9c40665350ef076b8c79,Tests_failed,8b1ecd751934bb5f5b195eed525d7a7f9c25459a6b5e26e9d45f10c0d2e6a92d,Merge_failed,1dee3e6a0c5915156de28efd35129b8c4fba03a68684844a39118f9c0dffbc66,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,bd85a1092d0b4f432dd48a607218f600d4f196facf97aa24d324170a3fb3cbb5,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Tests_failed,98afa53f6e5db808ce57010bea78554fffe330be96c675bd976d08dc8ed6e8f3,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e,Merge_failed,371084a3fb51cbd946cbfdd7f84c1799a4783ed19f15c74d345252a258ee852e 107,refs/remotes/origin/pull/880,3e8d638a869b041afbdb0dc3a2657b286f802ce0,ef83eea7536dffa00282ce781768e86686fdd243,0604fc7487cd2108d6c29643c578bdece8f27df3,,True,True,True,106,455,5307,4,True,106,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,True,Tests_passed,78a2af64721a306210912e716c8e6b2257a12f9de6970389c054754ca76c8bc0,True,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,92a6ec2c93e7eb7ff1291d0937bd42e03503dd42a83a11e0e671f51067c23aa3,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,6ca820d795b890b36440a88be1bf2d796ef7f1684f9ceb6b322ad87cd2b4ff4b,Merge_failed,583eb53d0204dc33a3dbf7d27edcdbe90eafc183e16b66768d501dbd34519063,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,3a1f77ded00d278912d1bb29b2c00bc14142b278ab618eeb3e1ce926a7a48be9,Tests_passed,15872ee7b11af360ccbf26a65c157ab7f0350a750506a6643e151517f9906863,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,fe9a6c8c8a972dfc1ab0b8707d8ae370ce6368d8eaed24b458150ec78e391cc4,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d,Merge_failed,9d397def89a15e4153c01227c8d6e6d7ee572bfd8b6d05a2116af78756cfd18d 108,refs/remotes/origin/pull/880,3582277dd2180a3561c903f5baecef9817a41463,92903d3974fcb8275e7c610e5eeda89059b060d9,c040e3797e30f4b52df1a10637259b2e08f1c0de,,True,True,True,2628,3640,1590662,18,True,2628,Tests_passed,9947874066e2629adf52c572abfa8dd615895b40ab5080f0325094b38053d911,True,Tests_passed,590a30ed04cfd168dd19c8bb1841b6fd75d234c23f558fdb7fd4a59ad2bf33b4,True,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,690d16e0fee78d047f6d492b675c4c08c4af7760de4d234ba7b1ec9349595933,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,36033a809a6ad414a7f8988e6bd80c6e6a70be8f8f08668db3dda329e7213bcd,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,161067042616ba8c81030ac990b71a668844b31196f2148035b40e0a5a3e159c,Merge_failed,ada6047675a4663170f5f35abbdcdf96bcb79ce3c26d98254ef0908e7ec6add4,Merge_failed,e8eaf0bb226611eb5b8b8347a4edc58fd74c2624d1f34695ca15ceb4bf02878d,Merge_failed,59849b17bd4b3fba05de50bdb47057e40389e466111c42bc6668d00ee55f725e,Merge_failed,e46a0848aa29e3c07934fbb04697cb5cafa55b951b75fbd7840ed1e02ddc2117,Merge_failed,e8eaf0bb226611eb5b8b8347a4edc58fd74c2624d1f34695ca15ceb4bf02878d,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,36033a809a6ad414a7f8988e6bd80c6e6a70be8f8f08668db3dda329e7213bcd,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,9147f43a3f5a93cecb6a89cf969db1d58fc36a3cff88c60635eea6e966e0223c,Merge_failed,161067042616ba8c81030ac990b71a668844b31196f2148035b40e0a5a3e159c,Merge_failed,2f98eaec517bf6d8033b4f760923c083865fb39ad546184bcd3f5b6a97c06b62,Merge_failed,9a1ffd5ba538e2af4d001ab9307af0cc6a22a6ff2768e217f1ad39a75cab8dc4,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,690d16e0fee78d047f6d492b675c4c08c4af7760de4d234ba7b1ec9349595933,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139,Merge_failed,cf390a1ea3e635a7a3123043f487353fa4bca3499e4e4337a9fe01f7bb09a139 diff --git a/results/reaper/merges_tested/google/gwtmockito.csv b/results/reaper/merges_tested/google/gwtmockito.csv index 2897d38918..23364e0c05 100644 --- a/results/reaper/merges_tested/google/gwtmockito.csv +++ b/results/reaper/merges_tested/google/gwtmockito.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,eec530f0d51313698a334c7dbf5906d950994698,3abecd684fe2109616c9cbf2e9c84c9ac962f129,392723cada499dd23b6808932e3007614dbef0e6,,True,True,True,5,8,125,2,True,5,Tests_passed,05172c84133878ea46ab524752cf6bf05b88f3a47c8313479d48f7b3717bbe4f,True,Tests_passed,b5fbabb3e1ecf8afa1b951f857fd02b4be01a0e14172382e845d35a259e75ae2,True,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,e891ff4e50e4d5ff2d8262142a3e74c39551068c52fb717ed39d9ef181a73671,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd,Tests_passed,c44231d0614d8e436fdaaee209ab3d4425f30b961c127f6bd3718a437b7cc0dd diff --git a/results/reaper/merges_tested/google/identity-toolkit-java-client.csv b/results/reaper/merges_tested/google/identity-toolkit-java-client.csv index 7a216002c7..8fc12583ad 100644 --- a/results/reaper/merges_tested/google/identity-toolkit-java-client.csv +++ b/results/reaper/merges_tested/google/identity-toolkit-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/38,f6edc3c022d66b33913deaac59cb7f42ab46303a,b86a722430a5458bc1183b2133b55de75eb71c2e,7d39b4815e3aef9aa5944f44ce7a96fb4915a7ba,,True,False,True,3,4,14,7,True,8,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,True,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,d5469e5756f2cf6487500f25c347e853a84c011765a823ded08ea2e2c6e1b563,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,e21e5e1b7e4b1bbf28f8a5a710e6f8a9cdeb5b9dc1aa19751de4e2fc23b54fce,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f,Tests_passed,5b1ac0e18f4c63ef4af4b5547ca7c59d5ce0751c801e28e2cb934145dab0e05f diff --git a/results/reaper/merges_tested/google/truth.csv b/results/reaper/merges_tested/google/truth.csv index 4ffa4429ab..7496f9cdfd 100644 --- a/results/reaper/merges_tested/google/truth.csv +++ b/results/reaper/merges_tested/google/truth.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/master,6bba06199f634cae5daafbfd70935a7d76871fe5,39fa8ab5fcff494fa1ed70251869dad3816be3ec,0282392866a66e4828d75b1475dfe17b8e827e44,,True,True,Tests_passed,3084884d2027fc037bda642caaed427e4ed51ef4b912921b309165f3df3308d6,True,19,50,288,2,True,Tests_passed,103fa94c7ce6ff4f1b0fe84bd2204daafa69879d0bfb89d2329d6957c31ec674,True,19,True,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,85ed3b8eaa233ef29e8576b8b0e42ad43b240e0604764c5f41079c969a6c67c5,Tests_failed,d177b4181eb95d346a50ed69b2052e1cc595bdff1454624df14b7e2de2b92e46,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,85ed3b8eaa233ef29e8576b8b0e42ad43b240e0604764c5f41079c969a6c67c5,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4,Tests_passed,a2f1b6dd44c30144157916e4297743e871a26bb6e0768e2f09197f47118375c4 50,refs/heads/master,ff195129ec6e45449f583a049be3b5a1f9c56a20,d87f02dfb380742e3a27374025cecbe0fdf84f68,1a99ae4aa2eb3d4df4ef4c1779966c6d66721b63,,True,True,Tests_passed,01326b5a10a18929ed0a57a32d0b7eec82faa0c9a83d5c008dde65ff95ffc089,True,13,29,501,3,True,Tests_passed,b861f94b18c119b25fe907f2a49e3935f92560e727f752f70b4191634481af31,True,13,True,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,2614a7aa06caaeb02d3f656e4e46465248f8192efdc3afdbaf83b67e8d65d00f,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,2614a7aa06caaeb02d3f656e4e46465248f8192efdc3afdbaf83b67e8d65d00f,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4,Tests_passed,660c1601ba482ace5c766c3430125640a3ab62e4d27e1a9dab0178659c7a59d4 57,refs/heads/master,2e4a23bebbce280861453c0d6f6f0a3dfd0e6dde,a9381d46a71766517f5df21c00a57a3c3f4a0417,5dda414fbb153f5cb20a88611f034f0ba14ffdd8,,True,True,Tests_passed,e62f6d500f4d21fa0095de89da0eb963dd154425eb243055592ffadf0a35a72c,True,4,42,279,3,True,Tests_passed,dfca8ba1e00b31b0e1d91cd18641319bda821aac8cd14291314d6150ce598b75,True,4,True,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,1ae01ccb08ea33ce973ab4c97df359bd4c918e567a89aed28e594ee96a76d19f,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,d7e425adbddf3edb58192f0844ec22cdf4223439831f6a5924a0805986024080,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,f152122c809bfc3e357af51bf0e8fcfdc1cdef4916bae4bac891444ebb7803dd,Tests_passed,38e20705ffbe6e8f0e5efe32f7ab85cc70cdedd23c70ee77478f5e6233e07d78,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,d7e425adbddf3edb58192f0844ec22cdf4223439831f6a5924a0805986024080,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,f152122c809bfc3e357af51bf0e8fcfdc1cdef4916bae4bac891444ebb7803dd,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,1ae01ccb08ea33ce973ab4c97df359bd4c918e567a89aed28e594ee96a76d19f,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab,Tests_failed,c108093585efbbe8570a8c67e0b5ed8aca0c6fc5c3e8cf572f2a83b0db90b6ab diff --git a/results/reaper/merges_tested/googlecloudplatform/gcloud-java.csv b/results/reaper/merges_tested/googlecloudplatform/gcloud-java.csv index 90dcbe0bd9..13d63dbdf9 100644 --- a/results/reaper/merges_tested/googlecloudplatform/gcloud-java.csv +++ b/results/reaper/merges_tested/googlecloudplatform/gcloud-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 897,refs/remotes/origin/Neenu1995-patch-3,bba6925b685635ccf0890a168192f093e1b6138d,b54c501ca4af73f91bc3a2cdd5badaa3e1c204e6,0dd3d971bafc2d724787a76e69fdde6dedba51df,,True,True,True,144,1041,11124,9,True,144,Tests_passed,57ed68ae04620b0a2ef5e86f91f3dc377e47a3bce957ed513462782aae23fd67,True,Tests_passed,20455c0389581efede595f3e26734a3371447d50f3b303482b8c97a2baabbe2e,True,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,340268d2080a1aec4f5917e7b7b4d9e55bb51d769b18f81e955a10c1688f50af,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,ac6a4924241533112036710a3fa034e442e69a042081deca15bff0f6b43d5dce,Merge_failed,98d754a41c590f0ffac9286488abc07536f6f0a7959ee9e4ee483a48c842cfbd,Merge_failed,4169f996892878fe587f2989af69cde06a3ef22d83846e034a2c5dccdb71d29b,Merge_failed,b156655d392932ad65deb01a8a0c2bcdf3525d661d79afc13b56c18f65bb8831,Merge_failed,98d754a41c590f0ffac9286488abc07536f6f0a7959ee9e4ee483a48c842cfbd,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,340268d2080a1aec4f5917e7b7b4d9e55bb51d769b18f81e955a10c1688f50af,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,07bf0fd7c18317ffd7745763eacbfc9331d0790b128b142d747fd9508c8e8743,Merge_failed,4169f996892878fe587f2989af69cde06a3ef22d83846e034a2c5dccdb71d29b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b,Merge_failed,faca03fac52be69839556fab1d5e2f4dc647960cf8acaf7a81bd0e10101c498b 955,refs/remotes/origin/Neenu1995-patch-3,1fa53a817ac6c3962ed89645b0ca86e276e73bdb,5d8d1237244e0c8b9a76dc66782d6c69cdd916ac,86065a7fc7d130977a40b99b2bf77d6889d84418,,True,True,True,9,26,503,2,True,9,Tests_passed,b16ac46f049d06e80e45614469dbf59bb2d368b58f4ce792b254fdc5d93449fb,True,Tests_passed,a4d336918f7ec4998f682688726e185c62d12c2a625ac21823c68101e574b9a2,True,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_failed,585b43a98be190e944262efc2216f5397c62cf30efc88448f4602f9d1256382b,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,56abb84cb66a0a8a9d7d0a5693010b9d7ae52bf9d000b633d4b8513cb59e0af5,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019,Tests_passed,010b036ad7af737a23420d5d43fff433abaa6432a249f61c7bc6639c2a248019 960,refs/remotes/origin/Neenu1995-patch-3,48458d345e33459aa7d477c820f7a83923cddc8a,0a71721710ff8d78e0f174e7f31e399d151a6a21,800b7090409203833b61cfaf4ec227eb26e1d82a,,True,True,True,18,77,1413,2,True,18,Tests_passed,22e39c888e0486b949ae2bb5088e3fd0331e4eea0875812a2fd77d23d94659d0,True,Tests_passed,8decc0cad225eb113fed17f21ad7c94dcaeafaa6b850aca7a1505d084aa577db,True,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,10009536a88e6c6b34121339050503125d808e7dbb6ac4290cea8076c951695b,Tests_failed,e06c5ea0a5818da6e8419529ed9b3818a8e0c804543366f24818822de01f6810,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,10009536a88e6c6b34121339050503125d808e7dbb6ac4290cea8076c951695b,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117,Tests_passed,ff40d74f2172f3d52783ddbd924dcd5200ab844ed5e634901c2dcfd1403df117 diff --git a/results/reaper/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv b/results/reaper/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv index 9cc59a9f88..60096aaacc 100644 --- a/results/reaper/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv +++ b/results/reaper/merges_tested/googlecloudplatform/gcloud-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,8e04ccd0191c04aa74799a10ec32adefa0e1800a,cf3945112d4fb7b8d6907b6d801cd6f0ff33c1df,dc10b3241e4dcf41b74259f2bee758a776c3e4da,,True,True,True,10,54,371,2,True,10,Tests_passed,dca5e099a34494c2542109ed2f67e540e6b1a8cdfa9025a535d9508a4994ef55,True,Tests_passed,4d6107c7ac2a21b62880c061b98a066df5393838964f2947a295dddf5f3bb2c1,True,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_failed,44e51bf2c931f78cdf98afbc860646c3038d89a45dcbdad5c544f7974eef55aa,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,46212b7d158f3b6a13bdde3490f6f6171c531aa1ce6ce478fd8da2e185b93d30,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec,Tests_passed,16be7ee692d73624f6faf7712f4e993649477a49b5dd8bb65e1ce89aeed1f6ec 27,refs/heads/master,ab0b73492be70ee1d298428f918b5d0a2cc95a19,7de13dab06f0d842de8a255f84128cd549875375,990444129cc2e53bfe3212d4fae0e5919e93c00a,,True,False,True,3,4,19,2,True,3,Tests_passed,37666d96223cfd79630c36e54e1dc065320cf7555c0d80ef8fcc4772971151cf,True,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,True,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,175dee53d59fa2b25223f0d581dece86ac1b3d4a9054436f6518e85bc3ddcc7f,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,393745284104d93efe516739d1827b67c3ddce24d2acb31e5c010e714a7f7a9f,Tests_failed,40615774150692c7c1d4105d47df87e7ddae2c0f82d405955af8aa177caa882a,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,393745284104d93efe516739d1827b67c3ddce24d2acb31e5c010e714a7f7a9f,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,175dee53d59fa2b25223f0d581dece86ac1b3d4a9054436f6518e85bc3ddcc7f,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1,Tests_passed,59a07b04884906083da172d2c595fe308bff7a7ab5862f65a1b4f247c90d16e1 28,refs/heads/master,990444129cc2e53bfe3212d4fae0e5919e93c00a,5db10d957d538d938d32f5d929efa713e8336456,53211292d79b368c32bf8514065f6c3e48c12ecd,,True,True,True,9,97,757,2,True,9,Tests_passed,86499d89a39784e05457eded34c77f4c7c25da997ae6fca072b2738f435e7874,True,Tests_passed,3b07d01f704bd329b797501787c09fb761c2556acf5b46594ef96d1e8f2e4956,True,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,6ff29ba8d642caf6806715079d5cbe9e877c834d7150092c36a1dab76686c259,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,922fdb13fc367543c4844efcaab0334b992d939d5fccfeb1acf35756ad60173d,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,922fdb13fc367543c4844efcaab0334b992d939d5fccfeb1acf35756ad60173d,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,6ff29ba8d642caf6806715079d5cbe9e877c834d7150092c36a1dab76686c259,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e,Tests_passed,e766759eb16280478e1f7d21bfcb2fdbeb5fa47e1df8c6f32e625201e6ad407e diff --git a/results/reaper/merges_tested/gpedro/slack-webhook.csv b/results/reaper/merges_tested/gpedro/slack-webhook.csv index e593760157..9f630f9f5c 100644 --- a/results/reaper/merges_tested/gpedro/slack-webhook.csv +++ b/results/reaper/merges_tested/gpedro/slack-webhook.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/41,566974e6f460456d9dbd46a27b39d49b50964c67,66aa7d7688037883abc3af82259df71ffe030fba,bcb855e94165d363b7594ad88124ee4e3691dd55,,True,True,Tests_passed,3fbc2ea8ee1656d19e9b4eda46020ae9f7cb5d0e775bfbc3c361aa930890974e,True,11,97,1569,2,True,Tests_passed,b8cbd74e5aa723b4164bdc734ed836647972b3f2f5dd2e72f87c0945a726c25c,True,11,True,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,e55ef79de5e925f4d4a90a181b6ee9aa93cb7baa48fd12bc030d5a0a507d2847,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Tests_failed,80c0982c27dd5b27c6639d36d6b0b46b8a692f0369afa27050eccb8aecdd02a5,Merge_failed,6f7c1f477efbde2adb7fb282f5a44314a3985ff50eb7c4dd1274ee3f07007978,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,967c8f35a01af2f20108b347224a047ec548bc8ebf0c0ea56e14066103317f8c,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,fd9182372c3b207e33fdf5a8456619a3d79cd0daba81be3f8f22ebcfa4a66a19,Tests_passed,618cfb60d1674fd09d66e8fcd74e1d5c20b3099470e56c8679706b5f5d016c4e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Tests_passed,aa6e2f7d557c8690b6c42434c95cfa7a01bf8bd7396646e56c7f4e8262f282c0,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e,Merge_failed,666c70edd1e32452aaec718412e3bfe72e7ed9ebd536d41902c9030afc555c5e diff --git a/results/reaper/merges_tested/graphaware/neo4j-noderank.csv b/results/reaper/merges_tested/graphaware/neo4j-noderank.csv index 340543bfd4..052882a5bc 100644 --- a/results/reaper/merges_tested/graphaware/neo4j-noderank.csv +++ b/results/reaper/merges_tested/graphaware/neo4j-noderank.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,01ca7a83cadb126fcef90405f4a8036ac2a22a02,b78badfb88462adb87978da091e7b7213e3aa6a1,19602ad06a849def37a2de307a320871c1328fa2,,True,True,True,13,34,289,3,True,13,Tests_passed,b739cf8e7d2ddc904d23ed4d66172c163ca413d14e78fe6d07f25048595de770,True,Tests_passed,76bc71509d3cb6f40997b441785bfd2d0a99c13d3ffaff70a495597d6db6eeae,True,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,a0b8645cbbfe24cecd504ca8de488be49dda1f96327e7a8fd7242a793a3ed225,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Tests_failed,e6e4833c9cb895916b90b152dabfe992e39d6d10805fb7bb6ae788b4a21d4aa5,Merge_failed,8fe2b4cadc110e2d904cfeaa0c2eaa2c1492f1c04cdfc914da59a57f7870eb5c,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,c9d4a819d219de3f4df3de9195da68448aaea089677ab6ee7762eedf447a6d45,Tests_passed,d84b581912d13448fb8eabbb2ea084ab2ff425ba224c585bb357bfc28afe25b5,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7,Merge_failed,cbe58eb8603c31c35252e349d9def4dc059a9c5439395e079ca91f46abd709b7 diff --git a/results/reaper/merges_tested/graphity/graphity-client.csv b/results/reaper/merges_tested/graphity/graphity-client.csv index 777fa50130..64b739d756 100644 --- a/results/reaper/merges_tested/graphity/graphity-client.csv +++ b/results/reaper/merges_tested/graphity/graphity-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,2a8e8c75e97d82b9c1bf5562af018b45f86d3120,4f9464b5b8eadf89842546b95f4c25f03d6de7a4,5d8fb283a53c4f40897bb50f7003c5453bb2d1df,,True,True,True,2,15,138,3,True,3,Tests_passed,bca72e5f7a121e2b7c9742dd6d912b8bb96c19728bfa385f97e30cda07bd9a5d,True,Tests_passed,e58d47f1eb3a9defe1a30ee25b100aaf65649fe7c9b820adb971c9b192f9c5fa,True,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,609096401f319af53729556d12df86a7ffa839aa409a7e7188eba9f92f672a7b,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,295dc05b06b9a474ae07c712784fd5605e6feaf3daa0158b4b822d0d6d35c607,Merge_failed,81661d9b6c6ec36e236b8dfa03b450df89a9f8198d64ebd9b21a4c2d8b375612,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,4bb621c0f92fb8e448ad34d7ac4a4b4f441a816b7f4bd4cf381903fd10e5097c,Tests_passed,cdd76022fda6b47bedc2e58eb0cc55dcab45c25f19038fb584f9f9a386759d5e,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,cbaa3c14214261a5b3321a201d1b0cfb9e02b04484e54db7abf3764de61c0b86,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496,Merge_failed,0a409bce9e883bc92623d18ef4c9a3d881a11c4fe899d397c90bd4f19099f496 diff --git a/results/reaper/merges_tested/graylog2/graylog2-alarmcallback-slack.csv b/results/reaper/merges_tested/graylog2/graylog2-alarmcallback-slack.csv index 100ac7b268..9f429f2cff 100644 --- a/results/reaper/merges_tested/graylog2/graylog2-alarmcallback-slack.csv +++ b/results/reaper/merges_tested/graylog2/graylog2-alarmcallback-slack.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,63afb94bcd157b7ffe10dcef43743a33946c65ff,3d1fd37c02b7c581c557a51b252d80769486b6bf,69d6d1cfd2703a67895e69a54b3fcb023486ceab,,True,True,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,True,17,80,544,3,True,Tests_passed,fd24f961bdb1aecd6946626939129009f14f5d0a88ed8a33f96958841217a762,True,17,True,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,60bfb63b214860f427d22fc3be2973563e6309b787ab9744312b3997658a06f9,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,2ce71682c30b454d6ceb2382b4ea0e12d76a7a0aa76aa540ca8be9f9e27b6d8a,Merge_failed,ddaf3ea36b8ca7b36b55b015692cf7f7b46577c1fd50648e4891b1d03fc5883e,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,2de73c0b0bb79e757a5839861d6206857043bffaa2ce7ae66a3686f400110242,Merge_failed,5274beb1430a8461efcabdc33c896fcee5d242df7aaa01f05a435851cd5bbcee,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd,Merge_failed,acd4751e4d6478a76e0d290a08f15f6f24eae2cc93288fa284f99dd9c2bc1efd 8,refs/heads/master,3d1fd37c02b7c581c557a51b252d80769486b6bf,8ae2537efadef9087ca49058c93d059a0c69f10c,22c5650f8df37377e2cb03ba6034bce50e9d184e,,True,True,Tests_passed,8755903f68aa49a0d85a7d607664f447b4abc794545fe5e2678c8d5a351aab24,True,17,74,524,3,True,Tests_passed,f9b45ac034aedfe19df776adc0d72f9fdc3dab80b1d0c7d523c7db36785acda2,True,17,True,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,7f7a0fa04bec660dbcbbda9af5d6d63c0a6bb68d8a8b6c587b5dc88bc17901ea,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_failed,a505cba4d00535502af2d2377c1c6be3c52bf5cf4a49ae32a88986b8bbf00232,Tests_failed,fd4d3160b36423a9f15bc1e2e1f90d4a007eb102781bfddfc5f0dc3446613e12,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,7f7a0fa04bec660dbcbbda9af5d6d63c0a6bb68d8a8b6c587b5dc88bc17901ea,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_failed,a505cba4d00535502af2d2377c1c6be3c52bf5cf4a49ae32a88986b8bbf00232,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb,Tests_passed,f76a4a18030a6f467f962a5357b63bee1119a778f4050a2e626e8ba110415adb 11,refs/remotes/origin/pull/32,c9a4912adaef3596c44b1fb7f501dcdb96190977,567f612e286b64e8414c5e4bafe8a0a2c49897a1,33f4ee652e2ad0055dc6576700db6b3118612968,,True,True,Tests_passed,6635ce4509418b5dab260931557708b9f13c2c7643b26aca0162ee5d712927fc,True,12,81,373,3,True,Tests_passed,0f88e4d198ed13f4c49c2fb6f1f1c9e85ad8933ae3981fabbabdbf1ab439befd,True,12,True,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,ecbf88bf994d65df628f695887c8a30cdebdcc4352dc8238e4ed8d0cf6e68ebb,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,d42cbe964fc49b61e08f1897933bf1c0ecd11e32ab245b3b4f6fe2549125be4c,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,29c5cdd0d6203194588809c444694aaa0bf492eace19c6c47ce5b88ad77c5904,Merge_failed,03117d06631c5b10b9405fd1adc5fbcdaabc1e4160f4d047de4da129d81513e6,Merge_failed,041aa2939b7be7cf71e49a8eadecc8345b0088c92f76f7a1805feec7f92617db,Merge_failed,3303b87410284678a4d55e55852719d6c9b0caa0dc1c7520b82a94542419e64d,Merge_failed,03117d06631c5b10b9405fd1adc5fbcdaabc1e4160f4d047de4da129d81513e6,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,d42cbe964fc49b61e08f1897933bf1c0ecd11e32ab245b3b4f6fe2549125be4c,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,ca973f569db4b7961a95857c9d46cf9d8bd8f49e679a7d985383f3265316fa5f,Merge_failed,041aa2939b7be7cf71e49a8eadecc8345b0088c92f76f7a1805feec7f92617db,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,ecbf88bf994d65df628f695887c8a30cdebdcc4352dc8238e4ed8d0cf6e68ebb,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87,Merge_failed,a28005b792b749639b636376b4e7d75765850ad561c6903354a70e4dceb95b87 diff --git a/results/reaper/merges_tested/greenlaw110/rythm.csv b/results/reaper/merges_tested/greenlaw110/rythm.csv index e9983c9c3e..d897b20896 100644 --- a/results/reaper/merges_tested/greenlaw110/rythm.csv +++ b/results/reaper/merges_tested/greenlaw110/rythm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,cd7e25b33109be5019be4c5bd155a4363a699aea,1e248bbdb7aa47033d9fcea34673c2492b293f25,da619ebfd8d34cbc272b1296bd79ab0e577d8176,,True,True,Tests_passed,78b248e96b4a88fa2f43128c895feec9d264652f84312319c75131a87ae60a95,True,211,212,4215,2,True,Tests_passed,f03afdeef57eca78a921a636cb411a3848ef21053c7d70a2fa1d0c3ed28acbb0,True,211,True,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Merge_failed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,31a19882ccd9b02e3ff5027ec8fc81f77ea28c7e09e60f324d6ac3d17daba075,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Merge_failed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,31a19882ccd9b02e3ff5027ec8fc81f77ea28c7e09e60f324d6ac3d17daba075,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3,Tests_passed,eb17bcc0989520a6f4b3ca6831247dc3ab561daa94c3c69923818ecd030c13e3 15,refs/heads/master,d9f68867177eb40765426874c583d9a70c5a4da8,e088577eb5a25ca06c9c4d9b55f90411af1fed87,7a55514a2ed5fbe7bc1b7a62b1ef8875acb5022e,,True,True,Tests_passed,0ab73f64daea558fd3c8b4439fce916828af4f6be054b5b414cbbf8e2224a00b,True,15,149,783,2,True,Tests_passed,44f6503cd197e144e642eb737680fb2579d2e56ed3f9f2b96d79fce244385aa1,True,15,True,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,1e15251b912c6e09b7fcb7a07485dcbc54fd8757143e5eca28c8d261e9f73dbd,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb,Tests_passed,8b39963dbec92e4a4659313cf66038f69c31bc932102f57ac1bdff42bebf28cb diff --git a/results/reaper/merges_tested/greenmail-mail-test/greenmail.csv b/results/reaper/merges_tested/greenmail-mail-test/greenmail.csv index 739156ab18..b39fd714eb 100644 --- a/results/reaper/merges_tested/greenmail-mail-test/greenmail.csv +++ b/results/reaper/merges_tested/greenmail-mail-test/greenmail.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 57,refs/remotes/origin/pull/294,e152dc4b90c0ad478ee886f8b110c5b220d46b05,d3ea847b346eb8879c2509681601175362e98875,2029ffd8f633897fa35c933c3ef46f969664dafe,,True,True,True,33,79,507,4,True,35,Tests_passed,25c6de389e070410d9bd2baf703df18e116736f675d91bfce83fe2188f3c799a,True,Tests_passed,face7a5e90020187a96ed0a13ab332d8091de7f093cc0f42386589e7aaec5c8d,True,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,fcf3902c1881a2fbaabbb9ea6aafbc391dada549566c98750e95a21ee4d81031,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_timedout,,Merge_failed,d26a02eb299765f04e13c033ceb06903851505a5f78698fbc73c8cdde644b23e,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,b26bc4b08d89123133c47fde0e3940da901c5905bd692d67f12ee7c86fca170b,Merge_failed,b9da2eb9f0fda6666a8fdbbe85e646542f4c12a899334f90698807979178304e,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac,Merge_failed,bd3f5149dcbf1406a82efda2e6185f3a0c44946588e6a3a044e151f58d7827ac diff --git a/results/reaper/merges_tested/greese/dasein-cloud-core.csv b/results/reaper/merges_tested/greese/dasein-cloud-core.csv index eaaa6e04fe..53c7cce47b 100644 --- a/results/reaper/merges_tested/greese/dasein-cloud-core.csv +++ b/results/reaper/merges_tested/greese/dasein-cloud-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,74a489c92f34f73958a6ae8ae1806a4f1f5ba571,bfd75d205caf7b4e5b12ea10111d6d6a3b10f785,4aef48c13cdd045001c75554d44cb3d5b2f2a070,,True,True,True,45,185,1671,3,True,45,Tests_passed,a7f20b65424d884056e9d4e902a7cecca90a778e5b5a15d543998a1959f3b5b3,True,Tests_passed,6cfe512f67b86b693a098a18fd147a7bfa5e9358616ed50e687473564868db64,True,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,92773701f449fbdd6c2c0bf2b14e02d02adbb8936025e1ab382b857e847e37c9,Merge_failed,87a7cd00bc0cecd22a7af44517c776135d3bb26cfe47e398b8a5627cc22f904e,Tests_passed,c43a0a05b4e02cb536eb70b32aef8ef9cdd1773888daae99d4c5b9395358e662,Merge_failed,e27827e1dc0a536f4daffe31029bd805088d1b80827419e8c9d0cd20109aad89,Merge_failed,87a7cd00bc0cecd22a7af44517c776135d3bb26cfe47e398b8a5627cc22f904e,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,a113a03fba2457b431f88f090dea48bbc891bd0dd2eedcbecc8db35d14ee5d56,Tests_passed,c43a0a05b4e02cb536eb70b32aef8ef9cdd1773888daae99d4c5b9395358e662,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Tests_passed,df22f3a68a674089beaae6384319dec9648d953acb05df007ac507ff13064e28,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b,Merge_failed,5b8e49720a955ea26ad732b96db2357f9b7f1843cd119f755b604214d930611b 26,refs/heads/master,c502bc6b3374bf7df609bf6b30545268b15d28f6,bb1c9bc4db7d22c7a3becfa3e82dfe7e272db08d,a33b1b3a1b77c53d54838540ccee68c7ffe584ad,,True,True,True,7,22,208,3,True,7,Tests_passed,793ecf50775136809929de1898e6241e91923e32ebd486a40ed0d09b6277df00,True,Tests_passed,b89ba6c22036dbae19ca717bfefbaa801780429a2987b9300d5c91b1ada7b8b6,True,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,14d52d783cda3a905c6896c21b0f623dbe1f458bb8d3f5719ad7f86e258b1485,Merge_failed,7640eebc866d78240e0a338868fde4b5569b396d5e23807f920e92be9e47ad4c,Tests_passed,f8b5b45f79be2afefae8fea27c5f27c50274fbc47fe62f398b9fe75ea694cf1a,Merge_failed,50c174918cef25b89c8abcd8c765ae3608922107e332f35f50e9403efd0b7991,Merge_failed,7640eebc866d78240e0a338868fde4b5569b396d5e23807f920e92be9e47ad4c,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,44a9b7ac673cdbcc76042af71c1430b8a1905fd350125969610248b2e5f29322,Tests_passed,f8b5b45f79be2afefae8fea27c5f27c50274fbc47fe62f398b9fe75ea694cf1a,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533,Merge_failed,6286cbe0735f188df1a52aa05468ac1d324d1a8e0da65b2cb158d06c129bc533 41,refs/heads/master,a06b7693d76afdb92aa2187de52db638f1cbf688,a61a51b03a3baa0d30fd9a5d76be7cc4c17a1c1d,67afaf303c178960a4905c9507de98e5f4f53f2f,,True,False,True,4,6,30,2,True,4,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,True,Tests_passed,6982b6d91cd2bbfe9f4f6fc9255ace3ba702ae522ad8d4ae4771186a017d97de,True,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_failed,f3dc59fd5e83d7b352832aa38c78468d78abf71eb9c4630983220f70df3040fa,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_failed,f3dc59fd5e83d7b352832aa38c78468d78abf71eb9c4630983220f70df3040fa,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f,Tests_passed,0801e27820d8ed75c327203f2e3968142d7150d92cf4315ffa83878e10fb206f diff --git a/results/reaper/merges_tested/gridgain/yardstick.csv b/results/reaper/merges_tested/gridgain/yardstick.csv index abf0589815..236b8ce8cd 100644 --- a/results/reaper/merges_tested/gridgain/yardstick.csv +++ b/results/reaper/merges_tested/gridgain/yardstick.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,094b8c16a3d14302e26113a542cc760f07a36007,32183ef3c8feb4b54a40047ea9aa93e2de372abf,b112625effff3d71f6d013960afe1c39d433a923,,True,True,True,7,9,539,2,True,7,Tests_passed,036666862ab023d692f66b134b3ea54d0a1979a98b2692d6cc5a44f0b1b45373,True,Tests_passed,f1952b5c43a667a084ebf1d5680f6eaa5cad790b9f422d70248f23084d31ead4,True,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_failed,fccb598a3b4da346cc542606cb6961435458d510505d99717aad586e9ff323fb,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,e12de50e86e02fe0d16c4bb1f1faf071219b7f756b680da11e148c95e8c51b3e,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,4509ea3ac1a8c39f704b716001874253d6f493f6d142ca8703eb80efa49d7f35,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548,Tests_passed,d3aaa7fa742da302f9e5fa0c4e58fab899955f7a92b05d6e0f29f610715df548 26,refs/heads/master,26cbe1302e1a08ae9f04033a22c4593ac16faf00,7fcc0095da01e2783fa87a8e3d8f593bcc651657,8a13eaf3a27aff435a167034da63c1a30e6b16ec,,True,True,True,18,79,694,3,True,18,Tests_passed,faf16b48bb98a20cb162122db253ea5adafe3a329a5a6c0df93e021f6c789daa,True,Tests_passed,656589828e0ed759acf2e88328aa930dd4a505bdae8dda4d4330ba9ffc0acb9a,True,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,0179de6da769ed3bef8347807e20ddb70ba6e1c82cb498c79e15a3b118e6ec0f,Tests_failed,cb252dd3a744183a2e18ed24e9a2b20d2bb026b68e28c8d908d4007fdf06aadf,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,0179de6da769ed3bef8347807e20ddb70ba6e1c82cb498c79e15a3b118e6ec0f,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135,Tests_passed,bac5519e06158d735d4c934015af57ba86102afef28347e99c7d1dff6c47b135 28,refs/heads/master,903c7f8ba68821de261d46d6faa53c7c4f966423,3b588131ac31435109009fce19ad896d234e9d6f,5329211282f0de4ad1461b8694b2a8edd8d0485e,,True,False,True,2,3,14,2,True,2,Tests_passed,4f31445a83f68172f10ef8627db4d82c26f8da6a6aac0b5725f53eb7407778b4,True,Tests_passed,42cea347429f09a3697990ae886d3aac12151b5ccd6a243401a4fe6ce0b0908c,True,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,95e094b23e4746fee1087845d50ed0833253013e9cb3a8972ad350987759b41e,Tests_failed,56262674a3ede0c50488b94b3ff4ac7601ac79be12a9bd0ac8baf2db1f682d0c,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,95e094b23e4746fee1087845d50ed0833253013e9cb3a8972ad350987759b41e,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56,Tests_passed,947e7e938372ff61f1065ad940c90f5d9656d2be5ea052cb0aebf5c2eac4bc56 diff --git a/results/reaper/merges_tested/grove/presto.csv b/results/reaper/merges_tested/grove/presto.csv index c55ced4ff8..6263d2e671 100644 --- a/results/reaper/merges_tested/grove/presto.csv +++ b/results/reaper/merges_tested/grove/presto.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 35,refs/heads/develop,36ff2b171e7967eb97a0eb56bff9b9c941e54445,685b5b1ce7c2f703be674ab4f843957a6eb85307,3ce4a2408b27c4f1f174fde6f2b15420564f1078,,True,True,True,6,27,126,2,True,6,Tests_passed,1fac110420c37c604fdd799042edbf23c0633801b316e67dad7c235e8944f08a,True,Tests_passed,aceaf9148ba582578ed210498c3b422a63901c4fec348628c832abe581f8a6ad,True,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,08d56461bb8e34ee9b45571572d353b19c6f9cfed0165ec2c55a17c0f0861dd5,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,08d56461bb8e34ee9b45571572d353b19c6f9cfed0165ec2c55a17c0f0861dd5,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,5d98c9afb148bdbb77edb59ef0d63174cea0652d8c832764d2a7b05a01122c25,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae,Tests_passed,21aeaeb2e21f2758897591ba769329c6c288d2eab6e6bbd86a482f4e999f63ae 64,refs/heads/develop,a5fd26fc395910e29b06fc2ecd2c1b73e23c5302,dea6844b19d27a50e13b38583b9725f0dafdee9e,574ca670a35f9747d61a248662614fdcdfc1a2c5,,True,True,True,13,72,531,2,True,13,Tests_passed,074f92109209ed78678deb35bcee52a7a6669a4096ae2372208cba8c64a7ef5d,True,Tests_passed,c3751098e5cf4e4b0d3708b9b539c9cf6016699fdb92310fe0c8aec276f9aee0,True,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,4df4b7068192a1f70a43fada3ea08714c75db3a0e7cb553f8ab7695e3ed9a485,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Tests_failed,0700a67a9ab05a621025a0dc2b31ecb1686d80b344d5f83ddacb40e862411e17,Merge_failed,447a830f250a7ed2d7f18aad9e61bb43f610b95b738184348d7e48cf5bbce5b2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,e4fb6ed16a336f5b06b7504fba5bc21ca59e29d5b65ababe8f473e99fe1f2e8e,Tests_passed,b7b96a570ee31cb1c111a002054e9e3ddab055e5f2a48f144f1d78bcdb79f39b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b4677647d0973ee8f516819fee4d1bf7e791fc25ff37fff7172b1f497b2e206b,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2,Merge_failed,b9eedbf065922c90388eeb19b682cc93cff5819a4dfe695634fe60f4400187d2 diff --git a/results/reaper/merges_tested/grundid/nfctools.csv b/results/reaper/merges_tested/grundid/nfctools.csv index 6e33012d05..839e196cad 100644 --- a/results/reaper/merges_tested/grundid/nfctools.csv +++ b/results/reaper/merges_tested/grundid/nfctools.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,204ab4aad5ab01dd597fe78654f814650b62c425,fe75c6932f070833ca3ac127989503d660745608,5cb34b7db3d4b109d92ebe444a4e4e8d8882d481,,True,True,True,210.0,478,8813.0,3,True,210,Tests_passed,27cebb6e54b58d275f6a4126390c4b8ff365fed3adaa26c0eecbbc21f1f631ec,True,Tests_passed,23e92d9e511886260e9316a76340afe8d2626830acd02b303e344609cb123e7f,True,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,9f584cf70f81cfb79762f88ef54ade59cfc0dd727780760841226c6404e38e03,Merge_failed,375aa698dae2b80aaee6e539d3b1ca3652db9e13761476d85f13608e6882cd66,Merge_failed,babe3ee0aedd3376c4605c5cd34496b1f01944ac068b34e44ab0a6babf6bcc2c,Merge_timedout,,Merge_failed,375aa698dae2b80aaee6e539d3b1ca3652db9e13761476d85f13608e6882cd66,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,88a818d36bd254bd8b41cf2f2f8e5e305eb602f17c5a88d3c4d2c8f8173f5639,Merge_failed,babe3ee0aedd3376c4605c5cd34496b1f01944ac068b34e44ab0a6babf6bcc2c,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,6454103b1bb4f8840040d628c18db563da24cd5155c9b114e440e15175ebd26e,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2,Merge_failed,1ba5d738e411e7c000ef8795e175d101b64541e480ad6db7a9a78b066e324ca2 7,refs/heads/master,2c2a51262a91233576dbe1b94adf94d040103525,ac436f67afac76d8cfe416884952d513653d04a9,5f456359d7dc8abb41247de59caa2d896f5fbbc2,,True,True,True,114.0,215,4751.0,2,True,118,Tests_passed,12149ef240e3568470e93a8efdfca36a4e284154bbc85b95d13a60cbc8e39c09,True,Tests_passed,5f556d386d8daa754e9d75a00f96d9a6dacb73afafeb6b53b31dc78fc24a263a,True,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,3ca2f672944a5c869a19ce9253cc9decc71d846b4f7855cb8ede6408a759625c,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_timedout,,Merge_failed,f42403f82ef3b02e94eb8762282b96b9e4e7b1d39101394a1cae87bb9bd3fa63,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,19516b29490f3054a0678386f17df7f49712f5cada3191bdd5a43ae300906565,Tests_passed,984f6620bdc1f3eafc7760ca2c3b4e2df529e9069e10eb3894ed513996ea16bc,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Tests_passed,e81d90e59d7fabee4ad448656f3f618944e416adc40ff04d08c70148963195ac,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0,Merge_failed,654ed1c7ee01a2d5f1779f1e9255b2f1d1024e831d4f29622cfd9ac1cd0e57b0 9,refs/heads/master,15659385c0127435a9d7ed840ff8f444d3d63053,6349c83782d4ce327af8ae862d283976f24ee264,653a89213a313f6f345cf44c6067d6cf87964f09,,True,True,True,47.0,165,1200.0,6,True,47,Tests_passed,2186dd8fe178c0680894e68b6827ad3579378500709bd2cfc6150b80659d6ca0,True,Tests_passed,c6235e248807be869730110c6cb507c859579cdca8d5198c2dc0e4b037b8da55,True,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,0d5fa0f4df06d8cd4c3b232ddaea88dd44db9e8bd9113ec13c911856c507eff7,Merge_failed,897af4fccf917c58eaa19867dbda52fbde30543a51ff9497cd92d29cf5aa9b16,Merge_failed,1296893132e89782b62c7f6e4b953376c97b3807bb54d96666f125d83bcb0198,Merge_failed,8e4c9a56e4543be80f975ef73fd1fd715a493627f09bde40044e6ed44368cff4,Merge_failed,897af4fccf917c58eaa19867dbda52fbde30543a51ff9497cd92d29cf5aa9b16,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,c8a76dd738cc544193e7d4b9d47b2bbfc0de3cb5fa1cb6de4b8a4490369a3600,Merge_failed,1296893132e89782b62c7f6e4b953376c97b3807bb54d96666f125d83bcb0198,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,8758bdccb3590c06139c238849374e760ff6f370d02be8f34f19e9c7b6aa1852,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30,Merge_failed,74bb77a723bd9422f057b8101d61f1f68c0ad0c2a0ea6a773e3cbae1cdea0f30 diff --git a/results/reaper/merges_tested/grunka/fortuna.csv b/results/reaper/merges_tested/grunka/fortuna.csv index 41cdecad91..7eb180bbbd 100644 --- a/results/reaper/merges_tested/grunka/fortuna.csv +++ b/results/reaper/merges_tested/grunka/fortuna.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,7475060adde9b911d104d64d02aceaee05fd9e4b,1147cd2e5a3da1272d9d771ceb4436351c574afb,7bb821bec10da6c91bb2f09992b86484b8e864fc,,True,True,True,27,90,695,21,True,28,Tests_passed,c8f845049af1e9c373021accd0568f693e48e945ea922d89d242285e5c1ab391,True,Tests_passed,c56d60a183af3255d50232947d6eca28f39d35a423b5303bd87e4d2dbcb76c49,True,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,05e7c18fcbf87f038a7bc7dd0e796dcaa236424a3f6731f0460377168ce8b0e7,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,d1189933a5f867e39cd40e1507906ec20f13c21af5ddecffaaa23c8004998d4a,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,46e4bd42372f103fad85e7947dbb508024be30f0c70c5ad3c076326fda74cdcf,Merge_failed,1254da680eccfa2598c1a07e7217dba34fa2bb845fe79448f2ce9a839bc74f42,Merge_failed,a5dd218cc2d6f848363312d881429950df4ece781e37672e34e66b9b21b27d4b,Merge_failed,d450ef3be5e72dcd0f4ff47f56dc5bb7d922b3e60bfc0bce0582959bde72c724,Merge_failed,70e974e6a17f0d5c2f1d3365f8c5b19cc62a4a54578be522ea5626ca94139006,Merge_failed,a5dd218cc2d6f848363312d881429950df4ece781e37672e34e66b9b21b27d4b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,d1189933a5f867e39cd40e1507906ec20f13c21af5ddecffaaa23c8004998d4a,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,75043a4c756223c0443b0dc06bc3919016b9aa0b813443098b14530532670389,Merge_failed,46e4bd42372f103fad85e7947dbb508024be30f0c70c5ad3c076326fda74cdcf,Merge_failed,49cf4c52b7b4650686ce74596d4ab5a242feaac09b9ed753298cb79f9dbaf278,Merge_failed,d450ef3be5e72dcd0f4ff47f56dc5bb7d922b3e60bfc0bce0582959bde72c724,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,05e7c18fcbf87f038a7bc7dd0e796dcaa236424a3f6731f0460377168ce8b0e7,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b,Merge_failed,64f84e22022db27c8e6e81c794e6d5d01bdb372fd07785f22988bf4007c4586b 11,refs/remotes/origin/pull/1,b53b9078df7906fa163e52bf892e8f120c7784ca,e387b50474e7e19df4428a630dfa71e60c28824a,d038300dbf0151a6bde3a1c9dd77a7f7ac4df050,,True,True,True,42,104,906,3,True,43,Tests_passed,c2353a21c685c4fe46db4c570183b1b46cef1a2daacca8cf16f4ec0e6a8939ca,True,Tests_passed,8eddbe1d714bcb573edaa2f601f83af565afe376078aeee20611b344f2787f16,True,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,e39a8f0616da2f5097bde218baa825d7ffcc73cdd4fa7b2b76ca12bade4f0e7e,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,3a376f471ccbff178f421675e314ea71ba8aad4a4faabf558346f57521de2517,Merge_failed,23a05aa1f8ae94d72a505a8994de4733f0f5e067c2b8998e40bbfdd620c063b2,Merge_failed,3dfa0d36cfe4aa651ae0ca98e66ef1b727539623c62346c6d779f5b57242ffb1,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,84deb8595fa17d86df8989a480f1a21b99145162370af2335bfbdddbb7887c49,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,53b65161301933a02dc66911164acf4f2bf3e1bdf098d3ac4d8bf4decb664af2,Merge_failed,d79b73e0ec12721d6178da26a28d099f75cbbe004c1eab0ea4d2082f999605ef,Merge_failed,a48cd0f09d10e2419ecd0c848f5cae614d7e3bcf6a74d8b8da8c1fc8995f8554,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,c30ce49155b971f101c169d0e6d47f875bc3ee7c82b5456b25762aaac4a50650,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e,Merge_failed,9f8bf0003858b6cdb0a12ba8466a06ed1ea132669ac75274b054268d8d4b3b1e diff --git a/results/reaper/merges_tested/guhilling/cdi-test.csv b/results/reaper/merges_tested/guhilling/cdi-test.csv index 42371ff701..5d752b6b5b 100644 --- a/results/reaper/merges_tested/guhilling/cdi-test.csv +++ b/results/reaper/merges_tested/guhilling/cdi-test.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,728b39ab384467c2a5bd8949528901cc9e532da6,558ef6bdc34c99dbbb3c1b43b683765af23b451e,e59f3187e74b6c45bced49be01756309a26daa31,,True,True,True,133,195,807,42,True,140,Tests_passed,2d495716ef5fe5cae34e639c6401f5a971c63f0f51b3920087919ef33ae24e8a,True,Tests_passed,23bd722855ff0f4a9b8ad8aa0a951ed06e32d99de77b09636f2f72f05da10065,True,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,d4b079d43144dd60f225f9326bb298255014464810c2073606bc51365d4457ac,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,078c5f4e4e8ddb47a4bd5e78feb2481b9fd80b071ff05dc5c711d84372395d45,Merge_failed,78ad8afe5e4bf5ff19e658e92be85fb2bf5ce0e2ac2a868b3415affbb86c4c95,Merge_failed,01c8bdf6d7c543cf8e03f67bb77b96ee3745201abddd6fee0bf3bdf154ca528c,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,0932e008d3451000bce46e9463df68b74af2f500e654ab89aa24d0b2a4c6042b,Merge_failed,77ac8a7ca9b9d8e649bf46096e88bab393c98a1df1f8f581bd598e147ebfb3b0,Merge_failed,937e757be7689bcc3aea2af11870b3a86e3e6ea1fc65a1780fe9c9a48d3cd100,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7,Merge_failed,df20aeec2b8b2c6d94c7056a3c12fee4cbf15d8bb2c5e61dd93de4c1513c09a7 4,refs/heads/main,04817bb259d3c82197bc7e163c7ccbfb76a5e7f2,c1ba7b04172ae79c02a49bb1963fa80f79cc20e0,67502b17fdcbd99a255834121d3f82315b96bbe5,,True,True,True,127,176,821,4,True,127,Tests_passed,182b0e33ac67129dc1c949bfef2149879c3321c5cc91954ad3dd99bd26f0bbf4,True,Tests_passed,f1d7c54ede5c9036d4f844cb6407c2caae1fe9b08c933698d0d7dbb193103355,True,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,443aab962ef49b568cd656c6a70175ddd436039e120f89dec44d680a58433402,Merge_failed,3dd1deb53c1fb30555b6059421d993f1a8692476efdc7cbdf73f639b7b7d31af,Tests_failed,b67cfddbaaf4e9c670792fdb723f7d2449661aeedfc9bf2de7ac2a5a3538f1cf,Tests_failed,a0a90f96aa34238592a7711bcc64c004cae04d3b7cdcd4dbc36e5c17ed8c0bcc,Merge_failed,3dd1deb53c1fb30555b6059421d993f1a8692476efdc7cbdf73f639b7b7d31af,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,1f3eb8a65bed42fc3e6a9f3220f055efa78b80ce00ace6e94fbf7d296b19e507,Tests_failed,b67cfddbaaf4e9c670792fdb723f7d2449661aeedfc9bf2de7ac2a5a3538f1cf,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79,Merge_failed,a1d937b9b4f1c3dabbb67afc3179445914a5ccf77985f5c30db33fb523f38a79 373,refs/heads/main,4f10c2209f0564d9ceba04b6be55dcefb7fbf9a6,7b6eb2b6aeedd54b183cd78522bdf66b2a34e6dc,d7ddd6f5527a52a18c3dcc57c68113aa5c9207f6,,True,True,True,3,3,5,28,True,28,Tests_passed,4e2d92cc54e0b21b3073ef04b9a792b6bca1b1dea8f9f7db9651067b01de7d46,True,Tests_passed,eda100e2dad4ac3223eb1880877926147e703fc3d357e22430fbc9015070419d,True,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,103719942742f5ec47ee50a6b1ad141fdd62d7e273ac15b4ee5a1452a317002d,Merge_failed,9ef89b6bd7af13f37a4e4d24b0ce46f5e58eac7e4f15e0166f912e9868cb12ba,Tests_passed,8bd8abae538fc3d6f93d7e607d27068d9467a7a737f29be9ff4119d97940abfa,Tests_failed,f5487bdbe499be2f643ba8fb4c1d7a386b5cb172bb5e203da0f451f3dcbaea4d,Merge_failed,9ef89b6bd7af13f37a4e4d24b0ce46f5e58eac7e4f15e0166f912e9868cb12ba,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,94392d241907727197897a077c897fd0e0983cb6e39a4ddfc3e205aa1980bb83,Tests_passed,8bd8abae538fc3d6f93d7e607d27068d9467a7a737f29be9ff4119d97940abfa,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704,Merge_failed,221b244158786babab00777f77d1463cd5a615ac5cd3f0ce78e80bba945f1704 diff --git a/results/reaper/merges_tested/gwt-test-utils/gwt-test-utils.csv b/results/reaper/merges_tested/gwt-test-utils/gwt-test-utils.csv index f7a3c56323..506b1c0c32 100644 --- a/results/reaper/merges_tested/gwt-test-utils/gwt-test-utils.csv +++ b/results/reaper/merges_tested/gwt-test-utils/gwt-test-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e65277e5e16f96f58ece40a889b291953522193c,efff4f30629859a45cc06fcaec59a8e15a66756a,7f9f72c2ed3a2ca75cc4b124ded0be4fdb247b36,,True,True,True,177,522,3657.0,4,True,177,Tests_passed,efd41c8f4772cbe50b19df2233114f2f0652169b520c8a69a5801e1b8e7c36de,True,Tests_passed,5a180168eb246b2256e408e2b3520fd3b64f1bdde485d6ba6d6f0000a4bc123f,True,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_failed,3ab99c6b3085cd3e91565690395fa0e03827daf102b151ef73c11a4062d36cc7,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,3510a83169ae3872b57d022ede42b9825f2f616efd7cea007c83fb79ef1e7dd2,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162,Tests_passed,43d860287c34d81a4282279fad9e1894ca3cfd61350828ffa2f56ef7e6143162 diff --git a/results/reaper/merges_tested/gwtbootstrap3/gwtbootstrap3.csv b/results/reaper/merges_tested/gwtbootstrap3/gwtbootstrap3.csv index 197ef98aab..90a34dca7a 100644 --- a/results/reaper/merges_tested/gwtbootstrap3/gwtbootstrap3.csv +++ b/results/reaper/merges_tested/gwtbootstrap3/gwtbootstrap3.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 124,refs/heads/master,95ea992b12ee3f10c8cc34e03d98d5c67f07a62a,68214c2c52342f3ea16d30562b62ae6a67f6681c,b16343da0ea3b48e53de0c33f8d0e38eda8e9990,,True,True,Tests_passed,c8f10c664d0cd3f3f0de64fb1477cb130e34d5ca9db86c9c0d7318a144b0804e,True,22,48,274,2,True,Tests_passed,6032e686ae2aae6f882ba36cb90f135cc6687a7d7ce15f7f773036cca6eba700,True,22,True,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,bc68698e3f98668da5d5a818814093a5a8a3098a1c7c588016947da1ecdc5f97,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,bc68698e3f98668da5d5a818814093a5a8a3098a1c7c588016947da1ecdc5f97,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2,Tests_passed,f469004a4dd5e82ecf9418c01a28ef40520c4b0d2904597162c1ceaad8e09cf2 132,refs/heads/master,5c0d1eab79ec3b3d0e8c11cf7ee05e9364bbb5f1,6113162c5ff8d2264eb0a7a5b7b576047aa24553,d5df47741ae781c23a4340a9230ebda6ed114fc3,,True,True,Tests_passed,9d268a356cc93fd4fa985987a9f2cd57fc64bccf47060d27eb259433859d98ff,True,44,117,2252,2,True,Tests_passed,e8312624d23ba23ee02ab3c356a6d9c19933639f17a616c20b12e341402a6dcb,True,44,True,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,564c54ca23a5c30cbc7fd357ce489b2139b6c86563a386b946dce94c040e305c,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,564c54ca23a5c30cbc7fd357ce489b2139b6c86563a386b946dce94c040e305c,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9,Tests_failed,265ebecf76f065fc57f386c07de36294baa18aedd55c8ae5ddde18a6b346bfc9 156,refs/heads/master,f8f2c0c1c490760083f2416a9f44177ac30a40e1,236cbca39e193e5a213de06f22f8681bac31b333,354f79f1b9ce005759cab6fa3bad12f945d0ac39,,True,True,Tests_passed,35a65bd471cc4efd9a00b358bc5dda1405d892c334915878c8b747b4239968ec,True,174,336,1145,3,True,Tests_passed,8e38b4627e3d24a5ce7099eadc283630be210eb2207cf14dde86494f1a9e29a5,True,174,True,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,ea6041288112d2609e573c2b276fbdf140df452dc802dbace175acc2069a5b1c,Merge_failed,326ec0229e5700f8a4bfced16ab75f63a4afbc4443e21565c24d3c6b495dcfab,Tests_passed,a0040b03558e9b7b2866e63c4924436c2671f384886a2926f3d054611b167fac,Merge_failed,8f073742be3934f08384d606d4b3f81dbceb8c1d96342adea79f41468c8edc04,Merge_failed,326ec0229e5700f8a4bfced16ab75f63a4afbc4443e21565c24d3c6b495dcfab,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7313662a751e5cec9bcb54dfeb6672a22151357f25b1b487257b1691161c404a,Tests_passed,a0040b03558e9b7b2866e63c4924436c2671f384886a2926f3d054611b167fac,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291,Merge_failed,7e50f8390f59c8557a8df905e05aea5fffcdb13abcc1611ac2e93628aa820291 diff --git a/results/reaper/merges_tested/hansolo/steelseries-swing.csv b/results/reaper/merges_tested/hansolo/steelseries-swing.csv index ebbe782d1b..4528d56b69 100644 --- a/results/reaper/merges_tested/hansolo/steelseries-swing.csv +++ b/results/reaper/merges_tested/hansolo/steelseries-swing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cedcf92cbdcad2cacbd5024e498fc27743b9a3bb,1dd3e17fce2fe179b87f09d05280cc060c1c2cd1,f8353e7a7fd40ef96510bb7c916c7d98c1be5dc7,,True,True,Tests_passed,c5ed1c77a88572d015ce9c1a57ffef874ff16034108983ad86af17e5441a9a34,True,31,244,576,3,True,Tests_passed,595be49e121f26a4ab8df4c3315ddf66690a84e1ca37af74df4858846c6325f1,True,31,True,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,ee547576198d306c759ac561eb23f3a3740a50628093829e3d27af4db25c52c7,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,fd98062b807c3e5887f723b519738ed2e966222bd4e54768a74e0cb7937a60b6,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd,Tests_passed,a895c53ba121a5cfa758052afc9a456f69bc8e16b125aa68f6de724d4661c5cd diff --git a/results/reaper/merges_tested/haraldwalker/user-agent-utils.csv b/results/reaper/merges_tested/haraldwalker/user-agent-utils.csv index 24c40df315..af5823a248 100644 --- a/results/reaper/merges_tested/haraldwalker/user-agent-utils.csv +++ b/results/reaper/merges_tested/haraldwalker/user-agent-utils.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/trunk,97242682eae8013625be47c8c513432d99ed305b,3d692feb91e6438feed318bcfd0550f1cedad290,4f3f972165b6407adc775b763649ae1b7ddceb4b,,True,True,Tests_passed,600c3c40d5a655bc1d04abe0244a7d75ee41728152a9d319f59e9fcaa941f6e9,True,12,46,528.0,2,True,Tests_passed,b2d8f8478caeb7907d7b7843ad009c33d341e9646cc9b4b8b8f8c609795812e1,True,12,True,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,be9200afcca93d81efbd62c0ec25a4b141b04b994ff0880d9e9d0318ec649b6d,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362,Tests_passed,77ec99502c4e6b2a33cd7f5ba90d8f2f9c51d4fd477217efaaeed7b9b2e82362 15,refs/heads/trunk,4e452fdc0e37db5cf1e7f48b2d885781c955354c,a862db4d3fb552cfbfef5c3521220f6de8616530,971b1b715509bdbbb3bb7b52a6ea06fb6c152e1d,,True,False,Tests_passed,5bee84460981563d731eb012b491e9cc203bb8c3102448c6b2ad9fc5aae24640,True,5,9,22.0,3,True,Tests_passed,c5dfec434173020da2a1f79f88c5d22b5c51f0ff9d95baee04d0684fb447d9f7,True,5,True,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,517f6b100490b7121c93243e3f6b987a32da601036358dbd08c0abca47a87dd8,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,517f6b100490b7121c93243e3f6b987a32da601036358dbd08c0abca47a87dd8,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504,Tests_passed,8eee42dd305e2b6f09663e31daa1b39049c3b65065cc2e53b65733bb7e6d6504 23,refs/heads/trunk,eaaaa1488bc87d2e857fac91448c6492cef72b5c,3be86ef11ed66e95f7cd996b5bba28b88826a1af,8a9affe6a9f580686cb3e66ac50394c1fe147807,,True,True,Tests_passed,00a198841359e97e8e02f284397bb807dc06eb34e9bbf46693ccae7dc1a3a074,True,26,208,849.0,3,True,Tests_passed,f39ba3f17206f7a88e6217f20b2850788840f3102a9aaac965a0f1387fa9d8d3,True,26,True,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,7fcc0e3fea14af7f5d119156cb09e01b8f321adecf8fbbfab303e25200ade2d4,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,7fcc0e3fea14af7f5d119156cb09e01b8f321adecf8fbbfab303e25200ade2d4,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,6abae91e7acce9ac9fdcafa0bdafa24207ee184c0de62f001d5e6e3bcda209d1,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe,Tests_failed,a3d9159d7ee0c7c06d15721d91d6291ffcc780a022785354577f2177a83e8bbe diff --git a/results/reaper/merges_tested/hdiv/hdiv.csv b/results/reaper/merges_tested/hdiv/hdiv.csv index b1067138fe..b62c5313e8 100644 --- a/results/reaper/merges_tested/hdiv/hdiv.csv +++ b/results/reaper/merges_tested/hdiv/hdiv.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,3d002a41907d808d059bb7c1ff4aaf3a3a76f411,76f1f9fc5bf03cd2ff1696b65444189675b96ca2,50ed0486e9c518c3c9d3a6919e38effbe871f91f,,True,True,True,22,43,191.0,40,True,50,Tests_passed,033cccee63cc3f7670b7a9e770a5a1790ee7cd90008aba465cf22a22766136cf,True,Tests_passed,fa75224b7fda1adedf30ec0339207cb18df05c988621cd389b86b2bee35c2afd,True,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,395e9c222363a8b766325192303c6748463916af1004353f0c36ad014ff00b81,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,d1310bfda8547bd309eb384301584c124872d0b62c63fa251d1954008fb5021d,Merge_timedout,,Merge_failed,fb4138098ea9096f030e315f1a0c1de57515051891f9780786b8caa3f706807a,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,50040c4538819702f7014e4f1bb47cbebeba2bffdbe3f131a6bd72df81ede795,Merge_failed,795505407e640377a2657707a80cbf9bd8debed66a5fe2fc159bf1e6b6345a0c,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e,Merge_failed,cc3d3684d7fec8d24f0f150d87e55b8d7621f627cacec730fa44ab90cbd19d0e 6,refs/heads/master,b018f08537d904981c8ef9a7ecf6b5e400869682,c482fc4f6a786a68d0a5e084e752337b2988f683,0f0bc5e0733991002bf425ae75960974dba3c400,,True,True,True,19,34,137.0,2,True,19,Tests_passed,9aa33d297a9f81f86a8f30d0674bdf80381ae6a76c152cf887a52b0f8cf2b6f0,True,Tests_passed,e07ba0b0746af5e284eed6750ec7979a4c21a769aa93e7ccba92a311b2f141ab,True,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,c8fd05f39194835e1c62c8ee4f4d2731a6a4f044befd6f4af75ee31ab0efe56c,Tests_failed,86a0572f26a205e598f411a04d9c9a577c90a4491b8a110f577a177b11ff19eb,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,c8fd05f39194835e1c62c8ee4f4d2731a6a4f044befd6f4af75ee31ab0efe56c,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,b8878f1c516228ac11f6420891b03857ef23e5669ebe3a781c560b98f2dbf183,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040,Tests_passed,864330b85d518a1b26c434cc720f8fb6958b5b3c1eb77a2b5476c7f1ee631040 8,refs/heads/master,9f06aa7519eaeb4ce3778d78e4751aeb251ec0d4,fe78060357f0a1a86bb10fffdf970b7e880b16e9,2abc4263fea334794d35b5c308462e69cb9405e7,,True,True,True,17,64,238.0,3,True,17,Tests_passed,7a702124a11bf4d6516313e5b909164c41e965f392dbf61399976e7f292c21de,True,Tests_passed,58ede13d4f68118960452557a04feef0aa488d657966ca9c847e84e0a4da2887,True,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,da4491fef54af5346bae615bf6d049e128cb7d54a85544f0ba0c617fcebc4858,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,da4491fef54af5346bae615bf6d049e128cb7d54a85544f0ba0c617fcebc4858,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133,Tests_passed,dc2554aa2de3f188e884204374b67c0b1876100ef424d422fb7e5e35a551d133 diff --git a/results/reaper/merges_tested/hdrhistogram/hdrhistogram.csv b/results/reaper/merges_tested/hdrhistogram/hdrhistogram.csv index 4d9b5c18da..324686b6df 100644 --- a/results/reaper/merges_tested/hdrhistogram/hdrhistogram.csv +++ b/results/reaper/merges_tested/hdrhistogram/hdrhistogram.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,4faeeb6c175ff46fbb6bf38bd8b91c21d205c866,d279c913888f2fdf8dbec31f77ec2d3573f01c59,941dc5e12699dc2e4e26d0135b0823ad94a5569a,,True,True,True,20,81,1062,2,True,20,Tests_passed,94bf2bc7e83c7d8b072390cef486b68e761fd87c8338c0cb2f8ee3ae97a3ae3c,True,Tests_passed,35f0499c462e3d496567a48c771a6c5e348d5f60108e2ee075ba30f302e4dd57,True,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,be355067efdaf75b779e09a39d225e9312423e4a8ab5f80e78bd080c4e632de7,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,ad7e6b5639261b73ea86ccb9eedc737d2c10080764305f1b7a1dd63ec8057c7f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,115c91cf0b02dc638a145f987f30c06c98e69e04a16166d9f0459ecfa0b6f088,Tests_passed,4e9af85aa690231ce584ec4c6856f6ca84c7bc1a84da891070465928d94d470f,Tests_passed,06993b1ced4b7d0fcdd9a591071612cd5ab9ad11a14783a4738d19ccbec9b0a1,Merge_failed,1808b62041a58ca8c5c880b0c2168ef485c2eb7500765713950a7eb61ef9dc1e,Tests_passed,4e9af85aa690231ce584ec4c6856f6ca84c7bc1a84da891070465928d94d470f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,ad7e6b5639261b73ea86ccb9eedc737d2c10080764305f1b7a1dd63ec8057c7f,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,3dc759f00d0a3cd4ded331c66a25f11ce1c5d3df9341f7c14cc7517fbead53ea,Tests_passed,06993b1ced4b7d0fcdd9a591071612cd5ab9ad11a14783a4738d19ccbec9b0a1,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,be355067efdaf75b779e09a39d225e9312423e4a8ab5f80e78bd080c4e632de7,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b,Merge_failed,10d5daeca96154bd6c136444311eee22a7d3237da71a89c8d1b5d02c5f52042b 11,refs/heads/master,1b51671cf06062671af931f98a8af2a53d335a70,89b0d5981bafb6b4b4ac624473a1771405d4da20,b7622c26c63437dab6399fda38deab974d0b665c,,True,False,True,11,36,189,2,True,11,Tests_passed,936f9a91c8c410963443475df8c5010477b0f7bddeaf289e14e30183a74156a7,True,Tests_passed,6f60e1e250944900dc954f3126a307d37592d4aea76f7cab9505725c776f088c,True,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,f33b5d9d23947cf68bb0ad70a505974904dc9dad0b22fe6bfc0c4e599e0e30d7,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,f33b5d9d23947cf68bb0ad70a505974904dc9dad0b22fe6bfc0c4e599e0e30d7,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,a29e18399229620429057a86bead99abbbf2c1d517b9d6ecd8f7b798c54c3395,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951,Tests_passed,2807a48429c0ef439b941604b657c19072edf5f27c47c1afd416a973654df951 15,refs/heads/master,a9592e15cbfc22a9ea0777124708855ecadd4fcc,2c11bfb43d91749a731a69c1d3223a27c682c577,0f13675abe6afed9aa574c0296a0874c977e12de,,True,True,True,10,59,473,4,True,10,Tests_passed,31dbb11d70d8e48f73fca145a4e5c8c2ab4ad514d6ca237e4ed6367b786f1b01,True,Tests_passed,5be2535a9827c234398f93e39678c1a4bb0f866dec4474adbb20ad8caf8426dd,True,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,86a654b661a4c45a5ee4c75bdfbf78a81758878b74827845b93f9b04788ad035,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,86a654b661a4c45a5ee4c75bdfbf78a81758878b74827845b93f9b04788ad035,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17,Tests_passed,12fa5ee7b4aacf5abefa2fba9e35807b396445ac346d9666d745a42e19521b17 diff --git a/results/reaper/merges_tested/helpscout/helpscout-api-java.csv b/results/reaper/merges_tested/helpscout/helpscout-api-java.csv index 248963026e..34beb54499 100644 --- a/results/reaper/merges_tested/helpscout/helpscout-api-java.csv +++ b/results/reaper/merges_tested/helpscout/helpscout-api-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,f606dc7048e32d8953594011ce7a80f8f325a5eb,f6b775455a0f59685e5a40fc597311bff6f01c7b,8f841dfa133c723515a234b19f123b8c5b2a4e83,,True,True,True,45,168,3089,7,True,45,Tests_passed,fa0d20130c3cff3b3b8f9913dc0afedd830cf8c8fcaa6fe22a50d77d09954e08,True,Tests_passed,32d1ec04af7938d97805196b6701280b7da35d683e3047b1ff26f679ca0ad17f,True,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,45fc83145ad2e907d40aa629e7c1202e987a6152850994d826a81a42132cf8f6,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,33d866029c769678c78bdccae388d87203c447ed2351d25c937d29d64df13474,Merge_failed,c8da6b370a1d00d54da443bb6c35e0a4532994cc63a7c0f65f5390480978eaf2,Merge_failed,d3fe40ddf7d8b9ad751cf6bb7e2a41c748a1d17556b845c91ecb4b0e58f7d76c,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,cfdee270939d5a57c5445c0300b97309200db9a60632817a3d4fba29e45f9b0e,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,216d238abf41746f9abbc6f94cb43c6b990f4b2f1e2f87515b77cf4a2b6cdd17,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,e46cd3e5fb199574407d13a52946aa3df90ea644d54e07b8fbf32a30aed85f6a,Merge_failed,12762ea42ec675743913e47ecb222b3a78940e777a7efd4d5ba82bf4805f25b1,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,b9013f0b4cdf2a567be5c2cec561af326505532b65319b75bffee2eeb743fca8,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71,Merge_failed,d3a6d2c257a1566b9f081416ee912d0899f2a6e520d6f93eb6bb4c1178960b71 27,refs/heads/master,1d75aac8e8656d8b7dfcff38087209a9c590ae80,7dde5bbe5d07ba446e8d8b7b942d378b40f2b5c3,0d774af5f76f303ab1e35649c7d92176933cf612,,True,True,True,28,170,1009,7,True,28,Tests_passed,b49846109469cdd2ebe69adf5a400b85838256f0ece4188884efa88fdf513ba3,True,Tests_passed,2b42646a8d1ba80938a74abdb1b5bccb846fecd27f959490a5988e1c32315e27,True,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,a930fc2d4d4dd5dfe989bc6ed9d8c5e42a7ea9d1f11637f061dbfc0c291e416a,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,f90e30a87927ce4e36ea73f7cf6f507e13410697d96218b6fa2b01f03a1e985b,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,fb9562fea099e75b2b5feb5e6784c58404d42554af20e51cbecafcd8f0d92417,Merge_failed,4acc68a1a8768b8ea331f518a8250d83cbbf3ebf3b8bc0dd4416e038530f48b8,Tests_failed,69f6fb3f48fab5ed73013f29fc24963b8407d17fb240b4a0ec8bca3505696d02,Tests_failed,8871fda908ac7329de4e738daebf12906545866ffa87ccb13806cb6d534ebeaa,Merge_failed,4acc68a1a8768b8ea331f518a8250d83cbbf3ebf3b8bc0dd4416e038530f48b8,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,f90e30a87927ce4e36ea73f7cf6f507e13410697d96218b6fa2b01f03a1e985b,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,52105fac3c99b6f9049aa3b3285491dd5d6583e826ee286ac1c100996aa5eaa5,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,580fbacd33cef30a0613251f173a97f3b4bdc5d3c2a36fea2cbc6a7a9d2ec031,Tests_failed,69f6fb3f48fab5ed73013f29fc24963b8407d17fb240b4a0ec8bca3505696d02,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,a930fc2d4d4dd5dfe989bc6ed9d8c5e42a7ea9d1f11637f061dbfc0c291e416a,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896,Merge_failed,e6755c115112a13e2941444c891091ed4b3b9b8f1f3dcc13e646856ee4452896 28,refs/heads/master,397295ddede909edd6af0276694088841a9d5039,0d6430428c081cb940f0d9d73fca5697b5df6662,aeeaea55d1faf6b43cb8603fa418cc7732ac4b70,,True,True,True,20,152,612,5,True,20,Tests_passed,d5296b22d2983db2c909090f06ab897ac001ea621ec552d71279d1da35990325,True,Tests_passed,3063770ce2dfce5674163a580e7f479e73194235e4b23ad61d39679c21ef4774,True,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,3192545b9e5d60e2f787a39778b8b53900e9c3135538ee6dddb02b9a7ad6cb11,Merge_failed,f13c14228a9cf9e0033455e0b112cc19b5d4240ec476ae60437abff1979ee862,Tests_passed,d4839313ce84c37f16f3ccc32da79459ed9576503b74788f91c30b8fe1e23ebd,Tests_failed,01d8eb92de88a70a9a0cf9290d1c8d590bea62e84b6b6e97bb252ff478e3b1e7,Merge_failed,f13c14228a9cf9e0033455e0b112cc19b5d4240ec476ae60437abff1979ee862,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,a7529da0c1041703b18235733eff424b9b3ae903f0bb2b3bf9bec27abb36ccbb,Tests_passed,d4839313ce84c37f16f3ccc32da79459ed9576503b74788f91c30b8fe1e23ebd,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,227461ce3fd25cfdd3644544eb01dfe586f1c002bb8acd894ec3af7cfe99c8d5,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31,Merge_failed,c97357dedb906e67613bcb113cac4078ae7ac14dd4b909b0eaf1fe565d590b31 diff --git a/results/reaper/merges_tested/helun/ektorp.csv b/results/reaper/merges_tested/helun/ektorp.csv index 7ce9862ea3..41d83eabc7 100644 --- a/results/reaper/merges_tested/helun/ektorp.csv +++ b/results/reaper/merges_tested/helun/ektorp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,e99a4dc4d57b353982c4695ef27e796ceec1278f,e1a40f7912d75e429d63fd01f4257b24bb191f2b,f4637590d7b49dc2cf60d6bd04a533d60236c20c,,True,True,True,21,61,357.0,2,True,21,Tests_passed,b90894a54016b08debfca457bba44f936e61f62ca5f7bdc1850d880c5bd12762,True,Tests_passed,e07f8842ad7067520cf628d4e9e147c3a6f9c462701bb2a492e3603c63bde5c5,True,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,67d647b8934c4a2957414ac9df88fc92305cc4c74ca135753e49a189f8a66fdb,Tests_passed,78c17b633666027b882c8d394813e4f9b0fa6fd58b9ebee757100083785ea1bf,Tests_passed,547ddc65538f63ba11a8006e079c9de9487053f39d3d87ac6d17358749651643,Merge_failed,a9505f9557406dc513b27c1c42fb7884e4abed2df30f6968774fe7c3fc15c811,Tests_passed,78c17b633666027b882c8d394813e4f9b0fa6fd58b9ebee757100083785ea1bf,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,37da60de4c9ae29a88739db464383df8a9875f37aee8ebfb1e2a3c1bea00d0ea,Tests_passed,547ddc65538f63ba11a8006e079c9de9487053f39d3d87ac6d17358749651643,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f,Merge_failed,8bc88b655365499211aafab2f3afff9e58817878623ed9addcd88529c9bf129f 26,refs/heads/master,2070fe94b619ffd972f24ac23e9021768162c5fb,edbcc281e23dbfb2aed710f2375a6c6e97c5b543,783a5e19a88b46c849ea137554ed57b8c9ea3a53,,True,True,True,3,8,130.0,2,True,3,Tests_passed,0cc3984619146e6a94de6b15fb86f773ddaddbb71fb7f5db95dcebd2680ce20a,True,Tests_passed,7824c0b0c9acde4ce627764123296053378df889bae05448c171630873f5787e,True,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,f808f86b340b315b2560b3b7836f5ba0221422beb1c85ae0e775b5a4b7f477d7,Tests_failed,9f936108e6d76703f62687040de57f298b686e82c3369188f73d787429554408,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,f808f86b340b315b2560b3b7836f5ba0221422beb1c85ae0e775b5a4b7f477d7,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455,Tests_passed,426c703029bf95b04a8269f0f3c665bf0941c418e2599617a2ff76d2b96e8455 50,refs/heads/master,da0144b9d5de6034cdeb219467de16ada91fc561,00899f1d877e21341d11e03666baf8a2ed89fbe9,3c7f21edda5820820f5168a8b14194a7a08689c3,,True,True,True,7,45,367.0,2,True,7,Tests_passed,bfc7a1f33e8e83309901e56858da458102025d06ccae07fd4d0969233525e4d0,True,Tests_passed,de8d6f3c9ae437f2c69e9c9c34ea02301c82202912b99a7c2fc2f02581b32b41,True,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,3c885101325b3996fb9652446ed4a8c4e82d868763e96b062f06f9428448771c,Tests_failed,fd053f07231623499f8c9708111733378fff262338abef76f62f8db4f0fa7243,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,3c885101325b3996fb9652446ed4a8c4e82d868763e96b062f06f9428448771c,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38,Tests_passed,75bc6bff49a9a712bf21bdeadb395cffa59457f8c433bc102dd38fbc9e91bb38 diff --git a/results/reaper/merges_tested/heroku/devcenter-embedded-tomcat.csv b/results/reaper/merges_tested/heroku/devcenter-embedded-tomcat.csv index d8414c0383..13d77a3d88 100644 --- a/results/reaper/merges_tested/heroku/devcenter-embedded-tomcat.csv +++ b/results/reaper/merges_tested/heroku/devcenter-embedded-tomcat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/7,c69377866c8614d5a1ef047d3061fcfed5203232,4f181be7c4b60cade09afd674ea02da5f593bade,5077d499c5c7be0952e9a191be47757df1096102,,True,,Tests_passed,aadb84a0424e3b658e3c90e517ae410accdf02cf55d7e5fe1eccce7f58794ce4,True,31,41,,2,True,Tests_passed,9b199fb6874ae2a58f6b7b2c55cd50157e2fab2047434ac13c7bb5d7e614f5a2,True,31,True,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_failed,aac3326a6bfc75590b4f34191dc95ce5169ef88eddd99fb0bac7d873e62a1551,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,971009eadc0547af5f610a35d0db5d3ed6929859ccf3dafec05cb90430e11425,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,47fd55fe8d7dbeb83096ad5239f3ef6ae6fc168d932ab25f061634639e9d88e2,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93,Tests_passed,c9c21ee693582294d57cf842fca439eca60f2543990322a221a9ca19e25c0d93 diff --git a/results/reaper/merges_tested/heroku/heroku-maven-plugin.csv b/results/reaper/merges_tested/heroku/heroku-maven-plugin.csv index 0fb140d0b4..bc4e1eeb3b 100644 --- a/results/reaper/merges_tested/heroku/heroku-maven-plugin.csv +++ b/results/reaper/merges_tested/heroku/heroku-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 40,refs/heads/main,a935a91977e0132509028b7d13eb8c2f4e4a0f0e,0009fe317d0c15efa8520595eb84f566edfee509,09bd48fe1a79a07a35bae8f6b7d37e523f13c7a4,,True,True,True,16,39,774,2,True,16,Tests_passed,41e34e7e8fee4a46c65e09f28f464b64a1c76bf830b8374d72dafca32279ad1a,True,Tests_passed,f87d7b4a0f82994172506cc91bc4a890c62f4e65a0f7d8a4492069e063066f33,True,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,6f12e991325e753dfa8a5aad351c039e9f25468ec26458bb9c4ad4c9b6390cb6,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Tests_failed,38a8d2f5cee4a627fa3a095d0d588ca0f0ad55a308d16a6d8744946164fdac23,Tests_passed,3e603e6ade3044b626dde1ab249364f116164dc37b37f07b00a59942f17a496c,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,d0b8f8a5265a526c93a79b391d262692ea7d5d57c680864c48b96a410b46a37d,Tests_passed,40e4ea7d58fd770cb8cdc19ed40fc83c34371bbd31ab4916e129cf8990ac016a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Tests_passed,8d6d849a1ad68e9a2bf7f3c68efa8c1e994a7cee97cdb8491956c7a7b83c5f2a,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0,Merge_failed,cca5733637caba9528273b456dffded19ce9edf67f59935eaf16a2cae4c478c0 diff --git a/results/reaper/merges_tested/heroku/java-getting-started.csv b/results/reaper/merges_tested/heroku/java-getting-started.csv index 3e725e5456..f6b996efb9 100644 --- a/results/reaper/merges_tested/heroku/java-getting-started.csv +++ b/results/reaper/merges_tested/heroku/java-getting-started.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 40,refs/remotes/origin/pull/21,5b7ee28950a64c58ff7f882a2e664283361bbfbc,0996f9d404961388c1133223684928251d87f889,395b06ff2cb3ac6e2dcca5ea7dc06e5d37ea653c,,True,,Tests_passed,d1d742bd339e1b5c46a3d37bf2d4fa4295928ddde8875e2b34550dbecf78d751,True,10,12,,3,True,Tests_passed,17d1ab556df2d3cbe7accf29e8f75c3765669b3c4910083708493a2e78e17edf,True,10,True,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,7bf05dc82cc4cad0104817714f3067dd9c80dc7f8dccc0280defcdac452bf212,Merge_failed,3e6f02e63d6e004b962fd1b5619ce311f6efcf7e1cdd6dccca67ecfb469c8126,Merge_failed,ceda171568b7c7ae166fed33312eaedf2506275dc11161799bcfd950b0afaaea,Merge_failed,18aac52f7dc84378cb939b9f345474a888a6e79e6cbaa46a545ede82ecbe905d,Merge_failed,3e6f02e63d6e004b962fd1b5619ce311f6efcf7e1cdd6dccca67ecfb469c8126,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,4b1a9423bb1009f096232bacae7b0a915ee6e2d78ad6f3f85f4ae4984f6c9d8f,Merge_failed,818b397b740b507653d4da53ed1e681016f38ad54f98128a717ce464244bf07a,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e,Merge_failed,02448c0729acb505b757397416e28b36d2157b4d3daff3b761f1b0fa1b46c04e 52,refs/remotes/origin/pull/61,ada8e6776a47c7ddc9bf33aca353d2b895416c4f,c25acd5f8ed8ac7675266798fe99fcfee8912dcf,194c69c5fc86c19188504524cb1045ef8c57b1b5,,True,True,Tests_passed,b4e9fcbbce415f112c292035a9ba83b97842fa926d400f43ea1db91db5986ce1,True,4,7,34.0,3,True,Tests_passed,ded4a4908e9d74279b7347f449839a1f7f498dba88afa2ffbd1d79e720c7eb6d,True,4,True,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,b208f31f33d4982887fb8f8736c568dbab3e29fb2892122bc61620898e3391e2,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Merge_failed,a682a58c2a2d3a18d9e045d02fe5eee6f6301a2d1f5e3fb2929fbba7a3881899,Tests_passed,8c3e826ef14ebac273661e78fa43e85e52f3184e0db5a206ffc2af5232c20b76,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24,Tests_passed,417ef7f99444aa583b61dee0eeb1d22c10c5125c2283ca92831b5e6c741c6b24 diff --git a/results/reaper/merges_tested/heronarts/lx.csv b/results/reaper/merges_tested/heronarts/lx.csv index f50f663d15..8243894cbe 100644 --- a/results/reaper/merges_tested/heronarts/lx.csv +++ b/results/reaper/merges_tested/heronarts/lx.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,198881dec136d9149da48e998f9c96ff27ef87b5,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,09c8e07784d7a8f456737672eab034f162e7d45d,,True,True,True,37,183,1980,3,True,37,Tests_passed,5c15c4056d6004c740f059cf48fcf5ea144337527d0c2a6c6bc33ef2045ea7d3,True,Tests_passed,b947f69fa325ac688a4bd4a196bf7860985ed39b04694f9e144a4125c473dd0d,True,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_failed,25137a3530ea8aee407dffb843f5f4f5f4e9b672ebe817c487aadcfef71f0852,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,7ae1c45ef7cb4b1a13cc160a446324cba260a58545c9a736ec10ae234f932a52,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,303ec12a72109d37fd60c7ceffa3d1e43d2c9912f72b26519f2e179a31cb50f3,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5,Tests_passed,863486f5eb0fd2788eed9576eb088a60139afc68c7bde6b2eeb642fc78ae40a5 10,refs/heads/master,4fa8fcff072d18fe7c1b3449d3654c0788f3b881,e29ab79381ac51d8c5d4eb1d14a9b75353151459,6b8e4c16a3ec7eab180e369d1f32ef5df2f9c239,,True,True,True,37,214,2300,2,True,37,Tests_passed,47a1084210eba86c0c24cd78f226066ca8673b9b4386a0fa20fd425138938fac,True,Tests_passed,555f3240f986a92c78ffc645335c855000c1ad8096f2a235ab366afb013b11d6,True,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,23ebe0e24e3ab20daaeaec57f81f77e8380e2ef97ae205e1fadb6a377a2be1b3,Merge_failed,5d273e670dd1afddb64f9b568335f554677925eb1cde75348c926d346dec0bc0,Merge_failed,9d17431227fe206329902ca51612d0da41d7c54bc7a75d8d7589232f63937106,Merge_failed,c434bcfdec8d5f7ce1a6267058952f30921299343028e989ca2bda320f6c6e90,Tests_failed,4af1738024fb3abc8a37b633692acfbe544a1e26b33bc0515790227aac899c82,Merge_failed,9d17431227fe206329902ca51612d0da41d7c54bc7a75d8d7589232f63937106,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,559d9ed9e53e073c9e749220d692e00a6409624ba1f7095e5d96ef8206978f60,Merge_failed,23ebe0e24e3ab20daaeaec57f81f77e8380e2ef97ae205e1fadb6a377a2be1b3,Merge_failed,153b12fc3266a6270f41d0c28bcde5be035bdffe49b04b982d16e7b5b8cc9797,Merge_failed,c434bcfdec8d5f7ce1a6267058952f30921299343028e989ca2bda320f6c6e90,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,d35010e019c3887ea9b8e2e0831f2207776111b0a991c41d92c8d48054426ef7,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485,Merge_failed,22ee9900b8c1da80a6bd543751206019bcc8a4f838d98e4ec1a3c4f139a32485 56,refs/remotes/origin/dev,ab0db9e858e35e7fe01ea103c7cee376e6946220,b88cb8b7fdc9444a18bd96e85e6003e6bf1fa04f,f587a9faaa86442dea40f06c9e7e29a2e0a0f431,,True,False,True,5,15,90,2,True,5,Tests_passed,6d6ce9ddb4e1dd02105d89744133483f22cb7d810c00c7935d06d58393c9f6c1,True,Tests_passed,58571645def6a35e028f084e1013c6b6bcd9b68e0eb701380d82d3d997548689,True,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,02a211f1fdf04a1450b3256767db3bf736a875c415b7eea5d46cd08cd6812cea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,02a211f1fdf04a1450b3256767db3bf736a875c415b7eea5d46cd08cd6812cea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea,Tests_passed,01f5d10f7d96095b471517fc3bff1e5cbdf9fedfea19afa387ff0645ae657dea diff --git a/results/reaper/merges_tested/hmsonline/storm-cassandra-cql.csv b/results/reaper/merges_tested/hmsonline/storm-cassandra-cql.csv index 0c7d0729ba..fe27749195 100644 --- a/results/reaper/merges_tested/hmsonline/storm-cassandra-cql.csv +++ b/results/reaper/merges_tested/hmsonline/storm-cassandra-cql.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,756905cd9e592caaaa963739029bca5d46d20b77,4d30b5a9670b04b1b661eaaba70c10360f5514be,db445a4528d0f6b316777bc641344f1b97cfa8fd,,True,True,True,4,13,47,2,True,4,Tests_passed,2314ad7e11181c347e73430cf592faa500fecf58c475c744817ec356c172b6f0,True,Tests_passed,2afe07950097068c71b595917ee694ea81d121b400c610c828b923b5144d8ea3,True,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,fe9e3080e241e3fec03c35ac67d4e934f4da72d9e7d768797e6d6787e1537c5c,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,6df25d02d1136d58f63e25e456f39ac81b2bfd03e84f212ad6958ffe37dc9140,Merge_failed,560abea0ec34b6073b68ba24ef9c22225f06d2329eb1c171eb8beda79aaf1bd3,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,aaa7a0097ee57658cdb08199a088b3863c4c6d980bd64a656baf3e14f64bb85c,Tests_passed,f88581f53955ebdd81bac5269d75ac2147811fe8f2a2d368144cff68610302aa,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,8ecfd1f2d67ea3c7947463d1cfdbc98a4bce6ab6de32ea47a2267d9bfcc5092c,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87,Merge_failed,167b1f79e9b96bcf755af4b2f7c27cf25e63a4a0f213df76d0ff34edbcb06d87 diff --git a/results/reaper/merges_tested/hoijui/javaosc.csv b/results/reaper/merges_tested/hoijui/javaosc.csv index fc4dbc70dc..28282d597a 100644 --- a/results/reaper/merges_tested/hoijui/javaosc.csv +++ b/results/reaper/merges_tested/hoijui/javaosc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,f806396898fdfbf9533f2ff881b05ff5b6df5f6e,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,129ad0d5979f9de902186c1ff9914307a9291e73,,True,True,Tests_passed,d8a86f358399c05baefd8d244aece38be8c933fec24279dc6e76a2038371ad1c,True,18,110,513,6,True,Tests_passed,387fff3decdee2b6585d3d66363e05cb129d661e43fe06a7823ccd47cc684ff5,True,18,True,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,d8e2d38026b7501ecd5d8d7e27e01107c212742aade63f38165f778b72eea220,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Tests_failed,43c0ef8466b08b1999263cd456fff7102995abdc14ec8310e64fb4cdc5e7f90a,Merge_failed,d9c8e904d8d1a305114e859259a4e018bcd26870f078710385dfbb5b6da35aba,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,4bc60c8a1c35f152a36b3fb850664ebb6681646f50416fa7381f8ac381660eab,Tests_passed,3e7d57da70b083f7fbea0dcba394a65e04c8d7d502c9a7a2158ddb27e0a57b6d,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,7a936d21bc6354fd378703c4c8a7e7f575e232dd7f2af03bcc14a148e1120aaa,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b,Merge_failed,c77664ed9ec7b010811bb2bb03e6d834e5d62608a15ad21b4a6bf746a737a89b 13,refs/heads/master,922809cde5aeaaa89a94a8aa7b4b3e03b3f993e5,afde7c1c37e7b7694d0faed5aaaef3b0efb7f463,e2a1667cb198675958012d91a374f9e9705195be,,True,True,Tests_passed,91bc85968ae2d947812b047835474adf2d99d1ade67cb28d6b651f5ee070c708,True,15,110,444,7,True,Tests_passed,33ec367078d1bec50a80794a5deac035e6ea46089108e057bdf6ed6a9940a79a,True,15,True,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,3871c093c19c17471e17f4d39828cbe9c55f7efb2d86aa923ee6885c8a1621ee,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,b2fc5ba5661d818e9807794136339c9116ef69f2e49c07de956628333bc3ecda,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,bb04eba4139c6cf771e92f1eabf46a5809dee244e7fc65f73e2a17b969af375e,Merge_failed,efb9df448a8de4d1b522ec77527725b45f320f26e0ee74129fac573a9dad60fb,Merge_failed,f07e22a6616d6ce80a425f94b785f8bf929783713b8c35a6b16b5454bff67f08,Tests_failed,4ea871ddcd6476d40c46891ef228bb4f0093d2feecad9b5ffdedca0ac58a8b21,Merge_failed,efb9df448a8de4d1b522ec77527725b45f320f26e0ee74129fac573a9dad60fb,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,b2fc5ba5661d818e9807794136339c9116ef69f2e49c07de956628333bc3ecda,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,4294bea554b0fc7d8c285872f46fa51188341080352975493239a00ff8736c03,Merge_failed,528fb4972a7ade2e9db3024abac74ca804b7327dbba4462c29ce4314fd6836c0,Merge_failed,f07e22a6616d6ce80a425f94b785f8bf929783713b8c35a6b16b5454bff67f08,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,3871c093c19c17471e17f4d39828cbe9c55f7efb2d86aa923ee6885c8a1621ee,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc,Merge_failed,936de9471fc55961cf0889a2eb5b9f5462a9939cf80218c2de5fb80f29f901dc 14,refs/heads/master,afde7c1c37e7b7694d0faed5aaaef3b0efb7f463,443d0261f9ce1e15f0db8cd9b92071a2d9136c94,678b2715c634ad6e3ec86d97fd821b48c446ecbb,,True,True,Tests_passed,bcb0c351665d731cb91b16185797491ab9851b5f24109260797c746278fba433,True,16,123,477,6,True,Tests_passed,1b56fe38339b19b0fd8ebd80ed743c7c3b2f3f35447f772fec446f2f97e38c4e,True,16,True,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,2164453799810187c671052c5855f33befefaeab45d76f6cc68b32a195178e23,Merge_failed,8ce498779089cf518e48e38892c9b920f5a82f8e88bd08a6a1b2e81d94fb8004,Tests_passed,d53113d45e93fce5fcf6976705ba181a134ee750ca1b0128d2f538cf7b7ac09b,Merge_failed,a8820abc6f6473d43129b47fc15637ab382cea1504816bf7914bc3a123c04956,Merge_failed,8ce498779089cf518e48e38892c9b920f5a82f8e88bd08a6a1b2e81d94fb8004,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,9ed039ad88e2eda566d11832b0043eed291cf22c8688cd769d21cebc54badd9e,Tests_passed,d53113d45e93fce5fcf6976705ba181a134ee750ca1b0128d2f538cf7b7ac09b,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db,Merge_failed,0b285018c0709e29533359e68d303397d8190d38cc442791bf7bca95d390d2db diff --git a/results/reaper/merges_tested/hoijui/jawk.csv b/results/reaper/merges_tested/hoijui/jawk.csv index a1f75ea025..1b8dd261b5 100644 --- a/results/reaper/merges_tested/hoijui/jawk.csv +++ b/results/reaper/merges_tested/hoijui/jawk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/12,b60fdfaa97a9a12c8eda22d7707295bbd1ea90dd,a1523a0d3dad5590e8b75bd6252a788512406bf2,e5c8f2601b4e7af1b587c3677e464cc6c226d36c,,True,True,Tests_passed,8e6904b4360bf56eb3fad4272171b1fc4cdd37376620f4b0af8f2a1dc6a3b960,True,13,119,327,2,True,Tests_passed,dbf04cd3d1cfe48fabcd285561e49aadbae7e1a829fc2bf6b7cbe9ba3f4bb133,True,13,True,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,117a596f3b63779c3ce121036f850701f4b82a70fedeefbd5f2d5a1255e5041f,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,1812123933c7a87fb59d171934a0c260f2a0c69ee758777921ebaa11ed7df63d,Merge_failed,a9029750d633be1e196d1e92c872ee971722b08c654dfc6b707d53e508d456c3,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,b7cbdb07e1e5d083b5911f74da9cf7623426502dc4198e3f5aaacc6f2acaf9bd,Merge_failed,3d33bec7ffd786276352c045e9ce4217a0b06fd0fa963222ec28362a74a1f751,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,6737025a5b3c538ad2f2920ee02f320ca6462ed846cb724fbf03184022636e28,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8,Merge_failed,7e3e73d1aed343a0f5cff0eaecbee0c541013dc8f2c691d95e3127d040639ea8 diff --git a/results/reaper/merges_tested/hoten/java-delaunay.csv b/results/reaper/merges_tested/hoten/java-delaunay.csv index e34fa40255..2dcc5f1179 100644 --- a/results/reaper/merges_tested/hoten/java-delaunay.csv +++ b/results/reaper/merges_tested/hoten/java-delaunay.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,bfbc8c5bb6efc4a6044df3c60d5e2fe8eeaaef60,a5dbe4c4472bb3da4ccdc9113bdf6c7681d68d60,5ed77e94f95e191e769255471ff01967cf606b96,,True,True,True,10,30,417,2,True,10,Tests_passed,666b875fd2076ef05b2e6ad421a39d36a9f0912601eba9de68effd13f3c2f5d1,True,Tests_passed,f9cf342dbc758e852e5fd8227393ceaaab341f7d8faedd0cb4f63a12e1a5a392,True,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66,Tests_passed,eb37e4aeb6152e9d6907d238e3434d78fdccf0baeeea545e8de983d5c82d1e66 diff --git a/results/reaper/merges_tested/hoverruan/weiboclient4j.csv b/results/reaper/merges_tested/hoverruan/weiboclient4j.csv index 5af810554b..1d25c8e1d8 100644 --- a/results/reaper/merges_tested/hoverruan/weiboclient4j.csv +++ b/results/reaper/merges_tested/hoverruan/weiboclient4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,62fb9296e8a8a0c3569630db86f72c4431a59af9,1d5f41e216cbd256148e0b617d4f9497ac1cbe81,cbb8c34c2182cd3c290acedb85cbd79a18da2f71,,True,True,True,59,152,3352,3,True,59,Tests_passed,3779289beac5d75a05e316c1f6bac5e4372eb5050efb56df8055012dd6cea8e4,True,Tests_passed,5a4668df1a151e1ec4ba95aa17d7c47ea86111da6c8d5793bf62e9cc8ddc6ad0,True,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,f29c7e7600d3cfd21c4feaa944e8e1b2018db220085b9f42f792896467f77d9a,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,9141cfea402f7c8e2213dec22aca0018467769b671f67230ec086103ed0e0644,Merge_failed,df28c98f5d44597d38b47c70001bfe6ea1c0124c4ce2b73d832a0aa5d845aaa6,Merge_failed,f3ec3d8332472938fdd5f062642b18eb1c5a8d416ce76f97e1a85ab0ad2327d4,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,69467df5356f497de94251f4160f39a0716bf3da15ac4a17e4eabce75aaba64a,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,16ae23ffe50c2c06d5545f7946b57153d5f4a3692c9d7aa775d0c993585feb1a,Merge_failed,a3cdc9200e3a496b5edc63843fe72af016b839f11ca9ddfb17f9cb476be2dffe,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067,Merge_failed,fe5f2fc4c8f2a18a932bd60d407257bdae74f8cf38fb0251a558fcdf6d03e067 diff --git a/results/reaper/merges_tested/httpcache4j/httpcache4j.csv b/results/reaper/merges_tested/httpcache4j/httpcache4j.csv index 5ab31ef03c..3c373c9e62 100644 --- a/results/reaper/merges_tested/httpcache4j/httpcache4j.csv +++ b/results/reaper/merges_tested/httpcache4j/httpcache4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/heads/master,ccdc581f7f9d3b683b03af7c474160d3a3d1594f,b7a15c040c8b08b14e1f6434a73633c44381118e,24fa341f4fe3d819067b80de67bdf98e8861a8de,,True,True,True,10,21,324,9,True,17,Tests_passed,5ae13776c25399f7834d05f4603ad0221a6761b3e66e78b048c64550a3f7500a,True,Tests_passed,69cd33ab0d1b4602132d7d32d182fa177e41dfcc5940703ab8e76430173aa9ec,True,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,dc927934833f49dc701bfaaef25c108f22eab72ca7387e3c78ca56892b8183ad,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,68540763f9004a8f0b82269558d941b609166375f1a1277b97f309e34aec992f,Merge_failed,d60af640d9ee4b1dc3f72e51deff2953e38154e3c51d47c692d8d28d15dcf5fe,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,85f53464843aaf18443dfd072fab1944a76e9d47ab89b6245b2d5cc994ef00f7,Tests_passed,b96f16020592b440a3544eeb98a4429dba65dcedf77f3c2583a812a5d4fb18c3,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Tests_passed,59c22b6f8721fc8ee2672d8722b2d71b96e2d4892c9db8e3326fdb5ca29ea3b8,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5,Merge_failed,399a3032bec59d1d06b74694b18ae7ea176a302b962c0a3d2159d7e48879c5c5 diff --git a/results/reaper/merges_tested/huaban/jieba-analysis.csv b/results/reaper/merges_tested/huaban/jieba-analysis.csv index 561fe6bc76..a9d30e1a3a 100644 --- a/results/reaper/merges_tested/huaban/jieba-analysis.csv +++ b/results/reaper/merges_tested/huaban/jieba-analysis.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,f56461b33c95e386ee28e5b745968b7cdd20292b,8ef8c236a8622f1f98decb9961065f2181a24d4e,e6487e17818416dc1d7050cced528515795e8ea4,,True,True,True,6,51,395,9,True,11,Tests_passed,ce47953878cda46771b538a55dc7b788e1dfeb438d4f3179dbaa533defc620ea,True,Tests_passed,21f4b40fb686b341febb5b37f3c226bde3ad9e2a8a213dab37c6a2cec0f8b9ce,True,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,d45987ca7d3c7b7b5abb598a5485524badff0c4a1b64a50b32388fd8bf54e404,Merge_failed,5fe7c1823e34ef0818f833131d3b2955dfac3ada72e96a85ed40e1505ad708b4,Merge_failed,2103aabc6d2c51dfa21dd257d11ce3e362333550d208f82096192c022164177a,Tests_failed,7104260e1f0e9d2f3a284a14ce3b657c571f09be06e5a9c83c5b9b1bf45e2c52,Merge_failed,5fe7c1823e34ef0818f833131d3b2955dfac3ada72e96a85ed40e1505ad708b4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,a23de3a0c75d942145b957329d25bdef19c931dfb7a0defaf616fa24a5cf1a0c,Merge_failed,2103aabc6d2c51dfa21dd257d11ce3e362333550d208f82096192c022164177a,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,e1932117da2a87d8eca3394fb30c45f674389f18249bceb3aab5b589b3eb07e4,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c,Merge_failed,2888df697db91d6f5b920bcbdf4ebdc107581667f24121bce848a3eaa81e8e2c 28,refs/remotes/origin/pull/50,8eeea21716d2ea2563b92c0e3fd901ae715b1ea6,e657cd03e1bccbbd7b71981997e756699fe161b7,092dbedb1fbe0cf2172f8e10707f8b52764bda31,,True,True,True,5,10,608548,2,True,5,Tests_passed,168cf6b3515e4d6b88fac756675ea2b6db9ec3b9776ca33ce1a7d9801a6995a6,True,Tests_passed,0121015a37af6416d93feedc57de2c258686a7b824c850e17b1b5635339dc372,True,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_failed,17cb9784fe07197d226dc2e30b6ae904888757989cecc2ccae08accfba19e0e4,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,310f95f57c00bef9870738483cf919d9d9d33367f5106450bcf49fce6f44d5ef,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7,Tests_passed,9b321c491050eacdc1b035f74cf628da9f02d30d6f37b86ef3bc6e199d1cace7 diff --git a/results/reaper/merges_tested/hudec/sql-processor.csv b/results/reaper/merges_tested/hudec/sql-processor.csv index 0dcfce4197..d2ce4f7dc7 100644 --- a/results/reaper/merges_tested/hudec/sql-processor.csv +++ b/results/reaper/merges_tested/hudec/sql-processor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,4e7851a544957454ab1795647f56cee208cdabb5,999cdaecaf30a71a3f740315799c6b75c01bf83a,aefd6d3f51a8b69487281fc61bd2bea51a8c1983,,True,True,True,7,16,2099,6,True,8,Tests_passed,755cfdb12fd1e82e08400fd797aa5e7796f64425f676ce18921d81a7f71f31b4,True,Tests_passed,3e4adb0971f73f29a1153c3d016742f6bff5e7f57c6fb23a21d495a52c57c7b0,True,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,7d97a275af463087d8370254a80c7fcb4ec25fd67e70ac4e07fdccd6a6695357,Merge_failed,01605e85cc746fbf180fe08bbf824eaf0bc9f5084986c688dfbc41b286da4026,Merge_failed,66ce56bf0861b1aee588e84972437354bf35e9463bfe7bdb34a0b8da54517b23,Merge_failed,0c10e489e751e7d2e38614454cf39c1d49312059c9ebcedc13251b9ec1d71795,Merge_failed,01605e85cc746fbf180fe08bbf824eaf0bc9f5084986c688dfbc41b286da4026,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,c68f0b05e3575df1c833c2e12c92ad18309ce89465d74d6920aca3b08fa866c6,Merge_failed,66ce56bf0861b1aee588e84972437354bf35e9463bfe7bdb34a0b8da54517b23,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,550bf2a5658dc31eba632a342c41c9b6f2a735281324df380156def6326e33e0,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc,Merge_failed,54a56de63a9a1d05ffc0f6065fd9c9b81f18cb6343543a9c4f44e491e72f85bc 5,refs/heads/master,ed303915969a93ac2f220d6ab3042426dda05c89,f32cab29eb45b3300f5a968f2cfd070c97827e98,12a47dcce612dd5b4a3907d00ab7bf3d04b0d8ab,,True,True,True,81,460,1619,37,True,116,Tests_passed,62c216718764015d1f307d0a597ebec0d7c6b316fc02a4396134c1391bc0f8a0,True,Tests_passed,2a2dc0c5aabfa0ca9b961ff84a40ac4b4d73160a4a48aebb7bebe5f59917808b,True,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,da4dcf3ae5860f8617cf23a981b923c07c09c2dd756457c8db9ba9ce3c49e626,Merge_failed,c85e70177f22707ddc48ec1e11ac1c899ba436a4651bab5bfa4b254979432c1b,Tests_passed,c629b2c9a056750bfa512d464f28bff07f8b37c6686431e73c0ef9febc2b825d,Tests_failed,fba98ec8f1d0a46a73f5ea73a607bba96efb91be8de49a0ca3b7696272dcb7d9,Merge_failed,c85e70177f22707ddc48ec1e11ac1c899ba436a4651bab5bfa4b254979432c1b,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,8bf3399f4783170c5ebbc94cea4b890224b61d9a54280b12c9c2dfca39199d9a,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,bafed269b63adecd88431cbedf2d7b41ea901c7c0b020ea1681c25174dd4b3ab,Tests_passed,c629b2c9a056750bfa512d464f28bff07f8b37c6686431e73c0ef9febc2b825d,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1,Merge_failed,6d375d7336ea5c3e71c1a2bc3fccbe534bc0a062a9a4fd99137704ae4682dfa1 11,refs/heads/master,bea67fca06eff381e48a426d7bb23f3e5560167d,76d15bf96876fd4e1dd8772fece6417d2986d575,3e8fa6cd3ba8b791cb219b36cd50625207d4d688,,True,True,True,251,701,14543,3,True,251,Tests_passed,07a3997a4378113b4ef7e8ba1ea967278bd6ba9a5317ff7fecfadfd0500b961e,True,Tests_passed,2797fbda845d8b1475666b074ca00bdf9d33257cc54808f8f2e5f5ff9c5a2c81,True,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,58244e52feff4680e9f16c6cac6acd522601b3fc3284031d4aa2b1a36ddec8c1,Merge_failed,4675b3a40d2b05a726996ec69b30a407ba163ecd0d5c24d96abadbec7d42b9d9,Tests_passed,9c3dbd9ead80c90ad973d4bb6179e0a1173ab4ea56f49cf05f620102eafdbfc1,Tests_failed,3862095dda32c49146174538d3f76d38be10d6cd25c799d9560d3d09537d083c,Merge_failed,4675b3a40d2b05a726996ec69b30a407ba163ecd0d5c24d96abadbec7d42b9d9,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,1f200200bce0606906d58582947fd7ba24b8693ec74065c94f2046fef5b7628b,Tests_passed,9c3dbd9ead80c90ad973d4bb6179e0a1173ab4ea56f49cf05f620102eafdbfc1,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Tests_passed,551b32ee24a618331ac8359f486c026e275f412b80895ead694ef407098f4e4f,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5,Merge_failed,359842d7ea6623b593ba5a057187480ea0d5090b096209d33b6452ad85be29d5 diff --git a/results/reaper/merges_tested/hyphen-ated/djbot.csv b/results/reaper/merges_tested/hyphen-ated/djbot.csv index 40ad9203f8..366d2ecfd5 100644 --- a/results/reaper/merges_tested/hyphen-ated/djbot.csv +++ b/results/reaper/merges_tested/hyphen-ated/djbot.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,13212b187da3dcee9d80fcf3b441aea4888a6240,e7cfb41c9432faa02d641a90cceb514a01efda4b,19712ca231a974c4bd69c40ae4e43fc03d5bba15,,True,True,True,14,90,607,4,True,14,Tests_passed,eec66b2b13823752b4f2587b2976f6b9cf2ac0c1278fe3f1b4edef8018e140e1,True,Tests_passed,b2bcc1ae67caa7d047f42dc8534f1778b3bc2ea1b2907a9830affb4681b9ea99,True,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,7223dc5495246e5762f7a5548ece41ba09e607407db1d0c79352df1dd6ca6ca2,Merge_failed,48ef5fb6d3fbfb61fedaf8b8a1d3a0185c3dac83c8ae93e980bd6991e27c5762,Merge_failed,73eeeb0b3270dffdf1ed92d634934ca11ea8f4072b6fa0fc9a05dccc25187d39,Merge_failed,38c3243273f96fa925ed081d7d6f398ccdab78b58d43d6880a27ce6d1bf3a722,Merge_failed,48ef5fb6d3fbfb61fedaf8b8a1d3a0185c3dac83c8ae93e980bd6991e27c5762,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,7219cf358a6f8158f2219e02a89c17447263383d23cd13988acdd508682a8102,Merge_failed,315a1f1837938123a3a08e8bf02b5222a2791e7326c70465f081c88b188a269b,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Tests_passed,cd62d0feaff11c1faa958cc223cd471825e3cf0b6b55dae8b79a57ead35c0d57,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e,Merge_failed,2b7c65ec6e512f87606bc81725d3e8f3673dc32388a5b0dcc6cc18591db6b59e 3,refs/heads/master,74d4ec8c8eaf131d157dfac6a8e0a84c99720126,6299377a3edaf452b914d61a70d4fdd8afbe3be8,4bb2d7d65ad5f1dfe1e417e0febff7f9e60aa382,,True,False,True,4,8,33,2,True,4,Tests_passed,1eae806f6a437b529d62117e99611b9fb474c2920559ea56600358cc4c3e0c6d,True,Tests_passed,eab0b398b76132ae4e23ed8864d7abca07f9878addbae12bf779f479796e3aec,True,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,ddb001be9887d6997d383164062cde16bcae6fc88517f0d7ad61297c16e2c1b0,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443,Tests_passed,f68622414f7e18ee7542e564cced786f64eede0a1a062d7cbacf008a2a198443 diff --git a/results/reaper/merges_tested/icoloma/tldgen.csv b/results/reaper/merges_tested/icoloma/tldgen.csv index f197564a02..e39db6528f 100644 --- a/results/reaper/merges_tested/icoloma/tldgen.csv +++ b/results/reaper/merges_tested/icoloma/tldgen.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,a124b6e2241bd4840a91df9a382fb8f702e76464,26e62ee81320302d85a92e2c112f3826fc25d604,001adfadb665abf8ae379febb1e494121b1d8827,,True,True,True,18,53,441,4,True,18,Tests_passed,59430136df62d87fddcdc0cd26200995a0f66e6b465fe03dca0461a5943ff288,True,Tests_passed,8d35eb54f2445ef698bc6fdd7955b9da2a9cdde8e6777c8faf59a49f54499079,True,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,4bc1272e39de57b0eae6eb60eac005386985f84603b9eadd30e9d90c794bc00b,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,70a63b5747472c1cef0816425fe81dd6ab2caeb04cd3d24dd185d80bff1080cd,Merge_failed,a8aa3240649cb44ee8c645854c12f63966774a3231cd67d1be28fcfaf66cb4e4,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,834bcfd77524e5fa956164ab6b52bf5185ddcb0eb4ee2e1455e404f2ad3199f2,Tests_passed,951ab844aa25f3071d267d977c10aa636fb9663acff3a0b2f66e8413c2bae3b6,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf,Merge_failed,3c0a81a2ee78fffaa45e76d4d8485ff1d1cfedeccb7da5bd63e820a795782eaf diff --git a/results/reaper/merges_tested/idpf/epubcheck.csv b/results/reaper/merges_tested/idpf/epubcheck.csv index 8614772ca5..ee5407b7f6 100644 --- a/results/reaper/merges_tested/idpf/epubcheck.csv +++ b/results/reaper/merges_tested/idpf/epubcheck.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,23cee7b1b22510f633b006d5540c3a4198a3ccd7,c133d33a71a6e5aee8bcf8684deedc5655459fc5,d1cba214aba957b44052af0f509a98e3e0761ff8,,True,True,True,569,983,36392.0,13,True,593,Tests_passed,ae183d6ed5e5871e2441380a2991000c10fd195c5184eca890b83262d3448d5f,True,Tests_passed,4c9c65fa36d11b98e66e3b4eb8c471e4723310f787eae4e3877cec4ca4371c60,True,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,b0121cdcf1778d00696ffd0ac8470931bb9522c0ab46a6b993319fe74914a249,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,4a980459cbdd15d96589d7048fdcf4eaab5f8d94fbe823d0d6a7aac7024b57ef,Merge_failed,101a7c563c21c00b443035e126ed9e318a7e2eabf0da0abfd9113256e6cef10b,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6262e359e874ac7b73b966a53737e5f3c2de74231e9b9283d88cbf182a210722,Merge_failed,a7ffc75352b0604f6644395a1dbbce270377ee6061b9f7480077397b3ddb2eb2,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,e98caa3185fccbe07e8ca24939ad7d842bf8057b8089196751fba3dfabaf20e5,Merge_failed,7eaad96810cd702e55078dd8dae36bb77a437b0273ce20341490dc31b4599871,Merge_failed,d77f44fa67f6e5d65c269ec3b81249029feb14c9cb18d79e2b92216f41b1f0c4,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,6007ae7b74df638a5924e4ce3656138915eb07c3c44df2ac70afb804c392e89d,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2,Merge_failed,4a48120d469904714d03190c7ad2127c286f421d06cefc5e87373c504b5055e2 diff --git a/results/reaper/merges_tested/idris-hackers/idris-java-rts.csv b/results/reaper/merges_tested/idris-hackers/idris-java-rts.csv index 8a2ebbd115..c5080d3197 100644 --- a/results/reaper/merges_tested/idris-hackers/idris-java-rts.csv +++ b/results/reaper/merges_tested/idris-hackers/idris-java-rts.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,c35f926f298bc670fa197ec7aee03aa74a1a3e13,b500f781a3204060f80fbc613b7e6669e3bca1c0,c4a734fa57af809cf249b389bbadbeeac2c32246,,True,False,Tests_passed,e0333570c8cd9ed805a94d3ecf0e08e411091df9c86e06fbaecb0d5f3e5637d2,True,3,14,197,2,True,Tests_passed,5aa12b1d82b44e7b43fc31a74c4f9d9628a26c650173972caaff8f7700a8437e,True,3,True,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,9d45e51eb47d71f11afc9a8dcddddcb4717bea558f60ad59c86e5727284a74db,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Tests_passed,0649e92f16ffc1b673eaed99e86938efdccfeee54be22244b62702b1536e8d57,Merge_failed,ba0bfe6eee3f964eb4a1e4a1136bf54024bc43473df54687e873b4920bef85d9,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,e1db6c7e5b4c82c90bbe1c0a25fa8c418502be41ec0f4a9740f47cf349ef1ebb,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,d5d116f89291bf835d9a01e8cf61b7b04915e452be6f79313a7b38e42a91e813,Merge_failed,45b64cb00cee265537eefce788fa2ccafa1d4f05dcbf1b987089d811786306ac,Merge_failed,cabb0c5e6aad04c2b11381c8cc19f98c21ffcbf1ce623a0f78ffd2f9f357ada4,Merge_failed,9f36e81cd4290dfe935a24dd722051837e32b557c0bdf46a16ffb5062a453fc4,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe,Merge_failed,16c495c49ea9481c8591b939a08232f05c75827a55f1b149b241b89b4a095efe diff --git a/results/reaper/merges_tested/igniterealtime/tinder.csv b/results/reaper/merges_tested/igniterealtime/tinder.csv index aa24c73a1f..573e5cd121 100644 --- a/results/reaper/merges_tested/igniterealtime/tinder.csv +++ b/results/reaper/merges_tested/igniterealtime/tinder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,c99be3f06ec9c816c3416f2c1963d6b19cc412c9,d43b195d7ac6ed93cfc73635732a3fa3f26d42e8,4462390ee85eea8ea93c15a95d0c8c45b2f49dd1,,True,True,True,32,43,17892,2,True,32,Tests_passed,ae53a361c29ad082499147f51e47428fec3f4a5955a80e14d90876e705dcbdb1,True,Tests_passed,8d30990c278e62e26bf457b5b92c672a770a76a427b395340783f5140c47b04e,True,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,2819a2e403f2f5b3495b3b867e64f34c1743a4b6853ec0ccb0e4fa6274fb3af5,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,b1c783e3d8f6a0f39e78b4d25b75b87532740760689cbdf1dac26248f2162458,Merge_failed,9985ca02daccceea256d4777ab6b6168f3a22927177365786301af60eab32a4b,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,a9a96d571a713c1390958441c58f35f78c39f6a4ecce2813de93fa470cb50e21,Merge_failed,7b6a381f7f9d317b34ee191fb23956d4ab5180a0c1b058a44e0c79a98ff91b67,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,9e2c76f86d24a713b658bceca52a26d5ec879883a68c4dc35ddcd0c765c62e0c,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa,Merge_failed,8680ba0bcd8ebc825011298e7031dbf7bb87c8a77ec2936f7c1ab691a5b0baaa diff --git a/results/reaper/merges_tested/ignorance77/transformiceapi.csv b/results/reaper/merges_tested/ignorance77/transformiceapi.csv index cb11e78872..3e1b0efc49 100644 --- a/results/reaper/merges_tested/ignorance77/transformiceapi.csv +++ b/results/reaper/merges_tested/ignorance77/transformiceapi.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,9a65b8374fff0fea24c5be16c94b999c57c18955,fb6fa941b74b57a81e0230ceb0ad15567f5eb2bd,ea4d04ea1a61a899462ed617ffbb312416af0f8e,,True,True,Tests_passed,1f327f894630144a2fcaf9615227d20ab9de221253cfeecbdf3324af00e70772,True,6,11,73.0,2,True,Tests_passed,776ff7ca01d929a1d6b47dbb92c5624e5e14bd947a66c4074f511cb4cf823ae7,True,6,True,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,ffd083d6a57306a0aa5a1a7b0508d08d1b998fa934b18fb917535359443a0102,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,ffd083d6a57306a0aa5a1a7b0508d08d1b998fa934b18fb917535359443a0102,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be,Tests_failed,caa681352acd8175cb993155c4d0a187ed5bb777009ee5ac7504c7d5b86895be 13,refs/heads/master,07df219c63851a01a3ee6040ca0811d109544375,cd82b7006cc9fd7e7a1d1444575abf56683ac3c5,93d4346a4e4e0421081c5649f6d49f5fe1648464,,True,True,Tests_passed,f63d55ea93748022f84067fd5a65dc9e8119ffc876cdb5fb179eb4da9b834356,True,11,20,219.0,2,True,Tests_passed,467209e6fb7fb6c7eda2ed67d93054bdf6226a61d70ca41657752d8ca2ab77a2,True,11,True,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,f471e76f601c689ed985bf445f3f91fcae57f5edf77f91196deff4b070e756ea,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,c87ee9555204888cbacf842929bf8cc9e09ebe3a0bf393bfaefe098f5648c8e9,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,88b8e430d8633159d7b4493e7a94ca0fc47e6603011fc1401bddd3c92d265e06,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002,Tests_passed,ec2ceabf24fcf4af7e5f68ce3b889807623f648fb76ff6ee1ab55e3cdd4af002 diff --git a/results/reaper/merges_tested/iipc/webarchive-commons.csv b/results/reaper/merges_tested/iipc/webarchive-commons.csv index 0b0de7a756..3386fc2a65 100644 --- a/results/reaper/merges_tested/iipc/webarchive-commons.csv +++ b/results/reaper/merges_tested/iipc/webarchive-commons.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,3d0cdd721a11dea44731904389ac4a54dbd08df5,4586a94a79e143a450d66c2673df9f776b2e8b7e,79aed910b44510294367a4acf4f3e6376b1c62c0,,True,False,True,4,10,111.0,2,True,4,Tests_passed,a0c2aab409ddbb7032f700e03bb6516cb64c516bbb7ac357f53ccf47f07a87b2,True,Tests_passed,0e042dd60efda06752bda17f1dd7e659698639f9faa72d691fd55643a7993621,True,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,cc1bd71d8b1be39f3ecea7a109943f8281d60991017af5b93c9a01f71c1189ba,Tests_failed,366116227599e78616a0fd694666a7a5d40dd9f013d4f2d0a8ffdd33183d3d29,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,cc1bd71d8b1be39f3ecea7a109943f8281d60991017af5b93c9a01f71c1189ba,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,b9226f284f58275459a64344f2ef51c9065e89c33daa99360129ca2b0334de5e,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1,Tests_passed,a646bcc216b260c9400a73b42930aef9e55dc2261d7f8e545d7972789c9922f1 70,refs/remotes/origin/2.0.0-DEV,6b33f9b79f1d3a913ca5e1952149a72ab1104a43,3ba7b47bd90a81ce0b0d4c5ba638c8a3d1d7d4f4,604f05959596128785028863dc72ffc7ccde6536,,True,True,True,25,312,1033.0,4,True,25,Tests_passed,a5d15cb5190e6d3a49e6646185430fad8df619fff0fe535099725c4b939c4ff8,True,Tests_passed,55a24d0e9afdc5e68707f30e56d5a5602a7a32085ad6785988f836071e8c74c4,True,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,0b2a9c5b571d47bb8679a32f711c60726d8463e497b02e9ee1ccef1364c1c4d4,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,611e4081bf267625e4a7e2d2a336f7b2904491376d6cd2cf3b6855936b3e6bb9,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa,Tests_passed,de82abe5f37df1dfe95270fe035f1f152f65693102aa64df2f0b396aed5733fa diff --git a/results/reaper/merges_tested/imagej/imagej-ops.csv b/results/reaper/merges_tested/imagej/imagej-ops.csv index fbe5150280..d4ef225a81 100644 --- a/results/reaper/merges_tested/imagej/imagej-ops.csv +++ b/results/reaper/merges_tested/imagej/imagej-ops.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7c6c029a911f721467b552bd446a7d9206ad46e2,d2b46095b23c72389a872e109454a05dddef915a,5d3d50356848cfc1c147774878fdf9662eeec966,,True,True,True,944,1079,2408,3,True,945,Tests_passed,9ac97ba1f434c5f3fe302c7312040abf04f836cbaa660b5a0e0124db99d0c34b,True,Tests_passed,5843bc0639c6c697b032ad92a4ca7c5d5ea13f9ea343876e3599e12a901bcf01,True,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,1322d884c2391b4d1fe5fccf5224ebbaca9c840dcf50128dccfff8e1c7e34195,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,1322d884c2391b4d1fe5fccf5224ebbaca9c840dcf50128dccfff8e1c7e34195,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b,Tests_passed,fdedcc25b7fc16383c650c83efa10c6421c2e6e9a4675eaaa6c4cca68af65c3b 3,refs/heads/master,4a3b273c23ad343d026a0e4770cb755b81032f9d,eccaa9a1b5b85e931114872a1a0d47e81da9fbba,a2b49e2a77f37952520ea214fa21efa7838461b5,,True,True,True,966,3076,16077,3,True,966,Tests_passed,14cd3527a14f07111d833f4af1ac2192e2fe687280208f351b6e5497a6d01250,True,Tests_passed,bcca8620da4b5b3caba604ee11f285b3ea9cfe6e936111410168f268da1d2b1a,True,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,b1db6f1e8acdd9bfa8ec0b2594e966f1546ff5f7d706f03c78923b6896571d1f,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,1ad7d23601c2cd2875a0fcb4a148fa05490ccbb64a40ad77af20e4dcf2f7d5cd,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb,Tests_passed,6972d3a4b81c9241856683add508be41c6b59b0956b3c82a9405019121ba77fb 5,refs/heads/master,bbf2d7e78454d9dd0fa95f9082efd4b53f21ad47,1db6c2d1c781ed066d61ca6731e1f310562b3499,ebedca370d45d786233cacfbc4ca1324313ae3c0,,True,True,True,953,2348,9486,2,True,953,Tests_passed,fba146a482b17584c28e6af8561a54326a8ce0fb3231c5b354937b86f0d09ca7,True,Tests_passed,4832e3bfea0354204f20b10bb9f859e03cc9df725f024f22bed0ddec7eb34ff5,True,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,6bc31c6a3c89fb5e4e46c6b0406014da3c2eebe84e182ade9552b8db0d0c625b,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,6bc31c6a3c89fb5e4e46c6b0406014da3c2eebe84e182ade9552b8db0d0c625b,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,f91d2fca7d3f1aad6906cd83193f2156d973ff1beeab70820477dc77258ace83,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f,Tests_passed,c6005092c455f01195a46555faa9a1498ac4ea2168c44deb9848066d7d43f85f diff --git a/results/reaper/merges_tested/imglib/imglib2.csv b/results/reaper/merges_tested/imglib/imglib2.csv index 0ad542ad41..71f70577e1 100644 --- a/results/reaper/merges_tested/imglib/imglib2.csv +++ b/results/reaper/merges_tested/imglib/imglib2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,e7346e55e937c576e23dc3a0668e7798468554f1,55d1176eb8f7eb680db287c1794db210c9be9d89,215f65b62b8544c490b38e4943fa94b9efd46ac9,,True,True,True,660.0,973,4364.0,13,True,661,Tests_passed,c3fb3e1ac5b762ad0e7bf1f72cc57b5a9fbf0afe505480c65f129f9340b077d5,True,Tests_passed,15c25084399797f7e4dc8c076d8ebf38de33e8db0a44fc962d5602b36c7931bf,True,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_failed,5ccddcde1911fecffa76e5cfd3d00e5ec332611c98a90e344ac1778d30cd9072,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_failed,5ccddcde1911fecffa76e5cfd3d00e5ec332611c98a90e344ac1778d30cd9072,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,5e3976937eddc3e2e085733d4e1177ce627b8ee622f8de3bf687c791120c2bf1,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5,Tests_passed,797ab844bdd8779997e66888104e1608574bd2bf62e4506ddab25fa581dfe8f5 17,refs/heads/master,871b03b9a7cb624f9959679a4009a689ddca8b7b,ecaf4fda351ebf95beb23d7a27b46bd5b57a563f,e27654f74b1cdeff03c97018cf336bbd4319fbc5,,True,True,True,40.0,160,2888.0,2,True,44,Tests_passed,33211836c04416dfcebac1042fcda3be9b090385af547ff644bfc581ab3d07b0,True,Tests_passed,e71bcd4a19adb551ca12e861de18eff9145caeec656c6a52335562ae232e6b7d,True,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,91c6382a08b27d4528fa46212c5452ac6ce03cfc36e2b3691f87320817e723c6,Tests_passed,ccca0bd868135a833c3e41b3c2a62ac5cec56b712ea01dffbf46fba95a04f161,Tests_passed,66d5195c53202c7880339f14f08aab7c79d1354fdd2891aaa1dbbadd19a0e377,Tests_failed,7a9b6f9e68140d4cbe67a52e9857e7b40eb4fef5ab13f70fd59b228cb9edc770,Tests_passed,ccca0bd868135a833c3e41b3c2a62ac5cec56b712ea01dffbf46fba95a04f161,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,9a523381b3277c26fc125a55c16df1f2e287ee4cd07eeeca1fb7865ea6b735c7,Tests_passed,66d5195c53202c7880339f14f08aab7c79d1354fdd2891aaa1dbbadd19a0e377,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34,Merge_failed,ba3dcccc84d261841d0c667c6dac11c3701285f0dfb56be6d2df5fa609260d34 73,refs/heads/master,dd4b342823ffc8756a05e5006dccef4bf47ad066,3160bc982d2ae97cee909dc7cccde9515b003a7d,86c79fbb711ceb89f8535cb3a6ca1d3d34cf4b4a,,True,True,True,160.0,1114,6126.0,4,True,160,Tests_passed,8332bb7c2f31214eb01a08f0c40a43b27290bb05f75c0f4d09fbb5cf1a46be37,True,Tests_passed,c23c4415708cc86ed611dca4ebaab27cc2abf3493cb85bba6696713dc8092f7e,True,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,d4066cc3390b01e65639802c15074a4345ba07655d17a7f44816762f2cce198a,Merge_failed,725af1888da5ff0aac2fd9076b6983d7344db54b59df504eb0dddbd41c10f796,Tests_passed,ce04b2d2dfd08804aa1e94f35f861e1c6f0285444546180f5165a5452cf3963a,Merge_failed,a3ee916105a8d06c8393e3338dc11b822935cec5c22b002bcc898d973045d299,Merge_failed,725af1888da5ff0aac2fd9076b6983d7344db54b59df504eb0dddbd41c10f796,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,a040bf7bbe0d78f91d34538b4f9d72b0f28fddb42aab241df9c3202c8ae74249,Tests_passed,ce04b2d2dfd08804aa1e94f35f861e1c6f0285444546180f5165a5452cf3963a,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Tests_passed,ee01ba789067ed12970028d3df1b39a5bd3580be1031be580988abe0c375e93f,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d,Merge_failed,2883f3750262dedf0370a9703db358c06c9dd31a87f414605abf7eab6c49775d diff --git a/results/reaper/merges_tested/imixs/imixs-workflow.csv b/results/reaper/merges_tested/imixs/imixs-workflow.csv index c6d1b6f971..c7b0fe94d1 100644 --- a/results/reaper/merges_tested/imixs/imixs-workflow.csv +++ b/results/reaper/merges_tested/imixs/imixs-workflow.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,c7213a8599927a2e82c9cd0fc28d32554167125e,2a98c0f5c974fdb822dcac40cb44872b34e0d9d6,60667c03a8eab638f51dfac73aa160668a9cd7f1,,True,True,True,151,540,11966,9,True,151,Tests_passed,56cb99ec70b59ddad1a93f40c8d50067fb21f5e190c827c8bffb9a5e523e3d1a,True,Tests_passed,e4ebdc9caceab62bac5673096cd7063d4903b04e15b2ac24931fca55e472e025,True,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,b6ada3e60bd4920686b1a3cd5dc0ee7d42972c3087b980c5d324753678dfe916,Merge_failed,e15af75682b852e07c245cba5b1eb69d02c29b64db0a9d3a020db75e845efd8d,Merge_failed,e30d7652ab02bf1a2a2b852b747c378318cefcd1e714e45bf9c2ffebfb668b43,Merge_timedout,,Merge_failed,e15af75682b852e07c245cba5b1eb69d02c29b64db0a9d3a020db75e845efd8d,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,705db50b89696efdbc9c5293a4f41e608795e0843cdb54a16af2251dd50dea1f,Merge_failed,371f96832203d333c29fcd3a04d3f95288636055d47423ee7c1cca6d5ac4fd17,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c,Merge_failed,794d94787ea954ec75809f25d3a79f2ce50b253239c14557af3895f3307bad9c 11,refs/heads/master,4f71db6de76da70d3bf01363201b369f39946f4b,e23f82ff6405944f0ff516cdf4fa5e51961224bc,4fbc3221b024b3c2c11b7e16e9c610f96f9900c2,,True,True,True,151,542,11972,2,True,151,Tests_passed,8dbeae3125db04385bc17eb4f00a7ba8225272e07c0eaabc17116aa2580d1e92,True,Tests_passed,94e2cdda7508523e7b9a8a11a242ffeba8127efa246e4b8571a9745753ac4f77,True,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,476f7aee1b7f4b4f55509739963c812a4c31f9a3eb014de6acb893c1b9b89110,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,476f7aee1b7f4b4f55509739963c812a4c31f9a3eb014de6acb893c1b9b89110,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,ee108395d0ba751a4ea585bb979792c8365702bfe3ce3926df675be7f7097f5b,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e,Tests_passed,9a48a5ca2a16cecd9d0341866f2cfb382fa47320d78838d488a49e6ff7c6440e 12,refs/heads/master,3e72e74ecd667e3e23531d180f3b2860fafaab27,e58fcff3929cfb7ab84e1333b1387a6b80f10548,58fa11564f4525e6bd6bf59244eb396c73dc75da,,True,True,True,151,539,11980,9,True,151,Tests_passed,41fe0659db4cf1d19eab42b10db6660dccaf684a6b26edc0ed93160b97f10173,True,Tests_passed,c2bc92b34a31861bd02d4cbc1f85869d009a83810be9dd5a7ee811c7660b74a3,True,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,50cde6286f14931159d533a0a9c35137c7c040ce87ec745f749c505089300721,Merge_failed,24dd59db44c1db0eb49c7af8768843c1b0f46a9552094af092cd179086c30c7e,Merge_failed,263eef70cf32fc31973a63d25762cd73fba2212abf91243d7687f3478c133abf,Merge_timedout,,Merge_failed,24dd59db44c1db0eb49c7af8768843c1b0f46a9552094af092cd179086c30c7e,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,3d11dec3ac3c92e8e10da23e550e84b4958fb36b72307382cb07bbee68b09dfd,Merge_failed,0dbc8e5c43737578b0bae7695ebb618c0281ef82b73dd0ad8a22b010549b2a8f,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694,Merge_failed,d016a5c9925a52f2675d5af7354068ba889345400b179c0a1238777310e8e694 diff --git a/results/reaper/merges_tested/immobilienscout24/deadcode4j.csv b/results/reaper/merges_tested/immobilienscout24/deadcode4j.csv index 590481d497..2eca351521 100644 --- a/results/reaper/merges_tested/immobilienscout24/deadcode4j.csv +++ b/results/reaper/merges_tested/immobilienscout24/deadcode4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,abbc95c30c2fa999e87557eb715e51b00556b802,df31162ba10e6746a77eb7c4967987ef151b2304,9169f1deac0d3bdf8a2ee8e5de7482037dbc24c4,,True,True,Tests_passed,b0e98c3eefa9a4eb48283ce5b5b8aeb9837473180e31f66ca28712242e553b85,True,91,130,3109,2,True,Tests_passed,ce3fb56e88f9a9e94664c8658a58f05c3c68ed3b11a8f5c61e8f5af9e307ec4b,True,91,True,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,07a2e460363132a2e4e6adc6edfbb8a0337e6e2c5f9d8f661ebc41fd291be18b,Merge_timedout,,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,07a2e460363132a2e4e6adc6edfbb8a0337e6e2c5f9d8f661ebc41fd291be18b,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662,Tests_passed,eeedec25d9725f6e5041d906bde1bdbf18920a8fa3aa123b9fef622941e1f662 25,refs/heads/master,5aee1194b7e224d667ec4053676fd48f72cd2317,f3c7faae1cdc0f42cf6a57d31b56759213ba7daf,5c07de747b84c0ee5f21a07127aba90a1c96eb66,,True,True,Tests_passed,48aa1862b555ce7b2ecb51c58314388926057cc5611ca3f71cff88e70e47deab,True,72,84,2531,4,True,Tests_passed,8c249514f541354ff0466ce9b69806b31eaa3bb5c3aa99d875af6ae2097d7358,True,73,True,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,76939ff6ad8c161b8834acc45bb2556d13e7a2ee0292af019dc1e58340aa5c76,Merge_failed,d92325cb6996be543ac449e8d10e1cf0872965cedca1739f4571dd8909599c5b,Merge_failed,8878a7971c32843ae5188feccfcd07943713afbc715bf41fdde838e1608c991b,Merge_failed,b85ce4a6e7a0298093db0978fd98b273ac6558f35cd3cc3c37ded1b600fc5cce,Merge_failed,d92325cb6996be543ac449e8d10e1cf0872965cedca1739f4571dd8909599c5b,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,3d1ded0503b7b99c14f60d99eff949ea66c86baf4836e56ccd69e35a2380c3c1,Merge_failed,8878a7971c32843ae5188feccfcd07943713afbc715bf41fdde838e1608c991b,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea,Merge_failed,5a3863c053ede7fa3b97a41dcdc68db3a75e199f811cbc8416ed982a49940aea 26,refs/heads/master,4a894fe5616a8290f6f5e1458b3e077c0d5e2106,79e31d8cf4f9aa17154d0e71ef3f7c6805bdb9a6,98128ee31a5b0ecbc2d90c03714e4dac42d36670,,True,True,Tests_passed,222484735e881096caf5780c63c5fba7795a39a63d0d9606254eb2c588a767c3,True,88,227,3509,3,True,Tests_passed,c4405c20930706372b7ced2d3794f0c20663522b8f2104392114601cc1201438,True,89,True,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,839ad7425051fcec9e451a390d951c9c6b9e6c7a99a808a4aef882bd1f12e484,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,4a96eb655d51e731a65380d733a4fb477a08b82036f40e45d746e5887c1d85c3,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,fd0d4ee1c8ef01bb21d5f59d05e38ef821f6e640f6a5d78e4aa17e401c4824c7,Merge_failed,9fdbf81b5f5e3a71e0724f69d8e9f26c115c4386d7e0c6f38ae57b236f0e24fd,Merge_failed,cf3d870f630c826df543a4c90bc10eba93c021daf6c63cda36f11501c0126cf1,Merge_timedout,,Merge_failed,9fdbf81b5f5e3a71e0724f69d8e9f26c115c4386d7e0c6f38ae57b236f0e24fd,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,4a96eb655d51e731a65380d733a4fb477a08b82036f40e45d746e5887c1d85c3,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,367501e8fdf899add71b9079ee37f215efad99c117cdaa306d3d1d5fb4eaf2df,Merge_failed,db5a5ab0c8e0edade6f2b7f65289f87d12611c6b7ad319c4033cafeafea24b98,Merge_failed,cf3d870f630c826df543a4c90bc10eba93c021daf6c63cda36f11501c0126cf1,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,839ad7425051fcec9e451a390d951c9c6b9e6c7a99a808a4aef882bd1f12e484,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a,Merge_failed,e19b97047dd3b4650f00b3045c4688ebd8fc74bda9a6c583b66620eea6b1354a diff --git a/results/reaper/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv b/results/reaper/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv index d399cec2ab..157f5c6e83 100644 --- a/results/reaper/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv +++ b/results/reaper/merges_tested/in-the-keyhole/khs-spring-batch-report-writer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,93520a37d008510ab7d8b0c2f7c904c526c02296,6097377d96d0bbe4d8bcadf767d366c50c641ee3,bf21478ae52b4c81eca759aeadd89324986aa1a6,,True,True,True,7,31,285,2,True,7,Tests_passed,b6909260bf934db2d5aef36578b0fe3a78a6be02c57952f8a942d48c4f8a1f63,True,Tests_passed,35406290825cfe22742a72e9487d1fd4a4a52d1c4a037864df6b6ecbfedaa9fb,True,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,5aeb885ec033f26f1c5d862555309034aa6220d9c727608315a04a85ccec11c7,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,c48b9fa611a372870dcc944d5f50b9278c395fa5c4a2c9f0850c30b4ef0fd382,Merge_failed,7aab709e4fedf031ba9fac5d3da1cbdf3685964a13107d419a66c5167985f705,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12367e53b746318a109dcbcc57afe73927ea2484534f0969670b9284668e1f4f,Merge_failed,4f734e107039af5ab91b43420ed6215325b7d7d038bb6a2e1f4fbe158b102da3,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Tests_passed,12c659cb6ad5480a33dfbbd4ecffff0a4206901f6438ab2400a4912ac30ee99b,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef,Merge_failed,12c48951ebffe28363ca0c96e51eeadbfb874b295e715eea3f51e05a2938d2ef diff --git a/results/reaper/merges_tested/inaiat/jqplot4java.csv b/results/reaper/merges_tested/inaiat/jqplot4java.csv index 8b7346ae45..ddc6f59957 100644 --- a/results/reaper/merges_tested/inaiat/jqplot4java.csv +++ b/results/reaper/merges_tested/inaiat/jqplot4java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,c86f902735495376b859be63a90203832b4d92b6,65229dd370b0898ec9eeabf030302ed889ca1886,6ead916aa215b4efaff44fe4aeb365f9cc50fdd5,,True,True,Tests_passed,db84a3f637c33d10c51bdba3688c9c3d8ac79052296b6c2e37137c77bd137559,True,33,440,4426.0,3,True,Tests_passed,682d9db5eb6f06af921f1ce3c94cfe360fb9f058a09c58bc0d89c4764367933b,True,33,True,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,081f94adf50a2b5cbcb59072aa1f90589980e3d106836e81ee279b101051ca7f,Tests_failed,88afcf6c095180f343b1f597f69e3b0a5c9e9570d0d78f2fb5f045429ac89d97,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,081f94adf50a2b5cbcb59072aa1f90589980e3d106836e81ee279b101051ca7f,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb,Tests_passed,7558fd8e8242fb298b6cf000ee9ec9647ae65acfe57d88b82f902c041fd7b9bb 13,refs/heads/master,6239c0dc07dc0d45ccf92b81ad4ba91d70137136,acee7209f0ba8e8ff196132182a77c7b620d8bb1,b7033b00afeca37605535cc7495bf9f6b112e5cc,,True,,Tests_passed,3338119461b87ef064f62bd8e152002ba2a6f4093b8628973c67ad671e23bd58,True,21,246,,4,True,Tests_passed,4889f248db533de82d6259abffd91a3da155dd7e5b7c2886f2c7812a6a83de69,True,21,True,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,6421e852240343f8a109b56296306376f32de369ff94e549debd31ce4d6e9177,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,d1e0dc2ec2ff6666897819f35f8b941bd961e4fdad58a578b0104c234c3b9ae4,Merge_failed,f862c02ee04f80de66af2972e7ef94175b585c0981d4d71d5175208cbeb821db,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,6d0aab1e6e2ef8cde9d23f5d381a24c80e4a52ce8d035f69afd1eb83700c6045,Merge_failed,8f24bb8449cd53aa6807955c9ee86b0b0156f70fec10a026530aaaeadb1ee1fd,Merge_failed,0350813c054172d1547385c2e496248315989e80d5b974a990d50e953d583b82,Merge_failed,a4e5c67100bd60947b667b1e720940c6c97653814aae26d9b81c4913c5201604,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,0597ef261d1698155a2f5a07a9ef7bf3b38bc693e1f7394c41ccbe2c51503290,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a,Merge_failed,6b4e5915886e9703a20da1ba2a6db378f39ab6d0cecc9c23ba276a68a09e9c9a diff --git a/results/reaper/merges_tested/ingenieux/awseb-deployment-plugin.csv b/results/reaper/merges_tested/ingenieux/awseb-deployment-plugin.csv index 90c5e25830..d54f3f7aa8 100644 --- a/results/reaper/merges_tested/ingenieux/awseb-deployment-plugin.csv +++ b/results/reaper/merges_tested/ingenieux/awseb-deployment-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,527e238ddf7b25402927371510f22e9a01ac8750,3d8ed54a7eb32de45b50b57cfe2975f58212f9ed,688514ce6ee363c40f3f7afd8946e6b84eb3ff5b,,True,False,True,2,3,15,2,True,2,Tests_passed,797e25d8ac159c1996acae92a69eb46b6f0ead3fe804f691d6b3b305e3b6ddad,True,Tests_passed,02b38fd2fadecdeee51c74fab5982924939ecddd2815a44d1e8331e9638832b0,True,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_failed,f5ed4d693e60707e5a519600ea6dc7bb034075511e01d058c0e73463d9bbd7fd,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,1549c9243002e9d75db7b25717241d9ce12bab19766947cd41cbf99bfb825689,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0,Tests_passed,992c83eaad03e3aaae8574d4a1037d5e423503fb99fd18af69d90c1da425ede0 diff --git a/results/reaper/merges_tested/intcode/sweetie.csv b/results/reaper/merges_tested/intcode/sweetie.csv index b0f8ca8a6a..0d531a408c 100644 --- a/results/reaper/merges_tested/intcode/sweetie.csv +++ b/results/reaper/merges_tested/intcode/sweetie.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,a9dd1a794eb1d4b3e7c9e26d4dd716df84189d88,3f18be686982e9c85e421ec672acc397e8296a97,001aeae00779c70a403f427ed33adf50ef85bfaf,,True,True,True,39,164,1595,3,True,39,Tests_passed,3dfaa9858762e1761a24f8fb6fb4fd11434d99dbf23df754d12276c1e26bfae5,True,Tests_passed,fe3fa22e6b0de4a57bd80e280fd82439ad791216e18b73c2a605a17c2d1f72ed,True,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,0849fb832b134a4036520f0777bdd77451d08481777788b0db5d513e77752d85,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,7f36d9b680f23d1bea1ddd04129076ebb2c50755471b3afc588ae5c6aad008de,Tests_failed,fb10e31e247138acd3d0f9789a16a0ed2046caf31c5239e4a68847130712f26a,Merge_failed,d1c100cbfb3b07e409540f8f7d1bcd006d97fe71a20837162f8b6db57a7b27ca,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,57b94158f2bbc74c1b982bb4d24636f3ed4c4d2e1ef7044c765286bda5571bf0,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90,Merge_failed,d4e3e20e3d4981c56187820389aef59e21f903b453aa5d88d05ccfa87a050e90 diff --git a/results/reaper/merges_tested/ipeirotis/get-another-label.csv b/results/reaper/merges_tested/ipeirotis/get-another-label.csv index 37971bc27b..89cf7672fe 100644 --- a/results/reaper/merges_tested/ipeirotis/get-another-label.csv +++ b/results/reaper/merges_tested/ipeirotis/get-another-label.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,ac8fd271f85a8adee28bffb01bf892ddacbb66d3,0989f5097729cdfcfe91010095351bd233596880,e132f19c89ad735a3a75b173fb833acfdb6fbeb6,,True,True,True,7,32,147.0,2,True,7,Tests_passed,2909cf287f63c0e1df62669d37d30422c96b6574758b32e9c9a96bbad1b04a4f,True,Tests_passed,9e873c54ac25d1e2ba614103167e71cdc676332aba6e100b028805bef8921e64,True,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,87f40b6c984a5279aad2f7b11657fd12a6f6c02dcc08a1c3ba27aa32d14bdca1,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655,Tests_passed,5c0fd12eb3e2a6b60f945b581b7f40a8b4cc37ccb6e163a0fca573594b8b0655 diff --git a/results/reaper/merges_tested/irobertson/jpa-annotation-processor.csv b/results/reaper/merges_tested/irobertson/jpa-annotation-processor.csv index f24575cfb0..d116dbb043 100644 --- a/results/reaper/merges_tested/irobertson/jpa-annotation-processor.csv +++ b/results/reaper/merges_tested/irobertson/jpa-annotation-processor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,7afb7f707acec7dedb8da5a37d80ce8b28a2ad5d,9945edc9998ecffa0b9796887a6b0309dcc3c0a9,36cba17aa2e95effcea8f835318559301e0471d6,,True,True,Tests_passed,0f39920997c185c204ab490e7745e00959f5a795f53feafcdd893faab75ac33e,True,4,26,95,2,True,Tests_passed,443572ca1c16e6e1e832edd1fb2f0cbee50fa3e91b720da5a45f583e636d6c28,True,4,True,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_failed,5c4aa6b961e7014fe586a892174fa0e202f0cda654d74e20b9dc7e1c7746097f,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,3262584c0f8cc887f66370ce767d1bd7dc939a06d73cc0298dc3125b0a9e5e70,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb,Tests_passed,614744bc75fa933ea6e7019c75e7f4e16b97c819d6a88ab6a6eff164407a44cb diff --git a/results/reaper/merges_tested/irstv/cts.csv b/results/reaper/merges_tested/irstv/cts.csv index e64f8f8f47..d72e8c843f 100644 --- a/results/reaper/merges_tested/irstv/cts.csv +++ b/results/reaper/merges_tested/irstv/cts.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/heads/master,237a62d67756b7e6562eb1ef75ae18bd26f4f768,944113ca8f5a75a9984f9040328dafd54443fbf2,b8db8e790fcd6725cbeb327e9183587ca3b9cb72,,True,True,True,16,1555,20597.0,6,True,17,Tests_passed,6af8635da82c1a54d9232f9afa809a48b31d5673dbca7464af810be13d104cf3,True,Tests_passed,16bffec354ea90f6fc59b690b9895845d0089b9c9c1ac5147779510dfb6548ad,True,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,aee0024e947e4c44fe62c68cf2b86d4b5d745e449792353bd8fda5e42ccb153b,Merge_failed,1649ff9ae02be849d17a718360bc64a131e9fe238dabac733dfc14bfa737c5a3,Merge_failed,75c9476497ae93c41d94f4a6d561010b7bc35b0a3fee29729e151b17511d62ed,Merge_failed,2fe77c42e96c2f434b68d9c9bbcd875d36d0dfa4191311c33f92d71a4d03c23a,Merge_failed,1649ff9ae02be849d17a718360bc64a131e9fe238dabac733dfc14bfa737c5a3,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,04649044c5294f156307a4074c12d21ea4395105f534dac07159d8e16d60f6c7,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,410e46681955cdbda897e9e55474927d13cd00bc5ad57ce82b7c40a5b2994506,Merge_failed,d68a75169415f2a72da9116ee972fcb39608de4b838c1c1a531e79feb50f2fa0,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,bc3dc23299e7de923447d4ebc0550540bdae3c7d2919d5406b54eb501417ebea,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d,Merge_failed,55bf1f5c25fc45683cbe696e30a3397d58be502a08e033f74c8793660dc6f05d 68,refs/heads/master,99e5d7dd4375466d8911dd12651d632540656789,b5e40d1851d46d0b5b1d745e5f9baf96d195a9ba,5ce3f2355416a9203dd1b12b8ff9d224d2b796a5,,True,,True,90,371,,6,True,90,Tests_passed,021788f737e7b9774c09b3d85ba338c8470362d69b7013e0c3f5936ccab75df4,True,Tests_passed,d1fd7ad07c29541c44c84a3dc043b1717375e9e155bf511736b8adcbe37cb190,True,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,5d9e3dee72f78bf5870e1850992b13e969a4f54bbe4ed634e86796aff869e991,Merge_failed,a7e77180d8c155d893e9bc544006267add5b09cc385143e033ee142fb736eee2,Merge_failed,3d634aedba0552d16c7dfb4669011ef58b223404531d4feb814c873ca12dad9c,Merge_failed,1df19750687f085e0026e7ab05d6fb795a2a21ab9d32a37b25d600bd24e0c4d8,Merge_failed,a7e77180d8c155d893e9bc544006267add5b09cc385143e033ee142fb736eee2,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,97a7942f01e936ece646dfc7b11963a2dc9ce90463710f831833ba026ecb7d01,Merge_failed,3d634aedba0552d16c7dfb4669011ef58b223404531d4feb814c873ca12dad9c,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,dc38fe1b5794bb8c9637461c51b0c11a6284da6e0279fa35bdca51c7074df17d,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7,Merge_failed,00c63d3ac4a1dc39a3185299d4694efed7149987885c5d0f95c627fd286146f7 70,refs/heads/master,e5ac2fb4e8ef1b4418f9d55477b664e02193101f,f0d036b91ebf1b39d8189dc04cb75e12d706da2a,99574c8e55ca1d77866827d98b3212b3a3f60170,,True,True,True,102,1107,28522.0,11,True,102,Tests_passed,37ac7bd9b801733444360ca3c443c7384a09cc4be321a16570d745f67f5c630c,True,Tests_passed,64ced37fb36a907e94fd8e8375fda13cc28a4d4837291276439c7d4d9a02f222,True,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,14ecdb07e5b3dbef530818aa40db581b83f7f9b0e0c9172b38b374a533c0c34b,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,4cfcd7f32b77d8e044879847524f770ac48f338ed4bab9b6c6cf9adc94f99016,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,d84ad44fc3b0bdb1802947db4c59e548e2f7f0e2755fcfb70c7b227645435a2d,Merge_failed,b10b3231b34b5fc2779d393bd1634168c6d9fcb0fecf5f409a92a433aec74cd0,Merge_failed,1b86b2c1cd7df662901cf9cab0d7f08c9466e3cfef704ffbe77dc673ad771013,Merge_failed,0cfa070e21b9c021b2e3d77d4e36061fd61cd969c23dc6a787b0081fe1311ad9,Merge_timedout,,Merge_failed,1b86b2c1cd7df662901cf9cab0d7f08c9466e3cfef704ffbe77dc673ad771013,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,4cfcd7f32b77d8e044879847524f770ac48f338ed4bab9b6c6cf9adc94f99016,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,e3ff898f9fc7e67dddd53fabf46ef4c193d99df75a532cc4b90772834170a59f,Merge_failed,d84ad44fc3b0bdb1802947db4c59e548e2f7f0e2755fcfb70c7b227645435a2d,Merge_failed,6c5449bc3938b0923b6866711452afa421b09eddf7a53969767ea78db3150ca0,Merge_failed,0cfa070e21b9c021b2e3d77d4e36061fd61cd969c23dc6a787b0081fe1311ad9,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,14ecdb07e5b3dbef530818aa40db581b83f7f9b0e0c9172b38b374a533c0c34b,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162,Merge_failed,e480388f753cf5aedb94581c267175bc725fad431989647698f1337a4dca1162 diff --git a/results/reaper/merges_tested/iryndin/jdbf.csv b/results/reaper/merges_tested/iryndin/jdbf.csv index 119ae98c90..baa264294b 100644 --- a/results/reaper/merges_tested/iryndin/jdbf.csv +++ b/results/reaper/merges_tested/iryndin/jdbf.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,9853124d737de64723a5fbdc879aed3b3d907656,6873736fe4071a4ab6e1cf0790f2c3eb252146ee,7855c84d1ca249ed60c5f43634036c6c34c334bc,,True,True,True,10,41,365,2,True,10,Tests_passed,decc28d7f0fc97bf55ee9c3becde0b585c246a4ad569ab3ef73e21162a80191f,True,Tests_passed,e6156306513b246fd88141be270e51fed49622d50b84271889eb80cc14b811d1,True,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,206558c54aeb643a864dcb265eee6d57d22193536a6c0456edccce00f3b8d34d,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b,Tests_failed,7cc3f3a175b278b6774f0c4a7cfeb87af5804885b0d3033bc7ad78d98420e12b diff --git a/results/reaper/merges_tested/iterate-ch/java-openstack-swift.csv b/results/reaper/merges_tested/iterate-ch/java-openstack-swift.csv index f737a061dd..1577db20c2 100644 --- a/results/reaper/merges_tested/iterate-ch/java-openstack-swift.csv +++ b/results/reaper/merges_tested/iterate-ch/java-openstack-swift.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,8a6b85283157ee0e827e9f4b99848372bb20e770,45818c6defaaaf55e9973c210d069877ac708643,8d3f1c990fd8de009a13a9b67769c8c80ae5f7c8,,True,True,True,5,25,580,2,True,5,Tests_passed,492d0fb3ffa41989fa930aae319f5fb19bcd2c00a5fad6c03781efd0dd99c10d,True,Tests_passed,dcee5e5189caee7da235f3f57dcfd19e9c012a3bbd7dd5bb693ade1d60c49eb2,True,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,15ab040df872fb06c1ff4c90669754f28e3c9d2a5713b7bf94196a846dd208c6,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,aa768e2365a03b752ac98dcf3226a0889f47fb0618a48a5f94794b19a51d264e,Tests_passed,3f7e94aa8a2596afa45dd9127d8229974302fad78be8d27e913e63e5dad918d9,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,6b14d809f56a3bbb58f806b0cea74dfd93f4115f115ff542adc3219244ca537a,Tests_passed,d8d4628fbec6a105fff2a40b1aea8653985ba0d3aa6afaa09eea853d7ad682ae,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9631cc19f0ceed714e44140e90bd724735e1237639318de8436c1d7d5e567084,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358,Merge_failed,9878b14df4907e7a783b8fee71dfb0a14452a4f524db16c1d4d20a0a5c912358 diff --git a/results/reaper/merges_tested/j256/ormlite-core.csv b/results/reaper/merges_tested/j256/ormlite-core.csv index c09adc790c..f08012be65 100644 --- a/results/reaper/merges_tested/j256/ormlite-core.csv +++ b/results/reaper/merges_tested/j256/ormlite-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,69a425eba7a7415c16d341a1ba34603604c06349,8fd3946900e2ef1f8b14729f3e08cc9dda7d01b7,c15b47ca259110e870ededf66195275d18298495,,True,True,True,96,610,19457,3,True,96,Tests_passed,14428c2ed7a2231c5148582ccccf2525b107f59107332e6c34bcf913f43a79b4,True,Tests_passed,d6c76e5450a337ac69ebe8e8af503d086120a3515f203074fb22b7c6e9cdc1ae,True,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,4c64e9dcd772a16b9078d5d3c8e8bd9b61b122501345f3a894959de3d3780aec,Tests_failed,9c14466ff6143f1141c20c36297b92a83850d7ba2d4f1c80a523faf424bcbcc2,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,4c64e9dcd772a16b9078d5d3c8e8bd9b61b122501345f3a894959de3d3780aec,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d,Tests_passed,9e1af06fa24990b84fea9b69110414e0262008d48124362515600d51bc63f31d 10,refs/heads/master,606986f118bb8c4de534c102f93dcbdc1241abd7,f46f05f128a1bde083a51b6f6e9f8f4a0981d7e5,1b78b22f5834adc7b9c1d0d6f93bc818594bb4a0,,True,True,True,74,554,2219,2,True,74,Tests_passed,a972f400f6fcc6d9ee2ff909c932ddc26fe443160251f3c095bc5840d3501966,True,Tests_passed,12083c250dbd413849a212a432fe7c60ae3cfe4c4c126e7bb6021d51bb54aed1,True,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,20fc42555015c8eb603cfe7924a782cbed1844871b59c6457ba9b1d2f19c21a5,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_passed,c4a4b933bfb68d401af3f192833fc1cc56227542011b4e919cd0a6d7116e5fbb,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92,Tests_failed,4f4204896eae3844da5d34f64971cccb3c4247536d9fa9d3c0e5bf372c3c8a92 11,refs/heads/master,2c159335d40ccfbc9e4451da16b7af9e89f7c412,8838b6c3959d164b3de65fb66200c64a974ed2c1,ad22a3d91da11fca0c0f768011a92707e8be1ec9,,True,True,True,65,523,2075,2,True,65,Tests_passed,3a09f5e5b46ff479023f000713dfd6e5c2f1b21cab7caaf9b03bcb46f0acf6f2,True,Tests_passed,a37ee0ef3b4d7edfb023ecaecddade605fac67f0fbb40c4eeb1667c3730eb460,True,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_passed,192480cddf95ecac52abb8f4fd4650efd2fa4bad8e1a4ffec66c4058dfa0973a,Tests_failed,e91be332dbf707fa6d966d1843ca3b90307fdd388a7223ae10d0c3f0b07d377e,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_passed,192480cddf95ecac52abb8f4fd4650efd2fa4bad8e1a4ffec66c4058dfa0973a,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010,Tests_failed,ad1bbae0a792def7b80c961ea70a29ae3e2edf6c6190796170d06b4888ad4010 diff --git a/results/reaper/merges_tested/j256/simplemagic.csv b/results/reaper/merges_tested/j256/simplemagic.csv index b1e1b01c1a..6e50ef8f9b 100644 --- a/results/reaper/merges_tested/j256/simplemagic.csv +++ b/results/reaper/merges_tested/j256/simplemagic.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,8c81457a6fd8c2b72841d5c199016ab637c56e35,a673161dd269f27452bcedbfb293be0cf9c0a290,862c6faf669d9daa1d84c5ec01f2be4a886f7fe1,,True,True,True,22,91,613,2,True,22,Tests_passed,fcd3bd7e6dea130834b4b3abb075ddb4e0931625cfc94dff614a7e2a3f325c6c,True,Tests_passed,a81fe97a85fba31eb520ef6eb514bbd7f8da8c5bc91cf3c4febaa37d0cb8e236,True,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,8f8dba8e819c20e2f2272ca5b4baadaa7681440a8080090c400e4438beb04565,Tests_failed,02c204f71f863ca4c708ed2e3b7d9528fc74e4711675f9defaf87130425c4f75,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,8f8dba8e819c20e2f2272ca5b4baadaa7681440a8080090c400e4438beb04565,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340,Tests_passed,6e4fbd32314fe7d44f277f6332ac6fda3c774075d5ae62208ed211959c826340 24,refs/remotes/origin/pull/62,a2fee571fbe304efa8981457403471a2504062b4,be23be93333aeb434b823ec988702e9a782e0091,360362b52be76e31d01182abffe73f25e170221d,,True,True,True,26,83,226,3,True,26,Tests_passed,d03640f23aeba27e1e1897251a2c6aec7d0c8675284b845a9b3eb9a413eed29d,True,Tests_passed,0b1abe883085eb51e4bf3615986acb3cb28d1a78a5ad220644e3e714f293c907,True,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,bbf689443b2c45bb6447a04fabbe0b5cdc1f5bd959aa1fdb9c4ae59a4894df40,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Tests_failed,50f85f927c2b3eb03a25d83363bb9823636dbcf875d1e4adc520c1af3ff54cfb,Merge_failed,fcb6c41f63a53d30e699a3bcaa235206827f5717520ad89fa01d158b23fe6f9e,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,e972762f15b11296a2fbd9114ffd8a0ba58a7a7092632c311968b726c4d90338,Merge_failed,ce1083c6e9f4fa70c21e59af832d0d4c655cf37cca2cc9dac4e94898d0009259,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba,Merge_failed,b170e4fd2cb2b0f4f83d80a7781aa26c7e684fef74a0415a719b2033c7ac49ba diff --git a/results/reaper/merges_tested/jacquesberger/jsonparsingexample.csv b/results/reaper/merges_tested/jacquesberger/jsonparsingexample.csv index 0d13d3d7ed..91d9474637 100644 --- a/results/reaper/merges_tested/jacquesberger/jsonparsingexample.csv +++ b/results/reaper/merges_tested/jacquesberger/jsonparsingexample.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,452713c93df4e8122c080c9cb9b360c6997a0a7a,de2cb9487fdc1f74fdabb99cf51feaf7a32e2dcb,8a9f356fb2bffc7ddcfe1894cba6c5b060a309c8,,True,False,Tests_passed,8a633b9736ca5417a23e531004ea0927a01e7368dc153f26077265199eefde92,True,2,3,7,2,True,Tests_passed,c30148634c23e9012ec9bfcfdf48a9e5be0cb4668fd991f584007a0845d2a92f,True,2,True,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,921e78dde9bdbd5dac1f5f36cca2956a3be38254c90a418df004d4269cf6d565,Tests_failed,85f6300b079fbb65b87e96e61d9e6d2b8706c67f74be493dc7b3515095f6baaa,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,921e78dde9bdbd5dac1f5f36cca2956a3be38254c90a418df004d4269cf6d565,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950,Tests_passed,3784467a7848cc5c1fe0bd90a8552928ea12ed661eddb5cad67a948febf71950 2,refs/heads/master,ac521954c2d20f93d597a8dfbeae1e3f008befda,09ff67b95c86658c563e180e2675768b845987d9,9b33d2d1e147bd014e2bb503ca0a38657876ce47,,True,False,Tests_passed,30b2ef34340761d99265a2fe661f6a3d29b66e4ae4883458cc38229a4aa68972,True,2,4,15,2,True,Tests_passed,c5f74055095f11a18db09272a291c7d5d9ac46a8b437ae1dc5cdeedce0173a68,True,2,True,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,9b4a2d8f81e91d2fcbae9134c5cbc551c0a4c717a8d2967931b95ccc9d22e314,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,817aabdc1c7c260b2b6640f8612a0c838ae9c30bb2d62a225fbdee9c58fbc6e2,Merge_failed,3cf1ef016a225fd2177b4c8a7d15b57529762ccecc938959aae050874478576e,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,86bdff7d7c08da45db3e918a48bc83e4f17e52e6f6d54540e6d03bf89b97187f,Merge_failed,4b12efad7f67d92f72aabea2c4df7cce7e052ef9c41a323cb69a393598218220,Tests_failed,82895ee10b7f4ce3f347ae0ef692661127d250aa212d6ccfa84ad4339c7a1234,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,2d76c101ed412229eabbb672f54f2004f1a827130ce199f9a7c387e465fd060d,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55,Merge_failed,12b4472d534b334d46f3791d503685aba5848e7fd5aa56328bee288d9ec3af55 diff --git a/results/reaper/merges_tested/jadler-mocking/jadler.csv b/results/reaper/merges_tested/jadler-mocking/jadler.csv index 3d44516864..3edc53ca66 100644 --- a/results/reaper/merges_tested/jadler-mocking/jadler.csv +++ b/results/reaper/merges_tested/jadler-mocking/jadler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 117,refs/heads/master,c022c949608a874cfc3c2a47cc18b3cf6ef0f161,3b24b879c4bde13d48c40c9afd91250aa5b18368,a29d0b7c2f1e21f1cbcf088c3bdf13640b569749,,True,True,True,17,103,249,3,True,17,Tests_passed,6c7ce2d9a83c0e602b91d8c1448f5d6bc2d59f42ceaa2495a9c8fe1c9e9f2fc2,True,Tests_passed,91390ac5fdfd0bf29cbc1e6bf3dba5332c215e20f2dd20fc7d0185d510e908a8,True,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,82adcdd64e117e04b6083f5cb024417b09a28106c0454e24c1c6fd85f18699fb,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143,Tests_passed,69d807e028bfa1cc206b2c55d6af135e4b4f27ca2b6604b5ceeeb42439db1143 137,refs/remotes/origin/pull/129,294a06c3fcf8679d90a65e2f9bb73de7f7a0a0f2,dd9a8d0b6ca858a54ddc1a52627e16d0b9dba600,973006503619b77b204b0eaf73ea940823445813,,True,True,True,40,168,5487,2,True,40,Tests_passed,c85e23ca4103a70e3b23f04192fea5228b62f242c51cb27caf6cd42f997ea497,True,Tests_passed,b4c9e15e0e24ee143e5b92dcf641cb6b3a43b6120237285c2bc04950fbb242b8,True,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,358af74ec0b411d191f7cc8985cee718765b561d888df745fbe97ab87508a0ac,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,358af74ec0b411d191f7cc8985cee718765b561d888df745fbe97ab87508a0ac,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58,Tests_failed,61d6acb6c9a36a892bc8e99978be5ef3330a5f9128468c70a6f283b59d3e0a58 138,refs/remotes/origin/pull/129,dd9a8d0b6ca858a54ddc1a52627e16d0b9dba600,38e09d8d02b6f198fdf9a5ce02ab2a639ff0c5dc,39dd9593b6c8156dc08848062a931e830057b651,,True,True,True,3,9,156,9,True,10,Tests_passed,190663b15a1d717089c8208a131b48166ab400f79145be3e71007bc85cf00bc5,True,Tests_passed,0b685b8e9717e071d882519a01b42740391eca226309550735b41b0681f76ad0,True,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,b7d223a1920256313a19af9c2c0c34b3e1b64043282d16bbd17a02d47d741c10,Merge_failed,ecbdb78a90c7d47fe6ac37ce03859eb21d9ebb6b4d5cdc49c8f863f840dc986e,Merge_failed,d96dbd0e4604758230ac2af2f1954b1f34ee1cd15751bf8b676dbcf561bfd281,Tests_failed,1ae8304730a3096e7daf9a08511fdb36374959735fc6ce117848560ee5ee8600,Merge_failed,ecbdb78a90c7d47fe6ac37ce03859eb21d9ebb6b4d5cdc49c8f863f840dc986e,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,a5f5afb7847184bc276c5595ed00fb2cceccee7507709001823cb5630a89fdeb,Merge_failed,d96dbd0e4604758230ac2af2f1954b1f34ee1cd15751bf8b676dbcf561bfd281,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,69e29dd58d923c45ec6404faee64ce75d8db067d19e172d620237603568c23cd,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107,Merge_failed,7c1c8a4990cf670dce2ee590b46c18084d52d862f7fb7cf001b150487df76107 diff --git a/results/reaper/merges_tested/jahia/jahiapp-newsletter.csv b/results/reaper/merges_tested/jahia/jahiapp-newsletter.csv index 6349bc3b09..a5e7ec9b23 100644 --- a/results/reaper/merges_tested/jahia/jahiapp-newsletter.csv +++ b/results/reaper/merges_tested/jahia/jahiapp-newsletter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/1,1d8a06e1d3bf5116c4d900bc808170310aed675e,ad6e58fc6b376e34a9b05748a456db9a7a2b35e4,51a1b0ec89c37330997c4af05f0e85c02d0f0312,,True,,True,27,170,,5,True,27,Tests_passed,f7e61f2816286bc68da15c29011967ae5a420ea75589589d219ce2d85c4b7114,True,Tests_passed,2c71690a52ac6d921d3ed2af69eba36ffe6d2840c064b694b5e1576e16e47c53,True,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,f1edc6884f942d8fb4d69036a63e43683f09722f9c7c191b4d99daf73ea07d60,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,8c6f56fa334e7e6393f4e5e184c96037f25e09d434d710946e9a48a0090b973d,Merge_failed,d2cd9824dbd0da6e15afe313768b1ed925c4326d116d48ffd3a97650fd38fa84,Tests_passed,bc54ede4ee2649258761dae27e65a8c3d6cf9f03b3e50d8c051c6897d3d8b445,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,6f8c1ddace43684942699ebc103ca7532525385f55b7f36b9818cd33c2d9152f,Merge_failed,d376e620767ec4e7dc952350734ed0995b4e28a49ed84f92b945633825495274,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754,Merge_failed,a8d5a1ee76faf190c7e6a57dd0e2d2130f7ff56573b4c5842dbc7ecad8cb5754 diff --git a/results/reaper/merges_tested/jahia/ldap-provider.csv b/results/reaper/merges_tested/jahia/ldap-provider.csv index 4e2c489f08..382a04e65a 100644 --- a/results/reaper/merges_tested/jahia/ldap-provider.csv +++ b/results/reaper/merges_tested/jahia/ldap-provider.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,6d1c8ec4b6fd4b940368f7290fd5ab315efd3240,fc5ec6dad13d304cdfd981ea9a300b005fac4bb6,9f02fba71d5f3bad70d553709d718db715276f48,,True,True,True,20,40,311.0,8,True,20,Tests_passed,165a535fcc358261b96ed31f503ec7c5e0699da0eb44a4dee7acf1a09832015a,True,Tests_passed,900b71294fa88c05a9c4354beeb2645da4428586bf5aa04085cea58e231e3e3c,True,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f9aee3170874bb6ab4ef460c24ffdff8938a4f57fd36d02fde808a925c725b8c,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,f8078ad48797053910ecf03bf2aa1e68bbdc998bd12b20ea8b61e8b2d2a21cc9,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499,Tests_passed,7152583c046c8b03aaefdb043fe3708e177f911ad0d19aae8c616d2d4f8e0499 diff --git a/results/reaper/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv b/results/reaper/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv index 6e77848d2f..7e5556e0b5 100644 --- a/results/reaper/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv +++ b/results/reaper/merges_tested/jai-imageio/jai-imageio-jpeg2000.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,96f3e9ffc1450a7b27819ca751a462e1048517d4,2ae1a9c110f059051c1b0792b9e07758827e6e03,9f11694895337febf5044cd3b0ea52291fdbea13,,True,True,True,6,32,173.0,2,True,6,Tests_passed,68d1a993b7f806a84c36f6d4abb3a73cfa7c08b6514e2a2e2ca70056ccaf550c,True,Tests_passed,d1f9da1d3872811a7f1d539e8f8b7b51a547c537942f86b09b2af12e19e9852b,True,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,f713fc42a15d33998d162ab8195b40b6ed49655219389ce41340e591df8df001,Merge_failed,f1cf66428d56caa069105d5691097e6e7d03e90d9088c9a86c6d56769b156ee8,Tests_passed,0e6e9bfd269863354882d08c4bc31ba59bb9c3753c8eb659e6266e93618bed48,Merge_failed,c7e4454b3092ae59192ed83c839d6800e10e53452ba7dac9e353bc29ce0810c8,Merge_failed,f1cf66428d56caa069105d5691097e6e7d03e90d9088c9a86c6d56769b156ee8,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,df93818db73713ac25a1d126763d25125492e0b48bae1fa32607f33e641ed91c,Tests_passed,0e6e9bfd269863354882d08c4bc31ba59bb9c3753c8eb659e6266e93618bed48,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592,Merge_failed,c8f07ec4df22c8f9004ef0bb33d1ece4e0b8f342c1533608cf2c16488d04d592 11,refs/heads/master,3db9087392f4de4fd2ac154c811678fa6d29465c,0bfd01b19961a6511f71d083a6bb45d76502f196,1ce5e4a41c1b229d07643e0746fdeb91841e7414,,True,False,True,5,16,137.0,2,True,5,Tests_passed,2ae40e4ccee6b5f7205b4bd5dcbb255df235604bb28e8df519d41e495299271b,True,Tests_passed,fed1d63258b2c38fb9a467c6182291bda1a3ad5cab91d063ba311ba09f434b1a,True,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_failed,8d6b8d7765f20bc196d84710ac0e4772db75ae99d8ae4813a8d2961f082e597c,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,80772bde3f692870451a9d54837a920eb687714c87f3ef7db5b9ab2c1995c0c7,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477,Tests_passed,cb49f6b7b2f029de35c7b424fa1d04221471c587f850330af3f7cb110e4b9477 diff --git a/results/reaper/merges_tested/jakewharton/disklrucache.csv b/results/reaper/merges_tested/jakewharton/disklrucache.csv index e4f8db2534..0817e4cfb6 100644 --- a/results/reaper/merges_tested/jakewharton/disklrucache.csv +++ b/results/reaper/merges_tested/jakewharton/disklrucache.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,bbcbf9e90954136a24cc18a49d9da48641add6a0,7306e106609d4b7008142964956a4b790d8660c7,4c31913192eae6ae6bf8a239e89844a0ab2455e7,,True,True,True,3,15,135,2,True,3,Tests_passed,32d13adc3cf5b0a70320c401d761ffe2b3a106ef068de85702c4bc56726a7051,True,Tests_passed,5decbd984cc822f1141b3ad615506f07924984c4d9fcfb85204af9e730668968,True,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_failed,a9310c145650ffb1de973404b221f1297415e776d4fb9e3b31cce4930015bf4b,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,054d5df9e6e29e823c8202d84b4626a45a937d4aa108af408932bafe52981889,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,f7bd5c109b6d0f968a0653ecb38267ac2ea73ebb893674929d8be6d988c4a32f,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa,Tests_passed,ac6b60bef48fd63f01a471a9b1c5ccbec8b53584a67cbcaa37671e541601afaa 19,refs/heads/master,204d41abb60f981a3f8521b7b5cb41deb43281bc,747e27fe8d35145c0edced0a6f4eda240a75c774,d0ef4584f651220b0189f83bfdc9caaf6a1c9158,,True,True,True,4,27,47,3,True,4,Tests_passed,50679c63faa75c6b2f8df6a11090deef31368696b0b8151d61ec4a20ccf2c833,True,Tests_passed,72aea9eec98e99634c934023009283ecb6e123b63be8470eee57f59891e92c4f,True,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_failed,dec66372ca71bc6b1c05d494d1fa5b24a08fdc84d0dc6436d090623d3fc15adf,Tests_failed,abe143cfb15d5307bad87845c939dfb2cd0a1a187b72042501e1e4cd084ab97b,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_failed,dec66372ca71bc6b1c05d494d1fa5b24a08fdc84d0dc6436d090623d3fc15adf,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad,Tests_passed,7018835cbfd0755e05b5688cb5404655a778a206406e8c043263327918b6fcad 28,refs/heads/master,7f28919d2a63436d1f4f762c880c16f1cbb4f6f1,aaaa511ae0cb28450d71f66b50e371983fdcc504,f0bcf1c0afe41ae0c2925dc362c72e0c71d54abf,,True,True,True,5,58,347,4,True,5,Tests_passed,90912dee9f9c78c0d221ea00da63b680f9521942f61d59272060a6fcec1fb1ec,True,Tests_passed,120480e0f2af23b1d3275934be29a006ca9575bce5affe29a98a7240b0ede917,True,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,308c60b14e1ca9951a89379aa2cb806d06bf8cbbbb6f95e74079816775f25cac,Tests_failed,c7910b63b1279c57b1c906532de14e5732166bfc00406c647a9c703d5063122f,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,308c60b14e1ca9951a89379aa2cb806d06bf8cbbbb6f95e74079816775f25cac,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d,Tests_failed,9bc3f8047500b2c16d58ce48edcdf766f9262049606075e2278b2539f3f7272d diff --git a/results/reaper/merges_tested/jalkanen/speed4j.csv b/results/reaper/merges_tested/jalkanen/speed4j.csv index 1da5aee83e..1cf5e3c46b 100644 --- a/results/reaper/merges_tested/jalkanen/speed4j.csv +++ b/results/reaper/merges_tested/jalkanen/speed4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,18370b95449b0062c7f3286734bb393cf47e02a1,1f224d4a60b62e76f9cdc0893e477e85295c3f13,1164f50c09c8ea4be8d59bc8cb8f01e11180e3ad,,True,True,Tests_passed,2f02793aa0403b6d25b6dd70488e1d1c286d04a41899d5d93551163078660fba,True,5,13,69,2,True,Tests_passed,fda8748049efa14bd2fb5c8c12aaa8e4d9b692cccc4f9f19182769752afb977d,True,5,True,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_failed,be64fbedf45f373e7536fa4ecccd794b7ddcd51bf8c5b5bb3d8306cf9eeb8502,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,c272904828ffc3e580731c4a59cc1f3ed95e41ebff642aa566bcc4c1caf717a9,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,3a5a594b5c458573576e7a66af5e8453b5054b43c3b92a045ab072426cff0543,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,62a86058e71d2c940df04d4488a4f70782ab80074c30040ac27c4475e44274ce,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121,Tests_passed,f3c4626d96a09bba15e854ec8ce6a91cc8630ab341bf37b966fd4185abb55121 diff --git a/results/reaper/merges_tested/japgolly/svg-android.csv b/results/reaper/merges_tested/japgolly/svg-android.csv index 6a7880d796..538ed86142 100644 --- a/results/reaper/merges_tested/japgolly/svg-android.csv +++ b/results/reaper/merges_tested/japgolly/svg-android.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,d1f6374f0fbb160444f998d4dda6a351d24b7f83,c92bb808ebdd240679593f352cb0ef139b43ec27,5610990acb1dbb9de9d4145e4cdf0416091d3a31,,True,False,True,2,15,92,2,True,2,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,True,Tests_passed,8bc0206708fe01382a8ade358ca33ed84b7c02a4dfc15aabd4b956f76a0bee4f,True,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,d6ec2c8026634569fa22fdd491cc57df520dcee98d0eda041180c189c7cf8894,Tests_failed,b964b660222696fc8c9e6daf5cf941a3468dcb0e8c707144efd196a463e680cb,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,d6ec2c8026634569fa22fdd491cc57df520dcee98d0eda041180c189c7cf8894,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f,Tests_passed,0980cea9f32890d0ce3784be4d5012474a8794c38c9100ce704cea0d7e420f2f 2,refs/heads/master,c92bb808ebdd240679593f352cb0ef139b43ec27,f62966b068bf8bb8e96d4592ad12275549a4f2ae,93c4a06d20ad8c29305cd5604a387bf37d5abcd4,,True,False,True,2,8,17,2,True,2,Tests_passed,c64d70b547edb86cf23ef9683c1c8ad0feef84b572951ed57de742b9bfef6a16,True,Tests_passed,46d4d1b2217297aee78e7f99cebcdf7e4c913a1f8db3e7e77d2656272008369d,True,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_failed,78cfb6d1db3c56fd82528683ca62605fd77390b92f9b4dcbe1ee1b44fb3acffe,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,a221cac335650c4b1b45c032212ec18e7cf383ac78df23a14e13ad078c9722ff,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9,Tests_passed,7555696ca6b54c41822cedace960101adbf72563f5c93a0070f694d5e4a86ca9 9,refs/heads/master,9c601773e2b843f770effec06e50d80a23a4598c,6d611e2185b007b649e29659156384f99397357f,8d982f7b79ee66d72c8ae004d39c211a7fb6cb10,,True,True,True,5,75,477,2,True,5,Tests_passed,0818e7ef7182b95f956c31ae57f63104f867270c56bfd4055a532b2989c95139,True,Tests_passed,02c03702ac0560a94bf37c5371bd393f80e1484b6c8af703707a8440099ef333,True,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,e659e066ee24fe1a0c618f5775ba6db8a0828b17275c56177ad42ad520884927,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,262fd1c0f7db4c89e2437da169c9166668aaddfd76b307fb0b6b2c16bea94644,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a0c12739b393789642fac821c04d3b839bb1b6a32667d43f650a7e2b9939a637,Tests_failed,00a0e3013fdeb549863fbd8522ea216e3b1ed55b6ebbbf502e68c7542836e9f2,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,262fd1c0f7db4c89e2437da169c9166668aaddfd76b307fb0b6b2c16bea94644,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a0c12739b393789642fac821c04d3b839bb1b6a32667d43f650a7e2b9939a637,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,e659e066ee24fe1a0c618f5775ba6db8a0828b17275c56177ad42ad520884927,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5,Tests_passed,a1801cd238c30689369798c0410fc76042ea5452b938ff9adc095f7891d839e5 diff --git a/results/reaper/merges_tested/jasig/java-cas-client.csv b/results/reaper/merges_tested/jasig/java-cas-client.csv index df429995f5..25d5b53628 100644 --- a/results/reaper/merges_tested/jasig/java-cas-client.csv +++ b/results/reaper/merges_tested/jasig/java-cas-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 363,refs/heads/master,c8e50905bbba72d8e0fd0cab49bb0b379c1443fd,eaee34b3611df101bdf6ded2f68445d193d813bf,e1e12a5f3f94703611b8a50e1c2acd1843393f38,,True,True,True,10,40,1048.0,2,True,10,Tests_passed,0b7a608c9a247b17377119e5accac9d490132131156dfff4a25d297306a32748,True,Tests_passed,bd7c43754c7379496351d1985cad3ceae4fa73fd9015bc90b24244f1484f54b5,True,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,1d7b51cdcc299ff405bde8cd288cfc22890052191a66f9b5d32224ceb34681cf,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,1d7b51cdcc299ff405bde8cd288cfc22890052191a66f9b5d32224ceb34681cf,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5,Tests_passed,090139e216b80072211070dd3d9a4a6f139fff4d2f2e274b726800bebf7d7ce5 366,refs/heads/master,f98e77686923e7ed87a10a0d9a5462e776aa368c,c61dea96bfe4d6b227b2f83c1044659a950d33f7,607d53a2aa7a4b73f0d0cfaff925aeb6af800648,,True,True,True,92,292,4705.0,2,True,92,Tests_passed,cd826c9d293f32b923e809b00581108a955d2f3dd1043e293d9a925ec6967762,True,Tests_passed,01c53fbf7e405956be1aa6398d5006102137dea18533e8dd331645f317ad5801,True,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,620693ae15c280fc79ec0a280205a218662bf1336d55a240e2b8c4ba78c5c437,Merge_failed,1a9c89c8d60e7fd3ab7ed7b45428bfe083496fbfc8b41a9282a880c8a9d9203f,Tests_passed,b6043e2b9f26f5e16c746812a880122405ba69bc9dc089c67a360aee74f3cc37,Tests_failed,87f1769c0195404da746be9558a573d5ab206887541db02910b50535c96b3547,Merge_failed,1a9c89c8d60e7fd3ab7ed7b45428bfe083496fbfc8b41a9282a880c8a9d9203f,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,47370e67c344923f4f20c2b1ec5adc68e600175ece0a8d063b56712e2abb3e4f,Tests_passed,b6043e2b9f26f5e16c746812a880122405ba69bc9dc089c67a360aee74f3cc37,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,f0e42bc7aafbcb89fb7e6ee01ab3453fdfc16ad71823544686326fc0cf288238,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf,Merge_failed,095c83c50c7b9a8183a79d48366bc7d71215ddfa317f23ed98fa8ca7ff3a93bf 371,refs/heads/master,863038605f7567aa5d0f1a2870dce0231a686665,0652f4ee230962403d64b4447f5623fa38011177,f5b2275913090136b70681eda703422d0b7b4102,,True,True,True,32,76,1229.0,2,True,33,Tests_passed,2a7aca671178b966ab05a58649a5d64946ddba669940669d56c6c552edab5a1c,True,Tests_passed,d86f4459d6d5225d2e43c844f2fb6d5fdb2b2d65719eb64c5f55f924b78b67a1,True,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,24fdba724f34473aa58dfc9abf6b607aaa187c966ec91d62d628b629c01d3528,Tests_failed,110d4568c9d9dbc50b5dc154d537e3e187592ecabaa7c78c994b4c2f22027498,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,24fdba724f34473aa58dfc9abf6b607aaa187c966ec91d62d628b629c01d3528,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa,Tests_passed,4a48293667876b171c44c68dee067c0fcc48b71f22e7a78facf791461b57fdfa diff --git a/results/reaper/merges_tested/jasig/jspc-maven-plugin.csv b/results/reaper/merges_tested/jasig/jspc-maven-plugin.csv index c5187095aa..30e9669280 100644 --- a/results/reaper/merges_tested/jasig/jspc-maven-plugin.csv +++ b/results/reaper/merges_tested/jasig/jspc-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,1ea62650f81dfb722f95c0878b8d49ed45e1149e,96e5b1d72738896df1e0a7c3d0c19e50e9d2026f,448cddfb8a0fdfa129f96247a4863d60ae70b648,,True,False,True,5,8,24,2,True,5,Tests_passed,a2cd8a1fbb8723186b1a57c1eff2346cf635be462eb45f53b90f49fe704e4ab3,True,Tests_passed,3c5cbcfdbda7dc0b5ffb709df3aed6315a34510bacf21844794227e72b075014,True,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_failed,907a965dee6c03aec73deb4d16d0a9aa6339681dbe85ce7b3e2b9ce8cc7a5082,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,d6e0dd280c1ea75d1e36d2e001441b9a7c8f995aba561a70ecaf047a5aa07227,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b,Tests_passed,93a6ceda9c0ed2cfbb9d879aa74a90d3b51f24db634b3c284b29d103af2da94b 17,refs/heads/master,6a1f4e7b3fb61c8c2e25b2618b3da025a4d5fee4,6ba53ff595e070f847ea19a1575db6cb94c7ad16,0d8f0403c95afeb250e5be8f1e6b4a7ccf9f92d8,,True,True,True,19,41,1299,3,True,19,Tests_passed,ef339d8f80687a558f5760ddce3d2e3729726478b27c658f2e9a1fed628a9a59,True,Tests_passed,a81935f94fa653e55ee49f786da52d13a21fc70bc740b5936bca5c791f02c9e7,True,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,4b7241cda3649a7f3ceafb7b08933cb3591b59f3a0edcdaee6544ff5ec0aa3b6,Merge_failed,43d958748aea7776b83ca14b3021a88df00d5d933382e810f8fabe15d3598edd,Merge_failed,da089110e0c8f6dee794729c2c9a5087237020da782c5ccbcae02027adbaa04f,Merge_failed,059708ba0af47fd9a710d5b6517aad3d390036e9587d0bc3f4f7595905a3071d,Merge_failed,43d958748aea7776b83ca14b3021a88df00d5d933382e810f8fabe15d3598edd,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,49685bfd8d7faa56208f77fc55755be1a8858a9ab5da6026c2eef0406104708a,Merge_failed,da089110e0c8f6dee794729c2c9a5087237020da782c5ccbcae02027adbaa04f,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56,Merge_failed,6e20e1b67b40e32c1f70ba20a35ef6db60687f51357525c13f376223f8fa9b56 19,refs/heads/master,634922effc3238357db5ca24c0a5feb8e8f5853c,2970792b02d0fd1ce607ca9825a1ef932e637552,b3646f914368fb4b42e2dc60836ee345034f9ff3,,True,True,True,18,36,1266,6,True,18,Tests_passed,b5c56d223e5785fee9f27bab2a9becb25aaa12bda902a230c03f1d9e251133c5,True,Tests_passed,5873b20245a4bb4980737e57fa222d90e7e362543e9c2f84c81da349d92f44cc,True,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,6174e63e9b65dc63dcf10ac4e1ac75ffbb1747ff5298ab16addc68c99ca8961e,Merge_failed,cdf03270e5e88fb3e3a88f3eabde127fc629bbaa18ad6464ddf012a1db07a0a9,Merge_failed,32a2db2171c1a55154edbe94d21990f68325c586330fe848d5c5e9b72e7389ed,Merge_failed,d561583a7ce29acce150afdc19256cbff401a9334880ddf8578689f85a501b69,Merge_failed,cdf03270e5e88fb3e3a88f3eabde127fc629bbaa18ad6464ddf012a1db07a0a9,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,2ab5a1f35e3b03d33e2c106c84c1ce2de4f36fc2d1df7218bbf55a524bb12da6,Merge_failed,32a2db2171c1a55154edbe94d21990f68325c586330fe848d5c5e9b72e7389ed,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0226fbec2bc65285b121e88d4bcaa274597f3b5880439451c6e685642c124b52,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e,Merge_failed,0b80e8f8c9819b98531d2cc3099c53b2a708c6cbc02520bf16bcb6e96419560e diff --git a/results/reaper/merges_tested/jasig/webproxyportlet.csv b/results/reaper/merges_tested/jasig/webproxyportlet.csv index 06619b3731..2d7d37dbe3 100644 --- a/results/reaper/merges_tested/jasig/webproxyportlet.csv +++ b/results/reaper/merges_tested/jasig/webproxyportlet.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 141,refs/heads/master,aa92c74f5e24668cc8312270702585e14c649b11,b008613b5a9adf71e75776098ea5110b794170ef,11306f962cabe54ce892c328b432041dacbb83dc,,True,True,True,13,47,175,3,True,13,Tests_passed,694ad467e24df3ddcf2ff62e9be3d67bc584561f8aa89172c6075b7cce0b545f,True,Tests_passed,8f9bf557172eca435165112d4c29e1c511b6b503650a14e1e6f8a5bceb07116e,True,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_failed,5cec65c37b520ae6ebd76811f00131f9e7238b5367721765e5a6ad97ac796a6c,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,9dd16d3a4830773a65c21da84f1addcf7215ec71f5e139e8191357838d167079,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9,Tests_passed,7fa07f0e20d2c9dff58a7c45684cd6e96554f8d68b592f84806aa85f4c1369c9 154,refs/heads/master,2e2f16c741dd7cd4e0f77dbe281912e9455f04ef,e1bf72bf755925ecc51dc080444e61eb73805050,0a323edaa22b8207420a7f9e44bcf9b13f4bf459,,True,True,True,92,522,1611,4,True,92,Tests_passed,3f40928ed0aaedd1c28d2e6d7dcb21f7259235d895fa85005b4249bdbc51298a,True,Tests_passed,530e7fc21a92307b8258160ceaee7bbe8ac89f17a5716ee9d1cee3a7858dabf2,True,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,9cbabd3944d3ecf494d98183409faf3810093331ad6268cb7e091298840077df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,9cbabd3944d3ecf494d98183409faf3810093331ad6268cb7e091298840077df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,b5175fabfe901f9dbe4bd0afde5622782de833f683ec0fcece6cecb16f9aa2df,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2,Tests_passed,a3cc1cc7dab451b3f314b8eae1349a20126d4de74202b2f3bb9e09d9a5fb30f2 157,refs/heads/master,8fa875fa24b9d8743f49b87aeac3701f3c5aeca3,a8b9ead6242bdd320f0ea81ca59cab5e00261dc9,f26bc29a09a4faa7d20968cdfac37166852abe76,,True,True,True,44,224,2065,3,True,44,Tests_passed,2e9f738b8d39f04de1f553beaa2c31a25c044a795d824ac156040461903e1523,True,Tests_passed,5edf7678fa40edfa318a8e38d871caf0087f939ec4b591714151e7229cb6ad87,True,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,bd1905c8b01ba3ff56492450af8a77375a1a2ae82c70137693edab049f8d28e7,Merge_failed,844bd5b90e57ad186461d5336e0e1a32228d3d9e822ddc6717232db868630392,Merge_failed,bebd4862333d1b4ad77f41660f9e9aedf52e640c8bbd8664795daa178dee01b7,Merge_failed,9f7b307d56c9f419af6113c1b93aa298fe4c824f79f8aa06c173c851d6a3ebed,Merge_failed,844bd5b90e57ad186461d5336e0e1a32228d3d9e822ddc6717232db868630392,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,711c6980c92b68dcfdb56bd3afb2a68eb65b623f6f122fc335dc6680da5d7c09,Merge_failed,9e4dd2b3bce7ca3b749de27eb276845d739840a79e6142f7431ab18ed6ecdde7,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6,Merge_failed,e47c42ae42265bb535dbe5eacb5cab9a043e6b7ecfcd8cc3fcfc2ce7f9e1bea6 diff --git a/results/reaper/merges_tested/javamoney/jsr354-api.csv b/results/reaper/merges_tested/javamoney/jsr354-api.csv index 7932f80d82..49aea05b56 100644 --- a/results/reaper/merges_tested/javamoney/jsr354-api.csv +++ b/results/reaper/merges_tested/javamoney/jsr354-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,133e18fa9cf8cfbf7bfdf5397090940a2c9c2ec7,68872305846e8a143b3f1b795a83b956b63f9bf2,00c3d1604183baf214d9f302dba9352206ec6c1d,,True,True,True,6,7,49,2,True,6,Tests_passed,9c7e1cd750d64918a87cdd2ac756f1cd9146f48d6e209214c2f0ae3705f25490,True,Tests_passed,5c1ee8da2468c5cf02d9ac17953215b4334b003093155eee346ba8a5c2f54552,True,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,508d5072524be697290ce299531b442f348929cf6ee26214abb1aeea394e2e83,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,508d5072524be697290ce299531b442f348929cf6ee26214abb1aeea394e2e83,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50,Tests_passed,8dedb9a5d39abcb1328f079085a9635088b29dc1c499d04b5e2f5090c0ca4d50 52,refs/heads/master,b5c1fbf3e07e805e8351775ba0a67133e5c3fe65,aa27d919aed5d0a37d5b19e0148ef2e39a5a7e23,c4d8946fae0546a9f1f9313ec71e42c9a88f64a0,,True,True,True,50,318,1520,13,True,50,Tests_passed,cd1378769dac03f9410ffd28fa62de21193568d275f8b2053a547f597aee6e3c,True,Tests_passed,14f51a32891a92949c1646f434c220156942d854f215a53e3c7cd1504c2e0988,True,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,737c743d2df475868f893ff1cef59b5e3d8bc66565a9487f8be3b37cd41ea987,Tests_failed,515832e3d865aa90ecdadf5cd715d14f69958ffbfff6ae0149b40153239c10ac,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,737c743d2df475868f893ff1cef59b5e3d8bc66565a9487f8be3b37cd41ea987,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,138a2bcdc8ebfb05684d1acc4c3dbee345b44a46978f403092cd1dc069ad6f06,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817,Tests_passed,9f59fccc54cda1ab211caf1b7da6f39b3261568a039e8f59d8c0dacb49c2a817 60,refs/heads/master,86df8837ecf3a584848aa9887f735e7da91ca61d,d85183a7c710272ae06bfbacbe4c0ae2263d9a84,abcef1ae459ea3db7e7b16288d8be5a11cd856bd,,True,True,True,3,54,124,2,True,3,Tests_passed,5b8c51b5bbbf9b8619222cd2775283e7704d9acbb7231acc9a12d8d01874de24,True,Tests_passed,07f001a05870cda7fcb4edc1c4bde7d36d766495a16ab10a576e7aab48640efd,True,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,334baf9f1f052ff9bc2eb3e6094783d613fafaa278a61ddb64488f98fb6c970b,Tests_passed,5b8c51b5bbbf9b8619222cd2775283e7704d9acbb7231acc9a12d8d01874de24,Tests_passed,01c96377e3998daea756c76f242090042c13c23817dd0b2a1f678862f2f1d5b6,Tests_failed,00aa41d76e03a9d08e5186e3a4c4bee306e117e48205a98154dc01bd1c36596f,Tests_passed,5b8c51b5bbbf9b8619222cd2775283e7704d9acbb7231acc9a12d8d01874de24,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,4e66c686cd4aa3548ad406e19bbfa344d13c120c133dd9d6ca90a2e9b0b6d41c,Tests_passed,01c96377e3998daea756c76f242090042c13c23817dd0b2a1f678862f2f1d5b6,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9,Merge_failed,40b40093142ff3fea586687a6d4f1315689ad93b771ae73fee542492602961b9 diff --git a/results/reaper/merges_tested/javamoney/jsr354-ri.csv b/results/reaper/merges_tested/javamoney/jsr354-ri.csv index 167adc12a0..b097ed9f47 100644 --- a/results/reaper/merges_tested/javamoney/jsr354-ri.csv +++ b/results/reaper/merges_tested/javamoney/jsr354-ri.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 124,refs/heads/master,bf07022ccddab3171412db1170d03ec24c77c41f,73024585e9348d07013a2cb4f10907f272638324,6ecd20662ad4ca485ca6f2b847c96be408866aeb,,True,False,True,2,7,20,2,True,2,Tests_passed,2cabcbda40f4b38bd5f07ff71e46daf13a82c59c7492a5dc47ff5a49b3038115,True,Tests_passed,17b3f856026a0b53aa106d36233b3ff01c7eb3c421c8d90b4fe5cbfbb26f2e4a,True,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,c54875644236b618258e3a223b4f9aff6e546c8143b5f7257a3ac0c944fdef6e,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,844eda3244d6700bc3d32655b3ff68b28efee1ce1e89438fd4549f95ce8c5c8e,Tests_passed,26edb0812da6a9c52ecec45eb3a973d1badaa1b14ea2244be24daf0ce56e1a4f,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,6a0d2520999f43ec8d5aedc105799f158802f0362ea78024e3b0208436d5ef50,Merge_failed,8d6a3e83e4edf190e19c30de964a72f439c5fa9cf8678d7a42fee666051392ab,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,ef92bd55b0e772a94d37b9bf2c19dd68a6ab92738802c941de9f74b6cb11c803,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569,Merge_failed,0d07aa9a2b520408cb8fc95dd1c027c42dffe7a16d8a3f810ea35c16deddf569 126,refs/heads/master,13abd52447b60fd8ae18b118e48fbc2790639e7d,ceee2db0e1e1c5abe20c77591efdb6a2c64b2bf4,b67ee457410d23ff1b2619e105f0fcae4d6f0aa4,,True,True,True,124,514,8898,3,True,124,Tests_passed,3ba3229d9fba9eae0036728985eaeaf5e201a288321e4e3bfe800e1abbc96cd0,True,Tests_passed,75861e8f60298e90e50093159ade72f3a7f08dae3bf829d18c5895810e7b0e68,True,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,6fcf97265e68ee9f1c6a9a175c71e71bae3e4405de4aca67ab8e92c1b40e64c1,Tests_failed,16815e6bc9104a4eec57918f33157ec08d07543653f7c9d0d2b1924782de4bd5,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,6fcf97265e68ee9f1c6a9a175c71e71bae3e4405de4aca67ab8e92c1b40e64c1,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,b86dc5748629d34e29cf4c3452588d2eaa4407eaef3240e4f83caf89770d80cd,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53,Tests_passed,19e3f9dcdd58dd4b7ea310f785dbf37b56c15be5f5ce7388fe40ecb0a8db2f53 129,refs/heads/master,ea8ef076f9210376f366622046c127afd816f8d2,2db48cfdc0b32cec70a70953cec77ae4b450a2c1,25e4bd18b41557663058ddec43156e3222d74b32,,True,True,True,25,113,437,4,True,25,Tests_passed,85b15e1f4277350876eb86e9d00ba5d0c394236c1803ff9e5067746c56c049b7,True,Tests_passed,7520de8d2ae4e6fd5978b61a831d08e5b13b63a204cdf6aac4a825af183ac4f0,True,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,927c274029634d24072385fbc491343bad5fc439df82ba2de87355785b1d017a,Tests_failed,3b5248b7076dba39253e39238d84741376d7cd8a383691cf998023a989e5ac59,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,927c274029634d24072385fbc491343bad5fc439df82ba2de87355785b1d017a,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448,Tests_passed,98770d9c2ccd45d5f209c6de50b92d950d9170d1f8d965c07d0e3ca268119448 diff --git a/results/reaper/merges_tested/javaparser/javaparser.csv b/results/reaper/merges_tested/javaparser/javaparser.csv index 5dfbf0bf75..7a8fb202a8 100644 --- a/results/reaper/merges_tested/javaparser/javaparser.csv +++ b/results/reaper/merges_tested/javaparser/javaparser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,9d751d4e593a093e77c1b5b35f2f8a470f439618,cef8dd864bdf9edc316582107c42a4e00803ae11,9ce738acdcfcc5f4fe6d968f264b28b1cb22a332,,True,True,True,42,246,524.0,3,True,42,Tests_passed,49dbe88087d7523611bd2943d80dcb21024130bf2661a53a6cf884f57486bc2a,True,Tests_passed,b41bbd92a72992681a7c75795f798f82c5ca657ff36e240574d4da07f7b0967a,True,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,a02fd49fae924779cdfd230e923077056056574018d57ff14d7f60b2acef829d,Tests_failed,85b684b19da7c26e391e864f929d614c923e73511e4539821d7eca5598986928,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,a02fd49fae924779cdfd230e923077056056574018d57ff14d7f60b2acef829d,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755,Tests_passed,4ae349f96c46470afeddc5d5810433e1d0e03a4c620c148f9224f91736a0f755 191,refs/heads/master,9fc1982987d5ab39a56e416e5c9ffe4e4291b65a,c3f372b0c7c8ca4bed1261e7f1d3f17ed01b4889,3c37a5e07b26b5c9a547ef8c8abe3aeca4ff5ea0,,True,True,True,136,204,363.0,5,True,136,Tests_passed,5f52483fbd186c0ba6669b47f4d04eea2c433f839b1625a36e79307ce1807bea,True,Tests_passed,4e54133cce738543cf89a12342dbf66bcdadb6354c385c853e4f2eccedcdda79,True,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,298318b4a836c6fa8ca2e3e8be0b24d51d35fd8552d5bbb90fffdcafa05cd763,Tests_failed,4d7c21ff79e84acb623aece8be70f44dc9ac0b0e4ae81020046a515fb87a70d7,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,298318b4a836c6fa8ca2e3e8be0b24d51d35fd8552d5bbb90fffdcafa05cd763,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df,Tests_passed,80e13f6f1b1c4e32d9bb9449dce63db909de4368aab085a2cda8d675a47735df 286,refs/heads/master,55e4b88e89ab8ff71ae62e3d9001484a2b39edf3,755c9fb2d0135f52d76ec3ec742616806183e951,de67cdbeb8fe14819fd31c00b94d38994406c3d4,,True,False,True,5,14,56.0,5,True,5,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,True,Tests_passed,a84d105b5f9740a1e8aa0e891006543c2e9f9896ad8ca605b83655b1621bd1d9,True,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_failed,b4ff6407c3c58bd264ebf642e03b0ff1d172f622dc771aea03c4068f7e0d28eb,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b,Tests_passed,19fdf4ad8f55836a6bb9525ca5070bab6faa8e4c9c9e2af2b595f6dfc4d2687b diff --git a/results/reaper/merges_tested/javasoze/clue.csv b/results/reaper/merges_tested/javasoze/clue.csv index 059cd54cc8..ec4987d720 100644 --- a/results/reaper/merges_tested/javasoze/clue.csv +++ b/results/reaper/merges_tested/javasoze/clue.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,a0e4c4affb26558cd60574073c39681defdcf954,7a7a348040753f9ea915cb5a8f06e66fba1b9adc,d8ac1e2274071f67eb86643b71bc7704772a045e,,True,True,Tests_passed,16221b2b7a88556270dea2d1ce13961f7ac08814fc04e2774206107367c9ead8,True,28,149,952,5,True,Tests_passed,bd0e1cdfe3c8392f6b2b533b04ea4fae823450491407739a0be829c63d6d5b21,True,28,True,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,237ab2beb534d42a88ffb8435069e6272ce8bac21bee88457800f6685f2d927a,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,974e587e953802e68e0723eac5d8fa155ee3176ec3e7bcf8c976ad14867f941b,Merge_failed,0d2b42ac215d2fa2c8f878bf7a755277de64eb69f84b8a0293d80e362d64773a,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,991e89574a7666ed331a0e9e93d90c2b4e54bb468cffe1f0b4e9df28a29eb9cb,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,c3818ead7af5e2c7a3490fc74aa4888cc1ed863561f0674da72ea95012921fe5,Tests_failed,f6825b44450a513c199d5080856102b40e5563e383ac675ccf29d196442f6d7c,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,1da738049ded578cb340f5baa7e87fa9869bd29661c3906dd2997f646be79ad5,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf,Merge_failed,130ab6f7f58bd26e21cac8f0827ac09bcd79e133deb7b70606afa8a572352edf 9,refs/heads/master,96d01a536c4d99deca3f20d9fef19949f60ee13c,63f75e522af7a9ea9494b85386ba20689a7ec570,2628ead17d59abbf608bba9a1ecc1c2ef671d8bc,,True,True,Tests_passed,ac707592c761827ef631ca09d363d1108b8636ac9381704cb0fef1d4d51a0b4e,True,11,18,46,2,True,Tests_passed,652e1545a5dbb3a3654b12e64553c6340c68bf8a07e7c4aec9a8eb354af00962,True,11,True,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,c2285031c23ab5a9402a8a8eca26a67d90949d0ce7cb683c6b65c3efd201af93,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,c2285031c23ab5a9402a8a8eca26a67d90949d0ce7cb683c6b65c3efd201af93,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,375675862069faf65b8a18d48276db0ef8a029f986c33fa41d3bf251c2917ac4,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418,Tests_passed,025e8f952fe226d9941940e4e72228481f52a2c1d0907622c5a133b766184418 13,refs/remotes/origin/pull/63,50ef81d6971ce97277810a9f4f2f013e7c76477d,c1590a3dfe464180a839fce83c46e303a5160134,d03dadf097477fe84f38fbc27cdf917174ad18b9,,True,False,Tests_passed,36b011185ec77aeab7b5544e4584ebf7b96604e2e0553384cc9ffd610d8a51d2,True,4,7,15,2,True,Tests_passed,859393f6dc3311a2fd081cc1dfa2b43e26093d1bf12e2e84e413ac9bfc4ca484,True,4,True,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,dd8694852dab7240c73c0e09642e843ca22acb8b60f90b874b8d964d3a09216d,Merge_failed,94fa2ee7103e330415513de006ada4e8c56ddeff944ca40e412cd491f009b07e,Merge_failed,b83aa56fe63c1aa95c588d67d295a41e4479e6a9e45497092a1db3d60c6f07ee,Tests_failed,021c355f56ed3fe78a6fa58d255b38f3a4d766f273ed59762dfe3f4b06f6537e,Merge_failed,94fa2ee7103e330415513de006ada4e8c56ddeff944ca40e412cd491f009b07e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,b5d81fad93beeebefaf1c0c97a485f8449fbe52be4001f6be1cb8a5c4c1e7ade,Merge_failed,b83aa56fe63c1aa95c588d67d295a41e4479e6a9e45497092a1db3d60c6f07ee,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e,Merge_failed,be745bf3d10a64a692b283cca8cce184247d14b132917e1d3759e85a49fafb9e diff --git a/results/reaper/merges_tested/jayway/awaitility.csv b/results/reaper/merges_tested/jayway/awaitility.csv index d60a183e1b..36c9d5fb07 100644 --- a/results/reaper/merges_tested/jayway/awaitility.csv +++ b/results/reaper/merges_tested/jayway/awaitility.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/master,715ad2ecff73829eade318cdd435a9e91d8c2162,cf261505ee2a2308e270ec9a64a80ce9e5a59f10,6949468fb680f667e0d67e5228d7fabbeeee97ba,,True,False,Tests_passed,d1112acb55e9eb9bc6aa3e29ba486300b985ee1f7bbab4372905682f543dba9a,True,2,1,2,7,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,True,7,True,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,700cdb2825f20f32ff74b98a8cb6409e486f063b9a0b85469b485bd29bb36322,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f,Tests_passed,23fb7c7caf18a8604be6442190986da23a83ebd9892076cba0cf4f628fdacd6f 45,refs/remotes/origin/pull/153,914ce47eebc4770884443a81b35881e6b48c8f2a,6d776b8213c56d2955b63c10cd3ca1bd515b7011,da76afe41b564b0bc06d03b368473b39f342d5d4,,True,True,Tests_passed,c823cfa439815b10c91db44cd5abb2061a9042ce7ba3074b5c4cb9c65ae511dd,True,4,10,43,3,True,Tests_passed,f6064d0611610891802bb6082d408aceaca4a1eda78f72c30f903c96c4e0097d,True,4,True,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,6dca8342b213a1f86ddfe64c53d9a00f6ca90f00dd2c0af21c4b903e37ea23d1,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,720e46c532378d3796f722c79922144933cb109e68ecdec024510427e1986cbb,Merge_failed,382a08e1464af38d7c472176d4e8f36a5c5ac24655a5eba9c0d0a9e3d77b95dc,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,8183135eb43b7a26c9f2d5e1ed521e6f137d31ab813a9fd3e13db5a1706179fd,Merge_failed,80be464e3838de7c9886959a4e9565453d52466b9851d2ca4502d7dc0bca255a,Tests_passed,d184acb5b3bf0116316950a6ba548f6e06ea5373f4f96b5ba85e8873b2a49c28,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,90d86acb31323210c9cc42d00a2728a505b2f28bc23c0e691f0f6dfe70cd37c5,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41,Merge_failed,1496f7f60ac24dade5e82d654de7bb6c6b0ecdb6407c3d6dede3b99def9f0c41 diff --git a/results/reaper/merges_tested/jboss-logging/jboss-logging-tools.csv b/results/reaper/merges_tested/jboss-logging/jboss-logging-tools.csv index a4bb481867..c706a0ad29 100644 --- a/results/reaper/merges_tested/jboss-logging/jboss-logging-tools.csv +++ b/results/reaper/merges_tested/jboss-logging/jboss-logging-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/heads/main,83df5d49064f76824cf23bad4e7fcb8776af855e,818acf752e1230fa945be7a2ccab3ee88665a32c,f7c761bb675a4ef7a0b7b5e245ce030f478546d1,,True,True,True,4,9,32,2,True,4,Tests_passed,0fe51dc2c490d0382682c06a1b2bc93bf005e557d0f09443bdc71e4ec920637b,True,Tests_passed,d27cfeddb1cd3c49098d3b4a3b126fdd1c48d522cb2a19814f769842d1f8fa1c,True,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_failed,7f1126281e50cbaff1f800444f39e7a8acc04ee06066c88c4810a02a9b83087e,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,74ba72ca7da2e5b83b3430481db7a9b8fb63840f25b4068f0f70f52e4059f5eb,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,21a5c7caec019889b11a931dfb5934614d5cd7c6cfc9237769c5ee35f507ab5b,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840,Tests_passed,0ca178eac8c54c963380d3e8f9105c88fc40dfca76fa586d3e5fb6eaa8e36840 diff --git a/results/reaper/merges_tested/jboss-modules/jboss-modules.csv b/results/reaper/merges_tested/jboss-modules/jboss-modules.csv index f5d1d723ab..289f0bd78f 100644 --- a/results/reaper/merges_tested/jboss-modules/jboss-modules.csv +++ b/results/reaper/merges_tested/jboss-modules/jboss-modules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 155,refs/heads/2.x,86ed5a70b195eb0e6dc7b43826b5bad32ec93232,b13e25e04244fdb8000f649ddccbdabec9c6c2de,5e3d058d3c58015f9f6c5801c52285761a76f01c,,True,True,True,26,153,1119,3,True,26,Tests_passed,7e3e8c943f661ec946d0b4cb3f53b1e9a83edd90e3bbddc5da498dacfada848e,True,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,True,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_failed,a12ab425b174f3ea94927e1f28ef4559d962ea0d127638cfcb8ea67d94c28361,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_failed,a12ab425b174f3ea94927e1f28ef4559d962ea0d127638cfcb8ea67d94c28361,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,e917a187f29e9520e61a98a7ee0c6a42de5fadad666836196a540bd8d367e63d,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf,Tests_passed,1cce9f4a6f98c3b58a760b6015a237a95412fe07d9916e27b33165fa7eb6a8cf 156,refs/heads/2.x,5e3d058d3c58015f9f6c5801c52285761a76f01c,2772d3e079099f08b4bd32d81f26549bb3d6a88c,32ffe5d4942aea74307f6146613c19d7a086b7b3,,True,True,True,21,87,634,2,True,21,Tests_passed,fccd9de43811ced4c6b325316a39ade676de7b313ab3c9b8207426133f40c103,True,Tests_passed,677fa2a3b5ba4290f87612f943557e529f86d253eba5a712b1d8362d0a699c79,True,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_failed,4d1e2c482b3c1af903bdd6130c98a1395c9123864226c043a72d963f112903b2,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_failed,143da928dddefe2b40d875bcd07efde0db0b62fce9842c7486ba1de4388d2c24,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,0d2b97a5d636c5673b2bf53d129e41d8f9b550d66062594128b47cf00d818f6d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d,Tests_passed,59739f516e12243f5e0333a899848fcf3591b89c5dab383575a2db52690fdb7d 162,refs/heads/2.x,223bcc9142e45c1f3a1c970a586ccf330f544877,e103797c14175a1a17ca0c06f14f51f1121f7cee,2a5da125fa808687b4d53e7401892e311180db2c,,True,True,True,7,26,425,2,True,7,Tests_passed,376386a1b79687e4bd3aaa19a8c7cb05509616bb8f30fb2064db31803a39a936,True,Tests_passed,eff28e65f82278ee1552d189179fdf768936f9e2742279a747f94b1f4f37167b,True,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,0196a9a5fce1632086690f826d2512dc9e36a868446ace7bc20ec302d582048c,Tests_failed,d25bdd43a80caf7a93b9337ba679ec7495798d3ace914cb55c7cc3374d2c46d7,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,0196a9a5fce1632086690f826d2512dc9e36a868446ace7bc20ec302d582048c,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75,Tests_passed,ad0c1b6ea524459a6b16adaef527681751514b53c4260687d98a2081e3c7ea75 diff --git a/results/reaper/merges_tested/jboss-msc/jboss-msc.csv b/results/reaper/merges_tested/jboss-msc/jboss-msc.csv index 20c7b96a38..40f54f4303 100644 --- a/results/reaper/merges_tested/jboss-msc/jboss-msc.csv +++ b/results/reaper/merges_tested/jboss-msc/jboss-msc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/main,2109ea6f82b5ab20a1a6b918654f7f0e990a5c06,98ab9419c2e91f16c31e50f5acf9b5f55a7da7ee,1a17f7befaa22cd08fe07c21033bc450bd09f5f7,,True,False,True,3,93,280,3,True,3,Tests_passed,13114c37ee83516642ac08e9fd85c70840d9ca7eafada24af9db523a7969475f,True,Tests_passed,35d503dbd81d2adeb3a10bd4c33c1c2d41556ade7ecf209397a6c4fbaa995e89,True,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,7846f6f0411e6dce3c20697a249505db79c8b66242344d4291e5f794e08feebb,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Tests_failed,4f7c57167caab4a1fbad985f6e7204e9d9528226f592cfe126022dc79854bd37,Tests_passed,505cc6d1dda408bff0c26a2b71abb1676682a07db4072d2771fa9f0b2ff307e1,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,3449abc52b7f4b54087b54fa454e2626221b7b4caaf1783987f538cfd1ec5602,Merge_failed,45fed222014efd4f50de3657fbe61ee4a573936fdb69ea46a511df8a925fcf66,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,fa770c0c0b780e2f3bb785504ef500fddb24d8a24ae83d4936a63a9ea94bd703,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2,Merge_failed,6b7987b03bda5a4b76a20236b70e79d2411cc5b174066bca33e5d6f10ac0a5f2 47,refs/heads/main,a4e21a3b10f4b4253329bdf153eccd97cc36531a,26352a640d233dd92851a174a181f6d77bf36fba,9fcb50d7abf665bf5629cf197db708fcb7cea89e,,True,True,True,12,76,476,2,True,12,Tests_passed,0ab45d84c2ad769e3968f8ea5c15586331fe7eb574b8e95232af9e50de0809de,True,Tests_passed,d4960b199f3c4ad9aadc54463a623b0626cacae00c5c5158e3b9867b307ce69b,True,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,f4e6371ef847689a1ff054de07ac960ac9b2e5863d2fa5f97e14f82a30d09266,Tests_failed,ddead4a137dd47228e346afbf179d6c2536186cafc977cddd3100b373ec9af08,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,f4e6371ef847689a1ff054de07ac960ac9b2e5863d2fa5f97e14f82a30d09266,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,9af206b30f8545292326d7ac929bf132ed8e1f38e509bcb0e937abd41af72624,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b,Tests_failed,4b3ad972c4556c438f30193efdffff70f1a8cf6978df35d41dc12fa440b4c49b 50,refs/heads/main,1d9b8d45ffbf332ad23a5ece15c23becd199dd63,91f7ee699502a700fee2badbcfcc985832a4abd8,69a1532b5dc2d7d91770079e0f097db64b71a88a,,True,True,True,23,49,196,2,True,23,Tests_passed,2fe333aa5f227c677bce07f9e2216c23ff6225c39fbc4504a47d960720de409c,True,Tests_passed,830cfd6e095f635ea66fe6f377cdd59575a24dc5a54103e29b4a69b62e30ff81,True,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,9d71d3b63bc4a5ab210b3e3829491b788402460da454d93c787348d7c65883bc,Merge_failed,38c12b41b5778e35f98ce3afde30703e8b73ef21be6e7df56890ed1bc7b1b825,Tests_failed,508ffe1a6899b6100965a4c55d2fec4aec2d1b8ff237fa652201825b75ae0857,Tests_failed,73f79994748098e2b9d13fa9434b3e53dba7a0e67d5cc74724f52a1dd4763ea5,Merge_failed,38c12b41b5778e35f98ce3afde30703e8b73ef21be6e7df56890ed1bc7b1b825,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,95f135d6c5e47602b50a7764139f08577f4e0516cf02ea919e664064a25e1cc4,Tests_failed,508ffe1a6899b6100965a4c55d2fec4aec2d1b8ff237fa652201825b75ae0857,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e,Merge_failed,73f27179553f256228cd70736b48138e8de0ff6c2fb21f267db8c6fa9457c07e diff --git a/results/reaper/merges_tested/jboss-remoting/jboss-remoting.csv b/results/reaper/merges_tested/jboss-remoting/jboss-remoting.csv index 36d68732df..dec14c61fe 100644 --- a/results/reaper/merges_tested/jboss-remoting/jboss-remoting.csv +++ b/results/reaper/merges_tested/jboss-remoting/jboss-remoting.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/main,fa12e275a2d217fdbf49a391aac7cf7b33b842ee,ec01151b604414acdd80747d3644975a1d866696,be046dc8e84d928360f05bf2f37977e8b9ce2828,,True,False,True,2,2,3,2,True,2,Tests_passed,66d6061879885f2c4266104516af070cb8866012b981f3867b0aa3a2f9dcb3dc,True,Tests_passed,bfa25ce1f81587fda2b6ba6c7ba9a302e7d1345ecec3c18787ef845e49aadaea,True,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,f9544d6ef0848d371ae26b00e60d3223755dbb0a154f629565b39d17f3bfce60,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,f9544d6ef0848d371ae26b00e60d3223755dbb0a154f629565b39d17f3bfce60,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b,Tests_passed,b0b66fa96562d0ff12fd0f7a4322a6689c5bbb8b96451815a9dba4130efcb22b 40,refs/heads/main,a8b1a9515e267852a3af22bf610cca028e905ed8,c1aee2651506e83b09e7a0eade417ed70e9fdb15,f543b871f3fdc5ab00689a11cccefc6af4a58852,,True,True,True,10,23,478,2,True,10,Tests_passed,7934db91b0711843ae61c05928ff909199f4a283dbcbdee4711d152d4d197a7c,True,Tests_passed,38f14b28e5c45e928eb55e169da9b6a0f956361b465c70d3e581f4cd690c5083,True,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,bb3e60978e6b1148f18b08d5b3ddd1e4b992d4c974843a5bbce42a174bc27242,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,bb3e60978e6b1148f18b08d5b3ddd1e4b992d4c974843a5bbce42a174bc27242,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01,Tests_passed,db8ad7671f4be06485ae6a168470cd0d4e661743b75f213c8be7389368f27e01 77,refs/heads/main,385ba29f16bc08ecce978e0c5114513f4779d41a,94a78295dbf5fbc01975dfae38e43c3a7c25f189,c1c95db78f2a84cc3961187c5b4c48396083ac24,,True,True,True,19,60,272,2,True,19,Tests_passed,06cc576406fe393f35573347683dc6746acdcc736a232ed287146b3a171b4e38,True,Tests_passed,48904359a370b66838458308b2a6ed1eb9d4f7a371409cdcb52d6b4a793836bf,True,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_failed,18d2c6bdd00a36d91f3fad0881739e4e9c727ecbec9ae10a3c709844aa9aaa6d,Tests_failed,ee70e27d99a311c3b2bf71469acd3b59474aefa0cfe23b92a644d782389a565e,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_failed,18d2c6bdd00a36d91f3fad0881739e4e9c727ecbec9ae10a3c709844aa9aaa6d,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,2896a0bec0bf9665f65bc1f28fe6d0d1bc55b7057c738991cfe395dadad91975,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf,Tests_passed,ebc5f86d21397916d9f2178c01229cfca367e1c5624aab521f229d48ca856ebf diff --git a/results/reaper/merges_tested/jboss/jboss-jacc-api_spec.csv b/results/reaper/merges_tested/jboss/jboss-jacc-api_spec.csv index 63130c733f..aea048a557 100644 --- a/results/reaper/merges_tested/jboss/jboss-jacc-api_spec.csv +++ b/results/reaper/merges_tested/jboss/jboss-jacc-api_spec.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cc96050a0c52dd790b2f50959011209fe84dac10,687df30fe259c3d9ab3d1c8f4a443a51578b0e12,13ac2c0b60d875e69080e327a8d83d64d1521494,,True,True,Tests_passed,5c30c5f8f5edcf2f29b5baa68b65ec0aca99cdd6f065fc72e01e9d9383c02160,True,13,12,39,7,True,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,True,14,True,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,e3c7b83036e1df9ae15d3c037ec73e050f7a8be46e2255cdc507da45c0cfd60f,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,e3c7b83036e1df9ae15d3c037ec73e050f7a8be46e2255cdc507da45c0cfd60f,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,f02d25418a33b1f68d877f7997d4f3e96c05b6aa227b0b4e0d3a0508c99b71d9,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270,Tests_passed,79742b153a19e0263d9d57bf9ddbb32741db5a895354ae60a6a8704a51832270 3,refs/heads/master,c462f40aa4634e8f135b9c5231d3de797d3290b1,8a114ee6daebc64bf9fbd46e097d197f46946220,e534feedc32806baf77693c27558b17bb9023eaf,,True,False,Tests_passed,d7d73dff718cc5e2355b31660c858940ca925af56b2e841338ad742ac3fddb22,True,4,9,32,2,True,Tests_passed,566fce4c7484fd2b63f24635cd5dbfbf9216c1f7d7b449ebdc07f10b11121c82,True,4,True,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_failed,090f0bf65d1296e57b7438aa95d332f58b496fde89cb9473be700a77194f757b,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,a8de524c11762580a22bba8b606e5b1cdd0e99df8dda900f7acc25f247cf0d69,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,8d3b097ad355a70f92c5376e6e19ddbe3094ef02121016235cfc99d5525446ea,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7,Tests_passed,83a80df52fa77e80ec43d785f84215ae18838409407ca9fe01fa0f1d57875ac7 diff --git a/results/reaper/merges_tested/jbossas/jboss-dmr.csv b/results/reaper/merges_tested/jbossas/jboss-dmr.csv index b1d65675f5..d64f8b37c1 100644 --- a/results/reaper/merges_tested/jbossas/jboss-dmr.csv +++ b/results/reaper/merges_tested/jbossas/jboss-dmr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/main,2a31e46d096142fa30d5ddcf584cd0c971ada12a,c0430fb6272c5beb96eeff49c0c7677f84be9665,1696eff49c95b72f32a68cfe701f67d4771e8592,,True,True,True,2,3,36,2,True,2,Tests_passed,0d8a983b2b6d09b2503f6192889ddadf7000165d821ef1e7f6548298a2f6df34,True,Tests_passed,f3cf155211d0182fcb9d3ee80f11a8a50ef0a8dc05cca58ee304a011be0e0343,True,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_failed,e1a36e8b4b81538d80ed2ad322adc415f856cf28a7eebc0e602a876ee110d2b0,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d,Tests_passed,091cb867e082da78a6faf9d5e29c2500997228acc93b7c6052d5dcfc79ee781d diff --git a/results/reaper/merges_tested/jbossas/remoting-jmx.csv b/results/reaper/merges_tested/jbossas/remoting-jmx.csv index 91e6f8365c..7b0fc8a4ff 100644 --- a/results/reaper/merges_tested/jbossas/remoting-jmx.csv +++ b/results/reaper/merges_tested/jbossas/remoting-jmx.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/3.1.x,b9ca42ed29dac295c11413a095c7f20a4c818ac4,da141df9a273d361c2317364add9302e66b6ceb0,9dc2bb688ee3b5be65dac1bec419c816d734ead8,,True,True,True,72,314,3039,3,True,72,Tests_passed,fd315bafa64a993c9ce029667b7cc6f59f162d60ac2b6e8c4f2ff640348a9c1f,True,Tests_passed,091b3f0829802b885280dfd2f870688e02132fbdfed6a90f0d5bda35d162492a,True,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_failed,701bd556b407a533313375c99f08f230233f95528f94d9a2a2314727ff950185,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,d53809aec94b6a148ea377d3535b6eb300a96868c1cfcc1671176308554ae1d7,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,f412b87684ad3dec79472a3fb6f641391fd0113fb7e9cafab7a4216e187062d6,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee,Tests_passed,3db45000a483dce3467b46cf19fcf80f45d7031ed2d1882aaf8f5b7f87f04eee diff --git a/results/reaper/merges_tested/jbossas/staxmapper.csv b/results/reaper/merges_tested/jbossas/staxmapper.csv index 33ccaa1baa..68627d5f36 100644 --- a/results/reaper/merges_tested/jbossas/staxmapper.csv +++ b/results/reaper/merges_tested/jbossas/staxmapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/main,8df8c6aad07328ccec3c4326485074342d85673b,6c21060a407fa75ffb47a90b4aa8a3f929ea08db,625397a3c0056de4fbc20ddf6cddb8f47a00b695,,True,True,True,9,68,225,2,True,9,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,True,Tests_passed,877fbef5f9ac8b3cf678987c016f228ea215959a773fbd8c4e5d818f35e949b5,True,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,f341a290f9343cc7bd2f454795f3f23186f494e434e0626ab8eda63c26d400fa,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c,Tests_passed,aa021b7203a634c88a3523cfcb44089cce4f571ca63b0bffaf9a36dd874d609c diff --git a/results/reaper/merges_tested/jcabi/jcabi-aspects.csv b/results/reaper/merges_tested/jcabi/jcabi-aspects.csv index 1db0a9b913..ae2f3dbe40 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-aspects.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-aspects.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/master,5780cbf85c5170db6de69ea735b8ccc73361b05f,bfd32ffe36542cfeb011e18f745c306e0cc59570,1d2552cb4cc1242e3c20432ffadb304808681d8e,,True,True,True,25,91,805,2,True,25,Tests_passed,a067de3f37170fe8342e109fdc0e2f97293756f8b5bf2569246227a2fe4e69c1,True,Tests_passed,dd5238278ff1088ec09a93db0f3313fd4ef1ef2b71b017bef5ae7f11c4bda8c0,True,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,858f871f3902c612d097966b566460c6be687c3ac899834f4098e89b5a932bfb,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e,Tests_passed,de42410f34d264fa98dd0955fe48582ea2691ccfe372886b4892b123f93c3e4e diff --git a/results/reaper/merges_tested/jcabi/jcabi-dynamo.csv b/results/reaper/merges_tested/jcabi/jcabi-dynamo.csv index 8b2adc2387..b060563d1f 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-dynamo.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-dynamo.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,a3e4660c7f264db9a33a64604ecc70a35afabe0e,9361237bd624eacbcabd5d984afb5bd01f0f806a,e9466c87dd6725d33a9f6343286b1079e62f08e2,,True,True,True,10,20,473,3,True,10,Tests_passed,bb2fdcb870946b9f6c9225a64bbc6198de35bb0a9c9f70ebe8c855a04600cd7d,True,Tests_passed,840a7426966ed546225524efae10dbbbb419ea8a1fbd16637a94fa9637228d2d,True,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,3511fb4d56640d64a166685e4b30c2a4cb3962b55ccddb10f4197110f2cf498b,Merge_failed,ec2b59d8a4a78672f8a1cdfd7938396f231ec4c54283b5b49b068b591a6f2825,Merge_failed,755cf2c6fcaef66a4f9a960f7dc39a4b5b0e64e6fcfe9c764c1782c442288832,Tests_failed,83209ea7fbe26e56b1b7ea6d07b3c8bd00cd8429f3673438866517d11d10513c,Merge_failed,ec2b59d8a4a78672f8a1cdfd7938396f231ec4c54283b5b49b068b591a6f2825,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e6165488bcf77cf6e40214f740e9f1529f1b2eb8313429f628a81ffdcb65295f,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3,Merge_failed,e78b1c7c12600617192b53984e79358a85e58854b56c4ac1e1d9d6f3da3721f3 29,refs/heads/master,06bfb00c7a266e151242c512dc82a81be6b92d76,1a80242486d7908971f3b156974f3f63c94bbda9,ea8513f79eb933f61166d8f83b52df386ff54a8c,,True,True,True,5,18,103,2,True,5,Tests_passed,17dc2c7d04982a7e8869aa0848337fc500b2fc6282eefeaef59058f281822914,True,Tests_passed,d2aa2c8f411d33b809f1460c91f99a8239c06539a84b61aef039e6a365118e39,True,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,ec408189b017722049068fe65dc20a5a9fa3bc67b14ee152f589be72f771d007,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,64e96679d3428c8530ef83bbc10ebdc2dcef9b357fb52c038c4d7bca15941e9d,Merge_failed,6940b25bb05969988512b45d231a2ae2c121d5f2a65e154b8443f4df20afe127,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d9a17efffc7bf285a420eefd33da231cf8d7b0d59e0eb852d87904531ae27f4d,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e,Merge_failed,d43701443cdc44ecb75f4da76f20372fd9946dc1bf9cccb11a6d71feb1334d2e diff --git a/results/reaper/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv b/results/reaper/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv index 9e35e4fecd..770c81a2bb 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-dynamodb-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 36,refs/heads/master,f338c10bd50912603f7c310831244485e9af2df3,1d7c27797979516e6ab4052e3aac3651378da823,2c1bb0dfdc2cb70fab5a08c25269727c6058f019,,True,True,True,11,15,304,2,True,11,Tests_passed,57d2272071c087975e1b6966f3eca7e31271f0fa0c51cbfb1f7366f494454baf,True,Tests_passed,dce284cf7b0a85d53b6982716e7a003920af2477db966b8d7f266026e0ee3440,True,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Merge_timedout,,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,2afb34db8ee57257375a4378de0fd8a937cb58f5cf20f2c3d9d0dcccc62c36d5,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc,Tests_passed,1b5c439d6c3906fd663edd3a3ff8a423a2b2e4a5668c50113bdb8ab9aba999fc diff --git a/results/reaper/merges_tested/jcabi/jcabi-github.csv b/results/reaper/merges_tested/jcabi/jcabi-github.csv index f0cbaf245f..c95ac7e2d7 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-github.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-github.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,287c236e196b6131585aec05f348b253c74d5dc6,81e46811c79cb77e42cb90847bd24caed525d8a3,2ce2bd2ddc35a6c2c89ad05b8f2b1ee9b98fd5de,,True,True,True,4,5,48.0,2,True,4,Tests_passed,81c4d5378f32354a1b61d817014ebec6af6a46cb18ec5b639787b2f392b636c0,True,Tests_passed,ad849830e6ba17a4554b9e53aab1ac0b5bf21eacc09b5cf0040dc5073090b258,True,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,e0ec5af95727fa94009a117d58e56752b5d4202215f1c625280c00c235638ec5,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,e0ec5af95727fa94009a117d58e56752b5d4202215f1c625280c00c235638ec5,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4,Tests_passed,42b1fdb08a889325f4d2768af90d0e86a991d30411c3eae2f6406f506352d9f4 40,refs/heads/master,58081f40b7bc2f2b811485f8dc974460e0c0ee13,6b2ccb3a5453675979cee90ce70384d7f49b4aa9,a68b100fb26de7172ec938260b189a12ed8eb83a,,True,True,True,18,55,941.0,2,True,18,Tests_passed,fc6b9ae478d4aa3e00d1e8191576037796bbd5750b29894b838de66634f91928,True,Tests_passed,6e82f190ecc4cc23f3152c2066e6966053a777d4bbfc3bfa7e62e691f879d8d2,True,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,8a1a530774e3d91386fd092b30c4e5d681569aa9694de38a83d6f55f56cc74d1,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,8a1a530774e3d91386fd092b30c4e5d681569aa9694de38a83d6f55f56cc74d1,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,867cd811f432b4e868d38beae17411f2c62629fb3876e75fbea67521f4579cd2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2,Tests_passed,b3d03281146f08d6dca2385fc9763b62d78397b19fd4e2daa63a2c9cf7ea8ed2 42,refs/heads/master,ea45e9cb7d4ddd6909b735e649963d74490d23f9,9ed8fb6f192b23fd83562f83be857834d6eb8973,910abe07275a484506dba7e6730fabe94b9ded68,,True,True,True,12,35,540.0,2,True,12,Tests_passed,403fced7c787f6d0a58702d3274d0e1c98a6bcfa66b8192360fe6b3f6353d546,True,Tests_passed,c39b8480df33e1156350cd6a662d41e0859069299d36221fa6f88f62748004bc,True,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,3ebe6eb202a8f91b930f71e408661bfb2c323c784c57ea64c0d2eb2e8c5a651a,Tests_passed,5dfe4b7730cea4576d0cedac4e31c24c8ffa8fb9951024bf7d5062a49a1f698e,Merge_failed,87ba497117c913da1eb7a13d5ab62c178e2c9313c5d6a0d7623f593fac48170d,Tests_failed,5b9ac674eab741dc4652457978e5ed46940ab2c70ae59b11faf83b77477b81c7,Tests_passed,5dfe4b7730cea4576d0cedac4e31c24c8ffa8fb9951024bf7d5062a49a1f698e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,143d2099e3e693a0517c6631a61d4b0a2f17d90189fad324305e66fb2f0c6c6f,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e,Merge_failed,dd0c46f7d7b0c12d3f55d9008b1a15a89dc8f8e5286bd8fae27294a45e97834e diff --git a/results/reaper/merges_tested/jcabi/jcabi-http.csv b/results/reaper/merges_tested/jcabi/jcabi-http.csv index b3f0502913..6d40e455c7 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-http.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-http.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 81,refs/heads/master,0c63dd0c7521670361a6b8b54f23fc4efae247cb,6ce8a0910083d6f849d7802efe761cc792e0e002,e0aeb6b2fe7f76bbc7f9f1e31942882ff91ad79d,,True,True,True,5,19,147,2,True,5,Tests_passed,70decc44afc9f2545fa6c82bac15dcfe7c0b78e932ee38230dcaea7b9bdb2c3a,True,Tests_passed,5bb4614d01983011c60658d7ca972507fb1f2da46923b165e62075768f2de1e1,True,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,9902dbd55c865d6ee911acfbb00b2c4c7804bf24f149c8a761f71fcd42950ea0,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2,Tests_failed,3086f0e22ef7f15838d433f3d3d35738ce17ccf7c24600fa5e9aba50ec5fc2a2 86,refs/heads/master,b00f0aa072e64ad270214d8a80222fc8c5e9781e,d97d312f86e5f916ea72a5cef88030000ed25934,60552a54624ce28e53c5b8e6a3bc55aaa1db7b3c,,True,True,True,11,158,829,3,True,11,Tests_passed,80c5b9d941784cd06d2d57b9075bfb2765a4e70bd6ee3364156568e8f7105193,True,Tests_passed,7281c0b82968720305f4dfff033bc5b500551eb5d03ae72bef79ea10f4c452ad,True,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_failed,f0dc57454c7f0a5713fb704c59b8fc7947ad5efdc62cd053784d11b852b36f53,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d,Tests_passed,3f835b6913ccb0a9f0cf9f5e8fbb2b5c14e3eeea95a200325f6967425bfc601d 91,refs/heads/master,3aab65595a636aa22bf2fc02ec514ffad2ec401a,7906e1069cf046509ab8dc34effb7e343531602d,d4c4a01060b8060855ce97655520e44cb24b5136,,True,True,True,104,232,2956,2,True,104,Tests_passed,f229d784bd3f5fd0f1626fd0a7decc33b223b8c7f61d3cf972f39ffe0ea0f09c,True,Tests_passed,1cdb08e8cffcf87de452156615583c7523bbae0784e496f4abcedbcc6f4b1fbd,True,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,ebe8870898bf067af7bfe2f22272a1fad006da5ad546bb28edbbc80101584dd3,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,ebe8870898bf067af7bfe2f22272a1fad006da5ad546bb28edbbc80101584dd3,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b,Tests_passed,1450db9d4cac1b479434b8614133303bb042980c81d54ae325fb1f921c77f59b diff --git a/results/reaper/merges_tested/jcabi/jcabi-jdbc.csv b/results/reaper/merges_tested/jcabi/jcabi-jdbc.csv index c30c1f07f1..a22ddb22e6 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-jdbc.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-jdbc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 80,refs/heads/master,40e95d792465ff63e698273a475a8b256cf11a5b,0955e011d84b9cb0365fb3d208c1ed279679e93e,4878681804738bae9a1f3140c5e5a67eeaa17bd5,,True,False,True,4,4,8,4,True,4,Tests_passed,a86414b4ca81197421bf87e8a766fd154cd787f735ba36f6e34e5b442f0b2fa4,True,Tests_passed,ea01f49037426a0c9c8e202564398b3ba587d7864410bbbac099e194d877419c,True,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,1da3a869425ebb4e7539347002f7912b4d963378289e6564e8841ebe191c6ba1,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Tests_failed,1818a6ee41f80ac8ccf2b3f0f375a848ba30dacb049d2471157516c10dbdfb9b,Merge_failed,b04afa2ba6a3e94ae383d9d90bad8e2957009093b1da313a55ab1cceed7d08c3,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,7a32390eac88ae039582543f31ef57e52585d085089b3eb58d88f1c197647e20,Merge_failed,6944db054a9c38ba5a43ac7b8f5c1df3fc08368f5b0f7744feeb950caf176459,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011,Merge_failed,6cd44c14da21cc8026c9e63f560c0e2f3d787f35427112e26f8033619f6de011 diff --git a/results/reaper/merges_tested/jcabi/jcabi-manifests.csv b/results/reaper/merges_tested/jcabi/jcabi-manifests.csv index 88af27ae8e..8a2104d704 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-manifests.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-manifests.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/45,84bccb34de372d8914bcc9c797705a155a71c516,6fab189edce64223226719803772cd8c9e98d0f6,feccf89447be6c4e13fc814d662d5d1b11f0c1c0,,True,True,Tests_passed,71528c2302785399766e84ca685268448f89ab87aa8e9c99ccb3fed9c096c311,True,23,92,816,3,True,Tests_passed,0e96359525af7d5c6d41b547e1248138efda706a9a658442dd57a8d1460c3e6b,True,23,True,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,9e85fef7ba0378babf6bfa1a4b110cddb7d9b2e6ae33c4b0c73e494c9dc2443d,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,7dd2c44b5fbe73b0bd19b47738d4d4b3984fae91b0a4e3cb646fec166055e7c8,Tests_failed,b7b8aefef5551d20ccc3b2fd26f1853e7900635bc0cd4cd2f90ad2d12333321d,Merge_failed,31e928c3ca7838dcfac301b8df540c22a27d76c543f53798bfff682285e26eb6,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,c69fd7fe1331718529dcce2d7278baed9baf2df479394642c3269ec253316000,Merge_failed,7bf669f8db1d5073384d68f2ad34181ac078c28560ac5831afb8cb873bfdd50a,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,560f155d3c7ca5e6126e6364e6a99d59494967860ffe4018fc326e0e3685ef4b,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9,Merge_failed,2f6a2f5073548db23648d558a4d1055aed6f598bed8871d8cdeb880bd53c38d9 diff --git a/results/reaper/merges_tested/jcabi/jcabi-w3c.csv b/results/reaper/merges_tested/jcabi/jcabi-w3c.csv index 5174bf9a64..2fc4c29071 100644 --- a/results/reaper/merges_tested/jcabi/jcabi-w3c.csv +++ b/results/reaper/merges_tested/jcabi/jcabi-w3c.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,23fe00a21fa09bd2e74031f21bbe216fcce51734,c43bab15e5de136c1c5e2fa5e7754436ac481328,dceae84af1401fd04c808a779f322f31f7d1e543,,True,True,True,8,27,222,2,True,8,Tests_passed,9dbac1a006de34bda6583b276196754eb03bedf4c3638faf2ffcb9fa742531d8,True,Tests_passed,1c4495d4eec1ff55e7ec34fc6667cb0203635e076f710813a16f96e8f8e97116,True,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,4456d7797372795ef47cfb92ca0bbe94307fd733b353e69f84894fae9fa6cb03,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,d9cf0a3518f2497569a142c59ffafd7ee47ed9324e15f7f4b60d2242b686e02e,Merge_failed,325d05c67fcd794a90260880491f22fa3ceb4179f3b1c539d596322a472b1a0e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,91b66cf571216e2e917f6bfafb622f996e08c266a7e4c09ac7d649a941247ff7,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e,Merge_failed,b099ca7e5494b09d7f7610147a4e84d55e7f3a7df12204bc6b523cadbacbd43e diff --git a/results/reaper/merges_tested/jclawson/hazeltask.csv b/results/reaper/merges_tested/jclawson/hazeltask.csv index 3e4116c864..00a902db14 100644 --- a/results/reaper/merges_tested/jclawson/hazeltask.csv +++ b/results/reaper/merges_tested/jclawson/hazeltask.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,9f9809f46cd73b80f333774d552565e5ca89f302,b2dd16e728a751889d4b24489c2dc3b0825b46ca,21c83e6c0520540de424bea4af4068826b6b447b,,True,True,Tests_passed,6863884ce35b3b3fcf6efd0bf8a3a3dbe06bae6ec921152119988287e7c27566,True,17,56,1153,2,True,Tests_passed,8a0b1d50a2aa45e693fd985c7df80f9938b47333a999a18f6fe5219fd71994a5,True,17,True,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,8b59e5d387cc6e32584e4d8e4559e16c7e91889e98d0bc3243f52227180059d4,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,36aef089a5fd613bc2a5ac5e756d57a67e8e9ccad7b762cfeeaaec4eaa82f4f5,Merge_failed,bf3a629006cd335315fa4f22d8fe77c7c3465b5a1a313c6738171072dd1bcee8,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,21b31efd80d42505ff84e12e0b790f6c76ee186a8338f45a862f52a66b13a378,Merge_failed,a07ff57a37a98c2babfcc24ed40ae3180df0291ec38c89951746b6928d7fcd5e,Merge_failed,d224db4cb6a7354dd2f8db44bbdf6b8c77c3de881af4dc7637bd79846588e943,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,de03aba91b65b2b489ce315bc001484d38763a395162ff519296667bc5a64e22,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20,Merge_failed,1e397037e10742aae0ab11c50acc17c206e2f3156ce19fdf08d66496773b7a20 diff --git a/results/reaper/merges_tested/jdatepicker/jdatepicker.csv b/results/reaper/merges_tested/jdatepicker/jdatepicker.csv index 191671f7f6..8eaab81d32 100644 --- a/results/reaper/merges_tested/jdatepicker/jdatepicker.csv +++ b/results/reaper/merges_tested/jdatepicker/jdatepicker.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ff57324d1d699b55b89f674a4689f50633a77f9b,7c33934557fd4009431dddaee5597487a51c0aca,cc74e94ac3eb76272cfa0a23481487e551c528e9,,True,True,True,25,33,6205,2,True,25,Tests_passed,384b5a8b0b25b7166a3e58719caec7a71abba37593928faaee916ebda8deb54e,True,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,True,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,5050911a269db55a05668375f531e588c71a01158675e5fbbf9a40167ab3d411,Merge_failed,b3294f02d54a92e540b95af9c51fd5e2685ca5e750f4065fdc44958cbb81974a,Merge_failed,e069e3cfe65211b962f6ed83160b71c985f78b39147554e11a9d76a4913cf8f7,Merge_failed,e069e3cfe65211b962f6ed83160b71c985f78b39147554e11a9d76a4913cf8f7,Merge_failed,b3294f02d54a92e540b95af9c51fd5e2685ca5e750f4065fdc44958cbb81974a,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,4bf378b315092df4c5a08215d7c9682791ffbea4a9968e86307259dad09f6737,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Tests_passed,9c33794827dc2e8f1d6492e8d0f368454f8bd4337e234b4d7dc6c643596381a2,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166,Merge_failed,516ad8358421b6fa73b5186049671e0151ebb58d085de1d1c776401e2bef5166 3,refs/heads/master,cc74e94ac3eb76272cfa0a23481487e551c528e9,2984c3f9fe78688e6bf34b0b23f7017657a6d4cc,a36294b8dab9448757932c766c55e7fb93dfbc49,,True,False,True,5,17,84,3,True,5,Tests_passed,2a37c87a0c14fed8c73bffa0dd97349b5a5240f2e70e687c70e197e4139ab482,True,Tests_passed,34cdf839b21828034a12732d95cc568e2098da38fec394c0cb21cb82a4bfe7d0,True,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_failed,897a07c308bdebe9216af091174188483d589531d2b0397ed6b7f227a198a628,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,c750f77f2f028d0c37240541b37e33c043b9aeafb44b1cd6ed275b45375e9a8f,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee,Tests_passed,395924ee72208873ed3f2184ad8e9b6faf2ee4241643223e870237d00969a9ee 5,refs/heads/master,79d78dec3a82066a97aa03456bb4c5bb9875ac96,0f4e989d218df97ab14c542144bfda6be47d255e,87536c372b5d9417aee85db0a78bdf833b8f6cb9,,True,True,True,53,270,6420,2,True,53,Tests_passed,882360918b3bfcee0a285a7062dfae3f7921b9d9c90f4adf3dfd4a5b2d75bbc7,True,Tests_passed,1be822e06ec0fe8d1b55351bf4e96da942d71c896c1b36071636a5769724be14,True,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,1ae5eb70f430b1737cf335f855650f8870253eaa4abb4b299967f57af78cd42a,Tests_failed,c24498e879595f09e2f6f00c69039763b11c167f55aff51991d7d7d4de59285a,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,1ae5eb70f430b1737cf335f855650f8870253eaa4abb4b299967f57af78cd42a,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c,Tests_passed,3e6a9a78749ec36848043322c4ecc66f9bf343d847efa62631721db6ba65d89c diff --git a/results/reaper/merges_tested/jdeparser/jdeparser2.csv b/results/reaper/merges_tested/jdeparser/jdeparser2.csv index dca20f1b95..9c72c35a01 100644 --- a/results/reaper/merges_tested/jdeparser/jdeparser2.csv +++ b/results/reaper/merges_tested/jdeparser/jdeparser2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/main,02fe20fc291fd127546c703cce697ac85dea09a8,8b8a1a284992f9d595eb28bde5cb3c703c9ba91f,fd6310c3745ff6d61487df6b8804760bea9cb866,,True,True,True,38,82,744,5,True,40,Tests_passed,e65e65953d6c3a627854b5f20e304a6ea7f061d5822ee65557007f1eb03fa190,True,Tests_passed,47a5f174e4385faf9c4058f8b0dcadda1f5cdab5ed5c4e76c8550a2e7e572823,True,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,148d0ba26edb9709a9b610fb921a51588a0a673ba53c583e67f1521cbe19d200,Merge_failed,048d12eb2b7b86c5c616321c4622716b984d2b653359e20fc40c6bc1e7eb5260,Merge_failed,2c450a33af64398bcf5a065ab7778ca53011f39e462e9e773653d210bb2842e3,Merge_failed,1d456e5ca5a78b829f1d777ac7ad1d6d6251a7436a4b3c97332bddebe353ef62,Merge_failed,048d12eb2b7b86c5c616321c4622716b984d2b653359e20fc40c6bc1e7eb5260,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,f8717407b11b5bdffc141140060ef00c196ccb0f9e2a70092dc198368995d313,Merge_failed,a024115d0a63562ac3fec7f2f5a0bb50f91ce3f6ea1e886daa08b997118621de,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c,Merge_failed,22e212ecd17e516671980f809a78af7ccbce8384eda05193588ff491a87fa29c 12,refs/heads/main,1da0e2349af32efeef7b5a1874bcc20c67c51fc1,3e7b519565d03b9d669338f591cb2deb0e33845d,8b187686848386bcbfc37c35c830ae50213c0120,,True,True,True,39,80,731,2,True,39,Tests_passed,c926970c508bc1f6f9b6bbc74f5b4491c644db587348e97016dd882ee3b9fc84,True,Tests_passed,f2c40051dea0b73f98eb69bb0335c4687c8c285053386a888f534aa7c4903db1,True,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_failed,3bf23a8adf058492e115909fa9af4bfa7a28fba666fd4f88fead46a10e96df74,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18,Tests_passed,d659308b120ce8198188e7b53fcc6193bb1da15bd32432d3db195a17c973ef18 25,refs/heads/main,868afefbb4efa5ab31cfdd9130758c2117d44948,f6270f89a8ed8b0f8322298dce22b45305fca316,c91fd39e62301264325af0f9870908fd29b9c4cd,,True,True,True,28,58,617,28,True,51,Tests_passed,4891b44f4179f8dcd678ade404a709b473294f84615052813a5ddb4a1d052d6c,True,Tests_passed,1b60fcfb5cf6137b329651b2e4c0a39d1b896e5e3333632e3f5b40bd36c33d4c,True,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,72b8747492c38dbcb2d3b36e4c6798820a00a140afea49069953f5089b410bec,Merge_failed,d637d8e0266d676631748777317d3718d2579d95da48c6df017f81fdee513ae4,Tests_failed,929bab2d4a6f644a9734de5378e27d6137985af9d6683308c44335a31a93c776,Tests_failed,c3d95635b76d22a02c65c491790c85b16941342585c21acc8c988d36b0c80503,Merge_failed,d637d8e0266d676631748777317d3718d2579d95da48c6df017f81fdee513ae4,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,63f31fb0c15b962fae234e4869bcb00623963b1453a6094818bc24d13b458468,Tests_failed,929bab2d4a6f644a9734de5378e27d6137985af9d6683308c44335a31a93c776,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,e8287a6ec0cd6b492a28addf0f80060df1a48b6759858b4ef74eaa5865c9b652,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e,Merge_failed,1e18adb212ff30258ceb53aa47b9637b9948308ca733251d18232963f481f65e diff --git a/results/reaper/merges_tested/jdkcn/jabberer.csv b/results/reaper/merges_tested/jdkcn/jabberer.csv index 2b3b70391c..ffde0b073e 100644 --- a/results/reaper/merges_tested/jdkcn/jabberer.csv +++ b/results/reaper/merges_tested/jdkcn/jabberer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5037a3d573c3e162e8de170b15258f76ea7aaca4,bcad97e1dce084756c25cf5b4f9bfba6e600408a,6ffe4e1c62789f14cf959876672e3d77b09699cc,,True,True,Tests_passed,73f44c203480ed18c03358e341da6cec5b87042ce96c1b72a79e9bc9de81dc0d,True,28,1523,28602,7,True,Tests_passed,1eaa3eaa12a543b88c9addeec39ea3e45e8c34662556ed533fa4d2565f7de5c9,True,32,True,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,42326de104e28ec37378ff5212c6c9af3f6d1ee328ffbd0b0e9d87b1cf14d107,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,1ba4589cc285be5f219cef0af049785d289cef3bf44391a32946a0f95cab29aa,Merge_failed,73ed1ce7647f14c181b60af7a4465864d047f50a61f51ba0862525633514970a,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,e5bc048a4075ad7ef6aa95afc3b512f9708ef0fc631abef71fdf0f60b6896ace,Merge_failed,f6b820dee8c6b484adb5571d530c614199ed64cdfe6c2f4a6d4e16fe03f63ba2,Tests_passed,36e6089b13e5a84938f8c90b551cd92bc49365fe3f56205f7deaf8bd57f4b194,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Tests_passed,1b20aaea85a9be4c123e899a69c2d7256eaca9e4e254dc04347eb667ee4fa3ad,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5,Merge_failed,f9bbb29af9fc9566a5153dd63c1cc1a29be656b33ba2f47f09915594ec8461e5 diff --git a/results/reaper/merges_tested/jdupl/lancoder.csv b/results/reaper/merges_tested/jdupl/lancoder.csv index 5b01490186..3abee0478b 100644 --- a/results/reaper/merges_tested/jdupl/lancoder.csv +++ b/results/reaper/merges_tested/jdupl/lancoder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,407742ea19966c62f0eeb9d47dce6afadf9f672b,1355727fd68e75d9e97387b2fb92355fd3cd1a92,80ee8865f90c66b4c90c833d5beab4943da35d3a,,True,True,True,24,58,548,3,True,24,Tests_passed,9a9b8b271a5a4d5bbcc627b7da9e738daf5a76dcbf483340eb27314d37063382,True,Tests_passed,1fd8f3ef0dd0e1591cf79eb252a18bf1e7c1cb904f9760b5e18a8e19d596b78a,True,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,2f7017498acb1c51f498ed3d952d3c19a0038f36fd55d790ab5193fc6baa6b5b,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,4bf8e2addeb1f4af1abab84ec12084c9964a30f3691cf6fcdc3b3c9565c05680,Merge_failed,37bfe619e05a2b21019e9ce708c767e20eccf7e9b054d6be2978fbad58f5f5d9,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,b0043f763d399a0464906737f3b859cfd0c6787324183c718f6f7079f054e63f,Tests_passed,f774b0788f945c3484b28d36288904571e61d551132d871102ce724c5bc6ccc5,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384,Merge_failed,d20351481a8134ef2398abf210abe70c0c48142031d2f382446393ac2257f384 diff --git a/results/reaper/merges_tested/jeevatkm/digitalocean-api-java.csv b/results/reaper/merges_tested/jeevatkm/digitalocean-api-java.csv index 292bf44887..a2c2c8fcae 100644 --- a/results/reaper/merges_tested/jeevatkm/digitalocean-api-java.csv +++ b/results/reaper/merges_tested/jeevatkm/digitalocean-api-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/remotes/origin/pull/87,8514768f75faa664ddb55d35a80f33960bdc4fbb,260cc90fd7c11dd719c3fd3ae8d2e125e3ba59a8,59583a5cc2f1a36025f2186208ede0135ead51f8,,True,True,True,22,25,56,2,True,22,Tests_passed,6eefd3ae1284b01b3a435e91fd010c86711ea5f6e902212044d0dba33e3e26d6,True,Tests_passed,dad290bc780ebf16a797261d48ffae22e47680ae194f0d5e320c8d0ca29f81d0,True,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_failed,cdc1d5909bab1768e6ddf79755205a06d086d6d8b988b05fe8463731417498ea,Tests_failed,ed96bde133537bcd46942e453a2bc407607d0b904640b85108b10733f85c5fdd,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_failed,cdc1d5909bab1768e6ddf79755205a06d086d6d8b988b05fe8463731417498ea,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,5c0af630428c6f4f4ca071873a5a070357c6f9312da5294e52e5194b81917d65,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386,Tests_passed,0006ffdd89886d70c72cf47be3ea855659477908bc47ea62ad333cd374539386 36,refs/remotes/origin/pull/99,997ce11f32044dd4702fdba7e1f4e5d60bae99f4,111275a7557b313dc7b0c1dee133b1e117b7d22c,780847a2b697201474857ecc249c40ca3251a4d7,,True,True,True,101,1900,7360,5,True,101,Tests_passed,ba8949bac9b136e076aa60eca3f3423420efb743b6da11fb7e3bb757dacc4ef3,True,Tests_passed,16739c8ccc9b5d92d986094217e30d32fb54fe5c0d500d8bcdade0074201b850,True,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,0a1933a6273f4a982e7f2c70d49a7d2734c835bd0dbf041578b18f5ac6d06805,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Tests_failed,467173f8a0db0890d219884a5f8554a0c6c1f97f63538761cb67eba2ab9a8530,Tests_passed,b95ddc816a0ed7b6b6187d976aabcee9d69a22ed59cc34de5a194041c645011c,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,ef1a273ddec911f4a80876a57d6f49ded5294ddaa8184631c388662c628a68de,Tests_passed,0bf4f4b480db7cac9bb60706aba0e02e4c15538966d809930946de9fd8487aed,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,bccd4d04e03247bf76bd55658b826ef48474993badef7584b48eeefbde35daa0,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e,Merge_failed,c6aeeccb1a6bd1d5cbf249c9f4caffc1d5a8e5fa7e55f8a79e1f9115bf49049e diff --git a/results/reaper/merges_tested/jeluard/maven-plantuml-plugin.csv b/results/reaper/merges_tested/jeluard/maven-plantuml-plugin.csv index a40835119e..2e2150bd75 100644 --- a/results/reaper/merges_tested/jeluard/maven-plantuml-plugin.csv +++ b/results/reaper/merges_tested/jeluard/maven-plantuml-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,729b0bf15253d09e809b1c8c9a6e5e8f1c43c682,c44bda80f054272e9c96d0a4bdf74f1d141becda,0885dacfbdb42af4595d33ee63901b99ef1b3700,,True,True,True,4,8,12,2,True,4,Tests_passed,028323517875ee73b3ba3fbbf148247381ec57bb4622ef83426e29ae46d79933,True,Tests_passed,587e4b38a2bfc52f622a611d99511cd010c5339f2549741b2ec7b4339b0695d7,True,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_failed,a4187a4175966967375f1d132b47f65096aa9d9a3f1876960d122384ec42a6e6,Tests_failed,dda1d3e78d62c0255fb80f1a243e8c2a82b7a048d898795909c4fc7c3e86cbc2,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_failed,a4187a4175966967375f1d132b47f65096aa9d9a3f1876960d122384ec42a6e6,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,188cdb24468998dcc3b005a16e845f56ed89d646f81f2e5fcc422f0ee580b76f,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014,Tests_passed,20176b75e89ee0566a956ffde8adec7fc7eac026d82c94c264bfc00e199b9014 8,refs/heads/master,571616267c56bdf33ea5eca14aec7f83d0355ae0,9f7e64cd7e24fb6ff8476e235d5839c553885ace,509cb7c52169df2b8c4d726d189474979b5a78d0,,True,False,True,7,17,239,4,True,7,Tests_passed,f5636c00094069e71499c5290d47d8aea35d45a913dc1720ac0e93123ab533be,True,Tests_passed,dca15947900abb12e8629399e881d43e7bda5686d4ab0d2f6f2ff83c9b762512,True,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,1e968b92e88920928ee826fd1b16d6f49a161c8e598072481d339c36c717d071,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,86b188848c437e0ae5556f45e4bffbd3744aecdd6d6922b78ed5749b6a18bd98,Merge_failed,e6ffa4fda73f248227b6c363e63a04ef81c00784a2c4f0a29b8c73461b6a859d,Merge_failed,1aada55f2e77f3bb817faabc7202cad153e08bb8ef168c83ebf8ec70255c0b37,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,d944683d224eefc411ae6b649bb19d6d10596ea76553b20decc2ebd29afb21ec,Merge_failed,3805c213fe547e1ddfe8a47a6c324191ffc4c75279af940998061410baf4912e,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,64ac21ad8856ad3bacfc57f398de0697ff3acd303485a5a0c5f3f0cbb103b031,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850,Merge_failed,5aa3dacb170c484e41b58c6e6df370ce26d58f14d483762c5ead93d14c0b7850 diff --git a/results/reaper/merges_tested/jeluard/semantic-versioning.csv b/results/reaper/merges_tested/jeluard/semantic-versioning.csv index 7dfbdc35fa..8f364f47c7 100644 --- a/results/reaper/merges_tested/jeluard/semantic-versioning.csv +++ b/results/reaper/merges_tested/jeluard/semantic-versioning.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,1130c9261b179f0efdf49badba9554d1c9d63822,37639815664ce78bb1d2c1f2240d133209ba1398,69909650ee34de32eceeee0b4dc6e0ab89f2a5b3,,True,True,True,23,77,819,2,True,23,Tests_passed,6e548b5daeca9c35e200cfc812d71b76fc5fbc59a34a18e2b3202fa542ba4369,True,Tests_passed,ca2c32fd8a7daee5a886c1ff4c8cfbda2f70e246d8bc4fb9aefa95d53ce94ef4,True,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_failed,e354c63339c54b523ea2b9a6152a02c314bb6cdde32de378695f442088e3343d,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,07b64fd2d66f4d16528de716b2ebc27088be5926490c89e879c2e07ee8b96150,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,faf149420cff030556bd0d76642cdfb2435f648c2f253fb8baca1d4e3b5adeb9,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2,Tests_passed,430ad204c91dfca0ca18aae6842cd6b22e3793b1557b6e9ee077996af35d3ae2 diff --git a/results/reaper/merges_tested/jenkins-infra/ircbot.csv b/results/reaper/merges_tested/jenkins-infra/ircbot.csv index d73da0f8fd..0893508c4e 100644 --- a/results/reaper/merges_tested/jenkins-infra/ircbot.csv +++ b/results/reaper/merges_tested/jenkins-infra/ircbot.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/main,25a15f084b1d8cb7805c786f23ba0f468c874d81,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,8b3ac03ed765013a57f4f2753e64fe5a05290598,,True,True,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,True,10,79,470,2,True,Tests_passed,b8d2455954af73eae15eaf48ab424015b4c20c7e2b759e3a51eb7d5e19ec9358,True,10,True,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,66bbb396e6f2a68a4d1cce6602e5593a2f2cf19f4838e491cea119daf8508454,Tests_failed,a468a50c36684b2f84186489b151f8e5f9448078ed8619de6b9df42e09d93e87,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,66bbb396e6f2a68a4d1cce6602e5593a2f2cf19f4838e491cea119daf8508454,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1,Tests_passed,f404af7c1ba5bdd7414a432b4265b9228309fa6efe478adbaf5a7e8fa1577dd1 9,refs/heads/main,59396ceb76c9db8977d1ac8cd650fb1f32dc6e43,069e970815bea3760fa9dc6609c724f8635a7c10,0b27dd256a1ddf2d51e7f1a2f28ed8bfab3779f0,,True,True,Tests_passed,19b5730003060a87c66505944f3eb408773632f05bbfd422e79e0e350d81ca40,True,3,64,302,2,True,Tests_passed,d556a6dbb753e631aaaf6fc380a44cf8add0ab3fc7614bb4eae0f046132a607c,True,3,True,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3b59af0154bcfd8904a92b9e626353f7d05ff12bf919a88cb345066ce5ef2eec,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e,Tests_passed,3adf2f0a9127e273642414afee4a2b24ad2acb6abb74a5cee3e3035a6ef5ec5e 102,refs/heads/main,bfa5471c7907101997c4630690a033cb82a677cb,fcc594a5c477a8ea55309a4c910701b3fd9b0f04,b8e5882dfa503fbf2c179eb683a2918343f4f90d,,True,False,Tests_passed,054f3970c9d2f1ff452b4978cedbca74db67d1fb9d80c51662cf1ae8073c5a60,True,4,11,73,2,True,Tests_passed,f1e1617c1c52c91d534a73820a36a66ac44bc8da64e7d1d439f4fc912a924dfe,True,4,True,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,287330f4c061a3fea304f1f08b5782bea9b718acded7e333f13ad99240bcaaee,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,287330f4c061a3fea304f1f08b5782bea9b718acded7e333f13ad99240bcaaee,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,16e4ec990656dbd53ef7bf1a40eb05938f4e0052158502ba2190f6e8dae2e8aa,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99,Tests_passed,26a2ce95b0f6530244aae1de7af7be79110cebb926fd327f8cb74e0326735a99 diff --git a/results/reaper/merges_tested/jenkinsci/active-directory-plugin.csv b/results/reaper/merges_tested/jenkinsci/active-directory-plugin.csv index 8c10966531..ea1c1fb729 100644 --- a/results/reaper/merges_tested/jenkinsci/active-directory-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/active-directory-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,d5ca0a8db535780dae86777eb35abe4cc2b202d0,8af37b499905c64dd3df3041cee645a1a819facf,1e35c12fee1b13d7d6a11aca78a69dab801c0f67,,True,True,True,16,58,120,3,True,16,Tests_passed,aafd61fe1f8f2d848c5da1a77a5b4a7ba5d58a482c6f63a2c81b8f699b7e2d3a,True,Tests_passed,7f6b7de2698bb1186287fa4fdf44610271e354c108d17e414247a41bb801ea08,True,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5e814f600832ec832feb7b22ceedbb16ea41e2670be9e2e2fb3c177e3d8d7e3a,Tests_failed,bc738d07f3c937332366aab652e43877f968209bf4cfcbc63b33cb678449563b,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,5e814f600832ec832feb7b22ceedbb16ea41e2670be9e2e2fb3c177e3d8d7e3a,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f,Tests_passed,a97c275aa9239bf942d261df018260ffccf9c207a650fbb1736be53e131e531f 42,refs/heads/master,3f894f3216914f72244dd916e073fe7410530a0c,bdcfc6a63f73d344b500627f2db0d982aec7ba54,0530887ab2160489002c5e5866221abffbc0a0e5,,True,True,True,3,5,31,2,True,3,Tests_passed,2a0f9cf3207976dae038b21c883b540dc99088044a040169e8ec51c9c6b82e41,True,Tests_passed,4d3ecb248aab18399e1ead20dea5bafe49b2989bafd8830fe68ee1f84795078d,True,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_failed,d709efd627fdfc36c4ee64fd6f17fabdb63f09ab00b405acf2731096cc5c3b96,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,2cb072cccee128828e9fcd558e4aeac4e6444ff02c054de5250b3ba2483ea950,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8,Tests_passed,20451216bd68f29c40879ae1801be38ac4ce853b794faddb203283de0aacdfb8 44,refs/heads/master,943701dbf3d5ba4988ae60c875a1953163551d5c,9dc0b0f2e7fdf4801c2fe17dcf13c9166678bf26,94f88fa711af225992b09a2675f23e72ec5bc993,,True,True,True,4,17,72,3,True,4,Tests_passed,97bb69bdbbf747bbc838ab188b81bbe248df7ea6086314618cfd7fe0f7a94cbb,True,Tests_passed,a08e29b9cbf86e570ee4b32d98a1d3273094a1fe66dedc6365d0b231c956c3b2,True,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,fd90dbb99c150511371c46bbe8870469622f634c3c4ac71cf59dc038ad31dcec,Tests_failed,a2dd1f8b66687ede9869d6d428d63ed176de8076b11e7af55eb7307314f8ec39,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,fd90dbb99c150511371c46bbe8870469622f634c3c4ac71cf59dc038ad31dcec,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99,Tests_passed,9ad95527ddee212b2425795fcbf77d6af5a5711bd275ef3c433c46d71ab5fb99 diff --git a/results/reaper/merges_tested/jenkinsci/ant-plugin.csv b/results/reaper/merges_tested/jenkinsci/ant-plugin.csv index 63c65f060c..c866e801dc 100644 --- a/results/reaper/merges_tested/jenkinsci/ant-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/ant-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,7025e65f06ee3934db303960a74846cc52440a26,d1c5e13f88ac5ed82c12de0a5c41434c1e55cf42,c57e18f6ac9c01ccce927930aed0221853d38ff6,,True,True,True,3,11,69.0,3,True,3,Tests_passed,48ed5a84e692574544be1c42c8aa8ea51c0c3cb97216a21cd549995e1cd726c2,True,Tests_passed,ba7cde4d005aa3b0fd359698c19ad6cdd147849c304b5c63a20b68e866609461,True,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_failed,58bfd6c2f2a666a0a94bbc1e1c2464d2f94e626663290822ef8f039b5391ef82,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,41c828adbdc8d9055c2710436787d31852280fb954abf86c8c7cef9d1f93eb63,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,f0fa9050b0fa880b9fd29f01dc64bbf52c1766243c86cb63541d06082ab821cd,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5,Tests_passed,713b370bffc7d03b14fd0726178150a723cb794e894cd4db8c69cd776452ecc5 diff --git a/results/reaper/merges_tested/jenkinsci/backend-update-center2.csv b/results/reaper/merges_tested/jenkinsci/backend-update-center2.csv index def07df278..2a4fcb9e89 100644 --- a/results/reaper/merges_tested/jenkinsci/backend-update-center2.csv +++ b/results/reaper/merges_tested/jenkinsci/backend-update-center2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 75,refs/heads/master,ffe5590d446632dfa271013e842badbbb9b47170,3a70a66f43951d8f9dea0b83af1fa00a3ca84a71,a60eb5abdc8146a5003e4f5552625b88203bc1b5,,True,False,True,10,21,66,2,True,10,Tests_passed,e628f54f8738d68760abe1e703ebce7e4ce9ee5195f72a5cd2aa85069f564153,True,Tests_passed,95bd31aa354f9c9c32ee5e93fe625ddffe0333fe2d5a3f8b82fb3a1e39f09336,True,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_failed,cf2130329fde88c942563eb40fd51e68ec63bb86aa93def7bf62a13234d5b247,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,e1fe1799155015f33ae805a6f9815c07f54df466c96a9b332904f6c38898ecbf,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369,Tests_passed,30969907403f01225d97e2886fed7201aa1baaea8b542093d96314575b9e0369 372,refs/heads/master,bd7b6d3e21a3b04ce94806b548ca9df03796a769,e076346d30b18e47aa253096f2c7304c6695e2fe,8dcb6331d7edc90bdc92929ae5590c62831ca285,,True,False,True,3,9,24,2,True,3,Tests_passed,14b07b5ab3ebc85e1eadfbdd91a543bbfd2451803f250980ba3925021a69c028,True,Tests_passed,1837cd7351d871090753b92323d47f9d1b99b01f9e23d2744cb98dec1624ffa6,True,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,59229d49d1b1c57787ee7527b46b6a8dc73f5e8afc139fd4485c196ee67ea6e2,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,59229d49d1b1c57787ee7527b46b6a8dc73f5e8afc139fd4485c196ee67ea6e2,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b,Tests_passed,f45d8a4ffea4f1acf64d1dab0ec3a9af9949aedd66e57e17c2bd8fc92db3484b 393,refs/remotes/origin/pull/355,e2a2e33ea822cf3999e642f26bf9d1b17be958de,52ae29180ec5a12f2a2b136b35e6c2c6d13c4e2d,ce0b447d038aaaee7b95ec5eabb7f0f459aa5dee,,True,True,True,12,36,2691,3,True,12,Tests_passed,a124a3cf68b6e68155be8d6e46eb68b8da299835ad76c51b214ea516159ad6e3,True,Tests_passed,fa5ebb6edabd5daa90348d78e32f6ad2c1fe2197c433312e09acec216de75b6e,True,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,b8d4e4e46d3ecb3c25257237e9c63dc92279f9d236186b6e03c703fd12b42802,Merge_failed,a8331a3e2144b644a86f8b505b8bfc250e9617436d6f47a47fd31d4f5e5224f3,Merge_failed,33bef421ade57297098649019310b3191a12a3d6422d32b375803a508daefe16,Tests_failed,2fa721da4f1a3e27a643537ce6cf9cdd87d9e7e69d797db2d99867fcedc0d8ee,Merge_failed,a8331a3e2144b644a86f8b505b8bfc250e9617436d6f47a47fd31d4f5e5224f3,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,e94bdb86ded4cc05f0ac7715fe404676e157acde3a0901dc85745c93ff72b1a4,Merge_failed,8bc986fcbc5b00eb9af873a3ca19c9f4ca16eba88a740db97d449086da89bfe0,Merge_failed,33bef421ade57297098649019310b3191a12a3d6422d32b375803a508daefe16,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1,Merge_failed,73e823dc27ea67d56e33208b0ed86e5228e68fa77bf510a52f3275f642427fa1 diff --git a/results/reaper/merges_tested/jenkinsci/bitbucket-plugin.csv b/results/reaper/merges_tested/jenkinsci/bitbucket-plugin.csv index 0094e29892..22e626ca1f 100644 --- a/results/reaper/merges_tested/jenkinsci/bitbucket-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/bitbucket-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,da518043f34583234ad250c82869d287b33ee483,b368656b472799b0ffb5f0617797040fa6335ad6,d29d40216fc8a16d2b79c9a4c9f3d8b5b3a37343,,True,True,Tests_passed,cbbed6c64cabad96cf0dfed829bdad8b969a6932d2f2fe0adfa87d6fdb46b0a7,True,8,20,104,2,True,Tests_passed,603d9bb311f51fd03cd49eddc4079769304681fae442acffcf6dd24675402893,True,8,True,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,c3b286de6a5fc0aa3838b0ab1632e7fd02dd5acbd274eba177d17897c675c752,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e,Tests_passed,a315b0ad31745d82ea41acd409590f71d0967cecc4eaee392b4f4e6f2544ff2e diff --git a/results/reaper/merges_tested/jenkinsci/build-timeout-plugin.csv b/results/reaper/merges_tested/jenkinsci/build-timeout-plugin.csv index d851104849..5ec1c04315 100644 --- a/results/reaper/merges_tested/jenkinsci/build-timeout-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/build-timeout-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,00d3a7bbff50feb5bc56db4ea1160b58dcb39af0,c3361f79b73d6b3366bc66f9882a05792402f3c5,2633bd942947f365384d093a848750fcf973a860,,True,True,Tests_passed,7a087ff73e4bd078425f5aa63d3631ee4dc43c58c2f9ce8d81557506044c8643,True,12,49,164.0,3,True,Tests_passed,ef5f065bb77b54df5889b2c0fd419494db8c57c744a02a6884c3f55d5fcc5c8d,True,12,True,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Merge_timedout,,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,33e4c2cf7dcd995a6c97538b104413466c3000768aae95d82c29b1450b0ff473,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33,Tests_passed,118f61992d77b72e82e9162982aa67972cf16520cd5a45b48e43cd231c88bb33 24,refs/heads/master,d51178be1cd90cf9173edd1705a7bf0dc75ab16d,c3fa7ef50c3724eba371ad179782c43631ee0626,068600c260f97abc7e4cfde959dbaba889711ad2,,True,,Tests_passed,88788e49f20f9d8b7c1095cfa56964912c4720856dff7686da859ed9a0d90554,True,46,208,,9,True,Tests_passed,967801baf73c9ca89062858b0c1545f899bac0a413184c49ed7a47377940ef0c,True,46,True,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,5aa8c5a233125aef46eae0d6f3e5fd22297897404174977a9059de4a55e6a60d,Tests_failed,2bdd3c477f48ca3c02df78ab384739276293e2855fa775f8adbf09f69a274f13,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,5aa8c5a233125aef46eae0d6f3e5fd22297897404174977a9059de4a55e6a60d,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,bd840e4583edaa31192972922ceecd33155bd22668ed8d0eba3b3eb002e74a79,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1,Tests_passed,3ea405ecd4702bf0e67a34775f21bfd03dc86aa3079201e8b5011eb42a41a9f1 87,refs/remotes/origin/pull/83,daeab4a1ee26e434bcc2358529b78b852819068b,6cfaaf002fd87f994de9e1b8a0e9e9e03848e209,00987e30a260e5e7028c0e1dde986578daf4cc10,,True,,Tests_passed,201490f737e12c6d21673801f80aff48b24aeab0b35932d1a0cfe59ea147f2c2,True,86,411,,5,True,Tests_passed,e22de3d42df99b660955e16dc7991af623467a711c33857e473729ec78b24b90,True,86,True,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30bd398b4a11797ab4f6ed039a23613c3ee66f9cb301605269fb8b13ce4e7b88,Merge_failed,a5eb13eb6e64f5b2efbaabac6365f18c2157bfc8fd2fa4c5d11d6ee384e87900,Tests_failed,be2dde5bfa05919f0f20c9f3f71a39a0e66ee00ccb3b9657e094d7eb61c0d541,Merge_timedout,,Merge_failed,a5eb13eb6e64f5b2efbaabac6365f18c2157bfc8fd2fa4c5d11d6ee384e87900,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,781476756e05a96a8b93331106903cd48405eb811d0cd5dc72f282df3dbb54ae,Tests_failed,be2dde5bfa05919f0f20c9f3f71a39a0e66ee00ccb3b9657e094d7eb61c0d541,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,30e40679d7b4491390153541aa1e39066f218def07223be7002a9d79c7904c44,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91,Merge_failed,804feee73b1bff24666672e26dc8495657d8ba84897769a52d53d74a48708c91 diff --git a/results/reaper/merges_tested/jenkinsci/configurationslicing-plugin.csv b/results/reaper/merges_tested/jenkinsci/configurationslicing-plugin.csv index 9d8fbcae31..aba9602d19 100644 --- a/results/reaper/merges_tested/jenkinsci/configurationslicing-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/configurationslicing-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/master,3aa14abb5005dfa0c3ae3ff2c370cd85d07b2865,03f9ecac2f383c6bd34b1bdf010914022a4f04ad,8cc81869e343ce10b3ffb7934f0b64c14cbce250,,True,True,True,36,131,1270,3,True,36,Tests_passed,95c52fb85da951e02d7ba6d265f3a9b6a4ba294ee5e411cd53241c281e04c482,True,Tests_passed,8eb1c8f598258ad06f9b663b77f9c2a02f128979b6171f0787ff4e6ad3687f64,True,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,7216f8379860a8637106583a601d90a5e92fab69c174fe025a468efb46f4a26c,Merge_failed,9536dccf384340072333b482c278f40da425283562e2260a1da8940d09e1e687,Merge_failed,c6b5f2ce291a70f0395fa5d62055b883a3934fc686caeeab810878c09bbbce7c,Merge_timedout,,Merge_failed,9536dccf384340072333b482c278f40da425283562e2260a1da8940d09e1e687,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,96fe85fd4ee38e25055ba7c02f1ec85017e51c34caf040ccd0cb60e817b55460,Merge_failed,ed79b2a2d4eda2ee7d2e39792ac1af848a390be89d8de2d6b8faab81c526a1a9,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,e66f4765d4624404fb45629d95a06f5a5bfb32a0c4702b42c51738fb12fa1d9b,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5,Merge_failed,c86ad45a233388931e08de21bddf41801d18a1fa8915aae67d8e48f87a502df5 66,refs/heads/master,55269af42ba6e2edd3b17cf20eabc76143d56208,b98750751ff6160add3a0a782bead42d06e3568f,2efc7be3a9ab350b884e202fe16e03166de7a126,,True,True,True,5,8,114,2,True,5,Tests_passed,01f79cca4b838b33ee97b13e7a3e78b1c21b493c4015fa7b57ec659ea42e7c45,True,Tests_passed,27411121b15b3b572ee8c41ced45c5a339934b820495741ea019085c58bedca7,True,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,31af740fc7a7ea1e44452c877d661a671f93ff37e86e6360caad338f2470a205,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,80202629c7e480c8ded2e19a3a7969bc8ba01173926d0bc45595d8c94cea833d,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f,Tests_passed,b51741db3c3e96bd80c58f981d1e95d10d1e60ced5624c4b0b1f754ceb48908f diff --git a/results/reaper/merges_tested/jenkinsci/copyartifact-plugin.csv b/results/reaper/merges_tested/jenkinsci/copyartifact-plugin.csv index ce7d601ecf..241c11fc33 100644 --- a/results/reaper/merges_tested/jenkinsci/copyartifact-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/copyartifact-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 124,refs/remotes/origin/pull/125,956cedccfa4eac549c80b15c1b4a7369618a4d39,7c5e9c0d73c1db329c9990f868f25f0637cfc862,9f6cf7bab6c7017ca16e9349d3cf754de4bc619c,,True,True,True,6,19,128,2,True,6,Tests_passed,9ee0084b5790365504f2c0a9dfe0e12e1cb5e3ec48f70ac23f0bfabeb230fb42,True,Tests_passed,76848720ec24edfa57ce4cf4efb47c4303b7d93f68279238d260d20b09bff186,True,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,151d651cf8e8730ef818d41eacb050bde94654cca15b8835f0df795b143bf84a,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Tests_failed,ff213464c2e0712a41f939541d450661ea00109ebeddcc27888515910f4d7662,Merge_failed,e32964efbe4b01d20fe3ee227a0f50f99d878505d1f992a17ae70643d7743ead,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,12eca70cefa93fd8a3883a5e0407a515de4884ed9e41bc5d4e549196d1aa4308,Tests_passed,17ba82f7032f556f96d8493530420288cb812891be35696c7bb518b960ba934e,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942,Merge_failed,db040722a67450234ca1ca25f41b7d67b1f28b018b4e913f971309bc95a6f942 diff --git a/results/reaper/merges_tested/jenkinsci/coverity-plugin.csv b/results/reaper/merges_tested/jenkinsci/coverity-plugin.csv index f382bb48d0..e836e6d9ef 100644 --- a/results/reaper/merges_tested/jenkinsci/coverity-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/coverity-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,0589289d51b2d32417078669ccdc472714a4decf,eeebd2a6e7c4914cf89110d933b5cbd7d55bbf83,560729c237ad3f846ecde1cdd9b25a4909921bc1,,True,True,True,3,15,86,2,True,3,Tests_passed,0b3ec02a6c586458685acb0e16a37721ab064faf645c0d79d8462b4a67cac895,True,Tests_passed,4779ffce89c3399588112cccfb529cc1878f6d42f40ab21e285e5cd6692bad79,True,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,70e2a844efb176835066f8b902be6a86690377d3fe4bfd75835f50ca294969e1,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,70e2a844efb176835066f8b902be6a86690377d3fe4bfd75835f50ca294969e1,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,1ad712b21cb72a3b05eacbea07ef669dc54dfa1a49a4a4470f818abfd2debcae,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7,Tests_passed,81a6f343b9e0adfe2eafb858bc538ca4ff9dfae7616f0aebb8752916561180c7 16,refs/heads/master,b5a1cda2570db077e62dcb721e9eb76d1581c3f0,93e9504821767ce10cfb2852f4dc611f89f568a1,31b19cfbb155accc5303d5a34299af611a439e78,,True,True,True,18,68,767,4,True,18,Tests_passed,a354f8118a476a3060950f6002c9b57dd577e8eed02d5a4dc81d242e77b3a9e5,True,Tests_passed,3ede2f33895d1ea9c4604f0c66f16247669bbd8cb2b2452ce55a2c41de57c248,True,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,267d9ee6638bd4c6196f79d49ca8eae358c571f7e96be3b913c0e8c49f41f0e2,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,267d9ee6638bd4c6196f79d49ca8eae358c571f7e96be3b913c0e8c49f41f0e2,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,b8d922e0197ed1d3a773feb97a537322891d93a03a262ca602b2379688230989,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c,Tests_passed,26ac39780dd5e6bf5594ef4f3b5e948a47799b44508b6f4b010a9553353f962c 37,refs/heads/master,e55009e07305c5de8c3ec77b1446e8b81dec433a,60c56b8aa766a8b463e4abf21431655cf2ae1d85,8c5fe23555a4299d66d0dac3edb5fb5aaf483ce5,,True,True,True,181,318,883,3,True,181,Tests_passed,60a621e49b1edee882dd076af815244b734d8e36cfa8709940ba6f528bc97f67,True,Tests_passed,30c279441251b78cfad77931bb0cf5c18fbe96b31ac15e8bf41dae2c3ec9625c,True,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,65d0e3a132a6cedc084bd87f38b74e0fdc3390bcce9be2b92c5d60b640e9bc87,Tests_failed,6f6bbd0131da5f7c563f9fc0cd4f87dc02898e504aa19cda1a329af2d541462b,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,65d0e3a132a6cedc084bd87f38b74e0fdc3390bcce9be2b92c5d60b640e9bc87,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,6e6bab490ba148ab704b8d387456d58281f48710a00c0488e99a3d6573360538,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d,Tests_passed,fec1508d89e1990d9dee7adaf09910deacf30eff6658b5f843b3e3b34411d79d diff --git a/results/reaper/merges_tested/jenkinsci/credentials-plugin.csv b/results/reaper/merges_tested/jenkinsci/credentials-plugin.csv index f198fff823..512528bc43 100644 --- a/results/reaper/merges_tested/jenkinsci/credentials-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/credentials-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,ccd45a5263d0b9ffb20a66965a9124e15e2b8e03,d71602e7cc03a96bf876171da18a19d8dcb7efb9,ff276f7134736281d49e9ae9a8bad6b7d2a59587,,True,True,Tests_passed,487b7c31de55091409cca54f2edc43b5438e657ba0515be6bfd392245af7675e,True,10.0,29,223.0,2,True,Tests_passed,020414aa0adb6906f0cd225f64596900921863e6f11f42e7e00aad1c85f5c630,True,10,True,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,7f0cb8ce1c0dbf43ad3c07888cc080b653797724555886d06dbb76cd675ae2a8,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Tests_failed,d7b05d4cd3301b133e546fd831315495c61285dd8fcb56abcb1153f74a6e1303,Merge_failed,68342bd7f877cc6399083977758ff81ee9a96f69409d572b485b50e3b681cd4f,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,bfc9eba2abb4b6d216353cf2c786d167b02b39f4d852b1259d99b0cf053c99c1,Tests_passed,a36a1663abe6dc998f252321a3a0833a62c0a32757d40c2832bd662a6d2d89e1,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49,Merge_failed,43c4b7b3821105e18fc4716621e14e4993f67ccdde26e5ee714ad65b4818ec49 23,refs/heads/master,5994ccc36b5d4cb577ec65d45dd9c5e8dba4a72a,e4f1b0ae217bae7bd79c157253a6c95f43e0dcea,059a6092fcf5e38d5dcc17577221376801e4575c,,True,True,Tests_passed,d2b6a94bd4ba7d0f890cb47ef14b8ca4d81a45fc3014792c16e4ed3e4237cc53,True,57.0,89,489.0,3,True,Tests_passed,4c9cc4a18ac4cc2cd80f52ea04c9c5ddf150d0ac694f656a50e0fde82544b527,True,57,True,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,84746a9801cbdb5c0d9c9f9090be6202ba14cd3fee3b44977efc27380491f745,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,84746a9801cbdb5c0d9c9f9090be6202ba14cd3fee3b44977efc27380491f745,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced,Tests_passed,2a18969a4959865ec26067acb759771dfe341ae8d8ed7021f3947e01cbf3cced 81,refs/heads/master,b4e24ac78b811901d635b7c382cdcf50562a63d5,745bb467b714821065bbdd448c4384af6dc03fbf,b1ac9f7c3a9c11409c3a4736cf430b82f861d9ee,,True,True,Tests_passed,893590bb5c2a0283989d9e08231ee1bd505574c43984a601f78aef55a4f212fd,True,39.0,90,1694.0,3,True,Tests_passed,aefac92437e3379c1cf105122922df7f6685a268aa9db8ce9350d5a7d8ddf100,True,39,True,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,beea233fed30464503c2d269c3b137bfbda8c315e9fd687787478e5f2ac95794,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,beea233fed30464503c2d269c3b137bfbda8c315e9fd687787478e5f2ac95794,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b,Tests_passed,3b8c8b3d2d6df9148f13bc21f1d2e8b0606d2c256496dcc3a6b38200ddebf57b diff --git a/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv b/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv index 549ee1ff7c..6c34a2098f 100644 --- a/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/deploy-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c58791723cc93e49d7430e51478ccd3d5fab8637,1d8fa627276dc4c63522d2f60c391c84211bd56a,71a4889710cfa96ee4ed356a696dbdb8a0d66615,,True,True,Tests_passed,a39565f84f2a26d90542eb2e3307687bee2c087103959451775aad51bc28a3a9,True,7,17,125,3,True,Tests_passed,536c26a1583c10b4025b47c8100288487b96bd9627c59801d5ff3dd254d2bfa7,True,7,True,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,1c54b3e59e72297131cc947f9783814f7ba61cde2db09d3b3e692aa6c21cc891,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,e2b41d2fd42a72d2b26d94a4a316239554cfc5ca32a5327e04d1f86e0deb346d,Merge_failed,16007b8a750cc48a8c6f6f8917f126c41c62a66b97f2e882a9e09b83f2fed157,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,6fae7fa785cdf985868217984567746130525b59ba61434bf2cd60f35759c731,Tests_passed,5e1dd219c8e451cc8a29f9db04d7d8e95f421c765c38e696754e3b6221c0472b,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038,Merge_failed,11af702a1b6d5ff24b116fadbc045d837707cbcbd2aa29ad6fcb82256916e038 23,refs/remotes/origin/pull/25,429e7a00021ce25331dcda7ad7a127ea6a37aab8,ed7fec8d21dfc4fc18ebf15c01f6ede4746661eb,22bca94bf94c3ccd7afb906be976530872ad4e7f,,True,True,Tests_passed,fbad75209a3cdb595bf37ff835968da8babfc4e79e433e5a4d1759299485314f,True,28,103,571,15,True,Tests_passed,2b8c7703d2d72894029b50c5ec154473313ca770c517f7875910e7084b28d1a5,True,34,True,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,766113523606078212e8c9bfa18cc99f2ae044b72061cc7144332f649408622c,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,08922d2559362de1439cc706db45503d91309b0962d6717c460dd1581e6ffcce,Merge_failed,397861d274a0211430cf072022bbbcbc9eb9dee5d9ea9af0efa78b0fb45fb0e0,Merge_failed,7849690664197b400d30a821ff99ff5a44cb158d0d1ee33bb50c73b35203129d,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,fd310d7dd2da56fb2142a587a0aec1f97985c39d92aa11bfd5feafef85b26abb,Merge_failed,8039bde4b63c8f50a419eada684945f9b568350c3bee1f0122c23c3229a63ddb,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,5b5a1c61f41a4eb661514a11752432f44c2a162ba5a9208c0e2849fd1da3e6bc,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319,Merge_failed,1ba6d35f5d5354066fe7d38c0052a8f07ee52fe9009f2773a156f02ceae9c319 diff --git a/results/reaper/merges_tested/jenkinsci/disk-usage-plugin.csv b/results/reaper/merges_tested/jenkinsci/disk-usage-plugin.csv index c0fc7f96f8..3a640a0ff5 100644 --- a/results/reaper/merges_tested/jenkinsci/disk-usage-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/disk-usage-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,2093c61a2874370fa8b0fe47c41450021a49060f,b0181ac70a186c074331f07ee2f12cb0afde2ed4,2ede1e8ec185d8255744fa996c84ada571323ddc,,True,True,True,10,27,91,2,True,10,Tests_passed,1174aedc3e0c7289445a2bced94bf55ee46e55f49492be8d8fedb2c8cb13daa3,True,Tests_passed,50f44b38fa41911677ac1b1cb9561c31d8219043fc732b5d098f953186363741,True,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,95a8f0a8f2835f66799da197f4b5632b317fb67536ba3ce217c0a2029b8ee56f,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,95a8f0a8f2835f66799da197f4b5632b317fb67536ba3ce217c0a2029b8ee56f,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072,Tests_passed,d01c933f72dc7e40cfcd1428ec5448b51ea55922ca695f8e0c25d4bdc0a38072 34,refs/heads/master,f527c92357bed2cfa432c19b1673edd642ea49ad,43277872e6203cd15347adc35edc566d7df9de93,0dc146859f808c46831250519fe00eadf238e58d,,True,True,True,27,84,252,5,True,27,Tests_passed,e2a5e580e4e9c822bc6b0506a2849a5d08946b1de35523a81890db7c4af995c5,True,Tests_passed,de22ffec737eed49b98f57465f6c67e6954803c285ad0234b4b1a9c9ed991aa0,True,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_failed,7f3cbd6310fe9988343fba379b69435c728cc6714cc7db21c02ba2f46103236a,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,e9289e94a0b970e98919e0f365a9eeb22cefd1001a7243676b994d571e25356d,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df,Tests_passed,613a0770b07b6f495b02eb982f49546a54f55d608028aa51f78ffe2eadb799df diff --git a/results/reaper/merges_tested/jenkinsci/docker-build-publish-plugin.csv b/results/reaper/merges_tested/jenkinsci/docker-build-publish-plugin.csv index 79882eb159..e3fbc9b2ac 100644 --- a/results/reaper/merges_tested/jenkinsci/docker-build-publish-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/docker-build-publish-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,9d4eb2caee75e0914e50d611c33ed709d11e2923,18b13198466216b6ad9ac577f1f3ef78e233452e,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,,True,False,Tests_passed,062155a0025a6c794e457b5a17c520169db88438833b440027576ffc77eb9914,True,12,34,158,2,True,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,True,12,True,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,84fce89593352526c11922774817b60aab5d15cc545bb7f36be7ccb30d727c55,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a,Tests_passed,b5d32fd15dce551145709a24777f38329a658c8417803f2715f194995689792a 13,refs/heads/master,792ae4e63845b99b8b1d121b81a5d5a5e8558be3,7835651b39ed5314ba81876bcca56ccbe3a54e4b,b476c9b21cc83f74a82be0a38a5a8c7027d029b8,,True,False,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,True,2,7,16,2,True,Tests_passed,5666db336d92e799610b6b542fbe09fa0ff854f7012ce2e2bd4e9ea07761c229,True,2,True,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,0fe199dc785ffe734c0bb2b3f877857f7bb6e60675d676c4b4bed2bbe3cdea5b,Tests_failed,763eb96f71eff2f29e3ed109943848e7112a5df88f2ddb16c357db95680439d5,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,0fe199dc785ffe734c0bb2b3f877857f7bb6e60675d676c4b4bed2bbe3cdea5b,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1,Tests_passed,24053664700b3f360bfdbcc4409a51a1909f605806378b7b1ec324990be781a1 50,refs/remotes/origin/pull/117,59faa9673cf41b1fda25361ac3a32fc7d64af5ba,a61e140eb90a352621f16abc3ba490160c94ad20,666a9d65a5b49c1a5d727e558dc67a6e24cec7a0,,True,True,Tests_passed,d6309e25fb1f703ada71a4870c53cf76cf19a8998ead09db2ff956f53d1aea2b,True,13,40,185,3,True,Tests_passed,dac67b85609d39986e4c378907970fb8e4f566712aecc822d499295792a0ced2,True,13,True,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,21533765d3390751e27d5bdaa545fe28cd2b970445d2a61bdb8806032d268faf,Tests_failed,1a645376edfa7a53422a6250caf660c60a28f033ecda5a4eb19aedc72ae7d0af,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,21533765d3390751e27d5bdaa545fe28cd2b970445d2a61bdb8806032d268faf,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,5cc78f08c6318530139af7ea616b8ce1578eddb99f0b2785bbba3d153f219ffd,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6,Tests_failed,8c441ff9469c297c4e0b0157237875dc5423d4d614e1d40ca21f0d53369632e6 diff --git a/results/reaper/merges_tested/jenkinsci/email-ext-plugin.csv b/results/reaper/merges_tested/jenkinsci/email-ext-plugin.csv index c145c54a11..1164d5374b 100644 --- a/results/reaper/merges_tested/jenkinsci/email-ext-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/email-ext-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 45,refs/heads/master,f995fa0ecca2296eff1dbfe2efa60948179daec3,18191e987eadf2c56a95f927ca2136acb93d8450,d0cb6f5249000db8233538c7f94d0238824ab5c0,,True,True,True,19,107,3480,2,True,19,Tests_passed,a1295c024fa4022e9015cd9ad4036b82805ec9b0e70d0ce632febb000acdf47e,True,Tests_passed,9a60875e4edc770f2b5418a283f6a4958d747dc740caa08b2d725939689776dc,True,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,9f53586338772150b0ff35fea1098d2529bc732a98c5671492d272a59c5312de,Tests_failed,76523a0ebbb9e972e2eb22a145754b9d1f2c1d7ac289a982bd3de6693b7514c0,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,9f53586338772150b0ff35fea1098d2529bc732a98c5671492d272a59c5312de,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,b51c0044f8b4015536c35c1d429c30a481c8fd6b1659e03a53826ccaa6f92020,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129,Tests_passed,d49aa3ee3ca766ff7bb091dc2ea5d66b00afa881c99cdee8f2479fc3c78e9129 51,refs/heads/master,bbf162f5d50c3d37e3ee8940a0f13d3a4ce4ff59,312def504a573f3d4e5a80fe39fccff9e4a7a485,3fc56050feee5e84d074b7bfe11c15e22a15fd0b,,True,True,True,21,145,1700,4,True,21,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,True,Tests_passed,f35690ebea5ced8492cf7847eba831c71b721e898f3c7720d1664480528a8d5e,True,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,b1abf47a9ef7821afc644a69c839101fba92f78a1240ae3e06d0eb3fd69c01f2,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,3b1ed1a4f9029416cc3268d04d89d2e3a30c54935a38567d57d1e9b95a3ef03a,Merge_failed,6a2b2a689e02ae16b869f82257b8d08997e0287f7396a2a0188d3edb5b04c0f3,Merge_failed,cebb61adb5e33e5d34219a8faaf3895b647f2d8f13ad0bbf1897b36b717003c4,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,5d22edbe9f7b989116324a9cc642c9c1e81955fd984b37e496dd332d14be2c57,Merge_failed,a91409e53ece24a84c7081360108367301adddb1e023006acc15b194522ebce1,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Tests_failed,17e3419f29be86e7d1a9332001d769d953d658bd8a6ad494b9b68862f3e7dff2,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef,Merge_failed,ef4a3eb39dbe37e3dbca4f35e97aef7f50fe28d4eb989e2542eccedabdf78bef 52,refs/heads/master,312def504a573f3d4e5a80fe39fccff9e4a7a485,6630e7b8c527b6b103efde1b55c44e2d65947e30,dd8b9f7bed97a0413ec71bb1212579f6b1224005,,True,True,True,3,6,41,2,True,3,Tests_passed,8b0a1f236392c1b277e4cebf597b2e38390e9d87e8d697276015ab842119d8fb,True,Tests_passed,92a59fa383701a82d048cd35e66cc652caf4cfb68676bccbdbef7efa5851dccb,True,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,e38716ca8b6ef9e16597f99a52f97c6580bf2cdb9ef4591ee18b4a12d3c22ea4,Tests_failed,3c1b967d871993d3ab23f73bd808b9a4b49e08029c118336f2b136670ff180e1,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,e38716ca8b6ef9e16597f99a52f97c6580bf2cdb9ef4591ee18b4a12d3c22ea4,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,f231d8059adb011700781a74acd1784859dbedfcf67183f73061faacd28c6a25,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588,Tests_passed,65dcbbca197c11cbbadc9bce5ea996e68f17ace50b152e0f9604ba8fa84cd588 diff --git a/results/reaper/merges_tested/jenkinsci/embeddable-build-status-plugin.csv b/results/reaper/merges_tested/jenkinsci/embeddable-build-status-plugin.csv index dea8134fcb..69c22fa4fa 100644 --- a/results/reaper/merges_tested/jenkinsci/embeddable-build-status-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/embeddable-build-status-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,606e4e382c71ccbb434642b94e3f766f0b6d4a9c,63aec092e7e76076a143d46d5dc6ca14f084a2ad,fb9b573e63c4d5cb5de20f3acfecfdc6d4c20a87,,True,True,Tests_passed,e5454b620f979f96485bed73879b909ab44359eea1f83d422605a37bce43f2df,True,17,29,315,6,True,Tests_passed,4188e47091ab83c5cad72cb3b12f0a3ecd38cec22b428c41069d3e1d577955d5,True,18,True,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,078d8aa846bb337d905ed2e39021307c79c368d16d6fbafbd7ec822b814ac870,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,525898d72132d67926d2052505af8f2ddd4043667a395ffa569aced4ffa60d74,Merge_failed,2943a2817221de0bed9e6506a5e71ad1f6c6fd06828e67ddc914b7242134541e,Merge_failed,012eec7cf27bc8e6d9393384b319745d95aad9356d43b88c2d203e9354b580d7,Merge_failed,292e4cf33bd53c0218769dc51e8f79ca922eaf2a1d34f0ebf196700db2ab9fc7,Merge_failed,2943a2817221de0bed9e6506a5e71ad1f6c6fd06828e67ddc914b7242134541e,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,078d8aa846bb337d905ed2e39021307c79c368d16d6fbafbd7ec822b814ac870,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,a53a204ff6b7ed07a04fd42dc2c2754f22ebd314285d7751abe9bd51df18128b,Merge_failed,df66fa27a406955585e1a714e77b48fb5b7f0760bbe4f4c417fb3eff2b7641bf,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b,Merge_failed,35733cf04c9b644ebd3b2ab17988f97e575dfede89538a793ae4ce69dbdf1c3b 74,refs/remotes/origin/pull/248,83edeb11f30652257c65d2df6292d608f8dabb1c,a26365da217d87b98b5c0cb01fdb16ae3e72a07e,b1e6224d7c9b0d2a4e61ea296f5ef975272e72cd,,True,True,Tests_passed,26ce1c1c330d68fd456c97d1d33391a1c0c0b6494e9843a16049eba523bdd4c0,True,14,26,387,3,True,Tests_passed,221f3d1e87f2d50f76f4c89a310e8f8594f91af1f6b26f939a57c6f5220d0c2a,True,15,True,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,e0e8d99415622abc47a1e5e69151562867d98d6ae15daf5c3d91c0ca74914e7b,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,1d9bceb00342f316c6ea1d8059a0b81b0a68d03a991113f9cdce7f356dd4ef43,Merge_failed,bbcaa308a7561becc90bfc389baa74ac21fb659d79a61a13a84dec8c36bd835a,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,3eafec2b18933b2c3a89903cba1515536f2f8023be50bfafb4bec18853874478,Merge_failed,b479bbc4679f2bdad47c871cd5b289deb23775485e900f83709133f62c8daa45,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef,Merge_failed,78dd7f45abb7e84e8a1f10e6821b7f7adb1ce57c656021bb71b1d7edb8dbb2ef diff --git a/results/reaper/merges_tested/jenkinsci/google-oauth-plugin.csv b/results/reaper/merges_tested/jenkinsci/google-oauth-plugin.csv index 8e314aaea6..c2523f3604 100644 --- a/results/reaper/merges_tested/jenkinsci/google-oauth-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/google-oauth-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,b2e845aefc227841fc8f34828ed2be13e0704bdc,7c3bdc7dd3fbfbb5638e5fba83a54f35b0ef59b9,b4e7f9568072518943e97b8a12d2d0b1bfa3f626,,True,True,True,12,83,399,2,True,12,Tests_passed,86e9c3194594bd588fa99235b49a7a3a2ea291215a09c3857a45758948759d16,True,Tests_passed,53592a8a0d271b5a66e4a66cfe8a209b16c4f19c074413c1639edeb43cd837c8,True,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_failed,5a607b1562ecc5beab8b0e384e2ff7112602f9187a2394eb5cd5749ca9d4f9a0,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_failed,5a607b1562ecc5beab8b0e384e2ff7112602f9187a2394eb5cd5749ca9d4f9a0,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d,Tests_passed,094b67b7173bef7c817874a5ca2cfeb2a7ff38b7e98c19805504051f3fee410d 9,refs/heads/develop,94f08c7c32d576d99ddd3e215b67653fc99eaeca,b5ac60d0f624ffc26d9c4ac499219fccddb01520,f28bfdf65c3d9df5ecb00be60c44a38fa1c0a153,,True,True,True,10,55,158,10,True,11,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,True,Tests_passed,3ade099905f25d2168a71c56597f7df29b3b04a066fa144b1f4cf018265d088f,True,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_failed,5b2b2ef97c4658ce866b20b64cf8f1c4539fb8b2205053d7051d6bb96ce5fd03,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866,Tests_passed,b51344463abfccc02fe6b3c0d61a7f0b9c76e3df410835b1b4907ca8e5b91866 diff --git a/results/reaper/merges_tested/jenkinsci/instant-messaging-plugin.csv b/results/reaper/merges_tested/jenkinsci/instant-messaging-plugin.csv index 84fe5c00b7..55b6049dae 100644 --- a/results/reaper/merges_tested/jenkinsci/instant-messaging-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/instant-messaging-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 111,refs/heads/master,4110663ba811f5ac1d99f3997dbd5513dcbe784d,a88f487a4e2095c2d2c55980c38e158217b3ec5b,5315aafdbe128c07fd15c4493cd6a275ac140119,,True,True,True,11,27,190,2,True,11,Tests_passed,7ac61f26f56e9a0dc0dd0701f8970d65d7255480da7aad88251b00714286f2d3,True,Tests_passed,64f9ca7519c2846d5e3acd4a3f7174e0bfe4ddc1d5024974fc02938a8a0d2bb6,True,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,b5114a78fdc29422efd8721b85b82277ba08009a82031e6bdd6f63e16b02c892,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833,Tests_passed,f5cce2be58576e5646643bbb67d7e96fb8c091a0b605ba0445116d034a4ac833 diff --git a/results/reaper/merges_tested/jenkinsci/jira-plugin.csv b/results/reaper/merges_tested/jenkinsci/jira-plugin.csv index c8ff8376ff..20bd77b32b 100644 --- a/results/reaper/merges_tested/jenkinsci/jira-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/jira-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/heads/master,09485920f4a79937bd261b623b9fc4afa14d2dd6,b06c175aa4d8928c881d90be65c6b81ab92266fb,639d44bf810a9f096ada141df5f265cc79c3087b,,True,True,True,40,180,1188.0,2,True,40,Tests_passed,b1b8166e77f0e0cd2894881c301e9735787f600f75e42228b0f7a0baa3a8085f,True,Tests_passed,fd6a2a71cb9d093a3767b1352620ee800d8b8eb96e61b77d903e096cadcd3c6a,True,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,1a0249bead2832f1277789d4bb5e07060cef6ea94607e68fdaef385fe08a6833,Tests_failed,4e606964c9184d082b012cde42b3f5672d5d441fb1be8411e347a3b12577a5d3,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,1a0249bead2832f1277789d4bb5e07060cef6ea94607e68fdaef385fe08a6833,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301,Tests_passed,9d56c138af70fa614751926e5653d88c71da0aab07988eee726d62df07a8b301 162,refs/heads/master,6ad78581c99587e433715daa56d29b61201e5590,dee906a5f334519d178023f61cdb659473830721,cb12c4d50da9a33540830c117b398589f85d6239,,True,True,True,35,154,831.0,3,True,35,Tests_passed,5e51adb79fc8acb192b330dc2df954de3b3711e44b60fe08f71b634545c6149a,True,Tests_passed,e6d3a99d1509ae354d0d0abfcae9e6207b569d26f96aa38e96d01b01fad04bd8,True,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,e0cfebd1a2f31c2f48e170cb2b13f9e4e1b5e16b1ccae54b5216cd6eb7c1e1b8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_passed,6aed63e34edee6b5319073e60e7300a1e9022e512acb9d44f007ffcab21acaf9,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8,Tests_failed,2baf39d47f4a5765d024c1d7671e6889dfc3903eb5a63d2f1601c47f8a609ec8 165,refs/heads/master,0eec353cb535b0cdc844b5c74c443e17cf76875d,a7265287929bd84489f9bbdbba3a50d658830f36,99f68c29420cf21eeb6fcc7db996f5f7424d27ca,,True,True,True,13,44,419.0,2,True,13,Tests_passed,b04a59b076d8d8c50a33b3c22d875cbb2e121b0ba220af2438d616f5deaf4c03,True,Tests_passed,ee7f540639439cf455390f73e89840e852918748af0038963bc00f7574f88490,True,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_passed,10153a199f7ee19a89a53b9161262a02a672004289fad6ba4061d958e1f4a7b4,Tests_failed,535716c25ae56c7efaeee5f7ad6a02588d3296274007392b23798234b3c3b0dc,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_passed,10153a199f7ee19a89a53b9161262a02a672004289fad6ba4061d958e1f4a7b4,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851,Tests_failed,1062a7c7ec445defc9c6e296b452547a1bf2f987390067925ca8e85c54d7b851 diff --git a/results/reaper/merges_tested/jenkinsci/jobconfighistory-plugin.csv b/results/reaper/merges_tested/jenkinsci/jobconfighistory-plugin.csv index f2e3f29d9d..5eb8061a43 100644 --- a/results/reaper/merges_tested/jenkinsci/jobconfighistory-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/jobconfighistory-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 120,refs/remotes/origin/pull/79,7feab60b0e47b5866e16881a0e5c86e100fc54eb,fc25ab3f98aedadb6062db1035f66aa3d2b82c03,59e266729e67209ab31606ce161ad4e46bd0159d,,True,True,True,25,129,1307.0,3,True,25,Tests_passed,adaaa463bf65ff8412311a92c532464b3ce547cf70db04eece7153d91b1c4512,True,Tests_passed,fbe0375142d9ecf36171a214f10bbd015f52970d0de84edfe357e6aba091526b,True,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,7a1a9f66b22e0001e5c7a1bd0518b7697f44a82204a70652981b5747f5f1e18b,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,d33cd7f15e5fd927ec3c45d1b70e33703ff381e6d42b7981bc512f679a2cea56,Merge_failed,bb624383a823421a5277e6cbc576caba43276ca143fb93b4b92f12ba02f6e0b2,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,30e417c6da820245b486b99bd78dd674c109b360548ff1d07afbd639c4f7f63c,Tests_passed,8835629f5ebd0ab93078fa6541e8fecd28d75a8e0656e799983ae3dfea9cc2fa,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088,Merge_failed,57ef57aad92c30aca138e4dfa7cf6a53d47a35adc35e26a291da746960269088 diff --git a/results/reaper/merges_tested/jenkinsci/junit-plugin.csv b/results/reaper/merges_tested/jenkinsci/junit-plugin.csv index e1e20dbb78..282be0522f 100644 --- a/results/reaper/merges_tested/jenkinsci/junit-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/junit-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,39859834f417ccc9f010344e4e67af8b66f6cb94,bdf558b98b467330afd1a22f7f8e5d63b1bfd6f3,8e215f7f5f0d77aa116483ecf37e8970d571ef55,,True,True,True,59,231,2939.0,2,True,59,Tests_passed,5023d72bffb4fe991afb78b4f7be1e225073ff960bb74ae7972647c8091af715,True,Tests_passed,c85819f26182fc76489583d1964e61a94c33744fc366c5f3c389d240f887f883,True,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,0d42075d041678f9ceacbebe0eefaeaa95173df374a3eaf2978cce1fcdfd5fa7,Merge_timedout,,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,0d42075d041678f9ceacbebe0eefaeaa95173df374a3eaf2978cce1fcdfd5fa7,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384,Tests_passed,d64eb4af1c7a2e2245ee8f049bb8021b2870dff6ba702d780b285b3e032b3384 33,refs/heads/master,2f4179baf22a128be210110ef0752c9a333e3a66,5d5a97fd1a1918a764a08653fc86d1e42d136c99,a70eb66a170d82beff6865a95891740c872daa5c,,True,True,True,17,143,534.0,2,True,17,Tests_passed,d58d201698df63328f9de94e1b844de17cc597ea8763a5c3efb7b514e43af744,True,Tests_passed,37546d70380f886331fd366e9cb5968d5aef5e6ef473a9fbbabe888f07f1b9b4,True,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Merge_timedout,,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,581fb4c52d0a022378266c6f326eb7b3d3c1edea7135234060f0aef7b19447aa,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,6afc77c84799e16d0db0097427a9c3ea676a78e799e1c15d732594de83c85e08,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9,Tests_passed,c83e8cbcbec8bac2d1a5b983deb08c9a6c7c9b192b83351809adf3635a806ba9 38,refs/heads/master,b0bf660633fd6d2aa8890d447f19c092fe7d3f4f,b5621f3d33b34d05584d9efba81290701d783b23,187cb92178f05d2c8799dcb5d1c0c47cbe7245f0,,True,True,True,30,167,2334.0,3,True,31,Tests_passed,8b637038cb33e88ae9d8a74c91317e218f8e8fc3fd0196767648ce095363e63a,True,Tests_passed,8d62dd9f5ecf968a08eb2446666a85f35e18d5be699e09bd62c6fd36befd0836,True,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,4b79696f8ac1b2c75985e45119317ebffe7ec1dc8c327be8b56b8a686c2043ff,Merge_failed,03eeca02c2619ee9fc6a3e6e830f93c8846b6dd9c38c5b9578b1f6a1fa19123d,Merge_failed,6ec6d1a54476a4fa77da13a17559486b6fae5d8389bf310d5a9399a081f670e1,Merge_timedout,,Merge_failed,03eeca02c2619ee9fc6a3e6e830f93c8846b6dd9c38c5b9578b1f6a1fa19123d,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,b64aa049634f3bd5a8f71b298fbbad273cbd10a2d6f896e37dddb10d2b9989ec,Merge_failed,1a7d2a0609650927dd8342d33f39a0404102630764dcb2b891ae6c0509039a7f,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,039f1ae1d1a2dd84cc5025a9f5d74c69740164103f8e06139ab10165873a83da,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592,Merge_failed,39a1d002e50773ecb437c6c566192bbe5dbae53c1e87812c3d85db1e40ef3592 diff --git a/results/reaper/merges_tested/jenkinsci/ldap-plugin.csv b/results/reaper/merges_tested/jenkinsci/ldap-plugin.csv index f4a51140bc..618ee3ffca 100644 --- a/results/reaper/merges_tested/jenkinsci/ldap-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/ldap-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,65487513156cf2c83c16957420906a914a4f2be1,e670ff87d7f5bdf3ca9725fa95669ac9333dbe7b,8cabafe79fad1d461c2f337a9fbfe5046f151f31,,True,True,True,15,59,320.0,4,True,15,Tests_passed,149e43dbc75abdaf82b5d561c244739080b8f341c37d35ea2df5290b0f8d114b,True,Tests_passed,5accbeb4d91349d1cf8ae22b0e84fec8088e8eaa919462730e3cf3f09e3a7a54,True,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,b0ec7c682d02857359424e68be9db53e5d37a74a84ad709658dd910efb62d6fc,Tests_failed,7fd32482d0dc31ef3fe526c4cf922b68ba8652145e6185a0294d2123b5d1ca83,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,b0ec7c682d02857359424e68be9db53e5d37a74a84ad709658dd910efb62d6fc,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01,Tests_passed,a81959e799b860133cc0891ac0fc7c6e2385a21695a84b5390706e3d171cdb01 63,refs/heads/master,f77946931ebcddd5865622831247bc965008a83e,69fa05a0bf6671cb0028b1133e7e640d2e993f21,ff2c95a970df0c0446fe31d3b218c8bded827c2e,,True,True,True,23,272,1034.0,3,True,23,Tests_passed,bc9d70e2230424a39bba9a0f75a49213d4f06a7c67dcc4c30820f67970850121,True,Tests_passed,7122a8017ecefb6341d1fe2ee00bbbc81fccaa94437f0d0eae3b500340f08ef0,True,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,fcd267e6e1413b5ef6c596daf319ae0d1bfe1fbf189601ec5dcc2d31cde8a971,Tests_failed,da723b120fca87548fc84eb0e88605c5c23de097907a0e427fdaa6d86579eaf3,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,fcd267e6e1413b5ef6c596daf319ae0d1bfe1fbf189601ec5dcc2d31cde8a971,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1,Tests_passed,99b63eff1a76274f9281ccf5e824dd29783b44066a15d74b4c1f23e4ce835cd1 81,refs/heads/master,544f4e74e5d98d3bafdc48e1525f60880742eb9f,39f3705a6a8f5c377adbc62dd71164065990bae6,be37dd5b9a7890b2279f7b9146258950bc716ca3,,True,True,True,25,118,1349.0,4,True,25,Tests_passed,eebc580ee86cba3d1d88310e473dd30f7d14a553f33d895e6859ec7adbc9e014,True,Tests_passed,77e35020795d41ce1ef5119afc7dcf8a0f873d9f03543b6aedd2fe4e9c24c473,True,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,579a1fd17d3b3e843530b3d9fbdf70d561d41f17d55656a7dae146303167b75f,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,579a1fd17d3b3e843530b3d9fbdf70d561d41f17d55656a7dae146303167b75f,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd,Tests_passed,955ee6c3fd7de139b877ca3800f98cfdac5f7397c79e9b3de60eaf3ed2a3ddbd diff --git a/results/reaper/merges_tested/jenkinsci/log-parser-plugin.csv b/results/reaper/merges_tested/jenkinsci/log-parser-plugin.csv index f4b744a841..4ce72a3060 100644 --- a/results/reaper/merges_tested/jenkinsci/log-parser-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/log-parser-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/develop,a4d0e3ca611eef6567b9ac34a8b8453a35fb4fd8,b57168beaa534d38eb0fe3d14b5a647ea967e378,13dbf9ee6740a819a5fd36fb9d35601f690dc220,,True,True,True,15,73,291,4,True,15,Tests_passed,07648d91aee9d0f6e494194a78a97607be539191d4020ace934218fccd873032,True,Tests_passed,dc6f04a493944036cc570f7ba9b270645760c760cb0951b8834da36419cb86db,True,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,8497082d49ac979b18d77baa35fe16f401dd413db07b7ea62ead99f5216e5afc,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Tests_failed,4854fd361dd4337592a341e97f427ed13172da8b4710e1146c7c665479d88d0f,Merge_failed,00fcdd0846c68cb082c3380116565e8359d5800489e1e86e168831bb9caf5e84,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,1d7e615078268d2e9b07088752c5df47b6c79ba89b02559556101dac6ee3e173,Tests_passed,4da3447bf53d8d693b5b3990b1763f1ad8222f3baed1351a3734a9368b44889f,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,58c70baf7a23c8ed699163c0331fa6436f0088cc9ec39b2ef080f21e0e6906c9,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4,Merge_failed,bd8442e9a112c86a6a53b90ea1e94519a8baa9653db75f41c4d2ce0918a0e5e4 diff --git a/results/reaper/merges_tested/jenkinsci/mailer-plugin.csv b/results/reaper/merges_tested/jenkinsci/mailer-plugin.csv index 0ca8a1e8e9..99af287d8f 100644 --- a/results/reaper/merges_tested/jenkinsci/mailer-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/mailer-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,06a11a1de909d15bacd04459d29807af9e0882d8,7deeda155287f04384088e250f40c59ef151d305,cc4c337146011301d9c6f4ab9269bad52a83f8e3,,True,True,True,4,10,27.0,3,True,4,Tests_passed,b7977e1d365e6a0d3243f110fd22a3593e3970de3d9085b28ba869648e1cb443,True,Tests_passed,d03eab9b6e7b54c9c752a738fa4147450f60425db3c9da196bef9f45f9f41074,True,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,6fe5e06a9fbf2177ec70c9b280f66c9989a72c2252bb7f8b4fe6af999ec4d90d,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,81b8dd259b81a17907dc8c6c6765a61f5f964cd70fb64bc88776818b595fd4b2,Merge_failed,c37a2489b6644311855de201a164a7ac8f50b45c7f5503a6802664e709566425,Merge_failed,4f66a58189d96dcecd16b22142d4a1426e553f080f1f2926158566985c42cf56,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,740dc7b2f94a22f18623aec60c94333d0985dc0f73a98475b4a81e0fecab9b44,Merge_failed,a555c00fe21a58aaa6c9bedfbfaaf6d8dc476c7d089e3734181c43c99c6dd603,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,fbba31be5e03632edbd285ad6ff38b4d4d5fe8cbc94248bb94e5f2a21789a765,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1,Merge_failed,a9c86c8507a1405e2c66d7dcb620052c9b943441a149b32f924d16dc5f97d9c1 17,refs/heads/master,67ab48f1a6d2f9f568f07ad61f5b0c5b6ae165fb,72edb8559177432001e9c4ca884a152f9e2304c9,d726a1130320076b82e004f675ec97875e9b5fbd,,True,True,True,5,12,62.0,2,True,5,Tests_passed,79149babb1505b08f27045e32515084abbcecf89709efde834af570228fe3180,True,Tests_passed,78ed702a2661a6f5ece85ee92ca6406bd119455528ae3cf452c20803a8d9a314,True,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,4c8b1426eda828aad1239cf33bae8b1295f1acb9ec20d6f454a7566aeaedf3a1,Tests_failed,c9be11053f1026e4cc10a1062c309d2d04d341d4415cc2521328a6ea753fac32,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,4c8b1426eda828aad1239cf33bae8b1295f1acb9ec20d6f454a7566aeaedf3a1,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4,Tests_passed,59d6b967a72250779db9eaa13f65e2b8f4e8891e951ede54e8d24bda44db3ae4 18,refs/heads/master,d726a1130320076b82e004f675ec97875e9b5fbd,ac3d82b437a724e24928b94c507dfb50e8299e0b,cbda5ed9f567e1a5793f0e8be50c6a960a9ca597,,True,True,True,15,72,270.0,4,True,15,Tests_passed,c0a21be88d9df23bbb816d4611d7465a5e14b6b13eedd13fd4f23a0cac623933,True,Tests_passed,6e0eba6784d00ea32d961b4a009c077b3b93fad31eee79fc61a7160caec9a292,True,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,29db0aafd6e431b3e31754d73273bd15bbcb19b3b91696b49d0d1bddd1ff0643,Merge_failed,a7c6306c82402b6c44d430485915c33b94c8bc92998a2cf614f564af1adeda70,Merge_failed,c2dfa14ca440c6972b6dc5f86782dfd0c3b9761b7bdb9aa9d2c014e6f60132e5,Merge_failed,79250b56a66953cda4113d8833ba996c32e4ab6f6ce30db24096740931f7a7ef,Merge_failed,a7c6306c82402b6c44d430485915c33b94c8bc92998a2cf614f564af1adeda70,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,8c8d726f6a6b7646decdb31464adb85ca33841fffd206822e3c9307975073977,Merge_failed,782c216435c46e0d2c1561db493faa92465221b4806ef32491c205cc2a2f1611,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9,Merge_failed,508da0966bc0c71526be659ab812b5a1f3dd93d095b6a039f91c6d58bc3306d9 diff --git a/results/reaper/merges_tested/jenkinsci/maven-hpi-plugin.csv b/results/reaper/merges_tested/jenkinsci/maven-hpi-plugin.csv index 04960883eb..dcd819325a 100644 --- a/results/reaper/merges_tested/jenkinsci/maven-hpi-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/maven-hpi-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d65f4ba879cf14e39c5e502787d736afa054ea92,210884d2a6f1aedd6df012ec1e525759529917bc,a6c6ae730091a96d8e2dcb2e78fd22ee7244e2de,,True,True,True,11,13,207,4,True,12,Tests_passed,3914940ffe4d46619f1a7cfc97d4f2a119bfb790aefbfe4267a075d863fde88e,True,Tests_passed,61cd3a31032564341c9c8e19549572e9d94393c4aab2ec7d3bda116e54ad0288,True,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,c4831746fe50c72c53e6118d1d12637da5b95cacace219b98aa2fbf222681206,Merge_failed,97007d1abc92c799a369a61c746994fa2501babbd2172b22ceeeef7a51e949db,Merge_failed,a21e34f94bd532914c6bbb4a672070e6abd33f5405321b821c0be85d59c7b9bf,Merge_failed,b5d19b6c240af1f8002e7db755def89aa00b8939cc6d8f646206248a2763c7cd,Merge_failed,97007d1abc92c799a369a61c746994fa2501babbd2172b22ceeeef7a51e949db,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,3eb586407275005b6153b3615c1a954cad6c6e162201d033cddbd64eb0799438,Merge_failed,a21e34f94bd532914c6bbb4a672070e6abd33f5405321b821c0be85d59c7b9bf,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f,Merge_failed,5381457299e3ccbd87628db380985a56ee601c3a420537c4f2dfd690970f824f 12,refs/heads/master,a5a4fbce7a8d2985df9057d61c9d664ba145121e,fd40b6d6f87c40af14c496b5b124cd22d52a5c35,1c45754eb08f767d2f144234fce232ae8e1843d0,,True,False,True,2,3,13,2,True,2,Tests_passed,bb421f8119089039567ad83be94b0221d49a6af1f767b242463bc3ab511c3859,True,Tests_passed,f67a1b1e2ee0b1af9ef1dbfca1bed7593e41353a998c796174592559088bb77b,True,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,4a19e1beae660b7bc7b38207ca58c6ff1b43c6b76de9e50bf63beb8875bbac07,Tests_failed,20cec80f990bcde3eaaf8cb711e3c8f6ab72ba0e41997d4985e5d32c22a7ebce,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,4a19e1beae660b7bc7b38207ca58c6ff1b43c6b76de9e50bf63beb8875bbac07,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,46616b89db65c51831da9b47baa354095b5665d89265f1e17a2cb9b16c3dad52,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1,Tests_passed,a6a44cd4e7b0b06c144c508aa1f88055935a5f709a495325101ba45da2b45bd1 16,refs/heads/master,433cb4d66954d957616211c059228b7d1531b800,fa4c6d88a63dcbe5807cad24127c28a1c2a54c7b,00d6ea26b6cb143f97564f02864e5981f8314ae2,,True,True,True,12,34,131,2,True,12,Tests_passed,24463a92eac28fd03c6afd9fdf7e244cbfafb05725628e496d40009457fdec06,True,Tests_passed,92f007a56f8f4055e226a2b62ffca3eda7e553a6c323aa5d239b808ca76a7524,True,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,102abe33b88d4205907f703ad7ad27c054f9b3a65f5c615341c21a350f716d08,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,102abe33b88d4205907f703ad7ad27c054f9b3a65f5c615341c21a350f716d08,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788,Tests_passed,4077950a028e10937e2edc6834e7c2b96499c5b79642ce3341ee4d308d197788 diff --git a/results/reaper/merges_tested/jenkinsci/mercurial-plugin.csv b/results/reaper/merges_tested/jenkinsci/mercurial-plugin.csv index 72e8186ab9..5a149b7d9a 100644 --- a/results/reaper/merges_tested/jenkinsci/mercurial-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/mercurial-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 41,refs/heads/master,442c688d35c5d22fd37822285b997c0addc5c3eb,7ad0c7ed48378c86e23c90fadc32e647bbcd45c0,2a6bc4be4425be43e355067e0c3bfc0c8db5ee76,,True,False,True,7,13,22,2,True,7,Tests_passed,9eac327212a73c1e75f93937810cb27ebc80878505ccdca34c96db826bded004,True,Tests_passed,82844bccf5727fd47ced32a688634253da9682292f5caca1946fe9e8c189c363,True,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_failed,7cbf0bde3fba0b3eaae6aa5816841ae432b9598b1e4262178a174ff6bfb3f2a7,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,8c8a3c44bcc5a9f3b53bd0adfa5bb2b7e7ab12dd29a8028b2de6319480daa7e6,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67,Tests_passed,c6a1e9904b16f39c83a9c0a888c93cd74a0e54f3955a3badc17f7d941c933d67 diff --git a/results/reaper/merges_tested/jenkinsci/nested-view-plugin.csv b/results/reaper/merges_tested/jenkinsci/nested-view-plugin.csv index b2a36caa58..717da61a67 100644 --- a/results/reaper/merges_tested/jenkinsci/nested-view-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/nested-view-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,94ea285c76a8bd6fec6c17193488009557d4ab2c,e8c66c2217dba216df05030200e0704684c1dda4,fd7070ab51330e9a4919a773408d927f43b6b6ec,,True,True,Tests_passed,0b8a32a4f448291b6a1d829f2cdb29c7b970b74b4a1886047fba917eb1d9f98b,True,6,10,59,3,True,Tests_passed,c45470d6a8e382d7af6526f9073a25f39ff27ddfd09883300b0ff85bf54b3141,True,6,True,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_failed,49eddc9338ae6376106f47c2ac52c666fdce0aa6be69b340b221af4aa50b7614,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,1951c89cf96132f6be014e1c715fbb02110ed9ecf3df5cf409210131c23881da,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,140c625687ef77017988c62c30a0edab4ce871d16d35fae987a664f3bf3d9985,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e,Tests_passed,296774924d166baae7fbad2d4156f75d1b11c4b9168ea31d9bd385250f00ad5e diff --git a/results/reaper/merges_tested/jenkinsci/oki-docki-plugin.csv b/results/reaper/merges_tested/jenkinsci/oki-docki-plugin.csv index fee863b751..97509b6432 100644 --- a/results/reaper/merges_tested/jenkinsci/oki-docki-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/oki-docki-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/remotes/origin/pull/73,1b83e76b9746823f89b48506efbc043c0b42646f,e3731a6f6485dc93f46c48ddc81882b20bc54d5c,c3da4fa3e757e55ce78e3477d3e6f96b7ab865e2,,True,True,Tests_passed,8dbd36c05296e7bfe203e5c54f5eba61c2ceed9ba969bf390ec6830c98450004,True,5,15,46,10,True,Tests_passed,bb1debed5b38d446f4e05acb0a158cd995a3b386406ccfd93d10d9c381c59ca2,True,11,True,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,29e8f712f7498b4ce8934980ee5269722aa7bf91c67d95911d57f695b598b25d,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,0d177e124dcc4350398208b97f329c9d1eb6de5ec26cb9bf993c5fb90c2e99e7,Merge_failed,410ce497fc29614351cc2d86924c1ec2157eab9d4d8252667d01d8acc57e2384,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,eaa74fbad7ce8852c7c5d205a34c0b41b02c3f5b569ebdf0e5f1599d3f599151,Merge_failed,f4429c0a0d5a4d8383b709121726b3cb005f0f8d533f51af0a6205fef3d9a249,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150,Merge_failed,5ac96c0dfb88f93663ddee69595536f8fbaea0e3f2f776a8b56d620cfaf83150 diff --git a/results/reaper/merges_tested/jenkinsci/plot-plugin.csv b/results/reaper/merges_tested/jenkinsci/plot-plugin.csv index 1c025f6c5b..ae87dab85d 100644 --- a/results/reaper/merges_tested/jenkinsci/plot-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/plot-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 71,refs/remotes/origin/pull/71,047e97312d44206b7c8b3f19c46aea40cb65b22a,448c2265849e8ab8953aef9fc16c510c879450ea,3c1ac06b43dcc820faeca28b71922231e682d429,,True,True,True,33,89,640,3,True,33,Tests_passed,49e0cb0ef7afeded35b5996aea911f00758729e3eda26e8a7940029f126492f9,True,Tests_passed,23eb6d208ecc54e9c35c0b9f45b372253960606ce43e8a326beecf38fbc90bed,True,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_failed,9112f9f38b485250d35c9e9266600cacfdf405a36072be649177148a750621b4,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b,Tests_passed,1bff99cc3db827eb2b730cf42db128c0b68c75a7e957253aaea31db28790fa3b diff --git a/results/reaper/merges_tested/jenkinsci/promoted-builds-plugin.csv b/results/reaper/merges_tested/jenkinsci/promoted-builds-plugin.csv index 4ec4af5d37..147f6d8d38 100644 --- a/results/reaper/merges_tested/jenkinsci/promoted-builds-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/promoted-builds-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 49,refs/heads/master,90cff675a1008c2167bd647a27a4c62f3b9a9c6a,af28c1241fac960920e8700cdde08c8f4d54414f,219727bd20bac7fad6f71fa77b33d192a36e72c6,,True,False,True,3,8,26.0,2,True,3,Tests_passed,e7ff9c59df7a232ff0c03172efcecf68ce81a3b7b9a8a4843edf911e4dd3fb62,True,Tests_passed,ea06d927f2569648bb447f8d065ec5e6d0fe724fb4e3beeb14829af3164e1c52,True,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,83cecea0eb6657d355449d158a277a7369da867da4f5930fb4cc907a69c99487,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Tests_failed,8bfb68208be97fb2b4bc4fe739872cfa42d8faf17fd77eef2a73fd4320aebe3b,Merge_failed,5c899e3bc8b3591a062dbb3092948af6ef7d0e7086467e0fd24b4b4941db587c,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,72d62046038596ca0e325b22beae11089b9a0ae4115aa34e68f7f4b0a06abd97,Tests_passed,bddba434dbae57037996cfec7a8c869d9d13327cafce461e3e1ddade49d015a6,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,c3cf000deae44f6450bc11a42842b8bde704e3debb727bc18049e765dd308d55,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18,Merge_failed,42d3f1f9a40bdf31a36071286bbaf5d7240a6345f45e68440f25fe8301982d18 diff --git a/results/reaper/merges_tested/jenkinsci/rebuild-plugin.csv b/results/reaper/merges_tested/jenkinsci/rebuild-plugin.csv index 03cb9c4adf..d8adcff090 100644 --- a/results/reaper/merges_tested/jenkinsci/rebuild-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/rebuild-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,e36c878d58a95640c051a57e906ac94e7b3bd121,5073626fda5900cde847e50810a89edaa2bd1810,105a66408d9e9713a6cc6838c5e3a9ae59e18f60,,True,True,Tests_passed,76bfb77dd766de70f702c8ffe7c231a5a574dfc9e613a36e05d74c8a37698c2b,True,9,20,179,2,True,Tests_passed,e10165dab3511ecca632976c146c893532397c2b7990e180ce1d32161669d5bc,True,9,True,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,ef3135930766601e503a92bbf7c5444ad0a018ca3bc09cd55db8ca07717dc425,Tests_failed,f6e49e7b91f5b89f462d6db9acec1330911329e23cc3faad085882c83201e174,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,ef3135930766601e503a92bbf7c5444ad0a018ca3bc09cd55db8ca07717dc425,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631,Tests_passed,00a8977d78d47a2ef9bf9b7765d89ea57bbf080d81a7a891dd0f0d1132579631 71,refs/remotes/origin/pull/64,fa2a472f46cbbfe1e0c7c4d0e3f0d40a1bb33a19,1adfe8fb9559836a45a99c86ad80605f2c30b1b4,fbf91ab63db56523914007976c7d2a369be08065,,True,True,Tests_passed,ba1dbb64f06280d9e24bfb04575fe72dc269545f18290c6fdf41d1b3c8e68baf,True,14,33,240,2,True,Tests_passed,4b277c7cd1ea44107ed47f25e7da9f7a2c4938e07ff7b0c06333fdf4411cec5a,True,14,True,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_failed,2a1d0455bddb945c4de9deabf8153abe34c9a4f502ab539371f06d5c3d29c3a4,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5d5a77577d40a967c9838fe548220898c48f3bcce105836a82a3c35ebc9e959e,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b,Tests_passed,5dfcb76101ecd0404ccf227213e5e19a55a31728bcd21a9fb5f05ab4a991488b diff --git a/results/reaper/merges_tested/jenkinsci/ruby-runtime-plugin.csv b/results/reaper/merges_tested/jenkinsci/ruby-runtime-plugin.csv index 9abe84ea5c..ef2f48f5c8 100644 --- a/results/reaper/merges_tested/jenkinsci/ruby-runtime-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/ruby-runtime-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/6,39375b570201fcf8b133343bea4d124bf7351210,92be9dc3bb9db0abf462653b236dd5ee69d21156,3d8ce2e3cb1e769fca79b0f08be9d449f83dea21,,True,True,Tests_passed,8fc2c75921936a7c2fc8979207818efe527e802b6f9ab513b8db0b1e85ccf78f,True,10,21,100,6,True,Tests_passed,010ab39676fafa2f98562da90f6b8b1b2f58d8d61fccae47c884f13f428a1ffa,True,10,True,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,4a99ebc6e6d72fc46608dc9b97e88820f08df5c89113ac4f6330e78a5a3ab031,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,c489a634b9d773226ee45f18c9be35e42e6bc866422607df51edf53e3000e756,Merge_failed,c4839ed75f4cbeb3965a407db6687138200d6e34cfa0e7090ccc5b95c6657bba,Merge_failed,bf3b8a92064c576ac54a15560cd30f648988ccf3442606135f6870f035cbcc6b,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,6c718065b8a254a4d55b7dca851982a44e35a86a5ab30f1ddcd62f0ee56154a3,Merge_failed,abcad57dc0e03effcda66c6a651bf016d78af653b031ebaeea7385e466a8147b,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a,Merge_failed,a00ea71a234b5d2bf069200a342ea4699c3ae1cc722bd6fb6d263a7c3cf60a4a diff --git a/results/reaper/merges_tested/jenkinsci/ssh-slaves-plugin.csv b/results/reaper/merges_tested/jenkinsci/ssh-slaves-plugin.csv index b681d54350..fcc1e7e313 100644 --- a/results/reaper/merges_tested/jenkinsci/ssh-slaves-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/ssh-slaves-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 68,refs/remotes/origin/pull/260,67b86f05f7f5d4cce393b8a6eeda9ebf5af23307,6d732bfe8d1d195fead4b2c1753b4c79338f0d6d,4b3a02a729f7376a1794920af7d1b661b310339d,,True,True,Tests_passed,25a55b9dd6eb461129f7e7ae1b8fbec6b1b0ae381f310f046337cb96cca825a5,True,10,44,89.0,2,True,Tests_passed,a0c904e5f5a467c4a98640f4391c7ee1d6827367b32ddba1d3422345c372079a,True,10,True,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,55c797321bc21aafc117a253a72c7b26b721bf24a604bceff1e3f0619e2668b8,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Tests_failed,247c65ac07be30bbdcceb08b503ff2dff45fed1db4c534ad64c246e97b4262eb,Merge_failed,607bbcfbb0f14d4b6e93a65bc8b5a2194bbd0fd3f13ba38a622a6c031d8c11b3,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,877aaa3029535d58c3f197d3fb9856c03c6234ab8be6ff254af0c488a8e922f7,Tests_passed,739b51f6338917ab5409a4d0411270db3d07f3026689bb09e39df945c66b5503,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7,Merge_failed,d29923dd039877de21bb4261b3afbc7dea4d8bf4e916bdbfe5b720278f58afd7 diff --git a/results/reaper/merges_tested/jenkinsci/testng-plugin-plugin.csv b/results/reaper/merges_tested/jenkinsci/testng-plugin-plugin.csv index 29359ae369..a5fa33ce88 100644 --- a/results/reaper/merges_tested/jenkinsci/testng-plugin-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/testng-plugin-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,2df4e9dca40488bdb4d10816d04c1f672de4d57c,cbbe722570d1bdd06267e642af03ddc32ff5f39d,a0d5f66521e3bc470047a0b683004ce8889d3369,,True,True,Tests_passed,5da7031c76120c5751f7cdada2178ba36af2c442ffa4c19590ffde5e18b6a861,True,24,60,471,3,True,Tests_passed,08ef0bc46c3164762ed860b24683da2aedf5ebdb899b56405be7c34fad3dc99d,True,24,True,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,34f8420a1988bf5a2ce07eb5ccc059ae141948afa9bdf469e754dec7fb76d221,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Tests_failed,2358ee24f1292b0cf125ef0b56ec8a93c392ecd55fbcd7d280ea8a49447a53ce,Merge_failed,549cee28e370e8da6fe239bbecfcf7d2fe0240f173f1c3e27c61912f5fd81d96,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,beee047f6718af217cde790aa28fa7340404c059f905aac92d616cfbf179ebac,Tests_passed,0a8b73cd45b14357a9d9df17f685091b93a4bdaa32c3a42cb1f05280d8dfc9f6,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Tests_passed,19d0cfddc193dbf469a451d8f98144c6ee6de0d0a68c20b1ce0f0c2acf04f75c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c,Merge_failed,c970ac4f3da1f3ac3d69cfcf6134010664a6a3184d426c7901f2b3502c1f9b2c diff --git a/results/reaper/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv b/results/reaper/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv index 3697a8113d..8e84342415 100644 --- a/results/reaper/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/throttle-concurrent-builds-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,5032e15fb75155d73e9fd1bcccc64ce177fdd57b,4bfc64f6985f1303bbf23f9ec15dd1a952b8cae4,c31b212352d2ff3f87404cf546cf22e53a105269,,True,True,True,3.0,7,57.0,2,True,3,Tests_passed,732d9321738e21f9182beca1f01b6aa530ddece503824d8477b90e2feb71fcd9,True,Tests_passed,76f4d30888d5787bcf45fc7bb881cff5c277c96625b6dd93ae7f7099179be25a,True,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,2471d7c7286214cec963f3f4b11236aaf335ba57233e45a81679ff392e6c13a4,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab,Tests_passed,236c21c23052a112919017456fa0d4255d850d80075224cab7c4c236b8280aab diff --git a/results/reaper/merges_tested/jenkinsci/token-macro-plugin.csv b/results/reaper/merges_tested/jenkinsci/token-macro-plugin.csv index 4ff069bc1b..09f6b4ab8d 100644 --- a/results/reaper/merges_tested/jenkinsci/token-macro-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/token-macro-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/remotes/origin/pull/201,b81fa6878b4f2e512ca115b620bff635f8f4fc13,ff1f4313d35e6a4c707c98666618af169389b352,934f268591ced72572d147e6393db570f375fc41,,True,False,True,6,41,120,2,True,6,Tests_passed,ec167640747beab83d5e975cd9d70c72e764c6adecc1d73f756b4a3c85464493,True,Tests_passed,4ccad620cc303dddee75f5d093cecac1e7128855e1c74bdfce3986e8b479a84c,True,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,0a99b4d9314a5e0e319f5d5d57f8af514bf43906d29794d55e5a7c4fc8df79f7,Merge_failed,6438dbc6bc49eeaf76463f51e038981b146f103ba39278b0ab6678f35dc3f4ed,Tests_passed,027e08ad5319d3cd417e8075dba1eac0a35372625693ed5b37139aa570e8909a,Merge_timedout,,Merge_failed,6438dbc6bc49eeaf76463f51e038981b146f103ba39278b0ab6678f35dc3f4ed,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,096cb9d5d7c4b2bcc5ff5c240b21f7ef3d1002211918fdf4a50ea9e1d2d54806,Tests_passed,027e08ad5319d3cd417e8075dba1eac0a35372625693ed5b37139aa570e8909a,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3,Merge_failed,98dcfc2b83f2ddd5914612188f365d32c464c5f353347d7f8fa4759f49b93ed3 61,refs/remotes/origin/pull/88,47d8b7d061275a8c961c9f0fd17bffcb2a656b89,7c063fb30ca13cca989b49f3834f86504995799b,b2ddd4c391c910628567cbba43e5e48fbd3e16b5,,True,True,True,7,73,963,3,True,7,Tests_passed,871803410282e8e4366c7f14398928a0a3e35656db91dd1f07c559ce97a46242,True,Tests_passed,4dae64f82b3a67fc14640f9845d7b7e2e6f488771ddfe642c11ed7ff6512f095,True,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bb353d80ff39078e74ca1328f8e9e92c84241964b06c4ed3003de465c68f1798,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Tests_failed,6b86ee49e56096a49df4a692ac2e035a59f30b9184980cdd81e0035152b9e16d,Merge_failed,20a897ef7208dfd2b4ac544cb04965f3bc3571cbdfa95a043b9e3e8b9c6fb41c,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,706d0b651faa2040f844538661349582fe7a20105d694f508317bbafefa4c462,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,bf699b79efc7761fe30edb238471fd063bf08709b9c7b6daf596a3f992a0139e,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,bf655cc2312ade40baf005493dca60e12441c429e2c1825ad55ae8e2b42a6f08,Merge_failed,b0c1dc4881849432e56096e7d1e379eb6aab0b6673772c857ad2d65dd2651f23,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,9f48e2b6981216864f8778db2aeac9dcb7d05ed2d26d248e46bcd4a34574913f,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0,Merge_failed,0a0aaf122b9df8ae4e0dd3fd4e5d7dc07359555e4c469079c823880825c64eb0 64,refs/remotes/origin/pull/88,b206c7045b9d38a5099933af3076b63a6c77c82b,147d367e0ae8fb9d373a812bad2e7fcbb7f6e163,712021dedd16dd10baa4a320ace0274871eefe98,,True,True,True,16,104,993,5,True,16,Tests_passed,bbec0a4d934143a85cb3dc10dffff187b303c8044519408ba306512aeac8c687,True,Tests_passed,7736f97a4b52507eb2d2cd8342691bd4fd615e9b376c241d212d30a9c9e58aab,True,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,815f62f86ab8a78b61fe0ef2e45c12a0988036673aa1939019183aac47e78914,Merge_failed,c917db2474e26f940a80a6687d115444a43fb74b4514c70922242ee92d4c98be,Merge_failed,4cb7a1f228abcdf9f9a03edadfc39327501091d91e4e8d5789c83ec940bb85da,Merge_timedout,,Merge_failed,c917db2474e26f940a80a6687d115444a43fb74b4514c70922242ee92d4c98be,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,9ba09ba0b705ad72825a3bb3077da87a93442dc3d1b75f6a21c6b7b8fad02c40,Merge_failed,4cb7a1f228abcdf9f9a03edadfc39327501091d91e4e8d5789c83ec940bb85da,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,664c354906b736bd3be2494277b146b423b4964fcce3b62f6b8b813704595ccc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc,Merge_failed,f1c63709b0119765139948010b1d96a0a69ad8b6ae87123203b0d90ee37c86fc diff --git a/results/reaper/merges_tested/jenkinsci/ui-samples-plugin.csv b/results/reaper/merges_tested/jenkinsci/ui-samples-plugin.csv index 9488a02863..d769f06939 100644 --- a/results/reaper/merges_tested/jenkinsci/ui-samples-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/ui-samples-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/remotes/origin/pull/14,179ee92cdf658ab0fefbb2e20d341443fbaf5ddd,cd322943dcc1363e90555c011d97ffde1807e6e3,d7e88884dd90310b67193b4aab8139998a107486,,True,True,True,32,50,240.0,2,True,32,Tests_passed,6761b9b89eb5f3b7e18758f9876712fdd0e1cd766d367e678a691197d01e6677,True,Tests_passed,015a7155f157be9f6ba6af0e0df998c3e6a140cf7d600492a1fb581b1f86e5c9,True,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_failed,a52259e58a8fe0d27ce1c9ad8a466249e03a5aa56ad09898260f67e08185b232,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,4162be609ae1ea63ddea418a390fd6fdaf46707823cf979715d6832c5790e55b,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985,Tests_passed,9a43bf757034b3c659a19547ce0809007b31525102344487dd05d0ea896cd985 36,refs/remotes/origin/pull/14,c8af2261afdd68800803c8595a112644b653ce96,cff342b0860bbff4312fd7eeea9fc0a58d3dcbe9,d58a5af654da46ba8c28ebef923abc97d282056a,,True,True,True,48,79,944.0,4,True,49,Tests_passed,4f80bb4e6d3988d590e02a277977bb4365a758ead60216ed33cfe2793505945e,True,Tests_passed,f94d2c7aa56697663d7b039896df9aca60fd27302dfb331883f36a5ce2f33b59,True,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Merge_failed,0db3ac9881c07c9877ecfde4f1e1d5265bb459bd72699b7173a742fa4cbe4f9c,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,18a2c0e3deb66d6d44aeff48c0d6aba0fcc7f31bed5c318142b39ed140ab6b66,Merge_timedout,,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Merge_failed,0db3ac9881c07c9877ecfde4f1e1d5265bb459bd72699b7173a742fa4cbe4f9c,Tests_passed,18a2c0e3deb66d6d44aeff48c0d6aba0fcc7f31bed5c318142b39ed140ab6b66,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f,Tests_passed,2a55aafdeb6d6df22a5d7918ec14d79e43c86d1063f3d95e6a9f4a4e22af300f 66,refs/remotes/origin/pull/85,81bf937a3df70590fc0bd9863fa042fca33b6373,27bbd0089038840c8f5f7031cf8372351acd9601,5adc77727645641a0c723afe6af819cda9aff26e,,True,True,True,10,17,337.0,2,True,10,Tests_passed,5eb465960460adab80fd439fb08ed4b3b86f47af4d0663d85ba06048d49a8b2e,True,Tests_passed,8b50329f3af4c0c1a6a0a7ca44252a94c1f0710f0e1de00b33166f3a49478805,True,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,b5e4a63feb89974e5650e8f265b22174f57cc4cfa54d8e5af22d3d765926af61,Merge_failed,d4b5c2b65b3e82f734bab119b265e0056e9c3ec4b48dc66c002c120ae0a05e2b,Tests_failed,42c2cc581c25483a995fb98c5997f5637a6b88788119c516528a8847bc05f6de,Tests_failed,67dc0d399f1af9a1e146c33adc0246c0037967e683bc10639cea47166cc709e6,Merge_failed,d4b5c2b65b3e82f734bab119b265e0056e9c3ec4b48dc66c002c120ae0a05e2b,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,cd79d0891bf45a2ab6b7bbf291484333bfdefaa91d2da72f2c1d0cd8b6e7315b,Tests_failed,42c2cc581c25483a995fb98c5997f5637a6b88788119c516528a8847bc05f6de,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577,Merge_failed,87ddc7977c6719eb6c655920bcbd1adda3280f3cf40b8fea1b35ecd8dc4c5577 diff --git a/results/reaper/merges_tested/jenkinsci/urltrigger-plugin.csv b/results/reaper/merges_tested/jenkinsci/urltrigger-plugin.csv index 838e678fcb..29efdee49b 100644 --- a/results/reaper/merges_tested/jenkinsci/urltrigger-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/urltrigger-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,636236f91bcd67ba35a17a01f43f271fb6150021,52aed37f45183395978126b7b547cdc6372c0126,739387ce7f2b1b61231fb7f5c460ffefde4cfe02,,True,True,True,20,23,74,2,True,20,Tests_passed,082b0839f729d1ea6adba90dda0aa0bf06854764125346c6207b4a75e3ef4de9,True,Tests_passed,a89f5f20c1cd9c02cda65a4cec851eeae7faabd6653b32fc347f9046bb3fd1bf,True,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_failed,5ba725bbd793e70b3bc901061eed3c86b2d7491122535a555900193e95dbd6b3,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,e7df0cfd2098e31ae2724107fb0fa671a59a0739188129a6d104e84608a4b76c,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,341867c52d4458f6620ee932ff8b6312eaae3d15befdaab002f700f9015e0013,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02,Tests_passed,f6837bc1b00c50219d267a07ad96bb561258476aa611c674b026e2ed5160ba02 diff --git a/results/reaper/merges_tested/jenkinsci/vsphere-cloud-plugin.csv b/results/reaper/merges_tested/jenkinsci/vsphere-cloud-plugin.csv index b5306bb46d..1fa83bee30 100644 --- a/results/reaper/merges_tested/jenkinsci/vsphere-cloud-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/vsphere-cloud-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 95,refs/remotes/origin/pull/112,9d608121dd2c89e1c5eadb6717ccfa7c412148f9,f5f88b588c8c76b53ca5a569b8f38084bb368c74,e81bbdb1045efc0513bef1271216bc624d375fb1,,True,True,True,28,31,751,3,True,28,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,True,Tests_passed,1d41135e87c8ab2c58592179fe5698e7397e6d6054ed65ca76547ef1943c90d0,True,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,968c1a920c711ae831b5432a59afb923651c20893966b873a8490546a5696c1c,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,b1c34e0fcd479abfac20b4e1457d5fdfe0acbe51f7c8510c48af2ea6eae9e3ac,Tests_passed,91952eeb51bd58c0bb4803229f4130c48dea1dd56bd61aef157d4ae67f4bbda6,Merge_failed,cea649cfb2af64681c63655b2192d20d4da1445b59f2cf5980150d38845511e3,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2c67cee965f401b3cdaf23cef6ddee45e6775f30a027af29eb172179cfd9ea6e,Tests_passed,ffea03a994d13cc1f2b6fdeed7c27f93cba48121769f9b05726dea56e778f2ac,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Tests_passed,629cbfeb8981ffe19ee86b39e583b3823a54d8989211acc936b83ce2e28f2fe7,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee,Merge_failed,2bcbd66f4ac39f618d62356ff8529aad8bacaa5e7bbb830b1a411bd750e9d9ee diff --git a/results/reaper/merges_tested/jenkinsci/windows-azure-storage-plugin.csv b/results/reaper/merges_tested/jenkinsci/windows-azure-storage-plugin.csv index 7389e8cd7a..435ce53414 100644 --- a/results/reaper/merges_tested/jenkinsci/windows-azure-storage-plugin.csv +++ b/results/reaper/merges_tested/jenkinsci/windows-azure-storage-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/remotes/origin/pull/192,68f96cee84c20a9a94696b400e3a5231f0caae4f,40521b451ea70ac7055171aba07f761400fe4e0a,36c07129d7d345a276e8760e33a60e3b4c4f6b3a,,True,True,True,12,21,356,2,True,12,Tests_passed,1cab803bfe52b220bb4063ed752b3351f6117caaed56c5e93f14edf4a865ece2,True,Tests_passed,7c572faa50c82739fb4e5d45354fc7cdf2fb0d93ab7e330a9ad292c5e5e778dc,True,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_failed,4f33a4c98f46939d8495a078567b3439b2ac50e9f9119d1a727a8df7edce28d3,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_failed,e59b7ef3cbe28d83f8bc20576c20a0f2beeb546691d4b768c9bcebfd73820c51,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea,Tests_passed,3a2fb54d57b5d7116d5de7fa8775da3c72dab2656cfd8a68bb181974e92072ea diff --git a/results/reaper/merges_tested/jexp/jpatterns.csv b/results/reaper/merges_tested/jexp/jpatterns.csv index fcf0fe6eb6..a53bb5371d 100644 --- a/results/reaper/merges_tested/jexp/jpatterns.csv +++ b/results/reaper/merges_tested/jexp/jpatterns.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/3,ef9f7d0e000c5af9d0a9e6843eed56e7b3450bc9,5305b3ebd8d787b57bf599118826be47097c6d22,14bb2740fde84b37d6f4a48f839c7a1eef194e97,,True,True,Tests_passed,4e3aec4b6a31cb1b0e2ec76ae1d1b2f4b82c333038cde5c33cca2c30bc04cf28,True,63,66,8849,6,True,Tests_passed,85c4ea1f34217247aae5eb9cc08d0a6fa80c466982644fcde419bb884009fbee,True,104,True,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,e6e75c9d6151d5b1f07bb79ada7fe44d47b5d015923a654c31908852e0c1a6e2,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,269e2f25b31869e45f5f1e203706cc2cc9bbd64f4aff0914cb0e510feb4c77ac,Merge_failed,07e2ee4ad0c35e03bf4d1f44eb05e67f9e489b6887ece7925f30d5e7009cedf6,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,267cb360bca7e4a1199bd16d545e55827b8782f13f85d11cbcfef04713ff1dde,Tests_passed,924f2c3ff2f7003d32606b7ae56cfa9e9fddedec3f0d77ccdcd511ccb31042e8,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Tests_passed,db09c616d950502c24b807137ed8e00ac125d9d8f68fd82c0867bcf9e92ee22b,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e,Merge_failed,ce3b705fe8d77bc3a3bb5c45270cf96e0c16995e75e9d9c65aea8fe11180f37e diff --git a/results/reaper/merges_tested/jexp/neo4j-rdbms-import.csv b/results/reaper/merges_tested/jexp/neo4j-rdbms-import.csv index d35e27a365..d7812f4e22 100644 --- a/results/reaper/merges_tested/jexp/neo4j-rdbms-import.csv +++ b/results/reaper/merges_tested/jexp/neo4j-rdbms-import.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,266500d1c5d5131664a1538b03399f313936af99,81dcb38041bd12ef136f07a1c11ea8bdcb235237,f0900a36160502da9867e48db990874982c6b9f9,,True,True,Tests_passed,d29d2b8551e236512b506f5943599f542cb65078548070e621ac7ff4b042ecdd,True,19,20,982,2,True,Tests_passed,ddbaa818eff33f73c7f8f10a1700ef22d0c6db83f1453ef78ca38e9df73b61ab,True,19,True,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Merge_failed,4d4d6cba3a86886e261b2b80df65b210bc0c9b1bd34068f39492e5e47a493ef2,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f,Tests_passed,579feda039927ee319a8de40584917ab8741ccc3e8c2cd6d357ac25421da465f diff --git a/results/reaper/merges_tested/jfaster/mango.csv b/results/reaper/merges_tested/jfaster/mango.csv index 83798291ab..3c8a4fedf4 100644 --- a/results/reaper/merges_tested/jfaster/mango.csv +++ b/results/reaper/merges_tested/jfaster/mango.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/26,6c28ffc629752987623e939e30b2ae66e1952a2f,ff1a792c607c318590ec447591691a91cedf8875,65c5d160cef1cd5ae01144d6bb809033aba61078,,True,True,Tests_passed,33a81092f3a084163e7257a6b2bebbff7deaf9f8694b5879f16dfe4693069bef,True,138,471,5334,3,True,Tests_passed,6491b1030229b60f98251a9878b6750e9b2eb812890d0c1b4122812e28f2a940,True,138,True,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,55a922a05927fb321ef0a8c689fac3465578f09e09b997d5d13fd42e368b5923,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,ecb245518a89ee6711c0d7daeb1d6307510a48e34745fbc8d7ad982eceb70a9d,Merge_failed,1d0bc12a080a25a861849ab91264972be18e8d686d028e7a7648d589fb56d1a8,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,ee25e02a03afcd6b5253748020548d4b135f2ed269f706c8089e82c81f6d866b,Merge_failed,4e7188d4ffc1b5d8f45eec56aa63b43863088d4b0ceb74d3c5f0794b2151df5a,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058,Merge_failed,c6435e5d67a446c286f5c1a2bf8538364ebe173c81710d0891a0dbf453539058 diff --git a/results/reaper/merges_tested/jfinal/jfinal.csv b/results/reaper/merges_tested/jfinal/jfinal.csv index 0155463840..a05fa8e7d6 100644 --- a/results/reaper/merges_tested/jfinal/jfinal.csv +++ b/results/reaper/merges_tested/jfinal/jfinal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,83a31ff0cf39aec29ec35e86e1b393c1236b8fa9,4d36c61b9f4c1fdad6dcc82f096c039782727501,85558c161a136e15ddc3703357410dfd002603a5,,True,True,Tests_passed,300506444a5ae03fc8a4f08443ea38ad132f6c7bb91848d7f70e4656399e193f,True,378,624,3911,2,True,Tests_passed,ecb17683da7b9a8d14f71087584ec95e8a77d143765de0236cef7edb059668d2,True,378,True,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,dfdc3b1a741e7720ac51ae818ee6ba14008fc37bf8e347a1de0d06a9fe4cd732,Tests_failed,1dedd9ee413d013626d375e6c524e813d7998a215c371d9554f7585893119c13,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,dfdc3b1a741e7720ac51ae818ee6ba14008fc37bf8e347a1de0d06a9fe4cd732,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828,Tests_passed,8a45da0035b5d2bcb6af268c9b516d41153b25755f655e68f04637bce8fd3828 10,refs/heads/master,77040eaf33ff2f0c2d3c7ea6d7b3b6d0755999d7,04b26b9ed3141349f49fa3141bd2044acc42f6c4,236c8e70295599cc96e83c44f0db84368e49ea03,,True,True,Tests_passed,703226916b0840eb75742e6655c4d86da210c9b921064fb905f811f02cc0cd0b,True,2,3,31,2,True,Tests_passed,54a415310644e77be425619dc944a025753ac0214de49227ddd111e0cc2b79eb,True,2,True,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,47794c6f558f425491ff5b0b4ae8bea47739c3c289a9d3c0630c24764d01373c,Merge_failed,4853a9b6a5e457c1002311884e5584e2c19a425bf9bbae63e03048955ac575fb,Merge_failed,fe4bbbb9b5341e3bc8cf9455df0df0c79ba1e789328c0ca9f595705b303f0625,Merge_failed,43a56d2d41f5747ad0fb90fd6ce04c5cbe1f3b40c08c884b1eb7cda81f7e94bd,Merge_failed,4853a9b6a5e457c1002311884e5584e2c19a425bf9bbae63e03048955ac575fb,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,4224d95e52396c778550d8751b74874fae0790780a56ba6733e06ae8b47ce166,Merge_failed,fe4bbbb9b5341e3bc8cf9455df0df0c79ba1e789328c0ca9f595705b303f0625,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,dd265d792d6c964697ad7c6ab1e94e40900926f618b3cfe1a6a27e834c9ffa01,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a,Merge_failed,5982e3f8d0b0cd2ddddb043e98be4302d20b2ba862ad5eb84ce837b3a632d68a 13,refs/heads/master,c5ab0b2b5895f3f708e0e8c4008d5f879ce0271f,1f8ad09c19e86235c7df11f8c1f6dcbf4844cf4b,9e426fcc572d52e5b15ce995c40a8dcb8c0c3439,,True,True,Tests_passed,cc7128736d084ac5fa7fbbf10c30b591f58fef1844c455d6b57736a5593a2cbe,True,8,42,277,2,True,Tests_passed,cb97ce9abe751c8664d01395549df38d6dd99cf223d75f036b61665c29d80b43,True,8,True,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,96b7e03b10fea3d2868b7acb1112f685ef1988d187846930c968b5ee7a3e296f,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,4c34123021fe45df7da7f9f9951aa6eec19bfd79cdd90454fb6802a53abc2a84,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,4857a2c9ba5fab44220823ffe7d3101bf27300676bb4c1ce4210bbab4a370edd,Merge_failed,88e90498147ac6259ce6227682d4406b8266c814d564168868075dc47c228c53,Tests_passed,b73dbe75a4348d6ae327253529c46096387db7ec7c1bd95baf1834a90961f284,Tests_failed,04910373b858b14e427c076e97d1baa6fd677c87bf1f2bec549c4e3a07c8f8b6,Merge_failed,88e90498147ac6259ce6227682d4406b8266c814d564168868075dc47c228c53,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,4c34123021fe45df7da7f9f9951aa6eec19bfd79cdd90454fb6802a53abc2a84,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,e16b9435d5e17702f92b3665de8b33814aa31a602150373f39d3d7ba343e1726,Merge_failed,1c6af53e1a71b3cb242880fd2a77a5671d017c64fe6a84ff4e4be26f2700c368,Tests_passed,b73dbe75a4348d6ae327253529c46096387db7ec7c1bd95baf1834a90961f284,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,96b7e03b10fea3d2868b7acb1112f685ef1988d187846930c968b5ee7a3e296f,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504,Merge_failed,0d2430a016bf5cb6949eac480f1eb226619e100cf0809027dfbcc02e9bcdd504 diff --git a/results/reaper/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv b/results/reaper/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv index 0184b8b6bc..0754978cc9 100644 --- a/results/reaper/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv +++ b/results/reaper/merges_tested/jfrogdev/teamcity-artifactory-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 47,refs/remotes/origin/pull/115,08f8573776df392bef2843094930ed26e1a39b54,527b02fa114cc6bf196e842ff2301208ce9335c2,5510a3f02afa1a68943069423d710049a50234cf,,True,True,True,61,358,1651,6,True,61,Tests_passed,4da1b8e223e67844e679b74f20c0123922c940e9d92c540bba32cb4671fa83e7,True,Tests_passed,0c72927c38c151d3160f04415aa9f504d5180c2a6e3fdd02e13283eef62bd0b9,True,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,9397b0c41f68b6d50f5c3b55d00052dc39744dc800968c126b72ac0d55994f48,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,6ee99094ae1b0358e8153656469736f477a5f4146b03ed34d0b16e66bd0d493d,Merge_failed,2b69f10cd240a54701ce7d7a288e9314934d1b8c654964c11f796b5f69505fc6,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,afe643bdc6cc097ef14c0488a67b507011d5d57b9886930c51936306ff96f238,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,592c15b122fd399969323dcb104357e1d3624078e0ba48bddfa2ac884570482c,Merge_failed,42ca82396cb7cca5cc098f1d01b6fc691fec5b33b11d8d6adbc51ade823b89d6,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,66ced84f65cd1ebd3fa11f08f53a589fd8664d2829d47578c4add8ac3a7ed333,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9,Merge_failed,98a4f437ab25d7e3e2b83b5975c963257268a75a4d3fe5a52601c37a09e475c9 diff --git a/results/reaper/merges_tested/jgralab/jgralab.csv b/results/reaper/merges_tested/jgralab/jgralab.csv index 0d01f58ca9..85a9984a86 100644 --- a/results/reaper/merges_tested/jgralab/jgralab.csv +++ b/results/reaper/merges_tested/jgralab/jgralab.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,e847d12f4e86d32f0be14db3925955bfce0dfc3d,b6ce189e6c29da1ddaee21ca7a4c5e0dba98957d,f22b3f4f2e2dec2542a48b761e918303e72f4fc0,,True,True,True,30,201,2104.0,2,True,30,Tests_passed,2ebc6c09ab99014f4f0757f82c2b71471b5cecd4be00867de964b79864a8535f,True,Tests_passed,35279fafd7f681f686c2053a82aa1dc1a61000989b755e711de12fedca8bd720,True,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,dec613823078f91f4f8fde4a19bda1eebb7a3c179e2ac18cfba7a5ac7c7875bc,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,dec613823078f91f4f8fde4a19bda1eebb7a3c179e2ac18cfba7a5ac7c7875bc,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,d7563df3d08bc28e88705413b0ec793a14a94e100b78d8b17f219b58168b2e92,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e,Tests_passed,bc6ae163737c95824a32a555c1c8e246333fc41db755c2a51436a418dbf2c39e 10,refs/heads/master,b6ce189e6c29da1ddaee21ca7a4c5e0dba98957d,a717e0713b57df721015995978be21a224674aa6,742302f626b96fe3dc3a4fa8cf87f54a7c23d7da,,True,True,True,24,236,1746.0,7,True,26,Tests_passed,be611bb4da79e637cbb329bd68427d19888d8167c1448731c672042b90b39463,True,Tests_passed,6ef7aa192da85d55cd421a91750b6646d7a3908048a2227bafef6ba1b74e3778,True,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,fd7f459c04e2655d71cab0ee06578f38de119fe0b68a6d30fd5618812f56b5e8,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,1a9f78049f1c8f037032d637f4bd7ce6438aa890999271b58cf32570341bec1e,Merge_failed,5bcd0a4871b967e0b4255a78b658184aa76390b77260722b3bd44f09b6c69582,Merge_failed,a92f610107c2a655a80ed0d5de9b57682b86334a225c609525bf6ca80cee1f9c,Merge_failed,6bf13cc259499fb9bccecd697ece5e43a39ae21aae71a30545490a1949beefdb,Merge_failed,5bcd0a4871b967e0b4255a78b658184aa76390b77260722b3bd44f09b6c69582,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,3a759457dd9dbd19bc597444e16d43c5942044665a3350d55a08266a9e670688,Merge_failed,a92f610107c2a655a80ed0d5de9b57682b86334a225c609525bf6ca80cee1f9c,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,fd7f459c04e2655d71cab0ee06578f38de119fe0b68a6d30fd5618812f56b5e8,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965,Merge_failed,daf6148336af78ad540e603031c8379f15a00107956fc02955dee2e9eda74965 13,refs/heads/master,a53eb0f40278f7288940a688398918e89b29bc92,270b06443a57a8b93ad956302bc1f88e7ff08f78,3850ee7264a681e0ae00c1b5b54704c133390031,,True,True,True,1027,1091,7989.0,4,True,1027,Tests_passed,cdf0ec28fe68854449f63d1b618b702cdae7f9ecfbbb498f43ce44811d19167f,True,Tests_passed,4face33089bcd57747764c0efb9f2ea820007ab5b67bbb6b808f7edf9ee0d5c9,True,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,c0b744aa21a23f90660b88d349d0a41b566fd294a05793bd0435935f8439077a,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,c0b744aa21a23f90660b88d349d0a41b566fd294a05793bd0435935f8439077a,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,2fc53cd3c08c24dd86aec2ad20df96ecbc2da039b63fa27646f2be18e2d52bf5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5,Tests_passed,102409279cebbf6746569d474592e195113f33e04e9e196dd1efb8b7365010d5 diff --git a/results/reaper/merges_tested/jhalterman/concurrentunit.csv b/results/reaper/merges_tested/jhalterman/concurrentunit.csv index 06fa3df9e0..b474e601b1 100644 --- a/results/reaper/merges_tested/jhalterman/concurrentunit.csv +++ b/results/reaper/merges_tested/jhalterman/concurrentunit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,ff9794f7485bb6455f5360b989c22f3173b679a6,e0a180ded55fff37fc7e0801d416b02b3019f194,21cab232bc4e99b4b9d9250d84c833f4e01ad894,,True,True,Tests_passed,a45de44d2cc427bcd14e936631f7ad73f6e6ec99868dca53b4394fda7935ce7b,True,8,7,1331,6,True,Tests_passed,ab7027ce12ea65b1337952fd4befdbfb9be95fa1ad03f22288cce803d094f0ac,True,8,True,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,dfbb7b6173b9d1783584f440052e21480980778ef3a6457138b23f691b991bf7,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,93e9a53a5918d72cbf316a3bc461c5e51a0ad82333b97688fc63f51b8660dbb1,Merge_failed,4cd63c695ec8e7bea17dbaf0119414a2c2dd7aadf4a3048c9b1c170145523365,Merge_failed,15d859657dc050efb52dd95d206360bf623fc9a777295c715d1b51b1666248ab,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,ed5a181d7bf04d0c8cdfe578b710c4938da4003c4e2d81d467d10dd8a428f561,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,fc1143e296bbe86d86453d574830166171703e422e258f8009c216740e92fb59,Merge_failed,f2a5bea1cbf9dfb2bb29a5dd8c2bfb71cf4ef0ca047d460154e053a2a06b7cc8,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,2099e2b7a4fa7f6d42031dafc5648e1738a9849c16f32e94b59d90950dbc5a52,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784,Merge_failed,803cc24c0b9e9348887f752e60fba899c1cc5b7d792606c7b40d61eedb997784 diff --git a/results/reaper/merges_tested/jhalterman/expiringmap.csv b/results/reaper/merges_tested/jhalterman/expiringmap.csv index 5f6de4add7..5b16af54d8 100644 --- a/results/reaper/merges_tested/jhalterman/expiringmap.csv +++ b/results/reaper/merges_tested/jhalterman/expiringmap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/remotes/origin/pull/62,a0c2e3e6a0995582ef1199db7c250f9883b075ea,6cb40a4752c7391c5a4d308d5737639e26dc1815,b6a544d640196f96fc91e21c8227735781a1a0f2,,True,True,True,9,23,212,2,True,9,Tests_passed,7a9c35ea159f49c724359e863eb1ab029d2a0dd2d4db7f4712bd8f1e51c503d9,True,Tests_passed,f0233b79d474b97e985835d8a8942615107ba2fb96eae333d6021525f364c73e,True,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,328f7ff681f29f55824e86fbeb1c3ab468da0dcff7829b65eafd4165b56a8d54,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_timedout,,Merge_failed,24b138810fdc72a379d6a29e0fbf46ad1e5ea8a1ba808647101f68d55d7cd260,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,e032053eb977f90401b5ec7e60d8995eea63cbdda93e2a15543f8ac201aba718,Tests_passed,d53e0eef0ab386fecdf12b2ae6761b7117cb761b6d9abe5499f2f9ccf103506a,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432,Merge_failed,c15577db2d0e6da5581aa8a469d01b3138fb04a20986e6750744438775519432 diff --git a/results/reaper/merges_tested/jiaqi/jmxterm.csv b/results/reaper/merges_tested/jiaqi/jmxterm.csv index 304b6b76d6..afcdb93d5b 100644 --- a/results/reaper/merges_tested/jiaqi/jmxterm.csv +++ b/results/reaper/merges_tested/jiaqi/jmxterm.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,c6a0ae5c6c5b3141e5c0207f44d4757919f94696,63863a7c3d18c62275713889ff5cd6d9299fe3f4,07635f95d926c7b117841327bb8aaa5c2a013800,,True,True,Tests_passed,9a716c57ead2531de7aa5ff5d949f6aafb8f17ea42616112fc2e13e962bf7728,True,105,552,2939,4,True,Tests_passed,933b12be2152a654eaca6a878e417893ae5c06fd47842a14c11c31c227980936,True,105,True,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,e8d27a42899702b45ea019d0d883a9f57a531082429605ad3808cf2a9ed9343d,Merge_failed,09ba8ae9a3ba6d9b48a3bcced68b742ce23d9dd38a3ae359c56f1c7f2b4dd333,Tests_failed,f1b4e90729012bb11b7d36efcde7f5e888d6f65238bb097793fc9238de2857c4,Tests_failed,eacfeae60044ec1c549ad5292305f963727e2656f662d6f1e6e1e40bd2801fc8,Merge_failed,09ba8ae9a3ba6d9b48a3bcced68b742ce23d9dd38a3ae359c56f1c7f2b4dd333,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,01d813cc71d68414d5b9c358ca49484c59b19701f77b30279a12410165474433,Tests_failed,f1b4e90729012bb11b7d36efcde7f5e888d6f65238bb097793fc9238de2857c4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,31c2d0336556dbfbdb49a2371e665c51ad8b21d892450dfdff86032cdea7c5b4,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949,Merge_failed,258f5ed187c80d86e53f6f7eb72544efa4f182b3742e1f9726fc8ddea680a949 5,refs/heads/main,eb38f4012dacafe4b4e876004ccf09080bde4e8a,32cf434df4d70cd02503e60d3be65b9156e2f7d7,211a81796b512118b338f16231de0cf748e0b673,,True,True,Tests_passed,25afcf9a4d83300c0e1502b5a7ce34f163f7c7e1e011553961a716e2ec4ac222,True,3,6,12,18,True,Tests_passed,feaf8dc103ef91d74e3d22fd1ad24e6ee3db2d94ee248f23c517c912bda1ca88,True,18,True,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,794ddcf62288d3dbea5548ae8d5986cf49fd68044fe635ddb14d5648c92185d4,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,7f5102f3fa6b5e01de6f09416320e56de99e81e838dd74ec4dfc7881cd7f2a10,Merge_failed,1810e8cceff2f11fd27120424ada5dcc9bd8feb98d50240f00cfb0a4e0dad3ec,Merge_failed,9848652f9092f4d4c7a64cd7ad282cd8c6f58fcf1f7232b5650b989eb50d88fb,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,3e785dc8807cebed30c8132f36ca82d654e3f18db04c01d7a7d5ed6cb44fa052,Merge_failed,cd623b37f7f424845aebfcd943b46a241b71b44ec62101f9ee3da5b84313bcab,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Tests_passed,8ce406ed4a4b2eeecadb5b2c8481a4c815ecb95cd42a5bbebd86dcef17e0654e,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25,Merge_failed,ada86f9354b3a980b0e4585a6af4be69fb8ab21081248256062e2e5f18475c25 diff --git a/results/reaper/merges_tested/jinahya/bit-io.csv b/results/reaper/merges_tested/jinahya/bit-io.csv index c02eb8861d..fd81a88066 100644 --- a/results/reaper/merges_tested/jinahya/bit-io.csv +++ b/results/reaper/merges_tested/jinahya/bit-io.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/develop,52e4b4dd02963b79a432deed359f275db0363c4f,eb907000fa0b4909b674e1ca9fbdf36627f70995,7dc2f1a267d6262fe7861cb7fceaf6ab858fe824,,True,True,True,73,151,1552,12,True,74,Tests_passed,8b5d7b682e26761a73c6d53958a7e8dbc9dde48bb2ef3953227827be949aebf7,True,Tests_passed,d4cd24cdff90b112168a31ee04bf6c04ebec0fb28616668040d7da3b4116eadf,True,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,eea88dfa9d0ddc701f0c9f814b24aae928338a7ad43245069060977d5e55c533,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,9901e09fc303dbf565aaaa78af1b5f65cfb438880b68fe4b4640bcee5a386011,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,e332b3cafb95990d7233ee3925686111278e94b370bc06cfd96544e4d9504423,Merge_failed,586f5a8fed6056e6d71f63a5071a019b3c9046a4547f73b55793a7be549f6f19,Tests_failed,3608e3c07571acbcb9ee9b60b8cc087344d1c98ed787d0dc175bbdc220a536a3,Merge_failed,bb91229ad9f23114309727f2a1471c741a2ce74ac3a67f067c127a7bf9af46d6,Merge_failed,586f5a8fed6056e6d71f63a5071a019b3c9046a4547f73b55793a7be549f6f19,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,9901e09fc303dbf565aaaa78af1b5f65cfb438880b68fe4b4640bcee5a386011,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,eb24334851464f2d8e45bc61a0765650010b45a25c53dd8be8170f4ec43f6733,Merge_failed,7a298683e567d0b1a1738da6030c915b5a0a167e3002672e349496c151e59b88,Tests_failed,3608e3c07571acbcb9ee9b60b8cc087344d1c98ed787d0dc175bbdc220a536a3,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,eea88dfa9d0ddc701f0c9f814b24aae928338a7ad43245069060977d5e55c533,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c,Merge_failed,98e9842ef23edb8c48d941dfa69cbb0ec31a1e5ff01180e8a3b253a0576b2b8c 36,refs/heads/develop,a3ad5c4ce8fe0b5633b4aa90cccc0e73d774247d,b1642eefdabeb4b1b09e329f82882eed1909acc1,292af81fc26154d3707be9e83cbf8b3b8a526474,,True,True,True,11,46,256,18,True,26,Tests_passed,0455c6c56a5c273fb4ed01800d7e226b42695080bb7aa78da7260ce7f4fe0266,True,Tests_passed,7afb2a8aa488f16b0c53927630708680535b8d831d7b509ce47439bb0cd653e4,True,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,724214221e0e4ce23bdc5c8575d34c4c68762b0c40f463ae21e04bd46b2cb90a,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,6b7dd207b91aa8e61e519f944c297c8d8dd71e895edf7ce1d2655bde97e26878,Merge_failed,727a1f48890496d4031eda123c47722a8dd97cb6e3335f3ea136360bfbbc443d,Tests_passed,73f2ebfaa042135f82cc11bdf4d6fbd8fa715a0e860d1ec55b554b5c0ad922a3,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,e3a9399c4a42109d43024977d1aafaabe8041bb4562b5ec081c3f7a754d7d7ac,Merge_failed,5efbdc50ff2f6f04eb3b91e7001ef7ffb89cd68ffa0d36679c9859620155f9f5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5,Merge_failed,3d51bda7e1909cde1e66286a07fed1349a4b7544a7e988d1f921cb0171f7e7a5 40,refs/heads/develop,ea3f256b27642633a0d92dad57050c2218539135,1c9e183e95e4fee17e668899fe6680f435e5a950,5ca82c4b60609b621f599aa740aad59de23a8050,,True,True,True,40,92,870,15,True,48,Tests_passed,162bc1ecf8f09316137f2a458ee8be5a394fb5eac702f179bfd2992082dabf44,True,Tests_passed,599a2d5008653fa3075a064a00a4caab1404beba27cf9a93eeed66fbe174f642,True,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,0517507c0a59422952620a8d9565e6a5b329252cba3d14d08594bdb2eed85e29,Merge_failed,de94d87f3b863977e37b703b4777ed958f13c847a1c58768c8e0483511f64f2b,Merge_failed,644f8024004c39ae46803da496674c3226c8455b16fcedac1695cecceaabbd4c,Merge_failed,30e036eba0f5511ce8459e58ad90970f492aeee3bff70ff58d98b23aaa03bd92,Merge_failed,de94d87f3b863977e37b703b4777ed958f13c847a1c58768c8e0483511f64f2b,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,d3142190996c8ce72619750c6cdea5cd206ec99b8e776106a0e3296766e969eb,Merge_failed,d2158ab994151466c2316d92548aefb87adc352b0d3031c2e0d7c013c169a99b,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f,Merge_failed,62e04059474553291f381650ba10ad39ae3ea5c4640441372fee28714691386f diff --git a/results/reaper/merges_tested/jingwei/krati.csv b/results/reaper/merges_tested/jingwei/krati.csv index 898884b05f..4e07e9433e 100644 --- a/results/reaper/merges_tested/jingwei/krati.csv +++ b/results/reaper/merges_tested/jingwei/krati.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,1781566efcd25979a849227f0d90ecc108e25342,d65fdedc86f39b553f6f5b717177fa4130dea9bd,c0d6e5e6baf21463785bdfec285c5178734753ce,,True,True,True,19,70,389,2,True,19,Tests_passed,be3c3ca22673b3593cdecd577ae8c8b3066c2fc8049c4f42840c4911d53c4596,True,Tests_passed,70ba88d87f91a874aefe681846e6aec86ee936fd396d25cbab90dfae78fc5680,True,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,6284918bb801520170ef7cbf3b857932dbe0c41066d4c06070548164ea5e7492,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Tests_failed,b0334dbf1fda9a5098ad4fcc266b6acb8999a037444f663114500cb175737132,Merge_failed,b9d7bec925ccc2f3b8f8f19ae26c4b3c14a93a3c16e3cf642c327b3e5d13c4f9,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,898e9a3595888d7f2f2d87c010142c543d67f8cfd15fbb9c8945bdb745a8c155,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,6afa7aef8397e5b056e4dc4b9f718b4956f2533e9ce5b2ccecfc44295b017378,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,11ff2c87e5e5a6d3a0fee607445596ee12a708947cf384342a84adb29ca62e28,Merge_failed,29907ee93f2340ee27b06632b77f74572b52521668b14cc49d62529bba50f449,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,702c39eba7eee3baecf5e1589dbbaeafe5dff3deaa99867b9befb993d73a24de,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1,Merge_failed,06f8f9828b2ac86bc735d776422f4c5d96a840f451fc119c3733e5769573a0a1 diff --git a/results/reaper/merges_tested/jitsi/dnssecjava.csv b/results/reaper/merges_tested/jitsi/dnssecjava.csv index f49a391872..5f3c4927cd 100644 --- a/results/reaper/merges_tested/jitsi/dnssecjava.csv +++ b/results/reaper/merges_tested/jitsi/dnssecjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,05cb5d378fe90768618ce158335fbcb564274790,c3843fa5766a7e1f7f02362e7e413282dc3e061e,72b617fe945d40563b1d0577d42258b4b7eb1cf4,,True,True,Tests_passed,61b329bd8c8fba5a72e08ce2c04532c9a66b1dbb11af4c270c1e69a5ad40d0c9,True,152,348,2197,6,True,Tests_passed,86dd535427e6efdb5b7012875f6222ebb1ecd07e19b97f91707b596ee9c1fc5d,True,152,True,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_failed,efcdf43a5de380b6597e6195df7470430b7fa42c170774ac0b827260e15f974d,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_failed,28d08dce0e1d3c6d42fd7dfff222cc3c3c2fc48fc6375e1f7f960c01b6cb588f,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844,Tests_passed,631803acd37fe1da433980361f7bbf23528b3a2079051b9a1ea076d989f39844 diff --git a/results/reaper/merges_tested/jkotlinski/lsdpatch.csv b/results/reaper/merges_tested/jkotlinski/lsdpatch.csv index 093c36950d..67d87d9178 100644 --- a/results/reaper/merges_tested/jkotlinski/lsdpatch.csv +++ b/results/reaper/merges_tested/jkotlinski/lsdpatch.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/remotes/origin/pull/83,6a4e1c82830d6579ddf349bea58a67acbdb29320,7d2dabf069cf7a85bdd91465673b185621237e57,ce522dbe7c021ffbfdc790e0c984df28e144932b,,True,False,True,2,13,33,2,True,2,Tests_passed,eda8b13df9368694b3691f5595464a07bb8638c278c9fdc1cd4d2d9fd6c021c0,True,Tests_passed,1ebdf987b44770a653955c7f07921fce00dde2fde938785d4a4e044dfa45ca45,True,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,ad3540ff4728bd1f0a550eafc6207dfd49a1d3577188b61bdf9d0b9fe475a679,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,2288275a4df96e14cf99d4e732b3de5a1148ae8c50fa8f9f6f5753ab10704bae,Tests_failed,948fd9fe7b1411e079926f23fb395683d4670bf52fbbd6432bc91e3f5c56a98f,Merge_failed,b069be4348cfa7e88b0be5e36753e85f193532ea02a9122b5b02157097f96afa,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,e415296baa559cfcb907a73c6998c3e68bace96f44f559f07ad169f6c0376797,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022,Merge_failed,95e90181945aae3f5e0042df5a236032a2e824a7f7edfdb62b794498ffa43022 26,refs/remotes/origin/pull/84,323e7ca477d826f187835aeb7ec5004acd21f8cd,a17b507fcdb4efc9419e4becec335398e30ffcac,93d8f524d86c28be9c4911797660df9108d425c3,,True,False,True,3,2,8,2,True,3,Tests_passed,4484bdb29128bd3930fce359e05f9b29dc5faef97d51cb643279ebe6eae57a37,True,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,True,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61,Tests_passed,b0039bc00dd5b7604560b9aeb264cc4c14fa34f834ee7c9eea006d1db73adf61 29,refs/remotes/origin/pull/89,739c6593d8e03cf19f345d56a96db2886f48adbf,261c4d961f314d0594bf23ae1a3756f9a2682ff6,40f690da7664cdb632a57117ccd651d99215dd5b,,True,False,True,3,8,23,5,True,5,Tests_passed,5f96251313acfd7ef2b7f66a11f56ff0c1c7e287d75e4e9645e8ee295f9f06b9,True,Tests_passed,d0b5583b3ce6f76ac60d9c371d80d11ba26fefeb3508d3a716f859d07f78340e,True,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,b6d640b3e92e7651c86ff15710bd10461524294620058d323281b408abf3bd2c,Merge_failed,911502d876f5d077de29e11ae0c20da98bf8577d141375b467e6a00f4a2d1d59,Merge_failed,557d6e92d3e75a09ae9401a17cfa18dac2578f93cd3e14c0d630424c374bcb8c,Merge_failed,557d6e92d3e75a09ae9401a17cfa18dac2578f93cd3e14c0d630424c374bcb8c,Merge_failed,911502d876f5d077de29e11ae0c20da98bf8577d141375b467e6a00f4a2d1d59,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,7f1b5df21291b97c392fb7f554439b89029e877046a08082596a3078c92fd8aa,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,af17aa69bdd57d038f7096a4aa3d77c594d9ee4421fb50375ef18968b40cb9fd,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46,Merge_failed,0ece22f89500447e9a235dd833bef66cd68ff29bd17141f4594f1fdf31f42e46 diff --git a/results/reaper/merges_tested/jline/jline2.csv b/results/reaper/merges_tested/jline/jline2.csv index 8792408604..4fceb86434 100644 --- a/results/reaper/merges_tested/jline/jline2.csv +++ b/results/reaper/merges_tested/jline/jline2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,89539d94808bd1b79e1e37c099111ba33365812d,ae3a537dcfa86bd9a0588732b7f344b3f3ee7462,4bd5ac04c8303b2225e4bbf4d11a10f50cddd2a3,,True,True,True,16,65,307,3,True,16,Tests_passed,bc94147925eda7622aa08984f41eeeb6b245c558bbbd21f8f8a9be7fcd43058f,True,Tests_passed,1009e9d4366b1fe1aeddf2d15b04cc9dba85c073a7365f863bbb052715018492,True,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_failed,464fea628ff0cf35f81750b4263ecd94e1a3145941c65c005e6f3271fba5babd,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,b7c7aa96958f73ee3eed3b86e4dd8075587d8ffc4a7d246e85fab9629fbde175,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77,Tests_passed,14da58c41adc4e3f0b68749be5faec11c812cfed5316b8e8abc4706426a9df77 19,refs/heads/master,f81985746156870b23c7a3c7e1c704d0d3d09e92,80d3ffb5aafa90992385c17e8338c2cc5def3cec,294b9ed4d82598415e23d9a19241463ded9a2b68,,True,True,True,14,58,277,3,True,14,Tests_passed,ceb6172edfcf074c385b79c3df34f1b6514f3eb48de6597317a05f527a362ba2,True,Tests_passed,75ae93171a033c01078219df7265c8a4add6187ab744eb5c9d84c446aacf71a6,True,Tests_timedout,d4dedb147b2820658edae301bf44e5b46f692dd6f675e13e27df9fb6533fa1ef,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 22,refs/heads/master,348cb9dadabbe9a315ffcf37b9221cf098e3cfeb,fcdf825312f57a0cc8fa9996c91afcdd976dc6d2,28f10d7755bdb063ff459d84f4922e67e5afc445,,True,True,True,26,142,1352,3,True,26,Tests_passed,c9b12da0f4a413d78c79e0f10b5ee181d0861e11ad93dc57c1175ded68b0f67d,True,Tests_passed,1cf709835046758f603b3c410c049dddab1d4574f65b22ef69d6b130831c415e,True,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,4236dc89dca62fdb2bc8748260c2ce188bef5f76baadaddc3821e410d95bf976,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,67642cec9961568f9db050204dc49cfb7de08e350c6565bf96cbaef36e3ce637,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,46c15b031b33d9798897c37e62deaa753ecd0324737728c858f4d6dd40d0e9c3,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,67642cec9961568f9db050204dc49cfb7de08e350c6565bf96cbaef36e3ce637,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,46c15b031b33d9798897c37e62deaa753ecd0324737728c858f4d6dd40d0e9c3,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,4236dc89dca62fdb2bc8748260c2ce188bef5f76baadaddc3821e410d95bf976,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e,Tests_failed,a47aaf7e6a409d0796890861ffc8a3880d6d1e57556675f7b78fd1c76828656e diff --git a/results/reaper/merges_tested/jlinn/quartz-redis-jobstore.csv b/results/reaper/merges_tested/jlinn/quartz-redis-jobstore.csv index 72af3be36e..043307311b 100644 --- a/results/reaper/merges_tested/jlinn/quartz-redis-jobstore.csv +++ b/results/reaper/merges_tested/jlinn/quartz-redis-jobstore.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,767ebce5e516b009457191f3de3b6ad3427febff,f1f4414055b5e362c08d2638c64dc77f8be5c239,386291881db9730d2f985e6d0714112da5599f18,,True,True,Tests_passed,58063eb4a5d51cca9a0bdabffebdc38d56e2f28e17f9b63ada564c5575e4f1fc,True,16,85,421,2,True,Tests_passed,053753e0c13535d7387611944ed0dc720f900470a678083356c4757c9f349e7d,True,16,True,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,aa570eecf8027df46d75d6bebd94ebdaa13925e90de71e40ff6d8b72cc1f0ab9,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,aa570eecf8027df46d75d6bebd94ebdaa13925e90de71e40ff6d8b72cc1f0ab9,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f,Tests_passed,8adbd55aa38c219776e28236902c38c35606086922b99bb2e27d96dea9ad6d0f 18,refs/remotes/origin/pull/67,8b87e2b2c3427b604f42bb48d3c06843b6ed77d0,8319caab3c74065fcd1e0cf10c206f829aa6b650,a4693da53065f64bf9164e41c4db2f137cb0654a,,True,True,Tests_passed,5bce0b2309a52ff1040ebbd5f73cb49698a2a7428dca680892af250f38919ab1,True,10,21,258,2,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,True,10,True,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_failed,0e4bf847551a36ddfa8e378b24c4c6086f5b6ebdc824e0bed3b3b9cb43519c7c,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,94d067a48b41d11c1b6ae73ffd7cef5bd530b840702d678110277a1fc3ba1020,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,5a9edbc1fb7aa235f689ea8ec54e692202641041f457489198dfe9da993efb15,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83,Tests_passed,6331935ca373832cfb20395218a468468698afe942a95180a3cdf24bfbbf5b83 diff --git a/results/reaper/merges_tested/jmacglashan/burlap.csv b/results/reaper/merges_tested/jmacglashan/burlap.csv index c00272a82a..dfddaae204 100644 --- a/results/reaper/merges_tested/jmacglashan/burlap.csv +++ b/results/reaper/merges_tested/jmacglashan/burlap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,4e8800b6680f46064862f5b9c28ca5499203ddbd,3b1917000b96d9fe9cba84db6ae8cbd3143dad2f,f4bc6379d047c30d86fc62227c55e5a7b09b5a35,,True,True,Tests_passed,23fa978adb1b61e4ffa7be83aa8f83aa8d39a796ed4e9ce5d4b43ddbd90be278,True,46,65,175.0,4,True,Tests_passed,43a9728a1d77cac8cfe3fd1c5c3bc70274727ae2a60193bc0d0ea0311a39bd11,True,46,True,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,99b78695843756d6c10dc519dd5a2cb0ec9327dcca24d1625a20a480cde3d33f,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257,Tests_passed,c0a0aae3207b38f95ff86b051429e3cdb6de1dbdb2f7e2280c7f70db87358257 27,refs/heads/master,5284c2d1ece3f22e5182183618daa7253c11edc5,386676cb8520cb1a921c32bf3dfcbdcf533fa911,999d52337d741ab6fff7903cad648a1b561add27,,True,True,Tests_passed,1934b38a4cd27a94fa3fd6fa68dba806996474b1b2ce9b6f14b91616d50078af,True,100,158,1247.0,4,True,Tests_passed,c745abf2107e5d42651568d75ebb311b8e395d083d123813124d0623db38d5c2,True,100,True,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,f8057a1ef69fd963534ccbfd387c77f77ed1e80ed7b8106c9f1798e7c7579df7,Merge_failed,97d6163ca45ed0d7741b98ef730d2550ef526b4c6bb59939551d4418e79476c3,Tests_passed,c85e12b9149237818540d6de1ba1dcc62f0534a44cf12a5bfd8928cc3a786562,Merge_failed,b1033591d96039edabc3d0211d9bc86b8c5f4e55c0475db561271574b9843660,Merge_failed,97d6163ca45ed0d7741b98ef730d2550ef526b4c6bb59939551d4418e79476c3,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,346db451b50b4203183b1167da5621cbfa7c005bc7e1e1a4872a38553be6fe80,Tests_passed,c85e12b9149237818540d6de1ba1dcc62f0534a44cf12a5bfd8928cc3a786562,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Tests_passed,96572263b431c1ecd41f30f9e57a3a8264f97fb74ab33304cbaa64e8baf0fac4,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d,Merge_failed,e1d93362f9c250e2ffc81abd0468c31ed8c725bcc49541632786ef019f5a263d 29,refs/heads/master,3a9a57f130852a9da62c5fcb5d1e1f185040c836,8a17ad37ec4b2bca49119b417225470ecba2b7b9,bf60804b2c75e256644f15d5ae96b85962b728dc,,True,True,Tests_passed,c687d1a9f49287997b93ba7d2df1f5a682c385fb6489482547fb84481f548f90,True,89,143,1157.0,11,True,Tests_passed,b298927f908ba8c42e53f1c4f6f22beba2f2288ebe4a674d2b8d9311643aa205,True,89,True,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,f4ebea8be246fff9757f05d28784ef150131c9a22cb1d31a8b77a6acf4697a3f,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,f4ebea8be246fff9757f05d28784ef150131c9a22cb1d31a8b77a6acf4697a3f,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0,Tests_passed,129f363b9120be3d4f05a2c7c603cc516fea10b1b1c1a92ce71263108c73b7b0 diff --git a/results/reaper/merges_tested/jmetal/jmetal.csv b/results/reaper/merges_tested/jmetal/jmetal.csv index ab67e0cb95..2515ae7255 100644 --- a/results/reaper/merges_tested/jmetal/jmetal.csv +++ b/results/reaper/merges_tested/jmetal/jmetal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,603a9332cec32fcec56db88c2c486c419723d77c,2574d157bf553894c1601312d0cfba9db4d36550,723030123b7596c5ab922390bcdad3ceba1f0a22,,True,True,True,19,27,248.0,2,True,19,Tests_passed,46447f1ea6236597df1fee86c245979d844ecd3c30ddb6953c49e9ec84391283,True,Tests_passed,ad48873b6dd833eea252a795a53733bb592e3ee2fd02944749d3517771f86db6,True,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,a5d68f887fafd25459086beba35e5b2726e341e413194e27bf10392dfd5eefca,Merge_failed,ef3b4546cf2816458850ac8e0604fc40b893d9f223e1c0e3fb364d198478cd0d,Merge_failed,2052faa8c2e7c8e3bdb55483417dcdb7aeaf71c82e32b756060b934035f12b73,Tests_failed,acdb863d550101d9b47277e5c519b8c9a6c29863e79247c6fe566836bb7cf4d6,Merge_failed,ef3b4546cf2816458850ac8e0604fc40b893d9f223e1c0e3fb364d198478cd0d,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,770dfbc57f791501a860db2ef005bfa22a887f8e7ed63b6f74fbaf2387f27679,Merge_failed,2052faa8c2e7c8e3bdb55483417dcdb7aeaf71c82e32b756060b934035f12b73,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a,Merge_failed,da627d489f183c4902e8b142696ae991da0269ab4d160b0e4a9a01fdcedec84a 11,refs/heads/main,f2a7247f193d01427b1baa9b7cfd2ce31c083cdc,2e1e597f77c10873b27f20c6cce676a89f04fe17,d1bd3548e043056ee3a663ae067edd4f230f04fe,,True,True,True,151,391,4709.0,2,True,151,Tests_passed,45b563e4ffe3f7e17c0277b2dabc9b44244bc210f76eeb3d3f11a20b5cfa1fa7,True,Tests_passed,a4764a3fe2d29ae08240009333e8f40138690e1608c685df4b3ceb208a20eda3,True,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,ffd2cb79da2312e42e1916926c3fb0b70ea6e1000bc249d8a78ef6b37bc43eb3,Merge_failed,a1e3aaaf83892f122a1070e1e7211e4230b4f18cbb1aabcfd76491f06f4f7559,Tests_passed,bc354ab607764da7ae23c9aeb93cc99643a951822fe597f4c5590af6b9bef2b8,Merge_failed,daf5fa3e38bd713d2e7f2e8fb8bd9a357244ff45b415e4967ed71a129b74d8ee,Merge_failed,a1e3aaaf83892f122a1070e1e7211e4230b4f18cbb1aabcfd76491f06f4f7559,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,dc66fb97a218bf2f1154c130deddfcf9ae372b02833b276b753f25b7285ecafe,Tests_passed,bc354ab607764da7ae23c9aeb93cc99643a951822fe597f4c5590af6b9bef2b8,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657,Merge_failed,c6be75c0d053a6a49f2999562b60ba7b68de09ccb6fd7e6afcead4c407ec0657 22,refs/heads/main,9f01645975705fab61f50c52d69cbe8291613a12,5aa34d2b78b9ade8f2bec96edfb849df0bc7f883,5ea9b8321e55bcf4f56372166c70d85de7db99c6,,True,True,True,34,67,1288.0,2,True,34,Tests_passed,6e210a593609a97a3289ddf4e85351e14a1fab5c1cb41e8cd6d0e39e0f00709f,True,Tests_passed,4180fa7d0ab0a9320134d441667fd2921cc937dd43cca15cd93c020a94138d49,True,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,98a72f44b35f0964480a39d376e6e58926d67feddd930ea66caf2f5456fec4df,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,98a72f44b35f0964480a39d376e6e58926d67feddd930ea66caf2f5456fec4df,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,a61ac8b213634f8bb480fa90bfd481e4f96c5a355d61303b74cdb7fa9a1216ad,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8,Tests_passed,8b44ec4c0be1dda39877c60c589ee57ec8a341cb2f03aa56bdb8c0091de8ddf8 diff --git a/results/reaper/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv b/results/reaper/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv index b1c878aa8e..295cb847ed 100644 --- a/results/reaper/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv +++ b/results/reaper/merges_tested/jmeter-maven-plugin/jmeter-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/main,1cac1475971c1f6615a006becfd86736f7fcd317,b2a7d8b6593b5363b7c2fc340fafe7fab638fc11,8066d58741ad12e0b9197347c18c618aa1bca08e,,True,True,True,10,39,236,2,True,10,Tests_passed,9c7bca091647681b1ebef15f7798173037a80e12d3de76d8ed0f149ff471ed6a,True,Tests_passed,00adf9db9239ca88fda7b597e43e4131f217bcb22f195c8d711408283df1a9df,True,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,ae2ff855b60ab1d11f29f814124b322d6bc0ce1c4ddac7c0a9a2c6797d814639,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,ae2ff855b60ab1d11f29f814124b322d6bc0ce1c4ddac7c0a9a2c6797d814639,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fcbf11884b480bfa265a010e2ee099caac19aefcc2dbcbdc4d611b3bb622d817,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57,Tests_passed,fa4311414fa010d9374c422891691f5a4b4acfa75babf2a43430045a0567af57 18,refs/heads/main,efc1712ae3cf864ff9e552c855f79ec5617dba34,bf8b0b908c2115a4e6a89172df35ba44e9e78703,8d2d280c9edccd06633c5a08af53a5a02b3695b2,,True,True,True,17,73,618,3,True,17,Tests_passed,852319d1cc6497dabf78b628d68ee3987d280c672c12647b717fe17c3cf02766,True,Tests_passed,2e75242bb607218708415c75eee0ecefb0af740899a29fdead2c8287d6939e75,True,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,2a6e321d3c114486298d32d628595c7b8ccd46a6c55cb3318711cd941bdb1d98,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Tests_failed,ee55120005b5d0e1fecd11fab09fe6d819c41fa4a7a308f825182ce752a7cfbf,Merge_failed,0fa13401938e8f2fff0b1f46f7a02bec6e6858b7f223414752cbf5b37165b3e0,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,aa5976bfc2f47289ac65580d0e4a4adc318ee14284c56b713ec83994710d685e,Tests_passed,c470f92b49bf54b5a003cc7faf717432cd851eafae12073cf1651acfdaeefa4a,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f,Merge_failed,d047552a63a40473d8e6b514b30ee9ea22ec55ab2bf44e5796033709348a002f 42,refs/remotes/origin/pull/118,bed2c2faa7de3029450d0a675b490907d0176e93,9b6e927eb0d991b98d56ca991285b40d49ceadac,b992be333cb3f9198a9833daf704dc84a85d49f2,,True,True,True,2,6,32,2,True,2,Tests_passed,532c4440b1388c2ef59b3ae6f323dc11ec1c08feaa8e02d5bf32eebf63a367cd,True,Tests_passed,a7e240d9313b61ea532afc990afcc26271c6ccce337a0be600812e82de0323c4,True,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,7cdf18a8c5d6363e1803cdd384e80dd1d87b2aa02a82466b8cf2b44ea371499b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,7cdf18a8c5d6363e1803cdd384e80dd1d87b2aa02a82466b8cf2b44ea371499b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,9a2c3cccf57e8b9f61912b8ea9d0290300357f7128bb52b464487793d13fa30b,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3,Tests_passed,cc31a46ac8fe1b88ea89978b8adbf85fd203b6d8efc227f3d1dfa3099aa096b3 diff --git a/results/reaper/merges_tested/jmrozanec/cron-utils.csv b/results/reaper/merges_tested/jmrozanec/cron-utils.csv index bd64e7e747..22fdedc8da 100644 --- a/results/reaper/merges_tested/jmrozanec/cron-utils.csv +++ b/results/reaper/merges_tested/jmrozanec/cron-utils.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 47,refs/heads/master,56a9faab1c79a0118677324ad31878e8bba372f9,be40542c2c55cd1d0a4c59374e508955200714ae,55f277f1ee25ce954d82c79af23f0633ef55b361,,True,True,True,8,21,315.0,2,True,8,Tests_passed,83826e842e905a6dcaf76f7cd95eb254f19b4c9100edcd2a203135a9d2df0162,True,Tests_passed,c78ba8d1e823d5f0eca39d0a0de135c8c471425422247d4d76582538ab924e4f,True,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,bcf1ba49553e2cf8576d28854a3bf70b373807525662c3da37a92d2c8d482f24,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,c3ce2f62511037438a810404f0eff8509e0d15072c8cf212de5d10d9f764f596,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa,Tests_passed,6b41985692827e44ffaa3eb7fcf038c0b6e9ff00155727eef7cb7fee5c4aa5aa 155,refs/heads/master,68a51b5bbe7dd8c6ee4396dd86714bc08e26850a,0ce29f674b4fd880b7f8433c6f1cf74e74f6bda6,ddbbc3da9e9cf10b8641ee847535e0b2e52058fa,,True,True,True,3,16,87.0,2,True,3,Tests_passed,608f50e91b305af3fb1b50a1249271fa42ac2ff18e0ecd3d0bde18e452bd84d0,True,Tests_passed,e0915690e73292de37932604b65bc2102e9ee2d793c61931e614777bab21e942,True,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,fd8043af78685af2598e610980184c1b2681c1736b8b1186ddb7de2730905835,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,9c015056b101cf6be9fa3cfc8097fdc88a615058bb97eb6b00d1683bdcf5c184,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c5feb7c6257bea04105c4e13ea3c01069595a673ba6eaa70dd0e6ffd3af477d3,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,9c015056b101cf6be9fa3cfc8097fdc88a615058bb97eb6b00d1683bdcf5c184,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c5feb7c6257bea04105c4e13ea3c01069595a673ba6eaa70dd0e6ffd3af477d3,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,fd8043af78685af2598e610980184c1b2681c1736b8b1186ddb7de2730905835,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686,Tests_passed,c8aa8fe48b9fed6138e70c09bceb3d57a72abb6b85f661a404c6edc96de05686 189,refs/heads/master,b788888f07da30b9247e17f4167aafc516dba869,bce38083d5cb200193732ef7f47e9c9f47f452b8,4a2ffd2cdd138cf0b122c96cec0157e6e881d674,,True,True,True,74,978,5142.0,4,True,74,Tests_passed,b1f9af9d7a8fbedd5e3d3487269bfbd6a09d892dc603969310d45921529d3aa5,True,Tests_passed,231909e0b9f5678e6d5f8a4b0855618b0f96b07a189ebd40bdc5dc0fc39b816e,True,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9f5de942186ac3283a21c2e4420ed1b1af1025969963c1885229d20e7e8b43ef,Merge_failed,e5dde0a215f02b5e0114f1e81413f7047703586225b2e01755223b20675f813d,Merge_failed,331d1e4195f41091aaea91650cc4f37da1fa858f5a1ab5764fae1aefe7867438,Merge_failed,2c436d39571c06f6fd949fc18bf01b0cc2cb0317b47ea9abe1e76afbd2652a01,Merge_failed,e5dde0a215f02b5e0114f1e81413f7047703586225b2e01755223b20675f813d,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,03f6d3a4a782e25f3b5e6055178ad8d8c241da75f9760cc28c2b38c07f012016,Merge_failed,b7dee64bdd2ae73982c63e688fda809f85a9eef93840802cdc41819e1fdc59a9,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c,Merge_failed,9e630b980cc9db3187588aa9feb6fe966990684fbaa83cbbd039f290de6e124c diff --git a/results/reaper/merges_tested/jmurty/java-xmlbuilder.csv b/results/reaper/merges_tested/jmurty/java-xmlbuilder.csv index ea48e5e0d2..17b18b9f06 100644 --- a/results/reaper/merges_tested/jmurty/java-xmlbuilder.csv +++ b/results/reaper/merges_tested/jmurty/java-xmlbuilder.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,4ee5f60778e25cc1f762eb5c6f6747ea15354931,de0c78aa839dda06bdfc92fa0eb7aa8af3d8104c,6483a913a5ee3561e8ebe0b23e5716f96eb447fb,,True,False,Tests_passed,d04f0ec5d99017403ed35fd42761441d2abbcabd333a4b8f80afdd7e1a34154d,True,7,55,204,2,True,Tests_passed,cce0483f078c4fe02f23db8cab1e9b0e2fef8f7fb90d8585dad4b2aba264366f,True,7,True,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,1a9dad78617da0691f9c25f28fad3a8a799b57b87023b994329df8380c6d8c5a,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887,Tests_passed,8f8f878e0f3e12beb259b5548bbd8a67ebda72b99132806347fbe2ce109d2887 diff --git a/results/reaper/merges_tested/jmxtrans/embedded-jmxtrans.csv b/results/reaper/merges_tested/jmxtrans/embedded-jmxtrans.csv index 6842e85897..f063932876 100644 --- a/results/reaper/merges_tested/jmxtrans/embedded-jmxtrans.csv +++ b/results/reaper/merges_tested/jmxtrans/embedded-jmxtrans.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,2266cfcadd9491cea8c5eea1d7c08116ce35471d,4148ed2bc9f8fe8ea4b1595b905669d39b4dfa40,524b8648461b933e02d7e2a8e7f3cd91f9cc0da5,,True,True,True,5,29,210,2,True,5,Tests_passed,fcaa257aca4e29b23958701e9570b2078ebdafa2a4d44423a64642742a312257,True,Tests_passed,c8c9734bdea9c1796f2906014144d0e6d76f6fd044b8aec1515b9e8c42d04e05,True,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_failed,807f0e99c840638f9687e0fba1f5f56fdb97a6a4992165137f3aa50ba6d015a4,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,6bb9010c40edf6c503757953ae7f32e414ec824381acc32f4bf15cd3890cbdb7,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0,Tests_passed,c903a8f93b47b35be326c50c994d0487eb408dbc583adab28a3d6c00f5d361b0 diff --git a/results/reaper/merges_tested/jmxtrans/jmxtrans-agent.csv b/results/reaper/merges_tested/jmxtrans/jmxtrans-agent.csv index 24b6e2d2d4..a1282d47c8 100644 --- a/results/reaper/merges_tested/jmxtrans/jmxtrans-agent.csv +++ b/results/reaper/merges_tested/jmxtrans/jmxtrans-agent.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,caef360a1fe53b81626bd62aa858b8541272f71c,a32d7743b15af3d88b1f8ec84c161c18b1c038ea,efa75a3bee4c285e8d4f44f974131d653bfeb8b8,,True,True,True,27,75,472,5,True,27,Tests_passed,8f91e9f7907a566717b1f7a91f92e0e5b81e59bc97fc81593fff3931c4c942b8,True,Tests_passed,f21f9756ff5e9556fec1aa4e6c69f1dfe94d7b6dd8782a8dc643c45a454f60d3,True,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,04fdb085d46366b70ae96ab54f39ce9c9585a01d922fb134a9e763af2ceab284,Tests_failed,226c67bfbcff30acb482b15be1033f376b91966a0a674c35749ba9475da764b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,04fdb085d46366b70ae96ab54f39ce9c9585a01d922fb134a9e763af2ceab284,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5,Tests_passed,646971830d48f0652b5c2ef4cf520e4cbe0fe0602b2bca59776cac02080d20b5 31,refs/heads/master,60e40f2ad4d067e75c9433b56c139e15ba4642f5,50eaacd59890332041d69ac0ede573d96329ed95,59e060ee6566654261084e583b34b0dc1194a6ec,,True,True,True,31,119,1957,4,True,33,Tests_passed,9788efbefcfb3a717e7e765c416dbf05e672d61c3c763e01cda3422676025e6b,True,Tests_passed,fe6fb2c3b34875510b4f9e5057dea4e97995649ec570b5bf00acf0d12e4c0fa6,True,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,5f4f21b4eb3f7d47129a4695ff631f7f17002741b7062b8d48df1016aa747b67,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,808984bd76f665bd17544d1eaca764b2362ea730ef354b05d042b20ad8f58fd6,Merge_failed,abc9116ee868c616a1361404222c083c7a26a7da7ce42e01882808f5037f1846,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,d140f9eb00b538dd839b8103e4dea703c901095e01b77aacb82880501f436568,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,ddc8626547c8dbe75bc49b1b4231f85a2ee75cb930597d67746fc7e2d0726e81,Merge_failed,e7884d0c1a2fb5748f4cc34b5a39ab149e712272107676069737aa1c412aa789,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,50a215d629cfe3e3626c1fbbbca90ecdad4a22c365a2434c905e408b8492c1ff,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c,Merge_failed,4ec977658f9768899b9db91b323c22dbcab978861750b80d503323b92ac1593c 33,refs/heads/master,79a0294ac330946788b98858f0c58692004b33ea,6e208f78f01b06b0a725b3e44379c4314c579a0f,da5878fda7b3033f7a3a246bbc4e11d12bb56acf,,True,True,True,18,74,982,2,True,18,Tests_passed,a09a75e7181a398792921bf25d33e514d0cd45118be8c2dc670ecfc8590e9e6a,True,Tests_passed,ee526316138a00d14466aa6dbc24677d655e98d8ac5e0ac183ed21964dee91b5,True,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,f7971d0f281e03d0e77205058436adf50d705aae615b22ab50219490f4756789,Tests_passed,118a8036e62ce214ef8d17c62a59b6b402148682cf961b5db2026af12e072aba,Tests_passed,4487003c7f42bf6df28d98e0afd6bda8a202fbd0bfdb18c1c71e2407113685c3,Merge_failed,efa987981735d55f3fec64e5bb91adca78bcdfd33f64beaa485634e1a844c18d,Tests_passed,118a8036e62ce214ef8d17c62a59b6b402148682cf961b5db2026af12e072aba,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,4851d22a9c2496cce4530dbe447f0f58c18232886873eb5acf51cf28a74eb27b,Tests_passed,4487003c7f42bf6df28d98e0afd6bda8a202fbd0bfdb18c1c71e2407113685c3,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Tests_passed,8b99a7d5b08655d757c0f0346434338bc9c380619c75d126499735992b5c0c9c,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42,Merge_failed,270dedf0095811e8d462f417991f786553540e0173c77444570a205f14246e42 diff --git a/results/reaper/merges_tested/jnasmartcardio/jnasmartcardio.csv b/results/reaper/merges_tested/jnasmartcardio/jnasmartcardio.csv index 9fcb3aef44..54db9dbdd9 100644 --- a/results/reaper/merges_tested/jnasmartcardio/jnasmartcardio.csv +++ b/results/reaper/merges_tested/jnasmartcardio/jnasmartcardio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/2,d2203a3c4b2373e013348cd1f2c167a8343ee344,2eb297e73a9bfb689da7571f0d5d0dd5fdb0f079,ca033c9d60c34680cf208f7c6eb4cdc59d62eea4,,True,True,True,6,50,623,2,True,6,Tests_passed,fe86e67eefc50de41a818b5c41ed4bc5cbc7b4317b56d242c678fa24d7c379a2,True,Tests_passed,24db2423433b76a5166a57598ed69cd1e94d5f6cf314afbee317035000dff892,True,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,17658ca5ec7d843c7863e5f4c92fc64378540f5b81039c9bcd65abb29e591eb7,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Tests_failed,fea9b7034322e784a7c5263f8086101613ceb89a6c133e5a89adaafd3ea4ade3,Merge_failed,259c643fb722d0d984b1455d83d926392b3c51e7ec1219479648c08f22820e6b,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,5efe0dc3db0f298a8c413de65cabab51d90a698b5609f049298124d44d4feb17,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,165a5c6db93455ec7e36f83cc5f7ae948b89884f55756ce927c1ed79b3f0a8ca,Merge_failed,be4b31cc3dfc9c151d5ada07ad8ccb6571b195f1251a0e1fb3ab491c49b25d6f,Merge_failed,19eb649297e04405a754e716749467e18d5df187c840b12ed14cf609232ccb74,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,60cab57d121ab5499b3c06d2f588fa2f499b443e0393d61c2fd713d540693f6a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a,Merge_failed,0f01a2ec47bf41974e715a2ea0f3ca9fa422a6c333d37bd9a0e903909e3d400a diff --git a/results/reaper/merges_tested/jnr/jnr-enxio.csv b/results/reaper/merges_tested/jnr/jnr-enxio.csv index 9e2a44e29b..39d9674618 100644 --- a/results/reaper/merges_tested/jnr/jnr-enxio.csv +++ b/results/reaper/merges_tested/jnr/jnr-enxio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,06504df5c5e789b3ae946cb938e00c2aa2e78072,c23148ed63fe76f01f16e74720adecc69981f803,7a3a45805cd2b44414df118fd8d21a9606fad2d9,,True,True,True,2,11,61,2,True,2,Tests_passed,a78e5a501c75c5b9a06f5562475d74e5c40a5bb8df8c85e333c4a86352952fb5,True,Tests_passed,e3768f8888ccce91518edf8ea78139163681ff2d99fda57841fe82a1b02fb442,True,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,b874150f7511597e001e55bed0f00f8af09e52b6473e3c2f6406502d839cf206,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753,Tests_passed,d895d1747571c62c25fdf58d629ea0cd11f6ec38cb660b4ce1ed864cf8f81753 diff --git a/results/reaper/merges_tested/jnr/jnr-unixsocket.csv b/results/reaper/merges_tested/jnr/jnr-unixsocket.csv index 0ad0b7e967..646b36ea3f 100644 --- a/results/reaper/merges_tested/jnr/jnr-unixsocket.csv +++ b/results/reaper/merges_tested/jnr/jnr-unixsocket.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,7a88525e30a858f886045abf598c4d0580dc204b,bab24354b9d4cbb5583102661f687b737d42b562,56ab72a460fbf41fbd37f460eccd0f890b511903,,True,True,True,23,77,1085,2,True,23,Tests_passed,1d08b86e0f608e27da288fec9aebe0df0f5a2418c39b8854e8a05f68d2e1529c,True,Tests_passed,3695ca94d268f5ab74d3d94f002e11c0efa7621e12eac5980735f6dace017ccc,True,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,5b1d1a95a4c2af507fbb8d776a13b7fe9ed691d3e97fa90c4fa71a5fcc252bc3,Tests_failed,e1109b16f0cf62c17913dce7515ba54c71ceeaca1a2a3cc8436757fc8e4a5ea9,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,5b1d1a95a4c2af507fbb8d776a13b7fe9ed691d3e97fa90c4fa71a5fcc252bc3,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95,Tests_passed,8bad1cb1f8e306ace2355183578f4da60e33bfb6dea45ada65ee4027c1a7cc95 25,refs/heads/master,1a75fb81ead63de73cb637dca45353706395fb2f,b13d7e769dc494756ae27c9763530590636ec630,47c0a2aa49646012285b43f87e2ddb02dbe26947,,True,True,True,16,47,1947,3,True,16,Tests_passed,f6a48e08cfbdffaac34c12958f297e5a01309138adbc1b14d1b90b4e1cccf988,True,Tests_passed,e5e9a8041c228a125ed2a30755ab53485bf9f840508695866b5a4182b12e97be,True,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,fee0305723caed464b14ce9a1e6729cdd9500d63df0e3da068e9242782d559dd,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,a53c3f8d3d3352b2215263c988e77250139f75875def88ebb142f5071d7c8b35,Merge_failed,11d1435772c7b5882daf09701532bbd01c2b6b2d291579a194ab77ae1539d0a7,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,b9486c0793999e6b8b17d3e5a2678b19c2efe7470523507a3b563721eef77d91,Merge_failed,29585878e74243d3a6f8e4a74753246bdc8d8c71c269e0c582f19614a1fe33fc,Merge_failed,3ee02136e32266e78ff68d7b305cfb0937878f23e76d9a8241f3cadfcb3a6bb1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,dfb85951999f0ef9f1b47425fea84386b31b5e75afa8c2bca5f10b0210b62ee1,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216,Merge_failed,ae8cae6db52ce6453c501d9e1623a110307d178edd09a2bc9756589946ea9216 35,refs/heads/master,7d8d10cc2c47723df19342af5f929782978081a7,33814339736805543ff5bd4be863c6489622283e,7635fdee121cfc2e8b3f0d6757401b919873a88a,,True,True,True,11,22,311,2,True,11,Tests_passed,8af7bb523009ccbd31696ea7598330cefb4cd7621c7361930e890e5fc7923c1f,True,Tests_passed,13ed23ad95724e079d8fb6bc6e4c83baf9ae7d9a338fcdb4fe70969e1acc93d4,True,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,04268779eac6a4f83b7c45291b26ff18f158e8041b487b7ddc438d85fc64fda8,Tests_failed,56881a0cbe34a12b6242b5d4b7824b3b4967ac3af4790eb1e625fdd12c4e71f7,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,04268779eac6a4f83b7c45291b26ff18f158e8041b487b7ddc438d85fc64fda8,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,6e3b6395d2d7f4a2b3241eb46249c25c6221db196f37bd2ebeb16aea5580b1d3,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650,Tests_passed,2029070ee2fe25b7e731d52583ab12d667cd9bef1630c005fd3f77860cd0e650 diff --git a/results/reaper/merges_tested/joaoarthurbm/designwizard.csv b/results/reaper/merges_tested/joaoarthurbm/designwizard.csv index da4ff5e952..2b94ef6d92 100644 --- a/results/reaper/merges_tested/joaoarthurbm/designwizard.csv +++ b/results/reaper/merges_tested/joaoarthurbm/designwizard.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,662a073a370b6ceeac9ccc052db9ee6d9a64ec1c,3b4bffa8d3eac2c7b5e712ff8037f534ecce3a3c,70c5e4cd47195d5679af62471cb41a2e5ab7771e,,True,True,True,32,668,2110.0,5,True,32,Tests_passed,283db25eb4d71fe9e18f3dcaf247e99f6ff22e421706abae2f0f23005161df06,True,Tests_passed,a277fd1b18f0097962ecc4df68f8b86d4b6b45a6152df4d65117073674f61e0d,True,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,ef545175bcb92557f9245458e62668631a525b54cf7c1ef25b4feb631d010dbe,Merge_failed,890343139736cbc49e71f968ad330032035b5ef5be732d399a720a6d02a59295,Merge_failed,b13ef5a38ad9ec64083aab9e6281ab318f24bf1da690b4875b8e5ea3316ddbae,Tests_failed,76b498d825e5b4dd0e810eab1fa22e33953153e5545a66c06e59e609e5f4f9f8,Merge_failed,890343139736cbc49e71f968ad330032035b5ef5be732d399a720a6d02a59295,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,2f35b494746113e6d4c5b5901371d8f056c61b44b053a8c4928beb6379674afe,Merge_failed,b13ef5a38ad9ec64083aab9e6281ab318f24bf1da690b4875b8e5ea3316ddbae,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,bc0440ea0c170441a3b479ecfca8365604923d8ac8a8ae6c6b8b9dfd480acf21,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8,Merge_failed,78c68fa0b130f75845097e4ee2e08037c17adf92037ef1a0971087b42dfd2de8 8,refs/heads/master,58fcd555cc6909bb7ca3df27d277600d8c871a81,dc838e11ebd5703f3b6f9506291d6f8f7f2e1f48,1cad83c5ea89ea295fcd6b3019bf095f05dea38c,,True,True,True,32,682,2444.0,6,True,33,Tests_passed,2cc66e406f85207dfb76a2b85fff5474fe37b2330c35f99b0b479e28b9866701,True,Tests_passed,b64c099bef0bed2dd66aea9472ad9a462f4e580cd526cbae3b31fe9543d3c781,True,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,238b73373d281b1a2b1328af800a414dfbad7d08419b0863178608d02f9a9a2b,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,21679d53d2ef46adf438acb79fc7b47162ede579b05778f1253a20c0ccf40eee,Merge_failed,b8d84e4711cbab02bca054b3d3c5f6f896da49ea1a8a4a9386bafc6e0d0d9cf2,Merge_failed,ba845f233417bfec7f4c67d26d17b19285ab888f620ec65491651845c42653f4,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,b78083cd92249a8407ef92737af33914698ee8728dc78e5a543dd5993645d6c3,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0f26484ce6883647b8fc06244c12986265fde0e8d76bf854cf4610cdf285c5b1,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,625488361164c108b584102b6e9fb9f70c26fded33286b7eda63c25fd28e03ae,Merge_failed,818b36bb19a588e61e0301801dfdf668c5f22cc0048c0b091663350aa24f29d5,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,2bb9ad5654ce36756035845bf58ee2035db3c9c94d92f47f36b01af6a5519909,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667,Merge_failed,0a26f310a84ca4a069c868723d143600cc59cb99f7d0cace25901def63502667 11,refs/heads/master,779483e0076fe0337b9e974f12c06390cd794323,b120a990b621a7be7c3f43bd7f612c53339b834a,6f988643c62dd01a7ee80939f07d5e70487a347c,,True,True,True,16,24,246.0,2,True,16,Tests_passed,2c7e7592103b9e165bea346007af502a3f6df2f2a08fa33f91da409ad244195e,True,Tests_passed,1c339ab2a63c933de60674a6b4dcb01769d6c560f9f65bffd058ad30ad515ba6,True,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,5e030893366aea4035c982d8c69e369e12bbcb530b76607b2372b2846c05b9d2,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,5e030893366aea4035c982d8c69e369e12bbcb530b76607b2372b2846c05b9d2,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15,Tests_passed,152a77a7911e353b9be447a5bdb2f322189e27cead3e09ed52de09e4ebc2db15 diff --git a/results/reaper/merges_tested/jodaorg/joda-beans.csv b/results/reaper/merges_tested/jodaorg/joda-beans.csv index 5541872e16..4c4100f0c4 100644 --- a/results/reaper/merges_tested/jodaorg/joda-beans.csv +++ b/results/reaper/merges_tested/jodaorg/joda-beans.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/main,25ca6227b8dc848d9b4c9a6911aafc28c79a3f56,54413184168acc35ad5b923d9769c3bd568eff72,9a397f74453bf131a7248126212bf104d2c40183,,True,True,Tests_passed,753ad96de921c9dcd311363f4f8d930bb4eae56fb672045ef4b2bf0b337093a5,True,41,80,1576,8,True,Tests_passed,0804514d7c459a0c9254d9737d0b51461854153c617a82dc9a7a1e37a9492d32,True,41,True,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,c8db1aa4b114ec6c48c6884cfa1367996ebd6cebd46d2dac7d23cd9425ca1ca9,Merge_failed,8ea10175958dbb2b0f0f39380865714a5381d69af16d3b9dfb876a3ac1bce550,Merge_failed,2b00f2536881c789e5cf82e70074cd9cc677457295b4a845037fb4198ebae5e1,Merge_failed,6b2272542f65a5b41368b450ea0902e2f5bbc37fe6aa118e2d2d9c2b4bafe3bb,Merge_failed,8ea10175958dbb2b0f0f39380865714a5381d69af16d3b9dfb876a3ac1bce550,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,4d205fd4a73c8a83263ea7b87624a60f247555271b957a4efd61aa381cf9e0eb,Merge_failed,7ad3e326db71fdc7e7aef20ab17e8fa2e237c79f31a1672f799f2f1fe4c80eb6,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501,Merge_failed,6235e4e6346dcbdb6dd06857253c41e4c791e3ef464b7765f03ebc041a9eb501 14,refs/remotes/origin/pull/212,dec9b88627fa8e7ff0b7804a22cb5cf594dbe7df,dc23f43d5e28cfe4ea9acd7e45e2bdb85556d4c4,5f44ff767131606cda6135a13f25c4816623a558,,True,True,Tests_passed,364df857cee01a24477a12059a69b1f0ba58b4d25dc681b790083baf82decf67,True,51,124,3308,5,True,Tests_passed,270a8129d623eb08b47281cded7e46d7b9751d44418092bb6802da065b2603a0,True,51,True,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_failed,044b6a17158f239f9fa88cf6fa2a81c3c14ff677b7ad0d55eabd345a6b73cf2e,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,7ba41dfbc9da009292c1ae3214bef2636da7feb2f8bf26b1ad732d2b2ae2af40,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,e9b320319d21723b73c9b80da6ac04c4cdf395159b33a4f8e3b03869ba76a67c,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995,Tests_passed,447789d23eeb05ac251bdafb674237e1e56ff2af9449fb64b94e047d56460995 diff --git a/results/reaper/merges_tested/jodastephen/property-alliance.csv b/results/reaper/merges_tested/jodastephen/property-alliance.csv index 7d752139cd..01243b3337 100644 --- a/results/reaper/merges_tested/jodastephen/property-alliance.csv +++ b/results/reaper/merges_tested/jodastephen/property-alliance.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,13848ab05df1997879b886e6488fba6265cc8233,5d2861df97016960d3c2ec09bbde50a30cc2e0c0,7d9b6dd776dd981d0d7dcba883e40358b860b85c,,True,True,True,11,21,1025,3,True,11,Tests_passed,c3df6d211dddacb99be8f62152b6adcc5e1d76d73a9207a2fdc958da99129880,True,Tests_passed,a70f0d0b3c55fda89f2d14f11dd80ff1732c8e957fd7be4ce92abf056509920c,True,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,548004e55d23183642065b03309a94c8e7c00dbdf0e130440b27b6d58f284da2,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,8beb9e0ae765dd3b417c18f6c6de1a996fc55804153bc5ea46afd5e5476b0406,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37,Tests_passed,1564873a8fae30143da752dd364373a9566ff64c7381de6569766d613c3cef37 diff --git a/results/reaper/merges_tested/joel-costigliola/assertj-assertions-generator.csv b/results/reaper/merges_tested/joel-costigliola/assertj-assertions-generator.csv index e8de304d81..71467a6f91 100644 --- a/results/reaper/merges_tested/joel-costigliola/assertj-assertions-generator.csv +++ b/results/reaper/merges_tested/joel-costigliola/assertj-assertions-generator.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,e9c59be58d0f5f8598375f4031f5f06ac0f1cdcc,110502e40c6e85333a4c6e5161f35f0757e8c493,535559c9286c16ac8f356676bcecf8a3392f9022,,True,True,True,45,217,1683,9,True,45,Tests_passed,c2206d168feee7de6ad83adfe0ed8d09893fa9d9f3c4d2fac4b6f6c6c47c4f0a,True,Tests_passed,64d33d228f278c8174aaf4b491d897899d579952a0c1fe5b95bc96c52630bd64,True,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,7fb5dd686136165029f9a0e90ebe613e176283615077cf03b245ca3038ee364f,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,70aac63c47daf47648143432243c279abc30e2d8d8bcd576385b55e17aae0534,Merge_failed,fecf62fd7ad0a9ffc99f015c1c201df652e9027b2f6e45555e87c3502447950b,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,519e398f10fbd079447f8a6f54970146d1fce2b633a290cf185f0b0a80eaef24,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,f4551651213c6ef1c7697e5c1fb14254a9fc1e380064f18c4432d19081e565b4,Merge_failed,0a7a732856b7cbc21b76e5ec69f86304f9822ec398eb0cfb0fbf868637cd142e,Merge_failed,137a949ec8361fca3c6eab637e16c540ef09f7d978bde9eb1490321b2b58e3f1,Merge_failed,d7a1d93758f44320bd0d93857583f2240bdc3f76a7ad2d6d43948b3c7fd40c4d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,7e85b52c367fb4cd9caabfbdfbcaa34ce40ec4d9e712a2a0cbe6d1c5913f509d,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9,Merge_failed,ecb33b15f7a038d3216cfe142b644456920b955cf5b6de18a3de47df0b8bc8c9 diff --git a/results/reaper/merges_tested/joel-costigliola/assertj-core.csv b/results/reaper/merges_tested/joel-costigliola/assertj-core.csv index fe03b0d881..67068ebdde 100644 --- a/results/reaper/merges_tested/joel-costigliola/assertj-core.csv +++ b/results/reaper/merges_tested/joel-costigliola/assertj-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/main,30d3049359fc8a4cbd2932bebc3b238a7338b8ca,f63c0c1b2ce21951697b1a9b47f214f4e1a8b5ff,a2d13c4a3f88f58e95ac894e113c2192263df150,,True,True,Tests_passed,695a224e70dd817606cbcf6526082028c94a3ab69bfb8344060bc2909ad10371,True,40,182,1400,19,True,Tests_passed,b94fe176594da209508a183b461c4dfde742ee12ed8e3c78554353db8c07ef2c,True,52,True,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,322a4bc0257bc589519d9444284fcc5156b070725f1629fca476685bf04ce1a6,Merge_failed,ebd2fc878276d825514210b5bfbb41b0ef1ca09ca4e506b3ae706edc1c1c2d70,Tests_passed,48e8424a7645fc2c250a17f5fd3d106687bbeba5804b5927722baffb210b8c5b,Tests_failed,9c12411d7d2811c55e814524d10504430f4d6ffc78f618f9667804300eae38eb,Merge_failed,ebd2fc878276d825514210b5bfbb41b0ef1ca09ca4e506b3ae706edc1c1c2d70,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,ac550c6e0210ebdf35ce20976a0a285b133a526e1d95bfc4cec5b3bd8d29c718,Tests_passed,48e8424a7645fc2c250a17f5fd3d106687bbeba5804b5927722baffb210b8c5b,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771,Merge_failed,14215d858570b4e47b5f68e4fa4b435cbdc717cb9aeb1d125481ee13cbc64771 12,refs/heads/main,6e98947d7295414f753f05fd251878ba7277bdb1,f863672644cba48fcc3f6eeec3d3011436087754,0bd42599f5aab6ed0a0b4f3e86a4ae3a48554d00,,True,True,Tests_passed,143cb1ba4ea0a27cbd6b525a3b76d1928a1b26c90782584bea350634d06c844a,True,739,2895,51401,34,True,Tests_passed,89c631f43249551601e9a602219ce75012988ce134605bc7ef4efed53a4df6dc,True,748,True,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,7fa6b64fdd6e3c87b9f69c9cd16ad90ae5cd476e40c585c71e01a60ca9e37db0,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,9b2d8d77dede638b3d7686e79999e20bc9858d4470bdac9bd3ddfba714249883,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,303059e918fc1ecbea3b94ef19959d5e9cca4f7a69c84767eabb55b0eeb28178,Merge_failed,0928ca8e30d02e5684539f76821a5795edc12907c703cb78cddeed2530b7d202,Merge_failed,b461bd516b24cd76d0ce7a6d70fc2d6a89a1cad44b59248e9ecd1306e85fdbce,Merge_failed,f74d01d8b0a5122b3225b314e775b6f10013390545920a4f079071dbeb3c1390,Merge_failed,ae2a18da30e322265359428b773f6281a7c8a47615bd087a151599236be0f874,Merge_failed,12c8dc469698796e46a369592b0ee9f261ce9093874c17819d1f3e208db68f74,Merge_failed,f74d01d8b0a5122b3225b314e775b6f10013390545920a4f079071dbeb3c1390,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,9b2d8d77dede638b3d7686e79999e20bc9858d4470bdac9bd3ddfba714249883,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,303059e918fc1ecbea3b94ef19959d5e9cca4f7a69c84767eabb55b0eeb28178,Merge_failed,0928ca8e30d02e5684539f76821a5795edc12907c703cb78cddeed2530b7d202,Merge_failed,d640b9e60c9e21a91a105f4f6aa0ab811de041007ed4fb6864767bb53bbb913c,Merge_failed,ae2a18da30e322265359428b773f6281a7c8a47615bd087a151599236be0f874,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,7fa6b64fdd6e3c87b9f69c9cd16ad90ae5cd476e40c585c71e01a60ca9e37db0,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294,Merge_failed,46105f03fd4bae53009f1ebf0ecf9f35939b5e9ac1f4dd0c46575a8b8fde0294 16,refs/heads/main,15cbb306b6a162438dead6e432ff75f52ec03c22,ce5a93c1161b9fa95a44ab1175556d12238a0e61,9621390b0251b4a1b64984b5db1fb423d84626fc,,True,True,Tests_passed,c6912d051f85e9c8c232f712eab096db21cf56fa466e0cea5243b2369edde600,True,472,1307,37873,7,True,Tests_passed,dbb382761b6dea2c455abf0ceb5bd2c8f1977ad3d807cb63ddeda1e3bee4b020,True,474,True,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,c479f62b4a18f9c42b2ec7317b06b422aa04a73718cd3623894d06a651bffba5,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,7ededf60a84bd98168e3e3c3dc17ee36a24a21ea6d6f3bafdaac6059daee213b,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,8cd2ab75776b99a2d0b65081706228adc7b7090aed99c1516f4929e8254da420,Merge_failed,29c22f8d45a41e72863a5f860921482e2f073e9eacdf02e5041c3c70314ecfc0,Merge_failed,669c9f29f68fe35925598e38baa6453a43596c54e898628882c368758b5f3d04,Tests_failed,81109c0f5efddfea10f30879335133ef3295f94e8079058976f8b6f9da95f54b,Merge_failed,29c22f8d45a41e72863a5f860921482e2f073e9eacdf02e5041c3c70314ecfc0,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,7ededf60a84bd98168e3e3c3dc17ee36a24a21ea6d6f3bafdaac6059daee213b,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,172c7375f8d74bf6bdc3014de861597a7540a844a34bb1a60e10e8d901003eae,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,66eb48fb96adc9825b4bd2a9f2aeb93f7490157505dfa598c773d9d99555f6f3,Merge_failed,669c9f29f68fe35925598e38baa6453a43596c54e898628882c368758b5f3d04,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,c479f62b4a18f9c42b2ec7317b06b422aa04a73718cd3623894d06a651bffba5,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e,Merge_failed,f21f681cfa7593206396e62560bbe5275d94e92ff8fa950ae3b01210548e273e diff --git a/results/reaper/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv b/results/reaper/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv index d8bf1990e8..0ae1caa9ac 100644 --- a/results/reaper/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv +++ b/results/reaper/merges_tested/joelittlejohn/embedmongo-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,e407eb6955fe9325b7b0c2ce4069e7d640c1cf81,f451b3a5c0d067c8341ca9d73d9c38c45a457cf9,d596ee43d3f18a8b46fa38218a9d2592e606c265,,True,True,Tests_passed,d358cb0059aab155c1bb2cf22761b4f139c0434b4a44d61a541024f259994a06,True,20,58,1402,4,True,Tests_passed,9babcde81773aa2f18c88f90dca876bb0816b1fb74e3d55d1018b39e0b4d4bdd,True,20,True,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,0e17d920d4ba2e00fa22b61f44dab5b0f3f79155b18969f5bdae927e08828ce8,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,478477a436f10235c2726ad7129569b6c2658644824786b712f3a2351bc6b364,Merge_failed,3b5d398417141e86619ab7b8f2e1a136c9f7598460b9411c9a942014b9f89bf6,Merge_failed,0c9c09de6eb37d268134f2b1d7ab52f8b12d1ec57f063074f26127527c915bfb,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,686c4044a24926780ad958c1ad7d325d3784ef957eab649ea03c6432a2feeb54,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,fe3981f9b3044013f2c7a6db2a30136857dfe8b5ae64f474fe665c840d944914,Merge_failed,c3d9e9552e39f01471eee66043c11af46cfc6f508af5b4fed147f891c238a31d,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84,Merge_failed,67d968fa986e8135a3633f287947432c9f31b1f9a4efb8c41964b3e79f2a7e84 diff --git a/results/reaper/merges_tested/johncarl81/parceler.csv b/results/reaper/merges_tested/johncarl81/parceler.csv index 62feb3d83b..58e06f4f40 100644 --- a/results/reaper/merges_tested/johncarl81/parceler.csv +++ b/results/reaper/merges_tested/johncarl81/parceler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 36,refs/heads/master,4a68f270e44264673c431d3bbe08aca025cc1ac8,902c3ae0a88186be2d7a53aada5c6f961afba98b,3e39c3bf7d67c9672613604045b43d3b532f7c68,,True,True,True,13,54,251,3,True,14,Tests_passed,d9cf07e16a3c1a7553e034851e92946f4ee4dc7ff535dd8c7f2e3d055c752ac9,True,Tests_passed,436eb4cbdae8e126e4c74cf130fa3411232a30b919d9225bc2be8a93cee5898e,True,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,dd64aad3efd988dad81df37015d3ba0419f10ae13d1bc350f187c3444373c9a0,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4,Tests_passed,86ba2397b8317f009d7112afa48384ab11e0ce54514200806746b61a909d5cb4 diff --git a/results/reaper/merges_tested/johnnei/javatorrent.csv b/results/reaper/merges_tested/johnnei/javatorrent.csv index f94e7006cc..c7c4285551 100644 --- a/results/reaper/merges_tested/johnnei/javatorrent.csv +++ b/results/reaper/merges_tested/johnnei/javatorrent.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/develop,3e2e076b0d94417e7a92f6e1f861ab06696dbaba,2fbad48779e19f1ce23c2d60097cdb2fed19ac89,effadbf711ec7d523c87d62deca64528d61c0fc8,,True,True,True,95,181,8627,2,True,95,Tests_passed,3e2e08cebda51e66bb9f926d48ba36fbf4e02cabf33b513bc07fa050393f495e,True,Tests_passed,ef0432d0e74301e6e414e666645e9bd449e9bbbd8285c883ee16eba53c4bc7c5,True,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_failed,d94eebf7d1ceca05b3c930321c6286b01ffbc1623cda7537ac8e00e0ddcff48f,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38,Tests_passed,51e87b48ff705506220c417e315fa86e080f07f2714bc7a76b8724d68b96ea38 diff --git a/results/reaper/merges_tested/jooq/jooq.csv b/results/reaper/merges_tested/jooq/jooq.csv index 6197a53fb4..0b74f7e75c 100644 --- a/results/reaper/merges_tested/jooq/jooq.csv +++ b/results/reaper/merges_tested/jooq/jooq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/main,6063896ec0bd3a8b8a60e87056caae9745bc8fed,16ca895637d4eca2ca2e1654a805460deb1ad971,d74d1c9655a900979ae943886d226f7418d885cb,,True,True,True,116,417,3453,3,True,116,Tests_passed,ac3f11e029b2da2ec3c65ac728c225e5b2d7e6dfb664cc768527327756d0c508,True,Tests_passed,f2f8655fb4a1db5809074f6e9bc98fab7400ed802fbc3b0b27e0a1fcef17ac41,True,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_failed,1ef31cb478169a2552900b7cfb76c16dedac8be63c6333417378f590871c448d,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_failed,13fb19993a9308fe9ffce1702b0166834b4e0b0aa9e2ff233110b16b799c82a1,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e,Tests_passed,07f046a690e867390f3e875a0580b823d768b68ffd50f79da9182dadf94a253e 48,refs/heads/main,db1d75b28875324a15635b91642f52cdb4f6c538,b393fdd738250b2823675610637f5de6d6c266a2,fbdc70e0a0a9a22365f06bbe303c44be9e8c3375,,True,True,True,5,9,21,2,True,5,Tests_passed,5664306aded0070b41ae0370b035351de5668a264e3efa101d62b9068a4ce64d,True,Tests_passed,227c6cca669c72ad5c7fe86bec51cd538ea5a1b466d1b10bf52d3f7bc6bdef80,True,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,1612631646382eb341a14ec19c705600d98b74e26273542cea7bcae5a2206fbf,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,1612631646382eb341a14ec19c705600d98b74e26273542cea7bcae5a2206fbf,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690,Tests_passed,41db1be62895b26b0fa0b6486568e9817f956282c2b18349b65f179c8f385690 60,refs/heads/main,df390cf9197813feb048902e9dedde61fb01931b,f5004522d6823885103365b39788ccc25c603314,8767b8014d1beaee87f4e90ed5ce3f4ce10c8525,,True,True,True,41,219,2416,2,True,42,Tests_passed,8fb7378fb29f3257782c278bc1b25eaf1d45a8821dec4a838824b9d8f9fe7f74,True,Tests_passed,e003554a9b0de037e8016b28297cd8aeb0144752ff536868f90dce0911a1b5ca,True,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,2c9bc315fb7b7e6fef008fe42274345317da0f86b1169ca9bb7c313d939c9bdc,Merge_timedout,,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,2c9bc315fb7b7e6fef008fe42274345317da0f86b1169ca9bb7c313d939c9bdc,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156,Tests_passed,436d2904d4a83cb69aad72d43f8a1a8768c9a801c3b6f1331583d4f627166156 diff --git a/results/reaper/merges_tested/joschi/dropwizard-elasticsearch.csv b/results/reaper/merges_tested/joschi/dropwizard-elasticsearch.csv index 85b7fc1e57..9b62f6bd06 100644 --- a/results/reaper/merges_tested/joschi/dropwizard-elasticsearch.csv +++ b/results/reaper/merges_tested/joschi/dropwizard-elasticsearch.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/20,2ab0f40441166dd2c58424181858b95c0fd89a75,4cc065ce92f42776b942309e7a089dd67362a6f4,fa313890509c9503d6e73eb407d981ad97a82684,,True,True,True,13,58,227,5,True,13,Tests_passed,3b227935ba23e07857b4d78e44ff6ff2c03e5017d5b0be73921a9d0e92e74816,True,Tests_passed,65d2b80d0336f32511d91b1a70aa048f384fb8ca7a9864e7b7c9dd0b7caa22d6,True,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,3e06ddfb0d9d5fd4c5883717561579c4d58b8cd609438999203728e2937263e5,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,6fe84f553f4ca72c772a4468d92875acb88299f5190ebbb5cbdd50204f92be15,Merge_failed,2761d9df79e2dd6b6b8aff9e8594508742e26c798fff7063689254a5f15f8c6f,Merge_failed,17bc20d97aa9aa4e4afb6ce01b276b5d0a746b584a5db7798759bbfc9d14fd34,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,8729ab01b1e90354062f83345c81759c7f3964f739d46f873bc093fc3c310041,Merge_failed,b5bec5ff58eaf8910fef70949a53df1a55bb44112fa4f0ac6a6f83700add1cda,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,cae9ea1c9e3932c6b4936e4f32a2fc7e9b4cb624ab7e3c4fe3f28d15dad18f9d,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08,Merge_failed,e05136a97f94be419ee8b9d49ad10af398d28b4397c1e5e4f6c778f355304c08 diff --git a/results/reaper/merges_tested/joschi/dropwizard-flyway.csv b/results/reaper/merges_tested/joschi/dropwizard-flyway.csv index 2785e0c319..3d05d11648 100644 --- a/results/reaper/merges_tested/joschi/dropwizard-flyway.csv +++ b/results/reaper/merges_tested/joschi/dropwizard-flyway.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/55,8a92a05013a37aded8a2b2a9f99072e6f88c5dba,1447dc82d46b9149112392b85ae0d2fb213799be,5f714cf565d9e7918e07c3b76b5a93dce711d3e4,,True,True,True,8,90,644,2,True,8,Tests_passed,4a576ec41043ae46313fa0b906aa1ee52aef56332dc5dd6249d5ee89d8e88e98,True,Tests_passed,7dd9727f94045e87994255cfec42b33b048a00e3d7a066a9a1449dd9a2c3f006,True,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,ae58b674a3b88f86db7009bf013b8f54efb80adc458c7e7749ebac2838e7a42d,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,01896943414eb7316ff72b30c61aacb0a39c1f1855ca6891e08147860c1d9684,Merge_failed,7228e6035205c34ab253a3a2004dcebcd9e6fb538c52463245b5fb895b765f08,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,dc4bb85afa09aeafe1c3af45d21d3a270f4a97526f6440c05ee2444355c4e8aa,Tests_passed,9edc9e048fd7855e23d4ee1c84181b29edff3b043b3aeae02a3e85cf7eceb240,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Tests_passed,24acce5a9c92a15dd679b9bc28bf1dc3934fe4b169dbf937e77cb159c15f0fb6,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4,Merge_failed,5881dd136d467774b86d673231e88db41b06efb3503602c67962d60e047ae8f4 diff --git a/results/reaper/merges_tested/joshlong/spring-birt.csv b/results/reaper/merges_tested/joshlong/spring-birt.csv index 289cdd716b..5d690062e3 100644 --- a/results/reaper/merges_tested/joshlong/spring-birt.csv +++ b/results/reaper/merges_tested/joshlong/spring-birt.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f38e819c4a81bcc9f55b6496c7c9a8728d550694,e674445485360c05639371647a788352f3eaa9bc,dfe261e1b7b69475d706f5e0a6a56a50dc8856b8,,True,True,Tests_passed,7d079ce21ab7fae3260104e45fcd5daf8b0e974d9a22dd26ff5331319f9dfdf2,True,19,228,1143,2,True,Tests_passed,2bf2e5ac6c9cd6c29d2ae9d1e8d3d76a3b9c3631e40d2739bc6f4ff3fd7a4e0b,True,19,True,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,a2ee21b8abdbcd112f92e9324654b06d78ae5581f26f35162f7bcf71e6e9c49f,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,69fdb942705e10523af4b0415a584d6cb8f0139d0e916f6ef460b5474f1dbfb4,Merge_failed,ab2da3f9a7c1b6ca03b84752ff617348a7ab961f69c944789ac773bc7b9b4195,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,3a36802c3206a1cb1d2ba0c8c45a124afffda2ae8755771b2ced5ab6bb23876a,Tests_passed,cec0764e6681d1ef7fa8571194422b987505b55cf995e5761de1a109a4177a87,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Tests_passed,3a5e35865e0aa4912d807a338870375843e21de86f04efa9ff2b398464a7b1ad,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197,Merge_failed,0be3536b998f34cee2d550073822d061814f38aa9a863b8b3702c33df4628197 diff --git a/results/reaper/merges_tested/joyent/java-manta.csv b/results/reaper/merges_tested/joyent/java-manta.csv index f5897dda1e..c27b33702a 100644 --- a/results/reaper/merges_tested/joyent/java-manta.csv +++ b/results/reaper/merges_tested/joyent/java-manta.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,19cdd7a14f9d79769b5668da7e1f052cd24d65c9,53019b8795b9a8616360b961a1f45f631e9ce84f,56387371e05cf163ec433d22943ad7804365aa59,,True,False,True,13.0,37,100.0,2,True,13,Tests_passed,fef02496655e86d2da6e9df26239f0d2470ce2c038e9795a121d2fd5b7e3d231,True,Tests_passed,fc032044c7fcebd09a3e5947f3fa39610a24b59a87a6f7f658d86ba25412829c,True,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,a15fc40672d9eb39b6fde67e5698af38d861e92b762adcf4f9a65cac11581338,Tests_failed,5dd3fb6d47804e59c8885cb1d3772bd485235069db651d7505857bdadc136135,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,a15fc40672d9eb39b6fde67e5698af38d861e92b762adcf4f9a65cac11581338,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,aeede78e284dc9267aaa222d6dd7c2cd6994e3b4974ff41a0f5f80a5278bf7cd,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7,Tests_passed,f0319827681a09a873addc70567f8cbeb6a107b74be9194246f4a99b3d996ce7 32,refs/heads/master,a8acac994ab4323915b73e6d5f7ca37e1d61b948,c8becf4a150e972bc461c6edb25ed69487a51fdc,cc475c6604c41d615d0410e7c89fd6ba1d12fb6f,,True,True,True,8.0,30,188.0,2,True,8,Tests_passed,ef4e0310f7cc3078bf14b4e5d0798610781ef003be7153998dac3bffba17e04a,True,Tests_passed,ad2df02d367881e340e60965e96a273af826f342316381c6803fe2e932072f64,True,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_failed,acebc4a080b5b41565d792b422927f49902034f44917fedae7cb4bc77bfe0262,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_failed,acebc4a080b5b41565d792b422927f49902034f44917fedae7cb4bc77bfe0262,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc,Tests_passed,3d54723c4b3ad14ff48d654d34473d1a8f30cd0cb7e9377201149a47534f9dfc 52,refs/heads/master,6d4df92818e5f613a2c1e6c088c6d6323cb93a69,46e9907f82f8f5bd0356772fe05b54fe5e9d0c45,15ce2f464ce54cdd871802651d6a82d3fde8c0a6,,True,True,True,3.0,9,57.0,2,True,3,Tests_passed,a17405945d5701bb9479fb573af102665675ffac7d8057dccd8e08278d4d056c,True,Tests_passed,cda8d0a41174bdb6522e3f651d0f1f9bf32f8b77649972880ba73701f0aeb19f,True,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_failed,eab220a3f557cc872e03485bb0cde2cb701b77278832c924944cebfb57b2c3c6,Tests_failed,efbdff6664b1d4aa98188beaea962a90534ca6321d01a0f2eb5971452bd25bf9,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_failed,eab220a3f557cc872e03485bb0cde2cb701b77278832c924944cebfb57b2c3c6,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770,Tests_passed,bb7ed8d187378dea8f2fc7d5c65641c857bb4e53ec3f3b9fb0d7459d3f82e770 diff --git a/results/reaper/merges_tested/jparsec/jparsec.csv b/results/reaper/merges_tested/jparsec/jparsec.csv index afdf6ad526..665dad3478 100644 --- a/results/reaper/merges_tested/jparsec/jparsec.csv +++ b/results/reaper/merges_tested/jparsec/jparsec.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,a1fac0af65c9c4a5735633c8df920f23df7b4130,c750ed52ba684e9f29eb3412cb6e5a08e45d673b,352ad7c2a3b94783a4d778b4246b381fc36f94a8,,True,True,True,18,41,352,2,True,18,Tests_passed,63bf67eeeda462ffca0a1735bc41a4aba09dcd702d7545fb34e1ca78e2166574,True,Tests_passed,0b984ce5636bcb6920a64463b90546a3a6fb171ba9f8381e86f5123e6d391b36,True,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,edbe0f3984986c2ff21a57cf26bc127295d4b532d7cb3065225bd66833ed9e65,Tests_failed,d4f233ca84302fac26f674fb5106939df56dc42f8a0fa870eafed6936dee2aa2,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,edbe0f3984986c2ff21a57cf26bc127295d4b532d7cb3065225bd66833ed9e65,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f,Tests_passed,cfe98996f3aa4cbc0ed50e59eb563cb5bacf2d3d29a3a548d73e13ac94033c8f 39,refs/remotes/origin/5-locatable,ef02642abd641e654abd504ed36a5eb1571ec40c,9b2be3d78619d74c8a1fd38c4b28b8fc775fcef5,b534848cf79d4a1341deb27d25fc3ce48670c806,,True,True,True,8,7,361,2,True,8,Tests_passed,051cb138152af5d962dd02d6ecc3ed55b4e8d41868f57c000bf9154ae716a9d2,True,Tests_passed,7d65e9fd34405cb14c1788039c0b3075397de4e484096d9a1f801878d34c8025,True,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,d25febc0f0d9f4e8ac50f7f84d312a3d97a0086622c9c91be37f4d24a1a9d589,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,93591f74d0167cdf2b24adedb6cd85b23084eb3178dcb3096ca253ae9ae90524,Merge_failed,eeb95050aa3cef886526f6c2855e2ec2154f21379c2c22a46b380e7f63ec889f,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,8f246a1130d75852297bf4695b7e03f852ab0ad6af8747dcbb3f0da4035d9d08,Tests_failed,a1f8a00682386f1b4775251601e19ab9378ef41230470c1567cdc0cade0d3649,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0,Merge_failed,2e7c7492cc6101a1616db6848a04182970220f061f42af0917819373b45d58c0 diff --git a/results/reaper/merges_tested/jpmml/openscoring.csv b/results/reaper/merges_tested/jpmml/openscoring.csv index ce4734ddb1..c359ca33a4 100644 --- a/results/reaper/merges_tested/jpmml/openscoring.csv +++ b/results/reaper/merges_tested/jpmml/openscoring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,9aca0c7a8409f3888295b16cc03a74d8def3ed21,f48b5593a16f6a011c30dbf61f9c083482ffe87e,6342ffd5c7e700aa10844e929e6a3c09f4f38a52,,True,True,True,57,379,3131,8,True,57,Tests_passed,637eed99e1949b6725d40fa7360000b465447614bebdf565dbb6a509560e1e45,True,Tests_passed,3d2386a845e132073aa35bbc589bc23f557f62b4a3f753c8ab3746cdc8325ed0,True,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,07c7b44947fe22b137a6090a70c4510439cfb6da1dd0965ec8abb25675224b75,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,21b45635b8f292576b725e53ea4b7ea7d856bb5508ce09ca56810d981aaeb962,Merge_timedout,,Merge_failed,07baf7b7a2ca82ca468e6c69e79d4573ab450a86f6ebaf66a8f10701f44d7908,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,ffef54624d9ce6e868398e73da4e7eb5fc9f058fd0429d71ff97be2730db91f2,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,e544c415c4302c253a35a8df3c17c85f1eb869450e927a78235b99eda6c9f3d6,Merge_failed,89dda52729bd284fe5ca3c07c880c2cafab6b1a843e8942ab617df44a06045f7,Merge_failed,b319f9fc46ae7554ba667350227b2a00e864affb278eaa3c3ecc523969f12b2a,Merge_failed,2d5cee7f0bd78d1d054121f48489834f873329eed903e650e70edf1e542f9499,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,35e776d78e8c891eeb524d6ad8e60e5f48ac82d5cec46daa6d66ddb14ef98d88,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba,Merge_failed,4b9010479c190390c6eb18a889117576fb92f534ad530567211b7edff79200ba diff --git a/results/reaper/merges_tested/jprante/elasticsearch-csv.csv b/results/reaper/merges_tested/jprante/elasticsearch-csv.csv index a7755e91db..fd26f5ec40 100644 --- a/results/reaper/merges_tested/jprante/elasticsearch-csv.csv +++ b/results/reaper/merges_tested/jprante/elasticsearch-csv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,a9ee7a06511f64b14b8c6dee08fe5f5849907926,f3ac07cb6f993e56be141dee1ee46036b7413b1e,e3eda9922e5f1698c37829530ca39e151c98f76c,,True,False,Tests_passed,4467b8d3d7eb88bce8a1391a53d70e1fb90d9e258eb03605d7762a7532ded7eb,True,5,7,11,3,True,Tests_passed,2315f7074a9a080560e77d53988006bb2f4ee1755762ab80e883725dff41725d,True,5,True,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,243ccd4aa5a664da7b80424fe45c0414097e06098e6f18dda0a9c595c711de67,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Tests_failed,0cd9aa627b1e691826f26d76de5f034861bf05785b427d1642a08b15b20565e9,Tests_passed,1246dff6e3ca02e22b66769077e1e17d63451b8217942674566d727b6ce2d7cb,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,e6f73d65451368d2b91af83b4e8c36dbbaf9c524190863d37b493c00d318731b,Tests_passed,7e240802551a3b3c24c3f5116eaf92a1eb078c09fa807af9fe979782391d7e9a,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36,Merge_failed,11ee80e3a167fd9c8514332221d17fcb00cfae06821ef4ad153c1b6d7f24ed36 diff --git a/results/reaper/merges_tested/jqm4gwt/jqm4gwt.csv b/results/reaper/merges_tested/jqm4gwt/jqm4gwt.csv index 00592a916a..9912892c9e 100644 --- a/results/reaper/merges_tested/jqm4gwt/jqm4gwt.csv +++ b/results/reaper/merges_tested/jqm4gwt/jqm4gwt.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5d69eb0c67f1964835f082cfaffec4da5ca60067,b3da51013cf0016af78a7cb0128e54dbdba5234b,f21545ac9a2db611ba3f4f401de2188cd1503f8d,,True,True,True,61,175,500,54,True,61,Tests_passed,443238e8112b152b3c4029aeac3c64fcdc169bd7a24dcc0c18e76b78171a374d,True,Tests_passed,aa6cb3053ef7d33876ff547a44fe48daa24ba586a8b024ed2a2bc612bd8ddb99,True,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,b05af6f44192fb656de1ba546dc84bea315cb6a4748f98e27084391d022314c5,Merge_failed,d4ea408ae8ecc311330cf3dd7b2843a4eae9b45f90dadd2f593f5dbc35f2cb5e,Merge_failed,1e39e6f9d3d98cebe3e05e56ac4223246db44704dafaf3412c43ae7c99abebc5,Merge_timedout,,Merge_failed,d4ea408ae8ecc311330cf3dd7b2843a4eae9b45f90dadd2f593f5dbc35f2cb5e,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,09f1f03a888e30458d7e138b6dc21b7236fd16da60b134b6443b925a2471fad9,Merge_failed,1e39e6f9d3d98cebe3e05e56ac4223246db44704dafaf3412c43ae7c99abebc5,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6,Merge_failed,ddb00d667e767fd276fb8ce07271f145b848360620a74af170b8a41453a22ca6 14,refs/heads/master,284907eaffb2061f44cdc7ec3be5cb05209850c9,1b17ddfa476505081e744f1cb1f78cda70c9ceeb,2a44c1c8135d26511a30a1dab51c8c3d3d60a02d,,True,True,True,61,147,8302,2,True,61,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,True,Tests_passed,db043c9457a77ff6b119ec2cd8fc9c489df94721c82d8d0744fe28c460914676,True,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,d41468b842f272e98d531c973579f559f4e609f03f101eee874e398fb32750af,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_timedout,,Tests_passed,9dfc34ddda1c06360708e88d7cb9a07d2ea698afb7c6d39a99264890060432bc,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,661d83f1316957b4afed90c460475a9e4a012c483bfb9724823f2920ee90c83c,Tests_passed,6418bb1a34d36df9f679cd66e191c77e74dd15e280d04e2048e5b26429acabdc,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382,Merge_failed,f2b2be837f28754c92eccc53069c4ac32f8a68f017d5123cf0166188d1f0d382 diff --git a/results/reaper/merges_tested/jqno/equalsverifier.csv b/results/reaper/merges_tested/jqno/equalsverifier.csv index 73f143930d..45fb60ff46 100644 --- a/results/reaper/merges_tested/jqno/equalsverifier.csv +++ b/results/reaper/merges_tested/jqno/equalsverifier.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 173,refs/heads/main,df016c4c5b205bf4bf04d73a41a0e51adeff84b3,164ae921af8c96fb85642317a081b4c6552e0e75,6d6383193921b3deda63c5c8430b59dcdc6a5f54,,True,True,True,21,43,101,2,True,21,Tests_passed,71c6914be3e3140555433ca2d0acf85270cdb46fe6a7f41df206d87c8ecee5b8,True,Tests_passed,99921378ea305b2a22258bc89d12a83a2c2984224acc545ec253da48ee250312,True,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,77a46c3a55f273abc1a78abc5a4ff00149026987565e7b55bba8e5d7e72a03a5,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Tests_failed,e2869bcc2d62dd9a2840f62982c7ff5fe5f02a974c6fefb6a1757dfdab4a242e,Tests_passed,3c6ed6f8ae0457c9c63d0372bfe94ac69bf0954318d93c3db27722e5c88c310a,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,3a717ec242511e46c27618c68d02dd37872c328e1e05ca69a00b0f3d2b38abf1,Tests_passed,8ccf2c2d941f3127528fa6eb4277ed6d7d9c11b626e90340acc169896255f542,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794,Merge_failed,25bc3197bd6dcff3bd9b25fcbb9f69c4d7e334f17ef4e34f085546e3f8ec3794 diff --git a/results/reaper/merges_tested/jreijn/spring-comparing-template-engines.csv b/results/reaper/merges_tested/jreijn/spring-comparing-template-engines.csv index 32e7ed48d1..03bdf50558 100644 --- a/results/reaper/merges_tested/jreijn/spring-comparing-template-engines.csv +++ b/results/reaper/merges_tested/jreijn/spring-comparing-template-engines.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 111,refs/remotes/origin/pull/64,89bd8bbc91c308af280811d25d63e2bfed0d2532,06eb1edc6811e45008478a8e30067f6e81621117,19ddeaa2c9d11e77d34ec03a255d8c3ae5c8697f,,True,True,True,17,51,368,9,True,19,Tests_passed,795512627562890affefee1d5722c1225b1dbe335e8787f4b328e1e61abe56a4,True,Tests_passed,cef906cd3b5033d6a8e803861d5d6282e3aaa188d35b66b5a3d6cb3de15b9c47,True,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,71aa85f2bb4bf235192ebd84e02448092005e519fb1396cf2fe03b120d2bb52f,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,c7c0c985c420e2d01590fcac07b00379fee2d05b51cb9b38b69b49593b2a4566,Merge_failed,4d64ef7697294fec60e297873d3ba98d92498e99a63f6eb04ed94b051b015066,Merge_failed,ab02e5b8ec44588f2ee1cdb891306ff736429f6b1c920907c21972af695c361a,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,e59f12226223423f0a09de72ab65bc1bf488f983979b4829664254d768809d82,Merge_failed,6831fd12a89ebbf97fcb963b845f0a713d0a12094d366bc86396644b4880e22b,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9,Merge_failed,4d0f05218351900e75e1d132d9da49db18f9dbf94c792f7306ccd4cb922bacc9 diff --git a/results/reaper/merges_tested/jri/deepamehta.csv b/results/reaper/merges_tested/jri/deepamehta.csv index 40efa57c58..b6e9bf08c1 100644 --- a/results/reaper/merges_tested/jri/deepamehta.csv +++ b/results/reaper/merges_tested/jri/deepamehta.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,c5130b2c869d299a7e7c81baf5d0abf292dc93a1,a15b9099b354d8d074290215378f8bb9377a17bf,ed3687fa9fe9bf68aaffcb7a1c4262e709183323,,True,True,True,28,150,714,4,True,28,Tests_passed,6774172c367b09125757cb1bc264136f30b152d55dc9acf8388a9376921c1ac6,True,Tests_passed,bf6c2f47c931f623d865d2caa99650716f332e64d1f35faa2653bc5f7ef0aa50,True,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,af3998228bf4705f436f501c6d95359c34b64d3d69308f39bcf4dbabc4b86978,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,af3998228bf4705f436f501c6d95359c34b64d3d69308f39bcf4dbabc4b86978,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615,Tests_passed,310d544e5587a2b0435238ec8877b47520b1a9e458bd402105b492832e39c615 18,refs/heads/master,f2d36924c5aac051ecee774f1d90cf9beb885fa7,af08ad3cdf0bfb8e281abc557c9acb495fb39847,1e6a45d4aefd5db0a8fd51eb164bf0c113a2ef48,,True,True,True,42,188,1027,4,True,43,Tests_passed,af277ecaa094572086413ef9d2cd9c7277dea3262b12ce35dabfad6d75ff52b3,True,Tests_passed,19cada8a18d97ff2b210c63268e1eb07159e8ccf5f2c9d2af36bc74248f3632d,True,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,42b73962693f3f3189b09b13a3eda8142c4a009eaa4f2a77527ba25c300770b2,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,42b73962693f3f3189b09b13a3eda8142c4a009eaa4f2a77527ba25c300770b2,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b9d3bdd403f42d3e9986ad52ac671d267720c2a1562f87757487f583f5f63d14,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934,Tests_passed,b6576214f406f35981b63bcd33aa4b61ad330ad6df6e6e8b64c6cf580a2c3934 22,refs/heads/master,6227095b02e7a8eecccfd9811e4ff4af180649f9,21c1c51ff14d1ec94e08827fcb5adbacbf420c10,b71616cb7ea32fbbe68009c2bf9c0cda430768f2,,True,True,True,12,40,151,2,True,12,Tests_passed,b1b39465f7a433c77fe9a61f3109cde6aecd2d9540d5a900fa4fb5d253d25e06,True,Tests_passed,626c4dc1d13e9f0f8925a7dcd242096f72776b65dbd3e44c34a4effa5ea9c7df,True,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,356f4fdd35b3166c04d187c13b08d63a65cd65ab8ca04e80c455830c611adcfa,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,356f4fdd35b3166c04d187c13b08d63a65cd65ab8ca04e80c455830c611adcfa,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3,Tests_passed,37e431b12575f112c51701ac0e368731d81729e4e5a6db8c881c14fb77d33ae3 diff --git a/results/reaper/merges_tested/jruby/bytelist.csv b/results/reaper/merges_tested/jruby/bytelist.csv index 24377a0f05..c5a5ecaaa8 100644 --- a/results/reaper/merges_tested/jruby/bytelist.csv +++ b/results/reaper/merges_tested/jruby/bytelist.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,989a36efd082324597ae190e1be02e9c837967e3,df4f174f506935be80d1bc15c984ab09d011e6cd,eaf546b696f5fb1a31584305e7da2e9a9b683bf4,,True,False,Tests_passed,a1fd5a0ff5ccbf1339ab26a2440bec50e0e8fd8aeaf96159f9af84ac9198b135,True,3,12,106,3,True,Tests_passed,402174b94029655e07ba85f2ddd4c625384a6025571a187bb2482b128b02ab0d,True,3,True,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,d7c9455709ca176a1ae66c32d25a15ddec61072e5dde50fca1ff95d55f3efee1,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,2d19e219ff68173c6efd586cf8fae1088516a77f2a186c902f34ee38466071ca,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d,Tests_passed,7cdb4048d7c7dd20a515d41f87e2468d5f7b6e54c149d22f7ebc19653912510d diff --git a/results/reaper/merges_tested/jruby/jruby-parser.csv b/results/reaper/merges_tested/jruby/jruby-parser.csv index e224ba0500..fd366e2ba2 100644 --- a/results/reaper/merges_tested/jruby/jruby-parser.csv +++ b/results/reaper/merges_tested/jruby/jruby-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,e6dae92cd4c87841431cbdfeffa34a4e05f3a2d9,d4c91601649b26088348218596017088bd8f2c5e,9a27caa9a5e5d5075b0559e2b91a138dfcd941f9,,True,True,Tests_passed,846f17401eeb20b1d6f452673bf0951d791de9a16c7202ba3162259b93bb2b54,True,21.0,1295,20385.0,4,True,Tests_passed,eefd921b5a64084a7e2d5a003b87067fc7a1f9824536e01ff83ae4b6e487ee4d,True,21,True,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,9ecf08fc82252653f585599969c047199e75f0c030eb839c9b6633b80ef6d474,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,d658300fc7b58bdf1d633c5cdedaf15f02cd1bf830d2de170ef9ee3dd59a8c05,Merge_failed,91c0dbecd0ed90cec97b9dc113b377145e48dba8998df2d88a69e7fb245aadaf,Merge_failed,cd7909d5fc7b856b33bfa282b6c7c642fe012848491571081c0158e8844361a9,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,52937b12238179b6b859e16db2810a3c5269d748373c3a8282011fc56869892d,Merge_failed,93e92c5d1dc136c8495be5464d26c3da89b0128dea619a1d8df5b316fac0b9bf,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,6a6bab9f7acf99b4950cd2613a08b4e77c122b7d2cab13068876ddbe1bb51d30,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5,Merge_failed,3ba2332a3fa2d6492247868248c4304630d6893e8d0a0a42f00de05901bed8c5 16,refs/heads/master,662c27a79ce26f2c0e481d00bf82a090659f4b36,230ba611c4fd9f2a6f8ab848b97154a5d05ccf3b,6e384fd19b1a5f8e96f2e0199a7d45b16714da13,,True,True,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,True,81.0,293,1737.0,2,True,Tests_passed,7120810de21dc378e363135e34d326e27fbb6241557663400dbc442bd16499de,True,81,True,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d8d8c0e3ab37c26d7b6f7fc889e6ee94068aef96e5425a3eae9fd2d4cc8cbee2,Tests_passed,01ba9fef43a4f66d2ac87a84e7336da5a22817216201b3da470b9786c1b192bb,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d8d8c0e3ab37c26d7b6f7fc889e6ee94068aef96e5425a3eae9fd2d4cc8cbee2,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,d348ebb5f256ea29868dbf78d85bb379ab43af49ab7e2af02d1e20989e91d63c,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e,Tests_passed,6ebb851d54a30d11120606274249773022ff0773a6284486ce7d7bc6e45d580e 17,refs/heads/master,230ba611c4fd9f2a6f8ab848b97154a5d05ccf3b,7bd2b19e51b47c26e141ae961ae4968d3ad90ff1,d64fb6da3df0ba3210bc60fce8e127eab3cda92e,,True,True,Tests_passed,57ecd223ea29f920fbf83364df1898b26ff14652dae48803f2b12e988b05325d,True,88.0,134,2975.0,2,True,Tests_passed,380ddf59dd90c2e4ab5255b6de55e7b125aadedb00f617ab24c28163dcc4e8c5,True,88,True,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,2b31cced99682dd99573b294ec36709e221cc13c90bec2f1187650131ca3d8b7,Tests_passed,f29e1ddf1a8975df1722480f9ed657bba1f30955cad512096c011047b0748dc8,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,2b31cced99682dd99573b294ec36709e221cc13c90bec2f1187650131ca3d8b7,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c,Tests_passed,e107b93b88a38e23c4d8dcede8c5a34e52c5550dae0c3e095b9f0039fecc2d9c diff --git a/results/reaper/merges_tested/jsamoocha/linksalienceclassification.csv b/results/reaper/merges_tested/jsamoocha/linksalienceclassification.csv index f99764c8ba..1c8373f420 100644 --- a/results/reaper/merges_tested/jsamoocha/linksalienceclassification.csv +++ b/results/reaper/merges_tested/jsamoocha/linksalienceclassification.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7aff5753c70fc8c52cdc949c2a2712dd90bdc30c,c57810b5c2d6e64a483f71582aa75ebbdc808ee7,a30776ffccfaeae3ea3e92cd1e85b030304a4b89,,True,True,Tests_passed,65eeae439dd016b1e096416d37fef772dd9363c89b646b61dfc70ecf31a6f429,True,9,42,789,6,True,Tests_passed,0e646ce98ce0f8d059d21cb0609a0324e76acf1cfc0cf1fe5538d6dd47849ab9,True,9,True,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,71f500592d2b0a929b651e826f89c8af3080cd4a54052ef183d232eab1fa45d1,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Tests_failed,c9075f80d2b6cee4662a56b4b321a8b122466e94d15c0ba577d6e652d1cad57a,Merge_failed,7ac63ea1879d0078a27b9f6fe64fe1626ec3da24356bed93ba04baf5d586dcdd,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,409487f623a789e54deba8a811ffe6d067be4739f9d0fcc48240b1bc242c7271,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,44b71fbdcfc9b3e8d8903d2db13d06c0449b2bb0ff1f052a8affac0351563483,Merge_failed,292e03c09ae1f197b391dcd221859758bae1bbd0080d9804c0699af7b5076f4d,Tests_failed,8396a158c4cfdfc53ce027f80f8b66930c2affac03282e53a981676e6160b545,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,f3e0450ec34efea4a4e74ea629d74196f8ac648971bf1c21b1d987eb48141014,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc,Merge_failed,13ff1a919a08fb32b4322860d9e75956021e7361a341509018c8fdd06ba754fc diff --git a/results/reaper/merges_tested/jsevellec/cassandra-unit.csv b/results/reaper/merges_tested/jsevellec/cassandra-unit.csv index 61430f1557..c5943b4a06 100644 --- a/results/reaper/merges_tested/jsevellec/cassandra-unit.csv +++ b/results/reaper/merges_tested/jsevellec/cassandra-unit.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,13b72270f1a5d2b26092a43ca8cfac15e5f0f200,4c5850090ea4533355b21fc3dd0337eb287659c7,0bb00c5f8e320eab7000a96b84fe56cee45f92d4,,True,True,True,8,19,46,3,True,8,Tests_passed,87193deb80bac84e9b59dd72176b66316c898b6e30a135afa9069fbc681eb3a3,True,Tests_passed,8c200f6379a7205b18e9d99b26ec6658365119f33c74c9a437b58bd0a38f3167,True,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_failed,ef2dcc6ade58072559bade12adf18f69d39c1a3c5ca22dda05b717ddf3d25d13,Tests_failed,b70efa2ac74d6a3b968e860d0ad785489cd07903f9e19e68c346817cad2ea30b,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_failed,ef2dcc6ade58072559bade12adf18f69d39c1a3c5ca22dda05b717ddf3d25d13,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c,Tests_passed,50b97836605278958774e5fbd07b4b421993012c0548584bbe91d3a795f5982c 24,refs/heads/master,4e87b46fe206e0acf5cdbd1e8c396be97410a5e4,21dc8a443a78021e0f1afebd4712cfed6ed3fce0,5ffd14659e8a2eee622f785997e0d00f7d7e318f,,True,True,True,16,36,204,5,True,18,Tests_passed,cbf4ccd08becc192d1154c54b7cb6f4e2e21b3afa66d6516f70dd17608f8c506,True,Tests_passed,60609d824ecb7c1930d6b261a2aff92dddd323a9c89ea03134b55fec87066322,True,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,517120c2e25693075c1e82c3826d85bf9d7951eac716b14b683ac7a54f9c39d3,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Tests_failed,31287108455bc5efe8dc3deed33f513b16f1186d18f9d117be7063516bdc9af0,Merge_failed,acd85447000be506959eb8bca8aa8f604400afb7dbc318d0dc1a9732dc8fdcb9,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,b2291e333cd972e3a4ce68941df782b352d66dfe0b4c5f89b97976f579fde846,Merge_failed,51a27dc0a0f018e5559218cdb795022542c83e589e216517a307d0b5c7497cd5,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62,Merge_failed,447c9803cf46722ba83d866b762523ce53cba276ad2e07035e3cb9abab3c2d62 diff --git a/results/reaper/merges_tested/jsimone/webapp-runner.csv b/results/reaper/merges_tested/jsimone/webapp-runner.csv index 4c71b7b2b9..829324289e 100644 --- a/results/reaper/merges_tested/jsimone/webapp-runner.csv +++ b/results/reaper/merges_tested/jsimone/webapp-runner.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 108,refs/remotes/origin/pull/188,f978fdcbea259b490d0e03b5881419b3aeda8152,b50903298c5f759c7fa91d90516c899f4d6f0ac0,ba88f4cc74dcacf2fdf74db6eb4a0a7cbd2206ec,,True,False,Tests_passed,01a0648602c3ddda319097f4a54e6bfe88f36e5cc2f79907405e38dd9264da26,True,4,4,16,2,True,Tests_passed,47de062241455f81806f4e5e0cc1f0ed27306bf66dd80041814379496b10ffb6,True,4,True,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,eb8dfbb356ba13d1878743465287143c5f6ecf57cf10897f03c6b8f6573c3e34,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,eb8dfbb356ba13d1878743465287143c5f6ecf57cf10897f03c6b8f6573c3e34,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115,Tests_passed,f117cb96e78126b7e63d8692a29810ae2988d4a049e81a44e924a61abe4c9115 120,refs/remotes/origin/pull/231,42bbf1f732331ba7731f6916a307666cef6855b6,0d080041b57c0e9bcf13c4b62291f32390fcf3e1,d9b047d5fb94f24dbefaebb8e79f5deb50fbf87c,,True,True,Tests_passed,932d81d4482640dffe55460c32a434e9013a6d06dac447c426d575a40651e895,True,11,17,45,2,True,Tests_passed,0bcc2ec94937f427a6e88bdd758610d739c7a97898281593e3fd25d940c7b668,True,11,True,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,6f3af7dcccb66284327416c7cdbe497d40003f8d498123f67757d9374268b6d6,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62,Tests_passed,dc30bc0d21b06699b3129913ef2381b93523efec3a78f993e39b5c1060cafa62 diff --git a/results/reaper/merges_tested/jsprit/jsprit.csv b/results/reaper/merges_tested/jsprit/jsprit.csv index 509bfb349f..072dd0e90b 100644 --- a/results/reaper/merges_tested/jsprit/jsprit.csv +++ b/results/reaper/merges_tested/jsprit/jsprit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,d1858550787f7cf488e0ca135c40b5352580fedd,4527818601ad344e11dadff16115677ba338c406,a0b3012cd5c8f7c07d41ec4d7cec9273d307f2ee,,True,True,True,39,120,450,2,True,39,Tests_passed,c8ab2c2e313d0dbda38a8b284adbe2bd92993e37e9abfbd564e72daf3a9165c5,True,Tests_passed,d1347fd175fb1d2f1fcd8883ce9219a561052484e16b1792186be0401e6a7277,True,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,f8c060a1dea04e9542d270b56ba4887f592a0709a67a6a5d08150754bb983481,Tests_failed,6b9a45d43ddb293cc5d589ab42e12de5ebe71b713909e881aa623abb4cb4d7d9,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,f8c060a1dea04e9542d270b56ba4887f592a0709a67a6a5d08150754bb983481,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452,Tests_passed,2ba03e7dcec818aaaef82bfa96f0cd206dffb2527edf24a4930b37f56e858452 23,refs/heads/master,b68879303e350646ff6111c9152d6b0f0decde17,dde8b01e1c3acbfed464318163c70d338ec70cc1,5c2c815540b471969e7b183c6ed454a769a3e2e0,,True,True,True,31,128,1607,2,True,31,Tests_passed,3d8c1bbf2db6e324f47bb72c67d2a1eb57a079173c29e4181af3d1c737106ff6,True,Tests_passed,6291f9049a719651e3a43c58ed0e860fa817f3e5e2433e6b7dba2156e77caea2,True,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,81e394509c4e4526e4a0b1f1b2f1a75ce144cd2f336fa10c7c1d567a0fc5ac80,Tests_passed,41c1ba3254d8dbbca18fb8eb422a90243c6b14963fe3e10f9b849969c099acd6,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,81e394509c4e4526e4a0b1f1b2f1a75ce144cd2f336fa10c7c1d567a0fc5ac80,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db,Tests_passed,63a1de6666ba6d29e5f14460914181eb48e7374bd94d6d37a185b886888265db 28,refs/heads/master,4c2df190640d3a29f804b8ecfe1c5ff2184d5d5b,d0ebc2d60b80bb5b1416c6be206035f0592bc1c1,a0009918ccd0e0c44319c39ae33b42f655e61a1a,,True,True,True,6,16,61,10,True,11,Tests_passed,f3738532edb41f106f849f34fe3ba774838faabdd8d6318baa423b66c429fcc6,True,Tests_passed,0d0afafff83c0f5bec622e8e4aa5cd9f08a77f8a9a6eff1267b0972e20a6529c,True,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,a2e9c3cf9701da6ef7e99556a73d29bad175e17566fc37ec6715e8ac6c506133,Merge_failed,d3b60a278b6555e49ffca9594ebff59b958d01ac21c214c30ef7d7f69a6b1774,Merge_failed,a44d27102ca97c8a94fdfc35ab476f2f39d87eb726545cc1e63390e4bd0c3cdc,Tests_failed,fb14ef7ebebc674611e480cae8128b985c4c996fa20f6297a98da4501be30e41,Merge_failed,d3b60a278b6555e49ffca9594ebff59b958d01ac21c214c30ef7d7f69a6b1774,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,6c13949519ebc1a3501d9c2353e0152ed51c61e6f45f7b2e5bec15c53aa05de6,Merge_failed,a44d27102ca97c8a94fdfc35ab476f2f39d87eb726545cc1e63390e4bd0c3cdc,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,51be89ec32d35d53182819a89edd2e1bfbe3627706dc402cd4c7d8e43fd58399,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b,Merge_failed,946ce89c57ea7eea49f07756791862788fc7ed8aede83d281057469a4803c81b diff --git a/results/reaper/merges_tested/julianhyde/linq4j.csv b/results/reaper/merges_tested/julianhyde/linq4j.csv index b20c121c89..1d04626b0c 100644 --- a/results/reaper/merges_tested/julianhyde/linq4j.csv +++ b/results/reaper/merges_tested/julianhyde/linq4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c0f3b4a7443737373430ec0a9b0b98d8baa2211d,52a1e6b48807a19c36c4ea8c0aee754d98c8e20b,f3f5c360dc087607a8c03b688dcc4756afea6d10,,True,False,Tests_passed,2e768541d087f358f7593cee6ec32f6a8ea74213ca41ce5e8849a149f86351cc,True,8,20,44,3,True,Tests_passed,c705f125a810fe1079fa4406877d385957dc319d15bcc3651b6cbacdb4ad35dd,True,9,True,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,561558ca4cffab12ab8cb0c6b46ac4e08ada7607fc36262872d344893fcd27d8,Tests_failed,9161bcdce4a7a8c5f431f784fd3d97e1d90ea312b1a454454885b811d2ba0f40,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,561558ca4cffab12ab8cb0c6b46ac4e08ada7607fc36262872d344893fcd27d8,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658,Tests_passed,4d427d03d61854383ee67c7fdd542db1fde2f412e7a11ccc29ab350f1e5b8658 13,refs/remotes/origin/pull/26,1f0e4d05f133cbc901e299ae795a86ed47f2425e,a73878006c809f7313e7767d24de9c6cc5ad3102,bd8899bc2485e6fb666ec9bf23c892898e523e2d,,True,False,Tests_passed,0b0419eceb563e5df39abfbdfb2c43c7855b8079fb926f52359bea37803eb7cd,True,3,3,44,2,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,True,3,True,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_failed,6ee28f8c010b3b77f16cf166c190281cfaca1659bcf29682dae865340366b6e7,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456,Tests_passed,1415a6163160f44e303b5725b9ef9d6ace536ffaab89ef4f8868e81ff12a5456 diff --git a/results/reaper/merges_tested/julietkilo/canbabel.csv b/results/reaper/merges_tested/julietkilo/canbabel.csv index 23e81cd872..e125503bac 100644 --- a/results/reaper/merges_tested/julietkilo/canbabel.csv +++ b/results/reaper/merges_tested/julietkilo/canbabel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,a2e8646cdce41a58d12879911e6ea6a836dfe7dd,c83fd7d51d708756fcad1c9f80b1cc9546d89a9d,e18507fe9f70894cfd25ee4a4f71fbd6b94a3e4e,,True,True,Tests_passed,cd40bf207daab30f267b0725bb715567c796ae040fdee3260ad0c97f9e719f12,True,2,32,88,2,True,Tests_passed,c0e502b69441fc741592da3227fbeafebfdb0f0b67a064ff4104aa7bb2ec2b64,True,2,True,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,15ff0358b749231b7c077c1cfb879a8dcee9dffa6219b9f09edf6b73e9180e56,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,ea991f55ba8102f24fa1b50be19ee86e1be259510bbd5d9c5a7b552e6828b4b3,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,a0eb64c72254a063765ee60191d7e0032a57b972664cd3d19988bbc700d13a88,Tests_passed,7b04cfb2d69cd14a749857622947b79979580cc0dd316ab8d504170c99c071ab,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Tests_passed,c5f590eddcaaefcf423561099325a9894f1682e8ed5ec8b9c079af777ff774da,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87,Merge_failed,bc87a9bf215c884f368ea2a7b85d676f85ceae5baf26c509707d230ab19aba87 3,refs/heads/master,ea550c2876ef63fc2cd3980af7c9900c8e4b668b,47df45694d26dadd949d95d7f5481e1ec2a3de4e,b9f6f3dbf1bf55edbe685e7b379efeb10ac9a6d7,,True,False,Tests_passed,d7b63d80f12fe78917eb41841d1b23ca5d94f436bcc2b43f916546ae234a5ced,True,3,8,29,2,True,Tests_passed,9bb1e1f8b15d68fa776e7cc7ef2be20cfd0dbb395d0e5ddec166c86dd98e7c40,True,3,True,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Merge_failed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,10f68374f243d005aa88ae88f54e58330b936a0e32a2ba9bcb18fa8dc3107fd8,Tests_passed,6adb9f01507ae2a9139dc70ffb396f5677a78638a1a835054ec2a908003f359d,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Merge_failed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,10f68374f243d005aa88ae88f54e58330b936a0e32a2ba9bcb18fa8dc3107fd8,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,df2c15ce9dbc1cba3d28b68e49ea3704e607af188d47c4b122c9553518cd08d5,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365,Tests_passed,7666315da8efb1b31b98b5bee793c2d5ab55ea29e4d8731bd6830ea2cb123365 5,refs/heads/master,41057a06b792ee5007209eff19affa91a6c3dce6,ba0f5163598959011d96333c47ca448747ef18f5,bc35f417799807f6f7a834d65ed04f73ba7659af,,True,True,Tests_passed,239d5e90eed36033235bd25629f79ddd4da9daf4d1b8cba7a0e981419aaab2c7,True,7,109,1298,2,True,Tests_passed,7987ba3e45a0c4adf39cfe40aea621fcb966f0b744cc51c25900efc6fc29f814,True,7,True,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,39aa09a35d96e0a4d2209ac673bfa3f93f06318cf63adc04c16b1884e94c326d,Merge_failed,0e2185148f467f69217be5cf2b24d7a82ca6b2a19f2291df4007b8ba6c9448ee,Merge_failed,12ea140a94b242210c717f955523c885a6e8db80a56928e8133e8ab26f6ab610,Merge_failed,879fb8bc131a27942e57a2fed2d347e3f4b7def4914fc7d4d370547d4e6da96b,Merge_failed,0e2185148f467f69217be5cf2b24d7a82ca6b2a19f2291df4007b8ba6c9448ee,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,c1e1890fb77399ac9c12d37385df38607b5db9d7eb578da4fc60b23c349ba09b,Merge_failed,12ea140a94b242210c717f955523c885a6e8db80a56928e8133e8ab26f6ab610,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5,Merge_failed,25adf2205fd81222ea70dfa98fcaeefd750338e6cba5675bc700b557ad5006e5 diff --git a/results/reaper/merges_tested/juniper/netconf-java.csv b/results/reaper/merges_tested/juniper/netconf-java.csv index d92ad3ad0b..fe86c044f1 100644 --- a/results/reaper/merges_tested/juniper/netconf-java.csv +++ b/results/reaper/merges_tested/juniper/netconf-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5720d527507c33e5fede2e542dc3d892eb780b5d,0e040c0dd0dde2bc26652a774d965e515f83ff08,ce3d27ffc4c1ad65dae9805d471e1af785361e6a,,True,True,Tests_passed,2357e7e485918b27fd314cf0c1b36bffbb75b2c7a987a2c8e11a6ae0d59d1409,True,23,133,2132,7,True,Tests_passed,44ddf35bea8f92693dd7c85b73685001755c0815a964b89dd7faa7a1bb424291,True,24,True,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,a4fc21cf1377b6a54c1fc9d7f2ba7fc8e0518eba9772ec10d8c10e67db3439b1,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,9e03107636458ee4f883af10d169404b3da58853a5102231da0bcf9ad01fb294,Merge_failed,24340c82ffb0826329c89e1d9b9d1cfdcdddb51e1f847d5c92f57a930fd79e00,Merge_failed,20f2907c64a44988890abb2f5d43f2f487d91c16d1f7360f668036a9cee1e62d,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,ae56b065f2dcb5d4e63cc02cf1f98e0f405605b88623fba7a6e7d9df2a738ec1,Merge_failed,c89731a101e850349cec848f2d4bd8b3707ead477052478a94ee9a37f6b34cb5,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff,Merge_failed,4467251523e3f8d920376d4aee69db22da25d28db971f14bba64398073ce66ff diff --git a/results/reaper/merges_tested/junit-team/junit.csv b/results/reaper/merges_tested/junit-team/junit.csv index 323e86a52d..9a385f895e 100644 --- a/results/reaper/merges_tested/junit-team/junit.csv +++ b/results/reaper/merges_tested/junit-team/junit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/main,ab7c961572adab958edf4c5cf1f5371b72117300,3681aa3796084b41d67a25b31c6595dbc180167a,343599800301b8f0886921cfc605dc85899f8f7e,,True,True,True,305.0,1133,12392.0,35,True,320,Tests_passed,c0a7dbc9bfcdb1ba4df41619164c4b4d2cc0d488daf2d8a5266b79dbfa66e519,True,Tests_passed,ecb36102132e62af6d728da6d2a70e664afee3fd9d2f068b845897d25de312d2,True,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cdbfc3804e10b962c2cb78c9604fe80ff4969ff64e1d15a28e3be8de03d5c4c2,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,ae9acd7cd49e63faf73a0855440b414b45a40eca3f2b1f0865bef6322f4b2e51,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,d744da66a666c97cbaa0a9d4b76234306e8b965add7fd57f565458ce38bffcf5,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,dd56dff44347c8a31aea76847c43e99b68d38f4fa8fcd3af6f581d0cdf858a30,Merge_failed,318fa1ab8b9d6d40251ce1d13b872ab3956300e901de268fbff33bc4c29d9732,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,ae9acd7cd49e63faf73a0855440b414b45a40eca3f2b1f0865bef6322f4b2e51,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,e3844978040f2bd7d1cbd09c97d7edbb2b4a339b9ddb364a670a6da725636851,Merge_failed,a2da201587bfb48b66e3dac0c9f68d9c0e973554c01ddaeb889e79404e2d64d0,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cdbfc3804e10b962c2cb78c9604fe80ff4969ff64e1d15a28e3be8de03d5c4c2,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb,Merge_failed,cb2353f12ce6b2be29ab22b37afe5a4af3c1d199689a9645b173a6565947a7bb 10,refs/heads/main,f5dda835d2a3ace89fe1d12e2e769cf1cfad198a,0038617a0a6c70c712cf30b90c849db518f3715f,eb75886b2be7edf709441962bf3272e4319823c5,,True,True,True,161.0,760,7530.0,2,True,161,Tests_passed,c3668db25c6ad2f55226e09d6c2fd65dd9cc7642ae6edf655391bdf505dd9579,True,Tests_passed,819381e8934e7a5fdf026f5bd003bb88d7ee4d47e2d78e6524ac8894f1e32ad1,True,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_failed,df10c58d58d5d0ebe2537edddb57256a8ab3537aba6764d32687a142807c96bc,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,ffc65217a2720628fd84fb2508b16ec93177fae4f0af84bdf38f03302c684c8a,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec,Tests_passed,56985d9c524bb589b130cb75b4dac41d60a5a78b7480673ebb164ebb452c80ec 26,refs/heads/main,28a3a3b1bd84e4b438bea6fccc913f419003f879,f56556f1f6fa3390efd7dcbc22123321c9a596ff,37a8aaba8a817b4bebbeebcd645d304601a0c8f0,,True,True,True,23.0,99,409.0,2,True,23,Tests_passed,62cbe78d69e793794cb21c1fed1d1dd6e552b06d00dc5984a98ef1cca5101d54,True,Tests_passed,06135118f54f96a79444e7c8060d104e8480e30aa273be887b11dd77afb0998f,True,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,d58191d306568d3af0233e998ac76a19c69c2744660d557e29cfc4403477025c,Tests_failed,3fcd6203d640738896222f236d03726bbe3f93c841fb035d539e9c02e72eca2c,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,d58191d306568d3af0233e998ac76a19c69c2744660d557e29cfc4403477025c,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947,Tests_passed,1ad6869e7ba4bf6d6e5df530a98d7ab5200a26792b31ac3e0956497e283a8947 diff --git a/results/reaper/merges_tested/jutzig/github-release-plugin.csv b/results/reaper/merges_tested/jutzig/github-release-plugin.csv index d7a04309ae..8fd9a77042 100644 --- a/results/reaper/merges_tested/jutzig/github-release-plugin.csv +++ b/results/reaper/merges_tested/jutzig/github-release-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,e68bccd8f307a6abd453e6de7be20c006516a3f4,8293177f3f8591785bf72e75cd78cfe38c84b8e4,b1a086f4016d3c53737122237c5def5c8982d518,,True,True,Tests_passed,b689f7ad5a0f965a97609704c06c2f1c7fe3e819716ddac4adc7f190041a3e86,True,14,66,371,2,True,Tests_passed,5a68158ee371555777cb33529794e2d724df9113d1584bd5b13540daea9160e7,True,14,True,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,7aaf2550398364eb90bf5b8c210a34b2d5ddaaea064ce1c44587fcb57b284b5e,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0,Tests_passed,83bfdc9b173959374899729a3b5094822bf687ed783cbb5eafcb75ecb741d7f0 3,refs/heads/master,d86f8d63a233331d6543a8f022ac3ffb9f92ea8e,681657434033e6252c24cdbe967fd86b33c0bbc9,3cd07c562b6df0bea3261808669ad121bf99b9f6,,True,True,Tests_passed,09d0474cde36a8eb5ca205bf9a1a50425f766645b8ee84755949cee2f62c10f9,True,3,53,148,2,True,Tests_passed,cafbece6951c487675954175bd64999f34481aaa328db68d829a0b851dede3b8,True,3,True,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,d1ae51fbe59ebe25a97364ee08229ee4df9d00b8aeb4e6d4f29f9a81f6680de9,Tests_failed,85f8de2c107db2a26acf7cbf06183c4d3e443810a422221deab37941a97b2668,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,d1ae51fbe59ebe25a97364ee08229ee4df9d00b8aeb4e6d4f29f9a81f6680de9,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,75ff6b00d2f73d9e7b0f834048c117d156385136f698d5d2973e2a7e312733fd,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d,Tests_passed,7c152184547560569c4a92c2e9c605c1f67c68218708b2ddd0dde503f7df3f4d 13,refs/heads/master,00ea032304dba5f66b524a6828b2b604b0375076,31b8202c5b62cae22472a84b0fb1b395d4710a8c,86153965278a11f895863864300f3047ca91494b,,True,True,Tests_passed,c0a0deca5325a786373e694672b1cc4d74b40874b5dc41379e2effd630866611,True,3,11,141,2,True,Tests_passed,623927726828e66f7f99bdfca546f2a7b55f7481994462ea0c5bfd1c5c4d28c5,True,3,True,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,169c60f9f8d20b6601f666c1f4c88836f4d33996e017daa280878caba3099c4f,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,fc8e4836612edeb788ad62fb24df69b67e9b00f8607030ba57f3e9a6ddc3bfd0,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,8dd2faa9e565675a01b95907e4ef5b84036809655193d0f133f54ed68d04740a,Tests_failed,cdc8e2f6b688caa65447af682eee5e452bf9456fe9d30516033a5de2148be67b,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,fc8e4836612edeb788ad62fb24df69b67e9b00f8607030ba57f3e9a6ddc3bfd0,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,8dd2faa9e565675a01b95907e4ef5b84036809655193d0f133f54ed68d04740a,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,169c60f9f8d20b6601f666c1f4c88836f4d33996e017daa280878caba3099c4f,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8,Tests_passed,15203e57dedea9a9bfce0fa94cd548331bbfa99d80a5a87c6f178da0ce6517e8 diff --git a/results/reaper/merges_tested/jvirtanen/nassau.csv b/results/reaper/merges_tested/jvirtanen/nassau.csv index 9a53cb1cbe..5ab048df12 100644 --- a/results/reaper/merges_tested/jvirtanen/nassau.csv +++ b/results/reaper/merges_tested/jvirtanen/nassau.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 97,refs/heads/main,77574c064155c1f9245f5dda74c0531bedc81c9e,622becedb08bc5254885f3738ca1914afee77fb6,741fae1ea49f571984a43ba789d66ba24995834d,,True,False,True,8,38,153,2,True,8,Tests_passed,d53abedc98a5c4cb6acea97901c01ede9ec78765668036290e705297b0d98326,True,Tests_passed,c8a5f4251ebbf76c089fd51678952e14f8df02fb5045e980e3738b14cc8557fa,True,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,dfdd8e10ea2c5b65bd871bef4c6c2a2d5d97d08f0f40daddb143749f27fdaba4,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13,Tests_passed,cebf2ba5e98bd1fc2064d80ff579cf0be11cf81206999116d433579a91a23b13 diff --git a/results/reaper/merges_tested/jvirtanen/parity.csv b/results/reaper/merges_tested/jvirtanen/parity.csv index dbc2725c11..c9cbae7359 100644 --- a/results/reaper/merges_tested/jvirtanen/parity.csv +++ b/results/reaper/merges_tested/jvirtanen/parity.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,a3aaadfbec54010fd2916804a872f09579f7b0fb,672528d11cccbec6b2a28efb6c8c8d14a1dd0c4f,07a94a059dc097c54a3b78bbfc97fba33c3aeda9,,True,True,True,7,8,20,2,True,7,Tests_passed,4520e13fefbf1431ffa2f3d753542e19277f1c1b216b07636f947cb76f1f24c2,True,Tests_passed,fb40cce2a40a80875af2797b4d65399d10b4410faa8bc89a49513f83b67af023,True,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,bc583789bdf87c39805a19617a07fc756cc107e26c49155371c0245cbd79f61b,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d,Tests_passed,e0216f631a6ad960fec39a72345b4fcbe325404ce740ba1b2b3d6face769ae0d 21,refs/heads/master,87ff7e6a5f763036ed10ac0213c8c6dd1e298eba,8ea86699d233a1f88524e10dbad6a11a0b9af53a,901659312ce0292bea551ac34d363470ba2c2cf6,,True,True,True,36,195,550,2,True,36,Tests_passed,3ee35a5bd252711b0a81717d89bf28045c3207f3973b5f54ded4316f83268cc6,True,Tests_passed,77c99d0c6af964f2b2b1bf701802f17171d3aa8b198270d811d269410a21181c,True,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ffa2299e9c1ee7f94003e6cf4d4046003f248577ae272591309c88256bbaf7c,Tests_failed,027b65bd9feb250b72dadad7938e0f88e7e517e381b8d524d4d11acea1aa2038,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ffa2299e9c1ee7f94003e6cf4d4046003f248577ae272591309c88256bbaf7c,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,7ef784ba5df04859cbf9ed57e3d002ba958f7751c97fda6a0459c9283e39df12,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a,Tests_passed,b9e4b5180ad382d3ff1d66567ac9b198c431c66d4c9c36cf1caf1b928ba5832a 69,refs/heads/master,7647cddebc814f7511790414b2cddff8767936a5,9a4219b684109f79897ee9dce0c46035cccb7bc2,ab080b8f2935a55bf2d4b45ef35718dc8cfab626,,True,True,True,11,50,240,2,True,11,Tests_passed,c369608adc31c0523817d49d48d3342c53d2e4eac49405e6ed5c530608b00024,True,Tests_passed,49d5d93cb5686dd8ef0d357e97e2b83b0186494ca66887c22b9dcda4168bbe44,True,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,bb2a3bafbdcf344a10d4c47a9016be0eac3d9848909e50d9d47cc9337b15fb5c,Tests_failed,924e50ba9138f4b7e4f6ff1aa7d22da6804ccd9e1fdfd1469249797b75d5e48c,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,bb2a3bafbdcf344a10d4c47a9016be0eac3d9848909e50d9d47cc9337b15fb5c,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e,Tests_passed,5488a9ed7c87e7e703ed4fc84a127c1ba1a321b9b81fedd332921c934d520c7e diff --git a/results/reaper/merges_tested/jwcarman/wicketopia.csv b/results/reaper/merges_tested/jwcarman/wicketopia.csv index 51aa690db5..79546b2033 100644 --- a/results/reaper/merges_tested/jwcarman/wicketopia.csv +++ b/results/reaper/merges_tested/jwcarman/wicketopia.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,65dc57a69735d064d0c1c05fa67493b94c05b159,e32b5746cff9606ca0d26560dc48dddbadcf797f,e03bd261c14b567655c0408f25e9849ba93d7126,,True,True,Tests_passed,c6a9890728b360c23a505bcede16723ffefb09dc4b37f50d64d1aa03387ec971,True,101,223,2678,10,True,Tests_passed,49252840affa51ac739ae2f9abaf66f7e1c8aaf9e8e1737d7d102ac4c3ed8dc7,True,101,True,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,a50b36544c14718be3a34fa83ed28eccc09b3baf298153f90ee6f03db453c4ea,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Tests_failed,8d49a54e1c831f1338344ec1982aee661b6d5b60dd2f5261a374bc488e097918,Merge_failed,d0f36402d08292c7b86733fb33c9b52158c64ed58809d2d9a6cde313a83cf926,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,f05681d5ac81e4cf91f726801ad7f00b6073dd7be1c48a969c7767180188f525,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ede69e17cbe41cbe98a308e59b9a1bd6630e2ddefb99a7458b43d2977eb0579d,Tests_failed,a71ed73defde346284a19ddc977497592390f3853cb6a3728f5228f92b3c2ac1,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,0caa91ca0166822fdcae2c0b5f9a11608f12f0eb449a2fe25243a17466f8ba0e,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb,Merge_failed,ff06921303011d8cc131635337f3a37931bd750c3bf9e50f80aa078ca4aeddfb diff --git a/results/reaper/merges_tested/jwtk/jjwt.csv b/results/reaper/merges_tested/jwtk/jjwt.csv index 2ca6190bc3..2bb851f6ff 100644 --- a/results/reaper/merges_tested/jwtk/jjwt.csv +++ b/results/reaper/merges_tested/jwtk/jjwt.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,fd52e0ffc2de0989879fd6f6b63e19416db6627c,9bf487f0b7686bec97ac368f592b7cddfa99546f,17c3dcefd0b297ae387c45d1c99a820b5c714bd3,,True,True,True,23,61,697,4,True,23,Tests_passed,19944222845d04de2ffe76d9b7520edfc4d305d0341bf621ad4fbdb4562ddf90,True,Tests_passed,c518474119e1faa6f7d7573f4ad97a45782b94c841365d609b431fa617ef225f,True,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,607c7b1f7c70845db252f560e9a4d1a40130b143a25dbbad233d7c3f5e265cc5,Tests_failed,c91db1392dec5f6197df16d52eb9948a1f3d6073c1cb752f588789cf91eb13a7,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,607c7b1f7c70845db252f560e9a4d1a40130b143a25dbbad233d7c3f5e265cc5,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b,Tests_failed,c29c608641b09628f8072abeaf2985718d1d756aa47c96a58a94dd2fd8d2f91b 57,refs/heads/master,ff932e9838a9961f4084a51323092559e1a1ad25,af01cca9224371012f9240c756a6a8ecbf606074,3fb794ee9131b9e6d6f0c24e408b05e53025aa79,,True,True,True,11,35,236,3,True,11,Tests_passed,40f183e144f7675839baeff496a088ec2399355e151996b5b0b5ffb9c3417d58,True,Tests_passed,489bd2e017dd2dcca02c17f59763f59df40a9f890ba1010d71bf3ee76c0132c7,True,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,543faa2f8087a2825272faafb9dbb8825726a3f9b52d22ac58b89b76f5a59d22,Tests_failed,7308313919df361e3450c149e9d0e7dda29b369f956a03d7f1f4f3b3fc3eb7a0,Tests_failed,4863d6870831f62ee955f6a0e88cd67ccb2693a8ad19b2737c9e0f2a87b22ebb,Tests_failed,4d839b947d654417fd75e8d033c7b5dd609ae70507b9c6ed4b9814d8d430429f,Tests_failed,7308313919df361e3450c149e9d0e7dda29b369f956a03d7f1f4f3b3fc3eb7a0,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,c7ecaa24922341ada2fdf56ec922aba76f9b555694b1178665be8145da3e3a49,Tests_failed,4863d6870831f62ee955f6a0e88cd67ccb2693a8ad19b2737c9e0f2a87b22ebb,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019,Merge_failed,ee221e79220576a44552109672702ca6f14aea24c58b7d71cdc2b10a9b098019 66,refs/heads/master,e55ea34e951f8bbc8be50a49b166949a4d1e4873,8e6e165c1db7a69c9a0d34387892f2bc2409a301,707f7bc046b363ac6262f43bdc0885ff04f35f1c,,True,True,True,35,97,1467,2,True,35,Tests_passed,5f8eb8867805b411684f48bdc39e2252ade78d9c946269a029192c08f218c654,True,Tests_passed,dbffa571c22047f577768182edd2e7934092a67e1b38ecef5389f2f1bf3489fe,True,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_failed,55ae3c777e57d84dd242547ddc745a33c190aeac4e49c0830bff52907466a545,Tests_failed,baa1a856ba105d676eb4dd66d725c5847f4fb3e7024e008ad934ff165d150624,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_failed,55ae3c777e57d84dd242547ddc745a33c190aeac4e49c0830bff52907466a545,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe,Tests_passed,85b4128161d36de4cccd030c13d7a3990129471ed5f7d947320f76efaac6a9fe diff --git a/results/reaper/merges_tested/k3po/k3po.csv b/results/reaper/merges_tested/k3po/k3po.csv index 572dc6149d..a8d311cd08 100644 --- a/results/reaper/merges_tested/k3po/k3po.csv +++ b/results/reaper/merges_tested/k3po/k3po.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_failed,1baf6d325a4544b5a24b63fb8590486dccfe7913fdd0d1d645d627b8905526bf,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268 329,refs/heads/develop,1b2a7eaed60d376ab87a8130c29b2ec957bca767,6f84f238da4c58feb35ea3fcfb882ed406d76180,cc79950f0d40b73fdb30dfe097e5337aa57fd4d9,,True,True,True,277,401,4540.0,3,True,285,Tests_passed,04ee2ace54bb3a086f6e04b05ed4108f4d350bfb74f0d6c7e0aed7bc74df5c14,True,Tests_passed,e7deadb731b20ea48f0af4f41ce58eada58ecdcf14b9062d5cde969cb44ad098,True,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,f7c26c4698b24c3a1e2e206d08230b53633407c234a181fc0879a4dd8559c82b,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,4b0081537cc273bb96ccb8673d15eeeb58aea5a543e542bf89f319eb31432499,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,8c0c7abf0261ce7320ff9b910f8bdc2c18f2b124bc8bf70cc36e85b1bc79a3dc,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a 380,refs/heads/develop,6f55ad6692307e9c8179c82d80b456c866468fb8,4624fce1a1d40d2266096adb5f489dd47327bc27,3befe53d068077af9ad41154da1e7b643c68752e,,True,True,True,2207,4142,44855.0,11,True,2207,Tests_passed,d27e072d1bda030093985d56af6b16f05576ab7476ca4a216ebdca6b440a90a1,True,Tests_passed,66e01a21920ac4f7f82f61059e150bf8490bf651e886fea1c62d8f5f3d72a7e5,True,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,547827178979ac42ae70c7b52755d9670a48ec355981927396ece77ea32e31be,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,d281879d0d7f4d071f626cbfb479546a702596e432eef84d2941f3a599e2b97c,Merge_failed,1649a83dd87d7f06bafd55757a01094343f915a6e88fe2b0d5260e9e0fb5e5ab,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,f11fb23c983874c0fc14534e3f6c7bd39bb8b333b4f17ff27e898878106eed33,Merge_failed,32de30109ce86f1fd0d88292bf98b6fbdd4be7fa928f5ff287baa4416f3a4990,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef diff --git a/results/reaper/merges_tested/kaazing/k3po.csv b/results/reaper/merges_tested/kaazing/k3po.csv index 6d59f31f88..c737139850 100644 --- a/results/reaper/merges_tested/kaazing/k3po.csv +++ b/results/reaper/merges_tested/kaazing/k3po.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268 329,refs/heads/develop,1b2a7eaed60d376ab87a8130c29b2ec957bca767,6f84f238da4c58feb35ea3fcfb882ed406d76180,cc79950f0d40b73fdb30dfe097e5337aa57fd4d9,,True,True,True,277,401,4540.0,3,True,285,Tests_passed,04ee2ace54bb3a086f6e04b05ed4108f4d350bfb74f0d6c7e0aed7bc74df5c14,True,Tests_passed,e7deadb731b20ea48f0af4f41ce58eada58ecdcf14b9062d5cde969cb44ad098,True,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,f7c26c4698b24c3a1e2e206d08230b53633407c234a181fc0879a4dd8559c82b,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Tests_failed,01088096240cffc5ef0d09500b73db6746f083ace630f7ef24b0ec478b0cadab,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,c855a83084cc3e5faf695bbaf76ff92c3fccaf0a16fc253bab06c72a4237b726,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a 380,refs/heads/develop,6f55ad6692307e9c8179c82d80b456c866468fb8,4624fce1a1d40d2266096adb5f489dd47327bc27,3befe53d068077af9ad41154da1e7b643c68752e,,True,True,True,2207,4142,44855.0,11,True,2207,Tests_passed,d27e072d1bda030093985d56af6b16f05576ab7476ca4a216ebdca6b440a90a1,True,Tests_passed,66e01a21920ac4f7f82f61059e150bf8490bf651e886fea1c62d8f5f3d72a7e5,True,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,547827178979ac42ae70c7b52755d9670a48ec355981927396ece77ea32e31be,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,d281879d0d7f4d071f626cbfb479546a702596e432eef84d2941f3a599e2b97c,Merge_failed,1649a83dd87d7f06bafd55757a01094343f915a6e88fe2b0d5260e9e0fb5e5ab,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,e7e7fea986fdaf17a305151e49df3dfdf4834a06e47a78be9113c4722282448c,Merge_failed,32de30109ce86f1fd0d88292bf98b6fbdd4be7fa928f5ff287baa4416f3a4990,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef diff --git a/results/reaper/merges_tested/kaazing/robot.csv b/results/reaper/merges_tested/kaazing/robot.csv index 5b744024d5..a42bc37f3d 100644 --- a/results/reaper/merges_tested/kaazing/robot.csv +++ b/results/reaper/merges_tested/kaazing/robot.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 193,refs/heads/develop,5601ab5aab64da1d3b14b6b78eb1a44bd4811778,0f312477f8d5ad89a3f1e3754e94f3b20d6b4934,45b621de67fc9c56ca9d2010e06a37e1574e9256,,True,True,True,26,63,739.0,2,True,26,Tests_passed,4270416ec38f6394359152116ead0c2bc69d7cd8d183c8600a0bb3e899aede32,True,Tests_passed,542dc9bbc66d449082813d8a7092b5bc7dc0f87b72df1f7b73c30f5e1db585b6,True,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,0b544d87ea3bda191f356d3dd89e96df4273e92298af6dce1ed6c31a737167a3,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,1e89da71c576a4e50f8b5995fcce5f0f670185f6b5639ef7125c093da95f094e,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268,Tests_passed,fa0fd511283c944b2f66b81497836838d00a2239de9f1c0a1efb11492c057268 329,refs/heads/develop,1b2a7eaed60d376ab87a8130c29b2ec957bca767,6f84f238da4c58feb35ea3fcfb882ed406d76180,cc79950f0d40b73fdb30dfe097e5337aa57fd4d9,,True,True,True,277,401,4540.0,3,True,285,Tests_passed,04ee2ace54bb3a086f6e04b05ed4108f4d350bfb74f0d6c7e0aed7bc74df5c14,True,Tests_passed,e7deadb731b20ea48f0af4f41ce58eada58ecdcf14b9062d5cde969cb44ad098,True,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,f7c26c4698b24c3a1e2e206d08230b53633407c234a181fc0879a4dd8559c82b,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,4b0081537cc273bb96ccb8673d15eeeb58aea5a543e542bf89f319eb31432499,Merge_failed,80623a11b869e707b22f684dfb69602587d0a39e432b5fff226a6edc68ccfc1e,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,9690fb9c9ec7e49d0d9afb5cf18f9b724575efe395114e0f25958d519a918432,Merge_failed,6097e7147d7767f63344df068451d261eb1a9d2fff3cb678fdc7d5518be43e00,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a,Merge_failed,e2ad4eaa1c347c6f8e46dd8130ab7633be19a204a54dd2ed3afe42a67b22805a 380,refs/heads/develop,6f55ad6692307e9c8179c82d80b456c866468fb8,4624fce1a1d40d2266096adb5f489dd47327bc27,3befe53d068077af9ad41154da1e7b643c68752e,,True,True,True,2207,4142,44855.0,11,True,2207,Tests_passed,d27e072d1bda030093985d56af6b16f05576ab7476ca4a216ebdca6b440a90a1,True,Tests_passed,66e01a21920ac4f7f82f61059e150bf8490bf651e886fea1c62d8f5f3d72a7e5,True,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,547827178979ac42ae70c7b52755d9670a48ec355981927396ece77ea32e31be,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,d281879d0d7f4d071f626cbfb479546a702596e432eef84d2941f3a599e2b97c,Merge_failed,1649a83dd87d7f06bafd55757a01094343f915a6e88fe2b0d5260e9e0fb5e5ab,Merge_failed,ca3de6f25f327e085333c3a0a1e0b10b2410e5e1ea817a48213947c7eded963b,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,9c39b23b077308454949efe0783c7d26316c6a332095bc4d2c60f1178df8e834,Merge_failed,32de30109ce86f1fd0d88292bf98b6fbdd4be7fa928f5ff287baa4416f3a4990,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef,Merge_failed,98bae013a5645f321bfe8175eff342fb22f8626613713b1bfaa2c21e79cd13ef diff --git a/results/reaper/merges_tested/kamranzafar/jtar.csv b/results/reaper/merges_tested/kamranzafar/jtar.csv index 9f27d4e69e..af4604e5db 100644 --- a/results/reaper/merges_tested/kamranzafar/jtar.csv +++ b/results/reaper/merges_tested/kamranzafar/jtar.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,aace0a3c8a6478fd1bac95865c27535e658afb73,8f25838636b85d3c504ec732e04258c61682b3cd,52872a151bbf6c9448f5b05b033db56ed9fa1fe6,,True,True,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,True,11,33,183,3,True,Tests_passed,d3db4984d1d11186836c08cfbf9fef75ca719a5c3140a891c1f4cebd33aa73fb,True,11,True,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,337f649756999c751751d5264c4af65575bbc1576ff5c7845a38d096af5bc4a7,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,337f649756999c751751d5264c4af65575bbc1576ff5c7845a38d096af5bc4a7,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15,Tests_passed,405f2578b9055401d414b3391a2016dcf5c4957c52b70f151d654d85f8740d15 3,refs/heads/master,8f25838636b85d3c504ec732e04258c61682b3cd,59e3f7a525ada0fc1e62e05de795e57762bcf5fb,46a20204bcb3c16a94371f21f919c2717274cc61,,True,True,Tests_passed,a841de0c6da0effa57a921b792091f28f9e794e2e69bf3d2b078269544f9dacd,True,8,15,145,2,True,Tests_passed,90c835d4115c583e0e1ddd6615c5f7adb16378073f8a5272fbbbbee1fd0017bf,True,8,True,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_failed,4971d188b11a7f8b78810fef00298f252bf844006055565f1c50c661f1c480cd,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,2cacc750f8e618515f9e6d99cf4784d3f7b23826df1b9c115a2e7117449e12c5,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e,Tests_passed,5ea460700f8a450fdda9b6d3fad4cd6345e3ce2189a8857fb861b6dc2315844e diff --git a/results/reaper/merges_tested/kantega/pdf-converter.csv b/results/reaper/merges_tested/kantega/pdf-converter.csv index 2f38c771ff..a390297103 100644 --- a/results/reaper/merges_tested/kantega/pdf-converter.csv +++ b/results/reaper/merges_tested/kantega/pdf-converter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,cccf5ae2eaae48fa72110a813376b7a4b54998a0,919f68029889285fa51f1ad587701bf7169d9265,4d9c80590373efbaafd17c18be56f21e9af873e0,,True,True,True,36,44,655,2,True,36,Tests_passed,1e6ea2387ad2d7442099e2f9ec94eee91c5ea190543854438c9ba8aaf85eaa22,True,Tests_passed,fe080ec907d9ed9dd106b2ff6ccf1765e3a5065b1f3b3651246b1db845ea5954,True,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_failed,817053322dcf8e341ef57730f73546299b2b5a71f5546e9dfc0ed5c2706854ab,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_failed,96ea6c8bbd5d1c5cc9e93822bc49139f68836c6b2fc18d2462c887fbc19b199d,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,45df7de8c8852a077906bfdba37638f65e6145726bf280dc544f32cfdc9e5cd6,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f,Tests_passed,b65f26c7f098204f5a76a6c2c099e1b2fe507cca52cd1222ec1940f156a1326f diff --git a/results/reaper/merges_tested/kawasima/websocket-classloader.csv b/results/reaper/merges_tested/kawasima/websocket-classloader.csv index ece87201a0..191723814d 100644 --- a/results/reaper/merges_tested/kawasima/websocket-classloader.csv +++ b/results/reaper/merges_tested/kawasima/websocket-classloader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,88366037a581c46cd8de7463b50d29713e2e5c5b,f482eb2bfc2a6a85243adf7e4eaa77d918493868,685399d19d8c960926a6518f0fa8f76091034add,,True,True,Tests_passed,a8a898766af5f842af256558889e192aeee5b0c52bb571507bd3ba056d1df960,True,23,92,1005,2,True,Tests_passed,f277f6168d47d1e1f8565f5be25621c158b26d37927dbda02d25ce03e84b74f1,True,23,True,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,a810e5184a7d7d509b5eaf26d737ffbf77234f64f9b2b6f53ae50f6c4d544dda,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55,Tests_passed,869e9c97f6b2f161058780b8e0861c6162973df9781577c7d089ac1e890ecb55 diff --git a/results/reaper/merges_tested/kbnlresearch/europeananp-ner.csv b/results/reaper/merges_tested/kbnlresearch/europeananp-ner.csv index 268c64fa49..b5a46af697 100644 --- a/results/reaper/merges_tested/kbnlresearch/europeananp-ner.csv +++ b/results/reaper/merges_tested/kbnlresearch/europeananp-ner.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,f78e47209b90dc4b322b93e85efb5ea7628f383b,fb636780098aae681c337985206b47e15ac54e7c,e7bab88b1b829e0ba68234b00d71aba8300a62e3,,True,False,Tests_passed,51be7d333dce1777c70f841953f7b9e1519cd94b1a667c6f554aba800b73d4d4,True,4,18,181,2,True,Tests_passed,dab5dd6395b9270fb8a2c256f32ddb16f0caba3b0faef122dbce0dff3b464e49,True,4,True,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,b06fa1d16c7db16ed23dd0cf6b157424f485fc62401e92b2121b01e288a79cd6,Tests_passed,9c33304bf951d3bbfa925f1dafe2e6a71fa43ce99ef6a6a8ce0f454e9a78b3d6,Merge_failed,b573a6f20189aa9559b5aa26c3c13ed5e169279bbfb351482d897ba06833cb14,Tests_failed,ede796d75a72f6f0bed5352ec0baffb9f882891979443ab745e6f4f9115d3f5d,Tests_passed,9c33304bf951d3bbfa925f1dafe2e6a71fa43ce99ef6a6a8ce0f454e9a78b3d6,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,0cf91739e58e1e616f1f5649d6b43c3fb0b5b346f9274b6866512bb0bb0d0d5d,Merge_failed,b573a6f20189aa9559b5aa26c3c13ed5e169279bbfb351482d897ba06833cb14,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa,Merge_failed,23e7a13c0596295e2163d0901b1fd0affb005496f0e52ac25b846e51b58597fa 6,refs/heads/master,62d7c2a50fc75040d093e8f6ecc592fce3988da8,43a2d582de17af1c2e128a66ef40cb346e70ce9d,bab2b3182532ccf3cc63df5a00b6bdf47a72b630,,True,True,Tests_passed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,True,27,52,1060,2,True,Tests_passed,43bd862d980231f4c820a811ee7bc2ad999cb13a1a3fbe6555255bc0dbc58975,True,27,True,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,e710563c993ec57ae273edc74e89a8bd3a1755cfe85e17e6a4e3f8ad0d2ccc20,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959,Merge_failed,ffa4aceb05db8925f75226d2911cae35cd4bdc8d9989e167e985be1706edf959 8,refs/heads/master,02058bce7bad895e7b27640e4b1b3a4d68ca1cb2,92926c7587a95ca44dc3c2f775d0b389f60471a2,570ac140dea81fd34fe574bd0f2d58079f957ef3,,True,True,Tests_passed,6dd993b111288675161ef890ca4c38886ad949b7743e5f6a2906c088c20452c8,True,7,22,379,2,True,Tests_passed,c09ba695ebf587b21dc486a7f70e52a6a21e33335627c208e7760cd3817c33b2,True,7,True,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,44b7a393f5bf7e5b6afcece93cae6e32a344239e0ae67eef9479fa93fcf0dd28,Merge_failed,0f1bd0b98c36b6b35fb450127d2309fe2d5ca439fe10e9395502e8bbe175d982,Tests_passed,d710e65cb0384be06f51f167684ac8029a22bd08376ecd53fac55ce0a57ed4f4,Tests_failed,3e86356cc40b3f76d08b43a50b1f4282140082e0240ee22e4cf1d11e94facb4c,Merge_failed,0f1bd0b98c36b6b35fb450127d2309fe2d5ca439fe10e9395502e8bbe175d982,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,d6a83dcf13d06d8bbf06b92584f3064dfeda67e4a17854b98b35d6b1fb028421,Tests_passed,d710e65cb0384be06f51f167684ac8029a22bd08376ecd53fac55ce0a57ed4f4,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,4b4268cc11a4a668d83fd7c4c7c8e6ae5e01cce6e1e5ad806bfd9201c63c1967,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3,Merge_failed,342c19dfbcec70bdedc4460f705470bc4a0ee79d703f2dcdf72d9c422943e3f3 diff --git a/results/reaper/merges_tested/keedio/flume-ftp-source.csv b/results/reaper/merges_tested/keedio/flume-ftp-source.csv index 9c8f1fc7a4..68aad137cc 100644 --- a/results/reaper/merges_tested/keedio/flume-ftp-source.csv +++ b/results/reaper/merges_tested/keedio/flume-ftp-source.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,17,104,572,6,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,True,17,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,c42d3461244d422f2622e4ab91f6af09ac6c03a71711a25f488113e365d06619,Merge_failed,f4a5f74be4c1c3d51605f780b6600b6a31eb91a0cd2e8c30b08b92b7f5d13275,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23 6,refs/heads/master,f4c145bec4acce94ef00f97b814a511049b3b372,be8c09ffe539f24fe37dde84fc5d30309f02bb1a,59018c3f32045ac899032250a530bb095c7bd293,,True,True,Tests_passed,43d54d6281107c850db541f4330d08b93727e70127cb4371c98b4905107f6cdf,True,14,94,1210,5,True,Tests_passed,baf075cd3a4fed05e94de824ec4a705cf535a0800dc9dc6fa64a4796e8f5ccbe,True,14,True,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,27f31ed6ff95607bf4887eaa974e1572d48daaf91f812305a50b22a0be6604ef,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Merge_failed,26947d38abd21a6664dbf2be8d8c6bc3622fb30b678997e91acf6fccd63ed4c1,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,87467990e15eb4a38af3b00f73d1488219b2147899f1a64f2d6e92478f9dc24f,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63 38,refs/heads/master,65d75536ef5225314352bb18e8b03abcddab265e,75720564551f39cf872c10a181c33f9130f4ec10,30517761affcb1eb3d17c01bb0823c4a75ff4d24,,True,True,Tests_passed,e191dbe5bc09e81f8738d8a5acdab215bfecfb89e1fd807c14a5a4389a403e21,True,3,32,208,2,True,Tests_passed,916e14eb556256fc2bcbe595ef4c6a0fd3fd14119f60894fc4a2efb598d9cb4e,True,3,True,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,917b6a3deaf762bc517d4db1c8b6418bcaf2ef30abead834f03dcd418065e36f,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Tests_failed,9a2a06bb0b3a5c671264f34d29c714416390b53edbfccaf2697bbe76d7c79575,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,40b46a4090098265be7e029b4f177b8144630e34f82422785a977bd9fa50a20e,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab diff --git a/results/reaper/merges_tested/keedio/flume-ng-sql-source.csv b/results/reaper/merges_tested/keedio/flume-ng-sql-source.csv index 567b417001..efccf567c8 100644 --- a/results/reaper/merges_tested/keedio/flume-ng-sql-source.csv +++ b/results/reaper/merges_tested/keedio/flume-ng-sql-source.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/develop,c4b62bbb5c0c6836fa4eb17bafe43393d7c39707,fe0bca190476aa075751b7399c7dc197ca623948,a461f70bd99e74891b42d3df4304c79182e970bc,,True,True,True,9,33,189,3,True,9,Tests_passed,c1919dfc38af49491ab16a6358ea72a2c358a5e45adf164dea1289ebe06f0f47,True,Tests_passed,0a5659bcf8442e668398a7957a6c71b736f06c00eb41d5ddc517a688b8f80a47,True,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356,Merge_failed,e65bdb0f7764c0cb50a528aee50c98412edcf2243556dc0c22e3f95cb5219356 53,refs/remotes/origin/master,2ce9f4bbde8a973ec095ac8a1d3a99dd37e0f58a,8e2e2fb3e09fc90c302c592550aca122d3b9ee90,c0d4caab50a88ef5b0f47b67a4034eca9e7bc3a9,,True,True,True,17,57,1734,3,True,17,Tests_passed,0980a9957ce3a31af9c761620dbbffbf34aadfeb87d459f70738753b14ab8a3b,True,Tests_passed,00ee085c342a24f217d2e13c8316e5a9563132fdb20f9798021d007255d65728,True,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,e64a155e66bc3e874be3056c17db68b17454621149b404e0ba04f605f664d237,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,84c0065bff525b6f82e37c3894c755188e70d3f213c2645f0abdfbefc4029c81,Merge_failed,f8e43300a07cb8f71d869d88670d39eeb3cc0e6ab7ef6621883bdbd98052fc89,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,ae364a7f8d6efe795b8c26a1f2f48fbd5a79d25700daccf3e35e2a7621dcaa1f,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0,Merge_failed,2b2a6cbebace2164d0dc4e710c37cf9c9c77cc4715bc9b6dfb4d83b6b1f9adc0 diff --git a/results/reaper/merges_tested/kevinbayes/vest.csv b/results/reaper/merges_tested/kevinbayes/vest.csv index 0fc230a042..2ab5ace39d 100644 --- a/results/reaper/merges_tested/kevinbayes/vest.csv +++ b/results/reaper/merges_tested/kevinbayes/vest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/18,3209c8480f0f7a364ff86db4fa1c5762026347a9,0e314832855cbd12a9989ae2d01d27ea825b4c6f,c2c2bbd61ea75d1802b45fa0aba03c8dabfcac5f,,True,True,True,6,14,284,3,True,6,Tests_passed,71aed7b4c882099618f2b1d575069985ea520c9dbb6f3dc7e7a7e91aaea1cccd,True,Tests_passed,73cf9cf91b2db95a30166e86a88c21aa43526465e238963bce11362932a31e2e,True,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,9996fcf545eae5e171b2030f65eb6f8a0893e2a25905125557eca7283eda85ad,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,61b17d0cc036e0461ae6feaa16c2786d536901a852ca00b6ff989fec887a0e41,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd,Tests_passed,5c14611fef788aa931c50a58ab359f936f1c5cb6e38291c97a194762187906dd diff --git a/results/reaper/merges_tested/khmarbaise/iterator-maven-plugin.csv b/results/reaper/merges_tested/khmarbaise/iterator-maven-plugin.csv index e01b752d33..c18450af70 100644 --- a/results/reaper/merges_tested/khmarbaise/iterator-maven-plugin.csv +++ b/results/reaper/merges_tested/khmarbaise/iterator-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,99d1681276cd909ef4061373c1584c047d898356,380156fe641eb5b936b5becd9e031c268a12db17,5e50ad9cdac0106e3b43f3172c3b8f97da1dcb9d,,True,True,True,4,18,115,2,True,4,Tests_passed,6cc03b238709c2c719e13e7d2f1aa91ad30e8d8a44ba9be58733c7ffa0031515,True,Tests_passed,15c9b37931bca59af69ce54b24423e71651be937d5863e0717fac9c7875e36e1,True,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_failed,f0b8e6eddd1f7d8ffdcb17983e8de50ea5efd01fdf37304133cd8271c4d68ec1,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,02c236bb757a3c9e5b7c0ee9e0b7af61066da9e4d32ef4f686456365cc441ee3,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea,Tests_passed,1ffed2e00c72da397d770f483d6f43b5981829bcf3b6a1f2e5b2aefd45eba2ea diff --git a/results/reaper/merges_tested/khmarbaise/maven-license-verifier-plugin.csv b/results/reaper/merges_tested/khmarbaise/maven-license-verifier-plugin.csv index 16d23fae4a..2f71f8e4de 100644 --- a/results/reaper/merges_tested/khmarbaise/maven-license-verifier-plugin.csv +++ b/results/reaper/merges_tested/khmarbaise/maven-license-verifier-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,0329bcf4b7d1b8077d22fe8580d37ea103328e79,ce8439dc6634eb06f4cd61edfbff3428375b2bf5,74d5f5be15757b3a648c9ce5242e2e65268f3aa1,,True,True,True,16,58,693,4,True,16,Tests_passed,23d664a3f5daa87048857f20e1128b8c2efe3fc5db64fb2e149e4978e04eece1,True,Tests_passed,b2ee79543a5df69c698faeb7b18aff30ce87a04ef953bd01c3702312c3ba61c1,True,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,fa27f025d59f74c522bdb23880b526ceaf45cdb0df3e878868e5476fae509f8a,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_timedout,,Merge_failed,f5ef6ad8c81e57c55e4498384f634881f443c2a3029eadb6e1a84037ddfd8c08,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,d0c2a0df3aeb58cc0de4d0d61805ed8763110d1a96ba8de7b725e85cc3c21c2e,Tests_passed,1d7adcd6c54c958a49a7030df86e04ea9e638dd1a83bf448b35a23567e465fb9,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d,Merge_failed,aba8da606205357cd0a94625c6250628d6a1d2f071c3ddac58828c17c9acbf5d diff --git a/results/reaper/merges_tested/khuxtable/wagon-gitsite.csv b/results/reaper/merges_tested/khuxtable/wagon-gitsite.csv index 575ae408e8..1fcdc2d0bf 100644 --- a/results/reaper/merges_tested/khuxtable/wagon-gitsite.csv +++ b/results/reaper/merges_tested/khuxtable/wagon-gitsite.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/18,c94bcd0245b4844ab11ed21275f886cbbf21c9e4,d5aa326489bb43f65303736331247706d7dba123,c24ca067a932b0342131923e2eaa7680368233cc,,True,True,Tests_passed,b00bf9e8e4dda305f8491325ee402aa038e852ac6b620b96127fa932548916a4,True,3,37,137,3,True,Tests_passed,8202568122501c76010d3a16a78213fce4e5351878d736f1e27fe6f54f4926c9,True,3,True,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_failed,2fd4f317ccf3a02add05336d33872cba3d2b21307a02716635481e1136a41ef8,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,d9bfc89e1138605b93727775f547a54d49f6043eb333012768a32df0a0f71614,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258,Tests_passed,00a6bcfd13173245ff4c05e0d31bd7bc3016f61792f7a038d9450a9046aa2258 diff --git a/results/reaper/merges_tested/kifj/jboss-syslog.csv b/results/reaper/merges_tested/kifj/jboss-syslog.csv index 9c83494748..e8c4bdc4d0 100644 --- a/results/reaper/merges_tested/kifj/jboss-syslog.csv +++ b/results/reaper/merges_tested/kifj/jboss-syslog.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c7b3272555db107615303e60fb0a158a763deafa,84b9ad6265e15bc9766e909625dd7557f7cfe7a9,07f3c2f3c3d8f4558bf34a77f38ff01d8fec69c7,,True,True,True,2,2,2,7,True,7,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,True,Tests_passed,4fcbc0daad0a898a5dfb7f7252d1a5eac83342e63123b30e2d087c8e93c3fa99,True,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,3f90756fef11e1699c9c2ef5fab1d87032c5d47bbdbd6d5f907ae2b7fd901d37,Merge_failed,53a61ede1d7a01bfc887a827d956709d746c7004791182c84169025b67e1a7c2,Tests_passed,967163b4f0ebf9524bf307c7fa998a6e36e2d82e75ee9e4f98fbf17aa693b25f,Tests_failed,eab6c468e6ac3183c1c924824d889706f69e0856f068123178928c15b30a313e,Merge_failed,53a61ede1d7a01bfc887a827d956709d746c7004791182c84169025b67e1a7c2,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,cbff75db35213bb1a8772ade59c3fa04acd524ec4cd4db291d1a6ae5467531a5,Tests_passed,967163b4f0ebf9524bf307c7fa998a6e36e2d82e75ee9e4f98fbf17aa693b25f,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Tests_passed,912428c79b8e538df02ceffd3de099ef98efe0988d36493d66d86519eaa90bcd,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620,Merge_failed,385a4c05ab687c8aebeb25d369c9e00198d1d1ad3134c1519905395b9ccba620 15,refs/heads/master,b0a5f59bc365dda96b4051495d15fbc46f36cd27,ebedeeed422121087bc3be855ec363c8c0213601,bb26bd84f7ec09f94959c87d4a4fd43af6b3994a,,True,True,True,2,3,10,4,True,4,Tests_passed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,True,Tests_passed,521cec31d4f89b12dc48e058eca3cfcc81f6bf21d96a916dc3810218ccc1c868,True,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,3e40f5541299ccf0385e14249ce8b7c0ea9aeaa508530e2cf99a092fe1127c2e,Merge_failed,a40363c425da2fdf473a772a2eb18f3bb3b58a5dabb012a2aea00561ac0d22fe,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,daa38173e9db468452dd6aa6b929abdf88abd2a14d041dae7c7252a2d2cfc2b5,Merge_failed,92f7a877b6b4574524128f30c015a4c4f7305687e8be915cb133b89dee4f58c2,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9,Merge_failed,2315fd247c8f4051ba0c8316d0d68d91174e2a632fb7f024cfc13d25a3b4deb9 diff --git a/results/reaper/merges_tested/killbilling/recurly-java-library.csv b/results/reaper/merges_tested/killbilling/recurly-java-library.csv index cafd3fbee9..7e11a3665a 100644 --- a/results/reaper/merges_tested/killbilling/recurly-java-library.csv +++ b/results/reaper/merges_tested/killbilling/recurly-java-library.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/heads/master,082db8c4c022ec85d57f31bd143cdf9af44d611f,776bb456c86504d3e862ea81fd2e47f193c36a4d,9aff7d4d3d1d7567909fb0c8e391d139c22a7af0,,True,True,True,13,35,534,2,True,13,Tests_passed,0d11680f4399a583cafbcafb12abb5576d546d3464ab772cdab699c91a3bcdb9,True,Tests_passed,0b3dcc13e64da6d7ee9b87eff212b954557f8393d3e3c55d40db6e761b54d142,True,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,51b0170faad2186d963b5ffa40794dbdfa3063912471594d88a869b81fe88546,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,51b0170faad2186d963b5ffa40794dbdfa3063912471594d88a869b81fe88546,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f,Tests_passed,b8903ca16f6162ea37269816f2e479a4371ca842eab613328ddbed00d029260f 36,refs/heads/master,eca37e42a2b9072eebf09e4c400b0331189abb5b,bd157312d98336f263b3073a7d6342ddbf8e6ee8,6e8fe82d485b8b0563be7aa88e2bf0c5fb16b2bf,,True,True,True,31,133,1233,2,True,31,Tests_passed,08d1059f244f0cf690e6f73808808e8efd5ccaceb12426ef6970d5e2e8645c4d,True,Tests_passed,be50a72bedfdf43ea94965e20f947613e5188a81c18c4d4e27fab4947333e99f,True,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,4591e990b30c086c4424dc2eb95607ec21ef0e4398eb4cc909e0c42a1bd1557b,Tests_failed,caea13386d24b4e36eba5419fb22a1e56bc3ab7c8e5dc1d3045c65baf8e494c3,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,4591e990b30c086c4424dc2eb95607ec21ef0e4398eb4cc909e0c42a1bd1557b,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4,Tests_passed,b28e58b635cf2794c7e5f86ef6d970dc797de63cc50b06d8bd58b33f07dbfcc4 52,refs/heads/master,ac45b727dad1b6d1c67333d133603ab2c389d4b1,a1993dcef73a6e4ee2d988438b02718973995f5f,f1b70177494b2008d82d67b78f5877c641f10b78,,True,False,True,6,12,106,2,True,6,Tests_passed,1047748447c14ecf61ec4ac4fc3b3179a7d093862d023ee7f47f93fb6cd68b3d,True,Tests_passed,4eda689e52cb856873cf0d56ca8ad2bd0c19fbb72a485a6c4e111f65f0e4b617,True,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,d0148b172a2058bc327ea9cea0970e5f1b809d941fc54402adc6cd5c29869f8e,Tests_failed,f7f676b2f4c71b06ab4e25d8257a602fb3a0b52279ad5979753b2d43b558f3e4,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,d0148b172a2058bc327ea9cea0970e5f1b809d941fc54402adc6cd5c29869f8e,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817,Tests_passed,94b55a63e221c64ed631c632c67500a16a663ea91443e66ad450e5cb8771c817 diff --git a/results/reaper/merges_tested/killme2008/aviator.csv b/results/reaper/merges_tested/killme2008/aviator.csv index 51ce8631fb..3932fd2233 100644 --- a/results/reaper/merges_tested/killme2008/aviator.csv +++ b/results/reaper/merges_tested/killme2008/aviator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,d4415b36930d0d13221d1b74083d8152292138dd,fc563acf7b7a2f3859f7fecba88b44a28b9879b2,7ddd4fabb2f4ffd82ad61df6e3ec1132d20f9b35,,True,True,Tests_passed,75e722134b9da983206e6087fbbde66ecb4d38690bc96cb9bb549a01ec485b4b,True,54,271,1166,4,True,Tests_passed,c6ce8b3b2b99c41b4fcd43a4e32d5efbd503159adce296030c1b081ee1d39c63,True,54,True,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,e930128edce51c8757b29c934116fe3c42019f3657b05fb4ac322d91b259a579,Tests_failed,f26bf0444bd620e257d131981bdf0985d1e669a0537355349d0a092d472da8b5,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,e930128edce51c8757b29c934116fe3c42019f3657b05fb4ac322d91b259a579,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7,Tests_passed,1c87049b957c659540c7d92a5336b957f174e7ea0744c33e0deaf92c7c32b3d7 19,refs/heads/master,eb6c698603e67d6a9204280412473c19fe13ae5d,c053a2390b21d56ee5893df3df8fc68eab043be1,562db5443dc2618e94fa3a1f244ca339197d4da6,,True,True,Tests_passed,c112742d418ac9579ee00e5c93a6d2341c2d355fdc18196394c7fb537fd98b9c,True,72,169,1913,2,True,Tests_passed,dc6a47eed0fcecf846a6ec74c4f55447bf43a0afc74ef90812302cc3e3af4359,True,72,True,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_failed,6f36ac843effb54976d9dc077da4caa9c22f1c0283f312b8935b4f73056d5b52,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,1a5e08ebf9a83fb5c6f02b22a5d7af157dce25d46aa0fb064f94a5b6a82f32c2,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049,Tests_passed,095267140733a8acae70d17d964bf073262665c2c97bc5fca6a4c9553183e049 64,refs/heads/master,8b16f5427c044e74265c127110b814b4d25b2e9e,2b1dbc1ffbafd8f0e93b63f3609f5b3aa0338800,fbeb07d91da5e6cd3d88a1ce1bc4a1bf510fddf6,,True,True,Tests_passed,37cbae6b3251539139d033a9b270485f60166a49e13a5f20b043846dcf967d3f,True,25,38,978,14,True,Tests_passed,94b886ddc4ff521fc20c3f50a6625c4671f4378695a270f65ceb505b69c06f64,True,33,True,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,10d468adbac921a875569a4a9bc0838cb85293bdce32a5b454105d04fa9bdb75,Merge_failed,276f4d5b6c208e01bbc5d18b8588bcc57881362a6baa58ab2638b35a04630a49,Merge_failed,6e53560aa729164c37c3fbbbd7e96d68bbf00f41d6a447005b575101916c50fc,Merge_failed,7024167c17386b9022c1326b92ff78c896e3a254e9646b75a6b355a888c3f6ec,Merge_failed,276f4d5b6c208e01bbc5d18b8588bcc57881362a6baa58ab2638b35a04630a49,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,1222a24579c243d0522693fc87a6fd06baaff7b0f49e046fe992711754fe5645,Merge_failed,6e53560aa729164c37c3fbbbd7e96d68bbf00f41d6a447005b575101916c50fc,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7,Merge_failed,62df39d5f651d93eb0e0f5ef56e4d97c407d9baad502b5de7c171da2dd443ae7 diff --git a/results/reaper/merges_tested/killme2008/xmemcached.csv b/results/reaper/merges_tested/killme2008/xmemcached.csv index 4f2d5a0de8..b3a4a0732c 100644 --- a/results/reaper/merges_tested/killme2008/xmemcached.csv +++ b/results/reaper/merges_tested/killme2008/xmemcached.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,b9e0c0c8b216855a15478361d5528b62688b9f4b,9f108c974c8bcc1f17ed0b202df0ea0a669ec65e,eef7bcbe4341da1a9bad3e5b30781bf1e381ec90,,True,True,True,22,69,1208.0,2,True,22,Tests_passed,78f5fd833ef4083e296242256078379e4ce043dd2e5f6f2f9e0f07ec5c937e8d,True,Tests_passed,911ed6fe66d5c9ff285ab292254578c250115a8fe9eca28f75942eaec65fb2e4,True,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,1159886d5452bc91d88df631190875e623de60a800730fa856616657d3389def,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,7d30d4437041464b3040f040d1cc618c29a05a76798a3ca682a78760cfa27cc1,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24,Tests_passed,45f77ce51e346688fe217470e10ea304a89b50090e4fa4421e779bce8f477b24 diff --git a/results/reaper/merges_tested/kimshen/sissi.csv b/results/reaper/merges_tested/kimshen/sissi.csv index f5655dd1e7..75f001c0a5 100644 --- a/results/reaper/merges_tested/kimshen/sissi.csv +++ b/results/reaper/merges_tested/kimshen/sissi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c00c2e6554f121dc4bbb4fb2549738e1b1ec639f,73d171b086455c3d56fb7554ef823f875663b4e0,eb55eb9b6f00bc2435d9d65b521ca592f9138e01,,True,True,True,14,48,242,15,True,23,Tests_passed,290830813490792a7cf33b82a6df8bdecc6d7cd87d92cf87918f9b5e8e19221c,True,Tests_passed,3225e85c3d0c3c718f84e1ebb2469ce0deed53e245e01c8161c47842796f0eaf,True,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,53d123afb24f47d961ea8942afd8fc2c33be2e18cfc47ae8edda13882fc9769f,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,f759f8150b16fff45b8fad620444707010efb021440b02254f025e2fe2539cca,Merge_failed,e19034a478da432bfa81f19fbd63a2e00b0453c1a74fe2aa72f4ff079518914a,Merge_failed,14edf980998178394f96ad46049da39baf951488f9e1eb825e5859e59992d992,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,b861bb35c904e4e253b1285732a05f8926c834fdb9ea56be18898bb813159f86,Merge_failed,be6f8d1ddb5d0cb5299502a6267c2f943ef235cf228a9c9cf962c0a076a9f14e,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679,Merge_failed,5c80a15f2e41fef96370745e64ea5f7442c97f7378b5088ac188502ff2ad3679 diff --git a/results/reaper/merges_tested/kinow/testlink-java-api.csv b/results/reaper/merges_tested/kinow/testlink-java-api.csv index fa435b94f1..da7020131a 100644 --- a/results/reaper/merges_tested/kinow/testlink-java-api.csv +++ b/results/reaper/merges_tested/kinow/testlink-java-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,85223b0a9f6798169dcfe409ac99ad5d8a8cd227,417b80f0dfbf97fc2091de960968a9b7cb3edb7b,48efcfda475a4f8e55ab4e48f0ba3a643e0ac205,,True,True,True,96,976,7373,4,True,96,Tests_passed,b343d4b8369f83f9363afdcec89b0eb23fb45a8c119f9e8ff0e627610de43c45,True,Tests_passed,e05e5b57495e5196ddd011e1011cd7ac8d9d3303e14c121e08259316bbd9ed78,True,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,6b431f38a48f544fc09b12dcedfa8165c1eeb791c2a04d16ffca3e6b4d8afc2a,Merge_failed,a05ed91d98f9f8c5a9d06fc0814a002b542fd54eeb0c956d2d95e3dacbc0fda6,Tests_passed,3798bcda3c549eff74b07b8bfb6e029f7af7f4d519afd7a79326a8a47199d239,Merge_timedout,,Merge_failed,a05ed91d98f9f8c5a9d06fc0814a002b542fd54eeb0c956d2d95e3dacbc0fda6,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,733e24b85d1beebb1496f6992795fbacf64493a78284de440db7e55b8bbf9c9f,Tests_passed,3798bcda3c549eff74b07b8bfb6e029f7af7f4d519afd7a79326a8a47199d239,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,a38436fc7f73e91681d4ca23b103bd4911b1379cab28373698ca69949acb4812,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd,Merge_failed,b6c6511be06c1d7dae131613837be9b8fce4adadcd60bb232e4dd7284cf908dd 31,refs/heads/master,c8219ee401dd1f5feac814af4f6294e7d57abe2b,eb9ac19efb822f141aa71fbe3495f428a889ae55,8aeca53cc5da2e39fcd102387343c5d6b40f0213,,True,True,True,18,114,635,2,True,18,Tests_passed,c75efdd969445a5e814073b74bb4b2806bf1d2c9c3c29451bbe5c17babc5d863,True,Tests_passed,bc57d9d0286bb6c4014169bc7bc51d76cafa243431b1ea2ec64543bf9c1693c0,True,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,63990dabb7eb612516c72de3706c1f5754f10f8986a009e2c0dc5e79ea6257c4,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,05fc0ef3227340da87ea94670a881989d694c5e328c9c3183d0e4dfad05be311,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,ed2df67aedc4ffbb82edb454603361e2712dc6c36793162a78219482e2683426,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd,Tests_passed,955ca38ea7678719e3025241fe65b862dd38718c11173dcbfe3305c1a9931ffd 35,refs/heads/master,192242bb6b260af7a870650706e6f2459a446cc6,97c67d946f8871efd235dd1e3c132481138d0600,f57400754b92515f8d61d19c009d0a0f65487ed6,,True,True,True,14,46,358,4,True,14,Tests_passed,c2e88347666258e03b34d8253d8ba9ec4f86d27e43aaba0224f0db269934dac7,True,Tests_passed,1bad92bccc6b8cceea3745b0ccf459a6f80144a85e61fbfb0cf6779ec649c2b7,True,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,b49e0fb44c22799b47b3ab1a04df6c5769cca046ba6dc9fe093f98a37a640d1d,Merge_failed,6301e22f027bf64d243b5971fef1c5e4f223f7bbe51b57023220205ffd52d5ca,Merge_failed,d5e7bfc14d031d2a7d4673ea882315231df794b948fceaca339055b8f7b9db6f,Tests_failed,3629dee54a532f874692bdc5b4bb7d2b7c7032f063a5d014bd420dba82c86a65,Merge_failed,6301e22f027bf64d243b5971fef1c5e4f223f7bbe51b57023220205ffd52d5ca,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,91470d97a6047455938e9961fa9e205564d226f64b7b3e434c91e2800321de06,Merge_failed,d5e7bfc14d031d2a7d4673ea882315231df794b948fceaca339055b8f7b9db6f,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,66db785fed4cc04beca84d4f300544ca51f0e392f2a2794c4ea039715440b0f9,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf,Merge_failed,2a3d2da41b504c0249d157ac273119a8eaf3de094fa84ed727118224798112bf diff --git a/results/reaper/merges_tested/kohsuke/access-modifier.csv b/results/reaper/merges_tested/kohsuke/access-modifier.csv index 4848d9a2f4..81d16bfc87 100644 --- a/results/reaper/merges_tested/kohsuke/access-modifier.csv +++ b/results/reaper/merges_tested/kohsuke/access-modifier.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/remotes/origin/pull/52,38876ed95a6d2e7c44d433fd0cc347ba6131907a,dc8ec3bf1c16e3ffeb9909f74fc56a124a76ee82,0d849fdb7804e5fdbe23c73fdfedab89c9ca4aa0,,True,True,Tests_passed,1bf7715248dbf26db4ce507496002d27d4a403eb73736847e082cf4a386ee068,True,32,124,574,4,True,Tests_passed,57eadde338c7c5b167b02b0571cb005cb8f935462f4fe09edba18d179487510f,True,32,True,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,b0a5a231cc11a944ac3b4c50bbf2bbb685398bf4600f99bf6c0578443cf24547,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,f28cccb04b6c10bded8dc449c399f994256fbcd102360c7385394d58075a1476,Merge_failed,6c365e1a7378ebb22328ff93bb668b421b6567e7c8f6fc20d2469bf7a04a6c73,Merge_failed,5b0d89e2121f87a059793df7842a389416696f81c25d5228af4a643f198db495,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,6df49e0a9f6d1e61fe7de9ea6d5541e4c889dc5fae444e5ce89c8a4be796d4fc,Merge_failed,f5595b23d881ec0b72d84e581a2098f1e821f520e0bd44f749b59ac471b6bfbb,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340,Merge_failed,1b091f7b5b62ff2a9e646a7123a1a80e32e6157de6f8daab69dff1c43cb8a340 diff --git a/results/reaper/merges_tested/kohsuke/file-leak-detector.csv b/results/reaper/merges_tested/kohsuke/file-leak-detector.csv index 0cbd5757bd..abb9d0d2d4 100644 --- a/results/reaper/merges_tested/kohsuke/file-leak-detector.csv +++ b/results/reaper/merges_tested/kohsuke/file-leak-detector.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,d76ad63466cf23012237a78f23d30f6885072c4e,d2c1e07c9626c495fea7c7c9aaee7aa30c2e96d2,24f774257f6c21a70b3ed0d0cb28970370149aa9,,True,True,Tests_passed,a653ee396855d20affe93ff72068e8c5f3cf09fbf855a7721888ffd492913a3d,True,15,56,446,4,True,Tests_passed,d13c3ebc8f84e90a432b0d7aa35f6159adc45a29efbe3e510b7529055b51ae36,True,15,True,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,24e0f2653fe1fdbcdc7f63d5f736d942c0185eb9d549a878c5eed7b03ea73587,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,16a206466ea98bd84d957ccec31a41f40b07a9b70bcc9785c329873ba4a68525,Merge_failed,d815cc8544166c5f21d97e070672de3439a71a3c2b0eeb3097dae3922acbf427,Merge_failed,a3eed005f9e7b61f30bb0ffb0fea25cbef099274f996cd0835e61a72eae81349,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,12422377752b721c04ed3126d1cca66899b77251bea2ac40596bf58e56060117,Merge_failed,9dfb719b3cc8a3dbda3f1e5fc5928fe6b5390ff6e7d81fa8584a4a046445d584,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96,Merge_failed,555f440e978447926dc15ee4a2dcc4706d2b380788bbbc413e9706c16deb9b96 7,refs/heads/master,768944360be1d5e82dccfe677341b8ca38057f49,dbf2f24f4c67a4ca26d6c25dce2d3dde74a4f262,a23c562281b1317a68a9743b0120635b8204aca3,,True,True,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,True,10,36,357,5,True,Tests_passed,c556b6d9afbb674ab09fd6ae415a979b1305663eb28783006aa4eeefa9801ed1,True,10,True,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,93e8457636dcf284fcd77b84fccaf3ec1fdb28e055b677f0624ea7f9e6e0a531,Merge_failed,9b3dca4c990a787e4eb8a304f0d7102c9f9486523baab4cade215526c060f411,Tests_passed,9a93062bad8759e7c919c74cfac2bd30e7bda3cb36877c5db867bed4388a2264,Merge_failed,701a044cb558c31306472ed93684e7e7150f2b25b22de9ff8979b00c63fd40a4,Merge_failed,9b3dca4c990a787e4eb8a304f0d7102c9f9486523baab4cade215526c060f411,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,9de11b9bac1b2eeaafd405344ba625b7b2f5af99309d8845943570be68b18efd,Tests_passed,9a93062bad8759e7c919c74cfac2bd30e7bda3cb36877c5db867bed4388a2264,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935,Merge_failed,f4bcd92f49d479c5c51a2f5337f8e50f6e05c8984d320710e53f7f86c604d935 8,refs/heads/master,dbf2f24f4c67a4ca26d6c25dce2d3dde74a4f262,b5c34d09d30621295ca0c63bfdb9ffa62e46d739,639c672f9e50e842150a4a77c781222179886ac6,,True,True,Tests_passed,7b678fe51160865383457e23a22d75b5bca397e69c32c17daff5f0d43a0fd6ee,True,8,20,173,2,True,Tests_passed,de2a49311e08ff64af7e426cd24bb567ca391e201208e040409af0f04a919c70,True,8,True,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,ed98a507469f4be13f22a2f688bf2612aae66b20570b60bbd883ea6d451ab5f0,Tests_failed,8f444a7c85edfc136ece2d5c0ec17f0b4536599c54e0a4c965539225083140f1,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,ed98a507469f4be13f22a2f688bf2612aae66b20570b60bbd883ea6d451ab5f0,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a,Tests_passed,1629ebe6fc675bb14a3e9e9c43fba8097c298d184c0ea0f63070ad270f95787a diff --git a/results/reaper/merges_tested/kohsuke/github-api.csv b/results/reaper/merges_tested/kohsuke/github-api.csv index 126922c3fe..e6e9f36a78 100644 --- a/results/reaper/merges_tested/kohsuke/github-api.csv +++ b/results/reaper/merges_tested/kohsuke/github-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/main,ea17ade038c1d67b617afe3943ebf62f22bc08fb,dc0a8fa788f6858f2b04eaf5659ae9124e59ef27,38baf5df845a1397522e1e953b84a80fb57a8799,,True,True,True,150.0,181,11496.0,4,True,151,Tests_passed,467cf4caf9ae4d4d49ebf23339d479dc2e92116fa2a92aeddd501361bc0af8ef,True,Tests_passed,3a597c16e497798b3f9729c32f4a3a693476bef980ae96e9b9ca9d0f89264f3a,True,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2,Tests_passed,dc95304d3c7e68665bc6a27ac5edcc28eb706ee0006c026724c568a749a269b2 72,refs/heads/main,b898bdb20cd3d7dac96f527c008c14753895279d,c4b946455964e13ffacce009c866630216fbd431,1dcedba6a1fa7aac2425dfe116cb9026f3591e49,,True,True,True,42.0,53,1988.0,3,True,42,Tests_passed,a9b7e66836005745c9578399a1874122364e159cbbbee60f0cbf495598b544df,True,Tests_passed,a0feff9044378b354df7b404f2171159a4ac11560bc1e921e915583504a29195,True,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1,Tests_passed,70f0579d3d5f01bf8b6d5c94a33714733ea216ec52dca2876854e3d55e699ba1 143,refs/heads/main,3865f6056a22fb5cfcff4f32777a059e856ba60b,b52ee84d3015fbf4441f768b6e7eadceab055ad9,54902e845b691d425e27df9a624f8b1013f960f2,,True,True,True,36.0,70,2475.0,2,True,36,Tests_passed,1f1c4e260964bb3ae52c5985b141c1e2672f224319bec9306b547e903b633da5,True,Tests_passed,450ac4fe7a9d98a210b639e6e0fe5c48fe2505e65f5d479c7bfa24cea12c1c85,True,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_failed,f7d86c08e4a9e06de9c3c1e531ba36a857521c1ab58da409f39a22f374af5c47,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a,Tests_passed,5aca23a579898b6cfac1d2927cf95ca8d567d0261ce6e6129cf38ef5eefb626a diff --git a/results/reaper/merges_tested/kohsuke/groovy-sandbox.csv b/results/reaper/merges_tested/kohsuke/groovy-sandbox.csv index ce60591d7f..de736da8c7 100644 --- a/results/reaper/merges_tested/kohsuke/groovy-sandbox.csv +++ b/results/reaper/merges_tested/kohsuke/groovy-sandbox.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,6c8ab911380474724b7b1649c644e02ac55bf599,017bd009294c4fcb56474260f6c0358bbad252e7,b84b9562056b0feec65db9a5201403ea3a4da459,,True,True,Tests_passed,0ae83806fa3cad134491cb38880b788ae90d1f11d5db56f676ec4dd447257d5e,True,4,17,138,2,True,Tests_passed,06a143fef81af841cb8430dcce5bd698373848e343d104c8578a0158f6f78cd2,True,4,True,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,cb31b0652a5429e41ec8866b05c346bb8b81635b1d71891ec60c5f52755f5691,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,1bdb73d44389acc51c5b13cd87d75f0412e10c1d2c6133832477dd1d5b498c67,Merge_failed,d6d92414b804ad8ec0310c524e883b2cbf456e7c141e7efc88ba60a326454b90,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,d0a150beb1e77731fad4cc17a9a5681b62ca8e64c02ee9c18ef47e14e52b2ec9,Tests_passed,ee094f8ee9ed9f34cdd65756fe64eb6f220e3c31d87ac406f0b0690d33d43178,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815,Merge_failed,b4de3e5465d5bc1eeb596a4a70d4a282c374586caedb835d943288833318b815 13,refs/heads/master,190dd89723ff482833d785bc8513097d6441f83f,a143ec39aae8985dd51c9cec954620de032a6dd2,67c7335dc15e5d5fdce2fb7db103a1cc77eccce1,,True,True,Tests_passed,786638ac1b60e0cc934355482ccf29dfe4e6e33b246aa1b869551edbf7ca6a48,True,9,57,689,3,True,Tests_passed,9cf2267b06fb40cf7fcc475a1b2ea4f75315f3c73116e85ff61eaa855c3b080e,True,10,True,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,7c6012b529b661d5ab37e598844881fe99c96f2b1e187d39060c8894ec3b2808,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,7c6012b529b661d5ab37e598844881fe99c96f2b1e187d39060c8894ec3b2808,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8,Tests_passed,c74afc5c623729181c4c5fefdabd92ee1e4ada64b09df7b4e844faf0e20223e8 39,refs/remotes/origin/pull/60,630268ac307493a3511ad78b5ba9494fcedbe2fc,1f5ec534e80c50bdfeb7b992b8c3d773d72fde70,6cdba35c25e1ab57acc009609758295b5c517798,,True,True,Tests_passed,4f873a34bf1991bfce8054d850745e44a0ee06269989b9ba463333b4ea90dc86,True,28,116,3122,2,True,Tests_passed,16064627f72c8da1e9ef594b6071f1cfc491686d997530f54f056b428e3f36af,True,28,True,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,13b48909c3d2de4fd3801dfe7bb1b68a83801ff8c079ba76a0599721c37653c3,Merge_failed,490d9ac20e4d9d572d9ab863c3917818a810845da2e0825a444e22c12bd4806f,Tests_failed,14092b09a2c00ea85702bc69b1fc5de7ae9942de481ed02423f988307b6714f4,Merge_failed,f87a8f595cf1638891ff88117237cc1f263403d63e89eab1f27ed0c344e39acc,Merge_failed,490d9ac20e4d9d572d9ab863c3917818a810845da2e0825a444e22c12bd4806f,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,345e6358c9558b9b62ecccff8df551ae70112fca03d6f497d34214d0a752a516,Tests_failed,14092b09a2c00ea85702bc69b1fc5de7ae9942de481ed02423f988307b6714f4,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d,Merge_failed,be2ccc4764e828fa3d618aee79c937cd25d69087408db28aa43969999d823b4d diff --git a/results/reaper/merges_tested/kohsuke/libpam4j.csv b/results/reaper/merges_tested/kohsuke/libpam4j.csv index 61314abb8b..92c66c1b42 100644 --- a/results/reaper/merges_tested/kohsuke/libpam4j.csv +++ b/results/reaper/merges_tested/kohsuke/libpam4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,43d35c217451951500d0cb1246602c42494f7a28,02ffdff218283629ba4a902e7fe2fd44646abc21,ef7b1229da5f41c7119e50dcef04befac3e7104f,,True,True,Tests_passed,81c7b7e54b68fb0dc7b5cad970618eda54cbfb1d543f16a4b509ac894fec1729,True,10,23,114,3,True,Tests_passed,de6b809ef9ff0c032039c7920ef1579b17afd63e0cc2bb58cb1590b2df7b53e9,True,10,True,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,097475a253454f650502dcae3858f4f94003d9c493589516a53c27c26c6045eb,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,4227177f380a169dd0a2e1b54131f2838fdaa13bd90b2f1b4bb5e19ab9f4882e,Merge_failed,663cb42656fcca760ed7ffd19d5d029a2a80ede6ab0bf66facfa2262a3eee5ca,Merge_failed,3708ec28702eb3da481e9fbbfc2d12c66f46ad577831a9d69404404b6069e062,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,43dba62ad666d92c85366a9c380af58c5874a33fec3163b4fa7ffffd6562227b,Merge_failed,9ebe843b9c76911d1d343a8b4cd30a5e666a2f0df0a270fb80b36a5a3a39661e,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc,Merge_failed,6ab0c0fff34927786ce2134157adeacaa3b7cb8bcfd13c0674a8dbf2a41261dc diff --git a/results/reaper/merges_tested/kohsuke/winp.csv b/results/reaper/merges_tested/kohsuke/winp.csv index 96f5f3cecd..7954e1b590 100644 --- a/results/reaper/merges_tested/kohsuke/winp.csv +++ b/results/reaper/merges_tested/kohsuke/winp.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,a9e44d3094143e4bf8e892f3d5e4fa5a12dc6016,a95c8dba746547b90c2a273de5d0355624db521e,7a3043b5436d2208b75c64757085397834da92b3,,True,True,Tests_passed,72aaa5f2cc0212835074c0d5d2f25bd9cf6354040970a5d06884d3535fd4777a,True,9.0,23,102.0,4,True,Tests_passed,e3ef25d1eae44c12f5ce1f0591a95dc739af299d75340f1deaa30982d1054fdd,True,9,True,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_failed,12aceac0f491bd0a6d513aa051b4a51197c10197d4adc57f66352e9cee634edc,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,ad1b2193643df2ac5d5b9c9811250bd2e5aff200f773540753f2b733813c5e59,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,57a019eb86b0938baf00ef42037fc8a5acc3065df5d8c7a18ce842d691f3d83c,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852,Tests_passed,fef3f8b3931bdba809aeda01b3673d2152f9805ead25e467e7bfdac074fd1852 diff --git a/results/reaper/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv b/results/reaper/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv index a94dfba4e7..d890acdb6c 100644 --- a/results/reaper/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv +++ b/results/reaper/merges_tested/kolorobot/spring-mvc-quickstart-archetype.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,743d56eac95a68af7ffe11e395d5aba05f09aac6,1ab406e437b5c46cfce99a86e521f65301896cff,30ede8b5ffe4977ac8bcd52eafdeeb6bf6632d4c,,True,True,True,7,18,45,13,True,16,Tests_passed,5690527142024ea24807b8a4bc25eec15c0c689e38f43b702a1c8c6c379f553a,True,Tests_passed,9ae83591b36e9dde6623128728e585c19eb0b7e275e70073d0cc5b8ae2a567b7,True,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,ff4595d6aa0f7228c3da9407d10bd20306f9efa5eba8760e41db77c57a779da9,Merge_failed,87accbac992662e32385d4bdee433aeedd60eebf4278a81e94cdb14eb6fedaaf,Merge_failed,90a54ff704f38759c9436be3bddf9c31caba79ba732d999299f53749af3bcbb1,Merge_failed,88feed0bebd4b0af0a8e65aa132cae15acbc30c35cd3d6b1f6ba2f973878a9fc,Merge_failed,87accbac992662e32385d4bdee433aeedd60eebf4278a81e94cdb14eb6fedaaf,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,8c9ce5086323069a2b3a0bfc080f6d91ce6864f0ef6dc8ac0cb9df380ad0255e,Merge_failed,ea9ae0acd76b9d085d4561667cd7dd587f34b23637c28982246ee535fce83a57,Merge_failed,90a54ff704f38759c9436be3bddf9c31caba79ba732d999299f53749af3bcbb1,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004,Merge_failed,244a4addd9ea2c16e3b3e313098af66682720c5af536c580bde32f4c4c9ec004 18,refs/heads/master,78c6fba5414281cddde8139a83318aeb0a6dc9ec,d806f03e7a360c67e709c49706911c7dfca7ab98,60c85b75e09af9ef6ba466f20117cb88755bc234,,True,True,True,16,36,346,6,True,16,Tests_passed,7311fcb93550e1e073ea621985d3777de76dc658ad5d91abfd3d0ec5e23bdb0f,True,Tests_passed,7a4fd0a7abc0e491bb865f0686176b40d2b9f9079fd08e4b0f787e3ee4660503,True,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,30dfdd0e4dd032b1b2b0d5e1c8b3c806f58e9b6aee223f7206c1153f82313721,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,8f9fc3c1cc81a45b91cde1057a3ad68622f5f78c283bf3c318af772d4c3081ea,Merge_failed,351c29d4f4053c3e0ede98aeca5d64a87b28d83dc2962a734447ae00912afb2d,Merge_failed,4d11b546c296a23ffe4e4403b726903fe3c78bc5621a70bb1cc5f51b4431a67c,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bea6ff5de4d7e59a22f78d0bff83dc37a13c36d19d73f28eb6904b882fb6d5bf,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,488386b42e4a1e675e3b3724aa046a8c51bd7a4e2cb359dade66b35a8d009225,Merge_failed,d69c3044418460c9aec3dd9cabcd9382a8444d3a9622e807e8b8b4ea7f37f368,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,ec3bf66b1dac37bf3f56d27d618d277ebe5b820ab0a91924f3fc9815bce963a6,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3,Merge_failed,bb411a86f05d79bc9e6cd0f21707e06d76c71d528e816f773d118e6f3cbd9ce3 diff --git a/results/reaper/merges_tested/komamitsu/jackson-dataformat-msgpack.csv b/results/reaper/merges_tested/komamitsu/jackson-dataformat-msgpack.csv index f0eae801a2..fb6d39100b 100644 --- a/results/reaper/merges_tested/komamitsu/jackson-dataformat-msgpack.csv +++ b/results/reaper/merges_tested/komamitsu/jackson-dataformat-msgpack.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b536174c01bb4f98681e9cc8940e0be97436b00a,7d4d9b6378fe436d8a68540cd75c811bc3220392,5a222d4b2483d5ed946d6cc34db5f8aedf15ebc7,,True,True,True,7,26,140,2,True,7,Tests_passed,ce7ddf26a009ac69110f813c2ca8911a1c19a9a26c58a7d0525bf66660e47e46,True,Tests_passed,ffe71aec2cc0ebd6fa9539eb48341e6480545d1880180937f0276d7aae6068ea,True,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_failed,24988907656df9b7f4a959dd00ac4fe7da5084d46c704edcbb01f3f133b73fce,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,e0a395212dba459ee3a7be66b3b1be1686491d6a62d3715e5d9d1231859e11c6,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd,Tests_passed,cc61678af24769bbaa2b907717e1567c224e78c69ccb96d1a83d2efc08e8a0fd diff --git a/results/reaper/merges_tested/komoot/photon.csv b/results/reaper/merges_tested/komoot/photon.csv index 54532df549..b37d43a3ae 100644 --- a/results/reaper/merges_tested/komoot/photon.csv +++ b/results/reaper/merges_tested/komoot/photon.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,5a62f4ededc96a9d8ca67a4ebbf4d7f537e8ad42,3a0c2e7c4a633597ff1c9fe5ac8f768f298b9d0a,06157909242b5db314c9e9caabd0abcad75e7348,,True,True,Tests_passed,629f212f89c64c8a65bad61a09ce9b12d0b6f93303ee14210cdb83d9404ec6f1,True,11,19,389,2,True,Tests_passed,f38f4f9336f6241c11faa338ec12e01956434d05e6dbefb3e0bff1d818a360b6,True,11,True,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,837a98dfef9c8fc5f17bf2681ef39e8448807563c7f116fd98cebee44cee30d3,Tests_failed,8b8f6c03ced3c8504318aa89a9f913c1bf0640d66ae955d607be4127adca602f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,837a98dfef9c8fc5f17bf2681ef39e8448807563c7f116fd98cebee44cee30d3,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f,Tests_passed,86e33857a9b0e9c9531ac2faf624a3468fadb0b364fde0a14c7378138153804f 57,refs/heads/master,e278ace2cb84789adb9af30d186f0f123170901b,e4a024eee0e4f0e9c610a786258a2ad45c1773ec,4c417c57120553f5ec0e0ef18440e80fac0f1d79,,True,True,Tests_passed,ccae829e89e397eec0f774bc8ad65456d564cf6fd326ad5f71eb0b1988a27d7e,True,6,19,128,2,True,Tests_passed,137899cd882d0ae5aa68dc9449e0e49328abbc8a6c0875413c2d4a81a0b9a74e,True,6,True,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_failed,60eb5227ccc1a4555f7839a838eb086096af40f35780e1ed0f269551b9ae3583,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,07f5dbf43e687b1d5205a0e89c1bf757210c691c426dabf03d79059b24b226b5,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,747dc9e83f8920cdaee29c19a22e2f0cd2673b3c66f5ca29d3c49a48a6057a1b,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e,Tests_passed,3a0bac86be4edc56aa751f183f5a8096d24f2678495cde0f2edf7f7ecbe3f99e 89,refs/heads/master,5b9b1e0873593ef232725640b6c4c78b27d5873a,28791b150e51b595be7e04c8b6a0b012d4b889ff,e8ab9448978fe313a97746197941fa43e3441fbd,,True,False,Tests_passed,96bf0a4462676e0dbe27c833d3ad09892e735b51178c6f22dd3b9c51509d0ed6,True,8,26,101,3,True,Tests_passed,2a9ab92e2f2a836c4ccc35906a4083a35d7da3ac93de8884fbbc3c96c22a66d3,True,8,True,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,f37cc76ce0f21e6caf02114a6af9242656e039db40cee0688bc550376c2537c2,Tests_failed,958c97349b62c92c4440be2c4c9a1ccf28d9e59683a316461b27f9b455ef35a4,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,f37cc76ce0f21e6caf02114a6af9242656e039db40cee0688bc550376c2537c2,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b,Tests_passed,0e30df04bc6a9bd0782a03d17df2ad2e6f318b9c52b19ae4830c229fe829691b diff --git a/results/reaper/merges_tested/kongchen/swagger-maven-plugin.csv b/results/reaper/merges_tested/kongchen/swagger-maven-plugin.csv index f6f9c856bb..944a0eaee2 100644 --- a/results/reaper/merges_tested/kongchen/swagger-maven-plugin.csv +++ b/results/reaper/merges_tested/kongchen/swagger-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,1e61731653f4f020bdf90d277c6ecffeb51e2b0b,6a1618ba07a66309f2b5287e4c812dc10d1970b0,de9dfa0105083b4d606eb9485be68b005be5af0d,,True,True,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,True,21,60,544,2,True,Tests_passed,34b5c80655e7e441710f45e4a266cf58cfdff0c77f0d16760cd8a81c123c62c9,True,21,True,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,819636c3622d6bb858c1470a352ff4f379da66f904abe4b17949cb8f748a7954,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,819636c3622d6bb858c1470a352ff4f379da66f904abe4b17949cb8f748a7954,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681,Tests_failed,492b140d56e469820adc06e7d02d698308c1953400e0a8e1611e9d9507615681 8,refs/heads/master,6a1618ba07a66309f2b5287e4c812dc10d1970b0,c6c1fb810d36710abd531cf56a9e0bee5a689df0,4dd5f332c20d1eec11d6174d7e60d120ffe5af82,,True,True,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,True,19,53,476,3,True,Tests_passed,5342f14f16d3b575044176a7523a1aa0a69d35e131e7628af4ec96533952b82c,True,19,True,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,7c6a4ed1834ba19e78eb1afb46604420e9746f95511cc030f231bb45815965b1,Tests_failed,0fb94006133ee6a4fe55af04fec464a352fbe1ba858c42bc14c235843f934874,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,7c6a4ed1834ba19e78eb1afb46604420e9746f95511cc030f231bb45815965b1,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c,Tests_passed,47863b4e0b77e8d28f87cd6f3d3e7ee97657597b28e5502cab57eb3a76c0c52c 9,refs/heads/master,c6c1fb810d36710abd531cf56a9e0bee5a689df0,4a41e8336d50543d3a6d9d8a269c7890cd571465,c929469dcc4917fd900093564e8f8fe1728fdaa6,,True,True,Tests_passed,7cfff0e36e063155bd937c4d86f90d04ca7c4500acf79bac1240196dd69046db,True,11,18,252,2,True,Tests_passed,ffb464c8e7652106e6bd69fed7a9791161b848fab069394f12726712062dd508,True,11,True,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,cb107a618518a13d91a615ddf23990cdad857c27b6fdc034e5556c2abda2bb54,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,cb107a618518a13d91a615ddf23990cdad857c27b6fdc034e5556c2abda2bb54,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839,Tests_passed,9653f54a72fd17a28cd4a3eefe0768f3349086581e37cdaeb3be50fbd7f91839 diff --git a/results/reaper/merges_tested/konloch/bytecode-viewer.csv b/results/reaper/merges_tested/konloch/bytecode-viewer.csv index 8d832352f3..91f1603e6d 100644 --- a/results/reaper/merges_tested/konloch/bytecode-viewer.csv +++ b/results/reaper/merges_tested/konloch/bytecode-viewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,d28e9c140791e0ea36ad1afaeaf15810e9fd7885,85197c97397b9ab3d2edadeadbfe4d4a7d852e05,a00b429b8f715c2873326e0525efc6fca3d4b09b,,True,True,True,22,89,828,2,True,22,Tests_passed,2b5f26f05d03653b1761fe467dfe4514d0f764d7437df48272ca3f3a7d4e1abe,True,Tests_passed,7c4b7a4c313a61c6691e743c94beccf0710a3dfe148830feb4f39d09a74dce12,True,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_failed,d60c3d491d1d204eaff05ce3024f6f924f83c570a624c16427cab063c29a9ff2,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,f29330ba934e9ae6e4340a9d440ab5c9bd79f8c82ccef47fc101632dc7da3aef,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb,Tests_passed,291ceba4a242dad91f3ce09a2e65429eaef964c57c57082db75571eb0666f7bb diff --git a/results/reaper/merges_tested/koraktor/mavanagaiata.csv b/results/reaper/merges_tested/koraktor/mavanagaiata.csv index 09ae69bd5e..ba2c197e11 100644 --- a/results/reaper/merges_tested/koraktor/mavanagaiata.csv +++ b/results/reaper/merges_tested/koraktor/mavanagaiata.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 302,refs/heads/master,3db986aced967917053dd5fad68a469976a6b27a,f563642bf7a24d3986336b775b25f974f2feb668,f40e69b670f030e802a393d7b4fe433bef727048,,True,True,True,11,45,215,4,True,11,Tests_passed,9c44ab4b04d70ae7b0b220c250f3ec3ac8bb2200b7a18d149ec99996b1a48bbf,True,Tests_passed,90bdfb521679d1c76f68d7af3154fb6ae3a44deb8ba3bb2bb2d8c8eabf44018f,True,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,a9fb09ca234ec6bcd8ba2ad5471ec78f1961302d5182307ab650d50943ab066f,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,43f782019eb2d119ae7055076acefdda0f09965be69a43826bf1d4b5129224b9,Merge_failed,3fd1599e49b6e3df3c7cf98952ece52859db787b3222150b4b270d537534ce92,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,03b74519a9caa74a08df6fd1bf2fd5c5f21c1244f5b25f7749044172705cd934,Merge_failed,947d9c51cfd3d696d2ca5ddd84f445da10ee7a576675bfba8240f897fc530a68,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,0e4510f21dfe73ba64ef7a4c4367f08645fccce78203aaa2fb673602cb6efd5f,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4,Merge_failed,e39aaa4be8a9f8c8d6b9005419893963415f75e043ec6ee13dcc70805f307ec4 diff --git a/results/reaper/merges_tested/koraktor/steam-condenser-java.csv b/results/reaper/merges_tested/koraktor/steam-condenser-java.csv index 217add49dd..647741656f 100644 --- a/results/reaper/merges_tested/koraktor/steam-condenser-java.csv +++ b/results/reaper/merges_tested/koraktor/steam-condenser-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,38c728a429397a5e8c647045144da9fd12930c65,4383d0a9b289ec581a4b4c4ce73f3c84096bf055,a609a0f0d1da1c5d90e506ab2310d21df934bb8c,,True,True,True,131,389,1644,4,True,136,Tests_passed,840a4127132d6907b5fe9c5478a8226bc9e4598b20b0d1ea17018d4b72379a62,True,Tests_passed,d69ba255a1d43501ea8df49e9babe2df70c573801644074a3f08c75c79bff469,True,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,bff99a12638e942317df238145b39e84c1d97f7a24a7afc4f3ae7d120f584d37,Merge_failed,e6cdee596fb86c07285d1e7cefda220253a36c076817bee57ee70005fa4d8696,Merge_failed,547662fc290e7bb64661656df0a00a8d8acc86f1f54cfcb15e0d86ff54df5cb1,Merge_failed,d3ed3087651af4d732b02f1f8603235f935905085cc85c745176df57694d427b,Merge_failed,e6cdee596fb86c07285d1e7cefda220253a36c076817bee57ee70005fa4d8696,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,9a7d95169cf7abd32793b7e45f2516ca585403c9e2180beec99cb239386a32dd,Merge_failed,547662fc290e7bb64661656df0a00a8d8acc86f1f54cfcb15e0d86ff54df5cb1,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,4dd7262af0d7d1668cb92228269577663e9b130317af9b6bd2eb559ae0e0adc0,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e,Merge_failed,f096afee594bdf71e406e79a8dc3048dccaa9817ad2aacd3713d67737836891e 14,refs/heads/master,7845353108a43162e5ead8a94fdebc8c21cfa0d4,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,8b8e64b32595b92b41e81ebd8cdbb7ea27e62744,,True,True,True,26,89,1344,3,True,26,Tests_passed,62971e708638bb2214a743cc3d10735353583d37c43950d42d2a0a6f2bd2c809,True,Tests_passed,080569ab758b6e35afe3b1a657f05814af2837487a611712681ed03e44c77b47,True,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,ab95fe99158922fc148375eba73e706b4ecdd4846ccab19a596367e758106e39,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Tests_failed,a57d83c35ec2218c81bcbeb33bd3d1aae8acbef309da4f528d68ed7e105fa8d9,Merge_failed,a011be16a794a6e58e8f599c757907faedac4e901bdd5435a9812de7a95e2de1,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,b24ae9bbf5105d1edbd6e143289062d873e8a7e7a7286598b6fc6b5b6ef5e323,Tests_passed,03383b2258a87e15b712e4727716bc9e5edae4991f2b0db1db6e70e4e5ce26ae,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,fda8f54cff3741b687a0a8cd35e3251f1a894006b36a14440f64375c1c14dc47,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164,Merge_failed,6fcd28eea87a8f8a2029efb471d7515e92f7796a728ff23c73aaae9a42045164 15,refs/heads/master,eabb0f338a3d47c5e52dcf013d2c70c64f271fa8,518c36141cb8a41fd9f4d66531129337940636ce,e1fe25a28d3a6b6ea5c3d832b794b68c81aeb211,,True,True,True,26,92,844,4,True,26,Tests_passed,f3e7240f443388c57de40ae164ab4f6da3f931ef41169bc912a03a7ae6e4c437,True,Tests_passed,b12f18a131d320b51a6e5dde2601065b88e8f1330d99ff067b14d9729c28f45c,True,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,480c1e410845d74f0ef1cefacf7d64eac8e607d57d47873b72c2fd9f487f0ee7,Merge_failed,d07387579765e7e60aa0c122ba6c8d600c70871b6a4eaa2f7c884ff3ecb0e871,Merge_failed,f7cc2416527fa013321a159aa8dc35929f56041ea5870ebd76449a5e6cd0e2f5,Tests_failed,b994f4f48b6fdd24e21328d622c7c30c760d608f9a50905f4bcf0f01b858e00c,Merge_failed,d07387579765e7e60aa0c122ba6c8d600c70871b6a4eaa2f7c884ff3ecb0e871,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,8c274d32d772ac64bc5d642554cb581922854fb36b3143738021fd0b83db7b3c,Merge_failed,f7cc2416527fa013321a159aa8dc35929f56041ea5870ebd76449a5e6cd0e2f5,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,14c609e4e24a77151e704e3824d2b0dd4566ab6537a53eaf3de9b55f2d6eaec1,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d,Merge_failed,881e8140fb6a28a8481f2e53505ffad729c2ebbe05748540727798502e5ba16d diff --git a/results/reaper/merges_tested/kpelykh/docker-java.csv b/results/reaper/merges_tested/kpelykh/docker-java.csv index 05d47866cf..408b961d2f 100644 --- a/results/reaper/merges_tested/kpelykh/docker-java.csv +++ b/results/reaper/merges_tested/kpelykh/docker-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,81789ea773094b18340502d457e8d349a76a2350,44aa4b057604562f10220734507928a05a315526,431306b785010b84eb7961ab7b92d9126b8efe5f,,True,True,Tests_passed,2db79bba3d310417a195ed89b59f34d39228ef08b6e37b63c94b924f6715a22c,True,28.0,80,596.0,3,True,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,True,28,True,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,bb93df24be5d1ae18bdbc7fed24e5156e9360e957ec87a5b0859dafaa904766b,Tests_failed,37968ac8c38c9c55c41d9429eff4dc21c9f306fb422fb5077883b73ff1834741,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,bb93df24be5d1ae18bdbc7fed24e5156e9360e957ec87a5b0859dafaa904766b,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510,Tests_passed,fd24308e43c66ad22f8f2a2e838699f0b1247569a69018f4b5b234e73f96e510 8,refs/heads/master,44aa4b057604562f10220734507928a05a315526,00ff6ec25af073b30377cb1a860d45f228de3a2e,9cf0799d1aa8c5de44aa7fe8b5336f5b494a9e64,,True,True,Tests_passed,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,True,12.0,49,346.0,2,True,Tests_passed,43966615d8feb6d07e6d7f9d119fa1ff45ff0669a9c91f1565d1fb10557c2fa6,True,12,True,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,5ae1006a8900bec815c112e6beeaa94c4478d75dec6dd5872cecce159e6daeb4,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,2470e1b524fa4909cc0e5341dde9fa5123fed31e699ae1c5eaf225257072d9d2,Merge_failed,a51147160d513488be6323bc1b5543c7021f0ce6da0324b5d0c007e5aff75244,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,d0d0b857f94066b725be9bb88168a02c414d8eca09de3294bbfed3696bc6ae7e,Tests_passed,468ffb8a59b3673bd7259b775274c836ad705476c8099c89644fe584ba13294b,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,88ed7ca43d1de084192bd73c564615cd5bf30c0c93678c5fe36c3f7f34249c75,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7,Merge_failed,cda0a3db586f81def67ce5ff1e55f70a10e623e50375abb7585e00973f2dd6b7 9,refs/heads/master,8c0f496582aff251a796457d41961f540dbf2c5c,a976811e70c26f03e061837a526329907657f0f6,98b265515b152822fc9a28e598ceb150bf6a892a,,True,True,Tests_passed,34788cf84d06f024b167944c7bbd982578b272f9ec9739b6e95a5da9212c468c,True,25.0,46,391.0,2,True,Tests_passed,05e4a84cc4bde3143aea0a0b01322e5f7ee66675060581e5213311f4a8d9c629,True,25,True,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,f6da6e1540c2ed15f3f131fb8599d864101fb0df8368c2811060d491b8ddbf6e,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,f6da6e1540c2ed15f3f131fb8599d864101fb0df8368c2811060d491b8ddbf6e,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac,Tests_passed,062ae0bf52ed9b529d97a0a36bb8fc1d63c930650b08f189270615666a03ceac diff --git a/results/reaper/merges_tested/krilivye/jocco.csv b/results/reaper/merges_tested/krilivye/jocco.csv index 339b485b4b..cf993b2b8e 100644 --- a/results/reaper/merges_tested/krilivye/jocco.csv +++ b/results/reaper/merges_tested/krilivye/jocco.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5994a8ffa7adc1fbe2157b96436ba57f24aa2fa6,60ffba89d1314e432830b72f4e2317437e026a53,a4f324fc56908cce4b83fe50c3c9a873c65f6ea8,,True,True,Tests_passed,a07bf68c4d038e584872ca8801d93f18d01537ef3223e04bdaccd669ed7b2f02,True,5,24,71,3,True,Tests_passed,48b5eb51e22d9f48cc08f24cee8f8c64813bd909cee17d02615a147878c7ad46,True,6,True,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b7318799ca878001b3b293d664c33b7acdb2bc846f770dbbd5a4f195edefec66,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,3c6fcb0da2ce2f7a305ce892c27df90994aea950a4f27803e66c77637ee51c3f,Merge_failed,9828b63d1cae684c52d394b90083ae0d2a62501b3958f271fde6cf3f019f6368,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,02aae8687020658d4fa8171c7b9368bb221bd653edbba11beece6ed70c654bf1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,787ea05d67913386d7b5bc9cea079b1b8b1081d675ded34b792523da8dbe7822,Tests_passed,16f563117aba778a5d219ac1f0cfd147492317a0309267fd4304bdf0d3287e5f,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,b45d0f1e31e2b5b55f9dbb3d52039b118c0415e1fe5ef775e23064c9f47480d1,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93,Merge_failed,165ad0c59e1a22763c8abda76f83908d7c41d23c7f52a212e4647c08ac7c3f93 diff --git a/results/reaper/merges_tested/kroimon/bukkit-alphachest.csv b/results/reaper/merges_tested/kroimon/bukkit-alphachest.csv index 4c6e0a2724..847b169e4f 100644 --- a/results/reaper/merges_tested/kroimon/bukkit-alphachest.csv +++ b/results/reaper/merges_tested/kroimon/bukkit-alphachest.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,1c06bbbbf3fc168448554fcc274249946e51fd94,efc79103f615ba17590bf69792d62db71cf80945,81fe6cc2b3eecbe7b7bc7fb684f3c24deac0ed5d,,True,False,Tests_passed,b3cab0f3dab361400360bfbb00798655603527825cd80f920b7ab13fa0767b02,True,2,1,2,10,True,Tests_passed,0a5facf58326e07d308b75cbb24c1b42b5ef8ff54b7df8b177e94af9d52b47a2,True,10,True,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,f0cd2f6f73fb9713e884714accf96c7d669cccb2754cf4d9189fafdfeb721868,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Tests_failed,e7586ac7542ea1cae017075d16e9a0d722792480ec5165be6a0f8ed573a4a71d,Merge_failed,c04a7255cb4b231ddb4bcc18ada120ec072c0e56c380e066fb6455881a256d02,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,42477ef138c7015069eb347704427bc8f5e478b39dc622337e372e6339996022,Merge_failed,9748472e8ed30199f415174ba63575579b54b168a0256df0879af3ae9e78fae8,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad,Merge_failed,595c91319e39e83284d3631c1a4b5472fd66bbf66893e3bd25871cb49e8715ad diff --git a/results/reaper/merges_tested/kshchepanovskyi/zkcopy.csv b/results/reaper/merges_tested/kshchepanovskyi/zkcopy.csv index fbff87e8f6..5d7784e222 100644 --- a/results/reaper/merges_tested/kshchepanovskyi/zkcopy.csv +++ b/results/reaper/merges_tested/kshchepanovskyi/zkcopy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,31218157e3efd720cd9fc792af1027a6e129dabb,55fa8bff2a05f6bdc8f7d555c566af41d8f7f1e7,c6ec352c54ca0c92a31a0a82805f3feb6e9d8633,,True,True,Tests_passed,19892ad83d2c86e6fc7caaab7e509cf0279c7ef34cebf16957714717d24922d0,True,13,54,784,2,True,Tests_passed,f95b97f48a36e71c1bb228030ae14a73f07e75d82fc2e94acc247d4cd73b9625,True,13,True,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,d62424b6fabf4ff0d08c441860c72564129add062d159f25738d345149a9e927,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,3dba44ca9ac461b520a81b19b24ca339b1db1b56d33bbf96786648650f57314b,Merge_failed,f708adced034aa15a6a97b0b26144d1c1679377a2dd01cc93e5c17942587aaa8,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,741fd3e1cac2190aa03a653098633e528958d560e4c0ea7febc7a6bd9cd97d81,Tests_failed,6e3af8464c22f0063e849cc89177677af8d988e4eca3780c2d61ed4b0e50b1db,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711,Merge_failed,cd025037c785464ffe5ed5c14b79033668359e8e38109889ab15edd16d351711 diff --git a/results/reaper/merges_tested/kstyrc/embedded-redis.csv b/results/reaper/merges_tested/kstyrc/embedded-redis.csv index 7e2462787c..7ffddf08b1 100644 --- a/results/reaper/merges_tested/kstyrc/embedded-redis.csv +++ b/results/reaper/merges_tested/kstyrc/embedded-redis.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,5e6a9b73824ca48a3cd95771397af7dc45a13dfc,378e7f02666fb1f92c9dd6c75945cec047d22e71,4c9ff88c45e12344ed6b009e1213aa752b758d89,,True,True,True,4,20,98,2,True,4,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,True,Tests_passed,4f1626c92ecb699e62a62a789d445d7363c0fc5acbfbc8290fd671dac46143e2,True,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c5110624ceee731507770ff72247c1a917f539fb498db4e9930153bd02d70e1,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c3d49d611acfe32c74934275d8f2bdedced976e434dcd13567833ad9d0996c0,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,7a941596925a5d2a49be1a1d418c277dd26f2ba3d251af2d0253b541272cc5e2,Tests_failed,b28bbd63184e65908f08563191c8db7bdffff1594df08f128fe82241c9bcf841,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c3d49d611acfe32c74934275d8f2bdedced976e434dcd13567833ad9d0996c0,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,7a941596925a5d2a49be1a1d418c277dd26f2ba3d251af2d0253b541272cc5e2,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,4c5110624ceee731507770ff72247c1a917f539fb498db4e9930153bd02d70e1,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a,Tests_passed,493e233c6f0d77935a2be198f38ce3c73f2ad796846dc829b1599ffabd93c98a 26,refs/heads/master,378e7f02666fb1f92c9dd6c75945cec047d22e71,25ab5d2c2c9bf9a8c9986da2418c0a250278facd,84fc8f866cc3231f2f470c7b692f420ff2e8b2a9,,True,False,True,4,5,29,2,True,4,Tests_passed,ff1d5ad2a84fdac8e1cde6917b859eee9f2f0293f27da445c630733854631e63,True,Tests_passed,b813737b3a3e4451e7a3a14f01079878f40c36beaae1748ebb6b22a8bbefe450,True,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,d82945466ed11761f7a602552cb9cf48127b8a67e5f35a9853c4965e5694c401,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,4486c7da661d44a72f4bd54f9af6ad4ce17cd827968afe4d4c611e9f46cfd727,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803,Tests_passed,9784eb3fb4186dfdbd9c52ea54355d359984496230e05e2e51ee5db30003f803 diff --git a/results/reaper/merges_tested/kungfoo/geohash-java.csv b/results/reaper/merges_tested/kungfoo/geohash-java.csv index 28ef678883..47eca18df8 100644 --- a/results/reaper/merges_tested/kungfoo/geohash-java.csv +++ b/results/reaper/merges_tested/kungfoo/geohash-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,1e0aa77a02c168f39dc3c26f64257af4baffac6f,b221044db5545db202e6acf5d9737fcc297bf66e,376f5edb443465ff6cc2bac0bbd69d62967b0c27,,True,True,True,23,120,990,3,True,23,Tests_passed,ed25fb81551ec7086ef92173d47919943b45d4d94e0093a750d0db21584495d2,True,Tests_passed,57888744d538abcc5d8ac24a51693d8ecd1aefe11f400e937c74bcf92f1b33cd,True,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,3e8b2eda38f439ef1782ab8ad3a9b56218213219aa2fa1f2f91bbdeb46d56848,Merge_failed,87fd63a594e21e085d597357f8b893aaf05d544dbacb2f324fb72d5c63f2e497,Tests_passed,260f93c11a01735000172bae7f45a2661681ff5444cc0ce75bf334d9ec830c6c,Merge_failed,1661fcfa1bb8581fd04bb0504d695d6f53ef7c8d143581b2a2566bc97806be10,Merge_failed,87fd63a594e21e085d597357f8b893aaf05d544dbacb2f324fb72d5c63f2e497,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,c7bdb8e98d54f4ce8c6c98e166d0e167e6f276c7f565db7a88f887c8c316523f,Tests_passed,260f93c11a01735000172bae7f45a2661681ff5444cc0ce75bf334d9ec830c6c,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78b5d94857918b18bef2fb9c920a7bfa36d28070e2811c8778d9fff477b5449d,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801,Merge_failed,78e9a2173d0ccc7fb0cb869f1e491e35f6efa07fa90651455406c42747056801 12,refs/heads/master,029fd4411871b99cef71407c432752c570fcfaa2,21ff41630c9dbd40e4674604d8e502b3c58937f1,90a2570b49e559dbe5f96308ae166bca5b3bf78c,,True,True,True,5,19,77,3,True,5,Tests_passed,f650c796a626ec4620a628f8c6ed258b5b390b36e12ade5ee7ea9572119486ab,True,Tests_passed,c007ff42eb0485334cb1d01ab28248e5973757159bd28d8b33f2513cdaca0f83,True,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,f9de71c4340538eccf9726aef84b126d7688fcaa1d79efe649fe00e6d75aa219,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Tests_failed,c3d3fa98a454a374a6288d6e326c7cbefcbf5421d68b8be21cc0a5660a8af9fc,Tests_passed,3b6edfd666a89645f28aeeb685a822a0dd2a38ca2497d9d370eb206760853369,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,b821e3536c92fb7927c1b5a490e912a7f80e62adcadf6b6c5d7e64be38cdaa6e,Tests_passed,9669e345b6da966d39c4189f8930ff8cbf5b9e0d8cc983b8de786a75ddcc623b,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c,Merge_failed,aafc68d985b0348f5dd3e0e9d39d3c7733a6e33a44cc1f3033bf9aa6505dd85c 17,refs/heads/master,8c29b236e5fe758d3268e885504051f98d6c8ef1,282e749d637fa3a1d335dbe53a52e99d183d93f1,41a5c57da4d66464566b1a8068e83b54d8b5c0de,,True,True,True,15,53,2537,3,True,15,Tests_passed,4a04d94af3eb334be27d0c21cd70a1578165d14a3889d7cb722c2313f402ea0d,True,Tests_passed,cedd137c8ceaa9f8134981dd11e96fe74d6c7001799bfe4f13092640d733fd43,True,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,333914f7402ef0770b682541a806c2a322474e086497803919d2cd9e31d9e8af,Merge_failed,1e9e2f5306066e0898d7f01954ab0b9d2941f7f471398bbbdd53f2fd3e55d752,Merge_failed,62337d4c9f2d19d18059391196cf0dd59a6edf486884b98e8bb1df1f1ff5c1c6,Tests_passed,8183a267d232069fc48f3a1877becd46f77381d3069f273044db84e7ccb2f2e9,Merge_failed,99d52d7ec62d12b884934e2d6684210f2deb32044a6a3ac3f2ce3adc3f01f974,Merge_failed,62337d4c9f2d19d18059391196cf0dd59a6edf486884b98e8bb1df1f1ff5c1c6,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,3fa119228805d174a8e2c81179f8322219a4141a79b1476b4f5d3f7f4ff9ad82,Merge_failed,333914f7402ef0770b682541a806c2a322474e086497803919d2cd9e31d9e8af,Merge_failed,fcd773b7e301bfb089a9c138b8f38df630fb46c297f3fe4ce32ea9394f683c6f,Tests_passed,8183a267d232069fc48f3a1877becd46f77381d3069f273044db84e7ccb2f2e9,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Tests_passed,f9ba88c23494fc8d1e3529275e58f0bf7f2e083862ea979532f0049cd4d99eca,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3,Merge_failed,ca99014dfe96d35fc5f6413aacfae662e79f2021f64285cc0b046f128dd333e3 diff --git a/results/reaper/merges_tested/kurbatov/firmata4j.csv b/results/reaper/merges_tested/kurbatov/firmata4j.csv index 6b9b4b0e8a..c42dbc9e9e 100644 --- a/results/reaper/merges_tested/kurbatov/firmata4j.csv +++ b/results/reaper/merges_tested/kurbatov/firmata4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,54c58603b9db933cd35e182e74139402f124308b,9722516afce5dc1ea008fb69943435452f0d9711,32d1a900f8985d662ff81a2a8308b626b290ef89,,True,True,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,True,5,14,78,3,True,Tests_passed,8e959ffbdd060b5a88f27b1017cc1a19597877c9e35fa0775fdb8ae20d8df160,True,5,True,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,3a4d9c8a1d7bedbe53a7e62c2cfe37ef2f4ed36b57ded63484e6e6ebc9bea867,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,3a4d9c8a1d7bedbe53a7e62c2cfe37ef2f4ed36b57ded63484e6e6ebc9bea867,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396,Tests_passed,0dc42d3e5312ce185f2f6358917559885cbea028f05a296fcab3a7feeb092396 24,refs/heads/master,9722516afce5dc1ea008fb69943435452f0d9711,6dca46a44bcb5e68cd4ed5bdbc7c038a945f8090,8347b46f3a7e5f193fb8204f132edcec14c08759,,True,True,Tests_passed,719c27ce57dcf4ec985bc8ee5d7cb8cc24c1096f7e65e547d4f9639941bcf0f6,True,5,12,71,2,True,Tests_passed,0ca0c3883e02c1d044e2b8751c87d26971af452f4c5c97765a04bfcec6a91a31,True,5,True,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,9e19865c02e0c88bc6224ad7942589a0ca2cf3c4576ce266ed8a0145878ae65c,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883,Tests_passed,29cd7d84aaeaa7f3845a59df6e076ea46f714a23094a26235670baa391b31883 diff --git a/results/reaper/merges_tested/kvladislav/ticketmanager.csv b/results/reaper/merges_tested/kvladislav/ticketmanager.csv index b0116875ec..5584164b78 100644 --- a/results/reaper/merges_tested/kvladislav/ticketmanager.csv +++ b/results/reaper/merges_tested/kvladislav/ticketmanager.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e0c7be166c9e6cd69ac0f2a88a583cfe7df0b353,8a259cc43530ca8b92eea1ef31020dac200f5cf4,00a517756b969118fd34f6cb3e629623ea58355a,,True,True,True,27,117,397,2,True,27,Tests_passed,53553a4047487af5cee9969dcf16dce322074c8f429f64b620bf805825abfc43,True,Tests_passed,293a2dc4b39236630fa6174a63d31980c5413d7b89db19cbd1deb780c4dfac6b,True,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,aefc5c6bc5d8d2cdac9b79d77f7b2d22218845ca24d609641d244acd0f916768,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,aefc5c6bc5d8d2cdac9b79d77f7b2d22218845ca24d609641d244acd0f916768,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d,Tests_passed,f4c5fc03c12f68c195793f14f406b4d3df5fa47e6076961b2e96731800b4562d 12,refs/heads/master,0ffb612f18bf32b1151d82c321219aa31f901d08,75222d1bfa744f59f417a16bd670579a413b68fd,cc5170a2a39c7439223a358ea30fd1c0136006e6,,True,True,True,82,3355,35182,2,True,82,Tests_passed,f81997b3a344059a697dc172bcf17edb0405b61aa82cf6076895d88325df6d68,True,Tests_passed,fc2a4e15996e4f0fb8f610209a90c23c51225563c2a2dee8c5b80b3a731a9933,True,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_failed,ab4714c2dcea43bdc3dca6e38893c469faba838cf3b23a8e7c646ae896ae096f,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,1027e75c231b895e84849a177eb90da1a6bca0cfbdd8ad595be6662e294f2663,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,0fc7a88a1b057df4aada582cd87b4cf6803b45e6d2bd125ec7f667b64408f326,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e,Tests_passed,19ee19c46bd8e06e18506b643cd929ef036f6e98df57b5d975ab056752fa006e 19,refs/heads/master,b24deca3fd3d5ab03d96c7cbbf3daa1ab4fe8309,7bf5cc0d73ebd483e07ffa6e7cf15e465fa9708e,2f3b65cd728d75b4d771f00d2515780846063cc1,,True,True,True,22,176,1574,4,True,22,Tests_passed,4e950aa9f92fc81cd54ec75ffbc7951153b1f353d45d3ae9dc572469ae02b820,True,Tests_passed,0d8caf6b06b99d5198ac66699065ebd5e4951780e9143349a085d75a77bee1a7,True,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,c7f94d868a968fa62908408de2b09ba97d4c82adfa2b3666d1ebcdf0e8c116c9,Merge_failed,62dee43bf33d83623727b27fe1387c676be75bef2d6b0e9015001881c0d846b0,Merge_failed,755639680a412eb6e1bfb8538f5e7c1cc740f7083b61e2ed51d3f35238f83939,Merge_failed,57216a09250663174edc8683c0a7a17f9a52d021637b9c33d3b1734451a5296c,Merge_failed,62dee43bf33d83623727b27fe1387c676be75bef2d6b0e9015001881c0d846b0,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,1aff3202002e656f89604f8e6610be77c3bebd9b11ee796a4d0fdcb7f8edb5ba,Merge_failed,f3d682a5992fdbaccb79937d090f89ccf8622ddd9215d1ebe4db598924bb80e0,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,177796159220fa87c187f50bac03ff284d6fa5af9d5a4301d54d8dcd6ab12827,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7,Merge_failed,12e979d6688da1cf91251979e20ee6d3bec40cf33202fdb863a6c79b1e50edb7 diff --git a/results/reaper/merges_tested/laforge49/jactor.csv b/results/reaper/merges_tested/laforge49/jactor.csv index d72b437314..692bcd456d 100644 --- a/results/reaper/merges_tested/laforge49/jactor.csv +++ b/results/reaper/merges_tested/laforge49/jactor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7d728819f4ae8ab3ba288ae10ee8ad69f01cdaa1,075f7d10416824c72519888c61a3488aa5be63b4,c032bd44475cfff2133dbb0ffea73d3ac7dda205,,True,True,Tests_passed,82c4064bcf7988ff7dcadf04b037899afa99121bf0a1bd201e2d52588b4208ae,True,8,25,234,2,True,Tests_passed,245bf5ad7dfefbcd1b67487c1a6e5ad4caf53e55f1d56a253aafd58d19df63b3,True,8,True,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,762ee627e10c072eaff894a3bc73e84a1559c7fd5d28ae0c43ad87ba708d6474,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,99d395916f2e1b5935a8cc9b5fd19c75f6a2b447653536d2b9050e9249a5fb3a,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41,Tests_passed,8f922d5e069e2e52ad8d1c44f0cd37c965cbfe40270ad083008561f43f5abc41 diff --git a/results/reaper/merges_tested/laforge49/jactor2.csv b/results/reaper/merges_tested/laforge49/jactor2.csv index 9db8780965..d0f9e3818f 100644 --- a/results/reaper/merges_tested/laforge49/jactor2.csv +++ b/results/reaper/merges_tested/laforge49/jactor2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,191ab09f7d4f34ab1b208159b40ccc2b06557f6a,d8f99520af880dbd3257f95e88e66225cc06c423,891c93393b912fb6e0056ecc127c4d06685a8e73,,True,True,Tests_passed,f225df2e907b663719dd2e1f3a8aee06364bd2de6fc38fce1e49ef58a0312da3,True,2,28,142,2,True,Tests_passed,2086d0f297ce22d1dc6e760d4233150b3a04c199dccbe4b0711178663010c26f,True,2,True,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,ce100baba316c12f1b00c6dbd4e10d7d58c1d91cee009874807d7e16adc5fd2a,Merge_failed,77a6672433275549ae2a634e0a8536a2ac4d85432974c4ba307d76ddec75df38,Merge_failed,d4162caa1e8fe3cdfb12edc4189188b0695c3d1026aeb7fd8d9d43acdfcc33de,Tests_failed,fead0511789522f50b8ac79b444af7661b24ba15d4bf68739415b5db3920b351,Merge_failed,77a6672433275549ae2a634e0a8536a2ac4d85432974c4ba307d76ddec75df38,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,6695d971517eb11b2d551b9ad77d49a8523dcb6031e463cd353969745a7f8d76,Merge_failed,d4162caa1e8fe3cdfb12edc4189188b0695c3d1026aeb7fd8d9d43acdfcc33de,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,cae1b1e5847ad5c0d86827382c16a3a480d1d1f3057c4e68bf894d73361bfc78,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0,Merge_failed,9f36b2fd4f7dacc9f79dd73959653368d407355487c7042e5fbf815125d6bed0 9,refs/heads/master,3b4eebb16635f02dd3048051e26438d9071c7b92,fec3b93dd0e680380bc11bb029d868e1e2fefde9,9792bcf3370f0b667a09ab6b9bd84e82219738c0,,True,True,Tests_passed,6901f8f781ab4dc57d6b2f7f5d29ba23bbc2605c8169c6dc50b72014ae3fbcdc,True,11,29,314,3,True,Tests_passed,869af00b45054df1121746fcf16412c02c214cbcb51eac2729a1d862e78771f4,True,11,True,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,79a5a46da309f0c2302bb4307ad4667339bb35aacd9fa645ba0a011dcb9e591a,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_timedout,,Merge_failed,ce3b088b361835d22a62b0f1fa35a0f05336e7d9592b896a0e81d2a00f8652f5,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,d29ecaadfcced3a8ecc0d5eeb6f8694308a907c12164593eaf986716ae51b8c5,Tests_passed,a9fb8298812a45ffb6baa5d05cd4cb307c1fcd16215a6fbcadf1ef8eaeb43268,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Tests_passed,2a96d6be4b4965a171a1d32d3653072df86030c0058dcaa4c9f1d44ca0e4845e,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe,Merge_failed,74e4fb0a7a3fee180725f34b85db3db57178cf5ae74fc4de4cd4f01d345e0afe 10,refs/heads/master,2ace56826c6da34c2cbb41dc8e4d30d80d5eefea,97d63bc1cafba87e2b8d6645dec5de1aaaa9482b,0ceff1faf17a840ca915563517df0d205e91a524,,True,True,Tests_passed,0829332e533dfa86c66d764ae8092d171335598e2761e0707ef03648f24023d9,True,15,52,228,4,True,Tests_passed,edfa4b2c279c0b46228e34143c67f0d24e0b13ccfc694483b6e91ce15b9d9966,True,16,True,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Merge_failed,eea52aa15a0ffc53b140ba1ec36a96f79ceb377702c7ea58d618e8f6fe9152c9,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,3f9e51690778799050962d15738416f4b813de657ac77bc80f14cfb634ad9391,Merge_timedout,,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Merge_failed,eea52aa15a0ffc53b140ba1ec36a96f79ceb377702c7ea58d618e8f6fe9152c9,Tests_passed,3f9e51690778799050962d15738416f4b813de657ac77bc80f14cfb634ad9391,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a,Tests_passed,08272179b0ab1d66c4e8fc0834ac9b7781dac3dafb7bd54f61df3ed605dbad3a diff --git a/results/reaper/merges_tested/larsga/duke.csv b/results/reaper/merges_tested/larsga/duke.csv index 403a1e497d..9aa2a52c76 100644 --- a/results/reaper/merges_tested/larsga/duke.csv +++ b/results/reaper/merges_tested/larsga/duke.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,5a6056799ba321ebad9ff55c6fa8cbda5fdf1be5,2ebd8a35288bf9e5edff394ad45431d40a26c8e3,9fe5a3dd92c50ed1bb7c0bf2c4a5969655a8d0d6,,True,True,Tests_passed,50d6febafc10d4d291bae49b4989d9f8fee81d1864feeb1bbd72d7e4fb520a82,True,2,1,1,2,True,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,True,2,True,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,a43ad5c94bfcf6364cb4339c6453dd633c894ed282de11ecae8a89272b1fa3cf,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,a43ad5c94bfcf6364cb4339c6453dd633c894ed282de11ecae8a89272b1fa3cf,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906,Tests_passed,fb31c86eb7f0537d9de0c9436ba26dfc81f5ffbaade047de0ecf4f97a09a6906 13,refs/heads/master,b5def8195d1e36fabcf3159c29a05b8998c2edf2,99eddc63255db9ad74aaff0a0a08174a950c9175,1ba93c26741ec856fc2304c722f8fc6c3c949040,,True,True,Tests_passed,aaad12b3d4ff0c0c7a8c7ac3032557079ae70a00b62321e0308e1d975d96d09d,True,16,55,299,2,True,Tests_passed,8b20d1c6e073cbad254f36d0b963b48faf273070ed6bae38c61442013dcc3f94,True,16,True,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,c097cbb218edd7dab4aaba950e1e8cb083d9baf5ab6093b78a24d2c7794e3632,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf,Tests_passed,85a370af750580f1d266fbef8dcd67e222ccdddec92800c37a559d8b80343ddf 16,refs/heads/master,6767497ccc440c9a64ec7526a7feab97a9cce367,5697882659b187d87f460bcd01ef0bf105d274aa,7fb9b5e58c583211067adeced2bdb0c4c59e830c,,True,True,Tests_passed,a63ff9dc60339622bb3cda774e1dc52c96cc739b3271406c282af81d59202761,True,30,270,1028,6,True,Tests_passed,6f9aa46b373f5f8b3a5266d38aa718d4451dfafba3591fd73f08e1f4378b0af5,True,30,True,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,ab10df5b928f114363d07588447394dfd31cd0f20684080bc8c627abe928238e,Merge_failed,4265ab06c3e9e9d0426391874b5c3eb465a2184328f9de772f3afcab85365913,Tests_passed,aaa4208340fd4d886d6fd87a640764a536bc5299e4da76a0660ce18eb2e6a3a8,Tests_failed,320f4dddcbb9d6e26a29b2181e6e888ee5e51fb7ae1ccbed58d63c6109b7ba11,Merge_failed,4265ab06c3e9e9d0426391874b5c3eb465a2184328f9de772f3afcab85365913,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,c7ff6a2b3d8d0956c0176303d4ef336ef77121d545a45bcb66d4699f9e4e2a03,Tests_passed,aaa4208340fd4d886d6fd87a640764a536bc5299e4da76a0660ce18eb2e6a3a8,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b11d83fb4f0f4219c810a5b4838235a8bcbee0b25b6d45fdb9e0893f27c4fc90,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e,Merge_failed,b8c5db97fec8f5c7dd5403419217544a9c73a60a8b7610b712b38b310372da4e diff --git a/results/reaper/merges_tested/lazaromedina/flume-ftp-source.csv b/results/reaper/merges_tested/lazaromedina/flume-ftp-source.csv index 29b140541f..9dd97294b5 100644 --- a/results/reaper/merges_tested/lazaromedina/flume-ftp-source.csv +++ b/results/reaper/merges_tested/lazaromedina/flume-ftp-source.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2911f84fb00a054b772a0c296274bd9efe2d9b59,cfad4f4b01879145e76d887dd47b8de76aced78f,8f8c1a2689fd6cc5f30bd78a92abd4088ccb3047,,True,True,Tests_passed,e00a61941b85d037045ecf050cdda82e42162ca946b309ca1784d4d53abf03a0,True,17,104,572,6,True,Tests_passed,7dd5cd603ab0ca5d96050b7309f207c6289496eeefac70cb7935791081fa4feb,True,17,True,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,13c2dcabf1ebb4a1aaf06722d2e5923436fb5ba381f69ad5dfd10f84708eac0c,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,8b216364a7d4fb7af36cd704b4326dab637d8a59cfbb1769333bde672843ae71,Merge_failed,55a9661c0ef8125218330305bb8f7cd711a70add2eaca1a2f82f7e783586e7b4,Merge_failed,a9c0f27e24850feadf08a372676cbead44789e40cd481f796e0110980af5ed0a,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,73eed9e18c29076acc150004b0c6a97762c8101939281a5f801de0c80f1e715c,Merge_failed,f4a5f74be4c1c3d51605f780b6600b6a31eb91a0cd2e8c30b08b92b7f5d13275,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,32343e6095c976c6f9185d81ad4787fa792ea44eaa820513d7ddb1dd87a2718c,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23,Merge_failed,37f455eceacbce6bbc0caa9722bee900907abfb1d9d261ec6b0d22e88ed37c23 6,refs/heads/master,f4c145bec4acce94ef00f97b814a511049b3b372,be8c09ffe539f24fe37dde84fc5d30309f02bb1a,59018c3f32045ac899032250a530bb095c7bd293,,True,True,Tests_passed,43d54d6281107c850db541f4330d08b93727e70127cb4371c98b4905107f6cdf,True,14,94,1210,5,True,Tests_passed,baf075cd3a4fed05e94de824ec4a705cf535a0800dc9dc6fa64a4796e8f5ccbe,True,14,True,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,27f31ed6ff95607bf4887eaa974e1572d48daaf91f812305a50b22a0be6604ef,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Tests_failed,c8a54765fe7f8118c5d9fc3ad2e54c585ae15d0fe412711f713723e76d3ce942,Merge_failed,faa79f50741794f4fd240832a100775bfe1391f560c7d3084a5c402a5a087193,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,fbf70304012f80e63dfa91f59e9be25a7cf615e68be3507f689471ede9255070,Merge_failed,0cb0fda1743004d8de7fdd05e1b4be7b35aea0bbca9e9032cb48fb37de1167ae,Merge_failed,f28926aa0e148ab6ba1ba74778adc8804c4c55330dd6724c0f2acb427d380c67,Tests_passed,bea5c2b2c817a47f5610a23eae9877136180d1f095f32b961e59730f5255ed06,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Tests_passed,9afeb0a494aa3e796f1cf816eeb0b6eb7a283e82cdfb121196a97462867005df,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63,Merge_failed,02716ef7f8d0fae2cdf0a7aad8bc673d32beac9a0c095451ad31b62fc04d0d63 38,refs/heads/master,65d75536ef5225314352bb18e8b03abcddab265e,75720564551f39cf872c10a181c33f9130f4ec10,30517761affcb1eb3d17c01bb0823c4a75ff4d24,,True,True,Tests_passed,e191dbe5bc09e81f8738d8a5acdab215bfecfb89e1fd807c14a5a4389a403e21,True,3,32,208,2,True,Tests_passed,916e14eb556256fc2bcbe595ef4c6a0fd3fd14119f60894fc4a2efb598d9cb4e,True,3,True,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,917b6a3deaf762bc517d4db1c8b6418bcaf2ef30abead834f03dcd418065e36f,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Tests_failed,9a2a06bb0b3a5c671264f34d29c714416390b53edbfccaf2697bbe76d7c79575,Merge_failed,2323524189c3f65df768abe476a524e571ebd4a130c87e4865fe13aff63444e1,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,d524b1e9f328c8948a41944b10dc28e346fe9aaaf327b5b0c2e85a709fab711d,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,6eb90689da936ba2a198a1fbd939437b1f6b0b64b5d22d9e59fbd249801f8093,Merge_failed,653160674c8caaedb683e95b17844418f03aeece0c44ec47f909f7f5558c5e33,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,9f5d2d37e9d71312c6719838ccbb7e22d47a43708d1d54aed8dd548344683ad5,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab,Merge_failed,545eaf4aadb893ab12b55656ca969e588043291400037087de450511805c46ab diff --git a/results/reaper/merges_tested/lbehnke/hierarchical-clustering-java.csv b/results/reaper/merges_tested/lbehnke/hierarchical-clustering-java.csv index 5d49931d9f..01df7f6e3b 100644 --- a/results/reaper/merges_tested/lbehnke/hierarchical-clustering-java.csv +++ b/results/reaper/merges_tested/lbehnke/hierarchical-clustering-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,147fc13e7c56047ffba691a9f7cb157c3b37e835,fff2a86e05b3bff17289ca2980394033d15f3afd,79b889c0a0e43e47e79f4dcc7468a479d9b5b209,,True,True,True,17,58,290,3,True,17,Tests_passed,568ee0ffea1a6ae7efab3ca3968e0b991bf811e1ed61d97147c2ee614962544e,True,Tests_passed,652309c7bf4d663792082ff894d0b047a9261769f56ec7478d637a095fd6832a,True,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,4fb5341de5a0ce773736d5841f3ff20c88c8fbe5ee27461fffe6826f486cc9ed,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Tests_failed,0bbd1f7406a01938032409a1688c8d30c3e72bc3d7089d001a97c06fa26e5432,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,a11ba454b9e92815268c98b3e132ec1d786ba1e4c232330889dd8759a168ee58,Tests_passed,e3bc563147ddf9d829d79886a5c1046590b2c503abdb8ff3d9209cdea9262a9f,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Tests_passed,ba24e4fe0358f272d50ff27a6c347d83f4627b4626fda4c0f30713285c484f54,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685,Merge_failed,bcf32f71b56e994355b78d2f9a07be5ebd3eec3f12f465b086b842dcef8d0685 diff --git a/results/reaper/merges_tested/lbroudoux/es-amazon-s3-river.csv b/results/reaper/merges_tested/lbroudoux/es-amazon-s3-river.csv index 67be4d94c5..5ed57cf7d7 100644 --- a/results/reaper/merges_tested/lbroudoux/es-amazon-s3-river.csv +++ b/results/reaper/merges_tested/lbroudoux/es-amazon-s3-river.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2aa45336dcc877155d7df5063071f37a86368271,41e6ad6850eeab69700979c1b972f8bd771aba67,b36560bc1985367325345e5244383c223b948a38,,True,True,True,11,79,525,3,True,11,Tests_passed,70a4b2be6ec8bcade189d2322ab21a7703c0f32c82c0797d5e41eb656809a15f,True,Tests_passed,48af516ec7212a877ccf2a5ee2d6216d03fd3342a7d8f7d18693276ac9487431,True,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e916a1a1f66febc4c200c730083c9c9fb53d468f8ac0d61c23d2e8c919f14ae5,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,adea0ce69921bf6c5f6a3f41b8515eea1b1cbb9bf07f54ed8aa127c9b53cfa10,Merge_failed,2261f1581b7703fd0ca271394151cfb2ae8927b1821c02d9884f7efb4a975577,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,e80a5e97e2852c6e9a1d9bc5602239f60a16576db32dfb4ef57fd6542cd111be,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,bac4c5a3e88eeb5b33c1ecd3ba60b7e321472c8d160008b4c5ed6e0c922a4f6a,Merge_failed,c91875f60e2adf5874ff668a6445a8678b2c5923871f0ebd708874de4c777e51,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,41b4399fe14bedbe7e63d6760d7b6ce655ceab2afe6f947723a661245af5b234,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b,Merge_failed,2638c2e6a94ab704a43f5efdccf776f929c9181d4a6c0ad66b533167475c3b4b diff --git a/results/reaper/merges_tested/learning-layers/socialsemanticserver.csv b/results/reaper/merges_tested/learning-layers/socialsemanticserver.csv index 253bc53806..f429315b59 100644 --- a/results/reaper/merges_tested/learning-layers/socialsemanticserver.csv +++ b/results/reaper/merges_tested/learning-layers/socialsemanticserver.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,6a7dca76f4993e256c13ab95b0e38d9b40847fe1,e157f975436908a1549d415cd3c0737252a6a3ca,6fd7ecaee5436da1772a43577ddf209a559c638b,,True,True,Tests_passed,0fdc2b5d64148e7e627ce70acdfdf13af73f96400765e5de21553aead1bf5d22,True,160,550,7743.0,2,True,Tests_passed,a88d0f618915901dcf0fd5eacaf320a2f63319ecda72842120da3730ed9e6d3b,True,160,True,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,c95f77a7c28b27adcc4def2562aeb16c5efefa325b4883a89be21b4512744efc,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,c6948269d794d25fa289b9538f7e6542859ef77cc9a195f70af0f1a7f92fba55,Merge_failed,2c3648491e93c44b62d85366996e505689599d08ce68be4c6b62e144c1399df5,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,c9743f5dae15dc38b1b7a980898829c87d0f57191655bc2598af3fe0c0994845,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,aff13ee4d360b93ce8cdd0a5e2d36b0dce14b65d487cd7eb7a5c3625b672ad05,Tests_failed,6ed0f51163fa4ed048d0d238ab6cdcfc71d521495897aefa198a1457060f9cfa,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,cd73491f673deb4ebeb080e863219c6704d9cd16ad8e77ffb2018eaa5e74f151,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69,Merge_failed,f28afa598a505b030b15dfc59f5bf6d74de780f1a322222df18eb06877a5de69 10,refs/heads/master,4ada3cddc3a15f7b2c63f40f83bdc48342e842eb,ccfc22be0135c5695909b3a97b8aa2cff840b9c1,263ee1a3a7b0baf8e0d66d04b78979ff9f71060d,,True,True,Tests_passed,049b63b323479aacedbc142ec59658e5815c38321b3bfeae2f2f52c38e497190,True,42,197,6322.0,3,True,Tests_passed,b321a24cd20b704fc079f72935e5cbb17e61fcb3272e50ce6faab2ec5cbb4b6f,True,42,True,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,ae9c6299320c70d5972e6035f59fa3e24778ac52381e27cf30ea287f1927a073,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,0d204a65d97ce299154f3317d3048f6c21ab3c08895e0358b1a93fe647101b39,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,b386ce603a73164d08a24ee83fa49635c3b72919120e73bd7d4670014ce0d53e,Merge_failed,963d55a0edfcd8ce255588ea1e3d9366795afe5d06d71088e05ce2d83ac5262e,Merge_failed,ecd8a11eb4ac84b1318151a087a7f9d2c28cb227de57442cdb7c4456bdd2d38d,Tests_passed,8269b6096fed2d1ae4ad43a136c2c1bf358f7f8183663f85af3b916208e84bb2,Merge_failed,420f246a8fc3479ce3dc7fe8388eb02689171764ab2ecf89ab4216f9b9d6add6,Merge_failed,ecd8a11eb4ac84b1318151a087a7f9d2c28cb227de57442cdb7c4456bdd2d38d,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,0d204a65d97ce299154f3317d3048f6c21ab3c08895e0358b1a93fe647101b39,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,788786e69c46e43b1654d4507b28cbede1bed1989c68bc31f3add4699e02d22e,Merge_failed,b386ce603a73164d08a24ee83fa49635c3b72919120e73bd7d4670014ce0d53e,Merge_failed,7329311ef81ef6e4b9b82005e639b9e857c641efecdd58885f8bfa7f58ee6e38,Tests_passed,8269b6096fed2d1ae4ad43a136c2c1bf358f7f8183663f85af3b916208e84bb2,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,ae9c6299320c70d5972e6035f59fa3e24778ac52381e27cf30ea287f1927a073,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb,Merge_failed,8ef139ff5305c7e1c36aacef4d752c9860ec1e0d0bcf5f5efed130e8cad8cdcb 25,refs/heads/master,085587be1338bb740008afa05913af155f816290,7e31babab038cf1943c5f812cf9d7abc05bcd28e,4ab2cf21c6c053ce08d08012b134454f8354114f,,True,True,Tests_passed,85dcd0fb4c60bbf5fb5ad9cecacc6a2e06ebcafe7af50e3dacb025b418406866,True,300,1676,8239.0,9,True,Tests_passed,7eebb4de84de2175e9df942d8239503321bd07136f7869e8eff880a466402e06,True,301,True,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,2b86a5aa1cb1d21a3cea8920bb75b02c515bd893be507f1200c2073673172b65,Merge_failed,5c1005082685561a51daf3425ac2201bdedf7fad6331e347668324e97daf6dbc,Tests_passed,6e692bd8c17c879a5030e2dec606b18b75c81c855dc3b781f64cf23cf5082963,Tests_failed,b1ea3e18a82ebc9a8f5537b301ea82b9061bac2c952a775e369c1c1cdf4d2c59,Merge_failed,5c1005082685561a51daf3425ac2201bdedf7fad6331e347668324e97daf6dbc,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,4439ec4bfb619bc1fd1fd7dd222dda8dbba6a7c05f4a32533b7c9604882962cd,Tests_passed,6e692bd8c17c879a5030e2dec606b18b75c81c855dc3b781f64cf23cf5082963,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,1dfa2da196e5d8602f7a439e61aeac16cb0adc29a4166c22817e701685a3a9ec,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3,Merge_failed,49662a47797a26712d495f76530829edaa10735011fb2edfaa62b14bf7c849e3 diff --git a/results/reaper/merges_tested/learnlib/learnlib.csv b/results/reaper/merges_tested/learnlib/learnlib.csv index 44f416a159..9285eef585 100644 --- a/results/reaper/merges_tested/learnlib/learnlib.csv +++ b/results/reaper/merges_tested/learnlib/learnlib.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/develop,cd89d29fb60db46bc9908025a3bac8a4f253646c,d930e2c5a91eabccee450f80485b4c3c1c842b96,162dc4f957254055b04003d39af4a20dee5de8e3,,True,True,Tests_passed,9a85af09753d9a59b787eb63d093f7c121e4d67ae2751f95b33445f9b394cfb4,True,53,70,166,2,True,Tests_passed,9ae2202e3577e34c5824e90d9490186d713606d17d761778c2144ff5ffb6c6fe,True,53,True,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_failed,4d5bec1bdb37ff0d93fdd03cee480eac051ac262e7b8df59e8924af5563dd7aa,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,02b33481b11596ac4aed2e93d86e24e01cfd0dc234c13a232078b6eaf47335d3,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2,Tests_passed,9e72793590756844f31d3d3d4b5ca80d30e680a097784cc93e27349e82acd1f2 diff --git a/results/reaper/merges_tested/leeadkins/elasticsearch-redis-river.csv b/results/reaper/merges_tested/leeadkins/elasticsearch-redis-river.csv index ce420334bb..a73563be5a 100644 --- a/results/reaper/merges_tested/leeadkins/elasticsearch-redis-river.csv +++ b/results/reaper/merges_tested/leeadkins/elasticsearch-redis-river.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0fe21428a65e166b0f69d4c533427043a443ead3,989b186f8f1eb0f34a44e9531131055a7956b253,2bf2964b787ca526f0271c387286bbc59d806fd6,,True,True,Tests_passed,c80191169baa07a1484204f4390111c23128862ad134644336cc5aac07910a2f,True,5,33,64,2,True,Tests_passed,56c598b4bafaeed4da68944dd3eddf97ac676f67e5afaebd999f804708743b5f,True,5,True,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_failed,86c99fd9f3ee3830ffc2a80c9e205f8a48b204ae67237c9f5f395f773df83ec0,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,21efb3e079047aa37f22bb76796851181ada26be26b9546ce7851df9e15ba149,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c,Tests_passed,58994e0782eecfb7ae4479349e01b400bbe4a63cdf8753d0b7c94a877fe5b20c diff --git a/results/reaper/merges_tested/lemire/externalsortinginjava.csv b/results/reaper/merges_tested/lemire/externalsortinginjava.csv index 5bdb3a0a23..711d557f67 100644 --- a/results/reaper/merges_tested/lemire/externalsortinginjava.csv +++ b/results/reaper/merges_tested/lemire/externalsortinginjava.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,5d3676023c04d823a56b85ca77a8b5fc90f24a5c,5cecda2aa3ec9be4978b948e6df3b25bbe9b085a,80a3557df8f0e0b7bb3a621d27f6c04867757b87,,True,True,Tests_passed,ac1d60e5022f1696e3de5e50c852a1bf4393756277aa86dfd26720feaf57250b,True,8,53,314,4,True,Tests_passed,fe9457430a0decbee0c7c0d31247607813c17bc138563af76b07fa785c939bd9,True,8,True,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,8f476c9d389e3b6154e23e5c561ee4281a92ea125b1822eb565e4fa64c85e7f4,Merge_failed,891e0d1f2489ce98f2584d843e7fd8f56e2e18228fec8524055e76e277be6424,Merge_failed,d203d4e2a15f8b207d841abff5360fecd50fbf90bb2d2a3570440591aae1d7c3,Merge_failed,21aeeccbe508bc010b18a39c67c009b59c2c6470887819b1ad1c859e31636010,Merge_failed,891e0d1f2489ce98f2584d843e7fd8f56e2e18228fec8524055e76e277be6424,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,4a2dd250b2e34f0daf1a73e4146f534591fc33ffe7b9ce5ba4f353cbffce0902,Merge_failed,b60c898209cfce2f879fbfe1ead2026a9021a92b2ab870fafcf3b8960f4b6df3,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,f6241775438496d17b77e63b68d677d7dfd2a6dd70d1e9ec848a54b2d15059d1,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52,Merge_failed,311d3d302a20c06d67e70fb40e106cf423a4d54c9c06aeb613a89c3c543b5c52 23,refs/heads/master,f6d54664fa3728e2303749b4e09fbca4d362b339,689d56f5f24b0a6a00f3fbdab2c96424f4c25c15,90587af600670f741c1a38134dee2ea7f6598743,,True,False,Tests_passed,08e4d523f5eb4a03a50a26328af879917d4146b903676db7376d61c590c3aebc,True,5,53,313,2,True,Tests_passed,0c6e9b82836630a7c2e3bb545824d65f828770f1d0f49e34739a40e3d36398fa,True,5,True,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,fdcfda25c94e8c9e3fd8f447611a2946612a428774c11493ca1b21b42c65141e,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,527ab42c4e8e805b425643bef30b5308e021483c3d8cd6981a96b86a39302a48,Tests_passed,4a7af6af2a48a41772f5462d136742ff0bf968cb9511eed5b16975914bf9e6df,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,d963b45b548ddfa273d092e60c29854d6d88a79a967e3eb9dbc21e6e715feb41,Tests_passed,13cd38aa549ddc9b0d807730a42b50a91f9d1e89e57fe9cb0e9847669a16863f,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Tests_passed,876050e1259e28938f168771a8f4d73e397dbbcf42316080cabc892de4b2cbba,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35,Merge_failed,1f9e6cf8a0b400d0d94f9b5a3422b10b3aa04409d9443e9a793d812342ed3c35 diff --git a/results/reaper/merges_tested/lemire/javaewah.csv b/results/reaper/merges_tested/lemire/javaewah.csv index f6517a3bf3..a95555aaed 100644 --- a/results/reaper/merges_tested/lemire/javaewah.csv +++ b/results/reaper/merges_tested/lemire/javaewah.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,7d5284a6c3955aed35a30b13c533a38edc6014dd,9886242dd6d38830ef0b75c39c08ee3e8bde658c,49d67c067729a1c78ad6015b266a71f76d6603d3,,True,True,Tests_passed,5a9010744bb8133abb96249b342117f8aec15825624503ef8478234a700d4f70,True,16,110,1204,2,True,Tests_passed,30bee11bdce6d16b5bfbfd3010d003007a0e5052bd4376b6b94401bb9a22990f,True,16,True,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,cd02cd73422854c3c1855024aaacca6fb8fa72f0b3f89204ddcd0256018ac00f,Tests_failed,2f4e3a131a33bbb4828e728631b124bb75cd9f83c6a229b82fc8a5cb8a498c2a,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,cd02cd73422854c3c1855024aaacca6fb8fa72f0b3f89204ddcd0256018ac00f,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2,Tests_passed,42da6c855c059703037b96fba13080ccb5c128c9e3a71176bcef8a4b98ce2ca2 30,refs/heads/master,0bfa66bebf50c2028a2f0a8bd32e6eb211a87509,ad74ab44c2df6fa512c73deeab17f75e18d21ea1,b9b27b484707cf53ce3df6b459472a37fde588d5,,True,True,Tests_passed,76940b28d8504dd98c293301c63c17c207eff090a0178aab0265440b11bee804,True,11,21,536,5,True,Tests_passed,88e6634de432a4ca667fbd207fa392c14c2cc9719d4f68bab1acd46c7684f93e,True,11,True,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,99c9280becf6d0cc8a1059fc8b4213905fe8727a732e1e3a5654bbfd271fe076,Merge_failed,c92b54f52410bb5d0aebd2d0598a5f8bbc0e0bab7892087dd7edcd5479758b50,Tests_passed,847212352d5d0daff8aa5188e94d3dd1aa346ff90c0dc3b6303187b997d27988,Merge_failed,7ff34ec5116da0a650859327946490d37dfd32ec522b64f1f9407f61cb21ab36,Merge_failed,c92b54f52410bb5d0aebd2d0598a5f8bbc0e0bab7892087dd7edcd5479758b50,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,3f3501a19867a787efad3e418d4c35b8103487cfae652b8c3e22c2cb5eb553e8,Tests_passed,847212352d5d0daff8aa5188e94d3dd1aa346ff90c0dc3b6303187b997d27988,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d,Merge_failed,fbadc69a244b8d03f5cde2b5e24bc9037be8ec1b231e667e1744fe428ed3679d 39,refs/heads/master,600bff483f9da0042699aa4bd9712ce788cc248c,b0952760c0ba180e8f63a8dedf2f16b0e966af03,441dbeb1d706f33eb7ab5c0e7a6112a6145f588c,,True,True,Tests_passed,8a5bf3585adb732d594cccaf66751cdaa44faf5de96b7c651017697158c2dd56,True,11,17,320,3,True,Tests_passed,fc08f6838a7ba7f29ffe915b48993b8525c5e33ff621a6a5f765af067af2eca7,True,11,True,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,3c511efadfbfa67914bccdaf42646cea61cd0aea607ad00e5a5c2f07ac8b60f7,Tests_failed,7616f56a60ed311ded1f756c4291f9276ba2aeca665b7c15d72950eaec7f3f92,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,3c511efadfbfa67914bccdaf42646cea61cd0aea607ad00e5a5c2f07ac8b60f7,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc,Tests_passed,6c8e45b6b962c70118e065dd4f2df68202461e0085fdc7e559d261ff686244dc diff --git a/results/reaper/merges_tested/leonlee/flume-ng-mongodb-sink.csv b/results/reaper/merges_tested/leonlee/flume-ng-mongodb-sink.csv index f90e0a1447..67d0284b21 100644 --- a/results/reaper/merges_tested/leonlee/flume-ng-mongodb-sink.csv +++ b/results/reaper/merges_tested/leonlee/flume-ng-mongodb-sink.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,6e95fc2cbcb962d885349d74fdc5a51bab767964,c7bbbbc61771590b83a5fd19fec74a6f917404ab,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,,True,False,Tests_passed,19990caf97b5a366543e127703f1c1358d8c24d85dc6b3636ac49ea570fe0ffd,True,3,26,68,2,True,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,True,3,True,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,657082fb3e14a125d948a56f4ddf0da5cda5a98d1aa3ef0f849409b1067e494d,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,2b3464f870314f0c389773a4f4a1d37adf87ab26f51631a6751a76770c57e354,Tests_passed,f926b46851ff0ba87958f3e15a76caa50084a3d461d9171b8b36a36bef12469e,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,d9c3c8da799b13c7551bea82bb4c4e8b9e49522a42a1a1e4d5d96e37ae525976,Tests_passed,1832977f80329a7ca290aa1e2451a6383e9c5905ef47d83e60770a2888e9d1cc,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78,Merge_failed,a235202f713115cd6bbdabde34d7e828e6920fb2110943933b6193febd4f6f78 6,refs/heads/master,fba1f22175d1da0f00dbc1a146b3754503d4d8e4,d49f51bd83fd89f815e32fd1ca7f0ba7159f212e,46b1f3364efff6a8c68326b02ee26d1bed70746d,,True,False,Tests_passed,842ab749a493754054a421818905b5ce93dffa92a64e5ee09074dd5b0edc4b26,True,3,19,54,2,True,Tests_passed,f22a5268aaca519d234d2b4cc033ff6f25753fab7e91e0dbe1caccc7bf7d608f,True,3,True,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,44a52493a86ca34659de3c4f5c397b714c31a6e1ff416913ead398ef80c8db27,Tests_failed,3eac86ba385f5d50ee5510417d8dd45cf3e7d0b54acf2f001a4e3036283800a2,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,44a52493a86ca34659de3c4f5c397b714c31a6e1ff416913ead398ef80c8db27,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3,Tests_passed,79ac35d8e5c329b969774ee8272c3f2aee2d50612fdfa277693f196b25270ed3 8,refs/heads/master,8ad0b50fa6aa1a155eaaa8524a422f9170b3e67e,3b7cf7176bcf497c8f0180c8c55a95456f586ba6,33e0e691b2953b652e68897b198c9ec5f031ba67,,True,True,Tests_passed,94d96a60b040b01a65a6485ee1e6a954cd2d719607f5129300f171bd187e261d,True,3,12,144,2,True,Tests_passed,6fb0072f64b2163dd1069fcf46b730ea08be2b0c8e3bd10cb487de0b9197c2c6,True,3,True,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,06ed06c318b75de4a645315308d0d0af897d3feb8b360c73a6cc2e2f2429d31d,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,06ed06c318b75de4a645315308d0d0af897d3feb8b360c73a6cc2e2f2429d31d,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,0e26f729b6f8615ad3b7f17723d3fc495de619629d8f36fa744c9f061bf8e227,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c,Tests_passed,c131b70fbc98846212a94fa8014f3468131b31853b6435ff1903ddaa0aa7277c diff --git a/results/reaper/merges_tested/leveluplunch/levelup-java-examples.csv b/results/reaper/merges_tested/leveluplunch/levelup-java-examples.csv index b5283430d4..a660f66bab 100644 --- a/results/reaper/merges_tested/leveluplunch/levelup-java-examples.csv +++ b/results/reaper/merges_tested/leveluplunch/levelup-java-examples.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,db0acd81d124fd8af863c20728e0afcf3adbbb0e,cd0b409006035fcb9e48bb075b58aac1cf6d4192,d6723a2397460e5ba08e2d9ee45bb78a816100ae,,True,True,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,True,9,10,631,65,True,Tests_passed,f2491f5f279546d648cbdffe352a5249c60d8d923f52b0a3a31c79ade7207d5a,True,72,True,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,c62ea37ac6c9e2743cb490b52b1850626cb7d0b181e29c538dd548ede7a8e2ff,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,f3803935988be5db69ca9e3a96bb4f11796d95e61290b2ca345bb0c3420681c4,Tests_passed,3d2f8ca0e63c1269cdc3f3e9aa5e8d8f97e61e57e2260507744fd055f2ac84dc,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,caa4326dae64dffadc952180558d17fb7550ae1fd9b4e377eed762970ced741c,Merge_failed,cda3a4ce58ef2b51b078e94d6861dfe14b48d2ad8789695dd98802bd8c174365,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4,Merge_failed,ef8d70427f46fef95c8138209fdcd8b99e793668687d0fecdf0dd0cee7d48ae4 diff --git a/results/reaper/merges_tested/librato/metrics-librato.csv b/results/reaper/merges_tested/librato/metrics-librato.csv index 04726b9a1d..fb1c495d57 100644 --- a/results/reaper/merges_tested/librato/metrics-librato.csv +++ b/results/reaper/merges_tested/librato/metrics-librato.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,0720f6dce4f8da338bbfcfa9e2c0009de7772709,a0891f0785d08d8abaaf3dc84009bd8769d4ca8a,5afe7a103adde58eab777f26fcc616f06601207d,,True,True,True,6,32,159,2,True,6,Tests_passed,8bfc3fd9e58392e008801f2a7ecac6df5095545d1b829d0d16b0c289206194a4,True,Tests_passed,8e27d6b8f17a98c1b5d2dc4ea8e66e06e99ffd05081dcd909ca669c52d342b37,True,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,8e272a223f411b3eaf152d1a2c661ec163cef4887e7f83f18d688674d841b67f,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622,Tests_passed,b9b97de7494f79954da4b96e31beae2abeb04fbf33e51b8ba12e4847b22f4622 30,refs/heads/master,140caf9da468df3c5bedacf427b06903b0933a9e,0fe7e8d986428c910b046bec995e793e44aed48f,f5efb2b25af84d04977b3ceca7712dabe4a4da61,,True,True,True,13,88,430,5,True,13,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,True,Tests_passed,6d5abf7af2bc92f56a604fa6e2903a2a481460e39d60c344014aaa3f77022fbb,True,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,0a4e0843e91352ed1326b39e8ec6746bc71e850e14e7e4e052cee72ab6587e55,Merge_failed,95a2f54cf4d1cefa45063c7dde9ba8435721ceddc19545e52c5dffc3399837be,Merge_failed,e7e3f638e88aa1912e7291616b8810399c1bd22fd6c5f652ed4e8ce303f09a51,Merge_failed,f51086d015c4620fe62406f3d2cedc293cc14c9f500f17989cfbdc413fbf7593,Merge_failed,95a2f54cf4d1cefa45063c7dde9ba8435721ceddc19545e52c5dffc3399837be,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,8dbdf3a3362754bc0d3156f7ba7ded5188c21d36e6a25f7a008ba6bc9a938cb7,Merge_failed,e7e3f638e88aa1912e7291616b8810399c1bd22fd6c5f652ed4e8ce303f09a51,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31,Merge_failed,9d8820d2494c70af830fa98b9c76b3741ce04a9498a723ac9022bd3ef5088b31 31,refs/heads/master,0fe7e8d986428c910b046bec995e793e44aed48f,f20cd00614275ef975d77648e1ff541e04832b51,34d97f335710c209bc71bb0e839c23b279b65d48,,True,True,True,12,71,294,2,True,12,Tests_passed,e37c8a3a9ebb7fa3f3994ae6a55abbe971ce145454a3eee055201081cd2dce72,True,Tests_passed,29112055e54e5b5c67434eeb00541c2a22e40d5df90b3df73d6589b40c3e1dac,True,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,6060bf18859f2988287d124216d39e2730df0e286116bdf713d6e100e3999104,Tests_failed,d691d837d76cf7944cf688d342794d7414a1e3bc212deee8403855da27ad5beb,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,6060bf18859f2988287d124216d39e2730df0e286116bdf713d6e100e3999104,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd,Tests_passed,cb129afc0ca37612e2333f0638ab9157c2a3ff0dde3a285612c142506186eecd diff --git a/results/reaper/merges_tested/linkedin/camus.csv b/results/reaper/merges_tested/linkedin/camus.csv index 9ccf99edd4..c2cc7555f4 100644 --- a/results/reaper/merges_tested/linkedin/camus.csv +++ b/results/reaper/merges_tested/linkedin/camus.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,05c0ceebfa45c20f5e1b584888fa5a9a5ae8c6d2,3f3ab0a3888ab9bbde8670a15f81404b5094ad91,e5694615ec635a2a10b6b8e52045b461ed9838b6,,True,False,True,5,6,34,2,True,5,Tests_passed,b87be47c4b81bebdaeb7e1e19e0d1a498723b7cd3a05e3e73d0a19f3aed47b28,True,Tests_passed,67e6913684581a54b4e6d211718756324deaff08231c368e10ae9db988045c02,True,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_failed,1d627577bc898fe14d16939dff010cfc65fe62fb1bb8dd11833b0bc440624ee4,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,b86688a1b10a9bcd987e8b312c669cf1455fcb87a9029455eadbbd67e2bccc6a,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157,Tests_passed,1adc1e861563c3fb1db08e22cfa9cc4662343bc6a9ae6053165d54a17b6a8157 10,refs/heads/master,9587d9ba868624a8e5ee934456f82a2a952019b5,ee7449a3b1ea92dbdeaee37494b9b4e19c59ffe8,103efcc907b903290134fb49588452d40fca555a,,True,False,True,6,6,50,2,True,6,Tests_passed,273fbf1121486c9264f39490e55d53aafa1eca32519ed4331bf49136a5dfdcdc,True,Tests_passed,a5baaca2f612b14596514fea7c9ac680fda8a3c0aa7d50e08c55d746e56c9b88,True,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,e94d91030468a2b02722e81bcd075df1a386e61e757eb790faae031fa0c6d1e8,Tests_failed,ef0e4799e09170af73766bdb3b36a6c5984c631af238e683c71f8f129c63a5cb,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,e94d91030468a2b02722e81bcd075df1a386e61e757eb790faae031fa0c6d1e8,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c,Tests_passed,dd8f577f574400ff9e3cba52e9aeb349c1495efdf0e399997cdc5e0ae42aba2c 16,refs/heads/master,5cdebd87dba765dab516fbbb74e840bf460c925f,3745615d07abf2a0ea464e97cc9940ad7e9e476d,20b334666539fe9f86645fb0f7799e923bfc2504,,True,True,True,38,215,2363,2,True,38,Tests_passed,e7e0c2cb08a4219bac23401f752476801aa64fe8765c5f6b4b5ae9e53c894d2e,True,Tests_passed,188899e8a8a5fa6dd768c94fe59ed4b4586825a26e24d62fecf2aa6212bca37a,True,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,e7e0c2cb08a4219bac23401f752476801aa64fe8765c5f6b4b5ae9e53c894d2e,Merge_failed,aa7e82aa7c858d074399d58c4b16726cfcd590b7dc1892adbbf6d23d4bd4dd15,Merge_failed,2e105478cc759445557f7ee27fffdce49a40da0cf87b6a2a6feb6109c4b6044c,Merge_failed,a12fb8a90e5e9eaf4d3d1980b2e573c0aa3158e6380b807668389fbcb201ec0d,Merge_failed,aa7e82aa7c858d074399d58c4b16726cfcd590b7dc1892adbbf6d23d4bd4dd15,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,e7e0c2cb08a4219bac23401f752476801aa64fe8765c5f6b4b5ae9e53c894d2e,Merge_failed,2e105478cc759445557f7ee27fffdce49a40da0cf87b6a2a6feb6109c4b6044c,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74,Merge_failed,a7be52d746b777b02b144ef183d3f5fd59dde445f8aaae7f0f7bd2cf46c50f74 diff --git a/results/reaper/merges_tested/linsolas/casperjs-runner-maven-plugin.csv b/results/reaper/merges_tested/linsolas/casperjs-runner-maven-plugin.csv index d405ec818d..9c79accfaa 100644 --- a/results/reaper/merges_tested/linsolas/casperjs-runner-maven-plugin.csv +++ b/results/reaper/merges_tested/linsolas/casperjs-runner-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,bac08fafd6c851811c8c7e2fd8b393d20d82bbb7,0de7643b2ccdb5de6f57e82e93028c383291319f,51b8b9d308d6592ff7d339b802c09da69df3d355,,True,True,True,24,88,581,3,True,26,Tests_passed,69199b4507b5ac16c9ea05b2caade8671b71721f4d607f35ec7a6e0dc5871391,True,Tests_passed,5c41ff374ae3a89aa1db1b4e810106d147c4c8af13d94416579430f69dea6a6b,True,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9d8effd0685a4793ea57dfc97db635028ef35a031b6a7b5a20c44992951c6cc4,Merge_failed,bfb884f0ddedb0d4155f11d499d79d5de7d2dc815452e0f5baed97f116c61c82,Merge_failed,73d656539f34ba930dc32ff726d4187135e885a43008a8baaf61b1bf81f4aee1,Merge_failed,f97d52fb5ef04eb491f956750379793e72fbcb4324d42200e17f7866bdf1d657,Merge_failed,bfb884f0ddedb0d4155f11d499d79d5de7d2dc815452e0f5baed97f116c61c82,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,b8528c0be7345913cd8dec0d85c992b7e2d177630047c5f5b9ec9c6b98b9f710,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,5d917c678f8198da930cd7b8f711b79d5eeedb09ed3cd8ed64e801bea7789977,Merge_failed,6688a8d6c0456649b2b017d1d30c96585327d0774f17b296e1ae8d5f5ed5288a,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2,Merge_failed,9f53a992ffcb3b4fbd6b053ebb8541aaab7d04eb40bcd33bc36b0a50812ecad2 3,refs/heads/master,98fccc0f940917225388733e66237404f374cdfc,bc49d4bec72a513a71898b54a82f7b58fd31bd75,3596606660beafd4e9f86deefb33adc264146b1c,,True,True,True,13,35,151,2,True,15,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,True,Tests_passed,97cbd5b06e0dde7adff256e50dbd2bc99fb11308c11727d7e7ddb8f7a32ae6f1,True,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_failed,9a7c3dd7c8697f8b2aad685923434c8b7d0dc4db2fb4a750fdcd7a2ba9b13d9e,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,3f3440db7e00385ec1ef0b3a12904b227de1c292a8e84552741cb153e43a623d,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,6a520f9195faf510af5e2a19bb6090806442de91e26ff42c7f858568ad296699,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80,Tests_passed,05de08a30071b02efa8b91cfce935f0bb7e6166771d5809640d39e15f612db80 4,refs/heads/master,bc49d4bec72a513a71898b54a82f7b58fd31bd75,f48926ede0185f3c29ce57154266545c30a6acbc,bbb86d274b099feb232c9e2a80a54d1ec94be0ef,,True,True,True,9,20,152,2,True,9,Tests_passed,20061750328d118fce02f6f860f7219e397e9493ca601ecf52cadc98ead91a1f,True,Tests_passed,50d2eb593def4562cbb2f9290ebd0975a8f603746281ca0f45d3818829eb6a4d,True,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,685ae4c28704ca0e7e322c901f31b5d33df30b168e235d56fbd63d1479a964de,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,685ae4c28704ca0e7e322c901f31b5d33df30b168e235d56fbd63d1479a964de,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,ef018df61a9869ec9f71995873c5c000348baa3fc04eab2cae7adbeef7bfe261,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2,Tests_passed,5a46e9c19735a6ee93ef8964a52f0b9fba9031240651fd8d9dd78f435fe0b1d2 diff --git a/results/reaper/merges_tested/lintool/clueweb.csv b/results/reaper/merges_tested/lintool/clueweb.csv index e98de64952..48b83ca25f 100644 --- a/results/reaper/merges_tested/lintool/clueweb.csv +++ b/results/reaper/merges_tested/lintool/clueweb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/pull/2,f9181ca9b2aaa753c6ad6682c104ff86b3ad61ca,aa26f1b3650bb1f473ce4f7da5ead01e6a3b7a6e,9903285c0c486d0cb92e662a16fb338061c32cd7,,True,True,True,58,130,14456,10,True,62,Tests_passed,36b130f3322f6322729db4e99b129b597027e4a340248c309d581a485da296e4,True,Tests_passed,dfe00cde5ee8a26404891cf942f4796a75fe1098c4c6921a5078bb128a39bdac,True,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,097874d253ae2b46505cd6f042772daede1177c0e71ae2bc5949293daef62a6f,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,11b4a6ab6c9ae9f3d6b25238f22a45ea88a6f0a5ba88eaddb60b3298959eaa0f,Merge_failed,d3cfe2254ccd0145be38b5c0707cad99c7190387823b59f0492f2b8a56d167af,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,fa4469e06cc8a34bb31861c042f4c36f2de82f931dba179856e5be4d59e34702,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,5231ba244a8cdaa844264f6fbbb88d0ac0caefdd63d3b52737bc07e272f5a91c,Merge_failed,18341545050199f835edbab9762059e94498543564c2cacde95bbdc24824bc8f,Tests_passed,9e53c6ff022a1943b30f60403852f30fa90e26eb94a56d53311185a79a2b46b8,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,55e579286409afa8fa0aafed8cd57eabf71c21a7fec855718b7aea1cc4c3d734,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c,Merge_failed,a6142e7bd66ebae3b51a2eb3c8cd3f5dc594b14e77906d6b2ba7a0c071341f3c 11,refs/remotes/origin/pull/2,850bda6ab8a72c664b915023c522133b365447d9,fca438bbf340f6ae666fc877f37f5bdc2830dabc,ae407960f13e0b597aefa167abd4971c1976b2e9,,True,True,True,59,155,125507,10,True,59,Tests_passed,2f15fa0a41f0527772a788437f8dad2f46755df374c475ee810ca1a66830c371,True,Tests_passed,7fc551da026c59417acb6086b1b9cb2286401122329721360331b2d3b1e2f89b,True,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,5b9048dfee96d707d445bc3b3317b116b4a133156d7cd3e797bb6eccff57e1db,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,8070878d366c576c02799fd7c109b177ffc4fe7963444e37bba15473b26ff883,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,ff39d6d2807a19ad8df6f4c4eefc55cfd91a0a95b92a06c3621f40df40c2325f,Merge_failed,31637ed5abbd5de2d5641f0dce2496f6c4dfc8c26f49f05cba0fca587a071980,Merge_failed,cf4a0bf6ceda2d0076ed96ed92f7844856abfeee60ef30d8e19d3849f13f87b0,Merge_failed,8a15b9d02872ab811e42e3f745c36aa82e25c863b4696a90d0e7e40a5cdf1ec1,Merge_failed,e974cbc73939a47447ce3db6f2f1a5aa67d9b0d739a9314f1d34031e3351ec38,Merge_failed,cf4a0bf6ceda2d0076ed96ed92f7844856abfeee60ef30d8e19d3849f13f87b0,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,8070878d366c576c02799fd7c109b177ffc4fe7963444e37bba15473b26ff883,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,8eddc4b968709aa7de66661505d569add1e87725674ac826dd3ca9b0b1ce55b4,Merge_failed,ff39d6d2807a19ad8df6f4c4eefc55cfd91a0a95b92a06c3621f40df40c2325f,Merge_failed,72fdb382618b6ae5b86975e783a8f5a4fe1f9fd470adccb547d3e608d155d237,Merge_failed,8a15b9d02872ab811e42e3f745c36aa82e25c863b4696a90d0e7e40a5cdf1ec1,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,5b9048dfee96d707d445bc3b3317b116b4a133156d7cd3e797bb6eccff57e1db,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347,Merge_failed,c139066fa2b12b34861f9cd8c697ac0898080d4ce5443da7af31fcb3fe1cb347 12,refs/remotes/origin/pull/2,93c50a471fbebf6d54a57594fadc09e2a228f02a,d7c0b0376bd72f2efafa754970898a2b9d90258f,e2a31a23c35f62fabacb53693d8b1c4742fc603a,,True,True,True,32,127,54142,3,True,33,Tests_passed,785267581b92ce16db0ad2a78d5b5cc296e44ec958ec1e91acbb648cb110d137,True,Tests_passed,2df20b27c45edb85709eb6a63e014d88bc725f5854879bad311adc5fe59383e2,True,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,cd976fd6096a966bc28a509fc0f55ef0f30627cf2b72bcfeb3d52fff02fc3e3b,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,48e8407bc1fc5c9b9bc422d36559b86175f9332e5cb700653c67f310ff9f93b3,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,1072450cfd4c8e04b7f494276d763b56a77d107785b4e8d29e93dd77a7a1bf9c,Merge_failed,86f9dcdc9232ecf432135b7bdf35da5e30278c3d54229032884ac9bff2ae67b2,Merge_failed,80bbe10807fc0244ecc14d0384d0ffd1d30b4b99296c676c126f6bfe661231e1,Merge_failed,b5b63a64a346cb54aa69d1eebf3cfa03aadd6e34c810311d1d7ec26afb072574,Merge_failed,10013fe52d46ebda522e6daaf98dc1a61392e9823379da3674af60cf268aa3e7,Merge_failed,80bbe10807fc0244ecc14d0384d0ffd1d30b4b99296c676c126f6bfe661231e1,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,48e8407bc1fc5c9b9bc422d36559b86175f9332e5cb700653c67f310ff9f93b3,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,13f356e3270b7d66303f0f7b7e15040c562ef3c514750f0f740fd890a3e3281c,Merge_failed,1072450cfd4c8e04b7f494276d763b56a77d107785b4e8d29e93dd77a7a1bf9c,Merge_failed,c1405285be712a8aaaad887f6012004d6af05bcb0e0fc8813886b83719880a39,Merge_failed,a9c3868c92c77ca45a7c38d3d0ab0d88e247a3ab02437952c0828e425d56647a,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,cd976fd6096a966bc28a509fc0f55ef0f30627cf2b72bcfeb3d52fff02fc3e3b,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd,Merge_failed,16446e1515ea89e01d06ec0416b0784824f766a81b952b259e42c80652ad13dd diff --git a/results/reaper/merges_tested/lionsoul2014/jcseg.csv b/results/reaper/merges_tested/lionsoul2014/jcseg.csv index 49048bd793..efb5e11d3a 100644 --- a/results/reaper/merges_tested/lionsoul2014/jcseg.csv +++ b/results/reaper/merges_tested/lionsoul2014/jcseg.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,3d7efe1902724e0b822dfdb103fb59b181703320,92532809c229b49aed282633f842022dca2df554,277326353ed2bd7fd13a5f1d6a248f77c6733a31,,True,True,True,8,13,65,4,True,9,Tests_passed,d1ac5ab5bbcdf3c62ddfb65bd4846f214f6e7e701ee6e28e7154b81852227b72,True,Tests_passed,c20344b7f8ef81594b144f903dfcda8ed712a02636159ce2e2d40317e08130b8,True,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,baeaba8a838815fd397412fb2f9dd86fd926c051f9cdc6dd79ce111d360cb8bd,Merge_failed,4a81a49160a7f6651ca1734d3cf4cd758a89dad5c67a9cc04498be8aa89c0385,Merge_failed,859d761dd8c64189b6407b1513dc018261a604e2e8d3596861899b857e062cae,Merge_failed,3cce02f6f1c61a33bacbe8a61771cc55b6e30055db601ee1a880fab68790c0e6,Merge_failed,4a81a49160a7f6651ca1734d3cf4cd758a89dad5c67a9cc04498be8aa89c0385,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,e8ce79abb3ce5d52a1840814ce0420712a72498cc64fdf9b37590fd8fdf25b83,Merge_failed,be2c42899c63f399a668d0135774da0370fc2c99e549447f5a34d73c8233dcf9,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,7eb6c32ea313056368b99dbe5291e47cd4a6c74055c5e6d58b71d2e81d516ab4,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc,Merge_failed,dd2c528db9b502f6a352cad418a38e1a75f6420ce57bad39d72c979a7b8656dc 27,refs/heads/master,a86200ceb8b239ff7c3dfbceb5bcd4df8ea0cf96,0e7ba00efa11c9a060b19f9951bdc6daadd6049c,1dec9143e14c98f774d64cb71c7f63938d420d28,,True,True,True,28,156,577,4,True,28,Tests_passed,f6188fd8729fb13be98adf439de0fcc58537c479e00fd3a37cf05c8c2358e5fe,True,Tests_passed,a906d0492828079b957e3a285c5b3799cf2c4043f56784c9af9f85d7f8852f4b,True,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,f32ec43ac3cd008d667a17216c3221af04b6814c01f9b7d022c860240657ca8d,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,0be42df253776cc0022c3b28b13759ec04281434ca5e6cfde8839e202961f096,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f,Tests_passed,5affb72e407761b83a23c3e273a5604540b9d625f37f90a3f4804398e0cea04f 34,refs/heads/master,3220cb12322c30c6b9f3b20eb5ff1a5cb9e61f1e,3b3492ee5474231643708da8957f515b4766c707,fda7635173f46dafdb61d3f6fbfc365fd17696e3,,True,True,True,11,39,375,2,True,11,Tests_passed,a35df7532b429bdd712f92eccc8532fca829ab770f38670f32d76ebcf3ea9b1a,True,Tests_passed,0f872ec04212542e6eda1c6a5c05ae15913b1d599b9de7f7fd844d801d8d0047,True,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,d5fb3bc3e14165cfa23fa4ccaf0a2cb4689994fade73fcb72b088b143d8e9340,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,d5fb3bc3e14165cfa23fa4ccaf0a2cb4689994fade73fcb72b088b143d8e9340,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a,Tests_passed,44657447d3fc6cbe359817f6d27c4e0b4bf18bad1c650a1a8ea0d96b7264655a diff --git a/results/reaper/merges_tested/liyiorg/weixin-popular.csv b/results/reaper/merges_tested/liyiorg/weixin-popular.csv index 20b064f82c..3c2c5fac10 100644 --- a/results/reaper/merges_tested/liyiorg/weixin-popular.csv +++ b/results/reaper/merges_tested/liyiorg/weixin-popular.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/remotes/origin/pull/199,2f0370a80ca28b3c7ae6ff49d2df49762f99a2ab,bf9b7f0c7cec5ce403bf08f05d541645e6b34130,a276acf0e5c77d23a692136b854115eb61a116e5,,True,True,Tests_passed,93298955de784a231afcec87bad1c12ec2e7c6ad18513f4982164d2495b4171d,True,34,89,3176,2,True,Tests_passed,0945c88d37ef6439673996d5f0fb8a99490ce25bcdd41cbd458f94520daaa273,True,34,True,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,b02773877527717f1e1d5e7e89860278c7e9f623d3bb3a7ab758c2f5febec25e,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Tests_failed,b2518a1af05242bb1e273519d62bb0e8c7dcd4f59821c7d42dc68f66e7156692,Merge_failed,cf39cfcc8f1c9d6db1913c8220acc2b658df287411b427130c506c5ebe06c9f8,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,3ec29058271afd3a63e24cea7057fdc83ea347a1f09f47610bd5f9d942ddc065,Tests_passed,1ebc3a74d7a07d5ab86d7691486e714873b76e79c6c41eaef03e97ba25cad040,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,62432ca96de45081105a0a33e822c5526ab2f27b6f23f12696189086983e756b,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e,Merge_failed,160dd81a411748bce2876d6dcc40d5c34d8ae1bf919c61bb161256cbb197475e diff --git a/results/reaper/merges_tested/logstash/log4j-jsonevent-layout.csv b/results/reaper/merges_tested/logstash/log4j-jsonevent-layout.csv index 0af53181f2..97f7a32bae 100644 --- a/results/reaper/merges_tested/logstash/log4j-jsonevent-layout.csv +++ b/results/reaper/merges_tested/logstash/log4j-jsonevent-layout.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,bbd02e8c15164ad61886290cbe577c6ead479d4e,1a515d43cd5bc5babc30c3b021dfc525bfdf4b6d,9bf1eb60ba1924819524aaf30a5642d02b660445,,True,False,Tests_passed,a68be4ffa78f1170337645102239c9de02e5225861b55951b4c43b62f651e7f0,True,3,5,14,2,True,Tests_passed,fc4b2f6b59e551f36b295a1d39809910b7bc1708e64947ed586c5406db0fd47d,True,3,True,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,25576f72c2dc1ae36a2d912dbb0582c2e8d5052495dd8c1deac9f4e20a529781,Tests_passed,5123343668d263baa4cbe3d08802856d66163a9a8fb84234bfe4de7fd77201e4,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,25576f72c2dc1ae36a2d912dbb0582c2e8d5052495dd8c1deac9f4e20a529781,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74,Tests_passed,d01453053f2644af7ea1a02f4a4db6ff3dd923e6d6bda264f45e3b91198ebc74 12,refs/remotes/origin/fasterxml,ee90110799a7b6f905dbda921690e43cdb8b7b08,dd57077b747f5e849172d48e96a48fe6fc538e0a,f84aca0ec9e49f60c64d7fde80f8d8b1acc3847a,,True,True,Tests_passed,cb3f99299108e0a3a01edeef8f27e66587f470dd039275ecfe0f386d2ae464c7,True,6,55,210,4,True,Tests_passed,4060031dbf743f20d701089480376adcdfcf4c437d24e0b0f34ad46f165e6e0d,True,6,True,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,637e5ac5dbba75574bf5f9e33434d92ac8fa499178f41c695d3df3c858e0ede8,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,c9ab9521ec5af787988c4b30b5b3658798fa043742fec6c1b12e7ff816dbb4de,Merge_failed,1229f946accf21c862bbc8e882ffba3b1926de03a84d3b2eaef8ff4dabb0c46f,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,287d5a7b30f9f9780a94f68a81d2d1205fc7dc4cc7e59f3c48510bc7b2c1945d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,5b2b797275217d4d8e8abb3a32607f6d3ca664295dede09e4c6e1ca8f4438b2d,Merge_failed,8d8107cf4988bef9528588fa01848456351ce62741ea3f6c52ec8b63f5659036,Merge_failed,01da2a68ed6fd0a77a71cf69496cff5f627411b81b231c75c506084a7f921f5a,Tests_failed,5203f0db791c6b9044ce3da544ea5eaac43c3babf21ce4599ee173f1d6a2e0ea,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,2d1e9ee8b188f2f35751df664b84ae44ac528105cd74c2746f48d73a50f993cf,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108,Merge_failed,89249844c965b8329367fa305b1ca8f30088882c65ab0e5ad1f5cfe3d2242108 diff --git a/results/reaper/merges_tested/lookfirst/sardine.csv b/results/reaper/merges_tested/lookfirst/sardine.csv index c8b38d5919..817e4d09e3 100644 --- a/results/reaper/merges_tested/lookfirst/sardine.csv +++ b/results/reaper/merges_tested/lookfirst/sardine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,d8abcbba75a4c96f3cca249d3c06d9818030318c,8d256c63babee5c3117fe1535d39035d0eafc68b,243b88556f5fb3aa45cc5ea6d00e2dce6e61c862,,True,True,Tests_passed,60ed52e2b39693e5369478b5f540c0d9f31814727d200b4703625bc8225ebc80,True,2,7,15,2,True,Tests_passed,10dafbeb5a38be85664c5aa6fc08a7cb5699e7c0e78c896a83a5a265545ad133,True,2,True,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_failed,effb3a4b39cfa0d232b78403259ba14ceab13a7820652585ae920263367f6c59,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,fbaf6c6edddf5c5b6afdbe4631d53f259699635b1b0ff519ea4fe2181ead8f5a,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352,Tests_passed,e8dd20f8a9e1410297dbc1e61dd217ce75f77467deabde42aba3893424d93352 diff --git a/results/reaper/merges_tested/lukas-krecan/json2xml.csv b/results/reaper/merges_tested/lukas-krecan/json2xml.csv index 095173e42c..bf359fabbc 100644 --- a/results/reaper/merges_tested/lukas-krecan/json2xml.csv +++ b/results/reaper/merges_tested/lukas-krecan/json2xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,3716f42238f1a1f0754f1ec2755b4a88cbdecb4b,dbe1af5e3aa815d9ffb8a0154ae5da21703c102d,c0dd9688d2e602d50ef4183e6d7a55f71cada211,,True,True,True,11,19,254,3,True,11,Tests_passed,5802cfbdbe4e38451e00a5db2afd2d1291deaf773e1b6270b1c6fb6cf15ac9ba,True,Tests_passed,a031b8e7f38d59255e43ba27c63f546cea243ac055be580b7289b80988b06338,True,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_failed,2f35ea7dac667abd88db40dc058659210799ef2ad08dcc408bb4a4ed79730de9,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,bd428f4805b05322bc1cde30fb977e089bf3ba5c633904d929ef6d974fe5ddbf,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb,Tests_passed,7e01ab39e293cf3d8712c64c9674ee88686d1916bc1bb80a35972bcd2bfc5efb diff --git a/results/reaper/merges_tested/lukas-krecan/jsonunit.csv b/results/reaper/merges_tested/lukas-krecan/jsonunit.csv index bc02d86932..d214f32313 100644 --- a/results/reaper/merges_tested/lukas-krecan/jsonunit.csv +++ b/results/reaper/merges_tested/lukas-krecan/jsonunit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 290,refs/heads/master,e49e44cede0a6ebc598974399c875a8d6179cb8f,fba4c65341510764258fcf0e62dee75b7f66d40d,0468ee93be40af89ef37f0ca153d716b79909238,,True,False,True,4,30,152,2,True,4,Tests_passed,a9a0bca9648d80217a189e26cf1168c3d8e82e36bb298d09f2e354b22b87bae3,True,Tests_passed,36c12aaae6d16bcfd149b412c5923cc57ced3dee4cbe1bdf9f906b2559004b06,True,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_failed,251a34c218e470fa405103c46cc0718834d9440c80af0941610f66697ab5083d,Tests_passed,a9677fabee4623d75d52c62f3693f9bd6c21e75fd5bad5b37ae323c1863622fb,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_failed,251a34c218e470fa405103c46cc0718834d9440c80af0941610f66697ab5083d,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f,Tests_passed,5b8838cc78dcf8a06bf3bb1339aa5bab394a761a2ffb33222b382d5d0a9da15f 306,refs/heads/master,2c3532649a05e9f89a14b58e336bbd6b7b86f190,42145c76a7343cd4724845b07b1d52849e3687c2,b8cf441e94e53bcea4a0045455451734c501912d,,True,True,True,28,128,1138,2,True,28,Tests_passed,42029b9c73b4f4d972600650db8511ebe2516a2a542352f6e7597232719224c2,True,Tests_passed,182b73689dd0aec91c2c3b90b119534482f7e25480d18bbb601605ffb8b181c2,True,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_failed,ee5c526365da08d5dfcc005908f2fdc816d2f42e75ebfb500d8606d5fa0c5e6c,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_failed,ee5c526365da08d5dfcc005908f2fdc816d2f42e75ebfb500d8606d5fa0c5e6c,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f,Tests_passed,240817a7b0b3ed4b6998145ede2cca6ca6b8f97e3e4ef5f71bf37ae1bfdd540f 309,refs/heads/master,3cb3260c4b9d6f45b33057991ecbd07523fc67d0,fc0d9c8bb879475caaa3dd5c5cf6db56514abf4a,345ab00fa4ce50acb679175e78365ec739e5ef6d,,True,True,True,26,99,988,5,True,26,Tests_passed,f4cb13de8d02e4a69c2749cf7e824f91f6e208ba903c6a546cc25c380ac20fc5,True,Tests_passed,8b4c4bba4f6c9646e7c2257b14896f5e8fd69a4833f94cdb11b17a857ae0d5c5,True,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,c7c8c089e0a27826d472b749658af40f40c81b23c6da3522e956c0b52eb91826,Merge_failed,6928a05070a302db2d942b0aa2a9d94fd0849fa50c92b71ae0cfe7a1a06fed85,Merge_failed,0ff49861977a882e465e01828f1bc1d8543757d1017bbaab2f355b16f4903d5f,Tests_failed,caec439b43b070ed530bbfffb50fb25a329afdb3f6e591bc3d65dfb25c77f884,Merge_failed,6928a05070a302db2d942b0aa2a9d94fd0849fa50c92b71ae0cfe7a1a06fed85,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,ea916014c998d5a47caecb7b7af343c0eea4553d203be9dc7f4c3ec3b1a84adc,Merge_failed,0ff49861977a882e465e01828f1bc1d8543757d1017bbaab2f355b16f4903d5f,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650,Merge_failed,cfb2009e8e2a674ddb419c8475c9a9b8f04977072aabc152c63fb61bba703650 diff --git a/results/reaper/merges_tested/lukaszlenart/launch4j-maven-plugin.csv b/results/reaper/merges_tested/lukaszlenart/launch4j-maven-plugin.csv index 5f1ee0135b..ce585ddaf9 100644 --- a/results/reaper/merges_tested/lukaszlenart/launch4j-maven-plugin.csv +++ b/results/reaper/merges_tested/lukaszlenart/launch4j-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 48,refs/heads/master,a9c285647e87efe1b79f807945bddb313ec48dff,66147fee70536c1f3b85c8842345e6558a3e6013,9ddf13a742aac251f4ad6357ca06155db7e54d14,,True,True,True,5,24,94.0,3,True,5,Tests_passed,84ebe7b9d66b61849e42e9170a4108b55a340be9c488e34e70a2f0872f03f67a,True,Tests_passed,90e5a10938146e86bdd3f55e737668ff046d0bfacaa707156b1fdf9201d4daaa,True,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,fa5b2b2d06068b4cb2d9850398462739d9e729363b5867040647324491337d65,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,b59288077c422ff62c96b20bab1f3740fac327f17d48823ea1c172ee27fa7e94,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3,Tests_passed,498a77675c88518e5b848f6e77ff9bf721fd68fe2f41e2e6b91417936c29b2d3 diff --git a/results/reaper/merges_tested/lukegb/gitdescribe-maven-plugin.csv b/results/reaper/merges_tested/lukegb/gitdescribe-maven-plugin.csv index e2824b88c4..68a76835ad 100644 --- a/results/reaper/merges_tested/lukegb/gitdescribe-maven-plugin.csv +++ b/results/reaper/merges_tested/lukegb/gitdescribe-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ef23ebbbc45456d85db155436a821f99e9bc24f2,a63836f1ad674d2eb8fd26a90cf2fc3a81ee94fd,4c460bf43af27827b37e5565876bb1f29ac0aa33,,True,True,Tests_passed,795564bf1ffa064d1132a2b2a981c6d2c02b2c811c5bb9e1bdc5e723c9cf8b41,True,3,12,56,3,True,Tests_passed,e5351029b7ccbe392c3bd965d6a2d3b09bb66aa4ebd5c15b5b4c152717ae019a,True,3,True,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,2ccc21aff832b7069aa664fe7adea956cc447cf45a62468fdb06fa8ce025206c,Merge_failed,c793f414a32556b06b277ea3d0a6bad1d1308efd5ea10959e11f3e884a0b5ef6,Merge_failed,b6be4f1aa183af8a1b1950ad28474b2237525cf27aee4a3d3ffe28170c38874d,Merge_failed,f15eb58acd439d2efd6080c123508f2336d7f2fb9ff45d116adac677ea58a35a,Merge_failed,c793f414a32556b06b277ea3d0a6bad1d1308efd5ea10959e11f3e884a0b5ef6,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,08481e37e2780b0136394ffe97e6d55abca68a51d967ebec2866d7523aa602b0,Merge_failed,b6be4f1aa183af8a1b1950ad28474b2237525cf27aee4a3d3ffe28170c38874d,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a,Merge_failed,3d277b6c0320126f47b62beb3bef0c1745c23cf9633ad8536571d9ba79de411a 5,refs/heads/master,8537d4687a51ced12400731b2a25204cfaa349ab,e4f609de937186203eb1d108ac03d1c39f7b99da,77325e31358997b2687f8cdc8e2e2c5f56907315,,True,True,Tests_passed,f7f179000ead4f09c3205ceaf768a90bc0b37ebf229afbea63a1568ac476f0a9,True,4,21,144,2,True,Tests_passed,be2ac16673efd736957fc0a4881271162f1918837aa44e03c7d56348bc1ff04c,True,4,True,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,d46f38fcad435aea72f776ab4f1ba9a6ac7af29f8035dcab21fa75c489691f23,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,c7b9fc1e03c65f37aed369876617b7243275c214b3eef7c281bdd9c932bc1f39,Merge_failed,80c745d21dd5182752daa802a82aa3c1342af01546846b19ee4869acc9b41f94,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,00aa5eb71b5f177721b5823537c72e7fdbd808ab03880e2053023468db4e17f5,Tests_passed,6dafbc34635b03fdfae8153fe1f5313c54bf6f272f68438f1183c0a9a1c26258,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6,Merge_failed,3073bd4c74c159edb3f0f968211b1bbc148b169c95daad3f5d68f90ed2f745e6 diff --git a/results/reaper/merges_tested/lusito/gamedevweek.csv b/results/reaper/merges_tested/lusito/gamedevweek.csv index e8e7f1ee8f..996dae833f 100644 --- a/results/reaper/merges_tested/lusito/gamedevweek.csv +++ b/results/reaper/merges_tested/lusito/gamedevweek.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 292,refs/heads/master,0834d16ed9d41814192d2af84d06a4a4a760a591,c98f377e7274e797be2596f0381030b246da4850,aa0191a210f9f43017d8067738cb70dab793c9ee,,True,True,True,8,14,554.0,5,True,10,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,True,Tests_passed,061358c705fc2c544a8a4c740160f08e6fccefa510a4c4ae96bdac1ceebaedac,True,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,8cc743b6bf41a10473168aeaaf5922ea109dd4ff31680fc71230995ed7f9ee18,Merge_failed,c31d7275a668148836156935d65f20121ea31462cea1bd5d1c3f36d7e1f6666b,Tests_passed,615a9dc20be85474c20b294b01812c6027e4c6fa4129500d2c3abc221681dcb0,Tests_passed,6cf5d70100a03d57438a2ac9b6c4d07ec76ca36516f63d18b54b916ffd85463b,Merge_failed,c31d7275a668148836156935d65f20121ea31462cea1bd5d1c3f36d7e1f6666b,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,36f47176d4793f6befee916269e4bc10d07e0339a47bd203252324ed6cfbed52,Tests_passed,615a9dc20be85474c20b294b01812c6027e4c6fa4129500d2c3abc221681dcb0,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Tests_passed,719a92e4668daaf1d83bdb1d81aa01442415f6016b7e8340fb74d461cd1d043e,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f,Merge_failed,38f5676ce78d5fb950039d19396160f19670151ede95ded859d51be9568a741f 319,refs/heads/master,d194efef95938a45962bf38ca75ddf7dcb178936,3bcb77d359c736451d3207f740399295e54ac455,574dd6ce91294fd578ce46e029a4f15d7377a81b,,True,True,True,15,14,1356.0,217,True,227,Tests_passed,5ad15fdeabc0f3805769bbb58f940b596a6a67e3490d908b2391d4606c47d234,True,Tests_passed,455f92e935a416b040a2c0587b87b038317e335b430eba11f97f2b610d7e971c,True,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,63b12371165d6421e19a7e4f4fb2cf3b80185897d2d9d73f2f9106c44fdbfac9,Merge_failed,5abd4d005c54f8c88e7caa8f5489123881eb15a90936828859b3a908e41e6a46,Merge_failed,a1a847f107b90564a24264a2010988411582c49fb9c06815edb119101e742bfd,Merge_timedout,,Merge_failed,5abd4d005c54f8c88e7caa8f5489123881eb15a90936828859b3a908e41e6a46,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79852f6c4d99bc24f5020012f8bd3ddb6b86ee1bf2db8cc1cc0877595e9499d7,Merge_failed,bba1123a81e7e2a089b705c7a3b1d49f4a80adae27cba480edc1c598af802857,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,119b4a107ceb446dc50f20318de4dcc6159d19ae8312562fec2198b8f6d83ebf,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f,Merge_failed,79b969b05a2cc7a889ad880f85bd7b328c33c29edd90a260c4eab118c7dc449f 455,refs/heads/master,23c03d5bcac19f2414bc9f7fef55b8ebbddbf467,a42a2c5f2fe254944eb28b3fe044c487ff50cc1f,a4502b085f3d52a544312223e3b6fd25a873b8a2,,True,True,True,33,32,2272.0,2,True,33,Tests_passed,578d1e98144350dcdc2d400eeb77c5a50443f6e51b6b44a3fa1c440248d79ee6,True,Tests_passed,de054c89773e1e3aa9b0cc6683e035b46f6bc12beedf35482c6c89c040ba2049,True,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,70eb77a3a24b370532bb9d33a0d782e9eb87deb3bb0cf6455c98bb8146131669,Merge_failed,d09eb85ab8954aab601e539f1fde386150aaa2a3ae360c90313bdcbe7b8c64f5,Tests_passed,be83377dcbc79038047dca1eee48929d593ea21ee2ae170259c60b9048f3ec54,Tests_passed,b68f701811e09f2bce4c3e460408369c6633aa501e1a47253d3bd0fad0cec7fb,Merge_failed,d09eb85ab8954aab601e539f1fde386150aaa2a3ae360c90313bdcbe7b8c64f5,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,3f2c262bd77bec76f29c445a6d4462167b28948971bea2aa7d8ffe16a36e141c,Tests_passed,be83377dcbc79038047dca1eee48929d593ea21ee2ae170259c60b9048f3ec54,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,db1e3235dfe5783731a8ecb73545e466e76310963c245f95472b19027929fef7,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a,Merge_failed,61165c661db2122ebbb57aed4f9c7d1e004c3ad1456d90e03c79df7048e6317a diff --git a/results/reaper/merges_tested/lwhite1/tablesaw.csv b/results/reaper/merges_tested/lwhite1/tablesaw.csv index acbe99b69e..13c8ef7a7d 100644 --- a/results/reaper/merges_tested/lwhite1/tablesaw.csv +++ b/results/reaper/merges_tested/lwhite1/tablesaw.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,7fc754b5f625d3078e0bd8b165686f94da41c781623cdd925c22fe66901b791a,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246 3,refs/heads/master,064b075c3a675302f3d372d0ce308a12dcca0ba4,a13a334c97c01a7284a80f171615f159d03b7975,2a7efb82d77980077ded7cee995c9c051fb1545e,,True,True,Tests_passed,8e253e7f54906664c5588ed04337ab0ebc000e46d65ad0c4260c8b5793b5459f,True,49,105,1735.0,7,True,Tests_passed,d9750fcfd6013df5ece52ac889dc4e82e0000e94661b33a5001b1fa9aee44e49,True,49,True,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_failed,a6641ae2f6190b5e571da73c4da12d540565a6b91954f68fc5696fe0aa8802a9,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4 8,refs/heads/master,13178c81a1ba18fc39b7280dc40919f4208650fa,25d12ee6c6f5bb70501541813caffa5265c0b9c8,92d27fbeb840ea070dfc5064ab3a67f223c56441,,True,True,Tests_passed,3af57b5a02ba264d51a67d6dc4c1a362302ed8f09cb98a0dcd08abceebeecd7a,True,24,84,245.0,2,True,Tests_passed,26fc25b1b168263e7dc12b303fdc31708348e8feab58e387de85d5a18a5fa6c4,True,24,True,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a diff --git a/results/reaper/merges_tested/lyncode/xoai.csv b/results/reaper/merges_tested/lyncode/xoai.csv index 75fd737400..64e2a6c107 100644 --- a/results/reaper/merges_tested/lyncode/xoai.csv +++ b/results/reaper/merges_tested/lyncode/xoai.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/3.x,5679c2e9385c07c78a5b50d34c0ddab31a0e1745,37472820e6a9725ac72f2c0df6fd161f16729f8a,2c79b4b8d3f8975b7a222d0205c681425cda22ad,,True,True,True,39,102,801,3,True,39,Tests_passed,5bb6e28c6bc1669d13a397a4a88a9f68b2fee28ca6264c70503d926199e77f6f,True,Tests_passed,d398acea29e7643af903b975a94bcfc3af663d939072ac52b0945b61d02bc56e,True,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37,Tests_passed,9626bcd94585b8bf2f0acf406ccb843500d5e8cf0c517369566bc15c10c7ef37 18,refs/heads/3.x,fe6c4bc520749bad20a6d65db9949a933e5fa34e,30623f08db90a8dd561d58574fda5ca383fd8a15,a2b135df622b83ade5f22349361c47b9827f50c1,,True,True,True,224,872,13121,3,True,224,Tests_passed,e272fd5136c780c7184a3fcb847ad313467a378e4f1c8c979cc253764133c2d8,True,Tests_passed,cae5c04e8fb4650d2852d9ff5d189f74e4d6b850fb1a33948b400a1b6860cc0d,True,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,2ba74ff41d01506667ae6595fcc28be8edf7fc7940977886e6f26d36f82aa804,Merge_failed,9ef58a0ce5fe6ebd39f6bea8fe0771649489db4f4d70e7d9d40bb4aa7b524418,Merge_failed,eab5e2af794c684cf72b2baefe87243bbc581d1de9320a2a4df1ea0e1d50c0d7,Merge_failed,eab5e2af794c684cf72b2baefe87243bbc581d1de9320a2a4df1ea0e1d50c0d7,Merge_failed,9ef58a0ce5fe6ebd39f6bea8fe0771649489db4f4d70e7d9d40bb4aa7b524418,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,574315fc862b2381f2c41c89a42a06a10f044b0667a401bb6df7bf4dc4865f04,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,9b830eeed2d754bcc1827514dae504fef927fffb5eb8a9f4373cce3c62214235,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5,Merge_failed,fce8cf054285588087813e42cad83b80adbe4fe3a243776f3a73fe973bbeacd5 23,refs/remotes/origin/main,0c5204ce00e306bfc23f644626853a2dc4e74373,dc7a68da97d4750ea248d5895d60b434bec82bcd,739c491e4b4c14ad2698d0ee1185b828a3c710fc,,True,True,True,24,86,369,2,True,24,Tests_passed,d8f1e8a795fa92846c234dfc4d0c10a42313f9881b2d76f1d12f0d497901917f,True,Tests_passed,f87b749bb440b967d6ffde2c60bf9793c1836881a77a9d99f3db3d9abd87ce6f,True,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d,Tests_passed,d86fd6776fcef9b44604e29814389fbbd19a654cc69d9cd7732af03467b8447d diff --git a/results/reaper/merges_tested/lyogavin/pistachio.csv b/results/reaper/merges_tested/lyogavin/pistachio.csv index 1defaabb25..c6fb2fbca4 100644 --- a/results/reaper/merges_tested/lyogavin/pistachio.csv +++ b/results/reaper/merges_tested/lyogavin/pistachio.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ff601b3619a0dbfb8867aba4b4c27227bef5bbf9,f4e73ff847ae74d7b17e0968adf729b348fce8e7,a5d70922b6c8a43679c3212b3d77ceaccb96a919,,True,True,Tests_passed,5ae694e25384883aaf6d256385e99ee2082d2a0e1698a921d2e48199fa45e110,True,7,29,200,2,True,Tests_passed,dc468c3da8474229fb8662de79441d1437e60bfe1eb6b8aa57908f3d54eb7d68,True,7,True,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,b115035e02f032c11fd5fc63bd5e5fd0f179f6ff24156f98515f6499b1e8a2e8,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859,Tests_passed,a5a31e96a84f440760d52b2148a582aa835409b5de4b3a2d339cfdcaa1c7a859 diff --git a/results/reaper/merges_tested/maciejwalkowiak/java-plist-serializer.csv b/results/reaper/merges_tested/maciejwalkowiak/java-plist-serializer.csv index c9913078e1..a8eb11453b 100644 --- a/results/reaper/merges_tested/maciejwalkowiak/java-plist-serializer.csv +++ b/results/reaper/merges_tested/maciejwalkowiak/java-plist-serializer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,333c0d3cd9cca7b7361c77e6d7cd6f274d3f19a3,fbfede3054cf04fc2c68df1c62bdab45d7139a35,29577ff717de7ddd32a8b667cdd9631d82bdf0f3,,True,True,True,8,17,89,2,True,10,Tests_passed,1220db2ce7dc885dce822850a05ddac790457ae1430ad6ebda964631a889145b,True,Tests_passed,9a970b129d3266cf25c0b67681d0e5b188b40e4701ac7f461047e7470587ee15,True,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,f0af379c54456d89cbcf1d5e44f545ddc905761a9a5a0b58525353c484d6302e,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,90a5ec1048759e6537807a01fe4793b678c1a56b7348e1d82f96f34fec7ac575,Merge_failed,b36d2e55719acfa81e53ca632c713049afbbcf3e77527e147a97ead5761d821e,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,da712a63044eda832c8ab1240f86f193d5431e8428c90da994a57b6b2bf32b62,Tests_passed,c149927ee72bdda81485209c2586cff6cfa66996ebd5f86ce1dbcb572d296491,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,cccaf6fcedac52ed7f345f20a1bd3bbbdbe303fbfeeb7aaacbaa1b500909d1e0,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7,Merge_failed,9d645013260dad547fe22efcb3045b54bfbfe1338ea574f067d799d951001cf7 diff --git a/results/reaper/merges_tested/maciejzaleski/jmeter-websocketsampler.csv b/results/reaper/merges_tested/maciejzaleski/jmeter-websocketsampler.csv index 57489c6ed7..23bf45b514 100644 --- a/results/reaper/merges_tested/maciejzaleski/jmeter-websocketsampler.csv +++ b/results/reaper/merges_tested/maciejzaleski/jmeter-websocketsampler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,bb5c4358ae5fc9c767cc7fe32e99969126f1e5df,928fbabd7c7292ea41610b9df0b96bb56eff82a6,5039fb9c869e1e2eb7aee718d786ab54763e44bd,,True,True,Tests_passed,5d078a1abb2dc38b5eac03cd51e092eb0f497b7364c198e22f8ff0eef4c1a703,True,6,40,179,3,True,Tests_passed,e159b749eb7574aee691b271ab55ff23196d4677dc2beeaf6f7da32eb649bb89,True,6,True,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_failed,e242ecd152695d791b1abaaf59271d973e89c12e095616a6f757e0d6f680acdd,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,5def75c09c9f37fb31813c494a3f31ae07e75ca810bc82a70912523b07fb4461,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,0374c51ccc3b22e0ffd5f9145500f6621ca1b5738f3ecd5089966620c0d02729,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0,Tests_passed,2e49eddfd66b5ac7b0a06d4c4c38f6fab114ceb9a95c9d29139554b00c6a2cb0 diff --git a/results/reaper/merges_tested/magro/kryo-serializers.csv b/results/reaper/merges_tested/magro/kryo-serializers.csv index 2697508c79..6ba40ab060 100644 --- a/results/reaper/merges_tested/magro/kryo-serializers.csv +++ b/results/reaper/merges_tested/magro/kryo-serializers.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,a2d16aa4330cc067402178119dfb967842efc17a,c29d105ef21670d59450c0709d3f8e190dc4c5c8,eeb8393425b557c013719052fad3b842db850835,,True,True,True,5,29,199,2,True,5,Tests_passed,c1bd50dced53135fb544c76a2bfd574a7137495513da023867db3a1afc3c9a5b,True,Tests_passed,72034e238a12007f7d4e8e32a2140d41345f3f5322c1409491980d255f4523ec,True,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,41dbf1f7e7a5a7b679a81cff4f9045a1bac99538adfd5db808c957aa3691394c,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5,Tests_passed,01ec92f0418406b96a625da70e89f61ba09e22c2b0649632e884bd8f3c1218d5 diff --git a/results/reaper/merges_tested/mahoney/slf4j-test.csv b/results/reaper/merges_tested/mahoney/slf4j-test.csv index 142896da8c..c2a8f802e9 100644 --- a/results/reaper/merges_tested/mahoney/slf4j-test.csv +++ b/results/reaper/merges_tested/mahoney/slf4j-test.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/1.0-RELEASE-jdk1.6,896b4a6a0d490aae9515e449244d1012bfb3d87b,f2858da07e04c8bbcad4183c7e003c192ce9f625,29d7e6d843162d4c522e532cfd6b9cc68906d17c,,True,True,True,15,54,140,6,True,15,Tests_passed,77681d7b3da4e5404bfded7729664f2e6d32174b3a8d49edb5deaa76c5bc8bc0,True,Tests_passed,e4f1320f6625ac0e6284253164dd55970eb397b857b1cc6ad9c616e558d30f95,True,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,a7c39fe3968efb7db6a971303cccae58e940d785f4b055781c545638908473ca,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,697eb084212e80dddcbb61dddeb2e8423f3a044bfe4ed01d22ca993a0d448d30,Merge_failed,99eb509fe3f066a575cef7183da71aa2aec19728483b8ab0ed75e735c20592ec,Merge_failed,42b1a4e5c517fce39df9924139b39a5b5a03faf5bc41d915c1e37bc3042966af,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,586aef7b6d92c4e143c01f7992384aca4b3f3016464451211d4746b12cbacee5,Merge_failed,fe4c5a226dbd7f904cf1260d6e8f27b2677d379d34d947bd5c6215959b785e8b,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590,Merge_failed,6efbecaf6298293e90cddb6bd0dbe718fb87e2909939ac6ad7e17763237bd590 diff --git a/results/reaper/merges_tested/mambu-gmbh/mambu-apis-java.csv b/results/reaper/merges_tested/mambu-gmbh/mambu-apis-java.csv index 786e110b09..e1b21e5d7c 100644 --- a/results/reaper/merges_tested/mambu-gmbh/mambu-apis-java.csv +++ b/results/reaper/merges_tested/mambu-gmbh/mambu-apis-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/heads/master,1da0e26ad55b2f4a1738ef3e7f57ac5ca6ca0ae7,a14a20e30055f71086d497513af21f5f5d6f6f2d,c6afe3ed0a26ebb6bab9a5ccd81a9990902c894e,,True,True,True,9,61,240.0,2,True,9,Tests_passed,a4edd5760c2b7ead9d4c555095d228c14e51c5ca2c6893690bd98a29ff9bba27,True,Tests_passed,4b8e90f869382c8db30e32d7a928d36d6d8c29c46607f723f951d7ba1688448b,True,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,da4ef095da5cb6a90fb300009d8e80593fabfc75182cfaac04691cb31df34149,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Tests_failed,e0b0f548d1f3094dff7b9ee253a94b42bc9f38915a649a0fe19dcf2aed11b955,Merge_failed,5ee18a0e090c45a7960adee71bfad94bb29f5ac1df32fd6b506a9a00f3404d86,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,b1dc1b14da9f47f0c9509d31d7069243dbb049bfb2ee207bf5ce170915f63ce6,Tests_passed,772a932609df72bced2adb5d5e8baaf1a7276e1883350cb3bb82ed817addae94,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,e7afa9f21ba1eac2b572b538cfb61ab0cadf10bd886b94be487b2f0d58ae20bb,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565,Merge_failed,4b63d4c6feae41b9f54c6f5fafb3183de921d561779db16bce67a6281fabf565 105,refs/heads/master,0cfcfe0d8535a7f495a58fc48fe19f492eb7a7cb,28dcfe6023219dfd4fd94ee084a4cfeee32fd35e,935dccd8ae3196c8f7317c80b179ec9ced167b5d,,True,True,True,19,62,548.0,4,True,20,Tests_passed,0bdff3c5e4e2580ab3ede53932f25d4768cb27365fc4b0012d64ba4a57f74a65,True,Tests_passed,40118ef007e9e4e1fb9d30a4275f2fda60d99577b3ccb67321b830a9ee9feeaf,True,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,4a7bf505bf76b197a587d14d4c05379fc059f6d0bf59409852b6879cab709b0d,Merge_failed,6f2f576500fce3f40bab8a91763b60902ea8cfd15baee543d95486956ff3ba1a,Merge_failed,66766bb7617d7d59f3aaa8bd208645db8446d5e65703ff0866ed6e6963d3227b,Merge_failed,5808044260bab65e6b60d69720b6f15fce2ff51be013de0806ad88dae367a098,Merge_failed,6f2f576500fce3f40bab8a91763b60902ea8cfd15baee543d95486956ff3ba1a,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d96d2a1e758921932684e988d6f8209305e31f6dd8934a90ab601ffb41e43a02,Merge_failed,4962e5dae2cba343d358fd8f9ebcf32678864096d44a98c252888db35b45365c,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1,Merge_failed,d5ce1b22e1e7e3cbf8b78cb29d9843fb29b35c63df02e3d4759fd9f5fa3a81b1 119,refs/heads/master,211bf655430157a7afaf515b303177353fc3402b,5a5efdc4eb08181c053cb2d648cb7345f9e55b99,9975c4d9e53ea71de245915eb7fee631e521000a,,True,False,True,4,14,24.0,6,True,6,Tests_passed,f1866ac74d3d584ac07ba1aea90debb9453bd79d2b966cdc5b7007c60eb8d47d,True,Tests_passed,4a9254ff978d3091ec022da655f3b29b8dd9ce34408e44dc9bc5fa35d13e83d6,True,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,e1e4f9421867b394bc35193eec2260791129339e5121c1052adb45ea5b7f26e7,Merge_failed,c29088df1e507bc5a876af33566e32a1d7c3cd3cab4162c3a4fe3801874778e0,Merge_failed,0d70313ed7a17724fc0e9edf3585b67ba400ad5cc1bee1c941a3e07d84641f32,Merge_failed,651cf3c37fb78cc6f5f778c5911b91523fa09c2ff406f84dc7a60337de2074a3,Merge_failed,c29088df1e507bc5a876af33566e32a1d7c3cd3cab4162c3a4fe3801874778e0,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,8c6eee0ef0c4e3a88cee60da0ccdbe34c5ddcb01218e55be07c4c9f1b0e87e90,Merge_failed,0d70313ed7a17724fc0e9edf3585b67ba400ad5cc1bee1c941a3e07d84641f32,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d,Merge_failed,c6490f289ecfea6ce301e800cd18edb824aae14c661ace186c220f2396cb358d diff --git a/results/reaper/merges_tested/mangstadt/ez-vcard.csv b/results/reaper/merges_tested/mangstadt/ez-vcard.csv index 49d980320c..95ddec9765 100644 --- a/results/reaper/merges_tested/mangstadt/ez-vcard.csv +++ b/results/reaper/merges_tested/mangstadt/ez-vcard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,True,True,True,342,2526,16131,10,True,342,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,True,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,35753c04e2f61a849e386fbd4572bb82a26a3f151f3c20ca1be138e938ac502d,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0 diff --git a/results/reaper/merges_tested/maoo/maven-tiles.csv b/results/reaper/merges_tested/maoo/maven-tiles.csv index 75c0bf8ddf..c63879ed87 100644 --- a/results/reaper/merges_tested/maoo/maven-tiles.csv +++ b/results/reaper/merges_tested/maoo/maven-tiles.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,515cbbb77720e2ad118b4ab9017a3e99e8fcb885,01ee12244e800c1980b5811f1abdabc19496c256,680ba8647d6b9c9a604064543b5d3aeff2bcabda,,True,True,True,27,48,1000,2,True,27,Tests_passed,f4f39390b1c4f6a4bf7c7e30bcae46481f75f7e0b1232f6212edfb64fefd60a7,True,Tests_passed,2d4c0f3a7a5f305a980070e31838f46fb1e0f2d33b32a7fe20506071d217407d,True,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,98b7d9572b0acc843d8b4624768ad69b6fa25a6c0ccaa7e803952f8af6077887,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4,Tests_passed,f1bfd82859203b699e7fbe201602cabf303957238712a2fa1b4b5e091d5c65f4 diff --git a/results/reaper/merges_tested/marginallyclever/makelangelo.csv b/results/reaper/merges_tested/marginallyclever/makelangelo.csv index 51711b8d2e..760fa16121 100644 --- a/results/reaper/merges_tested/marginallyclever/makelangelo.csv +++ b/results/reaper/merges_tested/marginallyclever/makelangelo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,f96ea74ffaf63c820dae4ed5e33941dfd9230a7c,8c91c249baee9d3a72e876c42f3dc387953e9bff,f8be12ef2f4810fbebac0340bd28cf2443980e6b,,True,True,True,51.0,270,2034.0,4,True,52,Tests_passed,fe6f454312255f2c40449c6c91317b1d27d621779beb3f250545457e00e3b85f,True,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,True,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,d219c0315a713ec6178cda2b7e6e0a5dabd9aef83234afadb299b8b8ddcc311e,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Merge_failed,29a4f41f1f43956af938fa633c81810364bba9bb5abefd51a5111371b4e43700,Tests_passed,c16c51c4e8f866d3e16bd5f384a14a6c5f342bed2425eb14066a34498bfdcd09,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,00e0c7897ac8d2811a214705f791c1d58ca76b527532302274eab29511f25d45,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,2aa99ac82ce1ac3f466f30bbd563e08106a9fb994f7fd44eafa1e0b05ba6767b,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3,Merge_failed,30fc0c3a7765675c274659f80adf9862c7b95c1d29c2641d1e0dde21280191b3 7,refs/heads/master,3a475307e2c539d696adb258b4cbc01e7cdd1d81,d2fd172a4cc635e891b597b639ae60525050a900,cfb67a76cbf1f9e647b4ba67100f522a89ac8feb,,True,False,True,3.0,5,89.0,7,True,7,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,True,Tests_passed,cdb2cf39860eab26ad76fefcdd772a1056f07c3df9fcaeaa38c2b9c38504b5b5,True,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,cc9fe32a8eacbf772d838f3bc5ca27b7e4fa0bcec2b82cd52c0ae35c3e85a4ee,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,3fbb434e192cce25c2673dcc9abd5537d2cbe20f4770a3738db8243f596b79f2,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,0c92e0f9bfc0af7dee2bb65f87802c5c3e86647c9aa0eddb21f33453e02bf751,Merge_failed,e0a2fe4ca3e6496d613316c65c88fe09057e3e176a106cf5cc0b996b2459dfc9,Merge_failed,dd04e02645fe9e0eacf91d37e477a86b6b3b97f09b351c89e4b70fbb9f1e56a8,Merge_failed,dd04e02645fe9e0eacf91d37e477a86b6b3b97f09b351c89e4b70fbb9f1e56a8,Merge_failed,e0a2fe4ca3e6496d613316c65c88fe09057e3e176a106cf5cc0b996b2459dfc9,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,3fbb434e192cce25c2673dcc9abd5537d2cbe20f4770a3738db8243f596b79f2,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,dbeba9cd449725ce8f77352a49c084544bac3f03ccf97bf0584e8b95648dac57,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,3082dbe284aebb5ac2c85cf983267a160da56d6cd72e1ee9201aebc938c0d736,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,cc9fe32a8eacbf772d838f3bc5ca27b7e4fa0bcec2b82cd52c0ae35c3e85a4ee,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865,Merge_failed,44b99e23429807b95b56afbd5fde4705b32e570cd61d7be10941c6e98378d865 8,refs/heads/master,d2fd172a4cc635e891b597b639ae60525050a900,28443125abf6ee10f7e33f7dbb94b938935dbf57,b1f68f5ad8dbb8fa7eb82bf231b7c127bb114c90,,True,True,True,7.0,17,58.0,14,True,19,Tests_passed,3b9b6be4cdc51703aa4d88c94c069f6a43b5f4ff1f16afe8c25c7ada5bc6c478,True,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,True,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991,Tests_passed,3bc7b166e936a8afe511bef3ae1f396ca69f71e67ab6fdc27da6bcdfd6987991 diff --git a/results/reaper/merges_tested/marloncarvalho/aliendroid-activerecord.csv b/results/reaper/merges_tested/marloncarvalho/aliendroid-activerecord.csv index 0d84d9008a..ca8b858919 100644 --- a/results/reaper/merges_tested/marloncarvalho/aliendroid-activerecord.csv +++ b/results/reaper/merges_tested/marloncarvalho/aliendroid-activerecord.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f03a2f645f41c63ce485586bed36884f105a1f1f,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,a8abd360e64f2d6f967d060c7a2304fef7fdc5d5,,True,False,True,2,13,69.0,2,True,2,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,True,Tests_passed,fb6472451d5fc52d7f0b0b2c2ac69e0fd7223c5d07299662d06aaacceb478334,True,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,a1b6722416e349cc717ef142dccf0c35e7a1196b43bba138043f7f1f60d465ca,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,a1b6722416e349cc717ef142dccf0c35e7a1196b43bba138043f7f1f60d465ca,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d,Tests_passed,10eeeb90325594c1f3d7d0ab6bd4d20065c0b660ea0737c7360073e6396e089d 4,refs/heads/master,e1a3624d06c1979b6fcf2d4f059c0a0e563451e1,66fd6488824b7aa0f15b7172466d4f9f465db644,13915de94d70a4d8e53cba4c0056c5b4af2cdfde,,True,False,True,3,20,55.0,2,True,3,Tests_passed,d714b13ae10bb963007331bf6b5e6c553b23d5a883702289c777437cb4bcdbd1,True,Tests_passed,4c40dc2ebac3ed9ef5cdd75797c83c666a75c998b4597e3ef6892bced615acc0,True,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_failed,5f5699f5e99a94fb6d0618adbc252e8dedb8fff836b21955dedf4684e4389d7f,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,5059c527548e3ee65d29bc3b2a9fc6eb50a37f4bf690f6731aaeaef22bd7d783,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4,Tests_passed,24aab591adc026aa0aea1eb0fd614c36a4be006c691fb9b95ff40825214df3d4 diff --git a/results/reaper/merges_tested/marschall/memoryfilesystem.csv b/results/reaper/merges_tested/marschall/memoryfilesystem.csv index 886881732d..6b3e59b517 100644 --- a/results/reaper/merges_tested/marschall/memoryfilesystem.csv +++ b/results/reaper/merges_tested/marschall/memoryfilesystem.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,fda60ab1b9a42f2e4ab6249852b3d2f0a40c9b56,f63459184f11f1681a38d7f0dccc30426ded34ae,0f2c367a1172610941024e8fcc319242db890219,,True,True,True,8,15,363,3,True,8,Tests_passed,96271c10f4d01634504f284e3581f37a0917ed3cb463d6d9113db50c18b4490a,True,Tests_passed,470dabe5eb8b75e6601bc8d346ad3ccd4bd539c44059938f18837837ba0a19e0,True,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_failed,72dec9b6f0d3e184419295013d8c7a6cbf9108abe22d638bf869da682d574a41,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,6ebe213d50040057952bd39ec80499a9350c70f9aefbfcd0e0e542262d425ca0,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1,Tests_passed,dd1eff317f2188412c4bd0a8849645fa9abfc331bf04800c97a222b2ba39b5d1 diff --git a/results/reaper/merges_tested/martinpaljak/globalplatformpro.csv b/results/reaper/merges_tested/martinpaljak/globalplatformpro.csv index 4249392b1e..681aa7e91e 100644 --- a/results/reaper/merges_tested/martinpaljak/globalplatformpro.csv +++ b/results/reaper/merges_tested/martinpaljak/globalplatformpro.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/pull/161,0ec29e20e8acc5897fbaf108ef01b1096609bef4,0a2254613a08297950caa29b6e39b04b3cafcdc6,1551b306a495b28fa1fd6c6fee78bdb646589f29,,True,True,True,2,5,38,2,True,2,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,True,Tests_passed,61dd10bfbb0fd84c635d0e04821f73fc861b1360f1192b3cba7b0836c463cad9,True,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,3a7d873fa5590cf67a445da3a18c4ea2428fb420c6855dca5f40a032e9162de9,Tests_failed,16f634849b8a2ad776e5ebf7073699fbc72541f1ede3fdfa253a3493c6247445,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,3a7d873fa5590cf67a445da3a18c4ea2428fb420c6855dca5f40a032e9162de9,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69,Tests_passed,d6db3e12dc7ebbb48193b0989cfa9d52f92b5e06e6ce9b8f236855a523875d69 16,refs/remotes/origin/pull/264,6a5d74685625e3deb07447a3b4bf29d01ef17d6f,678b25980013b7708e9ccf155939016ee027c00e,a0096642ac72a49d487e9a4b69169d95b2b0c87b,,True,True,True,21,90,390,3,True,21,Tests_passed,02ce8c12a7b4e2a5efc2cca4994a8d81e04fe6785fab859a47b5364638ebc046,True,Tests_passed,f68f35521db577d4ab64fe41097904360b45d4feb76b687d179521b01060fd5c,True,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,11c2dd09feb0e4df6e22e74a3da9c36598ef1842cdcf8667218c50ac5d200faf,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Tests_failed,790e32dce17baa1c71a568689ccd34a20ecb938f7c2b4cabcf17171d7a235ebe,Merge_failed,6b9fd5790f7ac8efe8bbbfad3400a2a501e454d797748f3f5251c0a722a613d1,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,d1922fe5a9d0f3477d89426ae9bd0860c2408588561687716f1fe4a00250e058,Merge_failed,52d02106809f89e2f7a697ee82207fe89133ab7570b8f55ba45671737d2df840,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016,Merge_failed,3a628026de8ae8af97d00649a0aa360f193280b0b184063fb3afb838369fa016 diff --git a/results/reaper/merges_tested/martylamb/nailgun.csv b/results/reaper/merges_tested/martylamb/nailgun.csv index ea1620674e..0ad882b635 100644 --- a/results/reaper/merges_tested/martylamb/nailgun.csv +++ b/results/reaper/merges_tested/martylamb/nailgun.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/main,b2c42be05bc20c96048c7cd10ad855750c2b6c51,c5eed04dc3918ce8961c8019572cae8e1936ca2b,ab6fba00de2031b7fa04a076fa809a1995ffa9a4,,True,True,True,13,65,400,2,True,13,Tests_passed,663984baf2db1b5b190c19320055f503fb3c78381a68a65f4e38b5c0826bd669,True,Tests_passed,79abf90df641ed9a3ccce98f3683c6501d2d05aae1c13fd0e66be1c10be47524,True,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,d3fefdf04b81894fc5a912cb4bb32010b4e93de474d6b2ff689139f3761c9264,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,d3fefdf04b81894fc5a912cb4bb32010b4e93de474d6b2ff689139f3761c9264,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54,Tests_passed,80d8a536662e6f17a43e1cba24c325a9f210c64a778098190caa5a5c2f30be54 60,refs/heads/main,7f1e1bc712bec6ad375f7d0e6cdc46323126b448,6f39efa91e60c1e0aa9ae11477c27e3b5f90c5a0,e20aaa3618f88209f1c343233c0fcf5c15ecef70,,True,False,True,3,17,202,2,True,3,Tests_passed,14ca52e6a17a9dc27808e6ad7f46e234a43897759abae64b71a546e10f74d67f,True,Tests_passed,40a35cfa263bfbf52b96fe83ad80c91531b344aa526dd13c41ada070cfb3c8ba,True,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,a87e3c24dd2ee949dbafbf7ae79fe0d81a495bef068ded21fefa97096ed8ce4b,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,8016792ac5f29d5fb1a6c57afb8515746a38fac1c14990929f886272d80d17bc,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a,Tests_passed,d1cd88b36efd2a033783c770b25f39b96f9f708faaff7b5d6171c6776289a42a 81,refs/remotes/origin/pull/49,543039be31b291caf41b11356f906971753f74ac,5e76e0f83375eeb8b169a2ac9b5493f2ce35188c,dc7e6c9649499196493b0d4780783b77ff459441,,True,False,True,5,29,279,2,True,5,Tests_passed,2929661a850739160f59956d39d348279d855342a785a686177e1e005dee0d26,True,Tests_passed,cbec3b8509b1db5a56871e1006797f12a0c8f70be8e9a622a989d8bcd1b5bde6,True,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,99c53f994f643da2a53815e5ecae2be23eef9030b872619420c1ca28e22d7502,Merge_failed,128c649ea1b25d265f448c6867e7400c5968a70dba0ae420bfb9cc847c83c32b,Merge_failed,8d69182610137c55a67aa79693b9882d800801373be9bcff777d58e2e7b95f9e,Merge_failed,6cfb273014cdf651081a47d0ba465c17f83a85b74f14bd1df5d3b6e00830c9ea,Merge_failed,128c649ea1b25d265f448c6867e7400c5968a70dba0ae420bfb9cc847c83c32b,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,cbcd2797062bfc9a1832a2238f1101e6b72ab0f5ce1f71483a343c68617b34a1,Merge_failed,8d69182610137c55a67aa79693b9882d800801373be9bcff777d58e2e7b95f9e,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,39745061c881ee845b5d1a17e2934e188bc8173026f60101f3c66ec6d205ceba,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb,Merge_failed,d224d5a86b5a979d303e1955a3953ba3a827da8a88dfe9d9afbbe2ac3b330dcb diff --git a/results/reaper/merges_tested/mashape/unirest-java.csv b/results/reaper/merges_tested/mashape/unirest-java.csv index c950a0bfcc..0db466d69b 100644 --- a/results/reaper/merges_tested/mashape/unirest-java.csv +++ b/results/reaper/merges_tested/mashape/unirest-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,dd532cf17f17fba254562c029848558c8c04b79c,a68309c79589e8d1ffd2694f55a412c6ea670306,b8ab11e459e8ea2594905b9139223f09ff27c2ec,,True,True,True,310,981,13465.0,84,True,385,Tests_passed,de12c2b1920e73f1875ae860f81b2386b37652b57aea2b905fb7b2424127e042,True,Tests_passed,31095d7ee5b0003a9018cb2758f2b25a0f7425af605dde8fe9d4b108a831c970,True,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,60f49a051737a6160cbf1f4e743ecf85b34dbb45e464d6d3cfb43ddd1b4ff5da,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,67c8113bdbf91986e4ed1e5f16069c6fbf2773d65a72909ed6c6c177d93ec790,Merge_failed,ea6cb2b8eb34a89252286c82924d3c1206373dceedd1dd910a24851d2b11df85,Merge_failed,e5c75021a4b7d1b2fc9e2707c1afe849671c54a2591c05d484293c04f4de1c0c,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,ca70d3b643b91f3851ade4527c742dfaff2312287a617a316b8e7ab9d6a9af3d,Merge_failed,2ebcabb7d46bc6e71537ee98a9c5e98b9d80e307c2e36f7f98407718a71be18a,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,1b74c76d42a3add7b2c7553d378a538e9baf433871bc6022f6882f04dcc09e27,Merge_failed,8fb3ae1fb7be3839f8036f444c933cd111a1d77249e6627fd6125b6eb71de546,Merge_failed,1ab6c833d382dabb90903cfe5ba31f0811154eadbfd014e638367e28248e5535,Merge_failed,a72330762fd3fccb03f946af5e187e32cb92aece6801c9e31242dbe43c0538f3,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,5e634c65217d7c5d4cffc6b6343bc0431b7d3226255a5a411645ab86651a2394,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db,Merge_failed,e4cc33df4aa72f6ee83d2eb96dfd077638885d9b1a17620ecebf8ad2e22a47db 61,refs/heads/main,be953b5e242762aa1dbf4f7f4b9380b551334999,f37caf93ad32a898a539faf05459aafe0e15b717,966dd6a8b9d040fb62e163363701467f0cb0d093,,True,True,True,9,19,312.0,2,True,9,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,True,Tests_passed,48d21add9fcf55e597592186e1e64eaf4cec1435168717a232eb6fafe56f8854,True,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,212f80ca595da4bf5b135908dec035618deb4d7cf5630f2c5900994e8d969b1b,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Tests_failed,338c28437f306554d0911408baebf8101bc023b7593a5f7a6c8a429afb241445,Merge_failed,3c9945976f9d0dc18f4e77a793793b2a0839707500aa2075886aaf9a5e3ec837,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,c35158e36502ed6ab5853bd70a643a817db1a010a8e87a86bf9c5980a7149989,Merge_failed,63b7ae474521a6a1e5173abbf12d71101eb3e17849f4873b871c36d8645b4b25,Tests_passed,11a1292261f6549a50b4adae7a9356cce39d98b77814e51567dfd96256178786,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Tests_passed,6beef343112202ba38086b80f17c0fb128a1ce48d795baa987094a15218cd44e,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2,Merge_failed,fd1da74110c93a3525a2a043640f8f9531040602af583e171692169d23c098d2 62,refs/heads/main,f37caf93ad32a898a539faf05459aafe0e15b717,6ae79056194d04b1ee0b5d7eea1e247d40e8dc79,7eeea8a17544883566f337fec6f81eaa115e9f0e,,True,True,True,9,16,301.0,2,True,9,Tests_passed,149d054859a6f6ee975a9c449d6322ca0eb7807509cd7542c4195bdb1720a7dc,True,Tests_passed,712d87f7971381a3857b696ee657b9b9c912af837c02cbaea01d25bc4ae932b5,True,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_failed,dc8ea74b95b534fecf41d3f84f95fff73a11d1a4ce0519d2d1373e8d459946e8,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,8183a3271345af6fafa5920d56eb95f233643a9b5d896133bab18127630f41b5,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f,Tests_passed,2bfffb296e3420885397e577bf11814fe43d5393a69072ca2255df9188b15e5f diff --git a/results/reaper/merges_tested/masterthought/cucumber-reporting.csv b/results/reaper/merges_tested/masterthought/cucumber-reporting.csv index 1109c8bc12..8911999404 100644 --- a/results/reaper/merges_tested/masterthought/cucumber-reporting.csv +++ b/results/reaper/merges_tested/masterthought/cucumber-reporting.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 87,refs/heads/master,c802cd0adbaa29205317b5c2ee784fc4d4370eee,a84fba80c5118fe61c391a8a1c54443384c9c41e,c0cb60d570e3ca1f07fbf85c7c24ec78be48c3af,,True,True,Tests_passed,8e1d308464d6073c7af06f0a916c3c166651d129ace0778805ef75f32bd71223,True,65,212,3842,3,True,Tests_passed,4d372614fccdfb19ae68845434319419fa14d443d9e4fc4e05f52ba8182214a1,True,65,True,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,ef8b02303fc84f15ca8a93b2b4be0b960f7daefc096aa791262bdf6dfbb98883,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f17b48c98ac9810299cdcf1ca0d446a7d750e2cb8650c212c758dccedee079aa,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4,Tests_passed,f7ae38447bd0d1f4ece19631b36f09537e979fa883245697c8c51fe1add059f4 106,refs/heads/master,65efc48712b4a98a89696c53bea379a25be30ad8,0e60e92eeb1708b8c012f8913606790256f063ce,fe0c6a45632cfc2417047784acee7ff5c4a142d0,,True,True,Tests_passed,dcde49efbf34138e76f9f2b512dfb2f7c2532c7837dfd628dbf69bac7809487c,True,15,43,292,3,True,Tests_passed,f6f022f46b015152a2d9e3470e1157a05b5ad7ed69106dcea77d86b1293734f3,True,15,True,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,5fbfdea730c6602f274242761835b1d34df96ab7599a62472e58adf8a29ea2c2,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,5fbfdea730c6602f274242761835b1d34df96ab7599a62472e58adf8a29ea2c2,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c,Tests_passed,58d796d5b9ab90bb06b103def0e9577e62619bf66b1414dc4c2574733175a81c 253,refs/heads/master,9fa019efbb3e9219643a69303c549bdb7b6515a2,c836e4e2131027467ef668ef029092f7f100e39f,02cbc6ec041475c9ca930456cd543eb3c43146c6,,True,True,Tests_passed,e26ffbc51282c6476e5fccf9dcb06fdee2d8684d980de51d7a56eea098467a5c,True,17,46,133,6,True,Tests_passed,383dff57d77c719a8bd961e01e86c9b16b97dda85da9182753d20da25531a131,True,18,True,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,fc2ee1d461fe3ff406fa36fdd30e21d1e55be31b41839005e54343c10a16ee50,Merge_failed,716c0f1fd48f534c833c777a716ea581954dfe9ca677371350773d2f2a67c4a9,Merge_failed,79e1adb7fa816249fbf9b798ca934ca920d152421027e91eb5e5b5c4a43e624c,Merge_failed,0a46d062b733e471b4d69cecf4867798a3be3fa95f437df180c4066f3d1e1baf,Merge_failed,716c0f1fd48f534c833c777a716ea581954dfe9ca677371350773d2f2a67c4a9,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,f8a063b1f48d316f56a0718083606854a840a0e5f224ca109c659b5b93e8c830,Merge_failed,f5106a923cd7b9c4709e829bc53e630c2679039e8e181a86e8421ffa6f01c317,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed,Merge_failed,8c638de508c30ee9d3b2467132147fbee0ab8c0ecb276319231797ba4eff9fed diff --git a/results/reaper/merges_tested/matthias247/jawampa.csv b/results/reaper/merges_tested/matthias247/jawampa.csv index 80f3e75ecf..6dd59daa6b 100644 --- a/results/reaper/merges_tested/matthias247/jawampa.csv +++ b/results/reaper/merges_tested/matthias247/jawampa.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,46006ffa74d27f272d0fdb2e99d4ceafea0c32e1,822a8c6fd897c68f22758ed0cbca62824f9aa3de,a863dd6f099ae099aec9861138f286cc8d6fa9de,,True,True,True,9,36,320,2,True,9,Tests_passed,7f3946c9ad8d38b76777b4f584f4927302938bdf243f04ed5bd0189f8612c10b,True,Tests_passed,c4e243d698c5ff0a342099bd30c15e1c5b277f19761f041d34a3f42aebf67565,True,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,f89ad21895e1f0c17f3f65fa8ef6699cb7afbe723cbf83e89499850ec9c6bc59,Tests_failed,f36dc3ca83a4a8ff45f6eb86c6e7fe74c567a8cc19e13b7a2fd75fa130529b4e,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,f89ad21895e1f0c17f3f65fa8ef6699cb7afbe723cbf83e89499850ec9c6bc59,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb,Tests_passed,6e152f2281d9d4c0942e6992e83003a3265d4d58579abc9a3a8e823317dd8ebb 25,refs/heads/master,f956e0584ab3323680744ef58438b1b09f11846a,cdb22b91593b13b98b53ca21965c6cbfd58a3954,90ac8af923bd105c3defbcdd74aa0e9679f06447,,True,True,True,8,65,255,3,True,8,Tests_passed,98a6f144331eebf5bd1ce2b27e90201da3ef8bbaf9c7fc14fe552d713fc56cfb,True,Tests_passed,7d5a8debb7a164133a61ce384ec695eea2888e55479f2b55b0da11acff07a70e,True,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86d51c9a1077cfba5defabd94c5193d87e9bccd633d18a8e8d40c6aa468381b0,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Tests_failed,1f4bc73f672108eb4eae934ec7afc657d2722d7ff121065258c7564f06e9e95c,Merge_failed,8076d42621e7a5415b7c246dcd7608200d16666d084bc38686f0017e66664eab,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,86feca9d3296419489a720afbfe47dea4cba2c16ba43cf6ce8789b00f1712e5a,Tests_passed,b6724e0f33d77c3e828ddf85d2bd1fb97074a831fa17b7bcc38367d27fb43f86,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,d5d99a23c6ebc21b507889ee4aa4614c73e552da988b1ba85229e1f65e15fd6e,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a,Merge_failed,38cd7895cc50bf92d33358af1a024bf9c4a393c9bcd26355db9e2d4d69bfc84a 28,refs/heads/master,d67461c964fd703f4a0d5f773db396460e83f8cb,c6a418416049ce849d029fc292362f28fb2b9e7c,db0e2822cb408f0de613f40415c9abdb7020ded0,,True,True,True,12,46,222,2,True,12,Tests_passed,7dc5c16480c6e47e5de9e13e5d41c92f3b115cf9e6203ad0fe01cf6c7ec97cf3,True,Tests_passed,bc1cb1b3fcecc724befd675757f6b8f231c65bada2857b468287fea5e2e1aedb,True,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,e094b4c122d3475d149f999a2f68d33909c58e0e22c9418e88445bee6db80687,Tests_failed,0c8de92b7bd20f64b6fe843efcc9581b6553d42b07d8625f4ae29a64ded4c7ca,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,e094b4c122d3475d149f999a2f68d33909c58e0e22c9418e88445bee6db80687,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3,Tests_passed,cb3d36935b82866e0705f412dbec0b3861656d20e3ce0e03c1237f5f7f7944e3 diff --git a/results/reaper/merges_tested/mattinsler/com.lowereast.guiceymongo.csv b/results/reaper/merges_tested/mattinsler/com.lowereast.guiceymongo.csv index af8267f6fa..3536ccba12 100644 --- a/results/reaper/merges_tested/mattinsler/com.lowereast.guiceymongo.csv +++ b/results/reaper/merges_tested/mattinsler/com.lowereast.guiceymongo.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,60813c8d71e04f2555a87814ad47ad8cdb621195,a3fa868fcd9f197799f27e01b7bda7b1cb22f768,0bb0300e17dbc35c25316126bbc9daeabf9dbbe3,,True,True,True,48,45,9471,5,True,50,Tests_passed,b6de22d76c34c6ce1a6c4b73b0728effc45b957d9716d1b719d5f9d4ee7da92d,True,Tests_passed,37e6b8386d7e743eae1f995f53cc0c233200fdaf6c6478d9aac8190d2b93fe20,True,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,ac23b23f6a27ae5625e3cca17ac4aab4c25bb6a82d5cf075edf767100a067156,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,7391bfddf057d54b7031ada9942cb7a08d239a8b5be68d9910ee496f556ee87c,Merge_failed,fa67070547c6c777ad30c014eae7690bc5c9c54658d63241cdc6f551d6a200fe,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,4275a9acd4f146223358750900b3a42ec9f19a1b9a115c0c47e9d131a19539a6,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,7d2002faef4e44b16a38573adae70d850a86f796020e037135a6acd098240f18,Merge_failed,cb2ef7fc0a27382e5a54f0b6c5e2ce63607eb158fa8ad6bed638ee4afa7455af,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,a591c5aff8c756506988594d2b9d20d4a811e53b4240106851ee00b65557293f,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2,Merge_failed,bc68284d531e5d893e45f21de60ccf611789d7d5d493e126b9218ded1b7368c2 diff --git a/results/reaper/merges_tested/maven-nar/cpptasks-parallel.csv b/results/reaper/merges_tested/maven-nar/cpptasks-parallel.csv index cb90d4a433..0e92a4bd81 100644 --- a/results/reaper/merges_tested/maven-nar/cpptasks-parallel.csv +++ b/results/reaper/merges_tested/maven-nar/cpptasks-parallel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,9cd3413080406cb66aa9a23998081e9ef757fe0a,8fafc6ee5cc901b301baee9760c6744be3816d29,4b91fee5ea7faa7a6cf5a6bc64ebc052f41018b8,,True,True,True,5,8,43.0,2,True,5,Tests_passed,4334654c4fec4cf5cd0edda031569c8528e4d2f931b919cf1bc9c30ce1d75d5b,True,Tests_passed,bd5b75a8905214677a2a4813b9f5e78279ff68057a41f767a3764fdebebb178e,True,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_failed,c063188a85c38ea577cd0f6312b861f1aecb1f0849fc7506b5fbad60266d5aad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,522fbdaf998ccf0d47c1bbb5c827b6f6817d67c843b9ffc197c13291d6d994ad,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f,Tests_passed,4a3a26d407e58d949b8c9db4a3900506a6d5dad8d6f97ea146eb86162561587f diff --git a/results/reaper/merges_tested/maven-nar/nar-maven-plugin.csv b/results/reaper/merges_tested/maven-nar/nar-maven-plugin.csv index 52d11a24c4..e29665816d 100644 --- a/results/reaper/merges_tested/maven-nar/nar-maven-plugin.csv +++ b/results/reaper/merges_tested/maven-nar/nar-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,40aa7bb76590d0d32ac1029e9054d37d6f26fdfa,615542e05da885afe07c39474cd4fc02d3dd1199,cd23bdea336fef4ee347b713cbef09ec75f5ae49,,True,True,True,14,27,395.0,2,True,14,Tests_passed,039f42ec3166b1bc22d3adc959ecd0e83af41af06af760c8600573b42df5e08e,True,Tests_passed,7c70ac6e3a7bd04e65f7ca0551737d1f3fd288f284541d0ea98781020825b0a8,True,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd,Tests_passed,62d6d8ded03ffc168882cfae985771564ba58ce453b7b38f2a252e0dd647bdfd 36,refs/heads/master,d00a2a2bcf5e073240eae899be9a0b65476b3be6,f094671078becaaf84107cb3859f4a41a66be2af,ace846dda0d26855c6c201bb947e6eec57744589,,True,True,True,34,66,1112.0,2,True,35,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,True,Tests_passed,22f43c28ef1a5c444e0a5e62156b1a8803e36d4be2ecd628ea91ac6e068fe075,True,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_failed,7ec93bdfd955a82f357d1db857bc2e229a504eba1230903f4884ba397d3f3ca8,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941,Tests_passed,b1c5a3ecea52bfde4306302ea2a4d31b71211f04f154e11ff90f66260080e941 37,refs/heads/master,f094671078becaaf84107cb3859f4a41a66be2af,c2ceada3b236d6ca319100ffc3da55358700b766,a810132923203cf47f78ea70866af8b30c9b48a8,,True,True,True,69,246,4012.0,6,True,69,Tests_passed,69e998f086dc08b897303b2468f192c681f6419e7c404ec22fa1fc76e7bd02ab,True,Tests_passed,519cb7909a022d29c35745a682337d9d1e90ca54c4415d51c9339acf324771d1,True,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,afea154323f644ec558c65ffca271b683bc2cbf99bca6024144cab985b7b94a4,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7,Tests_passed,c029f76155c16337018d81a8e503b473277f5547850602f6c51a48f12c5601b7 diff --git a/results/reaper/merges_tested/mavocz/smscsim.csv b/results/reaper/merges_tested/mavocz/smscsim.csv index 613319e2ea..fcb86c4d24 100644 --- a/results/reaper/merges_tested/mavocz/smscsim.csv +++ b/results/reaper/merges_tested/mavocz/smscsim.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/pull/5,8bfb11d2761aacc461674c06d3df511961252c0b,9b60d4b015a6db7f9d9f2bf9eb6083fcf3dad959,c299c6bf1fdfb1a8fe954b93ed2682bdbb0150f5,,True,True,True,4,14,146,5,True,6,Tests_passed,4530709389bff72c74c2dd79ec52aad8e75d9c5c1902a32b8be9b4ee30cd2b86,True,Tests_passed,a11239d4bdeaab1c33f9aced952bd4cc56c271013765b6dd80b65b33d3860382,True,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,d9235f7714e96af4e1063fc2fdcdec40de03f5ad1a6ade10252dc6f8325c9f29,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Tests_failed,509d46f6232d2468f194b7bc60032bdebb3c17e75440f32db3fc87ad2a9ffa10,Merge_failed,4b75c8297b80bd2b0ea83e6005547af5b4650c3caa03aa53327eb51db232657b,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,725f49994c6e1b0d716c3e3d2c5ef5d65fa668a07c558874459ab722e6f6ccf6,Tests_passed,8cbe8c37c545375cc56678042fb29c85425467e0c72abac4dc76c339ff1fe402,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef,Merge_failed,b3f2dcb80976af8da8ee3001684a0798e5d51a11fd55fe6a8c6c8ea6c29302ef diff --git a/results/reaper/merges_tested/maxmind/geoip-api-java.csv b/results/reaper/merges_tested/maxmind/geoip-api-java.csv index 80d323d5cd..005bd7bb3f 100644 --- a/results/reaper/merges_tested/maxmind/geoip-api-java.csv +++ b/results/reaper/merges_tested/maxmind/geoip-api-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/main,3c90dc1bd7530ddffb1460695963a5f3ee2fae5e,6891272a3d8ee689774bc41e44b3c5331a0d81bc,48beecc7ae1e5393325f315fc5a723466cfe956c,,True,True,True,3,8,18,2,True,3,Tests_passed,9f87f63bd85ec9fa88d5b994fbba82cfd801aa6ccd09c59b9435efcae47e9c5a,True,Tests_passed,01e2e1c667170aa917e1a60b85d9667a2aa731458fd67266bd18abee20cf3551,True,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,77ad2474ebdc41f1145f77335cad3836161f90990edc6d194b8625dd19262e3c,Tests_failed,c71f8775b86c8e4ceb2376656dfd8ab53bd27d61d2f36a5628a3f7ab40eadf29,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,77ad2474ebdc41f1145f77335cad3836161f90990edc6d194b8625dd19262e3c,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d,Tests_passed,0907254f7d5d3387e52610566da5714f22fdb67efd3af40ef5b60267b6d1718d 53,refs/heads/main,49ecb07cc82f13aa1a25857de424be43c88368c1,41ccd2de77d3495a43edcef222564924cbb53740,5eef24504c348cb6880642ae3eb6443f40e3b8a7,,True,False,True,2,2,4,2,True,2,Tests_passed,486fb2319bf0044a951c20cf592d5aa2ab6f0f7e8e106fd734201741b56a1745,True,Tests_passed,17920ca2ec398d8c5120df1721bd16938a965ded154e41d9cd83bb00f03b52fd,True,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f98110b8e0f539e457cde5f88c30a70f6d52351ac1a8a7ea776420022b2fe6b1,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Tests_failed,2a949e2920a7cffbe0923489a566ee082c9c7e424db870257cf86a98183412ff,Merge_failed,3158af89b5c5c2b8f9591c16d38725c1c7510279257049aec8cbccf11465c143,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,45685eff5d083a0ea034c31de0d54faf49d45bf492a5a14aa12df0d3a63b4eeb,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,c088644fc53e514a7f8d43e2f27bd2ce6c85657624d469007c4fd8198377b814,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,d37b3fefc04e10bc370de5ffef19c4292671b92ede2808100bd2305f745e6149,Tests_passed,070bf26a7475992ff9c5096643f3a6b0911c3bef4d715222e074f265dde10957,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,f885017a2f3e5237478aec3e2ca14cf17ca69ea6687e11df5cbc7eff2e3ee7ac,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98,Merge_failed,4b9668e13dbbf12a2fc3e7254bbb32947444a0109dbe7bcfc865ebba86f9ca98 diff --git a/results/reaper/merges_tested/mbaechler/proxy-servlet.csv b/results/reaper/merges_tested/mbaechler/proxy-servlet.csv index 9952327608..6f32fa62d2 100644 --- a/results/reaper/merges_tested/mbaechler/proxy-servlet.csv +++ b/results/reaper/merges_tested/mbaechler/proxy-servlet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/6,456846e2b56eb09964f65677180bd70ee107d33e,db267681433444c8f171d2cc31286f5b9da437bf,a03279659c46dda30accad5f0b06b8eda491ccc4,,True,True,True,5,18,69,6,True,8,Tests_passed,29056de4ed7e265465fdc8ca4787a81ff7d451d69d853241b2b7f2696b47a1f8,True,Tests_passed,df6c2a427c019fb49bbe937666286a792eb7afa7fca0ddc3e7fbffe823036358,True,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,f3744895bb7a1a087f19c59148a13267726168aa4cb94dfe01d47490689158c8,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Tests_failed,b4101b8d6aca4685409f6aafa0be8f1e94d2925a7c3b5e56bb2fd9925154b486,Merge_failed,2a17a20be3a4594577bd12636756ee265eab8f577041b4639b89c24599c72f2a,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,5eeaa984e8e1ec11aebd21a11db5e49c50acfb81ac8a060284b64eb4cae3ce19,Merge_failed,6724566401187baedbede3126a29fa4c0803eccc4288326f7fb3d430aaa47d72,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf,Merge_failed,d16151bbff95b7c9a11136e42f57621e9da5df357c5d833c9f02947787766edf diff --git a/results/reaper/merges_tested/mbknor/dropwizard-activemq-bundle.csv b/results/reaper/merges_tested/mbknor/dropwizard-activemq-bundle.csv index 30b24af873..eef389d7bd 100644 --- a/results/reaper/merges_tested/mbknor/dropwizard-activemq-bundle.csv +++ b/results/reaper/merges_tested/mbknor/dropwizard-activemq-bundle.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,12e472f3dd612c31bfc713248ffd0389e0dd2e8b,1d1aad7523ab4c4304e5766700e0038f75ac7dba,5a53776d9e4be3785c6643ff650370633c2b78e1,,True,True,Tests_passed,f4f04dc211305042b26b920328fe40bd4af73cd38a6df25f9f1c59d34c12ae58,True,13,47,448,3,True,Tests_passed,6c46c80017aa1a8afd66b39eb24808ac6f96a6b4f016b5beb68ac21ff4147939,True,13,True,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,81b2b38eac8749b184050871883bbaffff505fefee4490c1b15cf607813f112f,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Tests_failed,13838d3a26e2a7b9af7cbf0c1f7c6e745e66505cc534f02a5a2ea8427bda352b,Merge_failed,40a29591c6963b166c2992f7e103be40b897febded6559cbb714a0869b1efb86,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,c5b2a07bb75b0120d2076bc69a95ffbfe0c8afe207fedb77b40f742b4b66823c,Tests_passed,19cf72447ae9ccee3243a690f3c92ac2d0c8a98c0588bca4ce66611d3b5402b8,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,4dc66db91f9627294de8aaaa651f5b9693b8b9af6d597d803984aef57e67525f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f,Merge_failed,36c3b4e8c47129c594b84296d70c5cdbb8db18fb757ddf874c6848d81d3d5c8f diff --git a/results/reaper/merges_tested/mblanchette/maven-java-formatter-plugin.csv b/results/reaper/merges_tested/mblanchette/maven-java-formatter-plugin.csv index 115bea44a0..de3fdfdf42 100644 --- a/results/reaper/merges_tested/mblanchette/maven-java-formatter-plugin.csv +++ b/results/reaper/merges_tested/mblanchette/maven-java-formatter-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 369,refs/remotes/origin/pull/733,2249c09bd7b1684c81588494daf9353f94323bbe,e1789bf6546cfd122d84c6aff3c6a10f00a2e427,c3607a1d7f7422a7860f1a31e60484c743ef3f6b,,True,True,True,11,50,98,10,True,17,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,True,Tests_passed,feb8259999683cbc1455ed285c446393c984c315ea0ab011aa96565eea2a90f7,True,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_failed,0b1d6961207999bb7fea918755920a1a2b61ae9e997f5a9d675fca445adae92f,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57,Tests_passed,7d1b89349cc1c1fd81e5cb8a1d97b7d67f34c562649fd92a8864bc4515545b57 diff --git a/results/reaper/merges_tested/mbosecke/pebble.csv b/results/reaper/merges_tested/mbosecke/pebble.csv index fd57248df5..91d9ac608b 100644 --- a/results/reaper/merges_tested/mbosecke/pebble.csv +++ b/results/reaper/merges_tested/mbosecke/pebble.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b7abf1ae5b1b372ea97bcf520d4f16417f8fdeb8,11dd4783d44afbeb269c9d98cf9579aad0e53394,1fc456ea34a4fe92d28f87f8e780c9cd9be3ea1a,,True,,Tests_passed,63550e8a7972ee1cd3bfe39883075f3aa1ec4d121e41e20006d32d9c88c6104d,True,683,903,,3,True,Tests_passed,9be692f984d55caaac5f271beeee9b7075467a3f7f94cea1f22aaa4efb45b598,True,683,True,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,9180713319839965cdc0680e0754fc1526d6607b04d8652eac7d416b999e3332,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,6d1719cc4c71c4651baf6b67142b2f9cacc30b4ea26f8bf6966e4be6ab7cb9e5,Merge_failed,9180713319839965cdc0680e0754fc1526d6607b04d8652eac7d416b999e3332,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082,Merge_failed,a116a9a94fb5e928d2aa9aca361d64327494b52eb052b67c644c3a0f18f6a082 4,refs/heads/master,aa932204dedbe24bdefeb75593385eb0c091e7f7,105894ed258589b9c8bc1860053bc57812a0a112,09a8defc69eafc886cde649fcd33f326f4580e71,,True,True,Tests_passed,ed4d457a5e400185ccd1199dea0d596dbe05032c22a8c8a04f2dcdd7c6645671,True,195,1143,6479.0,3,True,Tests_passed,47cadb7e2f88c87e07ac201347e014841ffe382da2431f41f1e8fbb58e46e806,True,195,True,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,7d4eff56c50483a35bcf78c24fb999e032bf34a7c17318be91d588764a0a1756,Merge_failed,04f9ae9cdc13bd954a971a689979048b3af3c7e3d812da7a6917bc5902eab3e5,Merge_failed,8e718635cc994cdedf4b3b937d3f15484527a6df55e156a6381cd58e218e34c8,Merge_failed,8e718635cc994cdedf4b3b937d3f15484527a6df55e156a6381cd58e218e34c8,Merge_failed,04f9ae9cdc13bd954a971a689979048b3af3c7e3d812da7a6917bc5902eab3e5,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,0531cfe855e188d4e8e469f85748e49ce55cbdc0c388ca50fb7ce3f49d23bfc0,Merge_failed,6bad8bb568086a942772d0190cd3f2726bae25541baf3e08b7251f5e9a516503,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,55c24081a0c05c91f4818cf921a140c2e362410466f457d96800d23fdc72b66b,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd,Merge_failed,c5bc5c019613bb4cda2d15119bf0a52d5472c50d816f7725d1341193972e9ebd 6,refs/heads/master,1d6c48cea436f9c099a0ca56ba3cbad12c5d8db5,2d9225a0cef8db7239eb19d432cd0920abe3f30b,1ba4eaff5a22851bb476f6643f78569677ddc806,,True,True,Tests_passed,0af7e3426c8ab14683b798db810be641ab30de6fbd407ba5d3cef4e0e2a1a7c6,True,161,889,5374.0,4,True,Tests_passed,0b302a4e9cc564c4da3b3212f6280ba61652766d735c346d236d0b814820629b,True,161,True,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,54e7a1d607051d74e036282db3b6a1967c97f8e192045e3361ca8cd77845626c,Tests_failed,9eabcd9dde1eb1bf32295a6bdf5d143afd9f6e0327fa18d6b1c9f01a782e50f9,Merge_failed,178fd61fd392a94257a91d37a6ee45960faee031296eec2bdbf3a2efe138452e,Merge_failed,178fd61fd392a94257a91d37a6ee45960faee031296eec2bdbf3a2efe138452e,Tests_failed,9eabcd9dde1eb1bf32295a6bdf5d143afd9f6e0327fa18d6b1c9f01a782e50f9,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,b81fbf93896f310021b544bee9eb937d47454c5b562c44e4befc834fba07ebd4,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d,Merge_failed,cddf3bd6e55e873c72dbacc8ee63cd4b55337921f3e14bb05f76c18657fcf31d diff --git a/results/reaper/merges_tested/mboudreau/alternator.csv b/results/reaper/merges_tested/mboudreau/alternator.csv index 2fbfe864f8..927476db7a 100644 --- a/results/reaper/merges_tested/mboudreau/alternator.csv +++ b/results/reaper/merges_tested/mboudreau/alternator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,135bc244a273a6a62f6b33fb869f93fe2b59bb1c,9cc84b46e390b64287a1553ae5fe098cc3db2d92,532ed01f2d71ad569fa578b030b742aabd326635,,True,True,Tests_passed,05b7b8f088a101bc2091e58e4ef502e2a0f636115c04a2ce4bcb43bc0216e34e,True,4,28,565,2,True,Tests_passed,321a5bbcb25f56767b6bfa68e141ace28cdc388745561bdc1089c22c38f76416,True,4,True,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,d34b0a3b88b40f9f8c86836faac667f9d7d889060e3d22f9c46473eefb1d4c08,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b8db7c16d69ad581b3f4f901d1842decc8df65e3d4c1677d9b149f52c1150da,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b4ddfa620d1e0527f70c08d03cf411e35f345796136371ba3edd57cb27d21d1,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b8db7c16d69ad581b3f4f901d1842decc8df65e3d4c1677d9b149f52c1150da,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,1b4ddfa620d1e0527f70c08d03cf411e35f345796136371ba3edd57cb27d21d1,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,d34b0a3b88b40f9f8c86836faac667f9d7d889060e3d22f9c46473eefb1d4c08,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd,Tests_passed,9b135ba04ef8d72073ff98f5780402f512d22fd85670f3eacde3e9ac4a758ffd 31,refs/heads/master,e98877f87081708e446b278c812eb504565ff5f9,e5ccfab1da7432b380d0af5e0f86b83894b4eab2,91954b46b0bb37bca9388c3812763f3d24a8aaaa,,True,True,Tests_passed,32297fe2fb78354de541330818f8cf10feff1841ed8c9ac9b71167b79caf693b,True,19,136,1158,9,True,Tests_passed,dfd7622acf5850de28d3b231d046bc9d0e2bef5a4d6c56d1fe8f610d7340459f,True,20,True,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,cd152448e5cd1e5c7a1dc2ef3e4882769124cd3572c972faa0bc7e152d0ccd54,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,3a3ae5be878854cd15fbd0e086ea31cdf82dc0c294b1d0da5e9cb8c4f0dc3629,Merge_timedout,,Merge_failed,ed94f1895c5948117c3500ea6d428c9bfd30960a0412365189f445378c972396,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,66df26661f5ee0e2ebf43b1be3ef16525e53ddc47e5b3981e544128bed90fe7e,Merge_failed,45b61ee2a588fea033a62052056d88200e9c797dedf143cc0384af76d63520b7,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,30720e344aa9be472f6d817ad9c2f5b6e43258b2ea2d8f65e23f89733f150696,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee,Merge_failed,797d40451fdc2e26e3cc5ae42370b7e0acc10aec084be247561b745d627b3dee 34,refs/heads/master,b57359e276976821428edeef1b981f5420989f88,19fa3891de01764327d03c8fd1a0f7b6468f537d,d926020f54c1df150deaed519e8cabe92c71c1a8,,True,True,Tests_passed,3c938a4452fb6da9e8e733cfa277f43c38f4797b95db24f6afe8bff88deae1ef,True,13,108,631,5,True,Tests_passed,a95a995ab4e04dcba4cc23cebe06776b6d00b8c54857eb55b886fcde4deca368,True,13,True,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,b8aa2cc79e11c0c862ce67c996817aa19ab6b7be0062e070a0a50de090da81a5,Merge_failed,63936e0acf035bad3255eec998a6e82e90ce45b365f38e13c8f110bce1cd3318,Tests_failed,9a442a6a94730c2815145c7beeb82ee19a71d8ffe4b1561ffea81f4d0477d3c1,Merge_timedout,,Merge_failed,63936e0acf035bad3255eec998a6e82e90ce45b365f38e13c8f110bce1cd3318,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,b5e2a51bbbf08749f9fdc3d76a56a468ead94ce10f6310eaf675addd3e09ae51,Tests_failed,9a442a6a94730c2815145c7beeb82ee19a71d8ffe4b1561ffea81f4d0477d3c1,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,29f710e301dc043f47f8b2649dc1df6eeb3a4fb0d861933fe6c97b032bd4931b,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507,Merge_failed,fa68b829d2410f5c3a6ea4f92593d9f8bfd81f5b16321aa1de2634c3355a3507 diff --git a/results/reaper/merges_tested/mcmmo-dev/mcmmo.csv b/results/reaper/merges_tested/mcmmo-dev/mcmmo.csv index 81988eb3e8..df450c320f 100644 --- a/results/reaper/merges_tested/mcmmo-dev/mcmmo.csv +++ b/results/reaper/merges_tested/mcmmo-dev/mcmmo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,81ac48904ce1c187c6177ad5282575a7c2d28907,ed8c8107f990a68111cce560f0a020c7401902c4,2594dc1bca27548e560cf514aa9285e925d1a612,,True,True,True,143,712,5593.0,6,True,143,Tests_passed,8e77e05911abcabe3a0626b50847bf5f50a46a62b2d06fa98224315eebf65aed,True,Tests_passed,ccf00edc4bbb59f98bad23de096117c3446b8db7d39b6d375760f98fb0fcc349,True,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,faa840119d3406991f8b1ebc639702db6686edaadb7b6e5b71b9dc1cb37abe29,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,fd4b2ed970ee239ac3528b4de122bb6babd5b167d2ba348821e336da13b2643f,Merge_failed,c68811f16d4741eb8698fe9bef07d29489879c5a72a4edf5d74aea5cad6a2d1b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,09d2d47bf34b049511d64d4c2d10ad76dbc74f639b9bf76c4bf6641a9cbc667b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,b00d02b6a8ab595917b37ee1c6a4125e8cfb628c8311193419d30367e9dad44b,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,0bf5bb93a36bfe4fc6762e32b58bbbd4ae78d3adf5ed43361b7b694d397209e2,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35,Merge_failed,70888a18a910758517dbd0d12d870bb5d86fc7ab73648169201eecefef59fd35 132,refs/heads/master,fbe26af2d7dbb841e19f30c63eb87ce1907c1511,0a1559511a4f20169246e98a6565d388a0c8adac,aee60f2c098238858b0f40b6d06bc4219a6b42d4,,True,True,True,31,220,1535.0,2,True,31,Tests_passed,7fc9e95bd9f26efdade15e753da505c74d812864e669f7033cbe360c57f8a379,True,Tests_passed,bd65722126a52437df2a40e5f6607c8fd508e009c3226bf638690e1968d6229a,True,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_failed,9229c0dff018e24c24a3555954896b1ce3ae463c6219f08d815637ccb168f5b0,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654,Tests_passed,61a4cd0ae47fcc270124d3c0a76b181098b9f6f97bcf9ad054a8b05b661a3654 133,refs/heads/master,cbff8482ce5fd4a2659429172a9e992b47bea4a1,3d515aab2338a6700620220a708d12b02732a0bd,0035762a71563781014fc27ff60d90ac6e0e85e0,,True,True,True,23,41,281.0,2,True,23,Tests_passed,a314073b1bc28c90846a04e8836aa5ea526eb561fc25da83bbc1bcdb3bb1edcd,True,Tests_passed,f0674127d020f47635177101f48fe86178abc01d394dae9f8ae1bd47f361bae7,True,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,6767c532854b80eec156b8b39f237d0a79400fb0653d26fe0fac119448c1e409,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,6767c532854b80eec156b8b39f237d0a79400fb0653d26fe0fac119448c1e409,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379,Tests_passed,a4c7d38a64c8313945bab40c84cf72bfa5a02b76bf3f6c5f49d97f3ad0237379 diff --git a/results/reaper/merges_tested/mcupak/beacon-of-beacons.csv b/results/reaper/merges_tested/mcupak/beacon-of-beacons.csv index 404209acba..cdd575bbc2 100644 --- a/results/reaper/merges_tested/mcupak/beacon-of-beacons.csv +++ b/results/reaper/merges_tested/mcupak/beacon-of-beacons.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/develop,f140a4d0179b6b4bc06291146f03962a071da5d9,1d50c2dfb1e611d6ff5a42b3b16837995249ba5f,53dd291e5bbbf9cf32694de42c7486dd62206ddd,,True,True,True,45,181,2344,2,True,45,Tests_passed,c5e2fab278ea5f52d8c071d548726b6229a301d873447c77665aaf2b0fff324b,True,Tests_passed,b30d5f2d070ac6773c9391c3d1052d4abc4b67706ddcc1d6c03a23b8cb1ec7b6,True,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580,Merge_failed,293e6ada67c2bc83c054ee98cf29fcd27d1ffad961272d71f0a908b324307580 7,refs/heads/develop,3723d0f4d5cf51fd3b5bf5c15529463550918e1f,49e4e1cdb8643f276703f5f7761f0cb6c3d836c7,9dd448552f4610d7c651eddacd82fddf7ad48aa1,,True,True,True,159,521,9036,27,True,162,Tests_passed,d532a309964d4290c1776c1951480911b52c979f60f9844efedf86be7d7fe1be,True,Tests_passed,7b484fadc10b7e9c97f9059129e501f30c9b3af803c18127bcc4ec81c51da9a5,True,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,d9da87ceab2710b63992ea86f5e94dad2ce869ee33f40a77ba53c9b90f5b0ce5,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,2aa5152032f8c9c631b74110e02b097431625928af615feb7f6130355262d7ff,Merge_failed,1969ae0142c1d82934ecdb1061d2ab048029ddefb2219d676a7bdf835e2697e3,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,4f5c382488dfaf0537defd7a9226e1bf70288212fa86bbe4e4c7e996ba83bd3e,Merge_failed,778bc56db82b30622c2b97843f53aafcf911939b68803ef92681509b9f1a9f38,Merge_failed,50e0aa9b910ebb33c480414910cf3f9b9058d0c8b4dcb59aacc5483b335531ae,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b,Merge_failed,353f84d0fe6d3e2f83d27ccfeca774ba97cdfadc897f92ff10ec4aede145cb5b diff --git a/results/reaper/merges_tested/mdeanda/lorem.csv b/results/reaper/merges_tested/mdeanda/lorem.csv index d827c2ac28..9faeace83e 100644 --- a/results/reaper/merges_tested/mdeanda/lorem.csv +++ b/results/reaper/merges_tested/mdeanda/lorem.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,b340dfb840716f7eb60f9febd104087913f2beae,066a95129ded0423403c5d7f48d90aebef73d278,96c00aa7b9415de0effec3d78dafbf3b722c168f,,True,True,True,4,10,29,2,True,4,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,True,Tests_passed,75b49c8a194bd79d752d4a07f3988a840d91eda770ec5931715322f4cfd524b8,True,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,114742d1b2b6bb0ac2eadab49591c329a066b975f0c69ab3b48a4b91c35f13af,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,8f9914b46191fa4aa497d2d2f6ebb2a363159392d3a296e1e355f4959c382a19,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665,Tests_passed,bc80501fb21782accd3feca5d5e1770f1ff3b0e7551f0425ed4e72f650bab665 diff --git a/results/reaper/merges_tested/mdeinum/spring-batch-excel.csv b/results/reaper/merges_tested/mdeinum/spring-batch-excel.csv index 388cf07786..0a61d0a923 100644 --- a/results/reaper/merges_tested/mdeinum/spring-batch-excel.csv +++ b/results/reaper/merges_tested/mdeinum/spring-batch-excel.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f1109bad1d0f6b5178b84a59be3e59e18442d127,e7fcf225aef0ccdd6d9c972a07104d4fbe87043a,e732239774881d118a937a636bbd7942bcfa6966,,True,True,Tests_passed,92b6ff26ab94cad5fa3c278f77751bbe5abea735e14350df36a9b31125a0d65d,True,9,17,434,45,True,Tests_passed,b9a87b24f91328d70b6bd43ad3c6b8bad8a595e9ca31ac5a51f0140171520108,True,49,True,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Merge_failed,b61caf8007b4db9cfbfc03cc33b958298cce7292487d3207f66b63a72f10568d,Tests_passed,83172a4492a6ed4ab79c5ef11f5914cb59dc9444f5ef41e6c6c1c0ec21703d46,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,653dde172639ea6bbfee3b718fbd6a07f377c1864d61c784a47312ee90ea7799,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a,Tests_passed,3b56082ce3785aab4699b2a77dc218153165bd7479d7d65a274d90941e3e516a diff --git a/results/reaper/merges_tested/medcl/elasticsearch-analysis-ik.csv b/results/reaper/merges_tested/medcl/elasticsearch-analysis-ik.csv index 165349c834..f4adb77738 100644 --- a/results/reaper/merges_tested/medcl/elasticsearch-analysis-ik.csv +++ b/results/reaper/merges_tested/medcl/elasticsearch-analysis-ik.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f0dd522e6030692a9722a2d01ddd6be2e2a62fe1,9eaa2b90eb782113acce5bb1c16100e51d71e404,949531572bcdbd82f7fede9982a529e8e0d14625,,True,True,True,7,32,229,2,True,7,Tests_passed,9c1691cdba914d74118a5bc40069d9bffd2cfe6b738ecdc90941c07c61b22431,True,Tests_passed,791d22a00ee0b5d591ba176d3a3cc5d1e9b5721515fc5b9ced1f07da07dcb317,True,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,7ea20f41f64fe099a56016fe9dae5897248bc09e33b7136eabc2ca379d386d7f,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,b1154a3c6ac6d2884c35c739d4120d5ea33271291282cbcbeb43f6c1c288f805,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8,Tests_passed,eb4f0a5580030b253096aace0981c038660abec0d6311da54084d68cf99b07b8 11,refs/heads/master,ca2bfe57320fbf2bbef20c9ca69b9d78f4912710,3bd1490225b3454e89a9b114df909cf03cc2216e,5ec0bd5bd6b20980f56fa2345681961f4525dd33,,True,True,True,14,159,798,5,True,14,Tests_passed,c52d67480c76e2d737d7345887df82526f21e7ae981e2e106c2f66993bb0104e,True,Tests_passed,b6151cdd4c5ffe876ee84dfdfb617c30740302efe59dc6e1a6f15f8568099924,True,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,5c425aae87325bffa34fee004e7b683976b437ca776245c6f02dd8c9e4830fd2,Merge_failed,af0068a5cfde48012ba9a4f1f02c7e565775685a17cd9449a39a658362270ab3,Merge_failed,759733f0ddd5bedbd51f1bcefc876d1f283e0a4af4b046f47b463cabbd7f36aa,Tests_passed,c94ac84284809e8c6a48b0e0cdee2ea0182958387f04d2546042c437a4f15afe,Merge_failed,4cc99734a518e871ce071a665d05d112fdc838910e074502cfa2549c54a15724,Merge_failed,759733f0ddd5bedbd51f1bcefc876d1f283e0a4af4b046f47b463cabbd7f36aa,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,752caeede393f007785b512c45680f7312d2280f216f2abd2768075b987d5da0,Merge_failed,5c425aae87325bffa34fee004e7b683976b437ca776245c6f02dd8c9e4830fd2,Merge_failed,63835c447ac754d5ea6418e8a80ca53b37e221ccbbd3064ea7ac39a8daf80da9,Tests_passed,c94ac84284809e8c6a48b0e0cdee2ea0182958387f04d2546042c437a4f15afe,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Tests_passed,88fa1128a623fdc7e43740c072daa2594f69bdb0a8b23348491c5e2844919ac9,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312,Merge_failed,9fd65197d42bb6be490e2619e3e84a294eab24417c36353ea2bee11d93caa312 13,refs/heads/master,e673eca316b224568093cae7c728a9640a6d7e24,c8f4d59f13a403fa5de137076478731e18f403b9,3d8fa5bee0acd1385e5ee8a796c56b9b0a7e775b,,True,True,True,13,42,215,2,True,13,Tests_passed,6ec3827247b7960ed502e8f7c5095560bf7e4f1eef12eafbdaa15dd96d2a860f,True,Tests_passed,9c93a3afb7e0ca0161a7d019feae9d1fd9fb2df92523886dbd02d2b5e1ae1a5c,True,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,8b958d5b83601f37c7ef8b837cf3a19dcb0628deb25778a6f33fb065defde92e,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,8b958d5b83601f37c7ef8b837cf3a19dcb0628deb25778a6f33fb065defde92e,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,0de5aa831627fd9dadc574925812b9167fd7823548bb64b625074ede851fa4b2,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4,Tests_passed,dd1bd983cb09ab1c0e1a44864b1198626e2afd781fbf5107b5c2c256995449c4 diff --git a/results/reaper/merges_tested/medcl/elasticsearch-analysis-pinyin.csv b/results/reaper/merges_tested/medcl/elasticsearch-analysis-pinyin.csv index 848a4d0cac..1044da88a7 100644 --- a/results/reaper/merges_tested/medcl/elasticsearch-analysis-pinyin.csv +++ b/results/reaper/merges_tested/medcl/elasticsearch-analysis-pinyin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,acdd6eff2a1baba3de2c336880655c5f4c0729ef,21b2b8e1e46bd70c7d1f7fa8f60ec08321ee3378,1e3bb4f99192270b46d7139b2a892026689d8940,,True,True,True,7,107,592,3,True,7,Tests_passed,4b2fdd68dd1e1248f01b041c83589c44d76c37edcd3a1176c5c8308d20139379,True,Tests_passed,3374c45042e3675825ec4ad1c47e2ba00b5ff70ed013f7b2a007c4829379abc6,True,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,80a72e2d28e828e20e996a4adbf4b38f54a89af650773cb6280ab7e767579287,Tests_failed,b08c8c46f0bde42ae73515ed8d9aa81b97e735fb1debfe5598185d3ea1808e1c,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,80a72e2d28e828e20e996a4adbf4b38f54a89af650773cb6280ab7e767579287,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6,Tests_passed,50d2189225c1448227fa81c6bdca153ddb448d45334870a2a989e731ff369eb6 12,refs/heads/master,840a6261b2223afc097272500f727b79d186e258,d3c64cb214b23a5ee2b92fe800a1b121efa737ea,49194469b9f96142fa01d44bec510a452cb4de28,,True,True,True,17,77,537,2,True,17,Tests_passed,60bfbdb3e86fd30a7bde40529beffb56c837e61441e4ef7d4df4fdf660a400d3,True,Tests_passed,b3e9ecc90b6f93636bf313f5b5e23f9af7b941cef71cfdd7b03a0800e41dbe42,True,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,8fa34c129004d802cb04c57d5947e7f850d11698b13811c5a68d5bd438811c51,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Tests_failed,4f01496661bfa41d51f6e10349cecad4e67b4aea18f2270639e461b1143ab8c0,Merge_failed,50d94a4bf3c113a2c62f0d471b5ebe57e049d988f31b4db616006433183d85d0,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,a4033a649f8decfa9c69affabb84ead4bd9f19ec8cf83dbf18eb2d6e4bb446e0,Tests_passed,1d06562d3a5df93edbd56a782eb239fde2ecc57a847276eb3918354b3ed85e4c,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9,Merge_failed,2f6e2265657ae54a639f6b686fec4824ebc816449e4bab4c5c352ee4c12a4ac9 16,refs/remotes/origin/6.x,4a5981413d5c6aced9b81e136f44c22ad56f37e0,51f55f9548bf94231f139fcaf282ea20c1b8d109,2f34d08eb2dc4056f7e958cfead0508ca9acea35,,True,True,True,7,51,405,2,True,7,Tests_passed,11022ada16fee7ba5de311affa791fc612886d20626d77eb80c0be06f8ce345d,True,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,True,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,c18b04e33be8461d8bc49c40f04138aff9e59bd016192c600e83896dbe23c08b,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,c18b04e33be8461d8bc49c40f04138aff9e59bd016192c600e83896dbe23c08b,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,132a52a48d3272967254dab62d6e0911435094d9ae77d9d5c2efb31279331fc8,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465,Tests_passed,3f5f15027f41ef48dd8c7b598d28d5d948a426b6c5d58e31fa2901a591047465 diff --git a/results/reaper/merges_tested/medcl/elasticsearch-analysis-stconvert.csv b/results/reaper/merges_tested/medcl/elasticsearch-analysis-stconvert.csv index 6529bf00a5..d56a51c203 100644 --- a/results/reaper/merges_tested/medcl/elasticsearch-analysis-stconvert.csv +++ b/results/reaper/merges_tested/medcl/elasticsearch-analysis-stconvert.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,6d996a9efa2dc4d57f947b31bf8c64d15f257fa6,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,9bbe6c3fed26b3237b868c295a7dca37489ce197,,True,True,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,True,13,75,193,4,True,Tests_passed,dbcc038e094bbc530afcbabdb7704fc1110e9629ec00717f1445f87870ec2252,True,13,True,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,d05bf1f0e9fa2a00087d562e8b12bdff998051700abfac6f00412d30484542f4,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,d05bf1f0e9fa2a00087d562e8b12bdff998051700abfac6f00412d30484542f4,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5,Tests_passed,3d6ae682ac89d1af9097f3d5b530bfef05beae12aeaa5352c9682fb69e723af5 9,refs/heads/master,5bddd6e4e8f8cb6d48a82ca31019fd1d44a68c54,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,a3748c08e9c5c50e0f8e439ccb9b9017606e4c65,,True,True,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,True,12,71,184,2,True,Tests_passed,77cceb256ad43eb8042b0f3d10d3ebeee1a6f96d1569b16369e7ab63c10bf440,True,12,True,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_failed,ba42aa5791225c644e9fa65283e12210f68a603bfb4b59a57ec2c0d865d171c2,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,e743e857333e67ef13f548ee6793df90e2f2db11089b1ea36966eaa5d790bb48,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,9d465c7704a7e971ff64efd755739975aca5b2553898a8b6cf843f3fefbbcef6,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e,Tests_passed,dd46c0e29992e54cd644bce01b7dc6cde039910189d6233fe46ef461b7b40d2e 10,refs/heads/master,c9bed8529d45f3c9dbe8ae8571de774ebad95a4f,ea402a1f299b72645b72a43501e89bfce2a5a786,79dd7851c0a485891df84ccc9a35beb1540750ee,,True,True,Tests_passed,4e3f17701bbea0e4f332c36abd67552d169b57bcf896ce517c3463d0f8e64c9c,True,11,38,97,2,True,Tests_passed,b252d2aa54e210e77e9f6bfb5371c66b3afdf438bfc5b6397907acb4ee10f573,True,11,True,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,a18e58ad087e1f13a6b4f12f3d11a719e04df981a77889b9690a01d18b21867e,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,a18e58ad087e1f13a6b4f12f3d11a719e04df981a77889b9690a01d18b21867e,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,ca3395c5053d4721ce0454dc542a53f2718e0b768b2349e34cb1a3f02409b1d6,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350,Tests_passed,0479f23958702f0547b8f48e3202c610745cd25df79a08ef7bc1fd6c4b54a350 diff --git a/results/reaper/merges_tested/medcl/elasticsearch-partialupdate.csv b/results/reaper/merges_tested/medcl/elasticsearch-partialupdate.csv index 28c7b75414..61800e730a 100644 --- a/results/reaper/merges_tested/medcl/elasticsearch-partialupdate.csv +++ b/results/reaper/merges_tested/medcl/elasticsearch-partialupdate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2cffb48e7b98f31e05feb82b21bb15e46b28493b,29be22f2982ec1d94929b4222e10d9a11bfa67c7,bfface3561126d5db1d340a8298e862bc3a8dd49,,True,True,Tests_passed,76241a787d3f93343b49562e74f00c70514451cd102aae740d65d00a7b558f9d,True,8,50,1239,4,True,Tests_passed,015633cb1c997465cdfdf7eed82105b59841252fe67eba77f3b5b8d3a2d238d0,True,8,True,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,fa5517c168d95feeabb2077254466d1b7f487964fd512f1b0dc1cb141ad082cd,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,7d39a9b8996cba2d0a74b19136b46e4c23a81bb78a66729964d4a33f8b8e0ab8,Merge_failed,b135f7cbfe42a8158a7f96630afbda5b3aee67ef875b978fa129b7dc7652e012,Merge_failed,53dc64fceb05f028c81cf2148c9dd0a4694e9e35b3416b3f602b5c715f7d2d03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,b2fa6e893f9d9627428a1046348e8bba1b4039b3d61c63bb6519421e1cf46946,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,220b51ded2e9387c5782601d31792091205e7dff31d706366b1c4ad0f2f9ca03,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,14314e8deff41b96d67744457bfe6accc20eee3f74e667b0deefbebec83c7728,Merge_failed,6945d95e8a8d9e5bc3609ca5754c9581e2c8785cde399d479e468804c8f56d8a,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,290b2d37e287094709035c77c8326d82dee4204ca6dd58bd34a93e60d0a7e730,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb,Merge_failed,444efc0580b3b052e2e7e68274afb8d852f532d0f87bed89577068150d0727eb diff --git a/results/reaper/merges_tested/mercadopago/sdk-java.csv b/results/reaper/merges_tested/mercadopago/sdk-java.csv index ace1fe5bda..f906b190c4 100644 --- a/results/reaper/merges_tested/mercadopago/sdk-java.csv +++ b/results/reaper/merges_tested/mercadopago/sdk-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,f60681aae04e2986541668b836247750833f4147,31885f3c5c4908aec7e7c1249dc024d64a623418,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,6,11,673,3,True,6,Tests_passed,f210e064229ce2f0391424a2c8ea155f49f4e6a83bc73544d0128bacf1b35af9,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,969d1c19cf4fccc8e137ff299f2a630189159b4cf48e1972db1df7494d9668cc,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Tests_failed,43b27133e46c1b5b0559aadfe5e78648b255e59edac201f885a589574f2b50a9,Merge_failed,22626f70e0c65d94d2bb284ae67a4ecae40e0bea04722f3b8254d3e1d5b3ef36,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,7e19be33a57271c9194387b0cd6e98dcbf1af77c2a6751f7e4ffac127dd48852,Tests_passed,9f3dfc6674e07b70eed411f6db6da4344b3e96ce02948de125da56049a8e90b1,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb,Merge_failed,2c3ea879003e8b23940db457290127e1c7762e1d1470a046e7847656b73cbbfb 51,refs/heads/master,2e09a545c1084699687e70b7d426cfce51f7cf7a,3c1e03c0192ea4cad0d0c2ee5071953b74d308dd,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,5,9,720,3,True,6,Tests_passed,59fe4f57ad7a6b8deda4f7ab810e80eed7a413c0587914aa5706df36d18b02ec,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,83f3d5caa611612e6b08a76144d03c6cea31d007543e9c65ff55b8c808b88954,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,83f3d5caa611612e6b08a76144d03c6cea31d007543e9c65ff55b8c808b88954,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554,Tests_passed,3990b234985e3aa56e39a74b82970171e889644b54915483229ebae10e5aa554 52,refs/heads/master,9a60e0b0670692444cef0a578af8477fde083789,7342ee129b23b6b243b4933a69649ad90f3b453a,78228de02eb44f771159020c833a8f4da3894763,,True,True,True,6,11,523,3,True,6,Tests_passed,17ca5a4cbeacd7cdc02c5c581f9610741375a5371e97a24dcb99868f8f98a39d,True,Tests_passed,a96d76388f5caadb8a817196f137e19fe4bf5788bccd59e92ea34551629359a7,True,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,186cc57f1b43fcc48e832dbec5510e184ad4272747d3cbe10612ddceea0abd7e,Merge_failed,59b93cfb7580a51c394963aa433830189030abdd9ef5ff07a5e36ca3a201e899,Tests_passed,d34eda486d231659d26e90c04ba59d7afaafbcef454ada3d6de7ff944e19818e,Tests_failed,c655958ef29b339bccb70cb6ca3a737a1235d3f0bdf0b57efd37cc0b5dc98c0a,Merge_failed,59b93cfb7580a51c394963aa433830189030abdd9ef5ff07a5e36ca3a201e899,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,188c4ad064654a780cdb8c5639c97779f96432ce7e986305440eaec72ae36e50,Tests_passed,d34eda486d231659d26e90c04ba59d7afaafbcef454ada3d6de7ff944e19818e,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9,Merge_failed,bca07044d0b55913e2bb4d017d676a8b0b5080767b543f3ea5296a8c3486bdf9 diff --git a/results/reaper/merges_tested/metamx/extendedset.csv b/results/reaper/merges_tested/metamx/extendedset.csv index b679459687..1983248737 100644 --- a/results/reaper/merges_tested/metamx/extendedset.csv +++ b/results/reaper/merges_tested/metamx/extendedset.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,7531f1e53c2080be0e20f1eabbbbd4e2ed3fd6fb,5521a5634e996bce73b45152db87141fb4d01c5f,523b72d6b645a4d92dfb6547332976daadfe23bd,,True,True,Tests_passed,a43c93fecc32649e98815a7234eadc7a814ed68a7b32ade72a2aa82bb9482197,True,3,12,51,2,True,Tests_passed,7910215742467bade0b9141025859e1c8c58120301fdd645ce7c096686cd3663,True,3,True,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_failed,af71a47697954474bb70b9e7f00e35fdc35a7f08caac3618889e735eb3b4b7bc,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,e1df91bdf0b2023ee53f355c26aaaa6b64e5ecd2723596a26daa2f17d5a5f15a,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b,Tests_passed,d22170949ff9e46713f7c726e44744d4b0da7accf2187c6a1a34b72ffc11812b diff --git a/results/reaper/merges_tested/meyerjp3/psychometrics.csv b/results/reaper/merges_tested/meyerjp3/psychometrics.csv index de63adcee4..2b84580f46 100644 --- a/results/reaper/merges_tested/meyerjp3/psychometrics.csv +++ b/results/reaper/merges_tested/meyerjp3/psychometrics.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,f90c2bd3c3407128d60612613daa8b5e6c509fc7,0a883ddd4ebcc56a9028663e1273b0d50fab85db,06a7ae98fadbd19b1f49de3b6b209e4b556ce4ec,,True,True,Tests_passed,85d40de620f73882f0bbbdee3fd7ac87e2a188c4dab59b2386ee2b30a0b239e4,True,16,35,339,2,True,Tests_passed,64c27e5d6d67399c27f40815856fe49be9054640815f0b5995c8b8c45a23d0e0,True,16,True,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_failed,9abba648278b024d95629a69612fddf4c9f8bd572b454af3b5fadd5536a34838,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,09aa9ae1e12bdc8579ef45da1578d42c3733c4bc586e61e83d7500bd05c48222,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626,Tests_passed,c03153ce0bbc7802568d7c596ee9bf679e50ae6f0948dc5ad4f9d4952d8bd626 diff --git a/results/reaper/merges_tested/mh4j/metaheuristics4java.csv b/results/reaper/merges_tested/mh4j/metaheuristics4java.csv index 8bebac5869..cbcc8d3a0e 100644 --- a/results/reaper/merges_tested/mh4j/metaheuristics4java.csv +++ b/results/reaper/merges_tested/mh4j/metaheuristics4java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/develop,78b481eb40f47dee1a6999abd42abf74ce1bba9e,ff1db58980b33481f6e04b8b9dcaeca2acf9e264,0d540432feceb6995da964618a4a4d016a753608,,True,True,True,50,68,2151,3,True,50,Tests_passed,67fd92182d5b04492c24c62c766ae39a1139ea86d33472123430b7e25ea71f6f,True,Tests_passed,a5d727838d8c45ebda211b42d1227cf322a76a39b303160f95ad3d040d16f74f,True,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,92b845cefd5171f8dc139ad9ebf5c78538adf463d9a6fd9d8df3248be76355bf,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_timedout,,Merge_failed,00f02d1173ffcc97f8abfcff6db6e31a21489f585e096218868de48629c9ae11,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,c9123521e1265766c6960cb962f076cb19adcad47512664dc3995d57652df3bb,Merge_failed,086cd234b44bdbe285f8dc78f1d43a59c72fad60d6aec7cd17b8c21822a5a0ef,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e,Merge_failed,48078be36cd113c6e0001f74b0c76a611bf7996e7f24b4bc27101730c82fd85e diff --git a/results/reaper/merges_tested/michaelwittig/java-q.csv b/results/reaper/merges_tested/michaelwittig/java-q.csv index 4debd4b53b..8d8c450a87 100644 --- a/results/reaper/merges_tested/michaelwittig/java-q.csv +++ b/results/reaper/merges_tested/michaelwittig/java-q.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,f40f420b416029849a73c6af3de3644db2011af5,b8a193e57a80d4a35b734d7a1500cd4387cc5c6c,0498df2c05d977eb0f376bf12f6b95d93efd1d53,,True,True,True,119,345,770,2,True,119,Tests_passed,2d2a612628096e5db1f58f5060eaecb56bd0f02c1f54d8ba5389dfd7b46ba1f9,True,Tests_passed,a6436b451d43e9d1e64cd89a22e4217b8a0466ccaa78c0fd2a45636d618ed5a4,True,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,17687bdf5d50b2c258ba034aa4c83e5308a91bd2254116953ca81867c15a256e,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,4599a8fa56af0e59c00d8c889a915ed4211e7170b3b51e76e3a35a1912c11cb8,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7,Tests_passed,87741efbfd9e0de2897ab70fb00fdb2e098c3edb2e80e53fd4ab557b86b5a5f7 diff --git a/results/reaper/merges_tested/micromata/javaapiforkml.csv b/results/reaper/merges_tested/micromata/javaapiforkml.csv index 09ceeb9010..db7d943c1b 100644 --- a/results/reaper/merges_tested/micromata/javaapiforkml.csv +++ b/results/reaper/merges_tested/micromata/javaapiforkml.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/30,c3c171b056ff1302482dddba02d6b49df4a15c3c,563e35bb09ee5df5119788ac6b1073879d103076,8c86cb6d3332b7112ae3f8277bebec199294e211,,True,True,True,163,4488,12023,6,True,163,Tests_passed,e22db7c67148c51e38dbb4c18a5cf7650ff5ff80d59dd71cde43da66ae2bc23c,True,Tests_passed,62a6dbcd928a1efcf016883451c5a98f44097807f4df61855acc5993bb3ca6e8,True,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,734bfb17bc05d63eb0195f72099dfd84c6d4363cb0fed7cde82c48def58dffdf,Merge_failed,413f4404971900f1d68788c8683f949a3a93a22f6fd013a1199d08fd594deec2,Merge_failed,e98d3f0979804860877ec004c1a795573f0bcc3eede4364e8021ac7b0bc56045,Merge_failed,88c1867fb3983ff0219a58d05137b519eae427fb3deb4553248abdbcfaf0a30b,Merge_failed,413f4404971900f1d68788c8683f949a3a93a22f6fd013a1199d08fd594deec2,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,85ebdd4d169bc81a162027ee48b2af155ae0e136f88b29a9dc75417acb933262,Merge_failed,45dae2ec7a0bde5fa568f3a49ddfb79f6e1139f65b53d37764dcf69a806fb547,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,0e15d923e07e69b67eb8147f50fd4fd005f2a9320f55477fd10568842a955181,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7,Merge_failed,844a6183058932849a089d5ccd0b2a5a1bbacfe86bbd8fc136459afb673685b7 9,refs/remotes/origin/pull/37,524dc619303f36bb3d0d04d8b4ea0bf72ad81cee,f31e4d3136564156e62a7adf65198fe1cb678237,aab2ba2cac18ef91bb8b3ddb1caed32339ef927c,,True,True,True,134,4063,10473,3,True,134,Tests_passed,799345aba19456eef37aa4a28d93dac4046a2b3b1e5fddf970f1b0d0c6b8299f,True,Tests_passed,c51fb7814584d0ec77c4666e8b3ea5df58d88432b987da64c88d20593ce53ad0,True,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f20e3708f15fabafa3cf02e6e2bf45b200057caee616a729caaae0ab14909dbd,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,22b5a83225ee024cc0529509022950ff97511baf54ef58dec35afe2f5c6afce1,Merge_failed,5b3af849f9bf1cfeaa507c7b7777d65ff63f0fe362ef4b07ab378431157df053,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,f6d4c141fd5be0d7c21641f46aba6df6f28a7937e02f39cbb37b073b9a0e082a,Merge_failed,c2cba1e383912c391d8923c0b2cdac70bfeb658f38412e23a816e980134ba048,Tests_passed,d237d2a3c5eee6fb1d9bfd26aecb013630f3e3fd81d44b8cf9e4c8254b4d72db,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a,Merge_failed,2bfb3a1026fe7a9a65334d40c6690f3df2cf260c93c495cec7cfa0abdcb2170a diff --git a/results/reaper/merges_tested/mikaelhg/openblocks.csv b/results/reaper/merges_tested/mikaelhg/openblocks.csv index d8cfe9dc98..6bad637a82 100644 --- a/results/reaper/merges_tested/mikaelhg/openblocks.csv +++ b/results/reaper/merges_tested/mikaelhg/openblocks.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/remotes/origin/pull/15,35f56250677614f525c62aed43c386e9bce16384,762dfeeab5f471e8cfb38faec23e60bab63e478f,4246e102c544b2cbdf4f505f9b6062d47f14cc09,,True,True,Tests_passed,bf475db3f470c6bed4ac85e38fa5a84dee08dcad82339d915bf3dd6d42973685,True,4,8,39,2,True,Tests_passed,e534be948a8101823c23621fc41ccd41522e2f1e32793366c9a9409f2a5403e4,True,4,True,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,c4d86d74265ed515f8a25748c84e90f2cb3a4b5201f37ee374683b1186f05cdd,Tests_failed,1f5aacfbdd2b3fe3cf4685b60d42ce24105a8be22f8a33bcf918294e87f9ff92,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,c4d86d74265ed515f8a25748c84e90f2cb3a4b5201f37ee374683b1186f05cdd,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b,Tests_passed,05bbbcd4621329887ec7a17f16cabbb57040d267ba402194906fcfde89c8437b 15,refs/remotes/origin/pull/16,fed14c0074c778058c5c6407c0d3851a48745643,3d42bdb33d25151c7eb51be29b54cd79f18cbea6,76f96715817507d662dba476143d4a55649d8eae,,True,True,Tests_passed,f8e6b84c9aaa9bc92ea713cbb039114bff61a8586664a092462e9fd04cbd63b5,True,66,512,1962,20,True,Tests_passed,278b9ba2cf765408c336b00d7fd29b42564ebfc9a2d2fb55023a0122cebb3bd3,True,66,True,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Tests_failed,61b1d0e5f7ce0b98342c75f7b0369a23127f0778f16f09e3943333f648804074,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_passed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Merge_failed,cab0204dbc6f3b1819051da1eb08f792fcabdefb7c1f98b2e5c842dc82d67028,Tests_failed,9b76b1b9fc9953e43c417a506678d914f4e1f106b68c6e6b2d558e2cb4655ed7,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d,Merge_failed,7838fea1573188c1acbb82bf4da763cc6dc5396ceda6bb5d73d589b13a127e8d diff --git a/results/reaper/merges_tested/mikera/vectorz.csv b/results/reaper/merges_tested/mikera/vectorz.csv index eeaced83a7..d2fed41903 100644 --- a/results/reaper/merges_tested/mikera/vectorz.csv +++ b/results/reaper/merges_tested/mikera/vectorz.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,a05c69d88c29478f38bf084ae736e64414221a33,e8c98f5bfa72adae5666e283fcfde46234972b84,9c688f13e9dc3c6d78263c3522593ab8d4bd9fb0,,True,True,True,263,2289,17369,2,True,263,Tests_passed,00d95835fc307de35f6c61680399dbd69a45cf19a4c09eb726a514ab7a4bf2ee,True,Tests_passed,374b7af21ad024236a57134fbfd8eb82abca9e136779afa286f1bb4594c2c617,True,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,b9172feedc1e80402fceb94887fed47c69356677288db0354924f0d867cc1af4,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,b9172feedc1e80402fceb94887fed47c69356677288db0354924f0d867cc1af4,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3,Tests_passed,83363e926f32432d05fbfb0189dc3b02ed739cb749bf872b0e4686f65dc4dcb3 8,refs/heads/develop,e1fd48e86462089ff00266aa866ee93a84b46c34,c070074e969780a9f77e6889fe0cacfaca1c3407,a223ab64a79d0a5edd3146732965fb2def1bc2a6,,True,True,True,240,1907,12981,4,True,240,Tests_passed,645a5623f957a0f328a4761bb2ee3fc83850d3159783640f05f7287bd20cf9c6,True,Tests_passed,42793e8a3d0ae9459a053f3b019e3db90dfe10072c7e5ad8ba73e307e49e868f,True,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,5cc6802ca823ac4d5f5ab0dcd6b9df8c4c0b7e4db6bda422f99e31dfa8be3930,Tests_passed,919e1b55d7e431189abbea072c129365ca2e4b1676a15478024ce047867f88c4,Tests_passed,503dbe11f88b7c35f25ca5966810354d2c43ec71bd81c93eea8911d79f189022,Merge_failed,d7e308c0323717d7acf7e1247800cee55089a3b19a3e2ad4054eb542513e9486,Tests_passed,919e1b55d7e431189abbea072c129365ca2e4b1676a15478024ce047867f88c4,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,6ec65373a7308334aabb36f241202506384c8e56f1dafc57930d7150211ac56a,Tests_passed,503dbe11f88b7c35f25ca5966810354d2c43ec71bd81c93eea8911d79f189022,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52,Merge_failed,1ff4030bdec558b43be5dcca0b38a9557b6a603e36a57e476d4402984406ae52 20,refs/heads/develop,d93ef1b341f6359c6e15cb8b4a6582eb85c473bf,507607c7c2abe9bc17dcdcd8ca33559706942a3a,a5dd418e61e334deaea564260dea70a3e4498ddb,,True,True,True,20,34,117,2,True,20,Tests_passed,a1f76e19369ea701b92ec2728a7b9db63bfd778c6ef36bab0d18ece3c0773421,True,Tests_passed,cd658510ce4731918d6b5d772c89bf2fc6e40eeac447742330cca0f16282af36,True,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,dfe4f9c587d488907367f99e62b71de98c2cfeb0196a44cd01dc2aa02a886623,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,dfe4f9c587d488907367f99e62b71de98c2cfeb0196a44cd01dc2aa02a886623,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c,Tests_failed,b717b24793a3abe1b99ab3f3ad9c42601c8498a34f8d2b8a11906ad814e72e1c diff --git a/results/reaper/merges_tested/mikvor/money-conversion.csv b/results/reaper/merges_tested/mikvor/money-conversion.csv index 103519e4b9..85c99d70e7 100644 --- a/results/reaper/merges_tested/mikvor/money-conversion.csv +++ b/results/reaper/merges_tested/mikvor/money-conversion.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,6d3819f26610029fefcce1ffc167aaee1bb7bc1e,31be65589b3b2748955f250f04612f35a84e5d0b,9cba67b86200dd371c86dc904e510ebb208a3e07,,True,True,Tests_passed,b63256923a405fa6a5325080070fa61c4c59ea40eb949933bd675b3023b6fc9f,True,5,6,61,2,True,Tests_passed,521bb34aaca81e71bf6594ff8c8dac549874030ca9a9a57f0fe0593f2feb2111,True,5,True,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,024c7f213ce66e734684e3758c4b18b2b22ae175fa685964df2b0e21733efaf5,Tests_failed,50fcb8ce451edfe772fbe5b1f19e9430058e97b9889a7559156776e76c030223,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,024c7f213ce66e734684e3758c4b18b2b22ae175fa685964df2b0e21733efaf5,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711,Tests_passed,a1783c1439664d1b6588e8180d64ec31431474ad17592e99feec66ad8d8c9711 5,refs/remotes/origin/pull/18,7fd58e662fac159f87c3d1f8980001c7570e615d,f4b08d593619144bcf293727980ac768eef70459,9e6bdb77d6178f61a8e12141628076ff289c5f6a,,True,False,Tests_passed,0506d34bfb48f879bfe0438a51539ff0345f9ad7bf8bc7061fe1a47acbf66908,True,6,7,97,3,True,Tests_passed,9a88b5c690992e2343df2bb870cf213ea8beb199e3805c8c03a38ff37e50f203,True,6,True,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,99e456e0c5c4c36f64a184a7e0834585836fc191dddf6e2824ac92994c96c2f4,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,be003950ff9086d7218f1e0679ab5347e3e13f6091af1e2265f1c8b78c681e32,Merge_failed,f7e916bbfe77637de31a558801f4815cf2e2c05199a1bb2df16a35b8fd5a49d2,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,491c1677bc4f3d05c70de902eecd405caa58c158f64e7c17c61eafe3205e135e,Tests_passed,142c83aa7e8bc34c54dc17936fa544c10eff79268ddda4fdfd6c199dffa39843,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,11bb448460cb84b4b16e06e6dc09be02cd0097e277af127865ba315af98f7147,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e,Merge_failed,f4a4dd628cd4d3c8c89af2cf799acb30bde010274a1e9d6ab7f21ecf3ee6dd3e diff --git a/results/reaper/merges_tested/milkbowl/vaultapi.csv b/results/reaper/merges_tested/milkbowl/vaultapi.csv index 17c1eb0d56..03e6846554 100644 --- a/results/reaper/merges_tested/milkbowl/vaultapi.csv +++ b/results/reaper/merges_tested/milkbowl/vaultapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/152,513fa83f0bb1da4b5a94904ddf3b65fa2dff631e,9520d8847e2b31f4a9d2cb5f7831c38877cd0ce9,7c7d0abcc2a89011a5bd44f67088d6446c7cd676,,True,True,True,12,23,2253,2,True,12,Tests_passed,a2c14020634374718d5b0c0f7d5da4fa70eea8d3dba2fbb9971d4642c39c94a3,True,Tests_passed,86e383c6710dd7bfc11604d004af9dce50edf16bcc0325d8a0a4cc354835216d,True,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,1711709ba200ac27e11982c6f527e2a0fe78646fbb9e5ae2bf4a04e278092521,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095,Tests_passed,99bdc1eca80a30394009a7350276c301f42a262535aa12b58f3d42c9b9d34095 diff --git a/results/reaper/merges_tested/mimno/mallet.csv b/results/reaper/merges_tested/mimno/mallet.csv index 66a1cacb48..713a4f680d 100644 --- a/results/reaper/merges_tested/mimno/mallet.csv +++ b/results/reaper/merges_tested/mimno/mallet.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 88,refs/remotes/origin/pull/174,a1f4c0a32d1da92d486d022bd1b860cac1285580,808668f25eab6bbd1282e1cff5c0594c8673b070,12487de1aa6433bdcf5af0ee0a17b368e64c7acf,,True,True,True,129,1280,4680,4,True,129,Tests_passed,e7509a93067c48b052332a33a4def32a041597470d2282c4f84a53b52158fabe,True,Tests_passed,f4b5a13b324f0d007132c101e5ca95e9bde8a5db2ba00edc1bc6810990ec4cd4,True,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,8a4509d7fe7397f9dde0f0ad3679d6779e7037af6538e0d011eb60ef97bbb613,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,0bfa52ac424b4f8da70eba90a2850c59aef193e5fdd9576b2fdf2d35b649811b,Merge_failed,3c31a28e159f073ee34822b81f9298650fed7bfa4ef3df42b0734860508c9d73,Merge_failed,96e984abe3927ca7f349a402f52226a7229f8d56e0de437226a13a6f40d9a132,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,953567ebe844d1b3cd868970f177d1ae15c1e23ec6766e7613558bbabe4896fc,Merge_failed,c8485b163beb8f521e935d4e8855e758e6ecb5a77fdcdacd7d491822f2aad190,Merge_failed,fe4f37ff30d613cf4916498122d991938ecf2c30fdb56bc0df33fb69ee152a01,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,08c7d72153e953463cce31911bbac391ffd4dc6e6c60b4f262da29a73a0386c1,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb,Merge_failed,1938f31b9dbfa99f9e237f332486ff60070237b25e960e777c167405cb516edb diff --git a/results/reaper/merges_tested/minecrafter/bungeejson.csv b/results/reaper/merges_tested/minecrafter/bungeejson.csv index 077801e55f..2a5938455d 100644 --- a/results/reaper/merges_tested/minecrafter/bungeejson.csv +++ b/results/reaper/merges_tested/minecrafter/bungeejson.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/restful-api,0b724f363a57d505cd080c459b42edd48cf57891,9a86a05971b5552c08194dfedaa054d5eac16d8b,80ff9723e4368f5bf84b14dce399d7912d6abce0,,True,True,Tests_passed,4e43cfb1aa9cec3de65d3a1d1dd9389e296fef1299599c7ef39367fa616d2594,True,19,38,171,2,True,Tests_passed,2fb281682c5cd6c7a0ff5628c1b18a580c7658b6c73edaaf1d7934d1eb91eac2,True,19,True,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,be5285d5a4e2367c30e70b7817b4ba0ee5e8e7aa7856b9d864d72775a12da868,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,b48e5f0d56db520d244b2e349c40cebf452e19fc094a54c7dcbf4558467a4ad2,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d,Tests_passed,0ef04542cd602296955f171583f4b659548629e865a8f4aa87b2dabbce125e0d diff --git a/results/reaper/merges_tested/mitre/http-proxy-servlet.csv b/results/reaper/merges_tested/mitre/http-proxy-servlet.csv index 2cd3f64f70..4698a5d647 100644 --- a/results/reaper/merges_tested/mitre/http-proxy-servlet.csv +++ b/results/reaper/merges_tested/mitre/http-proxy-servlet.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,82c69770ef0ebe40519b75f68067fc29d158734a,d9b90d18cc2d1c19ab312c92d30eb5be363cdbd3,5d6e362230b46d07881bfa679d821ddc2cb3e225,,True,True,True,3,7,89,2,True,3,Tests_passed,611078f2ae6c97d37ee7ae39230533953c9aab874bf35284d981ccdfd4d526ec,True,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,True,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,d55b913a9e8866fc42232a44ca60f5f9494657a65572b93993c52d87101e0951,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,d55b913a9e8866fc42232a44ca60f5f9494657a65572b93993c52d87101e0951,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21,Tests_passed,3371defc613b562050769203b28bb45fc0ea804a83fc1ac9c66fc548a8d03c21 11,refs/heads/master,73da1ecb003abb248aae7b00fa554801baff1418,89f7168fa870d7f726185136517c5d52467d73d3,41a79b08bc07511f7f68b193054b19360fd48838,,True,True,True,6,37,204,2,True,6,Tests_passed,0c3a39385c0cc620f4f2fb45aa41bc487862513285efbcfee1272d528fd79bbc,True,Tests_passed,25eb1363d17ad1f68bb841db44f81929ae6cd281015ba990ea9f87329a762b8c,True,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,b48a3fc1ef43466160d0e466078be8bb105a9d90e1e411d9b0aa4b779c8adb58,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e,Tests_passed,e20709540711fda8a1b68e2c03de1ae419900de6a3624945965b4a91a1c0017e 18,refs/heads/master,fab3d1b12692277cfcad496a669c21660c1a3b05,a31f484c0a565fbdcd22fa1b1002de0f3e46dadc,a16b59f2de279178364122d9e8ae3dc5164f7d0e,,True,False,True,2,3,13,2,True,2,Tests_passed,70a03524094caab99a403d609dfd37954044e92a7a279d39a84dbb9ec0475d1d,True,Tests_passed,bd2ff7cf2fdbc08665e011e6dfecefb2b27655d5100f364a39ec4ff287c805ac,True,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,08f1573a2072f35c1ef0da54cadcdda4ff8a521b3c4becc546b771d2f9961762,Tests_failed,0768bb654df787e0d42c518fd2e9a8bdb1d4fb2942d526ad256a38c2d4b86301,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,08f1573a2072f35c1ef0da54cadcdda4ff8a521b3c4becc546b771d2f9961762,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f,Tests_passed,ff69a9d4a7c099c59a5985ab300bbb292d4b5ac9be61ef5295ea46cd00d3e47f diff --git a/results/reaper/merges_tested/mixpanel/mixpanel-java.csv b/results/reaper/merges_tested/mixpanel/mixpanel-java.csv index 7b79bf628a..af118f7c35 100644 --- a/results/reaper/merges_tested/mixpanel/mixpanel-java.csv +++ b/results/reaper/merges_tested/mixpanel/mixpanel-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,bcdd1ed28f9b69aa8baa6d7d44e292f4d8e8a236,7cc869766660614944e59e0f153f3fac91e654af,dcd372da803eba5bf6ec38189647f005634b922a,,True,True,Tests_passed,8c5a9a45a6651722aff61e1c8d82077152d3103ee3f03856178a7c1ff4a23777,True,7,24,77,2,True,Tests_passed,e70b6084c60ad9db77a6c5d49ffce05898631fbfde7f7918f1a827665883e10d,True,7,True,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,2779da433461a80abd106d1cca374ba1b1c45c822fbf59660cb1fb0f95b6dd1d,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Tests_failed,582ac54c96f77e8814ab0eabc18295fc08fc84ded7d2a2d305873343eebd879d,Merge_failed,10e0320a347ed28e1c7d69dc0da481c1e85115fe82ad3ed10165ed2735806a31,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,42607504ec4a0ebe1ca3dc2f057c4365ec54944b04a9b657d32926868d677364,Tests_passed,6c4a1b1826b8c9b1f5ae1785a3bd4a1319c769e8344e2df65572ca7dd480f7ef,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4,Merge_failed,b6bf8a289a7288301565e908c5e8216f5d3bcebfe2d805d0ab1a06fd9732f8b4 9,refs/heads/master,7cc869766660614944e59e0f153f3fac91e654af,9e386f7f089bb0f9b342cacf5844ca78e36d37c4,8dab459335da444a242b4d895a790d0cb6385365,,True,True,Tests_passed,8648bfdd0699e78e2a24e613d7f72a5514d15c0acca5c22a7db99a62bc3e279e,True,8,27,79,2,True,Tests_passed,4163d9a50282b0f6ebc6629653e5b9b6857cae19d7b30541ef2963ee147ebb22,True,8,True,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,fd37112a7bf0e55221405841b0020bde7cb199f821a638cb2f6c2fd7c8596439,Merge_failed,99a9aa1d48bef4a77f9fdf05a6d9c8a1d7b92b0857f62a4897b88dbf0c47db03,Tests_passed,8b19d46a41e8c6be76e000543fd8c994b78dc0b5ec06d924d43f8d5866a58f26,Tests_failed,23ad341152147a9b2d698edde1c9859e9062d1ad68bd6d3df53dff0846a06a81,Merge_failed,99a9aa1d48bef4a77f9fdf05a6d9c8a1d7b92b0857f62a4897b88dbf0c47db03,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,5ed5a8449dbb9b3584abfddd551833bd87d5954a754db4fc763719d787fea434,Tests_passed,8b19d46a41e8c6be76e000543fd8c994b78dc0b5ec06d924d43f8d5866a58f26,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8,Merge_failed,dbbc0a1968964bf28a177c2a6c822086434169dffd316eaadd26240c885e8ad8 10,refs/heads/master,a318fdd72fad23f101a76f483e9ec1bbdd57ab9d,1f53754583fb2ccfc3759f6c5611bd31faf1b925,8dab459335da444a242b4d895a790d0cb6385365,,True,True,Tests_passed,6693b78cac89f0ffc0f150b2630afc2017296fb8e621e9149b96080f0d807943,True,3,4,7,2,True,Tests_passed,4163d9a50282b0f6ebc6629653e5b9b6857cae19d7b30541ef2963ee147ebb22,True,3,True,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,fba7ac42d5d80b842884f7029c641cc99c987bc3ade252cc5f9550e404c7d426,Tests_passed,cff27ec973d56f0ae8368e37327069e8fb962d03431d7fc3110a5d3c05866558,Tests_passed,9bf2389e4bd03d198c38961285c072131a0c746cf72618e275339b751aae09e7,Tests_failed,51dfd2499fe62575e9523f0f4cce64d90672928b5043d9f42f78f194edb17842,Tests_passed,cff27ec973d56f0ae8368e37327069e8fb962d03431d7fc3110a5d3c05866558,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,9dd91c4160df5f1f91076a50fad53d477c036f9573dbf4a8ef4e0f2bd81ff969,Tests_passed,9bf2389e4bd03d198c38961285c072131a0c746cf72618e275339b751aae09e7,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9,Merge_failed,bc303bbc65c09ff85bff70404be625690ba9bdb8bb57fc4be99d503ca81b23b9 diff --git a/results/reaper/merges_tested/mjsalerno/unobot.csv b/results/reaper/merges_tested/mjsalerno/unobot.csv index a07b08e173..da0d8f5789 100644 --- a/results/reaper/merges_tested/mjsalerno/unobot.csv +++ b/results/reaper/merges_tested/mjsalerno/unobot.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/27,716a704d8b270ce23f86584b7a611866482c252a,dea483d77ff8b1c3832247266a697ea556cb31ee,2de6af42d0fae77854b7fa9da25403f143fb59a0,,True,True,Tests_passed,d2d472f4e79a835f1bcbad93747f0d2494477227307f3c3b0a823c37cb70724a,True,11,20,44,2,True,Tests_passed,bf996ca6da45a143600aa7d689bd45e0444d1f0b21f91a1cc5c0f55071fbfe28,True,11,True,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,d0989375d7573c2967d7f1e52fce4f03c34500fffb642b577a19a09fb1513be3,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,d0989375d7573c2967d7f1e52fce4f03c34500fffb642b577a19a09fb1513be3,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58,Tests_passed,8c2fc154af3f5a3dad38f25c4e5b1fd739c5cf8df4c846c9e6ecb207642a3d58 32,refs/remotes/origin/pull/42,5c68b52897a24a9aa71f0ee807a37f04c1f997f3,7c9a626e059d1f481130d6de69cdeb79243d8ffc,50f00c42a551b152e5945adda21c0a9580734ca8,,True,False,Tests_passed,da5d9cb924c723c919a0805ef1b79ce0b170172cc44217e4b40a9c6de8211a3a,True,3,26,53,2,True,Tests_passed,07125af5f670ab7ae858ddcfc5fa6ec59148472bc595e74a13c501ba831efaa5,True,3,True,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,f140daa966c14fb71a3217da340aae01f338f821681ddebd34a036d0eab9739a,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Tests_failed,1983e3d49975e2204e5df53a46173847589452e350a92b295adcc240fb50cb61,Tests_passed,d98cf04a194022e4fba02338fa80e30b98b3ef54f53b68558ccd656b18979d9e,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,7ddd313659c7647087532aed2268414baa83ca52c1c49ba1f4f95026ed97833f,Tests_passed,03693fe78a09fe824ddfcfd92bee4be2accfd2b8100f26d37b5d6a7b8e5d65da,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf,Merge_failed,63b99130b8896d4354a437bd3fc9f0c3bab9aa32385be4faef86e1d9f119adcf diff --git a/results/reaper/merges_tested/mjsax/aeolus.csv b/results/reaper/merges_tested/mjsax/aeolus.csv index 63fc16d153..bf8150fc9b 100644 --- a/results/reaper/merges_tested/mjsax/aeolus.csv +++ b/results/reaper/merges_tested/mjsax/aeolus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,85127f4c5b94cc63493a78baf3bcb0f703a4bca5,9863d87774e76990b823efb0c6dbef3132084438,71bbc8afc3cd487cf847377e54251c8416cc1e49,,True,True,True,52,160,1472,92,True,115,Tests_passed,a5049851dccb1faab38ce136e46912bfad21b98691e4d74f903a71f5985a9e33,True,Tests_passed,4aa0e05f3da13b5a1f192fbccec0b9d0f53fc6b7d359ef49feea494f51bb7689,True,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,50e627507ef4e7321302b898913e7674875934dd3412fd99a40efc515837c97e,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,02a2bdcb26285c666c17f15947dac5b4dc202113b542b348442014380fa8904b,Merge_failed,fcd7636d431de19b73b6226fc650de58ef7a4b4d12811cfd199ff60b796a1634,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,df947a9511c641de6bcd8d1e8e5fabbc1351caca46cb3fa79143b8e1c4c7662f,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,ee8af4e489606c0826a73aa7b41df9313b01d20f9d7e17c539002c9d1f2adcd2,Merge_failed,cea2095df91dadf8506402663ee6557f8ee46b9638b637020029f31c25952337,Merge_failed,bec1c1c79f00b1ebaf79b7131878de2387be805ec1d1fe9056350600e6c63d8f,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7,Merge_failed,f64424525e3140554ea678bae7b29b69e6036010030f34a7aa1825e84f7e8fb7 diff --git a/results/reaper/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv b/results/reaper/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv index dfaead0d84..392579d164 100644 --- a/results/reaper/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv +++ b/results/reaper/merges_tested/mklemm/jaxb2-rich-contract-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,009ccb41c98fa7b0e3882eda5bc247b80715a169,0a55df3366207b1d38e81e468181949e1d53881c,43689ec1ae3954706b5deae283af80b70fc83ed3,,True,True,True,2,11,151.0,2,True,2,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,True,Tests_passed,794f32ccffa1331220a581afeb6905ba65726bfc01a1bca1894a38fa86f3bd60,True,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,9f40a95cc7ea48a105fe1d0931d4beeb8a7c892904203cd6f28536fe6e2a718e,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,9f40a95cc7ea48a105fe1d0931d4beeb8a7c892904203cd6f28536fe6e2a718e,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f,Tests_passed,acd1e207a54d65ccb4a9bad41514f6e788a78819f6b00344bb6ccb9a3bef356f 8,refs/heads/master,0a55df3366207b1d38e81e468181949e1d53881c,e1a4d4058ac0a67fe00970ba020d205f7bb068d9,dd7ada0dbd4efe4681fb530d9ab1273cd5ef5910,,True,True,True,2,15,167.0,2,True,2,Tests_passed,a931f70215bee43c3256dbeb50fdebc91f64a34bd7c010172141d8a677f1f5f3,True,Tests_passed,547099c7078cf1dbcb3272f1cb561a14c534e50dd7c437d61fdd7a71fdfe60b2,True,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,2c21fbbf716c86bc7536835e02423dfb8bbbcc1e08d5c20112179d603a9b1f7b,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619,Tests_passed,289cb79ad3bb341e1dc48888bc3341a711dbbeec34cacce10987a6b3d24e2619 21,refs/heads/master,9b9fd9587c7bfe1930c693b902fb1ae8e65ed360,4a6b11b38192da9a5a27882d09c7fdec2dfb04d2,5020fe446eb279ec1fa9be3c0ad3f0dd45714521,,True,True,True,15,138,680.0,3,True,15,Tests_passed,27f404d6a88ddd183d6fa996bb3a3a1b040b001fa7a1ea28c7a609e1e250b62b,True,Tests_passed,3c342992f3c1e10734e1e20af0a5e643bcb4db338f410eb6a9c616ed66454f97,True,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,bbfcf9ad74d6d6a9c5a91cc357225e5572717b83d64908e7883e503badf4e1a5,Tests_passed,f2b35215752fe07f3ad6c49b26d4198abf7503cbc9658335c5f943358e95ffaf,Tests_passed,cd7e238b54e03327003293e7b08da910671915fd32601b3dbb914313e97f85b5,Tests_failed,86018c05aa67973a8bee7d2a372e794886a5109f44aa3e4a68d41283e5765f90,Tests_passed,f2b35215752fe07f3ad6c49b26d4198abf7503cbc9658335c5f943358e95ffaf,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,2313cea4c2d934caa562a35697539614a7d2234f69b8d6330febec152eebd410,Tests_passed,cd7e238b54e03327003293e7b08da910671915fd32601b3dbb914313e97f85b5,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3,Merge_failed,7651740f4f5d1886899b0c3091470651c4a9f68846478d914f062415dc8e23e3 diff --git a/results/reaper/merges_tested/mlaccetti/javapns.csv b/results/reaper/merges_tested/mlaccetti/javapns.csv index d6958ea18f..254d2380a0 100644 --- a/results/reaper/merges_tested/mlaccetti/javapns.csv +++ b/results/reaper/merges_tested/mlaccetti/javapns.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/develop,51f78090f2a79f6de2fd0fa8df011a93793be24f,e8ddea5897afe6ecc5450265070dbeb226ba2588,1a3b869b27f4a5e48b9e6dd1c36739916e380393,,True,True,Tests_passed,1204b5b49bb4b8347abcae32a25cecd4a020894fe5aa8f23f7f6cd3f7fe57486,True,23,128,417.0,6,True,Tests_passed,f37a42d341dea310a51a21c8f9e79d488d84eb2a7022f1efef33e1b868d4b69d,True,23,True,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,15999d552ca3d4c92a5ecabfbc0792137c5a0fa58e3a212c89f39575be198fcc,Tests_failed,22726cfa2df2baffa938d8b149051fe60edfa2458207c677f67e16b1d3543265,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,15999d552ca3d4c92a5ecabfbc0792137c5a0fa58e3a212c89f39575be198fcc,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,0369e1d49c44361dd9d325075a5811465f6b78bf7d8234df93de13c198cdd527,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e,Tests_passed,4775c8b87f8941f281dfed731644123be317940eb41f050ad30bf818cc69425e 3,refs/heads/develop,413b36b2eb8345ba9226bb29894aa908b78e1f23,2d5ef5447267fb2b50ebf753103505f84605ea6c,f7ebeb852ee61b50638d120d44b4e10507ae553e,,True,True,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,True,22,116,350.0,11,True,Tests_passed,910b3f21713eafbd9023948b36bf28d21ff51d6c062b4fd0060d67acf576392c,True,22,True,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_failed,43d99a960e82c4fb71338ac1bc4287f59e1163d22a690bc8c4f3a80e42f959d7,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c18c32c119a2f273617a06c23049dfcad8e39591b3109bff8583aae0e479e055,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,c7c0a648184c65d9970b95613bc041af78a20a927ef2722f1b3b9b8a935fa748,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54,Tests_passed,f2528a52dc4a0bf1e33cd5226eb562efdc5649ea55a61473321a61efb1055f54 4,refs/heads/develop,2d5ef5447267fb2b50ebf753103505f84605ea6c,5fe9fc977cc702b4b6bb69a1da1ded1e7901d12f,af02cc10af5004480c393559b146a4220a3b8101,,True,True,Tests_passed,ad11ccff0624ea013a898f9ecf4f71d29e4cb24a3d47f0259416de6004e14448,True,20,88,267.0,4,True,Tests_passed,dbc42c1b8f004eec1075fa7dedf97ac06b5be3c088c84474b06903baa0a03a41,True,20,True,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,9f123fac11231a58f09b14f357d62238597bfb2c0b05c39fdd2180cfc58c83b2,Tests_failed,9e587e0bef096dac120097ae7480201453b83d04a5f968c051c1ea915f09487e,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,9f123fac11231a58f09b14f357d62238597bfb2c0b05c39fdd2180cfc58c83b2,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00,Tests_passed,6e3d5c86d143354c2f9eca68655fedea524bc02276539e5dbfc50b96977cef00 diff --git a/results/reaper/merges_tested/mmastrac/nanojson.csv b/results/reaper/merges_tested/mmastrac/nanojson.csv index c534fbd57f..01a8459881 100644 --- a/results/reaper/merges_tested/mmastrac/nanojson.csv +++ b/results/reaper/merges_tested/mmastrac/nanojson.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,73d6edc6752e3fe1296b145b5608b854aa69728b,4349800958493e77baacd9af44be62a898a0af97,3f211d814aa3b3c9339697353c7e171ede6b36a2,,True,True,True,9,27,59,2,True,9,Tests_passed,a92e85438ffdba4d151db15d991a1676dc888b29b9b9e25023167164f213c662,True,Tests_passed,769c66137a18e0047f812ba92d08ec42b3098f8f8b69ccbdbc651f116b656e11,True,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_failed,b21e02853994211a5f19bde64ac39769557b9f86f8e8e4b560d918e0cbaa7b2b,Tests_failed,7203deb84800cbcb4acacee7ca85ba13a5c1c458efa18edabefcffd2276b828e,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_failed,b21e02853994211a5f19bde64ac39769557b9f86f8e8e4b560d918e0cbaa7b2b,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0,Tests_passed,59093773b4a4d22f3c7e483cd8926cfe88af6620da7d1c4e0fc8d2317f923ab0 23,refs/heads/master,82385874bb4125a795bc67c7094df60367c096e9,9b02f0ed8d95b7aac915f3fa01632feb862c4751,c9523fac6ebac74f194ccae4aa151736d5c1385d,,True,True,True,21,29,190,3,True,21,Tests_passed,87de4b28745d7d06b89476de36e3a00891cf749a6af641094d0a0b42060dd23d,True,Tests_passed,dff4712663b33cd2a973726ca9a50144a76e05b16790b328c9448c3067a5a0ff,True,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_failed,796ea8d7be73534da3ae8ea253e24cf3f60033dd1c72ec9239992ad7fc7c0aac,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Merge_failed,a2a8a4fe0bb7d3336a19e47eee7490aa18808a23b3a85e0813a40e26ff0e0f83,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9,Tests_passed,7d56dc2f6cc2624134fd324ce0c03c9588d53b7911f8cac1d55398fec849add9 diff --git a/results/reaper/merges_tested/mmazi/rescu.csv b/results/reaper/merges_tested/mmazi/rescu.csv index 46587156ba..4fac31f2e6 100644 --- a/results/reaper/merges_tested/mmazi/rescu.csv +++ b/results/reaper/merges_tested/mmazi/rescu.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/develop,aa57149a68d9810ab14bab6f46d0add4f3fdf1d5,4150dc3394dafa37bb2d1c3c1e7251bec88ba0a3,43fc334d373f4491c6307faa51015550957e4b82,,True,False,True,2,6,53,2,True,2,Tests_passed,e13e55b385618bf4553a38d5d51e55c809132ecc8f51dd471128c6a998ee837f,True,Tests_passed,389daddeceebbf1ac201d7fa8bca5544e1cfffedffe8fded2befe761d868efeb,True,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,817e1bec4c0ae650f9ff7cffbadef972e7edc235f0d8962dac37ebcd74ea84a6,Merge_failed,3cd8a9ec17125a19f3b10d769088959cd4512fa49793711eca70558ce1a7531f,Tests_passed,4c1790a3b570234774ba239a743a75b131f4ea4d49d65372e8130305fe6e36f0,Tests_failed,8a7ed1029ee1401cbd5fd7b58ad9b2ebefd0a8e96d5ab34d16cff9790daf7933,Merge_failed,3cd8a9ec17125a19f3b10d769088959cd4512fa49793711eca70558ce1a7531f,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,780545e50051bc2af7f81e5b875620d65cb0ad5727f4d39e5ee0dafa8bbbf741,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,df63e84bc721e57deae694355ed472de5226c19a3e1b11199cee7e4282cc7394,Tests_passed,4c1790a3b570234774ba239a743a75b131f4ea4d49d65372e8130305fe6e36f0,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,f2f1860882d78763173f1faa51b416aeb18a0213e3fd4721b90b21b6f9eef0b8,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d,Merge_failed,c8fc0ed8ec3c7e935a947d3fcfa2c87f69c45719b28a7768ec81a241787bbe7d 35,refs/remotes/origin/pull/100,efdd938e7a692b6e6f5cc759202a445f8c1d58e6,74f37e6c3fdaf31c8ffcb7562dea81b6cf48ef66,5b9ff524c314835010d92e74200a4f2f66377d3f,,True,True,True,11,41,176,3,True,11,Tests_passed,c82ab7e00366a2f9d675099d7d0af778474a762c96e95ac74c3b75684f8f38b8,True,Tests_passed,0fcfb9942c9e8f8509892a7db28250ad676b82fbf2727bda4785cb1f7ef402a8,True,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,1203ceb3c0702849bbff8572d57e2541b4a376ea5349bf5ef654883c023198b3,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda,Tests_passed,0143a5756a28b7c2a97e5c3a8d549a10528654cb5d0e288aa18d167c1eda8cda diff --git a/results/reaper/merges_tested/mmlab/rmlprocessor.csv b/results/reaper/merges_tested/mmlab/rmlprocessor.csv index c431db8d5f..264f09bb4b 100644 --- a/results/reaper/merges_tested/mmlab/rmlprocessor.csv +++ b/results/reaper/merges_tested/mmlab/rmlprocessor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,707510e3a9c3a799e38a2933cd54e4688c0ad7aa,e011318d42cff62d34c224ad889163c38254cb5b,7fc95258a1ce664d978c90ea375c9ee0d76546ca,,True,True,Tests_passed,ff38e94a8726322f71be194cc8a46873dcedb18403a1a57a57cf1c70704a8712,True,43,245,942,5,True,Tests_passed,cef6c32a7d620ba45c9847b3b61719e9fc33db4993de3802e44f9678f4a705c2,True,43,True,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,a400a60516a7ee15ff9dc020de6f16ec79f219bbb9e0c72fc690e3c2faf137fc,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,6956031f2ef21c6cdef5265bcefd7d0f91f75ee96d1718dbad4da46574594a22,Tests_passed,c1e61b6ee996578ed2b93809012c1e9323a732cdb7dd2d6b06e02bf5eba9a08b,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,add68a5c71131c004e4c51921e931f11ef2f0696ce526d8cbc77588a05fc3e32,Tests_passed,9cb85ccf86ac507f6c843f12547dd9557c11565973b378e1c277662250f1cfbc,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1,Merge_failed,570b1663dd868f4b605ab235f544e44f24b29d53f1645f343f9f6d5549aef2f1 5,refs/heads/master,af76241328ee4072ccb1c5c9d4f7be49877f1a9c,a1a65245725da56b16e3b55c2b71a78c15240698,2344e0e8205041fe662fc55b400b3cc71fd650ca,,True,True,Tests_passed,857f2e2c39c141c9a99d5498c132fb9cba2dbe021055ca7ba515c7975d067bf0,True,50,292,1952,9,True,Tests_passed,74b491341ff77b1f122061bb65b64129a375cdddab471a8c10a313b4922a146a,True,50,True,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,01764b8f2ba6a40ce863ab1d44c95707eea4ffd539af62d656602291c36975d0,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,9d7d433dc62a57daae3b8884bf73c243ace354619753d974934bfb9fd12ae5c7,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,78af17c4616a88544a5504531b06fb73ee54bff73da385f1832d79c96abb197d,Merge_failed,bdc56a9baee4e02d280ec71de730a53f1c1b6b0b7d05c18832a6da8b445b82cf,Merge_failed,e0d07332109d3905f51f3f64e9c0f9f9e5c7baf93aa8d739116f1d0465044751,Merge_failed,4ec3c4575962059b45e95d3d0b6e6f9b3109f62ecf6be1ba54b2655777ea7af8,Merge_failed,bdc56a9baee4e02d280ec71de730a53f1c1b6b0b7d05c18832a6da8b445b82cf,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,9d7d433dc62a57daae3b8884bf73c243ace354619753d974934bfb9fd12ae5c7,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,1fda46d2008388613d17401c4baca0808ab0d264954676956ac2e30f452c138c,Merge_failed,bb25e9c4c627787a735a617bf3e239c7be2634d46e867c5fcef79b38274197ec,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,01764b8f2ba6a40ce863ab1d44c95707eea4ffd539af62d656602291c36975d0,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569,Merge_failed,fc60a81272607e9d87e7b3ab37b10d68937a7c08089ab6435c670e4a28139569 6,refs/heads/master,d46b8c445cac62835aeffc0b74b41f69283fd31d,fbd8fae079642e775e53ddec4a82d5669401f1d3,23cb6fa36dea674d20821fb799ce3399a98ddef9,,True,True,Tests_passed,ed8f7de4f53e0885e695f08c66e8994955cb3889e3e513aa2e8e09bded5bf7f3,True,6,18,41,2,True,Tests_passed,05d0a4900b0b69fd57049d0b5bad200e4058549b7f9ae06b82becff981a17e95,True,6,True,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,a8dacc5380c01c82c3474a2ed06ac6d13a146c73881dc97cd2d4744e5a8f5e64,Merge_failed,da04b31ee9f6b0394738638490c81f0f0e983eab2ba95c4b13b93656590af990,Merge_failed,a4ef96788f2627d52a2cd69aadeb8a164f4c7a2dc2165ce8aa4c5f01037787d6,Tests_failed,b593cbc8f48e247031487f709dd27128a5715a6db94118098e71182672439b6a,Merge_failed,da04b31ee9f6b0394738638490c81f0f0e983eab2ba95c4b13b93656590af990,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,fa40786ce7bd6d81431e9274a1afdd63a20163e7aa76b388415f33a339cf4e1e,Merge_failed,a4ef96788f2627d52a2cd69aadeb8a164f4c7a2dc2165ce8aa4c5f01037787d6,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b,Merge_failed,458116e9d3ed59ee47c89d61b42a7a3f262835012ecd79b6759e4e4684c64d6b diff --git a/results/reaper/merges_tested/mongobee/mongobee.csv b/results/reaper/merges_tested/mongobee/mongobee.csv index 2071ca7d3f..b2e0aaabfe 100644 --- a/results/reaper/merges_tested/mongobee/mongobee.csv +++ b/results/reaper/merges_tested/mongobee/mongobee.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ce9bd0364a434871c144294349f0c01130d1aef6,483e00c905bb7f7a561dfb3c026f12f786a63a97,e11a07181c998c4ec675516f2e768bd666768526,,True,True,Tests_passed,27c8e0c5c0a7d3968e527431b1609967e007a66eea9af7b99d15d32c6c972044,True,16,103,325,2,True,Tests_passed,9f602d2e38ddde7d92acd64ebbf15edb0ee2f5708039319ed3fa6577f9ffe322,True,16,True,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,8f91a370d6af0ef9d05db106383b85033e2685348bf4fb5dbe098de02a84f3f2,Tests_failed,5a517be295a3fe8b9593c91e82df9e2875e755df85dd774c8a61220ceb6f6e69,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,8f91a370d6af0ef9d05db106383b85033e2685348bf4fb5dbe098de02a84f3f2,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222,Tests_passed,547609448768134bb7ed0e270e0bbd4733688caee6e98340bfc1a33f66692222 8,refs/heads/master,abf507930c55a2a4d918d70d5c3ff852fb5cbf5e,81176bcbef3ba6fa4bfb006ba4571a33c71bdbc2,f73e3dc7807a7a4daafde4fa720b6f4246670978,,True,True,Tests_passed,2c1a5f276ab626eba7700c2ad8e3724e568a77586b80c21a1614d9bde703dbf1,True,11,64,592,3,True,Tests_passed,9e00b2d19b8f69e948b4291cba5261ea6dcad756e554a824442f59e591e24e48,True,11,True,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,73db6dce3f4fe4840a549ed22ff1354966d58a311716ff5c4be5ea84c5b8aaad,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Tests_failed,7ca05e650490dddc4d2fae05c41677fedfc29748fbf0837522051458a1d4fb9d,Merge_failed,8e8a6a4ba282fc09993ae011cdbed965eaae3be66ab39c36f2af5b65418596da,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,6c97950040f402d72271451644d91316f743d6196867e6095434321ae23b7077,Tests_passed,857a2eab39573ef6b455dbefae5e06727c117045433ae935a3e0161aecc6480e,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,4d6978fbe427bb7c682ee1550f4df04d74a30272214026cec675633f58925b37,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9,Merge_failed,da860572afceec76a38371d6dbfc0cb5408e24ddf700013df3a789160ada8fe9 18,refs/remotes/origin/pull/111,4215e59573dd36b437eca014fa3811a846dd89e6,87ca4d3fd25054c76ab8beb27f2f6be882c6339a,44f05a37beb8dc18f77ca57da9b5cf0edf114413,,True,True,Tests_passed,c43189be123d91b7fc17148d26ad66b26d2b79219f231c4f252d22603a9941d4,True,15,77,1284,3,True,Tests_passed,07bc0885af749dbc81237f2af798c60c8d54082945d2581ff70dafb768d8ae16,True,15,True,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,1cf913851a596f3e5e78bac2a2179cab4dcad53e4e7b95512b67b1efe8c1a340,Merge_failed,43b3890f79059e3ff73f8ae65e7972c98f914575fff3d35b4aabca846b65d9cd,Tests_passed,149d2c6b0a195103011848695e8f0deb33e7565ce1f770da6332d5211ca35502,Tests_failed,fe986adb3cb490d4ffea5d5c5ac8856b414f867cc1943c7c831800650f27f28a,Merge_failed,43b3890f79059e3ff73f8ae65e7972c98f914575fff3d35b4aabca846b65d9cd,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,7a27c3f1d9ffc0193168a1b42760a824278c7c2b6adad173c8c8a452af35d8a3,Tests_passed,149d2c6b0a195103011848695e8f0deb33e7565ce1f770da6332d5211ca35502,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,f7b1b21a77e2b4514d96e6860ccbc74cfee37cc327aa8451f0a1d629bf138ba5,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799,Merge_failed,5b6537b0caa1c3b66ba42f0fa74b277713f5b8b7e4b6c5cb4b145fb2b0d3f799 diff --git a/results/reaper/merges_tested/monitorjbl/excel-streaming-reader.csv b/results/reaper/merges_tested/monitorjbl/excel-streaming-reader.csv index 14fbe02bd5..c34e4e579a 100644 --- a/results/reaper/merges_tested/monitorjbl/excel-streaming-reader.csv +++ b/results/reaper/merges_tested/monitorjbl/excel-streaming-reader.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,af775bab85e873e839c0e36f71c9dfcb830b54b2,1e3af68f6dba9fbee1ca7a6cbb94f1fd375d21b9,eea3b3aec39ca8bd74ec3e7cd39154695de5b82d,,True,True,Tests_passed,4ebfd4a6b9d197813cec1be2eb0bbe5e72a2cbaee141b9bf85ac5cb568d406d5,True,19,95,1378,2,True,Tests_passed,4c8de25debb4b003f8c30b5056c3920892454198f660e6013951b2cafe0764c9,True,19,True,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,226e5495c76d0b8bbb493a692e23fe104fc2c023c624678e1d070d7b4559bed4,Tests_failed,6c20123a713b83013123b26aae397d227d6189fec30feee2d8c703babf76f0cd,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,226e5495c76d0b8bbb493a692e23fe104fc2c023c624678e1d070d7b4559bed4,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5,Tests_passed,1c2f8a8fefac3b013d47d78cd0400b63c37a1d60c7b67cd3cdfbce06844feeb5 7,refs/heads/master,7d81ae0fed55b297e0c7ad370ce073981a6fd102,ff42c34125920ba41c669acae3569f49d1d7b7e4,d835174011fb87873fc64fb0cc5ef06a9465b325,,True,True,Tests_passed,5f0de8c57b82e882ca593015ed7615ca8571a04bc4c0e91a65589c86f4fd3b85,True,10,46,274,4,True,Tests_passed,66b04d2fb59c5839488b7a8d63a0808ba716cc954de2f2dee459f603767efd49,True,10,True,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,1a2239ea5255c7854ee0a3ef2199e91c637bec8aed632210104f34c046b6df4d,Merge_failed,c7defa69fe8ee874cfed56a6bf6140e79ac4716d7b4da8bd9299889c96fb6c26,Tests_failed,0021d7b6d330c9b1a7796cfdfbbf0c8ccf876b9355999b22c86a957b40e8c36d,Tests_failed,df7202daf6d79cc18ec1eaae54372c97846ebb7e870cd32a9f3e4b8a8454a91e,Merge_failed,c7defa69fe8ee874cfed56a6bf6140e79ac4716d7b4da8bd9299889c96fb6c26,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,1c6897f83bee23e91a57b2cebc8e75439dce54799ad6ebcb8e5c1f73374594f5,Tests_failed,0021d7b6d330c9b1a7796cfdfbbf0c8ccf876b9355999b22c86a957b40e8c36d,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,13aea7e8eeac6740d6c236f9f2bbf0055a51a40055cb7969111be740dc11f564,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b,Merge_failed,dedcbb907f733dc2e61b2fd02dee9e31b909fabceb4d6af45b35fb5f2e38900b 12,refs/heads/master,04ab309541f3cce3ae00d512edf23eea0077b34a,c0fa34745464fe5f603964b16e3bf80da2fdc3e9,3609c86c15c9f1d8e2cff662cf380dd19f905bfe,,True,True,Tests_passed,9183d0523fd14704310ea519381ea03020aeebea355801d31b78d2e2e3b3e187,True,16,62,717,2,True,Tests_passed,c106ed25826f7b62e437bb941afef3c172d72f27d2a7895aad8608c953d7ac5b,True,16,True,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,d26abaa700fa620f00bda4590b02bf5d218e47243b796a397126cc35a53489b5,Merge_failed,36ac7479c8bf56479a97d22de42b46f8e73ba2778687455097e53a2a4d30b3f2,Tests_passed,61229d6d77204bcefe72d6465efb35b70a71c97a5db99eca655d6f82a74cbf33,Tests_failed,fbd7e1d627621a5c2382df31cceb9185ee10e886fab32d123266ac478d883532,Merge_failed,36ac7479c8bf56479a97d22de42b46f8e73ba2778687455097e53a2a4d30b3f2,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,3752a02673415703585eff5f3f6429626e7a5167246b04042b9a14c7e5b7aadf,Tests_passed,61229d6d77204bcefe72d6465efb35b70a71c97a5db99eca655d6f82a74cbf33,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24,Merge_failed,28437e93e82f390094f5f1c5ff53fd0923db99cbcec692eae3f743d0d2dd6f24 diff --git a/results/reaper/merges_tested/monterail/elasticsearch-analysis-morfologik.csv b/results/reaper/merges_tested/monterail/elasticsearch-analysis-morfologik.csv index c5adb1685f..bc14e66148 100644 --- a/results/reaper/merges_tested/monterail/elasticsearch-analysis-morfologik.csv +++ b/results/reaper/merges_tested/monterail/elasticsearch-analysis-morfologik.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,6024cb183c93a9bcde34205c97b4a1dfb3694ac5,6c0272594c958b201b17fd354e8b06b3f8008cef,e6694bb0f8433e24d3bed2c2a2c10e16b6b53eb4,,True,False,Tests_passed,0bad627e56221cdf7b5054b87bab687cd870efe747d1b9fc07527c8b64bf2e74,True,4,8,58,7,True,Tests_passed,c48d3da379b47b59f3ce0583e029d3557b679af0c333d74137f31bbaa524be71,True,8,True,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_failed,a1502ef1788d13bfeab8ddc7c01115025d96cf49468f9b6996910bc7e38868eb,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,473b3cfec2684ef48d664507d313c97ea600ed0ee179f2231ae99c30840bbb60,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,b750754c02c606730378ff9cdc6ca4cce31f82fc7a28ea9af571d30a5b226490,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85,Tests_passed,9e73bc5ce57b079ebaa642b97b3a4b6af85eae55dd14b859fe00616553bdfd85 diff --git a/results/reaper/merges_tested/mooso/azure-tables-hadoop.csv b/results/reaper/merges_tested/mooso/azure-tables-hadoop.csv index 9d90f376e7..68feae5edc 100644 --- a/results/reaper/merges_tested/mooso/azure-tables-hadoop.csv +++ b/results/reaper/merges_tested/mooso/azure-tables-hadoop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,f5ae55a8d5024fba05bd9a188ae18116b624a69d,8dfebe85856c3c8b151ef6c125269f017e4ff3c8,2d39177520998c04d9ae22cfe33364183a368d84,,True,True,Tests_passed,9e4249278bd982e5cf0c0fd85a3f35ec70961e9d195585c572a71834917564fd,True,15,52,251,20,True,Tests_passed,61bae1ae8066aca05420353b193b18f6b6a44366dbd625f0f341c69d1b411ea7,True,24,True,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,f1006de1c2c8ec5ac47f3e180e3985bf486bb53e2c869baf6e5752f15321e7a0,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_timedout,,Merge_failed,3b0ca38e83af50acb6210d445beee1595cfee7ba805378eb2dc308b1cc49e9d6,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,2dd963750de0fa32ace1a65f5254f3f69547bf5da69647aa14e57621bcddc279,Merge_failed,d8ace01d98972c573a4265b7501f0367b81e90934f045bb82b8b29a9873278c3,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,08bbc51509615be0b7a71d56a66654dcc32fc4c266753c0f5c04e727d98ab3f4,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9,Merge_failed,eecd038e4c4355c54124d9b304f21046bfefdb55d3386dbd724761e6d773b7b9 diff --git a/results/reaper/merges_tested/morfologik/morfologik-stemming.csv b/results/reaper/merges_tested/morfologik/morfologik-stemming.csv index 25b231d4a3..4d9bbea9a7 100644 --- a/results/reaper/merges_tested/morfologik/morfologik-stemming.csv +++ b/results/reaper/merges_tested/morfologik/morfologik-stemming.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8d67ef792f7feebcc45f1c251f8fdd177d980371,abbb816a635b1471a19c50dc5b296b237981c0c8,b23517a11b4c6af7825b1abdaa8d6c0c68e13928,,True,False,True,2,4,27,2,True,2,Tests_passed,4cc6cb448444ef6d232bb7b3b45d6afc49c66bf17a21072d8cba6e9fe46b36a3,True,Tests_passed,6d3fcb57f9aa4a870da1c1e7fac47fe842f800a7181329872827205b4c6b999c,True,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,08a3740077158c38ab042e0793292a3e357979304abe4c9a85f355490ec0fea8,Tests_failed,d623e732333b5dd9b59cffc847492d28c65b812036856655d0cd2ec1f4f833b1,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,08a3740077158c38ab042e0793292a3e357979304abe4c9a85f355490ec0fea8,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e,Tests_passed,b7fb26b5e0372f222f4ce65db572cc5313a58995e5b42f445fcbd8f9c7bebb4e 23,refs/heads/master,ff3dde628c969e0d31cd9c0f3d845320e626545d,1a27128d9e6104f726032168c4b31e39d0d8556b,8c46349590627e869e00b42681c9c1ff5e79c4f1,,True,True,True,3,35,260,2,True,3,Tests_passed,9e6d8183cb58a04ac6efef887389378960a7eeb4a0165ad934bb84252f09dc36,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,True,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,238f48e20f95e95642cd36694b705cba762fc80ade26bb791672e58b4d5c59a1,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,cef2ac3f5b2e6cee6cda82b8ee69634ad4031493505c75c4f6f552e70c1a2a30,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,143702ce4aad93bf48a6e7b2d3739dd8040942387cc21d7dae3450bc22e23c4d,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2,Tests_passed,d54cd9be077b72268af8406d4fbe0fa9b3dfc7adafc62bb51e996b627791b9e2 26,refs/heads/master,d9d8d5cfda86d4c83440209a82adb39b00303597,7e6734a2cdf26e0496b95ade5cbf7bb5acf5949c,3a82eead575349bced4b69ebbe6fde969dd9ef13,,True,True,True,12,83,2921,2,True,12,Tests_passed,2a987601f77576902f5af8f562fd44dceaea5d85bfa493a9edff3fa079bdf730,True,Tests_passed,11e94272be9aff1f14d56424ac303e06dc9120081acd19f8647484053299f1b2,True,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,9ee9c0e392a893b054bd0cd302d0fab4dcd71df30e1537471170811f67c2a9bc,Tests_failed,3b436f9dac3e061b5cc683888ed65970c11361a9dbb7814ff6c22f0d2b5ee5cc,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,9ee9c0e392a893b054bd0cd302d0fab4dcd71df30e1537471170811f67c2a9bc,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6,Tests_passed,714a3d7195303ed0e36e3de2534a3662eee6af561e530a7bc718417b82ced2b6 diff --git a/results/reaper/merges_tested/moritanosuke/glacieruploader.csv b/results/reaper/merges_tested/moritanosuke/glacieruploader.csv index 42f030dea8..fc72d2a37d 100644 --- a/results/reaper/merges_tested/moritanosuke/glacieruploader.csv +++ b/results/reaper/merges_tested/moritanosuke/glacieruploader.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,cfeacbf6ce259d925301898491500214446bfa79,c1decd8574b90ca049cc3c1cdf35f71d9fbc270b,daa8e1c90e68ae8d880c1cd587e5536bf18d1dfa,,True,True,True,7,20,78.0,3,True,7,Tests_passed,ffe1246fbc2c46d1e69a57d15ea6d56e371ad45c6054b2e8777088e59d8b01e5,True,Tests_passed,8cb2c6858c9c1d7e891945e10645769cfa0c3d96f14877bdea2396720ffc63df,True,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,50726c021ef6f531a32297a28e443f3ea503f5e438438358031914093cdb69e8,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Tests_failed,e5bff27185dd5b53d61637e7cf77b071c6d291a7cfb9096a17fc9f871e81b39f,Merge_failed,767c4440353669b13405d6d5607ff95d787421fb67a9406f67cf86cfc51bde76,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,7b06c6aaccb5728d5e242cbc2a73b27832316c9b5a2b6fa6ca4cd3a84af9e732,Tests_passed,5801921ec717e98359c33e0dae7bf3713fe5e98ccb05848dd6ac6c3d2cefa1a1,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,8397c7c78091a4994fa3591b84b32e15469f89ee6b4f7dfb8f67464869b42925,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9,Merge_failed,4492928f1181f00177cd3ca98a2a02c3fa26c616d1cb2709074f2e703f373ae9 diff --git a/results/reaper/merges_tested/motown-io/motown.csv b/results/reaper/merges_tested/motown-io/motown.csv index 7b0ed90e41..7a494cf95b 100644 --- a/results/reaper/merges_tested/motown-io/motown.csv +++ b/results/reaper/merges_tested/motown-io/motown.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/develop,0208735508218488254ec01471e5025b1c2f97cc,f48ce44e8435ebb642994c7795002d01d4ea87c5,789dded2d8f15fbdd4d2955d662359327b773e59,,True,True,True,59,192,731,2,True,59,Tests_passed,23f1f47f71cb0373d0e0af67412dac4bace21b6f5b0d8f30b0e9a8af04324fdb,True,Tests_passed,464511e1c2853954081c786c2e930137c1b6bd0db74b2b1d25f445640358f892,True,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_failed,7ab40fbf4129d3e0f7f33e25592f37a7da439fde04fefef9c49f7bcefc3c1f3a,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,317a3f58bcde9d51d14fca7e510706fdbe6268ae3e5f79db6b227f3a3fed3fb3,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,286862732c61c0d1b49e84bcdcfe9ce7a20659d180dd6734e43ff085dc377d7d,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127,Tests_passed,c2b2fd7f61d2b63cdae1c341a68a5473d9fcb5f4ede5b66dadde41a2ebeeb127 6,refs/heads/develop,c2ad8d6d0cec1d5f43f3e7c9cb46afd45783ab0f,e50859054dca7a828dc5ce859438bf363f65c9a2,d33e1c9bb6a5e5e0ad7711a6f47075477893aa6a,,True,False,True,37,37,76,4,True,38,Tests_passed,3f7b1a149d9e218dc43654e92eea26a971404b178a64e0a2f5898d2cbc5ebc68,True,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,True,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,f7fc6e85ca1d7aa020d9f035228f3c02b822ae824d6778e1f930d906c25572a4,Tests_failed,e7dcd16481816358f5d1e87451f5c4b3fb84b21cee0215abdf72152b6b685a50,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,f7fc6e85ca1d7aa020d9f035228f3c02b822ae824d6778e1f930d906c25572a4,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05,Tests_passed,ebcd3c15c5fc502a97ea821da367803c046eea7e358bed6886d8ce387941ec05 21,refs/heads/develop,7466c1938e308fa4cbaf43d76dc50d12dbbd9430,e07dc68d00c93a4d0a05160723a76793db8f0ce0,efc0c648e3c64428193fafec3e5af8cdce93095b,,True,True,True,198,582,12599,21,True,198,Tests_passed,f7ef041b2f41d595a58fcc7a005eac48219d1f3e0e2f1d729f1e1c66a1f8f304,True,Tests_passed,14fd454b1d4d41be9943bd1bc1d9b921a728d37048cd234dd3614e3c97cf2c28,True,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Merge_failed,126594f5ea017f783fe657c9f9463454461635e0fdfcc279362800e39e4f201c,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Merge_failed,126594f5ea017f783fe657c9f9463454461635e0fdfcc279362800e39e4f201c,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141,Tests_passed,d63c1bd9fdcd725eadd830ffca0bc518cb8139dc7f05d10f8f2ced058593a141 diff --git a/results/reaper/merges_tested/movsim/movsim.csv b/results/reaper/merges_tested/movsim/movsim.csv index 313505c592..081425d192 100644 --- a/results/reaper/merges_tested/movsim/movsim.csv +++ b/results/reaper/merges_tested/movsim/movsim.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/develop,aba5102173958664af92232b0a401a4b7614a667,266480659a4cb29b060d84c28996577c6a5bc0e5,b2247f76c2085082f185f84d5e47d9f3d2ceaac3,,True,True,True,273,1324,12980,21,True,273,Tests_passed,27248b5434b91c79011f0c575dd579a81b44ca5467e81b66dd878e267a4b12cd,True,Tests_passed,4a45026dde1836226ebf625faed4de3e05d79abd31a1ce278ea7e53b091ed111,True,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,56874649a17103a1fcd9a81569a0fb1d649129e3dd07f514154d6b3248b5508f,Merge_failed,386faf560dc7947468cbfcdcb02b61c84e51edcf2e4bd0eae36a845003d3c533,Merge_failed,924e862d56a000e02a3cc6ea4dc009845f8aed8eb3bd20c788d0a78685a8377b,Merge_failed,7730dc9fcf56f3df83224ab27db6db84804e4ed1740718e6736406f39cf8dfe4,Merge_failed,89e8c661142694b32957c8924c69e265a32241259952710807dd0d0194bf8766,Merge_failed,924e862d56a000e02a3cc6ea4dc009845f8aed8eb3bd20c788d0a78685a8377b,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,56874649a17103a1fcd9a81569a0fb1d649129e3dd07f514154d6b3248b5508f,Merge_failed,4309c5a7cb9096aa7d0ee8fb3f000374aaab064226697681c80672465cf932e7,Merge_failed,7730dc9fcf56f3df83224ab27db6db84804e4ed1740718e6736406f39cf8dfe4,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,67272f7899da32796400479adf973607b4c93dc2bd93f5b68ff5564613e9bc97,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a,Merge_failed,a40deac7a16ef3c447789d05a3c4f24067a80d823a11f4eef0fbc43b81f07c2a 41,refs/heads/develop,a06535791e7eea9149a5dd279652391bd0cf4b5c,51e5bb8b29c0520339d82143530d50c59145fb3f,3fdcb6bdd99b2a6f27cf52209e113705e4144091,,True,True,True,135,575,5235,13,True,135,Tests_passed,ea8e761e0105311cd89651cb5487f4c52748f17396d82f926744162612cea1e0,True,Tests_passed,ae6c6e32020a5565cb2ad36e942af33004420d31164e0cb9be6607959e49b97c,True,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,a49b73dc11f3c79cdc947629acd4245a3da633d0bb9c1f4f8efeb25332d85050,Merge_failed,f54908d1cf4667fb0e9fbf795c333e8fae7d687cfd5b2bb59016b81d6b23412f,Merge_failed,de26aea8f7f53f495811b9db3f429e83b57daa3f71f9032f993b2487066827d4,Merge_failed,ed0639e8c8a732efa71e307abeb6e762218fe19bca467d590c83b1184de2708d,Merge_failed,f54908d1cf4667fb0e9fbf795c333e8fae7d687cfd5b2bb59016b81d6b23412f,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,f0101202ccd099f32a7eb1d51d41c41e3e9d07a3eba355736259f3047d9414ee,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,9ba91641cb046fce90de29364a6be1ea95ea99e56ddd4b917f1bf27eeb144b22,Merge_failed,7f6039f9c0f1212888cc8b1687992e5a470c9144fab6b9b44c1baac5938c0272,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,d3e27aab800bddc7bf59c0a331b40c06b94e7a7c1f23888b8318132f2234b024,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3,Merge_failed,66f7b1d27ea81b348f19f223734046ff7aaa5834dbc0e54629ccc6ee83e213a3 42,refs/heads/develop,51e5bb8b29c0520339d82143530d50c59145fb3f,36e886fac1939df3a8380e13bf3441399a172e5d,8752db9023e17442dc8889dff010f6859bd651cf,,True,True,True,103,600,5253,8,True,104,Tests_passed,2d79009533df7a2b73da0ee270cb70b070e2cb0fc1185fc2d3b6d569f84f3887,True,Tests_passed,cd606817be518cdae18d31873ed25e5da615ff8b95c5021488fad64dd70ecabf,True,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,82b8c7850dd7600f1258298b7ed69f2c4f454033e1d568d1a83edf921f65bcc7,Merge_failed,a406a05c2cb14bc31375d539207551dfd5f074571ab8b8972216b663634f7546,Merge_failed,b99f3b19c1c9d4f2ee9d23aea2a565c3871c7cfc80a56a5ebcc57cd94e389c7a,Merge_failed,8c8ec5bc47447627fc32c5ae5b2babb85fcd95f1303796391c81b5bae8ae7875,Merge_failed,a406a05c2cb14bc31375d539207551dfd5f074571ab8b8972216b663634f7546,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,3219f01d4c1cd14bca1b63c984e9713b69bd13ed6edefda1b5f5cf119f82d3bd,Merge_failed,b99f3b19c1c9d4f2ee9d23aea2a565c3871c7cfc80a56a5ebcc57cd94e389c7a,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,4a919353825d2dc8bd7ab41cc0140cc7b4336e6f3c92b3a4c8e8c1c351277b12,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc,Merge_failed,b0c034dbdca4ed300517fc4a800f45204d54f7e2d7268943e18e304ba0a60dfc diff --git a/results/reaper/merges_tested/mpatric/mp3agic.csv b/results/reaper/merges_tested/mpatric/mp3agic.csv index 4e0aae04c1..290b9f899f 100644 --- a/results/reaper/merges_tested/mpatric/mp3agic.csv +++ b/results/reaper/merges_tested/mpatric/mp3agic.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,242381f1e929b2c6feda45c6d5ed142257e160a6,8a866a889070bb23420aeb0315d327c659fe60c7,59e11d2bc119538b17b4400a35224be68b095c4a,,True,True,True,9,35,149,4,True,9,Tests_passed,6eb1ea6b089cf35d2a0b436a1294a8103b722b6bcf1a8c2086a43de85589c38c,True,Tests_passed,3e722599b73015a81d1ca4773f849079b21a5e9159523da320891a220ed64c26,True,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Merge_failed,cfaa9eadbc75d803d80a7d91fe22802610d586b23fe8d88685f9ac705197aa69,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Merge_failed,cfaa9eadbc75d803d80a7d91fe22802610d586b23fe8d88685f9ac705197aa69,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,cd45fee25fac9342bfe202e279a3569707930f35b5a5fe62547b5072cc56f89e,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279,Tests_passed,afd73ee30eb925fb128b4d6de966b13b9b4af52a61943cdada64c25060a01279 20,refs/heads/master,446353b8eebf05bb653a17e1d326a2f0d2ba82a4,b8f18ab448b131ef01eb7a23e9d078ef594218ae,ff596131531ae8cebadbf1c827a1bd4f449888ce,,True,True,True,8,85,437,2,True,8,Tests_passed,b3024ec13bedc96ae0b33c4ecd79a18151e09c50687fae1f0d26b43e0fc60448,True,Tests_passed,8b46d1842e4d7a58a7c53b1dcefb183cd7d50b9dc4e1bda69d385d78bb29522e,True,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,3f7bf1ba1143806fc7a0869c946cb6f3c1438bb7e4fb40ad1b3080c515320acc,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3,Tests_passed,cdd8003f938e7ba82d6ae72025edbfa43dd9a96d84a447db72465a06267e0bd3 28,refs/heads/master,02a6d6c97f6b9f53c7f8f775c4fcfa0c4d16d31d,e9ea8d3abd372864277262af41c9afdfd9e59deb,f7145f5a8aab67a63250357c200ce755f01636d8,,True,True,True,36,48,1986,2,True,36,Tests_passed,bd7d7bd7b42993265091d5235435c4f4fae8166816ceb4c818ccdc48fdd731e5,True,Tests_passed,bb6e6bb701380d236f90ba1b8cbb42f8d5b3fcdd13a821c1a35180ba801225cf,True,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,f7f5c46f551b8213f1bd0e02dd7c7422d5b63933d16b7bd9e998c75dd93f3e62,Tests_failed,84e45f05f900cf510f2951edb1f880051f834f8b8a5156b6e69cce04e183dfeb,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,f7f5c46f551b8213f1bd0e02dd7c7422d5b63933d16b7bd9e998c75dd93f3e62,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0,Tests_passed,9add90900fd8c4b067f699958561ced5252fd9eb04168cfe1b01b9220b2c52e0 diff --git a/results/reaper/merges_tested/mrcookieslime/slimefun-3.0.csv b/results/reaper/merges_tested/mrcookieslime/slimefun-3.0.csv index d6278dfcbb..f7d20aa925 100644 --- a/results/reaper/merges_tested/mrcookieslime/slimefun-3.0.csv +++ b/results/reaper/merges_tested/mrcookieslime/slimefun-3.0.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,6a34470b47dc32ca17866b68a4cdc67fe4875e91,361c83fd73553341c18c9875cb0e204070aee4a7,68edac523e1a5963d824b7b827800345baf61b45,,True,True,Tests_passed,d8fe4555513359844171ab93850a6b5bb18b3ee5ec8876fcec9e6710b0814875,True,182,728,4166,2,True,Tests_passed,37dd72d0d71efcaf80b3d12b3677cf50a5666999a5227d4324048036c327b6f9,True,182,True,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,04ad673d02524c0730475fe7fd95280426deff10e545bcff6da0d09afbbf7c16,Merge_failed,2e05991620a701d6a1681d149a0446bdb58421f8994e11ec279b8d7cd2bcecef,Tests_failed,e013dc84bc78b6aa2aeb28087854addfa6e3f738e1d67cd44c885fb62cd9f7df,Merge_failed,6af6f2da397fccf78226b651cc3dbfd42e5d62ec601ead9603c3ddbe70a7fa30,Merge_failed,2e05991620a701d6a1681d149a0446bdb58421f8994e11ec279b8d7cd2bcecef,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,fc637b066de2ef197218a0eae845325f734a78ebd11425e02d33f316c9f01150,Tests_failed,e013dc84bc78b6aa2aeb28087854addfa6e3f738e1d67cd44c885fb62cd9f7df,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Tests_passed,fd18fc98e1c0031e11f8f76649ac90bec43caab0ab85f19947ea2fb4e476d3b3,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421,Merge_failed,8f73d7702e3bc4a1e8f319e104b63d7cb63eb1a6a019c1c1781b4aa79d056421 17,refs/heads/master,f2fb911ec2a276c022ef7805dd882597b880f0e6,6bbf46b1d91f217c08aeaf6f954c5b970e4eef31,1f407b7a8638d44342b06c54b509577ec110c4a7,,True,True,Tests_passed,56c849e539e06c16e32c61b7530901baeafd8e51614e4ac9f537eeef4d609c6c,True,210,767,4889,2,True,Tests_passed,527fcb0259f1dd91b70aef557fff2c874b31207db467825955e7142fa0980b6b,True,210,True,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,c002946b67c41b9f5c3f092cfa3905c55211aa86f583ef2520975e64b5f827ed,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,c002946b67c41b9f5c3f092cfa3905c55211aa86f583ef2520975e64b5f827ed,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,2369a0e48132e3dd914b556203492d2e29df63ba5b55dd41f1667bd7f23b7d4c,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3,Tests_passed,5374f40c5df1bffc0a49840fa49d53de1a0d8b2cfa59a1ec0c3181f4d18575a3 47,refs/heads/master,a761ab919462147969afc249dbdc7b02524e51a1,5c81577e4d788bf69c39276fcf41023d303d464c,91156fa0d7fb9c2c23f986c39dee3b6be6692975,,True,True,Tests_passed,b3b77b853b3683d25816e9c87f8b31d0e469ba5d84f0c8127047fe40dcb311a7,True,90,241,1671,2,True,Tests_passed,27109359d7b8b211985de1136064f7645f5c66034421cd99b015e50751f88c35,True,90,True,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fe5f5051db4b28c63d9bbd33e5bd93f27d118cd35de856d7681f2c5469a06549,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fe5f5051db4b28c63d9bbd33e5bd93f27d118cd35de856d7681f2c5469a06549,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1,Tests_passed,fb854ad133ff0c7a5879a58f0a4618e52d514766ba415b00f45160a337fa13b1 diff --git a/results/reaper/merges_tested/mrice/license-check.csv b/results/reaper/merges_tested/mrice/license-check.csv index 9c6716b38c..e7b55e5949 100644 --- a/results/reaper/merges_tested/mrice/license-check.csv +++ b/results/reaper/merges_tested/mrice/license-check.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/pull/28,df4be32c0a82130293069c4cb3c69fa9f176241d,6f1e7823726ea7d7b3113f534fa01982984ccc16,373dd8516ce2531960cd609ee036b038c16d6daa,,True,True,Tests_passed,7d8a2df5668fdd55bb7f28f3e1471ce43c384034864632c694995ddfea24dac0,True,9,61,1247,5,True,Tests_passed,42aaa63971641451dfc7fa4cb319e2ae3d76bd21be83b5d7b3650d53750e9f3d,True,9,True,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,e9ebdb3e3b7750d9a8ccf4e7ac566f3f673633a662dc86abbcb800bb95c86651,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,74d7bfcf570b980f4dac61b819ee9913b80d467906982b0406929aae58b9c055,Merge_failed,9abbf9542a2dc59f0c384dda028bd06b2ea651e4b1e7e5c528492a59d2c134a0,Merge_failed,032857bb1ecebb06c38653f87e8a237a5b1d3bee44623e76a6d14b58f9802150,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,4ccfbbe1d3ecc494471b446c8850bbe98925a0988df93cc73d932f5688ba49de,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,024367e564ab09c183e8cc967fd83ef5cf3afebdb5dc7c86ee25e9078f601905,Merge_failed,19aa602830902e309786b77f83e9b05a4a71d57ee1f15af30c14a8ff882f126a,Merge_failed,a5e435b61f1a4a6583a29d5e94223e89db33279fd5ed730f84a684ccfbc2f1a0,Merge_failed,d40d99548df6d3983bb807922e572dde5fac64a4ed15d975363fccfb4b08e992,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,405d0eaef853ef4e9d399255db1f851e387fb592cf7d00ca42df1148ca4103cf,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd,Merge_failed,44ae562f4fab48da0e415c4f0d583e6c9fce722f9494f9352c03377ef6c4a9dd 9,refs/remotes/origin/pull/28,3f339e29eda87a55f1565e326f866b185982f394,87cf4deeadb0c0503eee6324867469f430d9873e,3f5ce440b26e7ddd9ac9eeec518f43571bf298be,,True,True,Tests_passed,34c22d57c2c785198e87af66dd02eed687f4c6ba85a4d407cebc7b4586cea810,True,2,16,67,2,True,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,True,2,True,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,4e42eb6e346c8560053684ebd7146df928b7c7d13f83abf21a6f97223edfd413,Merge_failed,7e0803aacfa9ca1294f65e873bacf1bbc477e70ed851bfb503111006c37f8092,Tests_passed,90c787d7f8d9b24171ca26903eee57d6bb897233ac1cbef2f8a0334065ae9791,Tests_failed,b3b7c7f9043d260e261266999441b1d5af83e41fb9786bf42d1a082818a14a96,Merge_failed,7e0803aacfa9ca1294f65e873bacf1bbc477e70ed851bfb503111006c37f8092,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,4a46a06fef9ad6b1b1772c6ed556c76c57f05b5e462c083b8c0b4cb723330770,Tests_passed,90c787d7f8d9b24171ca26903eee57d6bb897233ac1cbef2f8a0334065ae9791,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,f3cdd6cc71997466c2694544d13ba6fbd49a4b037f6ba24eec0f4cba0fb97c1f,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc,Merge_failed,36b1ce89970e14fd82e59442245daa35e897f9ebfa5847d70c6e4ba1b3e965fc 10,refs/remotes/origin/pull/28,3f5ce440b26e7ddd9ac9eeec518f43571bf298be,5119f171ad14b56d6215a5ac2b1c3a2bc348c1e7,fc726f5e6df929401618abbce28bb25f66539dfa,,True,True,Tests_passed,b981042e47cffb04ea81a3f2be2c5668dd4ea1af4aa018bd43bfccaa414b85ec,True,4,16,57,2,True,Tests_passed,9bedcc14ece21f56db8c070475f7232cc8be185a150bea10846a6bdb1df8d6bd,True,4,True,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,4bad1f7d0e547d7c3d9888b6b483c4094bff4d6e6de93177f47b4be68c79da10,Tests_failed,87cef6d7dd4d524645842bce2dffa07ce20c9a1e454fd891a10d10d4caeaedae,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,4bad1f7d0e547d7c3d9888b6b483c4094bff4d6e6de93177f47b4be68c79da10,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee,Tests_passed,63eaa9ad91753263d327ec56de09dbd156608af2c5312ac836b4ad38e5d2e5ee diff --git a/results/reaper/merges_tested/mrpdaemon/encfs-java.csv b/results/reaper/merges_tested/mrpdaemon/encfs-java.csv index 72b7782532..bd2dd86fd7 100644 --- a/results/reaper/merges_tested/mrpdaemon/encfs-java.csv +++ b/results/reaper/merges_tested/mrpdaemon/encfs-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,bdee7ef4faeae5943a8d25ed9eb48be4d97f7cae,31a551c0db99c6797ccbc368f8a81ae7b63d61c9,bf71a245940d69cf408659e03d9ec701ac0d686e,,True,,Tests_passed,d74264bc6dc3c1f7c4552000544703d378a029b2bbf5bc4946126886445d47a3,True,13,48,,9,True,Tests_passed,f020afa7d60ba22abce5393485170f63c7145c8a7df5165648498db762cf012c,True,17,True,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,612e6bed8c44147eacee0a89ec1517bda81bce9cbe74c22c2069adaf4ed3bee8,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,ce51a5946f02c5f94bd533c1999f568c7715e878feb349fb46a0ff8124d68d29,Merge_failed,d70161b7f502f77da5eae36bf0df4493a71102f66a6e4293cff499a5c0ff3ad8,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,0c55e9e379495e57811627d495e78147879d6b66eba28fae3136e90995988419,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,7bdacfb14847a54a0d6e6c503f2cf7748f4bbb005875b692c3ea65fa90ca2997,Merge_failed,b7742d463204f37ac271bd5b3aa46133417560df9f798207c2ee833506b3d505,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,ccdf0df011bbea5baff5804776a74b64e32d386a16ac19c730a35672866f5de7,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e,Merge_failed,aab53250ec437ee58e7c1e1e13597face76623e9a7c47f5a94a5c6b4d4981f7e diff --git a/results/reaper/merges_tested/msopentech/azure-activedirectory-library-for-java.csv b/results/reaper/merges_tested/msopentech/azure-activedirectory-library-for-java.csv index 7778414f58..4c77d861c9 100644 --- a/results/reaper/merges_tested/msopentech/azure-activedirectory-library-for-java.csv +++ b/results/reaper/merges_tested/msopentech/azure-activedirectory-library-for-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/dev,53c23385021a85d70a01bd4d40636e461df286bc,6bd171718cf75f2390762116b23a1d6f6a6f995f,28c39226a7eca10fcdc86f0bc64ec861a1f6b826,,True,True,True,10,36,233,46,True,48,Tests_passed,12f7960f476cc152ddc8772c3ea21b5fbd0d3afc24da9d5adfe1ff5e9467f3f8,True,Tests_passed,0fe66af89384be180bb941a98daf91c0310ed3533e39ab208e6a088f12ba96f4,True,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,095e726cf7f9d91b4ee52c3387671b49ff1e0b97f1f6c9c182467335b95e37ab,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,0cf2c575756ffd23261ae20997f10bdd6e8ace260755b1f47f20ea02fed6b708,Merge_failed,a8c77def2f77f785b8c8709cca359d2a4533ae9fb46e0bccf3cb20c89caf5f8a,Merge_failed,94daff9e61eb3603cbc9c1a4054e2a45f625ee2bdec5d2a3e599f2479b15faa0,Merge_failed,713aff00b575d40b89bbc3e5dd4fbd6e93c5282eb1fbfb3723c9f4feaf7dbb96,Merge_failed,a8c77def2f77f785b8c8709cca359d2a4533ae9fb46e0bccf3cb20c89caf5f8a,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,095e726cf7f9d91b4ee52c3387671b49ff1e0b97f1f6c9c182467335b95e37ab,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,1c44563c0ade6b686874d117d539ec53afebbe342967ffe15f35c684b691204b,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,0c100f96180c929d1c29fd1d3a8d2bb307bfe005f2a5c1bc2208d2feb459e71d,Merge_failed,fd637f972f6105b521aebecc38923646817567f9d049e0fca4219e0dc77c88d6,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d,Merge_failed,c8c5d5445987bd1e461a561dbcfefbb3a66dbe45819d6e9b2edfcd2c5bcf143d 28,refs/heads/dev,48bdc8500618d5452013a4823bc8ba7a85515986,c8286c6389c70d2033e8ec7a35fa7ccf786cb1b7,663b8bd7b8b90d8af9e04b363d4f98d080f20f4f,,True,True,True,46,188,2646,4,True,47,Tests_passed,c96e970d3253b313b108b25d2e7ca3fda79bf6266f00605777b75ff0de8d54d5,True,Tests_passed,f5e9a243ca812af2f41770b5962f4b02ba899b5602a9d25f390b402a18cb3cb7,True,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,59aaff5477cab1f197121b5d6608279c57ed6d869ab502ba79d5c16843f7c06e,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,4952e1cebedfff4c8947471801f592badc7a37e7a34b2f0bf8b0b14a547c5ded,Merge_timedout,,Merge_failed,166e879abdb80100b08c118343d14e463e26b6d4ae9503f9ea181da74d59e37b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,e256c02bc7a86b5338835e8245c9bb737cbb92edf03c3af6fb15271f861d0f9c,Merge_failed,402ae7d4e0228f680882ebbc286287b619375e595bdc9ed8d408a8a64f5711d7,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b,Merge_failed,79bec18efb21ffc76cb9cd29155bb33a8af7580f5870f5e79433779e47117f8b 29,refs/heads/dev,ee1814c0ac36dfd7d0ebce404b446f5e02b76a5d,14c567ed46797dce0f8b6ca902a48718df869951,f6d775d5f5f0214f92878f5fccce6a99706fe5cd,,True,False,True,4,7,18,22,True,23,Tests_passed,cd13117767f6c627eb3b7559fdd1cbee26fbd22c1590445a110fd708e7c8c0c7,True,Tests_passed,2206f21f589e63424fe2dc371dcaff3e1ba36af280aef40c759a126dc2b3e453,True,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,44b1b3d8c034b107032ecfb1ddfeb793958531dd30ef2251910acbecd1716438,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,569884d3a1600c7f11c9734e5891059b3b4a00307c24c8299a8c51a8d0ace3b3,Merge_failed,22efdcec4e7afa2912d25eba54ff4f3a7a88c41e9c31f1ea3cd6f3e3e4a81ad2,Merge_failed,52650dd0e50b4a6eb567528b997cf340e859665405e3b25ffd83cbc2e42f66a4,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,6725026a9e75251485e8470f332d70a9d11ff4affdabe4b31eb3c1a2875e06c4,Merge_failed,b61e169e101a29838ee9e73aed8a56a3be88e03190f253b884be80ec1c24fb0f,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,e077849bebf5720787b631610cbc0d62b4271d766e4763299e9e7b48647eb4e5,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529,Merge_failed,38dc0214245416ca97f616228f7b31a88e82069a9b20afdbb16288cc7527c529 diff --git a/results/reaper/merges_tested/msukmanowsky/omnituredatafileinputformat.csv b/results/reaper/merges_tested/msukmanowsky/omnituredatafileinputformat.csv index 3460faaed4..3c7b839735 100644 --- a/results/reaper/merges_tested/msukmanowsky/omnituredatafileinputformat.csv +++ b/results/reaper/merges_tested/msukmanowsky/omnituredatafileinputformat.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,44aa839e687eccffddf79772f186de581646b9f5,ba3fb170040f29dc002f5b7e4f393b106358c404,dd40c2076fbf3a7fd6f3d732ba864b09b58b1b46,,True,True,True,7,20,39,2,True,7,Tests_passed,68ebeae518531d431c7f3ce6d9a22bce14196b040e0785c32ed7d0a1cac9f134,True,Tests_passed,7a098a87b1757f98ae3d2774e65a801f5f365b303836841954ce1cd66166748d,True,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_failed,67fc18cc829410a28a6f21774e7ad77c7ed4e8de61c35d07034f7f5d04eae926,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,69010a40351764cd0dbb4aa8964c9e95c8c983323d707b7eca04ecc9e6469b52,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546,Tests_passed,299a66b13ee6d31af96a8fd7caf3ad691d42686043f9bf23fbb66ee6db997546 diff --git a/results/reaper/merges_tested/mtedone/podam.csv b/results/reaper/merges_tested/mtedone/podam.csv index d42b48081b..410a0345ea 100644 --- a/results/reaper/merges_tested/mtedone/podam.csv +++ b/results/reaper/merges_tested/mtedone/podam.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,cf0ef51c1bbfd1e3620533aa091a4b933a025977,5b15d635e3a8cc791b16f7664c0147bbb20ea54e,2b0c431a5817a9381690e50d13203aa5f3c3fa89,,True,True,True,7,17,72,2,True,7,Tests_passed,196d1dc551efa3603b916b1ff946b200b379acba1b49378e95f536656ac3059e,True,Tests_passed,1dd25c85b1f5b06dd5c6c73ed861b968fbaa7e2fb38bf2dec141a1547d327cfa,True,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,e83aec8be6901291fdbedd70f823f103c39165efdaebc94506963b0f56627d0b,Tests_failed,d074c70b3094a8fde55a3ab10c572c4079ffc5271380e3dd1d52442d4f908a8f,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,e83aec8be6901291fdbedd70f823f103c39165efdaebc94506963b0f56627d0b,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe,Tests_passed,3e300c58349aa84d33b29e1ba1eb553496e54ba7f3cb916f06115c5bb5e26ebe 22,refs/heads/develop,fb3c88ce41b3e3886c1d26647da2b911afb4d9c7,9b2eec284f16188aff36bcf1a67bc2f90c457cd1,9e32dad461de38d8c01db6874fa3e4f8878b557d,,True,True,True,11,133,702,2,True,11,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,True,Tests_passed,18d2814ff2da9ed23a940f43a09e465cf0251e594add0935a726e4ad6805b41b,True,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8 23,refs/heads/develop,9b2eec284f16188aff36bcf1a67bc2f90c457cd1,284048cfbda97497b55bcbdab9a8823f6ac2ed59,c92fa88d1d1ae5aa2986472c27743ea3f6d90562,,True,True,True,11,137,709,2,True,11,Tests_passed,f2aac968b8f3d2864e7fe27bacc8012c63e847bc6528da944ab73b7250cd9cbc,True,Tests_passed,18d2814ff2da9ed23a940f43a09e465cf0251e594add0935a726e4ad6805b41b,True,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_failed,f3ce53f58d022bfdfc35daae1f80d6bafef52c05c5ba07f936ad36986f38c43a,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,a46e51fa151d0152aa5fd630d87d9e2e55fc5e049ac8813640e3a7b1cc3cdcf1,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8,Tests_passed,c8edcd222e467e62ddbaa59de959666ecae07be22eeb0cbc88b9e274e038d8f8 diff --git a/results/reaper/merges_tested/mttkay/signpost.csv b/results/reaper/merges_tested/mttkay/signpost.csv index 409560d396..1d1a97e799 100644 --- a/results/reaper/merges_tested/mttkay/signpost.csv +++ b/results/reaper/merges_tested/mttkay/signpost.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,3db54f4931b3d3afcf7b7400426614c40e58ec4c,0e81fbde2863d3aeab9a2cfb3bad75f48a1686f5,f6f8b4904baf3f335abd3428216c364999ea82cf,,True,True,True,17,51,381,6,True,17,Tests_passed,f9f3a4d35b2d77cbf9b186932e0f8bf47f07b8c8fa31e457efbe77ae2a28bcd8,True,Tests_passed,27746c62cf63d432a3c57d0cade969e5d1c64f6b6bfb99838f215020afe28bdc,True,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c83358a5470cce98cabbfb8217fcbb0e24613e9b42fe2813054fa971eb2517be,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c176630f4289e6d1d18cd519b933b7e2da3380a264b724f40da5e4c551f0dbfc,Merge_failed,a4007eb321c3dc4e0f95a2cd48a6db5b304e1e5054ab7668e7e7652847c13ded,Merge_failed,50f1aa7713abc4917a01fbc411d446f1161fe2287240b8890b27607839512680,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,0aff3abebbd22bcb515ea093475300437f564fcf01051b174965cb06b2c651a7,Merge_failed,6c18aab44777f615a41cb75d5bcf18261f6d69d75308597b56b4373dc7974bf1,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49,Merge_failed,c55a5ebc7ddb6f7f7a5d149c0e15c8dc48b96372953c70420ebe74d2f7cbab49 diff --git a/results/reaper/merges_tested/mwanji/toml4j.csv b/results/reaper/merges_tested/mwanji/toml4j.csv index ce6085bd6f..0c8b593125 100644 --- a/results/reaper/merges_tested/mwanji/toml4j.csv +++ b/results/reaper/merges_tested/mwanji/toml4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,16915c8edb83ecaa709c267c05e2272c24a8fdd4,dbbd2f5e0e34be9a47328c8cc6b9dc2b889bb5bc,568a77b1bf7f01333399f8a6bc21780ae741f21f,,True,True,True,6,20,135,3,True,6,Tests_passed,80e81e1f51fbcbf5761105ba5d0f61c828ddbbc3e95a5703161dd9ce3c1c53af,True,Tests_passed,afc613d5006d797d74ba2031a25cb6a535de99a0bd551d05fa7eaf891d9a5968,True,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,22374f407dd827362d1912467193407b369d60806536e54f6c32025145996e8b,Merge_failed,41645d46ded5b14361c63cccd725e1292c364b41f0b671209affbc0f99cd8c27,Merge_failed,6febd2a6c01df16d70bf7d54ead291d1f0eaad20a1955874a9b41877f9fa99d3,Merge_failed,6b8bdefdfa076b5d15b007b5540ebae01579e92008519e640f2987379811d3d4,Merge_failed,41645d46ded5b14361c63cccd725e1292c364b41f0b671209affbc0f99cd8c27,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,0a94ba4eb34ced27c7e23a76403c4735106e63f22c11008b7e4f6dcdc5a36835,Merge_failed,6febd2a6c01df16d70bf7d54ead291d1f0eaad20a1955874a9b41877f9fa99d3,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,a8f7ef81bd9d5e043874ad9c21742e840f87efef8b51b29e6bb0b5e4a20602d2,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc,Merge_failed,68ad3617a511f916556b618e322ced5d0863a4bc5ce15550727779b2c81a46cc 10,refs/heads/master,f8f55a6f16602fb21f3d44c45744e719ec808e2f,e7d7de7ae5d5a0b7e6d59e095d4ee9bae829ad68,8571d258cafb004ddb73ea22ae9d620b7310f20b,,True,True,True,27,59,1234,3,True,27,Tests_passed,53009c36ff12b528f2d397f15d0c3e574d09557685bc4131ae3f74b16b0c2d9a,True,Tests_passed,993b37a673e4fa19f2752d54fcc7c2ea74cdbca098b2c80b5eb7d4e1a26f7424,True,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,2c017bcc7eb08fd78fec779fcd957f1eb7465812698d1f78c2bdafee0a8b11f8,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,2b56c54259855b4ccbb5dddb5eeb92d1e688447dd7d1bf75e7309fac444ea4e5,Merge_failed,6bcba85ea79a8eb5fc9d5c67a294f1f219ea4b96994cf305daaaebeb8ec57a92,Merge_failed,2e28518edc922b4b711cd2f90f9cd58895fb614aaa0fc0c6b417d7361e36af27,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,4267ae59207d42c3a6ca2e5eaa7cc03677135068fd2a02a4768317244d0e37a0,Merge_failed,a0a01c2d95e6f5803686f28b3c8b539e0f94a60d222cad153c102d551bf0d1c4,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,6b4a2928919e2b21bc5c8c5059c637cc5105631ed3906b1e53d12a695d313945,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc,Merge_failed,202e5555c4c7a00fb0068393bb61eade546edf8b485c4875f4823c37d672fafc 14,refs/heads/master,a3edb55e9c0c40f0620c3b8c4480864a2f07f46c,4e22176f1e4472fc6f3b9dae134eed26300b20a3,9093fec59bb777c4795ac89b292e465aa25d70e8,,True,True,True,37,193,2307,2,True,37,Tests_passed,69192e456c702d2b22131f73ef40f9ffba4f0baf04a30b73ea6d811e6153f22b,True,Tests_passed,148bf70b2ed696110d4ea99427754414b08350cebcd99d78aa0c379db409a625,True,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,eef84978b40c9c4f67afa92616144b8a093042f07b58bd2f034c35c18f96fda2,Merge_failed,61674ccac6c854039e13cb8067a65c8d4cf238db633e38e63499ab63688352e1,Merge_failed,d7475c6833eeb135342ace3882c8d5444277fa85af191f0e2a21cb3cbf992787,Tests_failed,411e136e87132ec26b2e9eb6da438bcb19f65e92a6cc911fa0d9c0a9d8a3ed24,Merge_failed,61674ccac6c854039e13cb8067a65c8d4cf238db633e38e63499ab63688352e1,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,9ac423617dc0f35ec1f7c340120c47239f2367f2c837c9b552cfd7ba3cb035bb,Merge_failed,d7475c6833eeb135342ace3882c8d5444277fa85af191f0e2a21cb3cbf992787,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3,Merge_failed,43ad19e2958047febe5c79746485e1c165d190997043b01fe3cfcda0bcf6cbb3 diff --git a/results/reaper/merges_tested/mybatis/jpetstore-6.csv b/results/reaper/merges_tested/mybatis/jpetstore-6.csv index 5687c5b213..19d9dcaf24 100644 --- a/results/reaper/merges_tested/mybatis/jpetstore-6.csv +++ b/results/reaper/merges_tested/mybatis/jpetstore-6.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 545,refs/remotes/origin/pull/637,33dc73ae76460d3a00823c2f4089ee1f5f07a4cb,5fab2433fbf9bc2dc9146d6b5f1c93934c31533a,a86cdece772d44deffac693e66cd45bfd2a8fe38,,True,True,True,14,35,291,3,True,14,Tests_passed,4a4f5b7070c8d1bfb108df09e34bbd5a7c191bcfde2cf2ede9e50ecccb6f5c85,True,Tests_passed,f5eeb9d8dc75c866593936e4dc56970fbc36b7a2750278c4fabb098f7efe56c7,True,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6,Tests_passed,56d62b60a57f488643802f9fd1dfb9e1a291e4eb32d6eed04e43804261eb8ca6 548,refs/remotes/origin/pull/637,b26b0c87017c0f2ec431ee0a1425910b9a9fff00,3c5d4b04254c9c898b2831b458a02b6f8c277def,f3362fe251b6fb468e0159bad8c36f1fd5798a3b,,True,True,True,16,42,323,3,True,16,Tests_passed,e2df62e1bcac35ae7304c1745b17150b6ac2d9c1be03ff5bf22873ec52943079,True,Tests_passed,136cac0b81ce395b9a3937d4ee18a60e4a8928044a6c8cb32d4b44508fd3b882,True,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,09e940465b2e40279da13647c02056a37d2aa82c65200b4fc4805e9f69250102,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,8f4e513e87b1a3df0e59cbecc2e0bd1b5d81463bde579ffd10a05a274909f1b5,Merge_failed,66895cb8f41ceba0348d5b35a55082338d85bc9f84d9492930087fbfd4541965,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,58df953bc4f7dd167ec48054a4ab145202415f6e369492dace40e9c16cfb10fe,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30,Merge_failed,916fca2340650c172d9dd7c24ae1add3c4567512033ccfd1d879ce435f4cbc30 diff --git a/results/reaper/merges_tested/mybatis/mybatis-3.csv b/results/reaper/merges_tested/mybatis/mybatis-3.csv index 4fa35eeffb..b5c703cfde 100644 --- a/results/reaper/merges_tested/mybatis/mybatis-3.csv +++ b/results/reaper/merges_tested/mybatis/mybatis-3.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 172,refs/heads/master,bb492ddf0c516fb895448726f743c3aab741da72,2e9581a34c1f6fc6bbb2e88331993e519f2215f1,f8d16508dcc3518be9c659138b03dad7031c8552,,True,True,True,1979.0,7357,48734.0,2,True,1977,Tests_passed,c7f04fa25495ef215bfc1d7ea4d28a65fb1f7093459508134c385446f88cce10,True,Tests_passed,0f009f82b176f6d2d59ea6187a2f908097e21965cdda42fd635751df110f9ee2,True,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_failed,9eda35bb4e1fd4859c1bf0743ff589f1bb1a22090d4f6c3fed10b27f85cc9f35,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c,Tests_passed,e150c20079e1a266b655f7ae3b1606d965723c390c85abe9e0bb4c73faab811c 188,refs/heads/master,9ed919bb1372856fb7cd69969d13731f91fbec16,0c9f887141cbf9a0e6723b4901fc2a8915af6f6f,41b9b839229580cd091ae747b205f207b56157d4,,True,True,True,1864.0,4215,11575.0,3,True,1864,Tests_passed,0b1958033e3122de17471f190f051caeb0fac293139089a7b0bb99ebd5fd3720,True,Tests_passed,53ea0749350579cc69d70173b37854236da7e6be59b762995f28363fd92f9867,True,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_failed,b6b25427c8c980192fb06bab7a4e0b57c246890445fc24d5f15dabd962a1f658,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80,Tests_passed,cc5e90f8067918ceb220c97e1cb3b68683fccc2c8ee6a38ec6159964d6a1cf80 355,refs/heads/master,5a5a6b9abd06e663ca8fe71d5b2dfec037d227bf,dad8c13771a7b98d3814bf9c50bba8d8d36128e4,5e89813d10e903dde4f744942bde3149293b3bc6,,True,True,True,1266.0,1428,5970.0,8,True,1266,Tests_passed,8b00dffd7db15d8556517599794a45d07053b61eb0114e2ed18dae8b249435ec,True,Tests_passed,c6e6c9d84e00d19c059a1515d96f7c2d7341de44ec886b8d9d1275ed6e9fb04f,True,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,d154e3f5689d1788e2edd55e5c0c37dc4035d31d98c629acbafdca757a796b5c,Merge_failed,2ecea51872cb5c11e07feff204e1703c1668187553a6d220a5e11f39eac674ea,Tests_timedout,e127bcadf0a86a934f0c72728acdf2cc5d46e1e5875cb1bde4641a343c89e55d,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/reaper/merges_tested/mybatis/spring.csv b/results/reaper/merges_tested/mybatis/spring.csv index 444568e7fb..53b1e805d0 100644 --- a/results/reaper/merges_tested/mybatis/spring.csv +++ b/results/reaper/merges_tested/mybatis/spring.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 155,refs/heads/master,49c1e3cce4f65bc98351fca9e31fa4183f60ce92,ad20725dfe9c4691952114efdeb85bb11ea9b4ca,bf4ba2db5f6002de0dc335cdb3d627abe50b56cc,,True,True,True,248.0,448,16217.0,3,True,248,Tests_passed,e038b98fc0166a5fa07a715d189afec8ed898abca23cf3ae995cec266c2fabd7,True,Tests_passed,eb5b17f3970579ab56da3b92e1ff4a536528efcd582c5ac32137e075fd35f96f,True,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946,Tests_passed,47742b3d3a9697cfe0bfbcb59886ee4c363d1399551b977676ae78e67f716946 diff --git a/results/reaper/merges_tested/mycila/license-maven-plugin.csv b/results/reaper/merges_tested/mycila/license-maven-plugin.csv index 386a95fa72..0b1e251585 100644 --- a/results/reaper/merges_tested/mycila/license-maven-plugin.csv +++ b/results/reaper/merges_tested/mycila/license-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/master,d3bf529757d51d950abf9e7cf025b708e8266d14,431ddb6c0ec33f909058593bf978ae4bcf997628,2e610308fce8c02bc9b9040fe7d99fbf7ce688a7,,True,True,True,22,58,154,2,True,22,Tests_passed,5029bc4117ce38746c3c8a30743c1f49446b0b3ecd66e8bb2ae8847b92036acb,True,Tests_passed,ac49b448b45c113a4e71a707c8c381e599bc9801c210f292b7cb9016d44085ed,True,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_failed,c006a261fe0ea46b683a3661cd4176079e393e99d4636e9791e71094e82b856a,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d,Tests_passed,2000e940cd6ac64d346722287236c6eabd01ae4471f2cd05aa042dd33aab310d 23,refs/heads/master,eddb550d9bce71a18f5c2397a372f28645716073,ef5db465e0d061c04b88eee3c43aea105f8b4080,6fcb6925bb42fc567849cdf0d5658a1809c80d99,,True,True,True,8,13,32,2,True,8,Tests_passed,a1e007b93819146fe8e88d4660c218aa2a602c82b0b32d84051effc18ecdab1d,True,Tests_passed,31a6af58d06547eab6675fd7cc633f7844d74dbd593364bb7860a6dac51dbc0e,True,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_failed,2666f0d00d0bf7046dce59478efa7c78dad9da426a110564ef489746005fccd1,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d,Tests_passed,335cd909cb7e1da633a313fc796bef50e506eb15b081cdde8ae612b66be05a7d 26,refs/heads/master,0cbbf006623cd8c927cc333dc187badaad014601,ce4906330740447184a65201e8ed12f65a3ec756,f79cd3a69c326e6dc6c32f6643cfdbd11da915de,,True,True,True,15,37,84,2,True,15,Tests_passed,19d03c4dc15b77a2db1767b05aa2d138ea3b019983c02825a2b934d64975990d,True,Tests_passed,4fd6d9b6334622550c216364b47a29e8ca141203509bdff33fdc224099a5ab19,True,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39,Tests_passed,3a0a178421d0fb1297285c229e96900cdbba6ca65ad6c336072b71ee6ddb5b39 diff --git a/results/reaper/merges_tested/mygrid/rightfield.csv b/results/reaper/merges_tested/mygrid/rightfield.csv index 7a103a8059..59bd0c6621 100644 --- a/results/reaper/merges_tested/mygrid/rightfield.csv +++ b/results/reaper/merges_tested/mygrid/rightfield.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/main,b496bc27f180d72be091fec0b9d8fdc134065499,892ba960313c17cd2313317c5cfe3338f3ed04fa,6e6e30d7a5a01a179e7858c94873daffcc2c1a45,,True,True,Tests_passed,f8331c143be04499685f2ad062a8937dc4e7b517ded7a387eb90946d9fe5db05,True,147,173,3527,10,True,Tests_passed,8a6515a4251681593a146f7ecbc8296b6c5c4beaab12a16a1221a9f9fc490942,True,147,True,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Merge_failed,e565e977eabbb10bca3e1da32519056cbd3aefd0e5bf06018e0049679f60bcc7,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Merge_failed,e565e977eabbb10bca3e1da32519056cbd3aefd0e5bf06018e0049679f60bcc7,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,c774a5334b58976575451af6dc6e460b46f258196897de0afdb7e55605364680,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5,Tests_passed,cc2b1440acb6e3b35e835db9dd250e6520ac74a166377f0b81443bbdc914aaa5 44,refs/heads/main,d34df55c7357f0aa5556d42703f3cbcc6c3d0389,6b372f7d40a40ff21d06aadc40e92cbaef78b958,e75a3a2b73de9706282f7e991088d0f82f831b85,,True,True,Tests_passed,99760028def508e4b875110f567997b11d507752e40f53e56ffed27a73a978c6,True,13,23,130,17,True,Tests_passed,6380bf6a0caca244fa2ec924181696460a9e9260d18a4f9ac5008255e3918fdf,True,28,True,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_failed,3882a4b1a86e85648d98296a313e68dd565998438d9361a54a6abb555a6cc5d7,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,559fb2b2eb51df373e664b501043ead45c127fb3d943ac2934ba73592e6591fa,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,dd34abd439d5b84c2409224093f3c4100475a92d3eee0ff80d7ff2a1016ee361,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294,Tests_passed,1a41379790ba1461f0d4403385faf5a0fc7892b492a906aab280f947c55ff294 diff --git a/results/reaper/merges_tested/mypurecloud/elasticsearch-lambda.csv b/results/reaper/merges_tested/mypurecloud/elasticsearch-lambda.csv index 5eb5bc6b5e..22b7ecd633 100644 --- a/results/reaper/merges_tested/mypurecloud/elasticsearch-lambda.csv +++ b/results/reaper/merges_tested/mypurecloud/elasticsearch-lambda.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/remotes/origin/5.1.1-dev,b929d2658531c72608f85151ef3b27a265c5214b,aaa9d5bcddb1f0952d9d2b1a01e78269813584c0,ed4d387a4da8018e29e8cba0cad1c06deffec484,,True,True,Tests_passed,f2b2fa2ddb9720336018c77fac329e4820e187c396ab5cc2e5a605fde7ad178b,True,15,95,904,3,True,Tests_passed,6851cd87583df5f35f5a7e4c7bb5ce82d321a1718b82edded9f3ad80203e34ef,True,15,True,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,b19bd36ec31e10d96df68140ff3f0e49df7d5b865b3889c4ea0fe1508cbf1515,Merge_failed,ec9599c1c693f6699f3942fbe096bffbe35ee49149a1863fb88405e07708e533,Merge_failed,83b158befb58ee93d6c8f04ba3f75fa9f88963acf05533765e9084feb64129d4,Merge_failed,9edb9b4fe5ff5372500cb324d0bef233a96999ad213f2273463fe7b6305e4a23,Merge_failed,ec9599c1c693f6699f3942fbe096bffbe35ee49149a1863fb88405e07708e533,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,a86dc3f3eeb88f92adb3472d7194020aba636bc9a4fa6b257e0bdb735d86eec9,Merge_failed,2761b130065c6ae1f12f1739a9e3b1c87e2afecf2e6f35fdf64349caac65399f,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65,Merge_failed,57320389d525693ed0979dee74eeca2ca675e8b8d5d99201ca81786a7c100b65 32,refs/remotes/origin/5.1.1-dev,9ad6ef3cc4463ad5e7c71ae057264ad3ba7b2f86,4d58e53b86ac42a8ed6d8a66f14a09f356ce119f,a591b944acfe10d8889b1554d1cb335853268272,,True,True,Tests_passed,8d90decbf47edf1cf55e9af45b19204deecf1c7e9cc5b7cc04b85000c603c1b1,True,29,135,1610,7,True,Tests_passed,10b35739e282c49fbacc1766c18807c0bc5b69268e86a1578c5a16d89a6f2636,True,29,True,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,9ffa7b6c4a4f032635e9d9d9e2e7e6eb6a841d8aef1015aae095ba9f0f2e1e8c,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,11b2253cd118bf5a8693bb0d6f706771dfeaeb67146fed260fcadc93ae748ae4,Merge_failed,656490d1eff78b7d1909b4071b506c2153562fd7c7cd7c22491d2ae8b8bacf74,Merge_failed,fb46db390e1e26001876a7f0fad39fc84372733ff76f5f6a974620091377caba,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,a9b2ce8aa62b61efce8b1ce3404b8730bc5c8baa1444e4f1884f66c9121acd74,Merge_failed,ed2d666a47fdd4314407f2f121641eca034e0e29e6ca78db5eaf4ff0f67cbbc6,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,1513aedb62d8661c018c12dc4a2644865454c5444aa85ab78042fbb02e75541d,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0,Merge_failed,6b3e5723839b68317d5b8b8d1fb1f2538b37f45ceb227773e4fe02349617e7c0 diff --git a/results/reaper/merges_tested/n0rad/jstest-maven-plugin.csv b/results/reaper/merges_tested/n0rad/jstest-maven-plugin.csv index 9423dd485e..046295ab4c 100644 --- a/results/reaper/merges_tested/n0rad/jstest-maven-plugin.csv +++ b/results/reaper/merges_tested/n0rad/jstest-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,1842e580665903b7192e06575679fb39870601b5,ff683a4d4ac09672f45d47252cf5d366f17c3a61,6c30f8927d85bfedc3bdca89dcf753a0074f0f4a,,True,False,Tests_passed,e8c6e9255ca001e7c13d41b00bd947d30fd4ea8618dd6684611662d37e2113dd,True,4,6,17,2,True,Tests_passed,2296fda8c17bed3d5a9cc407311a097fea5f7d6b215d6610f31eb9b52940cc38,True,4,True,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,cd066e68abe49a89a45a96c8e60ef9f8cc21ca15edcde7be44d5db9aede9bd28,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785,Tests_passed,36e073b6163b6859cba309271969da9da2cdfaa67cb10efa7d1d8504a264d785 diff --git a/results/reaper/merges_tested/nabedge/mixer2.csv b/results/reaper/merges_tested/nabedge/mixer2.csv index 2476ff6683..437773790f 100644 --- a/results/reaper/merges_tested/nabedge/mixer2.csv +++ b/results/reaper/merges_tested/nabedge/mixer2.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,e8a1930e8dc2367176464e888888ac1645bb9eee,b7f31d46bb5fe9ceb54490c49483081ca0bd854d,82a9bb4a4bd8b2a4c705a47a1b8325e2a492f950,,True,True,True,148,173,533732,2,True,148,Tests_passed,ce14e4e4da5260130f5d137d049257acf929e6c886b0243264e5e0e5f2835805,True,Tests_passed,92886eaeaa78cbd79977557e7e6832e4c6ade83201fd4f6596f54f15cb64efaa,True,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,86156d1ad2d3f050bd1118f67f70482b80616ccf14a4cc914fd7505128eacf94,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Tests_failed,20e0a272527a12f4b8f842187158c2729ee88facc95145a6700bbaae8cd68aff,Merge_failed,804974926ef28fbaaee573971619701161bdde415f125697d26e402410a9ec1d,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,c680efc91218e0496fd384cb964b83d8c2b61d0ab6fd942e66cec6be47bfcd20,Tests_passed,92730cae5f9abd510aabadd619a1917ebfd2425d84cdb962dfc48f7fb2d22447,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,8627d60188138a37eb70d2395d79fc2915e174f703178983eda9116bf59066fb,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283,Merge_failed,d529cba54b048e5c6f733cd2396b074d651efd8889f7ac4a2dc69660a9a71283 diff --git a/results/reaper/merges_tested/nabeelmukhtar/github-java-sdk.csv b/results/reaper/merges_tested/nabeelmukhtar/github-java-sdk.csv index cfe30204c0..e9c5eb1f62 100644 --- a/results/reaper/merges_tested/nabeelmukhtar/github-java-sdk.csv +++ b/results/reaper/merges_tested/nabeelmukhtar/github-java-sdk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,539b0183d88f09003733316cbe25ccb3c952d024,e30d4dba438a58d625b740c0cf388bb8efacf02f,6434435f5c4da9f3c8b9b4112f34237bdcef10e3,,True,True,True,4,91,930,11,True,11,Tests_passed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,True,Tests_passed,82589bba1cc439b911c77fa5792386700d6de74a4a0a1a3ddca9d41611dfc89a,True,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,89b9d92d10d9d8a53d83d25cbf2a8c1f9c43a8d3936e7bb4ed10e52c0d23f9fb,Merge_failed,06c2b94b173745e6be0b0d3f1870a066bff530555715f729da207d37060a641b,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,b9c5b715c58d5187dac128e17f443f63b9c21b5317136fd7fea42cae101fbd17,Merge_failed,9c293a507dd267703ab1db6a78ebf018e37b700478806609b16b1e773e32d199,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f,Merge_failed,d1c3877fb305afa0db87e2be2d60eaabddb22df4d57a42b08312e22fc35b852f diff --git a/results/reaper/merges_tested/named-data/jndn.csv b/results/reaper/merges_tested/named-data/jndn.csv index 6666eb455a..b88c8cff28 100644 --- a/results/reaper/merges_tested/named-data/jndn.csv +++ b/results/reaper/merges_tested/named-data/jndn.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/master,3076a255b5a703e01e07b3f15116e5b9035b540e,82f4922742e1670374b378d5138bc4da23c894cd,07e767dfdd2d13c210dd71c3ce7acaffcef6f67c,,True,True,True,53,155,3530,5,True,53,Tests_passed,a3b48849e3ee2b8a82c490f256e3899cd304c8ca582343c991e608c02714484b,True,Tests_passed,6e7bccf60f9d569a8dcc1a379d92d421ef36547b90f5316e0c35fe539502fc52,True,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_failed,5cb623ac80f44b59a789a1a852062be718acbe2e4dabec38acdc98e5af758d63,Tests_failed,020798fb88d1f7d5b1b967d593dbfad92dfc883914f25715070be2d67b495ea7,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_failed,5cb623ac80f44b59a789a1a852062be718acbe2e4dabec38acdc98e5af758d63,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,4429b296c09e405b247d571371d142fe51f1e84f189e1e2d218040b725b5e037,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836,Tests_passed,7707903d502008c5cb85d58240391749be4c4db7a758bd958382d536b2dad836 58,refs/heads/master,3d4740219275bed6dbb48e2aa7ad8bae7973193b,f5d5b1de972d014333bfe7c8d445f4c02084afde,a2da147b6011ede6028ab2c034039c596c8b9892,,True,False,True,7,18,85,2,True,7,Tests_passed,ea42a944c5dc0d24063b04303ecb1d5f875a0129e5a7a5cdfdad61ab1334c074,True,Tests_passed,1cc28b2b95dd9857bf06772e3d9761e484b59475a096bab0c08de0efe2469ca0,True,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_passed,cf86d6838cd094cc5aac3ec5e861d22e605d167ed7ccf6a66a9e9285967dd6c7,Tests_failed,7047889c6d4b247cee0e02bb3dea22f739e5926bf8569bc4c86812a436d4c501,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_passed,cf86d6838cd094cc5aac3ec5e861d22e605d167ed7ccf6a66a9e9285967dd6c7,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55,Tests_failed,6e21688fe8d7f26508e3a50a0bf829bbbd044ecb66d4d948e6c28bc8e5aead55 64,refs/heads/master,63a0f4bbb8ca58eb54d3c1439168ae87c912673e,85658d3cca6162e7f46a38fa8d13e03e0ff0a3e4,bb6f538abba8ae65bf0d6aa5a66a27b57cc14683,,True,True,True,14,33,84,2,True,14,Tests_passed,bb30d1a8c70debefa0e2dbea6ee10ceb9fec65e481902d57f7b0dc5531d50529,True,Tests_passed,a7c96cc3b411f375dbf908a4303673c563d1ea90e0df90f22c66c41cea5df11b,True,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,51be7920cecb8075b75471bb364b821152ee85cf05d873a881103d039d28461f,Tests_failed,0d377b885353b05a2e0bda3c0e4ed830ef73655f0f2b443136a99ccc3336c167,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,51be7920cecb8075b75471bb364b821152ee85cf05d873a881103d039d28461f,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,b969dbce7ce6a91645c41c562ddb8cdced588330b6fbb9c876ca366d8ca3f561,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8,Tests_passed,a30fbe0af52941de7cf89aa6ca62bb28c2e59127fc15addf50dda95b4b0bd7b8 diff --git a/results/reaper/merges_tested/nastel/tnt4j.csv b/results/reaper/merges_tested/nastel/tnt4j.csv index c1a4c2f70d..9dc7fb0f2d 100644 --- a/results/reaper/merges_tested/nastel/tnt4j.csv +++ b/results/reaper/merges_tested/nastel/tnt4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,b522f15d294173f3325363b1853a57105be1b32c,e501c9b1eb2fd4eefe6ff379e99288363818b39d,edc5367d6b31f6631dac5ba10ec21c07e908c25b,,True,True,True,15,60,338,29,True,31,Tests_passed,90cfdb0592890517c267371b30b8aae7600ddd8555d6bc611d67c091f1278192,True,Tests_passed,cdde78349d278c84f2a17e18827a141e6536efac4cd68c373b7c28ceeafbc8e3,True,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,a08e2c0c22c167139b03d89e6e655642fbef18633b56ac75d228f4e42505406e,Merge_failed,164f5d0b6e63e9e281465c6f751dd40136cc18d926357a3fc5b1cb57f18bf1a0,Merge_failed,c776299b9ea4001ed60e582a272666d197fd7b81ab7718fa7ddc4a71eedc41be,Merge_failed,971579fb3ef878ac62b4cf53807435318479c2edc76b1cd10a5e27e492dbdfbc,Merge_failed,164f5d0b6e63e9e281465c6f751dd40136cc18d926357a3fc5b1cb57f18bf1a0,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00779a2f6b27f2bea7f1e607966f5341db6f96f383e687eac15f1ecbded38ca0,Merge_failed,9a36f83be09a6d5ad8cd626aaac33068bdf1eadaf8ccb15079f1243f1a8a0d94,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,00f90af1757d26cd2b3ea76aab0a00a230f8db1cf5a09aa787c81f84136c75c8,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5,Merge_failed,7331277e47ea3eef99f00ee3368a6e1e9f48523edc2504a875028fcf3959b1f5 13,refs/heads/master,627930d2b4765450617ae73f3c5d4a7af62b97c2,90ce78c0eba903759538d042760362497ca10b56,2d191958a7ab53e2ba0d37d112f2386a24e63c8e,,True,True,True,13,52,307,14,True,19,Tests_passed,8b99c52e2c24a34537e4d34808dee8da1482de5cf9c4872d16dc3e7d8cb2cf0a,True,Tests_passed,1e13ff31c149b138b0d4fd8d49ac48b9d9ca85c81d8982e744f92bad97e8c466,True,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,a057bc5a8236b65ac225532c1b44e440d7908b85d2f962fa9c133461d0750b38,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,2fd262f62748d7a3caa76f5b459226d185b43949fd8d2b9eeedd72f6d1dd7f66,Merge_failed,b7954486a5556b5fe146d1e5031c084b1f051ac053f6373e0d59fa6995f0b446,Merge_failed,9a126c17f2c74fe251eed3e2f4e5f0707ff54a833ce5b4d5b742778e4e732982,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,7ff24a67548e83e2646e57451fa6d0b9d24d9e36330190590c68715c43447428,Merge_failed,82bb44884475530383e7d853bfa5a725b9672feaf3809e81af9a267ac7475825,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09,Merge_failed,26d823e2a8954b24ebcf741dc2152613d16381b9e54ba5241f58e6b9d7e06a09 68,refs/heads/master,9f6f3a3bd4ffb7da44189450809772f3bc0da917,efb637d9076cef0d9445e90a848903f2b00d4719,9d15a924f1fbc941bd60fcaa612160496897dc9d,,True,False,True,2,1,16,2,True,2,Tests_passed,fb637e0e5bfeb7705ac380cd1a9c60914be519ef78732be1aea98be27d13a751,True,Tests_passed,d62976622dbdbee8ee68f9a427b50daeee53eab4ccca911eb4c5a970476601eb,True,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,5dd7cbcb7b7a7f3e7aa928519840fd1405ab11b1030a9a57dc9cd0f0a489da8d,Tests_passed,de361ecd4db546a909744b6a649b2b81b7a1360deaa6b2515a94985170d4175a,Merge_failed,7e870f3bd457132cfaed463f86e7fb5b274f0b0cbff301d2544a86c74750d4cf,Merge_failed,85b0d67f41e45bdbc437406fa51172034f2829b584ef05131a2ab12fff4f4946,Tests_passed,de361ecd4db546a909744b6a649b2b81b7a1360deaa6b2515a94985170d4175a,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,99a89199da7a94c44c810926c24a8bf31d403beddb80a4f65814bf51517c6fe4,Merge_failed,7e870f3bd457132cfaed463f86e7fb5b274f0b0cbff301d2544a86c74750d4cf,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,8b78174e8f338fff9685a8034bf25c95ee6e4b9233c5e4d5b01ef9ad5387a61d,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b,Merge_failed,61cabfa58b4e5d99b43fa4b4296a4f037b33055f0392fbe3f60a4425acfc6d5b diff --git a/results/reaper/merges_tested/nea/vertx-mod-cassandra-persistor.csv b/results/reaper/merges_tested/nea/vertx-mod-cassandra-persistor.csv index 585ce4ca53..81ede64938 100644 --- a/results/reaper/merges_tested/nea/vertx-mod-cassandra-persistor.csv +++ b/results/reaper/merges_tested/nea/vertx-mod-cassandra-persistor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,5f849c44ac7fa15876145c056ba40871f94afeb1,fa8733a59151272f42eb183d907ca866dda4fc02,274f625caff7e956fde0784982f279a69328a99c,,True,True,Tests_passed,3a97a7e1d982df6a8806a0c5c6ba7af25065a0e7b5f723df724b5410678f539b,True,8,32,530,4,True,Tests_passed,53ff524ad4faf8e4bb54b559a74b17b8b21c604f12cdd931ab4efbd18d94e743,True,8,True,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,34f3e25d7a1721860a0be42da4fc9d0ee86e9693a479d161aac08dc03a9e479c,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,f7f5c7ccf452060c82957c9f96245480d2e4137e2559ba9a148a11fa0d6ac8e8,Merge_failed,6834c0f5785fcfc02d949193ec350c8c9e85d6963137aa1441eaffe874232eec,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,a0cc89969823093ad786f8941ab57c6f0cacc0425aad40300a578b63362e2476,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,777d748083f48b7189158b7915a6e365d77dad505515e8b5db02ab958c2f3171,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9,Merge_failed,058ffe59684a6e134a1b00541e630e04cbf40f70fd6744119f86805cbd2a22d9 diff --git a/results/reaper/merges_tested/needle4j/needle4j.csv b/results/reaper/merges_tested/needle4j/needle4j.csv index c5a7189cc0..9300e04f73 100644 --- a/results/reaper/merges_tested/needle4j/needle4j.csv +++ b/results/reaper/merges_tested/needle4j/needle4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,34d705ef5705df4014ecbfbeec2da14694e900ed,6805db04258461dd4b131b4522872b3990814df5,aa9d371e20371c7a750a04e4a33f26854e064a2e,,True,True,True,28,118,804,2,True,28,Tests_passed,7e71beb48dd4587877dcf02d55c3060a83aa745abc63a6b34136881becdd0996,True,Tests_passed,f275a6189d549a54a2f0176b401748bf9ed9c1b4d8fc8f5ebd1805b6328667ad,True,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,23781af2fbdf00d905bbeaea360688c4ddbcac055fe0baa5116fb089bf57bc5a,Tests_passed,62eea28b71ebe105ab034a9661d0974363d7179711dba16bfaba197729c2da4d,Tests_passed,607f89e4b69164e72a7b2c5aac91b02412185bc249d45c3d36b80ab9222ea6eb,Tests_failed,b74a7f9239b54709f625e044eb0e191e9227e9bffdb93ca56bd61c31c844a4e3,Tests_passed,62eea28b71ebe105ab034a9661d0974363d7179711dba16bfaba197729c2da4d,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,0fa76b5985aff0d0243297f619ece774e4541d6c94fc4cb89f5e98d71c541be0,Tests_passed,607f89e4b69164e72a7b2c5aac91b02412185bc249d45c3d36b80ab9222ea6eb,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be,Merge_failed,839940162ebaa64ca1960e6954f061f39f22b42cfb4b729a2fc1ae2888a508be 7,refs/heads/master,93f886c3493bba1e2bc216c583c83bee71c6c747,d247514a07b785bd923d201ce11bf88d3972afd5,81ca0c3cf142efb24091bc993a6ed13d091835b6,,True,True,True,31,116,1541,4,True,31,Tests_passed,be9360c550c3cf09e7f0027ff9299d4d405aa4927b2e8385f33623c6eaa898f2,True,Tests_passed,cc4a937c431587dfc2e0f013bb0804cb50e608dc3da1f756441d1fcdbb0448c3,True,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,a91581ef4185b031f9b86e27d68bdea3076fe43885545702f83412ec86f1f96c,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Tests_failed,1bf712f64938ccb4e00e2342c7557e74e5a4d81ba0a8e6034cc23c419510e935,Merge_failed,7aafecf0a45283403b0ddcbeff6ebeb474841b4d2a290375345da1506a96f948,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,83785b142da691b2f07f2e2de84f1e62314918b94e61795ed6f8dfa937956082,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,dcbeab9add2078bfd00ddc1858323a46f0c9d6663e27866ecc67a004ffae9610,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,51867c73e25fdd0d57c3c15e3bac0304a48fa7f450e333443b05e565fb13f994,Tests_failed,e8966767a33fb7c84347ebd50838863c89575550a2fe1939b35a4b61ef6ab65b,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,e1fb906da1a8bd543acf60c6daebbe3c0d7c5db064c6ab8ed9cb4da27568857e,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65,Merge_failed,d7d6df193fe8d96c87a6c51dd370b10f4462680cd4d6594d2a65caeba0a35f65 diff --git a/results/reaper/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv b/results/reaper/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv index 575a47145f..82eccb7369 100644 --- a/results/reaper/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv +++ b/results/reaper/merges_tested/nerdwin15/stash-jenkins-postreceive-webhook.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,3322436f3e6f3286b568b7f8a2cc22844406b99d,5f1fa9cb9933a59ece0bea597c142c9bd2c88843,281f8d180f70e11ca389995f2020ab815a34872e,,True,False,True,5,13,28,38,True,38,Tests_passed,b9a58708f9e775a2cc006647930b6e87959f6061f3483401ef250b58a5892914,True,Tests_passed,7b8341bf821ed94867294ee9645abf7c36c90603b9ebd65fbd7cfe148cd18ef9,True,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,324a15e82d017c3bccdf451f32db0aa35d44cab5bb86ab99b80390e35b8174db,Merge_failed,302bea1686a5c5cc4d888c41e792b431a82eaa0e412daaa7e6d270158ed37d18,Merge_failed,c881a109592adaba4b8ee923784f1026d2ce9405222fd59b699df0e7db5612d7,Merge_failed,6da91078bbce3f6e6ec62d4cc959a5b9cc2c03cb3694e9bedbc5e57e746d4e2c,Merge_failed,302bea1686a5c5cc4d888c41e792b431a82eaa0e412daaa7e6d270158ed37d18,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,f0b0be71ef929710c1238573affb7d369358d9cd7cf6ac7348ebfa00a7c8852e,Merge_failed,2bc3ab5695fe6f583baaa8efdbf85570dd331bd5f73b67381674fe970982522d,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413,Merge_failed,c89b1bdca9a4d6d9480c119a59cf6695a47863a2d550be56089cc4eb8ad97413 16,refs/heads/master,8860ab3c4ed4b40a174411ac0b97af4d2ffcd4cf,48490bd6058369d762091369ef73d5144f194f05,e9b8f2006b0f21d93d0a3818ea5105919123a493,,True,False,True,6,17,112,2,True,6,Tests_passed,508df40e55546af80f2a1412bcd69eed9fc49242fedd7d2e67693fb8898f7e52,True,Tests_passed,709947285e823acfe6fc6d38da2b50be4cb9595e24cf66b20946ed5c14f93fa8,True,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_failed,7f69e2a6264006f131dd865893142c1c319cd86e443b48250de89769e5d9588a,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,b95687e826ffff4ef4fbbcb49efbe0232d3ca69ddb7e47ef4bb2933213f2e409,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd,Tests_passed,3816bac51f68f1c1793e6a808137db655d94c82f32f985dc6b0f49cf93f653cd diff --git a/results/reaper/merges_tested/netflix/rxjava.csv b/results/reaper/merges_tested/netflix/rxjava.csv index 0fb7359526..af1e986150 100644 --- a/results/reaper/merges_tested/netflix/rxjava.csv +++ b/results/reaper/merges_tested/netflix/rxjava.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1661,refs/remotes/origin/pull/7148,8ac9df9b2e145914d91007ebe3fc7ba0606c6751,ec96e6a73c7b55f8f41654ff97dd7ef189a43560,54850d0d344434022070fb034cdb7bda59b17b2b,,True,True,Tests_passed,efed346b5213b3f7d41c04dbf3b3d6aae051762dee43954d9c5ea31a2e1e6b5c,True,15,158,516,9,True,Tests_passed,57d2334564d46196bf26d6048d852522d8af994c9f1ff9d11304c8b63862e2dc,True,18,True,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,451cc1e312fde5ead95caa2d55612fd1146ef9cd9f5ed8dbad9c131062d66bb8,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,77f5ff8d74b65237a2cd3453643a6ba6ee175b8d470ecb692bb7c7971793673a,Merge_failed,c96db8d7906ad6f75fc77e77a59bcfead872163799d6bdc0b94106d79942f305,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,5eb30b2fb50cd965513a8b57adfa956b15f9cd33012540bb3d7a7feea0910235,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe,Merge_failed,e27d56c2b3035709d16f464f2b2108ee918f7195dea971ad34c26df8d0d54ebe diff --git a/results/reaper/merges_tested/nhl/link-etl.csv b/results/reaper/merges_tested/nhl/link-etl.csv index b1039cc7c9..c3adf62487 100644 --- a/results/reaper/merges_tested/nhl/link-etl.csv +++ b/results/reaper/merges_tested/nhl/link-etl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,5809ccc76269b6a862d5670835367f18ad2061ae,33baf16591242cead99d984a2d1f4c0d747989e4,0593efe9ae3fb77d9ac067420e2ca07b0600ccc9,,True,True,Tests_passed,a3d3b344798a3390d4c5ad3aaefc15420eeb7ab2cb150b5aed609cedc5b651b5,True,113,566,4607,4,True,Tests_passed,5b8354b4a36983f6480e12595ab97547febf13bd57ebf86976e39523db126b3d,True,113,True,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,d9c98d63d668556f054d9b94bf35f0950d86d371eae63f58374c7212d71fc0f5,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,41c3cf69e96f05b06c3e7e41a8f5b6b290e607f2401c4f1d8ac3bafa833b3474,Merge_failed,6a3dcd1db1b72ba2110f581a3d40d8a968e77f8072607fd0dc68f37f2fb6fe2b,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,0248379b7c82a5f841d774ed9e7c367ca968a19003a500ca5372db7d64bfaf2c,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,da9dca15fe65ffefeb5ccb48b03eeabac493f775497cc6bdfa56021fe7777eb2,Tests_failed,0055de8960b71f4adc7c553abaff89d2bca89472e954301b7b1389226e46aa06,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,34a214dbf9ab9455ddb7ba7f670db5a11815f62cee5fb93c71c3dd6c03c49c8f,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb,Merge_failed,38cedb49dc6be08fa9e8bdea78de00c6e93579fa1dd73a6b817e9990348593eb diff --git a/results/reaper/merges_tested/nicoulaj/checksum-maven-plugin.csv b/results/reaper/merges_tested/nicoulaj/checksum-maven-plugin.csv index 822da3e88d..0bdcda1cba 100644 --- a/results/reaper/merges_tested/nicoulaj/checksum-maven-plugin.csv +++ b/results/reaper/merges_tested/nicoulaj/checksum-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,2b189287252966d78359d4fcc9eb67e27fc44596,8a6b8fdb7b6cf93c85d542500fa2fd59403bafe3,1f9f27bd2730b65aff11c44fc71e65c9c65dc024,,True,True,True,39,94,325,2,True,39,Tests_passed,108a412ec48c29ad873821d3479c1892804c7a046943f73c606c76500fd007c9,True,Tests_passed,6e6d2406591c65d26a6ecd941c9b63e8e335ab94961c5d8771f94456aff65193,True,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,745caba5674756ae13b9938e82142eb4080c17fcf639d1c26e0f8e49add2489d,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,745caba5674756ae13b9938e82142eb4080c17fcf639d1c26e0f8e49add2489d,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,fc1904c1842e1aad4938f160b06c89f55555da18649b5ed744a817bab3b7b6d1,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869,Tests_passed,ac342e45134e3e27220143fb4cf1028efa0b3f28716aec9e1f65ba752c267869 42,refs/heads/master,837c34617a6123ead3cc374d0a1afef4f0232ffa,cec0366866143849da17a6a0e2917736c53cba07,084cbfda8cf2ecb83cf81e8bb6802db18a6e8aa1,,True,True,True,15,67,518,3,True,15,Tests_passed,0ec14b7cff841a219998c9a4df9660a906d6e1ba9255fa9c3906e0689cd77595,True,Tests_passed,7f92c9e1d16c78b0634ba1a08ec8e9caa1acf9368077f7dca8a39e37054b4bf1,True,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,12ea7cfc084fe57fda3140013b7a6bb0b7172c0636d30a4820a19dc02fb45a37,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9,Tests_passed,8824c4fb0cada807b42ec9cd19f0e5973c29e2276817a966331e1d0675b5f2b9 diff --git a/results/reaper/merges_tested/ning/compress.csv b/results/reaper/merges_tested/ning/compress.csv index b071eae926..d9d72c929a 100644 --- a/results/reaper/merges_tested/ning/compress.csv +++ b/results/reaper/merges_tested/ning/compress.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,aa9cf28d6f6a6c4aa88c4ab77bfb5b9a1a43b16f,6752dba1ae0535d0c279326d247e6a10d4f51608,01ea96f50f6e82de9a0436e403afd975be90920c,,True,True,Tests_passed,ea6b050c5a70e5bef4d20e3665d3465e7050a2244744fea0ebdd577c09e6b169,True,25,122,807,3,True,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,True,25,True,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,b8463a6e5f0d2feab7f831b99a1c19c7765a19b0a50a269de1cd61269a581703,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Tests_failed,afa44658f1c8df749150363300e6869e52f756f62c54048cbd3a0322521b1e35,Tests_passed,d0ec8ff19b475165cad311e64414df7f062c8c6a44b3e1fa4337941cbc469ca0,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,23b9eff166e3cf820f5180bf2a249b6cd592c9625ae37be6a2e6ba88471cc7e0,Merge_failed,602bcd69202521776f7c62e0bb88ac37cfeb642b65e1b607181442da763a93cd,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Tests_passed,bdb18c32e776a0a14ae12beb25a4485f8b1e3233eff9dc148337c7dfbcc61db9,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f,Merge_failed,a5f22e4519b7acd2242956d80c7be52badca6cc82dcab96fc776e31e55dece0f diff --git a/results/reaper/merges_tested/ninjaframework/ninja.csv b/results/reaper/merges_tested/ninjaframework/ninja.csv index e6f4ad356b..04b540edca 100644 --- a/results/reaper/merges_tested/ninjaframework/ninja.csv +++ b/results/reaper/merges_tested/ninjaframework/ninja.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 78,refs/heads/develop,32ae342ef827c23bb4e4997d84a02663abba1964,aeba7be4fd406af50015af33827ad5f705e62880,d8358ef10479ecf0f79c2fe8546032575a39db5f,,True,True,True,477,620,1890,13,True,477,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,True,Tests_passed,b3e9bdbeda7503b8ceb59d4ff01367042ca3d39958a16b9fc097f6e93e649323,True,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,7952821dd131b2afc617f4776df007d0a499a1422aa393c9030347d3f1cc6d47,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,b7822c929cbe4ef2b39758ce827d32b9ebcbc5332f3798a0dda2972d7ebf969e,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Merge_timedout,,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,b7822c929cbe4ef2b39758ce827d32b9ebcbc5332f3798a0dda2972d7ebf969e,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,7952821dd131b2afc617f4776df007d0a499a1422aa393c9030347d3f1cc6d47,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18,Tests_passed,55d70eb1c969192e9ec2c17b04d63b007907a4ab66619c069e99476f69919f18 79,refs/heads/develop,aeba7be4fd406af50015af33827ad5f705e62880,660f74b9d6a77fc1e39514ff41e512590ec78105,8f95c8237b3021f50607b99fc7408df2e2fb42eb,,True,True,True,476,478,992,2,True,476,Tests_passed,88169f089876d1b9a35d20f6f260ae20413e66cf441886200a41b441dd1343dd,True,Tests_passed,bfec4730f644d6e2636a24802dc32efeeb1fbee128ea00a80adb39a39c37132b,True,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Merge_timedout,,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15,Tests_passed,e00df46447a2838406ce6d4efbc424786dc4e6153b9fcf617084ae6500434d15 82,refs/heads/develop,8f95c8237b3021f50607b99fc7408df2e2fb42eb,0af3a18710848892e1ef05f6ee9ecb29de3f09b7,bafaa6e26e2465cab4fb04dbed31ec9ef550ab11,,True,True,True,47,129,287,3,True,47,Tests_passed,cb4ad95b69b388e89f1ee603b40a22fffcd1bb6574e2a7a7e592e46ed0ad72ce,True,Tests_passed,129b38cf27f859830e5705fb0d45893653cb728049ce55d2b3579b1c0daae173,True,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,e7558373f8645aee47eae7ffebe38cbf1d3f93a020daed57321fcc075c9a9fd2,Merge_failed,191e237ae57a051558138581b11c2759176dca335db70e9c666a1dee7aef4c06,Merge_failed,6efd2a910e8360226bf30baa0ac05fb9ff0948c549f38b1ab0327decda941c49,Merge_failed,6efd2a910e8360226bf30baa0ac05fb9ff0948c549f38b1ab0327decda941c49,Merge_failed,191e237ae57a051558138581b11c2759176dca335db70e9c666a1dee7aef4c06,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,5112147cc3185f62038130ef7f3d1dc317e0485b1aac9a2e6a051a755bfcb7b6,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,2e084c12cb956bda8606c68fc51c0f9b69d18cc01ad3100e53900543e8f9dbc7,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a,Merge_failed,d724908d418aeecd73697001b489bde6242dbe5f161ca37e518f723565fa5d8a diff --git a/results/reaper/merges_tested/nitnelave/creeperheal.csv b/results/reaper/merges_tested/nitnelave/creeperheal.csv index aab94f6f0c..0805f9562a 100644 --- a/results/reaper/merges_tested/nitnelave/creeperheal.csv +++ b/results/reaper/merges_tested/nitnelave/creeperheal.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/remotes/origin/pull/60,bec4cb33c4fdb28d6ec8d49ce51adfa1fa094b50,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,2fad9a0a73c98f68e02cd074264edaad9639ddf2,,True,True,True,61,286,2241,2,True,61,Tests_passed,566c57fa6a879449e4b662390d8bd4a7078499d9a37950a0377df5c0c5017bbd,True,Tests_passed,24128777e3840be06f8e8b43a16c5b30bba7894222537a218d67adb4d12caf7a,True,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,b2c408821384f07b91e413ed4dd8bd690423163a8252ba7adb2d4beba036bcde,Merge_failed,a31a8e8a937d669dfe4c197d35c2a0e28d4288a9fddf442e0a83c2a7e0e36299,Tests_passed,b02693eac6a95bc27ae5cafab69212738b8a960b5966d9321691b3ad02e924d7,Tests_failed,dae2af0d0aec9f99053769820bd7267a0a886b3e56ce8ae7db6700e65e79b6da,Merge_failed,a31a8e8a937d669dfe4c197d35c2a0e28d4288a9fddf442e0a83c2a7e0e36299,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,8a324ce0c73c31600eecf5536312ae6ec5a0a67f4441cd20ab276bd879995e96,Tests_passed,b02693eac6a95bc27ae5cafab69212738b8a960b5966d9321691b3ad02e924d7,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998,Merge_failed,def19fc7a9c6d3b48132c99d72a86838670a53e7ec6ae6ae43e9fc82c6f02998 23,refs/remotes/origin/pull/60,a8f5cf9a61b44a1c73353cfe0ba1bc9e341fd402,f3b468bd793ea17c8393ccde13effe27c8dfc544,4efd54689557c48ab4dc71c35cefe358127914bf,,True,True,True,62,285,2122,26,True,68,Tests_passed,4d9b55d86bc14154db3ec7c0006899830e401cdb41f3ed6f3467f4f58a2c1f89,True,Tests_passed,6d0a1b20623d5fd7fc273379f9bc436315679b245b715efe9ba0c02c3e8a0766,True,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,0034daea793d632a8d5d1d5215c02f1561c9672279d452edb542c0cf6f9b7df8,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,3e21a0439d58be5d9688befbbdfcaf2463befc233eec2b0197f83fad33ed6244,Merge_failed,f42a9f16171c8b4c8424de409ddb29590fa0b284c69c9d5f98b57d177b39aae1,Merge_failed,aaf797fdbdeb17496cb55fcbec47b45b065b6b841e0e02c2b2ebb14a297b2b97,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,e2d55ed815b2e59427cb20c5ab56012fef88cae056453e06423171d57947eaa6,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,1a6353477387cf064adbda93744e4cc8dc9d68395b8b6dc64c195364f3a8bbe4,Merge_failed,5547551b07980cb916d4e074fe5cf90828784fb76bed8dfd703384cff4f9b0b3,Merge_failed,8a166cf0a32e4321d815a52320a253c916c8940a6f4747c097e1931a56892fcb,Merge_failed,3516549bee188cd178adf8f613e2f20ca0194202644bb2614399f9c8e92369df,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,37a586ae1921e9dad8524878bf3e4200d33a240caba1a61bd4db9168134aeb1b,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07,Merge_failed,92806060028f9d039caf26264712ce96a05cc368fde4d3f0f4d590717486cd07 diff --git a/results/reaper/merges_tested/nlpchina/nlp-lang.csv b/results/reaper/merges_tested/nlpchina/nlp-lang.csv index a6805064ec..16a69c069d 100644 --- a/results/reaper/merges_tested/nlpchina/nlp-lang.csv +++ b/results/reaper/merges_tested/nlpchina/nlp-lang.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,cec0dd677bf90156ba3adaea1ffd6c69f64df9a1,08aa1059f93618cc7c59624d5df0157ae691cef1,20cc939c8bce1777f8e750c83154a0e1fb373406,,True,True,True,11,25,298,3,True,11,Tests_passed,70df7518916170212cab9406318f082d665458bc3df72963690c84581bd56a2f,True,Tests_passed,688f7a4088aefbf02ccb2cb5f5c7840365e6ecc4d6b6244d2149694b727507ad,True,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,f8718862436cf450d7ff2c0b871e492c19997344ad47498a4a3b9b19e279f452,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,28de242da21c4e2eeedebe22db487124df36f1eb557cd288dd5614177e220aaa,Merge_failed,59e6920356a08a099af03e8e486b95b01be80626038f1d6c01a83058206aef77,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,871eee67909823a851ae7803904625690fae715d916a6f9a3a49eb7b3d6af4cc,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,bc74266f9d2e866781c1fc8e7a4f6a93a161a7cf4e0cf9f3f9dfb232a6681009,Merge_failed,c3567124fa72cbda13704804e08a0db5956821a372f29b84a9bd2e147935f4c3,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,5446e98578dac6169adf829e7bcd8ef13bac7ad64c7459506b0634edafe5176a,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387,Merge_failed,50867451c65f5d6cd51ab8bb802914d92a6fad7c2ba950e2e9090e270cf04387 diff --git a/results/reaper/merges_tested/nmdp-bioinformatics/ngs.csv b/results/reaper/merges_tested/nmdp-bioinformatics/ngs.csv index 8b096a0858..6f3b7edb2b 100644 --- a/results/reaper/merges_tested/nmdp-bioinformatics/ngs.csv +++ b/results/reaper/merges_tested/nmdp-bioinformatics/ngs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 44,refs/heads/master,af40ea2b0c4c6fee1eebbddbb7e303b1c5ad4d3a,577983a2343f16c0cad588cce6e8b3f886870427,ab8cd79fb64b51e3ff6d447b1affcf094262cf1b,,True,False,True,240,247,557,5,True,240,Tests_passed,9248ff315b79a4c3a86bcbc4bf764d53002714d0a08ec76cd596b6961ae3a370,True,Tests_passed,d6df38719a10d9ef10ae8ee06f1e98237360ab31fcfa051eecc01536aed2af59,True,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,b3a8fd7bbd61a95e5efa1fc66a07e36c9860b7b7298140e04a3010a0ca0ad670,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,b3a8fd7bbd61a95e5efa1fc66a07e36c9860b7b7298140e04a3010a0ca0ad670,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343,Tests_passed,a55ddeb67511652e52d06388680d01bdf1ae4c65516785b841f0034cf79e4343 52,refs/heads/master,4b26663ea1d58a3deaad68a2da6b674b055b291a,43943849a35b943ec203c0d39583a9c5fcec4675,5101b8a038c57c34faa31f05a3a1da4a50cd091f,,True,True,True,6,10,292,2,True,6,Tests_passed,abd2fadb2826104a244981a79c491d2f7deb794cb335766e36276e16a06de96e,True,Tests_passed,76d2806e6c21bbfc46c261ee7b68e6e82116316827ee84dd22ef3a51ee2773f0,True,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,710cdeddfaa1c2a234689cd475cde53229627fb2beaf5bc5064d3c1b580af5fd,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,3f10c3355fc9a0653f2c4ab0f8c2ea391ee574cc52741fa15487e7fadbcd0374,Merge_failed,16b6e56bd11ca91cdb8112cdc9f5bbc92a0d68a8d8423a8bbe4a21d9fb33ec19,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c1f7c2f785eb4ba0b6dd09c73186bbe4970da4a619e83ea6c87e53ad32e920d1,Tests_passed,6859dc5ac0ebcb699723e050b3d5d18aa4bd82a10962dae677962c640548370d,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6,Merge_failed,c12ad4dfca6c60fd8e5ee283d501b937ff35075b1cec614b91b65f2371f09bc6 71,refs/heads/master,eea085987884d72311ac1707a37e9554e5f32dcf,7fa1b1e3b8edff936a25f96f3b1a005eaa0612a4,fb85d10eb856c5d37a48cef4097085e06fb58908,,True,True,True,62,150,1243,2,True,62,Tests_passed,a86ea45ad76f8772f17d85f6af02be72e85821bc2043ac9375fe843528cf677b,True,Tests_passed,ae06bcded5cf94e702f0f821a627934f0850d64c1b69d98c3d0f2a60e193513c,True,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,0c8053292bedf7bbe0aec40d13489db914487a07dea21b33168516e59ebc27f2,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,0c8053292bedf7bbe0aec40d13489db914487a07dea21b33168516e59ebc27f2,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f,Tests_passed,2aabc501c67d8935923ea7975fcf1e7b7d0717e6700ff12297fe20484242523f diff --git a/results/reaper/merges_tested/northconcepts/event-bus.csv b/results/reaper/merges_tested/northconcepts/event-bus.csv index ee8e17b009..21db3136bb 100644 --- a/results/reaper/merges_tested/northconcepts/event-bus.csv +++ b/results/reaper/merges_tested/northconcepts/event-bus.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,c878f8d9161df6ab27628108df79d54bf354cc60,d188a72f4990b2d3b0931c43028727ca22cf1895,19adeecc8b4edb32f39fc8308321459ca481046b,,True,True,Tests_passed,0673cf54a98166adfb7fcdf423843d0ab105bba55e00e228dfa89378a6eb428c,True,30,29,2638,25,True,Tests_passed,efa9ff4d8416969bdc52ffc16b4eb3a2484109770f1a533cad2b993b47ef0a75,True,30,True,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,41b4ffd7f4f9c95ce10ebd2304e24aa595687c02d3df284652ea840166a16f00,Merge_failed,645e5ade7499f8bd5d0c09698d18237b36206cd34651cf048b84fd6e028687cc,Merge_failed,e5eb90ac6639c402540d1e93c1f663eda11e12a6ed0b0477d21179cca0321bb5,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,3566f787c5267f20059e707673b31cae0a9c02c517c90351d145ca5dbf238cd7,Merge_failed,28030c4fd07f6720c4327b8cabdc937631909a2e08013c80d6a7547e78bf1e33,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,e9ee65a819182dd2967405bfbe47afc49c79e0be3a227ee7bf93c1dfaf9111f3,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad,Merge_failed,a6e072503d34bd38c3bc9e8bc2d17100458d76fa93c9f07baf08bc26b6cc0dad diff --git a/results/reaper/merges_tested/northlander/a.csv b/results/reaper/merges_tested/northlander/a.csv index c44b8b778c..4553cd8c34 100644 --- a/results/reaper/merges_tested/northlander/a.csv +++ b/results/reaper/merges_tested/northlander/a.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 63,refs/heads/master,23b77a81c1525c74e8d879353bef54c439a326e6,6837868203c91001bc52badcbba944ed5e009e3a,804f1bd50ac499bd45d906b5060c0e5fd6b6e457,,True,True,True,4,11,47,2,True,4,Tests_passed,41221932b608bdc2e8ffec596ed7d8434a8c4bbf6e9267f636e81ce0e33206c8,True,Tests_passed,d0f513915656e6a26ae084d7a4d73c1d56679093e512ed044b3151f358ffcdb2,True,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,eba55df61e3efd85286da4c07bbfa912182d13a9d3fbf5060f944ad31c141ba7,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,eba55df61e3efd85286da4c07bbfa912182d13a9d3fbf5060f944ad31c141ba7,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9,Tests_passed,60e1fd92b7ef11c6d7dc3926f71151677df8b039ea94f7b352a9e3e02a116bd9 68,refs/heads/master,3497235f96c45ea39d2be68ded078b07a4d1a17c,eb5566450e3912f14b2ac5bb5848f9c6c585d10f,9f94bd9bee386305f046787bbdfb507c9616eb82,,True,False,True,8,37,127,2,True,8,Tests_passed,4482a10f20e79bfdc93bab61f0b9f3faa0aa23c8bc8b9b2dcec74b363eb94ba9,True,Tests_passed,edc6e9998423a77284e60ca64ccc20ed5ba09ce964236f045bdd8efec148e91d,True,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_failed,f252b767bfde817a78d2fb0061d030cc8c9c4f493372bd849764913ba247e66d,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,6d985384db8ce0371c3ce87f0e1ca66a5efc341d057f9a5949c828b6f5da8c99,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157,Tests_passed,f32bc7f77406ad2eb52c0a8fdfbf597a3afc2507af6b9968896a757dba547157 85,refs/heads/master,60eadef67420a9c64f6f2d129dddce3d93803681,ec2c937426d2bffefe23ba70d485acf342992e34,dcfd0a6d8d0c96b89325eacb74e6b0d84bc17685,,True,True,True,5,24,234,3,True,5,Tests_passed,f00b9f4f39dfa3a1ace6af22b7c2f224ecaa15fb679b50ff02d41949c51eb6c4,True,Tests_passed,43ce609cf1f758612f96d93ebd760b94e67afb6e3c9cd5b6df7109383c90efc2,True,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,2125ec7e33b6d69aadce451f834c5318e18f1bf902a47625061bd7b32a2b715b,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,2125ec7e33b6d69aadce451f834c5318e18f1bf902a47625061bd7b32a2b715b,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Merge_failed,4b7d0b30745402f42054d395cca423b66259136a03b3a4aa16311d7c6971bf1e,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1,Tests_passed,49ef5d26c7499a8162b57f15b3c93a13e053f1e49e95124926dfbc93ead7aac1 diff --git a/results/reaper/merges_tested/nuodb/migration-tools.csv b/results/reaper/merges_tested/nuodb/migration-tools.csv index 4e6a9a5399..a617931149 100644 --- a/results/reaper/merges_tested/nuodb/migration-tools.csv +++ b/results/reaper/merges_tested/nuodb/migration-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/heads/master,2e1f6973c44144fa9b61715b1a4f0b9491d71572,65659386ae60f9c71c6a89e597e767666a523ad1,55d9255f2ba08e2abc92de5754a08c6f5a0cd1e7,,True,True,Tests_passed,158571a9755868f3fe875257efe38e9f3e1d83b5b6a6fd4fa909d8cff69dac96,True,62,200,905.0,2,True,Tests_passed,dbbdbf3b4f9a7b799f469a25fc52ce5ee7af35ec94ec9fcb8ce438a5a61b194a,True,62,True,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,85b988e0a208a56d489aa8679412167c1f5da8a1d4ee761924620c992ddc904b,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Tests_failed,abea25f98fa16f6e0efa7e75cd5c7e9a82b792d2c342d7ca08e48c952dae9bc9,Merge_failed,ffaec38b966e74c7e0ebfbe09642dc63eeecbf9b1b051509aa3a4869f857a523,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,90c24808c98230039a93bc99ca051f2d503ebfbdfc4d2e1bd48765c58a15942d,Tests_failed,a50bef9a8c405179381344618703c51ca4f2f54c4a2142ae178c9aa0a39a141e,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726,Merge_failed,473c2d1368c04fdd269bbc54bff08b318bad56fea380868933d6d3264b7f8726 diff --git a/results/reaper/merges_tested/nurkiewicz/async-retry.csv b/results/reaper/merges_tested/nurkiewicz/async-retry.csv index f8960051a7..01850b277a 100644 --- a/results/reaper/merges_tested/nurkiewicz/async-retry.csv +++ b/results/reaper/merges_tested/nurkiewicz/async-retry.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/java7,d8144af35c9072f3aab544a52b73bfbd6982aadb,27316bb87f8ad572d714cb0907a04ed67cc92d7f,65be530e6f819396409b5f245845ffbd4f8783aa,,True,True,Tests_passed,a1631ec0f3962d20a075eefacbc9db5cb3e392b7c7c925cda4bdd5d2cd776fa7,True,57,270,2409,7,True,Tests_passed,5756d389f54e9e8bac5a8c8c1b43c59378697c2778d954d17bea0015c31a7661,True,76,True,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,84e31bd32cf1da54b11a84557685acd7046aae6eb0c1d9f3a6238649b6423c90,Merge_failed,5d522be9e000a9a9bf22f6230a3c2587d3a0461ec56131c18f3db2f957b3d952,Merge_failed,73976f60c7b3b9fb47b0efa8a5457ff735b9db4bbf093116f582b8c47e90d441,Merge_failed,691ca5efaad2941e2d6d1d0dbbb5256566afca1f025a30df3f9c01b413b6780a,Merge_failed,5d522be9e000a9a9bf22f6230a3c2587d3a0461ec56131c18f3db2f957b3d952,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,84e31bd32cf1da54b11a84557685acd7046aae6eb0c1d9f3a6238649b6423c90,Merge_failed,73976f60c7b3b9fb47b0efa8a5457ff735b9db4bbf093116f582b8c47e90d441,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed,Merge_failed,c9a8e4e4be8b9331419eeb1801115384882b6809589c3e93ec619218b59859ed 4,refs/remotes/origin/java7,27316bb87f8ad572d714cb0907a04ed67cc92d7f,3b3d7b88f079004c1861d67951d154179c545a6c,f573ece398890ae0f53eb29e35ebd3af1e9f70ee,,True,True,Tests_passed,9b669603feb41bf23ee55817d437ae34fa148d5f751dfe2df0f06ec55e1a9700,True,31,182,1051,3,True,Tests_passed,a1c52b0e89e2bca25f8f9c39d50cc88f401fa64464bac6851e060efc693a8394,True,31,True,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,8a17901df483804459d318ec045e6b11402ae49a76b49ff35d7333ff83f78a76,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Tests_failed,c25e1281413859123cc4268dc26e8e5a885283b3de749af7329d140b3dcbcb2b,Merge_failed,1ba0a70256cb19fdc239e8256eee003154b00f13aed0cf0752fbd8dc4cd70aa8,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,5feb07254bf4f56301491946ede5c077ac5b0049b9d9502309ec972e2d5663c0,Merge_failed,e62a03a529d87ed9188cc7538eefa8e631f15293fdca4b39613282e48fbc504a,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad,Merge_failed,1788c18a13d951c3d25da2eb41849300f4a991add9421fe72a1020ef508f3cad diff --git a/results/reaper/merges_tested/nurkiewicz/java8-workshop.csv b/results/reaper/merges_tested/nurkiewicz/java8-workshop.csv index 3883d6dd64..56862f549e 100644 --- a/results/reaper/merges_tested/nurkiewicz/java8-workshop.csv +++ b/results/reaper/merges_tested/nurkiewicz/java8-workshop.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/5,f5918aa79c6e08def4de82ff69f94733e71f7fcd,22ce75de37ea170342618aaacf1bfd7ca9bf31d2,15d67e90921769a92e3e1b597e056f6aa29020b7,,True,True,Tests_passed,3b30774e8709a9b0326a72e21d6a72e7c565014cbbe9454bc380283698277226,True,52,259,1045,2,True,Tests_passed,7e432992c0e01c3b4cbadfff20a0df4f022d2c33094c967f37a3a05b63f25e31,True,52,True,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,fc55995a49593bdeaa10756d941f2cf43f17313302801f00c8bdcd848133e180,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9,Tests_failed,4816e5f294cf55f5c2d4a812e8953b3ed3bf491de31166a856dc6fa12af015f9 diff --git a/results/reaper/merges_tested/nutzam/nutzwx.csv b/results/reaper/merges_tested/nutzam/nutzwx.csv index 1bd9419b10..ddc07d6d20 100644 --- a/results/reaper/merges_tested/nutzam/nutzwx.csv +++ b/results/reaper/merges_tested/nutzam/nutzwx.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,11d3b3744cfea0ce332aa28aa480735956a0a73b,0c3d36f52d279671ad0055ef7565432001af4aeb,fec5c5fa38c02162bb262432e6a8b72c281cbfff,,True,True,Tests_passed,b6861679550682cb9aabe988964dc08a8f557ac02ca83217cbe76332a60d5f30,True,8,28,125,2,True,Tests_passed,6b8e7979813391e03388cb96d2bc51ad98a1efc8712920adc247f639c7994569,True,8,True,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,556c0c621f547d3ea50084f48bc19c7e68fbcc1927bbc8b6a8a24b733edd7405,Tests_passed,ee229c299e8ab8074d9a5c7eea8f04008b84213228237cbe400099ab3b9f4cb6,Tests_passed,0361b4153c734c43a3c679948d8d48eda8c8871dea170b9ce5f01b086a5a0132,Tests_failed,8a983953656b692f3862381276862fa089c27b0c0b2221667e49519902c3bea1,Tests_passed,ee229c299e8ab8074d9a5c7eea8f04008b84213228237cbe400099ab3b9f4cb6,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,ef83ae67d9cc744b4f3ea583d68c12076eb3de31440801f49c40c5ce4d097c65,Tests_passed,0361b4153c734c43a3c679948d8d48eda8c8871dea170b9ce5f01b086a5a0132,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a,Merge_failed,db1c1a5dd43e2cc84f170521041d4b95a4adf81a45be6341505426c0d1f67f8a 20,refs/heads/master,fec5c5fa38c02162bb262432e6a8b72c281cbfff,845ebabe3c5df9bc20043dd1d1f4c36cd96e92ba,ebecc6c4425f4affd450866dc0e68fa0b6ba2e5b,,True,True,Tests_passed,14ac71be239824d618fd35a278df1aa95ba7449d077584f4b6fe2ab6dd2826b1,True,8,34,257,3,True,Tests_passed,b8a1f772d567a34e48c799fe531d7688511a26f39b3b8c4aa8ba000d651fe29a,True,8,True,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,8250332f29c286f124766cb6d6191e144325b2a92ee9e49370dd9f7d8e498c1a,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d5c347bc8090ad22d63e7da5b88f6deb089b91c2c8c6a87a102b83509e79dfa0,Merge_failed,e64c4a86320d8a5cbb7422101061c93ed5c7bad14087bde0ba7a2282f1fb5ca4,Merge_failed,4170e7eb153db8f817b08ad7c5244cd48d847ad534d3b02b231431216a742362,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,96b6aa66bcfb530cbfadfcfaef4fb091013a3955e46d050931ed5ff121bba03b,Merge_failed,f1b306e92a12434720ffe3f5e1fc783490e0701247ac3c8e4b985ad0f88854cc,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,db62a3d1c114968645ce3e17f136673023c1ae421104d4cd061218f3ffccfcb4,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f,Merge_failed,d0c94905ee0a2c4871bc0d587404c06aaf78283caf094165649fbacd31306e6f 28,refs/heads/master,33faa161154bb74801bf70c3935b04d8b54ee073,e2167429ea83a8d8f56b432eba0e2a9407337a6f,f694ff34f5812ca40e85221b95b4ca0e0af57aec,,True,True,Tests_passed,6b7fb280fa9d9a131162274fb5632f60df0da7cade4e504c489ba91b6cb73808,True,3,23,43,2,True,Tests_passed,b9449886748a6aad18c584226a05022d1ddae8f9ec625df5b181cca6aa3c8b11,True,3,True,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,5aec0580e126ebb05a16786b38f1986530d3243dc619908efe2cb1261940017d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,5aec0580e126ebb05a16786b38f1986530d3243dc619908efe2cb1261940017d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d,Tests_passed,be182b66c11791d1978ddd14fb13f727618769bd74b33d54480b96af9c15d63d diff --git a/results/reaper/merges_tested/nysenate/openlegislation.csv b/results/reaper/merges_tested/nysenate/openlegislation.csv index 65821e2b1a..0ec74e60c9 100644 --- a/results/reaper/merges_tested/nysenate/openlegislation.csv +++ b/results/reaper/merges_tested/nysenate/openlegislation.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 127,refs/heads/dev,6c571d514aa843b5c115542ec91e31c366255aec,3667de0c4823e492f024b347cd404c64ae38fefb,779a73d6c383df3e7bd24ed92f86d5f13a5c9e9d,,True,,True,353,23182,,4,True,353,Tests_passed,567663deafab52b2539530cff7601de6021680387844ef085e9debe19a14e9a7,True,Tests_passed,bb0324fd522ce7f8abf82d24905a7afa702f7fb1b50ef45251922d61d38d44b0,True,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,67f68238b9ffbfb10482836b799124b99aa6f760e8c33508bc213454952d5a3c,Tests_failed,46f9e09e09dcb3b16d5fe117c3b8dd4f906fe586b7d06122e672e6016194d90f,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,67f68238b9ffbfb10482836b799124b99aa6f760e8c33508bc213454952d5a3c,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902,Tests_passed,71c02774738dfbce15580d98965cdce4e7e9884a677bffa5f944085e9298e902 128,refs/heads/dev,ed229ed5c1e4cda4a868763111ab9c99c01816ca,a2da6ad801721db759d00e7f28a939b09d785bef,8a5ccf4a564d30890a7af3f1f5f329a811163b49,,True,,True,146,567,,11,True,146,Tests_passed,62550a954049fb4c05173f28c65d2ce5401bcb0c39cb11e06256a06f4d5a4c18,True,Tests_passed,52b38a177dbb277bb2d12a257b6e2a21e16135bdfffa8deb599a5f4b0a611195,True,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,2d6ae794c06e27fef8aeae909e7803f7493bffe111cf6e72b7823e67f5ba0d22,Merge_failed,9e3f6591df617b9de1ad3027f9b40ecefdf43980ef46246ac9af73c11e5e8ef1,Merge_failed,b6af2218c32a1033d07a567ae86ac23a8f1a2b9c1a04fd5de944944a754f7cbe,Merge_failed,6db598db1f135d581d60c5ed35dc4caa842a9fc974809393aaf1459e920b7288,Merge_failed,9e3f6591df617b9de1ad3027f9b40ecefdf43980ef46246ac9af73c11e5e8ef1,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,7a3ca5136c984fcc95613f4661a4cd00377cdbc7e95e137f5ccddcb7ffc1be20,Merge_failed,a0b0335af4034673b6175f689b5577e2c6e2b3aba6db1a341fd9e02f974d204e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e,Merge_failed,fbfb1c7f2601f5185fcbf1093048cf762f4da4e16e9971312d3cc603da32542e 132,refs/heads/dev,ea4b5cbd002c440ba2f7308b526b6b7f4366a9e4,002161a68b5e50ed736962063e5e3a792e14ff7d,485a532a6b2aee592c9fde01f0628fa333748aeb,,True,,True,353,23118,,6,True,356,Tests_passed,d94dc9536ed4f55f9c36c75d12ac94ebedb74169fa093164612749bbc3bb3897,True,Tests_passed,17b3122c901446b78905fc11a6356eb118098f8075f5dab6f5066d301c1b9dd1,True,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,f2953403e5fd491fdc16937c3ad2fd758f262bcc76644afd84706d6a65da5f30,Merge_failed,8132c6d158a50b3cbe6c92db93278711d885b4434fed5208707b2cfacb1e0e05,Merge_failed,1667ac7094dc3166e593c32b07e2d72c9546de8c7051250645a220b54918b378,Merge_failed,7e88a1778e1d92046707684289ba85e1340487a20f74d19fb4901887963c03e3,Merge_failed,8132c6d158a50b3cbe6c92db93278711d885b4434fed5208707b2cfacb1e0e05,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,9d1e9c9acf3282a1e7e77703f58a835f5d234213824050120c6fcbb5209dd3c9,Merge_failed,7cd6b8df9b29bb20efa166e35665093836dc29c918d23d3149dda2e46d264e92,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,dbc9b63b7b2064c40d61b00e11027af3004a2a1f00331a69e5f56aa3cdc1d7de,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611,Merge_failed,ed5582e261c20108bbab9d3b386231db99ba661528c47f62f352708657df1611 diff --git a/results/reaper/merges_tested/oaqa/baseqa.csv b/results/reaper/merges_tested/oaqa/baseqa.csv index e2a16cb088..408410fa51 100644 --- a/results/reaper/merges_tested/oaqa/baseqa.csv +++ b/results/reaper/merges_tested/oaqa/baseqa.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/rankqa_multisource_search,1e0462637505b3a15f7975cf771777118990ce06,8d4a0f584520ba18644bacf34b2726a069664e0c,2ffc27e45b778c9570d9d701f625259945ee05f0,,True,True,True,86,229,1433,2,True,86,Tests_passed,bd56363e9a95d4c288404ae8e3014c437323d061f27ddaaf78aec3bbcc2e3680,True,Tests_passed,3d2f4a5b99ffa2582a8310240a50713ded64cffa2604eb1c7900a8f6106b74b9,True,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Merge_timedout,,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,9d2dc4182f7bcc5e7cbb9f936245cb621c2db8c085fae1a6cb1772f353724c97,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,32e4409c61415f4adc88c3556a1fc7993df8d063e3a5af3757a4d165573e3916,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c,Tests_passed,c668d41f33f0e79fe2e1a8f70635980fe28fe41c49915ef586d0b5140914079c diff --git a/results/reaper/merges_tested/oauth-apis/apis.csv b/results/reaper/merges_tested/oauth-apis/apis.csv index 853586cbc4..7abf90dda0 100644 --- a/results/reaper/merges_tested/oauth-apis/apis.csv +++ b/results/reaper/merges_tested/oauth-apis/apis.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b7324372f050116584267f8d3b14da65d67e74e9,4d29337d5e240051ca530e49b7c85c425ef490ec,0a7301608cc377bc36922ae25f352ad7aab2cc05,,True,True,True,40,116,1688,4,True,40,Tests_passed,1471a3157ec98d83fe69633e621bd309761d39e4ad7ed94e6bd4801e15e51f48,True,Tests_passed,32b5269124bbbb956ad0dad71826e168a13abfe1b8fae3c74d0f3c0def5aee8a,True,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Merge_timedout,,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,20215aab5c45233ba6c2533a4e2f168b5f104b87f27cb7b298bbf6c866368bfd,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,3882c89a3be74baabb185a78126b175e565e35b2fa1b59122a15fc8210a930d2,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb,Tests_passed,83b4f6cf3c7497d46338a8d8cf4c121f89837ae93af830a6ff261e5f7d018ddb diff --git a/results/reaper/merges_tested/obourgain/elasticsearch-http.csv b/results/reaper/merges_tested/obourgain/elasticsearch-http.csv index e815b6a5d0..518d0f7ecf 100644 --- a/results/reaper/merges_tested/obourgain/elasticsearch-http.csv +++ b/results/reaper/merges_tested/obourgain/elasticsearch-http.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,37df8773d873cc3155de5231165beff1a7564b99,59f9745528d2834c08fc9eaac05be5ead6698bfb,12b0ce30efc69082dca4af70d660cbbefb1522b1,,True,True,Tests_passed,4a2bc4687b7476b7e88ff3b6bf2a0a915aa739de07a35f35294eaf5ba8ceb8b3,True,9,20,53,2,True,Tests_passed,434259f3dd81d9b54f8b3a8af0ed2285ab29672a735f4de7f2cd73b12dfc2447,True,9,True,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,a7b36daab93353f94813e49672053cea75710eb85b971877d82010064be6d3f2,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Tests_failed,1352dcaf5a2bb6be2e8025e58e1e0a690043efa420b99a633ea1eb08cc25a132,Merge_failed,2061702fc89f68e6af994e30073b395460735932e3ec12cd6ff499e5391d7ac9,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,67aad3a2ee90592205af84e05144349a9b26aedcb902fbe0eb7f7a873aad4dca,Merge_failed,9a5db9151b8a063d4ee20fe21703bdade555ffceff9d7fbcc1bc851bdd198ab8,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37,Merge_failed,86668f5df7071198c135a4d999daa85646f1d16098fc588915b210e645f1cc37 diff --git a/results/reaper/merges_tested/octo-technology/sonar-objective-c.csv b/results/reaper/merges_tested/octo-technology/sonar-objective-c.csv index bc11eaaa7d..74b08cd670 100644 --- a/results/reaper/merges_tested/octo-technology/sonar-objective-c.csv +++ b/results/reaper/merges_tested/octo-technology/sonar-objective-c.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,a1e94950696d8ca2430d435be2221196a7089ec0,47764f8ea60a7196c883c694b906b22a9a114dd1,99788e6a37091e542f7233fa10ba465474743207,,True,True,True,46,112,2378,6,True,49,Tests_passed,70b499f5406ca2c861615227320658533ab419d41a7112e2daea1baf085d647f,True,Tests_passed,8a2afde9b13c914c3e517266afc00cb6f92e7f518cfc1be2636b734337c8db93,True,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,b23bf291ad89b470aa0b63fa39bce1edb60ff4accd3072514c7fb15603a7832c,Merge_failed,6a32722a6ddfaececa73bc3c9cad31b82281551bec545fb2c791f38b8f2eeaba,Merge_failed,3e8e949763aeda9820fe9c799b9d0b0993c4f3a5185a8f2802ef311b1a8a5ea7,Merge_failed,645a52de444e39ff125d6ca64ce9652338f1bb436f0c8e86c4250066cf03b029,Merge_failed,6a32722a6ddfaececa73bc3c9cad31b82281551bec545fb2c791f38b8f2eeaba,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,b5a2c2144caae575280107c7d51172f7b5c013480641a00744176c0bf74286e9,Merge_failed,137f139337767fa12056dbbc28c46a3bf6caf1a8d5aeb31af0e935bb94759f81,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7,Merge_failed,7e7a93590512b7ce845114855f2029f8ebbf68677c6334661d678bcc8df392d7 27,refs/remotes/origin/pull/104,b836820b107cd3bc5b7501fbccec5233804e39fb,96d4fdd2284122f3b9019d0d02b81ae3793d0d55,e8b0e178bcb565ef6356f732f33c1c9ea5991c3b,,True,False,True,6,8,15,2,True,6,Tests_passed,a36f03aef9a42aa4327b69c98c1cee4d0cc5341f763bad51cb8f3517057d75db,True,Tests_passed,b13a644ba693a782e0d8983d7f8abfd00d4d8d9fcc42118c9186b837425cc3f3,True,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,d873e576732256913858e84ee1c3f8737ec71d85e125ba6a38d12ac1f19de53a,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Tests_failed,fb2dcb2fa7933ea808916c04cd904356ea33c2e848c350bd77b1487c24cfefd9,Merge_failed,6ce847de4f57c3c5acdec50958c89eeab7e9a74f5170afd0b85054a66f332649,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,13674a7f66adff1191c1504e45f6ca2b26b8e10b6b40f0b12e08b9b9c94b6a3f,Tests_failed,4ae16258e73f03b5fef992ab4d7b1e4a3ee67f20f3dbf20132984a32c5ea0c2b,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,4c174b2d7a0a4e93d9fe38e26535e063bbe5735491f7607d7e9e9a44b550ca16,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e,Merge_failed,3c4bc0c0a1ccb2826a65ed5c8bae1876b597959cc30b65d9af69ed1e1d31a77e 37,refs/remotes/origin/pull/104,6be95c55b7b58fe59a8c78260c08f8857285e0be,387a96e68627cfb548dadb842aafe80fe93b2411,fe098d3fd8ea2ad839f2a4b6763cf0d4854b2a51,,True,True,True,20,78,826,4,True,20,Tests_passed,bf5e652ece07c31097efcf50aacdba467b4f80d43a0324d0b71e5bc31a6fcbb9,True,Tests_passed,1dc16be563c1da4f8f32c0ce78631366ab76b5ed92f6b1cd1629663dd537502c,True,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,234dc460247c9b723890757f359e59115d0570487714c4c96a26cae2ee43bc76,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,8350ed1bad097f891e02db1ff74ea7045cb7f68ce7a7764d708798f6be05450e,Tests_passed,9cd8813e733cb555013e7e19a90d40b83615a38ec6ddd4885c4317d2d6538106,Merge_failed,d7bd5375cb53edfc0d4ab92816407150d3391be39f4dfd043f01f137cf334667,Merge_failed,f64d4d528beb3ddcab7e2ddb863c9fa8baf6f3811078bdd2d7f8d3bae14363c2,Tests_passed,9cd8813e733cb555013e7e19a90d40b83615a38ec6ddd4885c4317d2d6538106,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,fdde8304fdc2a974d11ab987f413d73ffea2cc4b6bb75562c57aeb6f0793ea49,Merge_failed,540a44370312414f4a22c56c81b8438f1f13c4f3578760437ff15c3a8be62478,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,234dc460247c9b723890757f359e59115d0570487714c4c96a26cae2ee43bc76,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c,Merge_failed,e11192d43b1f06976d6494441313357e68bd9295332eeb6e3917ee152dda717c diff --git a/results/reaper/merges_tested/okjsp/okmakeover.csv b/results/reaper/merges_tested/okjsp/okmakeover.csv index 9be3509436..b03b2ef31e 100644 --- a/results/reaper/merges_tested/okjsp/okmakeover.csv +++ b/results/reaper/merges_tested/okjsp/okmakeover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,db184c42795a9a70b512cda17c9aef80783a12e3,24eb1f27424244ea4f537876612bc369fcca500d,14679576b6f0c1f47bad5b7f82cc7d34933dfe43,,True,True,True,13,23,375.0,8,True,17,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,True,Tests_passed,4709a0746e4093f15459ef6186bf9ba67141041c827cecd0ec2782421794791f,True,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_failed,ccd80a69a80ccd3bc1c2ef46e6ceb433a4f22f704a8cbcf42149171149a2a1bb,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3,Tests_passed,651b244fa1c98967e26ebf9790c786563ab2dd659752e3136e9c02146ac612e3 diff --git a/results/reaper/merges_tested/okleine/ncoap.csv b/results/reaper/merges_tested/okleine/ncoap.csv index cd587672fc..2ade4e61c9 100644 --- a/results/reaper/merges_tested/okleine/ncoap.csv +++ b/results/reaper/merges_tested/okleine/ncoap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,0fe28d174e89355a76eb698dd4f13327180400a3,5401cd4daf32fd37e513f354ce05088d6513e8b1,c63bdc8c5f9e4234ae7493bc82fd6478332511e3,,True,True,Tests_passed,4382d7db0abc6f775d4cee8342f3e8365d119a47b5777ba84d764b57fa5759ef,True,39,264,4701,10,True,Tests_passed,76bc4925bde781429ad29061b49a315e6555ee9e3dd021c3527b7eadee2753a5,True,39,True,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,6b022c6e4e8659132b0790a12fc31a9edcb79b43f51b3f69014454ca111af193,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,917c58dfd7882d26b5aa67fa2ce06bd0d14b4b3c9078cc7ee0afa7b5cc9d74b8,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,878032083eba73e979d830ecad24a5b28a8ff0b6e241052ae495dc410fef0ecc,Merge_failed,d2ba5c143323b81d9fb8d214ac08a4f2ba0bd83294d3a46b1e6ec82b579d52c6,Merge_failed,d5f0b3af8db4a3be63ebeccc7c1c0459b3b6d48b8d877277c1beaa32d866983d,Merge_failed,05fd2e2b045d8fbea12c9346fc1970ad93a23a2b9aaf6fcd0eb060bbcb35d16a,Merge_failed,49b9ee5d9738aad814cfc385c046d469260972a7deabd665883f85b69504ee44,Merge_failed,d5f0b3af8db4a3be63ebeccc7c1c0459b3b6d48b8d877277c1beaa32d866983d,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,917c58dfd7882d26b5aa67fa2ce06bd0d14b4b3c9078cc7ee0afa7b5cc9d74b8,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,ef39e01a1127dffd81a49ef1c23b5e9133d5405825085ae8217f6d2a32c2c58d,Merge_failed,878032083eba73e979d830ecad24a5b28a8ff0b6e241052ae495dc410fef0ecc,Merge_failed,386e17c679f4ec3e7b59920c3ea5d269eceeba09ca24666f362681f22fd70fb0,Merge_failed,05fd2e2b045d8fbea12c9346fc1970ad93a23a2b9aaf6fcd0eb060bbcb35d16a,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,6b022c6e4e8659132b0790a12fc31a9edcb79b43f51b3f69014454ca111af193,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17,Merge_failed,b1b60e3c9e9d91df02e8bc5d5ac8e49b744953748ac659600c7cf4d8123c8f17 16,refs/heads/master,3df696d062b432a0dcddf572837cb5fc2577b9b8,6e8d616eba7a4151c05521cc5d1e7682feed1a2d,d17e0c0c869162d214b6e47c299ca607ea4e1303,,True,True,Tests_passed,a69c6cc86007187010aea642b0db0dedbe8e1584fa5e04b3ac015a0713433af0,True,47,180,3518,2,True,Tests_passed,d4331d677056f482e68539e46d7392373fb3d8b20e267ceca54ee449b7a2e252,True,47,True,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,de6124e3e784cb5ce21b23db4e01b4202435267212234bcf324aa82f43b8d6f2,Merge_failed,616f323c0c2b72a3a1a65f9e24a600798f647fdab6259fcf4446232cb3ef9e55,Tests_passed,f9f9dd7bf60affe302e1ddc77b6a5e9d0a690416584a629e696d07766b340d03,Merge_failed,a7e0a08e56f55100d81b89127c11f9bc208fdf50de9ba266ea150863c7c1beae,Merge_failed,616f323c0c2b72a3a1a65f9e24a600798f647fdab6259fcf4446232cb3ef9e55,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,b093b1c1207a6f0ea84fc703284b7b51675ea7c14f18c200b72e7f4861329d51,Tests_passed,f9f9dd7bf60affe302e1ddc77b6a5e9d0a690416584a629e696d07766b340d03,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935,Merge_failed,d0a62be521f5640de9d4b81f0bf50549b3c27849bc636a404f45e149e8883935 19,refs/heads/master,38e0ea624008eb1ed648ef47d3bdd04c4c2eabe5,a67343584ae3a459c097f81423f07901f817ca27,6d29c26b4acb4624f2fba2361f07981043628e0d,,True,True,Tests_passed,6acf500c364c41bc7d266c17a09d8e61f5308a87ba89e527b71eeaf0ac27a604,True,33,126,2180,3,True,Tests_passed,2f0f2777a201f6f5337bd18f391852e565ffbd402a426382faaefc8e0b628f6e,True,33,True,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,3202c53dd7346e0adf1a479fec1b1ff433694b6d4040104617004a56dc02b140,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,3c2b6a98395c644f8b381f0490f489bc87d70fd126903541eb1fb838e246d119,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,3202c53dd7346e0adf1a479fec1b1ff433694b6d4040104617004a56dc02b140,Merge_failed,3c2b6a98395c644f8b381f0490f489bc87d70fd126903541eb1fb838e246d119,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6,Merge_failed,38d01ea79368cb6e10050fde0b672e3809a525b025e985a04a0655fb190463f6 diff --git a/results/reaper/merges_tested/oldhu/suunto2nike.csv b/results/reaper/merges_tested/oldhu/suunto2nike.csv index af5bd4c463..820bad7955 100644 --- a/results/reaper/merges_tested/oldhu/suunto2nike.csv +++ b/results/reaper/merges_tested/oldhu/suunto2nike.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,171bc13151de4b6d205f809d0be56662b49a4920,c2f7c5f4361999291a95718ad44880dff02b2e8a,14135273289c531d1aba5d9299f21daa9fbc89ea,,True,True,Tests_passed,2731ff566036bd25b66b4ec890c2fca70b35f2a7636bc13537c1e1ee5ddb689d,True,25,24,4021,3,True,Tests_passed,ade76afd7b1e3017c23d1cc8b44dbbfda4b8156fe4a9a3f5dd0d65779e2c7361,True,25,True,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,ce6e9ca927262fc8f21cd845a3b0f87356b6f9c8ca4a1de4e8b959055bd45ff6,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,6461fcfdbe7ef8c12b960a147dfd07deeb801948984a3f4836b8d6f5635160e6,Merge_timedout,,Merge_failed,1b04870a54c3c3bc418dbe4b6e4aff08da1c574f7c8626064122d1706404f22d,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,9e3fd792c94c23e4663b311ba7f1af2f7182855576cc1fcf7055c84102066ba4,Merge_failed,375dc12d936de6306c22b765cd5bf575abb5aab8d6b2f600ce5b6e33c43bd69b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Tests_passed,7bc36473a075deba8d928744f3fb1c3b108b2a046c6c53c2a870a4a9c91e182c,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b,Merge_failed,80be862559cc0fd7d88b5f8165529a7ef63267c0b34da32e7e5ccdf7097a0c7b diff --git a/results/reaper/merges_tested/oldmanpushcart/greys-anatomy.csv b/results/reaper/merges_tested/oldmanpushcart/greys-anatomy.csv index 16209c5230..805937201e 100644 --- a/results/reaper/merges_tested/oldmanpushcart/greys-anatomy.csv +++ b/results/reaper/merges_tested/oldmanpushcart/greys-anatomy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 37,refs/heads/master,3d5d857cabac36862f8a8e90c524908762eb8469,8c2f20402460ae3f414d0820b8d2e7b7d44e9aeb,dcc47f11ebf5eb68d090362b475ff32fb7546ec8,,True,True,True,29,127,317.0,3,True,29,Tests_passed,5e10dd945192f0ca5345d4a1c3e068a92204f4ba83d98967fdf407aa4054199c,True,Tests_passed,f8a63df2cf5b5bde16e67166e6baf4d35f8516a80dd14321f063f28f13207159,True,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_failed,a429edc0284021282afd3a8f73cc332a61f4222d8a659aafd871352cefb827bc,Tests_failed,b2aca72a6898b909612a530197e83548d461893a8a6b7f345309bf280cd2e2d5,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_failed,a429edc0284021282afd3a8f73cc332a61f4222d8a659aafd871352cefb827bc,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05,Tests_passed,8466d185c379ec5bc0fcde4bbe00ae19abdaafdfbc3076f2c6bbfb4530dedc05 78,refs/remotes/origin/pull/215,26f8fde516d364d9aadbda98ad78f6c4255470e3,6e6fdf572322ce3a539867c0fc34bcc82d247e6b,0bee9a9d50380719ed4e8fe485a1bf1988fa4bf5,,True,,True,41,259,,67,True,69,Tests_passed,13c24b625424481c7caa468b2b778136dc9ecad18887e2f88bb292dd3a47bc4f,True,Tests_passed,09eecbe1bf9f935415637ea45155d0a30730d1e6f82c4dc43447b4bbae986cc5,True,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,7d51c2d40d30035684c07dea82694954ae38646f72823094b67f10e60e9b5168,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,ef252f8dccb78f194c72f12b7659aa66e0f32c1af28c1ca3917a0eba6fa75663,Merge_failed,af6f67816a47816cd756690342131d39a4904679abd82a9308aba931f1e5a248,Merge_failed,e75e091fbd8e88349a6fbc51ea172f546e0c73a13a005a15a9a0eab0f36bbd54,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,b0681e874c5bad9b4da811e6d2c80b3004a407dff258a10d444bb9d2f1a06929,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,7e0b88b1359cd8ed4d1311c35098f17894f6cf4fb275675f163f75696a123111,Merge_failed,e1069c5b8a4a88e1802f1977e6829d044ec7530f0121964ef87d26f06c606536,Merge_failed,085365cbeadfd7c0b17d4d2b4215948c7971b32b0cb80062fb2400d5b5af9892,Merge_failed,a057e93029d1bba19ea80b4c8f3347b310a7ff8de85f97dba4a033e6ac8ede38,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,bc4ff95a2cb286f63f4af467400fc90c11640f46281f597a18efd46fb153546c,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637,Merge_failed,11b6ae5b4f3e139ee8a0ee02649f3d7a8c443eac82afdd19c5860b9ff6f53637 diff --git a/results/reaper/merges_tested/olibye/guvna.csv b/results/reaper/merges_tested/olibye/guvna.csv index 66c34735c5..dc96f525d7 100644 --- a/results/reaper/merges_tested/olibye/guvna.csv +++ b/results/reaper/merges_tested/olibye/guvna.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,34cd63519389f9e2fc0f1a8ec79f770a764e5e69,02579881c322e91d755fb2583d8da6d89c863f70,f8f105277f09d628ecd30871532eb411c2d90103,,True,True,True,8,39,368,12,True,14,Tests_passed,11168fe7094d8567e21bed0a2a82b3fd62ab741d8466b1c2cd0fa13dd70a6fba,True,Tests_passed,e8a4f3bdc315ef90ef73b6eb2f8626f9e8e60e37309aeda5de0d7a0d6a028bb5,True,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,255e318c777ea96ccc4672fdc4bba304df0e12e97f7587fb7bd37e2854cc650b,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,228a289486df7d87857c83a942405c7209f19da2e3800c8c61912c52af89c88c,Merge_failed,f49199fc88d2740574e4b9b685a773940c513c63fa19f5d14d5128c498db63bf,Merge_failed,5b9d7a00b4fda132cfcd86856494a985dfcfc87a632b03eb3d2641b4deeaaeec,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,9efc920af70c9b70712c5559a293c75534534cd351616cec9ccd402c0f1e0785,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,299294a0958e5fc65560a59f399f7cda03b80cc3831ee07e8759bbc8084b52ec,Merge_failed,05cce9fcdc7a42659413f49c1946058d0d322cea66be36840326664b3d7e734d,Merge_failed,39bc3acf0fe33f11b9c8e81c3aae0a3cd777ee180cf41abe3868fb7ffcb8076f,Merge_failed,fdfb23c25efc4771dad31621283bf4d48a0e1d5de834957905777ff367891b0b,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,2c8b10fd697610ef08274eaf5adea1a5514b7e83c5665af528fd4a9fa6db1011,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e,Merge_failed,1996d9a079c9e89809f4b0750cd2971de1f402e10fd42900d8939e3a4d3a660e diff --git a/results/reaper/merges_tested/oltpbenchmark/oltpbench.csv b/results/reaper/merges_tested/oltpbenchmark/oltpbench.csv index a3eaf3de73..2021c69091 100644 --- a/results/reaper/merges_tested/oltpbenchmark/oltpbench.csv +++ b/results/reaper/merges_tested/oltpbenchmark/oltpbench.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 151,refs/remotes/origin/oltpbench_tim,6bfaefb73d18a9614ec50797966446392b1cd22f,da1a4f66871510925af47869e5e3248a1f901213,bf63f51d491c4e1008973a73ec1dbea743b19df1,,True,True,True,11,32,146.0,2,True,11,Tests_passed,dc5e8ad07c4a0c15e7073bad46eddbdc940093f0145735963c9837d654f87f73,True,Tests_passed,08207e3cdd1fe2c4a7dd33327a764ad808cfb3f2e3641e277f50160cce320aa4,True,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,872fc2615a4b5ed035b12befbba7071f192483f9ad0466cda513fe29114d7ee8,Tests_failed,958e604e5fd3c9300ace7e6f48e84241ddcafd543fa053a35d7bc30cebaada0f,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,872fc2615a4b5ed035b12befbba7071f192483f9ad0466cda513fe29114d7ee8,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a,Tests_passed,f0f2cde856aaf08b8654b956814f50ea7bf31871a4672dcc08c68d449b32022a 160,refs/remotes/origin/oltpbench_tim,61fcfc2877ed46a1d8b36faae932fbb557081511,b61f29da1c16ed829c0dbeee66498adb07692a3c,0af97771b02e48284db1130f2c0aafbd822ccd30,,True,,True,1308,3597,,139,True,1367,Tests_passed,2ca09b4a834d6b2256898efbd077928fad232d0d28c9a673c9b2e34d449b4c15,True,Tests_passed,bb9717489bce87787580043b3d2a32e58bda0b359858f18614879c3c8c726c8e,True,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,8187fa98e68a15e2044b13115cd3f5c2d74045d5e3051be7b2a03869ec44143b,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,cefedd83547fc4fda65ae3f9a8e2fe3b021975b21988414e7f75fe2ad0f889b8,Merge_failed,954eb93b00a610e853b51763593e918549f56be730e2c57a51671880aa8aed47,Merge_failed,cc0a199d46164f3c3877fa1cdd057d94b7f90e1170484464496c3dda2e6841d2,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,db8f00f621e571cc2600c78e8622c9e582535f26900674659ef498175513158b,Merge_failed,6c6c157de20cdaeab18b619a64f73c1e6dc4d2f0779cf5ea0b8b50d7ae20a552,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,10513d559e2cae2b78e229403f1048c3bbd78e2f990e7137c339f52350366e45,Merge_failed,db7a9c9c7d7ed4e325ef0082f6511d8e8d549bdd5d02ca56d99ca1abed54d49a,Merge_failed,2e1f24fff9d52ec4e2abca34a96fd2d1b2b298567541b5a89a0d746a8106cbf5,Merge_failed,042e97e12d816f90e916182635fda912628a8a0ccedfeb8e29b1df661684f1ee,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,6c50565ccc2206d6d41099d50e006eb8acb57efd9e56b027a749ce1688a19a86,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227,Merge_failed,9843a428bb3ee5ffb508e0bd2891ee6dc1e1d6c6c3c0cf53596abd306286e227 218,refs/remotes/origin/oltpbench_tim,3c6f9eb68e6945dde630a5e8e4ec554114921e67,84f656c4999d251e336f98c05506fff1cb123fa1,8c359b3d410c9eb195ea796f205143d6749da903,,True,True,True,48,136,480.0,3,True,48,Tests_passed,2298980a876c2566da3eeac08389b03a7f7b8b613c6bc455f7886be44475df82,True,Tests_passed,cd86a4b1c63c64442d28380225f9c69d73bfc310ec8794a4679bd01ba6e78204,True,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,fd35ee579e936cb20188a80d324bcced9b6c743a80f3c41ffc74df045b5a9972,Merge_failed,bbb9133c15669a9c0d291c18289daf494a7f45924f388f1a2b02ebe9afe7b551,Merge_failed,33db164b6d43387582e38e2ce40363deae0ac3f352dc5224546d8eed7b68bc76,Merge_failed,a6af79933f367f88deb521c257f31cecaf5483b8bf66e8e408947179f68b6727,Merge_failed,bbb9133c15669a9c0d291c18289daf494a7f45924f388f1a2b02ebe9afe7b551,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,387a8b879543fe4e219e8c29bea935a4cdc9035c6390bb99f8450f99c0080a3b,Merge_failed,33db164b6d43387582e38e2ce40363deae0ac3f352dc5224546d8eed7b68bc76,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762,Merge_failed,38cab78470fe84ac5d3aa8acd09eff3195de08b24fbfbc2fc2deaa978fbc4762 diff --git a/results/reaper/merges_tested/omnifaces/omnifaces.csv b/results/reaper/merges_tested/omnifaces/omnifaces.csv index 5db6b4f62b..8bfe957d35 100644 --- a/results/reaper/merges_tested/omnifaces/omnifaces.csv +++ b/results/reaper/merges_tested/omnifaces/omnifaces.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 240,refs/heads/4.x,05abae8be2b4e35b6c7a849b68ad6af6b07d4310,cf7b11b43e4e846ba0b49fada1a592e604c73bb1,4a9ec6a7a0b412f53534747272e7ee7d5655338c,,True,True,Tests_passed,1a39dee973eb060173c97b7d441d78c520ed8aad7cc4334df9883bdb08f068ad,True,472,3161,27465,2,True,Tests_passed,dcea7c6c928b81a7be0aa8c6e887691491d3b7a2508b63e27962cc9ede1cba7e,True,472,True,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,9211870c7360349cd0443141b8ed862ea30354a343eb9ac43ef0f8e87f36a5cb,Merge_failed,31ea7489d25eee27d5f1d95655c495e47caba8f9063bf8668f4e3013a039206c,Tests_passed,9131232da917790da14e252252e19cc1c191735edc02b4fc45591c17ddfbb57d,Tests_failed,428db9c247427c60b77f80afecd7d22a10940be57821049b12c24cbc0bb75048,Merge_failed,31ea7489d25eee27d5f1d95655c495e47caba8f9063bf8668f4e3013a039206c,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,b4d6fc41e39598e29c357aa39cf1179e384a64923b60acfd4f131b0f5291a33f,Tests_passed,9131232da917790da14e252252e19cc1c191735edc02b4fc45591c17ddfbb57d,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce,Merge_failed,e860bfde5a83860c8c2c584ed7bc56063ed0e628d740db25754fc0945efe67ce 241,refs/heads/4.x,c17533a8f6a494ae15a97632aa3d536507930ca7,87ee27014bd3b46deadb1b55c5f36565af27f6dc,cf7b11b43e4e846ba0b49fada1a592e604c73bb1,,True,True,Tests_passed,b018a22d5126f356f5f3a42f7205646ba618e91b70359254f59c7534dd217a7f,True,355,1279,7416,2,True,Tests_passed,1a39dee973eb060173c97b7d441d78c520ed8aad7cc4334df9883bdb08f068ad,True,355,True,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,be516de2959930b08c965132da378f93e926cfba31e1f635c95bee4dc62a618e,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,be516de2959930b08c965132da378f93e926cfba31e1f635c95bee4dc62a618e,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553,Tests_passed,e5bc081c2316fb9bc67a436470a4f4b90090038b7d288dab42375eefc8835553 458,refs/heads/4.x,7420b2d63f5105066f9de581c90fe5bdafb88208,414f8ce7bbd379788149dbb3e5b68f60a1710625,ee42b2dc9c9858c197e89d2f188fa69faa3cbcaf,,True,True,Tests_passed,753de711e97eb3049cd97830717442c9a5703513fb951daa85586f4b361ee816,True,7,54,309,2,True,Tests_passed,e82497232ad6d1bb55933d21230b2c84a8a33e6c77cef151b2dae135af44fc2e,True,7,True,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,ece4d5bb12fd25908b921c611842b0eca4e282d76e8c8945776c6b4dfcc22bda,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,ece4d5bb12fd25908b921c611842b0eca4e282d76e8c8945776c6b4dfcc22bda,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c19fa6faeb491a15d17915004298a494b41e3ffc9e023d0d49c0018f8b2b1604,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958,Tests_passed,c6e7e56559790a3396a46cd37ff31b91291184ffb279cdc283fd0e9c9ee59958 diff --git a/results/reaper/merges_tested/onebusaway/onebusaway-application-modules.csv b/results/reaper/merges_tested/onebusaway/onebusaway-application-modules.csv index a01e2abdb9..d8531f8d21 100644 --- a/results/reaper/merges_tested/onebusaway/onebusaway-application-modules.csv +++ b/results/reaper/merges_tested/onebusaway/onebusaway-application-modules.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 64,refs/heads/master,e779e9fce1879efbf6a4241c6a704aec6c2faacf,f66fe0132c2d695835e1cbb85425e1eaad1b6836,6541bbbe23fe4e5be1da37c3f3711ac822f51530,,True,True,True,57,91,494.0,2,True,57,Tests_passed,e9fd9fc53bcd45c1e69d5c96aa8f8ce328e3e15ed4325633eb85eba2295e0cb7,True,Tests_passed,0b0cdf552093fcffe9a0076a9c7726926f85b46547898bdb01f9971c08cb5478,True,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,2deed109cb5bc55960dc540f861c7b5c70694ca8e976bec20c6e86ac54255d32,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,6ab758b4530459059e98840a75214c98dd4f7ff7a82193e617436360a2d329d8,Merge_failed,9276061df342a284c8317d1cd47b9fcda489be7e0ec9e5f987aa0b9033504bed,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,8b38276c95e251138a7bc9f5ad1abb755441dd5110ff95bd4e2c074289d8f157,Tests_passed,e70bfaf504677ffb6eb3b5ec4eb8d2ee6418e49b4edf0be58ef349b801ba1885,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2,Merge_failed,123f83d9cc1155f097f988187d1b306258bb2b766478086e1f594d1e4f6cacb2 66,refs/heads/master,915e2f3ffe763e3e677ddbf3f2454626c11e5e49,7514d3f661d221b7ffda249a0b9562e0770daf15,0aa9e6864e22a83b416ff29752146bb2203a49e1,,True,True,True,71,111,964.0,2,True,71,Tests_passed,404a21aa887a650bc819780fff4f99e7e0d153f0ee01b5779f0ad930e7124183,True,Tests_passed,1d12ba5241b031cd87c68f7ff401ba18d28a11a2ff991964eb1d874e0fd28124,True,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,b6e8bb0168e6fece9b9b69907e875689ebda799888d52a49f29906740525e204,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3,Tests_failed,410df81c45f887ffa919043ab296dd001318a1562757589bcefca51788f5e9a3 diff --git a/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-modules.csv b/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-modules.csv index 770be9dc4f..92ee1db9ca 100644 --- a/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-modules.csv +++ b/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-modules.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,8cce63143574581cb7d40815845c285d6026ccc7,bb64bf127eaed25b3c0107744275450ba6a1e8e4,113c88d60bb4cb89ddee80e562659be1b2eccc7f,,True,True,True,24,78,614,2,True,24,Tests_passed,dab14918c729705616648bda58ec7477f46e0c1605e8dda89bebbb54d18fe3c3,True,Tests_passed,13610a4a1e2545e6c693b60643bfeb7eadc634265ade660160dd0708bddc347d,True,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,411086ef0b407c7fcfe0697694580ef35123a833c7d014cc145a35b5d50d1ae8,Tests_failed,d38fb88e824c032f94f2ee88629e7833f8d7f31ee038fe16aa1c45daccbd4acb,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,411086ef0b407c7fcfe0697694580ef35123a833c7d014cc145a35b5d50d1ae8,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6,Tests_passed,00f76440453ef04c6e0c1d7081bcd3d147bc0b9d925d8499be24abd8de2b93a6 23,refs/heads/master,0dfc36d5c8bb5baea8656f9c4ea68983a8e0070d,5e20b0ca0ea45255157403cb84b356ea248a5b69,cee1328fa50808ec510d4c1dbc1f8be3ef59beea,,True,True,True,171,723,10984,16,True,172,Tests_passed,2cb3bd75e78404454c91415f3cf4782822aa59c55e49be2f795acc0c8b3c891c,True,Tests_passed,1dd80eb012f77a6d8275b7830b8f13f052764dadb032f8e2beef6b4c84f7bb96,True,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,298132f484081963456b2d3e967641a4f3483faf59957fb4a91e0807fe131156,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a07261ef575584a18c6d29496642063286f995865a9887c06e2f642e9f3613d5,Merge_failed,1ff28b5cbda4f305f6dfcc74be04317ed6561dae49be6904ef90f1124fe90004,Merge_failed,683760c5f9606c19f0f67f26fbcb11fc11e6933240e746b6c32a2a6ca7a1e0d5,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,5270cbb4ce3b85349fdef7cf7ccb6d9610f453c355ab86c2fb5dc86a8cbdc469,Merge_failed,10256d2e29c89a4146e74abe67ce1deca631c28276355375e517be0ef9c2a8c1,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,774579c99b7d66914b0e88eb27f86065af4cb7b4761c7628dbdfc61096f7a6c2,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131,Merge_failed,a4c230a89210675dc2af0f71f74933a1091d4fccbb4c18f2e183301029c13131 31,refs/heads/master,334e85e1e3b574094e565a750b4ab2a197cf3553,20c567a27dd6c875acfee8c6378e24a02b777950,c3abff49a88a31b1ff1229481bab9b531ed8b08e,,True,True,True,16,20,487,2,True,16,Tests_passed,eb5277fa0ff33245679dd4faa8a8f1ba484c286629f4a76d71bfd20d4ddfd514,True,Tests_passed,05a20e04ee4a422f1e45d9305b650a6a80d4c87c51d3a04b42ae7e2ca52878d5,True,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,4f563744edb01397101fd4c2a56d049f3d89c336518fc0955bf90d351453b39f,Tests_failed,4add29a5c474e8cf5a76ef141370d68002c6e76d8dc6971eefe7a2681a44e24f,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,4f563744edb01397101fd4c2a56d049f3d89c336518fc0955bf90d351453b39f,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c,Tests_passed,169a54d67d55095262424bc7f2af5a7c5e1cb08f1fe39284316bfc4bdd9d8c7c diff --git a/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv b/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv index 257c5b9749..f08740953e 100644 --- a/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv +++ b/results/reaper/merges_tested/onebusaway/onebusaway-gtfs-realtime-api.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,2c511739c7f1597917511dc3484d38de128c51c3,e357f81ca88d9252b2a5e1aa8c671c6d5901082f,428e499bec03c4a9fa1a753dbb29be86e813da9b,,True,True,True,13,1728,13256,3,True,13,Tests_passed,dbdfaaeae976d533bd84abe43e2ff00b5f977415f78bf5e448bc00b2c3f30371,True,Tests_passed,69a1162b55e19b247c0cdc2f59d94b9705ccd6a85d2bc84479fdbf4deb644c42,True,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,d74e83d879335d550ec6308c50292848d9c336f7931346e34c753c35d2cbb487,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,8d32100d28177ce62b6df1b79ac13662e5562e3ee20b6b59c488085112143649,Merge_failed,033aabf8fe47343f53d4844e1370bee4cf658c30a4b32754eecccb0cb338cde1,Merge_failed,1c1415454090713f6ebe06d094187b56ff7a7ffa622442e7e7142a5009a685d4,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,1c9288482bdba660c6caabd055871dc920db0f9b7d164ba5b49fc9f55ca220ab,Merge_failed,a2fee9f90ad0c01191d16fac32b027e0548e036ab6382176e3dd026344e5bca5,Merge_failed,4a8bc8aff3798b25feef8a6380cb75b58eb5076a86524a6407c1610bebae2daa,Merge_failed,c2d6e6ac756e58236d90bf17ae8b2f2451cc7b3ad4c6125a0d1ef03142a9ffa1,Merge_failed,a2fee9f90ad0c01191d16fac32b027e0548e036ab6382176e3dd026344e5bca5,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,8d32100d28177ce62b6df1b79ac13662e5562e3ee20b6b59c488085112143649,Merge_failed,033aabf8fe47343f53d4844e1370bee4cf658c30a4b32754eecccb0cb338cde1,Merge_failed,1c1415454090713f6ebe06d094187b56ff7a7ffa622442e7e7142a5009a685d4,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,92c3e42838190cec89da397073ea8849c5d2575560a90991f344e51b38a308aa,Merge_failed,4a8bc8aff3798b25feef8a6380cb75b58eb5076a86524a6407c1610bebae2daa,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,d74e83d879335d550ec6308c50292848d9c336f7931346e34c753c35d2cbb487,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9,Merge_failed,571c2990b4195b98714e3b3f34ae107f25cd330c80743b1a4a6d54b2ecdf7ba9 7,refs/heads/master,96a36bebafe864cf710f1c7d4fb59d6b0f6be102,30c97f6c6318d2c2b21af4b037379a4fc4066005,9cef141e244263ee6b29f6de503c0047573d5933,,True,True,True,7,263,6254,2,True,7,Tests_passed,1303a1d689098aaaef350c57cea697928222435bcd0f7f0306f552b840685cb5,True,Tests_passed,910e326a92598a4aab534d07b2f80bf0d4cd63b3a4ad319ade3b7807a6813e66,True,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,04875702851856d6b96dd33324f25fac2cbce0743668234dac27a73a10f3d70e,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Tests_failed,63055549bfb530abd2fe7148475ef8d0cbb4605abc0e36072a74266295073cd8,Merge_failed,1b6f85ec1befa9d08fb50f91a5d5f4904c0c9224a485e2a8abef3e6d0fbf1d66,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,ad6e693b568ad23006ef922b03938b5855ec2f403dc170a6403110461e1ccde6,Tests_failed,ff0c253c01a5511cdd80e46784a8739729fce909a88a16390030b107cffdf9b3,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea,Merge_failed,fb696849081e704f5f04d609f5790bb28d009656a9f4d22fc7431d920160e6ea diff --git a/results/reaper/merges_tested/onyxbits/raccoon.csv b/results/reaper/merges_tested/onyxbits/raccoon.csv index 3e84dd59eb..ac9099cc05 100644 --- a/results/reaper/merges_tested/onyxbits/raccoon.csv +++ b/results/reaper/merges_tested/onyxbits/raccoon.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,ad6961824ce68e2e909617b87fe3f852e6e915d8,c13a337e9a4a5c6d15792aac976e63152d45d5bd,c320cc3c531bcbeed8f44f9a5c813a887ec446b0,,True,True,True,14,38,205,3,True,14,Tests_passed,f4318104d3b8f195dbde99f2fcd9ce71fc5c6ab524d97c5b31b3000a7ca75703,True,Tests_passed,8cc67a04927bf73fca5bbbce428980fd10191e2f8937a88a0ce9dc9f3c9be809,True,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,0c9ed5d3ca8f5e017da36a484a22b12710ccf3fffc0f81f7a03b23d9eadcf870,Merge_failed,70331f53a66d92741d4621e7308de130fd8052b707e7807f857f245e4b529f29,Merge_failed,67e8614b224af1ab62d4798545d3254bbe2a2038ba63c215b2ff0abc1821c0c8,Tests_failed,41dab5fc5d11707e5ae0a00f7f053e348cadb81784d9289d2fe15fb9079f61c0,Merge_failed,70331f53a66d92741d4621e7308de130fd8052b707e7807f857f245e4b529f29,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,d55aa7ab1aff3d8fba0d78150f8fdc8ec1a855ce93fb59b7660247a9a09ea377,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de,Merge_failed,7a95558bb4a532104256c777d274ade5f976d44597ad92fcf91a0ec0c8b058de 7,refs/heads/master,242b60f26dd4783edf092061d17369b2dbad9ac5,1e372cfd6d21de6e607b6354c38788a9619ffecd,73ed5dcb5cfdb1caa59abaa09bd729b68eaec141,,True,True,True,11,56,1512,2,True,11,Tests_passed,cfe23c22c36420f01626e8c847674c9c0297dc31ad6ecaf03b458107087cee0b,True,Tests_passed,a27f8624e3cdfe7167828887807bcf3fa3c4b5462deefebe16646cee2b73496e,True,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_failed,d336ce1ed1c7c0db7f88f57e1a73a472a1995c5e3f1746f75f56b53ff85e5d45,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464,Tests_passed,f97521b9bf99ff04ac6fb535452f9492b8cedd19db9ce1a011e86a485c16e464 diff --git a/results/reaper/merges_tested/opendatalab-de/geojson-jackson.csv b/results/reaper/merges_tested/opendatalab-de/geojson-jackson.csv index db69702aa5..bd6bf4fa7a 100644 --- a/results/reaper/merges_tested/opendatalab-de/geojson-jackson.csv +++ b/results/reaper/merges_tested/opendatalab-de/geojson-jackson.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,894661ba0d4f40c02ea56ed56abab760fb13444b,8c4446a91079a1170b5bffd0f3fe9ada035c2b42,8d47769f37e6b4aa01ef3bb9d52aff0da27fb228,,True,True,True,18,58,270,3,True,18,Tests_passed,e6588ca086257abfc5e05b878405eb5ea21b65cf09e92c6caae473f2b37ffae5,True,Tests_passed,1f4ddf696ac6a2b785eb936ee298d703aab992316a367d0e68761de9b2e87d91,True,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,665da34ddaf56f970b89d5baf38b6afcbf4e45f8f3364fc3b7754a702b002d12,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Tests_failed,3060d3d1793b8fa8a4f8fd4669abf07166f5823c99e659224039da94e74a2419,Merge_failed,76106460d1056d7044dc04da1056d340bec048e8cf760f2fbe7d208f28674d95,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,d89c5c88d106ab93a562a171c3acee7d993f70dba6aa91fdc181e2b157470285,Tests_passed,3af1c9a0801b32127539f20a22b0fdcb2a892d3a27fe22477cfb2168e6feb7a7,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b,Merge_failed,441c0dfa537db927cae740926fa17164b34a42dc1d09de3080227be3c2c8da4b 20,refs/heads/master,622bc5ffc17df85d7f2cbf587ee6d353862ea626,1d4b2e1c08892b185ca0100b67d971a7eb643d43,b2d344508afb0585ba49af27c758fc18a5f0a305,,True,True,True,21,37,420,15,True,21,Tests_passed,c19a4ba4da5e02bbef7d4ec7a1310b00f89a00a9b43c235658ce8318bd6be4b2,True,Tests_passed,115927d8f702672fe1a8956aeec63acd392e4e165a3c069de395c07631056865,True,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,b1f6d1744abd15660aaaba141824ae60be64d0a9333d8e41712d57a687be20c8,Merge_failed,e7a64282ab44d13d97faa233822248b7753429f932bbdc49e10b9bc608d72ad0,Merge_failed,4e67e4f6eab672839a0572894422d2355f8120779fc5cb364bafbdc037f4b996,Merge_failed,a377e0859efbd8caeaeeeb93c2655a5ace7ecb5f1e73ba88c80e84f9b17ce0d9,Merge_failed,e7a64282ab44d13d97faa233822248b7753429f932bbdc49e10b9bc608d72ad0,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,24b23f67c8da9417819761ea6d67d16675fe16e12223e210629f5e2267d86ea9,Merge_failed,4e67e4f6eab672839a0572894422d2355f8120779fc5cb364bafbdc037f4b996,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,36adea2e2300113ace4ed13b495fb574a6659e989b9bf9332ad48717f8b717c8,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1,Merge_failed,9a98ce6d8304debe7629382829b2c248f8157d7681d0cb2e2e910e5f5edd44c1 21,refs/heads/master,1890a5b8c56bcd2b7ca81142840d0619acdd0f9a,9aa6565a6c8412266da20fed4bb9f2ec9587cc1b,bd0009e7399268f86f28aaa2e6eb28e64ccdb303,,True,True,True,20,32,400,6,True,20,Tests_passed,33cc16c656700c7ab46b3fbbdf55adbb919c0ab5845a8eda0ed63e1aab8da361,True,Tests_passed,98a97f4679baa288a31a7d2b2129e246755f42404e0c499c317c793cfbdb86e5,True,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,0322de51bb41a536db43181865c3c958dbe326ca0842e8c6e23b240364006759,Merge_failed,be5d186f4b677d1a6649b617e2663da37bc9a3d60233cea2a619e4f9a15a50aa,Tests_passed,e88312c46534ef418ce57ab659f8dc91c3931d1159076877916e99080d9f7504,Tests_failed,6328ae00782156aeb06e867ec8079535473aa5191fc84b91f52433fdc1f6422f,Merge_failed,be5d186f4b677d1a6649b617e2663da37bc9a3d60233cea2a619e4f9a15a50aa,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,28a665069147435933bc65ca148f1da28a63a230cd480407de4de39d69ee71c1,Tests_passed,e88312c46534ef418ce57ab659f8dc91c3931d1159076877916e99080d9f7504,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8,Merge_failed,b7e171539fe16e47dfd693f01bcb074dec9c92e2f0228b560146e06733a6a0e8 diff --git a/results/reaper/merges_tested/openhab/jmdns.csv b/results/reaper/merges_tested/openhab/jmdns.csv index 1d61f6edf2..f0ed6863f9 100644 --- a/results/reaper/merges_tested/openhab/jmdns.csv +++ b/results/reaper/merges_tested/openhab/jmdns.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 23,refs/remotes/origin/pull/142,2c7d1a7405d9d43873f3a78f5373648ef759207e,27329d1d263060bbd6ef18bde3b7620e5edb572f,96a96e12ed57c536cdd105e508188f95fe68fc59,,True,True,Tests_passed,c2d276adbb95455f5b89f9e1147069ae8daef8f069d3b37f77ff1479553bc028,True,24,105,684,80,True,Tests_passed,e9b352a0d6f4d105e720e51c3ad42894d85df86bc0507e66a73787cad30c0af0,True,90,True,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,21b12506ca022a09c217c02d9f1824db5c12c37b09754426a64b257686ebe173,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,8153d64eb2429b26bdcd3e71f025c0d5487938c2a5c67355d23e6f74cb9879b0,Merge_failed,e84666428784df3a7a16722b5bf7dcc97a9d99e4f266e4d2dd8d19a605d12366,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,01aa7b2bf2cf5f6b548a41c44d7b215d3ba2edc6361b57692912be792be22d9b,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,ba465c1c81d218e3b5b69ce878277a71100eb18865d9d569a321f0c1e18c05e1,Merge_failed,1b3562233005fedd32bcc1e9049a207b7f19df3fa22100245df839ee25a4ba12,Merge_failed,764c29d1094e0fc8af2f3a755d99a3913840dac450d847e9025ddc620e757a75,Merge_failed,e3c12736614bec6eba4f8ff9ba5f13ef014ab7c2b45ef9b1c36c74a03b4ff2e3,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,d3f49dcd934ddb9f31c0d23fa5942346ab34fd4640381f8d6f7b23f4aa04363e,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514,Merge_failed,c5789b1978dc6687999962ee57fc22786076266f9a6a3813b5eb81fab2fc1514 28,refs/remotes/origin/pull/172,5e925d672a496843fe245893a8d89162b5e26bbf,7d411597e93b2d64a4c4bbfe33cc466a5af67c57,fa9bb884b6eedd5692ff4afc3818de033180a26a,,True,True,Tests_passed,a4bbfe984345d20b1de09f0ce225f73bb0e0ce643fa6e9e3687850f643be45fc,True,15,62,352,2,True,Tests_passed,4bd679e3e88239f414a335a56c0adcfa7f60d587928ae72e95026b457511f258,True,15,True,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,68173618f3adcdc394a1725acaada8ece8ef69c173eba1586411c70aab48ce65,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,68173618f3adcdc394a1725acaada8ece8ef69c173eba1586411c70aab48ce65,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484,Tests_passed,8a9f6f8630b97b3557152f10586c7446af395c06a8d1fe7331b1cceb4875e484 31,refs/remotes/origin/pull/206,1ea70c3c7b12342a04644c9261369d4a416f3ea1,c66c503121ee6b15948d3ea4f7e58a9ce6265003,3c4502247c73eafd19ab9e1f21dfb1168606c9d5,,True,True,Tests_passed,769ac0b2018934f5d449d641467e3423bcc115d7c1b118dffd1bc9542fa6e58e,True,15,62,795,2,True,Tests_passed,92020b944978b69aba367dcdaa6b743b79b82e7aca5be968a67b33794a0ada5d,True,15,True,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,ab3d5efff1b78344a07068ab32ce054861929f30beef6411983c91691984c09c,Tests_failed,da680de10fd9774653fa68b51fd41d7586585b7334d42e9467271e2dc7bc831b,Merge_failed,7ea0577ba8da84344522879834fc8b44104b33e48327244cc934a8bd771f5955,Merge_failed,ebd24a43e697373bce9b1f0c1991f6f84cb7ab777511504f3d834ec40839f901,Tests_failed,da680de10fd9774653fa68b51fd41d7586585b7334d42e9467271e2dc7bc831b,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,5951cd915058c81192835ff059a6a51a2973dddc4a00699b3b06de203a7ec465,Merge_failed,7ea0577ba8da84344522879834fc8b44104b33e48327244cc934a8bd771f5955,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,73f876449bbc909c71bb6bfe99242dcf6740916e2bc0e7562321ebb5ab69131a,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274,Merge_failed,9c72114b41a26ef09438f30043f5204c83b16dbc70696e30c16fb3cecb95b274 diff --git a/results/reaper/merges_tested/openhft/chronicle-bytes.csv b/results/reaper/merges_tested/openhft/chronicle-bytes.csv index fb14e02f3b..d483d452ec 100644 --- a/results/reaper/merges_tested/openhft/chronicle-bytes.csv +++ b/results/reaper/merges_tested/openhft/chronicle-bytes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/ea,592480ea1eba72fd37f98ad2fb1dab76b0e140b2,3dc3925bff05ea1584701afe808220c6aa335d60,4e207ebaa1774edb2eda5852767e4f12f58c2117,,True,True,Tests_passed,c21b2747b7bb6cf1fa70ac65838a77b382933a4b233e6d2d411f410ed7266054,True,67,250,5935,3,True,Tests_passed,195dceef14b2b1ea5381254f2aa306c344171f97fbe4f5ed79822b62768a6993,True,67,True,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_failed,4e5636abe784f3bcf0eaa39b13272c1519117a0115a2c9e24680606e23e712c3,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,40aa7537e94c5b724758724929fdc16625f45c0bc0214562d43ee8a99bb2c6db,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba,Tests_passed,4d10c237f4d15b9e31d08bae2baec8dfe4b74e44b5dce9b835f5f9fff6fecbba 40,refs/heads/ea,e3ac571d253f5fcf85f24e64833bb488092d58d9,2caddfea71d4a3291923e5932bf994076318b9cb,4d42f73c641704d7902aa284121ab19e3c082243,,True,True,Tests_passed,84cc90e53681ca3be51813ccd0fa6573ecfbb2a76a204b32822d33bfe371e839,True,6,17,98,2,True,Tests_passed,6f35fce28168ab0482ac3702347930cba2f1ae10e297ec926ccfaa2640fbffa6,True,6,True,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,cc4df2eb325a395d97c52de059b07c4cc153fb1ecae86af69a494031ae39660d,Merge_failed,97e8829c4ccc4e632b02f3c721993aad8935741eaad61b2dc60b1374c05643b1,Tests_passed,b422e8d651ec939af5d4cba19f1cbb4a5d56bd0b9f0893f467bf9a39ca0a2731,Merge_failed,022708a8eae12696937384aa613a4c172d517cbf70b26da11a604faf03ec550d,Merge_failed,97e8829c4ccc4e632b02f3c721993aad8935741eaad61b2dc60b1374c05643b1,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,6bcca2924f5c3cb4d8430de18fa429c8365890601dd4e44003a1a59812b7b815,Tests_passed,b422e8d651ec939af5d4cba19f1cbb4a5d56bd0b9f0893f467bf9a39ca0a2731,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,096e3dc9c7a89b42c50a405252b087d7fbac75139f46aa9cc08cd437ddf94717,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a,Merge_failed,f2c9789b11907b5b59dfdf5a1cd4e53c9ac00b45acaed082a6aab457053acb7a 50,refs/heads/ea,5bad7e86eaeaf961867ab32657bf3d9c5f4a55af,420ea2a65d88fc2661a898a5bd25ff7b4efb1a27,b92648cfac1e07a32364e98ae1214fae8ec44e56,,True,True,Tests_passed,13f16a5d7750798b50b36cdcb3dccf80f54be2b171e306ea170267eb35982dcf,True,25,77,562,2,True,Tests_passed,e580028e81c720573643b18b671b25df9c1403f37853e8779af7b034a3f3cd9f,True,25,True,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,d8a4b9e85d89abab6949ac9da5e88efcabebe884f9cdd6709966ee6cd1c38ef5,Tests_failed,504c3d00f3e56beb9011c620609672a383c6c63fe6c239b755cf809f18cd69ba,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,d8a4b9e85d89abab6949ac9da5e88efcabebe884f9cdd6709966ee6cd1c38ef5,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc,Tests_failed,0d51f1321eaeb5d69c7a5e53e4277daf782d24c7e527bb16a0721ccd1ef27abc diff --git a/results/reaper/merges_tested/openhft/chronicle-network.csv b/results/reaper/merges_tested/openhft/chronicle-network.csv index c2842f881c..d60980f53f 100644 --- a/results/reaper/merges_tested/openhft/chronicle-network.csv +++ b/results/reaper/merges_tested/openhft/chronicle-network.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/ea,297f43b8f8860335c79d857e7bdddc0ac9f8f0da,705e1e7a01074bdaf1668d53d6974ee1288692d3,17b56d9342ca579875930b1652336638a0f00ab1,,True,True,Tests_passed,fa9b1521ed0d9c14b01f3e38a9976c0d31e5ddc91ba5add96afe1c399be683d2,True,56,315,1682,3,True,Tests_passed,805787c1835f0a9a943d0d5db2d089205b40ffcc43d5636fbf02231155f6af53,True,56,True,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,b88907900ef8c3c0ca0fcdc929f0da324c368ddf5c28720de819c1e683b5feb3,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,a9d4e5634bd4b13d78a03ef1628499cb957feea128b87354d990103c96521134,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d,Tests_passed,6e32cd1dd541551630bc27037f1f085b37640637fa4a6b2055dc85d64e3d2c9d 24,refs/heads/ea,37adb9cd8c603aaceb5f1fe6fc6a03cb30efcf3b,9443bbbb3c88cf311c4733b2d01d40fac2195106,2797452b9a3b6b5da491a7806943222fccfad5b2,,True,True,Tests_passed,183e55f682e96030becf9d4a07495939806a62ed9d838b85c45b7efd5250f31d,True,32,176,1911,2,True,Tests_passed,cae6e1165cbcf29ad007f1bc54c1de20baf96145383b9650a59e12519500dcb9,True,32,True,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,98810963ba699f6c8dd1aee6a482e35f440fa4985ac31b0afd8dfb1221f11683,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,98810963ba699f6c8dd1aee6a482e35f440fa4985ac31b0afd8dfb1221f11683,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,6f29deaf58c9fe55b6c2a761b415baeb6fc019ec2bed2af72f37200212c42aee,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50,Tests_passed,7bd75ca839f07ee7c67a0d1db1d65cf630af33ee1e19c8c65a1e663e6e20cd50 58,refs/heads/ea,fb39c8ca3b23986ce690c7a1b35dc96657630b0d,b4649399bfd0050dbdaf5e6329ddf5f22652b592,d2fe96b2af99b24704121e921e8614a46e3628c9,,True,True,Tests_passed,d26f525187593ff5236073cf619782e4a5dfd283a4083e09a20c6e257cda370d,True,5,28,64,2,True,Tests_passed,39c54ef003b7f353851c4dc3aa75cf8a93de6ced3b57b666a804cb8be466f649,True,5,True,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,6d5b4225df2a7e91708a192d409b983816c73af90cf3a8aba48454d458845c11,Merge_failed,0fbfe0bcbe8908e5303adc90833357358ffb55427e31d1896a200e61ca67a67b,Merge_failed,009c4c1e40be192e3d112dbd7bf0f5a9cc1b18ccb1b6e466232baf8413883992,Tests_failed,ab7769c8e4ff22cf3c3a922e5288e1c87368cc5d3adadb8aa740883d0d8d03be,Merge_failed,0fbfe0bcbe8908e5303adc90833357358ffb55427e31d1896a200e61ca67a67b,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,f529785b46cadb030cc3285799c125d90ac6c4d4701457651f08ac473eca5cdf,Merge_failed,009c4c1e40be192e3d112dbd7bf0f5a9cc1b18ccb1b6e466232baf8413883992,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6,Merge_failed,bc3258689b0bba4bec8ce5ca25772a7022dfedd55bd97442c2df949513c5a5d6 diff --git a/results/reaper/merges_tested/openhft/chronicle-threads.csv b/results/reaper/merges_tested/openhft/chronicle-threads.csv index 48db43c427..b0cb4512c0 100644 --- a/results/reaper/merges_tested/openhft/chronicle-threads.csv +++ b/results/reaper/merges_tested/openhft/chronicle-threads.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/ea,c79efe704817535cbb84891bb2048cea21e926a0,a354c888e4c0174d631ffb8934299161055c5b3e,58ac76a7fe6dc52a74258985f9d2bca00c80aa73,,True,True,Tests_passed,3bbeb351de56d4020efba79d9b680025a67964cdad15106e90e77683a4d1857a,True,34,57,268,2,True,Tests_passed,1891de40f58767f5a6e308e86d17ef85ce3542f293a4c2b8f138d368e3a61416,True,34,True,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_failed,0338368d37856f33107abd24d0deec3384e0f2146075d1b9d38ae453f752b8ed,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,5b4869a0b2abccd20aacfd3c21e0fc629709d8262709fbda56e90399d7f3cfe7,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c,Tests_passed,6f4cb8af006f484bafcfdadedc9d5aafff179668cc91e55a674845709caa866c 31,refs/heads/ea,0eea0fef995baf05cab5bbb01c1e5afbb443c039,4ebaa15919d0aeee3cb1c33c53cedd2a66bbb2a3,3d2874922c1970d9f7de17921419d820533a384e,,True,True,Tests_passed,a6b18a8317b666105345bba726b987d81cc4ebe1b7441375303c7c6eec964143,True,27,91,316,2,True,Tests_passed,563901ef0dac99fe2abfb28639f6a20a712d25f5c705a812ea09cc36aa39fccd,True,27,True,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,a4e8646f98ce8cbf7bb91a13db16cecd979b5de32b96de2a721e721aff00dc5d,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,a4e8646f98ce8cbf7bb91a13db16cecd979b5de32b96de2a721e721aff00dc5d,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c,Tests_passed,b75059429a92c2f9f3573c9c9345fc7c06988b2150f640a2878e1a08fa96492c 36,refs/heads/ea,651fafcf0cdc3bbb18890955b02061bfc5f85c64,9ab050a11428838af56ad7479904209a7040b29b,b7d01c6ec8e5bdf57ecd47ed93b19624b5ba6c77,,True,False,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,True,2,Error,0,2,True,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,True,2,True,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Merge_failed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,eed80cf2eb766308de18d2f9ae8e85339f69b7262b7bdf9a5e423071ae0b395e,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Merge_failed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900 diff --git a/results/reaper/merges_tested/openhft/zero-allocation-hashing.csv b/results/reaper/merges_tested/openhft/zero-allocation-hashing.csv index 849da8470f..2c995d7fa1 100644 --- a/results/reaper/merges_tested/openhft/zero-allocation-hashing.csv +++ b/results/reaper/merges_tested/openhft/zero-allocation-hashing.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/remotes/origin/pull/32,0d095dacc71fdff39d82d11674d410941d909e6a,a84b73119da25af70fa05889ff5d2298568ed57b,6daf738c303d538031d65815eebf24ad649c6abb,,True,True,True,6,23,140,6,True,9,Tests_passed,b2014e8890eacfbad9e7b8a2cf09add99c2da49ad21a20a79c40d6a821f79358,True,Tests_passed,e47a0ead91c88744a4375b6b069bf958dd4d89dca67ecf6e4a62a6cbd9646851,True,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,d1617d29d5df73973e2536488f8be522fc5cc459e41829b2c92f3414a375b489,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,deadb20374b4a01dd7109d120e966a87369800c65c4472f77d1b24b1f404ecff,Merge_failed,d10622e2024d9df2493b53793b3bdccf9e975ecabe531fab807a4614f40dad51,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,5bd88cc6ac276d5e35a2de68486bb3aa617fb45fbd77a0ead470853f2ac65a68,Merge_failed,58c4bb91138acdff815738730c26768076a0b9e5efe725b97aa3ac059c8b0733,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85,Merge_failed,290fc15c9ddb202c65077bde663bbd7e1674ebe3c9543dd7a7a0de6062be6f85 diff --git a/results/reaper/merges_tested/openmicroscopy/bioformats.csv b/results/reaper/merges_tested/openmicroscopy/bioformats.csv index 868d15d7fd..49d183469c 100644 --- a/results/reaper/merges_tested/openmicroscopy/bioformats.csv +++ b/results/reaper/merges_tested/openmicroscopy/bioformats.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/develop,187e02183d425182df14ae8984d175d0f89f7c32,d64cfb7261d14d9f5feca213555ad8a25d0c6035,034c708e74a7a3a8393de8679e5374bd169e4464,,True,True,True,29,136,1562.0,3,True,29,Tests_passed,60e8d5692dff887b1673c735d30b8f67556e9d2f885c015442cbafbd889d14b8,True,Tests_passed,18d01b972a33bd7c842dd37cc742df6b37d4c3537c39e66d1694b1a45131b1bc,True,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_failed,714f895cdf072b842441912b674001f00b4fbd1b8ecfaa8ae9cb778daa4d51af,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531,Tests_passed,405af26c103e43fe1f204c88a193267b2bec3b22201bfacb184063b90ce62531 54,refs/heads/develop,5fe8f5f68fd4f49f1262966207a942f4d3094408,4a7dc150bc015124609285e5b85571fb178e63d3,7670770c43755508b0062e656d5c7863e9ae08fe,,True,True,True,23,460,2760.0,3,True,23,Tests_passed,d9b0dc029286f207ee0fa554bd3abcafadabdf147ed5f9672490bc52e96281db,True,Tests_passed,c9cf55ced79646e740879d03ff49d602866745281b399b438652a77449168e2c,True,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_failed,14b8e0894a75f2ea745a311667f17a89c13680b1111b63bd3548f6dafedf1d13,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea,Tests_passed,da61b44df8f1e808a85392de9d29d355d1b6cf4bb7949c57a90f78f081071cea 78,refs/heads/develop,9ffe29e39564e95606ae3c4148f1ee599a49ddbb,1749b65c77b80e7404e1e6981bde2ecd99b1321b,5b968a3180855926cbcb65c881142b21214388af,,True,True,True,578,879,50725.0,2,True,578,Tests_passed,ac421c34e07d03f36c4c35a0c7d0a78aebf55c530fb3767467ba1bf1937532ad,True,Tests_passed,37a477fdb454cf7e1dff423f850089c06e9fd6115089b38b568c3620b3ca4e63,True,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_failed,68b5b514ce699c3e06a10dbf4156b075b443bce002140a1487a0508e8a85d18a,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6,Tests_passed,46c3ee258d3908841eff5248fc3369f745ccd9c8c68b205d765f22dd794395f6 diff --git a/results/reaper/merges_tested/openpnp/openpnp.csv b/results/reaper/merges_tested/openpnp/openpnp.csv index cfd4879797..13b5e076a4 100644 --- a/results/reaper/merges_tested/openpnp/openpnp.csv +++ b/results/reaper/merges_tested/openpnp/openpnp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 61,refs/heads/develop,af43024e03f6d9e98c738cff8fb1424be52c487b,adee9594a676ec7a47c34de8056a713149e6e33c,084177cacd8343ff532457004e5bf6c164727263,,True,True,Tests_passed,c3afdca741bce5866a79690ce4d8914201d34b0625f0c2d22f5eed42e538183f,True,215,1710,28083.0,2,True,Tests_passed,f385dd719617c34362f988f8e5f88805f531700ddc01816d4f8e20d9ccd8dac2,True,215,True,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180,Tests_passed,4ca7b649219f1d1dbea49a3d207051925873d681f098d0be9b7f56f4f214a180 122,refs/heads/develop,96da33ece857ce8c9c2b8ff013e4781c0f03069b,8b23322749545b793ae1365f54d28ecff18ed5e6,9a14b2d053a22939b3cb66c73ff18ac6dd5344b3,,True,True,Tests_passed,ee355dfb007c1068ab1d2b8ce161e057a74e999a694798ffe7b3ae1c038c9826,True,16,162,1256.0,2,True,Tests_passed,8671d5dac4bb3ba4c6c6727f6bb0d0de4c0ae5577b66c3603048da0414e679b3,True,16,True,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936,Tests_passed,6a9297b12faf30fb6b2a33d1bd7c0d2f0794d4d76f00d0a6d6acc83b2e7f4936 132,refs/heads/develop,fe999d4f63e21efa1eb2d4537ec9ed1ae0c1105a,fc5da2e2215cf837bc8aaaacff852fe9b07fcd6c,478c53786e60e90cdc91f14b92bbed36b6e6598b,,True,True,Tests_passed,2c2adefb2c8a8a1352db4e878208590188fd18c195fe3dd2b2d66029fca4b83d,True,118,710,16968.0,2,True,Tests_passed,d473ee0568b6762e359a6fc396ffd62a0e1756d787985a99ba946969490a74fc,True,118,True,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_failed,8c687ac680ea4428295bae9838618a7f6e6069649304bfc31233c2e57660b6ad,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890,Tests_passed,a7d9994d12ff0d0ff85d698b979be492cb679ad8b7e8f97c06137867f0256890 diff --git a/results/reaper/merges_tested/openrefine/openrefine.csv b/results/reaper/merges_tested/openrefine/openrefine.csv index 5debd6dc76..1ab52fa822 100644 --- a/results/reaper/merges_tested/openrefine/openrefine.csv +++ b/results/reaper/merges_tested/openrefine/openrefine.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 306,refs/heads/master,348d82d13191514da07309d5bd899ba60b7e4b63,b593306d1c62851d9e89d5ecb906c1c9e02a565e,1bb9e8a67ee4d70e1ded83fa4f60b591c3e09867,,True,True,True,78,219,871.0,2,True,78,Tests_passed,879b8852abc5858f9537f0b564ca7f6391708d9d99c8da9f396ef908ebe6e1d3,True,Tests_passed,6e7b44632f81e233ff16539adc82eb66b09e7a12d8590b3b8edfde571fa19909,True,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_failed,cf8a5c2e49c6d107b2721643931fc5bb9bd3a2c5c92da7e9c26b1128e2b513f1,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d,Tests_passed,25a56f6e128d80d8e74269324c193286e1091eff5b966a3fcb1cc3a4116bed2d diff --git a/results/reaper/merges_tested/openskynetwork/java-adsb.csv b/results/reaper/merges_tested/openskynetwork/java-adsb.csv index e79e3108e5..6ada7e44ee 100644 --- a/results/reaper/merges_tested/openskynetwork/java-adsb.csv +++ b/results/reaper/merges_tested/openskynetwork/java-adsb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,8bdd94b1653f06e87c6a9b018030d8abf5074d15,439be26d10a24cbc594e9fe07b6814b64e06c8fc,a907f893c15773ff3c6768aee25d56f2cdb3f9f1,,True,True,True,36,98,808,8,True,36,Tests_passed,0c567cc29355a1c43b9cd93955d8b00540525a7a86ddecfb24330fbf54929b70,True,Tests_passed,88b5f8e79ecbb7cb647580db4031d5282f62cb45a74bbcbe3596e57e417f9aa4,True,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,2596a6ebe3a8cebfef2a70db73690500a448b17501aed9c3b8844e4495a54306,Tests_failed,6e6c24b907053dbdec6f3fd16a432f3768d0f90a08440cc8bc057881825e5bd6,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,2596a6ebe3a8cebfef2a70db73690500a448b17501aed9c3b8844e4495a54306,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2,Tests_passed,5888d0c7977d9d181afd1472c1c68f0c562f26582eca0bd48b40d98143d2a7b2 16,refs/heads/master,14f216cddfb325156ee31a3fdebdeadf3e6944fb,85a0255b0de8eb3eaecf8058c285313af1886256,7c4f90789ede736fdbd1161f70f46cdc273a7c89,,True,True,True,11,43,355,2,True,12,Tests_passed,5b84b99a1e9525efb6e40415bccafa20284cf7a1fe4598af00333746305f9577,True,Tests_passed,dbdfe4bf301423794f02465c1e7385409e31266d796b0d961234afd94721643d,True,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_failed,44f063fb6bca23734a967888a5c4a45d823bac13b138f8f2da529ea3dcc33a69,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Merge_failed,eedde221ca64048501d82a274be7bb67e0f3331a527ce15b06ee06a325297a04,Tests_passed,cceb6824aa512ade9b4790bc0ffb1ff61ecf449619ca7fe9d51d7a971502e74e,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17,Tests_passed,92e6ce1723e5600344cf0f8d0445b84a752d36062954b40000501188834bdf17 19,refs/heads/master,8edb263ab2c4a303d3101d328ad1722d44954f64,278f630827cb2bc85a09a46fa6fb138059b39433,cfceffb5a63862428fbc5e194426ee6278c92ebb,,True,True,True,8,20,88,2,True,8,Tests_passed,e1a74a77a9f648bc404072113e1dd329ade4b640b9b2077f7e10ccd456c95a29,True,Tests_passed,d305ceeb4afd075c2cfd9cb7cb4c77f200fed743a720d8472b129734c769224c,True,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,a6b7e0e2d601980d65f6c8acef0f92b55f76615d540bea1b09a6312ffb50f1a7,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,a6b7e0e2d601980d65f6c8acef0f92b55f76615d540bea1b09a6312ffb50f1a7,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb,Tests_passed,f9180eec2d57e73d25adb9b46eb7714555c290601109cac9fb52e7513875d6fb diff --git a/results/reaper/merges_tested/opentosca/container.csv b/results/reaper/merges_tested/opentosca/container.csv index 18f3844176..cbbb2bfc89 100644 --- a/results/reaper/merges_tested/opentosca/container.csv +++ b/results/reaper/merges_tested/opentosca/container.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 239,refs/remotes/origin/pull/244,30001f0c79a805508ece1e8b4deb3a9549dbd874,4c4e1574aacb70be6e5922a12fc02095ad5766b4,49141fabc37abd62d5f1b439a33bb75e9438f4d4,,True,True,True,32,254,784,2,True,32,Tests_passed,21f0355ae28b03492dddc447cd5881d288a62bc8adda897b8a8dedec655dec4f,True,Tests_passed,33e7068776c823b3971dd81fb0053a73fa2f7799aef3ac5f14d9d7b3784d59a1,True,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_failed,b4da6547aa2c9c76294f86f6d2cb98a174be920d5493842df60d89d120a873b2,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202,Tests_passed,8944fc287a6938958184939f7ac103c2832c3cf9caeecf7bb203e13c09557202 241,refs/remotes/origin/pull/244,6b594e8970fa00400d0566a726502e3a846316e5,e608f9d07a964a909b8e6b5a2faf1c30c9721ab3,1d39227de59bd722cd32225585c956f6d38b578e,,True,True,True,116,603,6024,6,True,116,Tests_passed,535f707410389f1def5067ca037dce243dbf44c39729688869fc3958945c2971,True,Tests_passed,fec642fa5972d4d71a57c31be3c6b7df2f8cac38714ddd6de021aa2302514f3e,True,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,2e6baf7684fe802a12668a91e612115ce3579c5555551598a0693dc8aa130f3e,Merge_failed,3efad1dd28d94bc3c45bd890ed5b989d469d37564d361d648da3f6a7c49cdcb4,Merge_failed,54b32bb647973025e918659b2279dd12d56a40d6c367f6802e2ff1a4cae7a7d9,Merge_failed,54b32bb647973025e918659b2279dd12d56a40d6c367f6802e2ff1a4cae7a7d9,Merge_failed,3efad1dd28d94bc3c45bd890ed5b989d469d37564d361d648da3f6a7c49cdcb4,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,42df359c1b39a9d6c67e101f061ffb084f9633f4d197fda9f8d367427510a107,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065,Merge_failed,64d25db3c0ab03c0e51cffd1c44744388d8c46be0596c629d75a66b0499c6065 244,refs/remotes/origin/pull/244,72249e5742cba06d1bbc6d1b566f4e0ccc36d044,e6b148878e35eadef61af10b02da335311ecacfa,eeceb63e333e12fabe108a44c3e105d0a5121355,,True,True,True,190,754,11367,12,True,190,Tests_passed,4a7deec2ed96fa9d955327f3bfb97ffab2f30f6749c32a01f208f06358409022,True,Tests_passed,57a575ff7f091308d7a0718d18c4af631d749bfc972dbedbf4fd8c3b204b1bed,True,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,5da4f103dd992afca8faee516a7e69f6f89d7452f2b40e324c2e077564e83cda,Merge_failed,2ea2c39683c383b14e7995338599dbb2bac9924b4d156271c8e9f4396cfe5bc9,Merge_failed,3b6a0e8e8f8cbf6fc77bb2bce8e3af5de56cdea8574a2b570c460ff01f804e29,Merge_timedout,,Merge_failed,2ea2c39683c383b14e7995338599dbb2bac9924b4d156271c8e9f4396cfe5bc9,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,890d4264d758efc31f5c5d82db858820bf639fbed3110af36afc091b012c665d,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,1b34016b12cda84993b5ff02da13daaa9bb23cbc43eaa1a35361cbeb9b12e86a,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3,Merge_failed,c870375741f5f275953d3975532aac53854a569b6b0ebbbfe11aae93ef37bbb3 diff --git a/results/reaper/merges_tested/ops4j/org.ops4j.pax.swissbox.csv b/results/reaper/merges_tested/ops4j/org.ops4j.pax.swissbox.csv index ac28101781..5712daa2f7 100644 --- a/results/reaper/merges_tested/ops4j/org.ops4j.pax.swissbox.csv +++ b/results/reaper/merges_tested/ops4j/org.ops4j.pax.swissbox.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,22aec8b7af2d3e207cd3db06e71a7ed130c1ab49,a4a563b9b8227e617f88e56fd9219562caf81d70,916b285f03483c22cf58b7efaffac807259bfaf8,,True,False,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,True,2,2,4,2,True,Tests_passed,ba04c9d476f7f588f34a228312991b3c38ba4d1fb01fb50b5a9c6117bcc959ba,True,2,True,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,1ffbdd50a6bd0e42dc6937192d055a0b09fb70b2cfb1ad6cc52e7a69ae5eebaa,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,dd6ac8bdd3e3f7f959a372421c972a664fcf0072b03605799779d6f4cc345f17,Tests_passed,b9b3c94942084611189d67664c6f753feb215aa767f7e16b3ca541d1145779c7,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,24646093a47b9021c9974ebd29f8440855f8f21a913b87f18030c6050c7cde15,Tests_passed,99aa9d92eea07a367f4d3bf45508da0811a6e43ccc2c0508066354d2832ce861,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Tests_passed,2fef533f8f6f22244bd9b2d856724a327691baf09f91252758e99bc5ab86a452,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02,Merge_failed,ef962a6121ce6ee279d6b108f65c5fef39325c47db68a2003b1e8d80fd677b02 diff --git a/results/reaper/merges_tested/optimaize/language-detector.csv b/results/reaper/merges_tested/optimaize/language-detector.csv index d8ff67a83a..448fd45094 100644 --- a/results/reaper/merges_tested/optimaize/language-detector.csv +++ b/results/reaper/merges_tested/optimaize/language-detector.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,3420609a2503b56ec82d0ef6fa3b3b642111b55f,a588b7fbac2d321697f16815c2dd4fc6f1d686e4,cbecb11909365f6e999af39554e7af855d2bd1db,,True,True,Tests_passed,ce93c25b2e4b3f8d75011a0bef34e185a07a33c3bd2e8db5b78d7d80db5eea1e,True,3,7,21,2,True,Tests_passed,184934be0ba8bc2c54ef413acece0a5ff82ba2413cb2ec7c4301a14d897f732b,True,3,True,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_failed,9e78fa51a76d364e5ddfe3ee0377575ebb3cd7681192aa7174c75ed7a3e085ac,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,28a0c797ce78fa6f53e3a44c2ccfd996ca133d23299295e355f34e9326ec388f,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,65ff5daddafb771a1b43dc43bfdadebe94e694f7369903d0dbba221c1f272c7d,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73,Tests_passed,ac593bc61158cb4eacc1a03cdce4f85a074c086c5593109be8cf31b3796def73 diff --git a/results/reaper/merges_tested/orctom/was-maven-plugin.csv b/results/reaper/merges_tested/orctom/was-maven-plugin.csv index e64fb57e79..fa94990656 100644 --- a/results/reaper/merges_tested/orctom/was-maven-plugin.csv +++ b/results/reaper/merges_tested/orctom/was-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,98acec132ed7b3670db4c82820dcf584e9f83354,b3267ad21ed199e657a05671480240e748357c36,81477d902b56176c611dadb875ce5da8c01fdad6,,True,True,True,6,10,46,3,True,7,Tests_passed,29ef75aca47fe40811cd701b950dbf21975fdf682988feed5df5e90df1da8ec9,True,Tests_passed,3c3fe5a0e154f90251e15a2ac8600ce8fa979ff2a18f54bd6a5f2e15d3a6b7e2,True,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_failed,3f7c5b3d05cc5d98abbaa1c5e1e35887b2114eea80f040f771dad6de7b342f66,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,e7b54927ae024ef479c589935baf65454614260e8d7592fc2401f341bec3783d,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4,Tests_passed,f58c490ef7c14c8302d543ef8b3b47706992aeb899d1966aadf58716c0fd16e4 diff --git a/results/reaper/merges_tested/orien/bean-matchers.csv b/results/reaper/merges_tested/orien/bean-matchers.csv index 6bb2005f58..53aa9dbbe8 100644 --- a/results/reaper/merges_tested/orien/bean-matchers.csv +++ b/results/reaper/merges_tested/orien/bean-matchers.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/main,258563a1b3e3ecac55c4d8c38742eaa1c019b7db,2eb1107603f2ee1ed902aa2874df09d30758f908,4280131224e1d2701288f3ca59413a17731fe2b4,,True,True,True,104,531,7572,2,True,104,Tests_passed,44c4c4811c450da3b46bcc1e8b8251da13e9f5ddb4c445f410023130bc1c5584,True,Tests_passed,b074acc1c25939184f4f865ca7f56e59e25cefeda93d825ba58594e10fcc6867,True,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,82ade3854741c5793fe8855d75445b78b7e86663824889fa0a976033690a71a8,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Tests_failed,5a9d0ab01fb697985acb74aad9aef48106a294a310e1ac8e37b90c59aecaa1f5,Merge_failed,937c797414b17b74df876f9c1cb7986aa6b9ab6584ce7be592be418b50565d6e,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,5c387c3430117bbbed6090232694466f91039f664d5821d060740ee4fc678332,Merge_failed,a7901b74b8ce22beda8e51ce19c00978ddbde32fd4ef1dedac2bfdace48952a9,Tests_passed,1d49178cf17c94e783f7ecf64f7270eff7e1e624636ad9295a697a049412308a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,b2a87ad6168b8445deabe7251e5c9aa028685893e23ba2e39118938f90861297,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a,Merge_failed,dd79d1503e681e3bdd202ba4ef2eef5012d993eda635a57430ecb5431af97f1a diff --git a/results/reaper/merges_tested/orientechnologies/orientdb-etl.csv b/results/reaper/merges_tested/orientechnologies/orientdb-etl.csv index f706d2c1dd..1255341171 100644 --- a/results/reaper/merges_tested/orientechnologies/orientdb-etl.csv +++ b/results/reaper/merges_tested/orientechnologies/orientdb-etl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,889e65b57d07559f507bcef0e966f6f0612ae9dd,976e3dfeee348acdffb27f3ff0f405aa4aa91891,9a1e630ba893b0fdbe95839bda9238cd89bd2183,,True,True,True,54,239,1446,6,True,54,Tests_passed,41176f373379e6bb5255cc76c94cc131f7189ac76923a9f81418c20c784c3554,True,Tests_passed,106bf5a5477aa831b6d33829c9d4386da75f4959f2b72ff88ac2dda1c8042091,True,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,84259afd6e1fcf518889a029081782fef076cc82dd3ef04413266db1dae47516,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,2d04a3d9f05acb902530173e5d110e1c1a4fcc5d8c38576d39d483b80f60a979,Merge_failed,7bf27dddb965a28a12db02a0d512c9c7ade248c8264cea9e7968c6564d40af93,Merge_failed,d23d1518b7571377af4597aa580a1d44c81b54f1cae7ae526dc8c2ddf3621ca7,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,ffefae6e4f4496bdcc1a78bef896526939f9e99c36b812c71c9252c8dc135fa2,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,f41a3486cd61723b49ffa6955410f858004d25aeabda48c5ba9ae41cc305af7c,Merge_failed,92d0f5bbd234bedd2378c3da44cdef362ee6bf07a067bbeccf5fb1c2a0fde9a3,Merge_failed,bb7b9af8104df1f26d1a84433a71505eeca7148598f922e1838de9cc74c10f7a,Merge_failed,dee094f30cc43cdf7d91b03865d5ed6fd94a6bdc7dc936e579f03fe248f57fbd,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,086e0e59eef7c6f03c6e74368225d1aad7172d4acfccba396538dd1e97932aeb,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587,Merge_failed,acc7dd7d817942ad8c4ebaeef74426870a5e77ca4527ca895e36c3d0cf4bf587 diff --git a/results/reaper/merges_tested/oripa/oripa.csv b/results/reaper/merges_tested/oripa/oripa.csv index f07e9ff3ee..1dc369e81d 100644 --- a/results/reaper/merges_tested/oripa/oripa.csv +++ b/results/reaper/merges_tested/oripa/oripa.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,25e1fea57c97de9aa64f142cda6b22ed297dbc41,930f2deaaafe7efcf267b3f7e852b6d5ac1bbf7f,82115e639094e2344560ce153a01db190704cc2e,,True,True,True,18,39,428,2,True,18,Tests_passed,c6e140ef4dd3f47fbc5c3996d529e906ab6026b45e597f582094faaf6af31e9b,True,Tests_passed,d4e91e2455f29039364addf890e824c193b4044c28826cef1a358adf584867cd,True,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_failed,56f0eab00643b7e552219250878f7b0e27f083619719c9d7c3aefee17e7a935c,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,bc1f9fe88af54f8aa258f1de4ef83945037d0193a258bb09384dbf385ae24ab4,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d,Tests_passed,7eb93a58b5d475ad86efdd10ce09b327bfdced3ad4d02f31f20b80a465170a6d 106,refs/heads/master,9a817debf28a9a80e30e13a98e48228677064a5f,5b02f77e77d24ed4c753eeeaafd90838ee260a4f,c4d4fc9fdbe7dc57863b2af09ca27777e088a7c3,,True,True,True,16,75,969,4,True,16,Tests_passed,ab489302d5a67770eeca17457571d6e81f70ec1aa93e5032909c8b30bc049a41,True,Tests_passed,bbb50f0450846e5816b631f2ddcb2cd7b0b014e820fdeddbc290b4f84fed9976,True,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,81685f35db34521e2d3cf532319d531af7192d03276f6b16b6501d9d84de2a86,Tests_failed,749f8c123a94af2366612a81abbe79717bb93fb673bd76f606ab29e558286046,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,81685f35db34521e2d3cf532319d531af7192d03276f6b16b6501d9d84de2a86,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030,Tests_passed,32fa439e304f3a295e50792e3f79834e61327147f02420077e48e57720524030 109,refs/heads/master,e0268dcf2e78431e371462f859ec6accd83ec4c2,4b57dd073c53b3a3ed02207b7c8b5e23b4a70b61,9c7f552dca1ed46138830f139a2742541d190059,,True,True,True,5,20,84,2,True,5,Tests_passed,2a5b19bfc40098aab5d17482374bbe8b419ef779db7309ae0e0307fa254b25a0,True,Tests_passed,0d5852a535c001eea32f86ac06d144fd0c49cda2477b91947b9456791302ec15,True,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,4f4ecbf95788cf14bea7c919adb52635bd4033fd61c371de8c900309ce1738dc,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,4f4ecbf95788cf14bea7c919adb52635bd4033fd61c371de8c900309ce1738dc,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3,Tests_passed,51ec11734a2670e48e3e18d306a48faa60b0bda12fe48ad6b0f790f0ff0354c3 diff --git a/results/reaper/merges_tested/oskopek/javaanpr.csv b/results/reaper/merges_tested/oskopek/javaanpr.csv index 61bff431b8..b33232d30e 100644 --- a/results/reaper/merges_tested/oskopek/javaanpr.csv +++ b/results/reaper/merges_tested/oskopek/javaanpr.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,d8e3efe215d03370603b5f74c2cde7761bda9eec,8738dcd19876a92ef2f84746471bd9df055ed0c8,6f1735d0c9d701c91cbf76ced9f2ebdd211ab8ed,,True,True,True,14,89,663,2,True,14,Tests_passed,2ebc928da4059bbb6123846d0c5a53eb9a351bcbe3a3c275da92b883bf88450b,True,Tests_passed,5d84845fc36fb3b254ef9317230a76e3260857a09fbd8f445e49ec9b5e3b40f1,True,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,de677c57f8faedfa60a9c8c5c1009a1b0cd7c65d0bc7bbf5f4977d77a31af2df,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,07ef5c870a0364d195ebeea99362bc7bfac27a9cb4d11cccf96deeac869a9471,Tests_failed,77f501577b0edd36e02bbd6de7238883e7db3a3827eacc620903daa5ca71afe8,Tests_passed,e35882b28b0560fcb1d82c928c487c1abdf3daa135199ff07a22d76b47e85b0c,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,a93ead2adbd6e5d6fbde24cb9e0abbc8f70d1d0d0519afd2897e111a2938536f,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe,Merge_failed,70bb1699ed42d517f5db2ed7c657c5868216f867e14d541e6c1577d5d4d8c0fe diff --git a/results/reaper/merges_tested/outbrain/ob1k.csv b/results/reaper/merges_tested/outbrain/ob1k.csv index 8fc377b847..2c5b46c1c1 100644 --- a/results/reaper/merges_tested/outbrain/ob1k.csv +++ b/results/reaper/merges_tested/outbrain/ob1k.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 65,refs/heads/master,8b2c257efe1aa01d49cc595d4af6f8d386d9b535,95c48c0fde2cbf37c4f074a0f38201acd2c7eae2,59da0517716f701678301ecb4cdb88f7046c8d26,,True,True,True,78,128,1869,2,True,78,Tests_passed,f145b2ae80a7ea5341bcb8457cd401440a0ff2199a11922d2a1341dcb7cd270d,True,Tests_passed,a6a20fdb76c4dd47788113f767bd7d533858319364d44fda4211f89eca78d96d,True,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,460c06e1d80c310d8283982ab2e16bcdbe37306d56ab7682870a5938fad5d53b,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,4d69243853cd7bb4a39daa9eed68b1dec4c9b7e4e3dfc5541fe8ea0111c142d1,Tests_passed,af6e334697c3e77133797e9fadd6c202818a0d2a46b0c5e0719358e47afcd99c,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,671f7d6437a497c032f83eb4ef323b572bd56c875af67d57659bfc9a22e8f74c,Tests_passed,f2cbd7efbb9cfa3fc35b0adb9fc88939a36d7efab90daf83bd40f443f41964a2,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651,Merge_failed,c8a6daef5aa92dd7be5db2094d72fa7dd7338a227ad3136448cb8ddf85fed651 80,refs/heads/master,2f4556b9770ad12dbf1ed15974eca509fd9fa1a3,86f08edf79a3939db96b71b87913c340cb7ca581,29b4ce17dda3c7ce2722402d193e040292c323b3,,True,True,True,15,16,55,2,True,15,Tests_passed,7a4d8011a037cc69da5abbfcd51de68d7d5dd32398631057603bfbe3564f863a,True,Tests_passed,84be1e81989202e76e3f284b6f0c57e21626943a2c53e280740ea4918e52a7b4,True,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,b0b969f3d931457033cbb319c220f58ee0fcac4058901c0f5bee7589dc866e6a,Merge_failed,374b1e409556b2885a479706b38d8bdea9e85a99bf3bf5138e4eb39f94e2dd18,Tests_passed,9ef38735225c4b813fc8ab4c7caecc64540c6f58dd4272cdc21a774c0aa24fe2,Tests_failed,6b44b0920e6b9dd5eeebdf5e4e030ce41c3d172079f45e7e28561b32ff765d12,Merge_failed,374b1e409556b2885a479706b38d8bdea9e85a99bf3bf5138e4eb39f94e2dd18,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,afd686a4ee914ebcc92cc14fa9e9046354f327dcff190aa23521536c58e739d6,Tests_passed,9ef38735225c4b813fc8ab4c7caecc64540c6f58dd4272cdc21a774c0aa24fe2,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,ee6b6f68045a4bd52c04cef8857c485c67649e8de27914aeed680315edbf2088,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658,Merge_failed,82cf205c12ab0903f0f082b25ba7a6b3e9e46ac2c725ef9e0e0befefa9539658 148,refs/remotes/origin/async-http-client,3f7bdcaadc669ba2d14a424104ee4e09433edf88,95b959c0c8278609a3df395ed2fabed9ee3fadd8,0b8d271b5b6a8f809c1ecf6283d9b4c431c645ce,,True,True,True,33,170,489,8,True,33,Tests_passed,d8b8c49fe3772e8c4ef43fc7469fa5b6e98ded243d2d10d462284d157af02229,True,Tests_passed,a594bad429bd8edb90b62993736c17e4c639d317bd57ac5076fe7fb561abaad1,True,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,37eda9f45b6715a56a7126f7de8e66f5bc95124134feae98260cef2385070a3b,Merge_failed,be94983a5c1f458f20a36af90362231c46c34d92082ecfbbf99eb70c7ebcb4df,Merge_failed,236b1617eeb64bde13182ba7bae0e3b0df320bddb5c7d4b5a2ca9616533460a6,Merge_failed,28a29bb408cf64d9a5c0c99bc5f1f466423999e72092fa08c86c2c01ad3c477b,Merge_failed,be94983a5c1f458f20a36af90362231c46c34d92082ecfbbf99eb70c7ebcb4df,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,853fb9877879f7771dd50f764d8e47df296f8a98bc3e4d47a5790edbd219c448,Merge_failed,4bf0ede311816d9393c37411afb734bfea59b86ff19cd6f5d92d64caaaf694a0,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3,Merge_failed,587d12106814bb97a3ed3b3a948a117c3f67219bcbce21bb18af44f274b21cc3 diff --git a/results/reaper/merges_tested/overturetool/overture.csv b/results/reaper/merges_tested/overturetool/overture.csv index 09310019a9..539fa964c9 100644 --- a/results/reaper/merges_tested/overturetool/overture.csv +++ b/results/reaper/merges_tested/overturetool/overture.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/development,183044a608970fa550c097fdd98216a182cc895d,e26838e2314cf90205c0a7ce585ff32e36e094c7,b74341db16ec8531f59a05cf585979e5fee8787f,,True,True,Tests_passed,d858bc6f5d2452adc0be0ae78cde16890176b452dd14798e88f6cb5f6c4de24f,True,158,1228,4154.0,11,True,Tests_passed,45a87b3dfd9994dafc029a2f3e20f0f9042725ff9f06e5d3b283fb6260ff2feb,True,158,True,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_failed,93de5cf77822d18faeaec1579494ef7bc9d4c588bd999f4fc2b9b6588b43d4af,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6,Tests_passed,bf9bc5819c1f17e960f7abe315e6ded5c10420d4d59f29080628497dc70771f6 33,refs/heads/development,66b1773e9f54abbebf3eb68880b5ee56c1061754,abc402180c032650443c90d80aaf254d5f5ba77e,20a2fa19360ff2c8d62ec2cb2ce69202a1d15d91,,True,True,Tests_passed,a34202484a69490673b695c9c77e50e417993e38eceff7c13ea55631bfb51845,True,47,207,1874.0,2,True,Tests_passed,f8a9ccfa69543bb75027f7bd52a581b5f83189e5ae0f7359841489cf7f05534d,True,47,True,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_failed,14c06680c7885da24f06340cf927f3508f8d96ac0ffd609fc8429c45fe538f05,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,a40293cbb828c5ab25672ba3b278c026ea8fa02358e55f92fad6b6d6c1e249d4,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a,Tests_passed,27c7f7ddbb5a4ed9d37062fd4d2fa63b87ca6b9d311f6faf08907ee5637e0e3a 93,refs/heads/development,bffba8bbaba72042e85c88e333720221b2d54250,0af3ceb006f531b6247af4f3ef1ae87bba9f3979,e52f643de4a711770abcfc5e2a06954680263436,,True,True,Tests_passed,d5b6c45f50a6b9124d921068742744da27f6f356be52bf5797a8bab35b88070e,True,393,1006,7068.0,14,True,Tests_passed,79fa8b31bd7aef01f934bb07e5522d6473a9b1e5eb7aec7cb34270b38c2cd596,True,395,True,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,8bc95d240abe5413abf04a5c3cc009bc87026643d37c3c853cbdcbac9a2ffbc6,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,85cacce307ea32ed99bf676a20aa13c36932f667961af2c92659fa6583e63e38,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,ec3b71df219ffa9af2ffbaa730e84b5c4b01c2168348cb66f7cdee7402437e0d,Merge_failed,20369e3eb28208372a9ce8d46d6b60b92c5d0116910a87273cf855090a91dc14,Merge_failed,af0f4b90ae29792aa7020150a3f7755e97b2a7b8570b524aa07aa99f1bfacede,Merge_failed,af0f4b90ae29792aa7020150a3f7755e97b2a7b8570b524aa07aa99f1bfacede,Merge_failed,20369e3eb28208372a9ce8d46d6b60b92c5d0116910a87273cf855090a91dc14,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,85cacce307ea32ed99bf676a20aa13c36932f667961af2c92659fa6583e63e38,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,e26e68525ee3e9d0c6c0e5f896d5a814125d47e36a1436767af9979ab282b99a,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,dfe9a4d699722abeb2f08540a7e1f4f178fad7fdd6a4fd1abaddf11e75dc0357,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,8bc95d240abe5413abf04a5c3cc009bc87026643d37c3c853cbdcbac9a2ffbc6,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683,Merge_failed,96695d4a97a19c9dafb4b80b6bb5d96eda49f4148fbbb89674632595f7b22683 diff --git a/results/reaper/merges_tested/oxo42/stateless4j.csv b/results/reaper/merges_tested/oxo42/stateless4j.csv index bec54f0c64..9b550dceb5 100644 --- a/results/reaper/merges_tested/oxo42/stateless4j.csv +++ b/results/reaper/merges_tested/oxo42/stateless4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c3e521ee3857f94babe0ffe5e8e18960dd2ac186,5d313e686e2da849af39f6b7f377ce06dc30458f,099b8361e58c1f07169332aef84b9f049bde2efe,,True,True,True,31,123,1592,6,True,31,Tests_passed,25837c3c87b90a0ef03cec3d6d84282a62157f76ae1cd646fdf77a3789f3d421,True,Tests_passed,dac8464e052058132ff9939d1004fa072b9baeb21af0de8c5c32fdfda9be9fde,True,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,44d95424ff8511050bc064ebacb2eb9ed4b7c09cea5373d3c70d3af98d83ec90,Merge_failed,867df1b0425255f5c6c88b37f2437b15bbfb27b6b8f69521354c90f639c2b076,Merge_failed,6a21a778905551af1a1fd5dc2b81bb896fceef1b8249e0184322967c530caf49,Merge_failed,b1d92d873f7e2193adab044ee447f40cd972199c2acd78cddf6ae043f47edcea,Merge_failed,867df1b0425255f5c6c88b37f2437b15bbfb27b6b8f69521354c90f639c2b076,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,f16e219c80fc258aca80f45223f69a98f1b685de891f17ad5fafc5dd6622bcfd,Merge_failed,b544af7f7a03ecc483bff457a6621e9d4f276aab479a46c91ce682cdc19baa8c,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,c8ffe754ad4faff49d1e751e3a31c877607f81d5a63b67fd5c2c6187936a6e22,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd,Merge_failed,0c109e163601ad8f5d4e2585b6f1a297796bca66dc84e9b8b55a1a884032a0dd 2,refs/heads/master,7024c77da6e879210442dfc38327f1aac8d00916,57c2134c01d9d66e19410f0322c8ca9a9f362ca5,6b6dd4a788a4eb9d3e0542634cf1fc587d1fb58b,,True,True,True,26,95,1316,3,True,26,Tests_passed,c892f00d53dd4912601be5883ccc7fe003935a44842ff932d18d3dc04e919c09,True,Tests_passed,5f23ce7410ccecc5c86db3beee1764ef814b107abe899af96c8e446eb23d936f,True,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,f27ed3b1992c9fdcb18968c4516d883587373285982a64d1058e357b00ca6727,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,0808ce0f2744120173ffb2a40826bb334aa123c2fb6adc4f797a4ae3694d5d7f,Merge_failed,5eb4a34884d70f2878ef098d850366a20886ba5962fb5e3cd1ef48dd64101b98,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,4a728de94f2a14c774db4bb052385064201d6b58a5bdbc75a676d962c4d0e52f,Merge_failed,eb33b87660fc4c4eb61964f8a89986a53b81af9fe35839ee49b5bbf23922cb43,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0,Merge_failed,9095b309d917f6c5c47ee716cf7977f605ec34549bfe0c27370c7eec1bb097a0 8,refs/heads/master,6440f4174babcdf18818382f948c6737881cca13,96f01f19ee01cd21c322c17521a95bc1e233e524,ec3b30f0990c51ba405736d8b794ed0567565422,,True,True,True,10,17,186,2,True,10,Tests_passed,b32e39f6b76dfd1e0e110bcc9e17fe64c4c3fbe91ee50fc39f18cca3cd55c205,True,Tests_passed,fe68224212a1c61d93a1c5f554fb9ec8cf9653017adc0797a37b08b17aae732c,True,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,f0559734e9755df0daecd06700b2200c5c1ead23e7f65a0368de88b95f55a3f9,Tests_failed,d07ef06967c970ce55631392e62bc656f8ddb1cacdde171a8947d70eaeb0a700,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,f0559734e9755df0daecd06700b2200c5c1ead23e7f65a0368de88b95f55a3f9,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,237165e659cc10fac6e34d0c24b0f0d34e1a0e028a61c4250572eeee8a00126c,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178,Tests_passed,ec096644dbaa0a6e839f5d6b9919078d5ab716a9c48d52b8dcda30bd6cac7178 diff --git a/results/reaper/merges_tested/pablissimo/sonartsplugin.csv b/results/reaper/merges_tested/pablissimo/sonartsplugin.csv index fffa70492f..760480dfa1 100644 --- a/results/reaper/merges_tested/pablissimo/sonartsplugin.csv +++ b/results/reaper/merges_tested/pablissimo/sonartsplugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,589137037749f47e451530cb13d43f497726d399,1f09a139f502474a87dc41a432a8f2f8ebd1c53f,b577ad7ed8578f40bfc37ac8ee3b455f36ca8396,,True,True,Tests_passed,26b44d8548052cd3e2f56763bb7546c0c1dc3b413f270de1e0d40d6f00568db2,True,11,41,185,2,True,Tests_passed,aa635581aae1790110be6498ef088ae7f9bc22c62dd9c4afe13cfa3b5575c11f,True,11,True,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,bc42d2a462396a492d3cac8e9a0942658ff33ee05db8842516e5ce1c80a96088,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,bc42d2a462396a492d3cac8e9a0942658ff33ee05db8842516e5ce1c80a96088,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b,Tests_passed,abe33388b6d8d816b3a068e372df664f33a5682ba5075378373e1e690399214b 4,refs/heads/master,b577ad7ed8578f40bfc37ac8ee3b455f36ca8396,fa1111336e72cc146977c4d0e71ed67508ad7200,b9320bbc7f6a3c9855069a5bbda3ece3dfd1a743,,True,True,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,True,17,60,159,2,True,Tests_passed,e665918514edc4e102e73846dd16bbe0f0c6961fe6979b439ec9da508c94e694,True,17,True,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,ac93bc58c25ea075b0cef8088004bd6d0a1215946910482999d407b931d36d50,Tests_passed,aa635581aae1790110be6498ef088ae7f9bc22c62dd9c4afe13cfa3b5575c11f,Tests_passed,afc12b05eaf1d40ed9ca0a3676e2d2558ce649c578c0f42a4245a3209e3c1d07,Tests_failed,a38607009cb2f894da0e754244dcef1750049d5e4815a7c6f03fe8ba55a31c9c,Tests_passed,aa635581aae1790110be6498ef088ae7f9bc22c62dd9c4afe13cfa3b5575c11f,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,f336020b2687ddc0880cba6acd5829dcb9519464d0bc28e4046f0d039d4cd6f3,Tests_passed,afc12b05eaf1d40ed9ca0a3676e2d2558ce649c578c0f42a4245a3209e3c1d07,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d,Merge_failed,a668b775f50cbab8f5c8eaffa86d4ea2797e8629b4c6ae044a0f4e58f1a3a55d 5,refs/heads/master,fa1111336e72cc146977c4d0e71ed67508ad7200,cfdb8aa0dde21dc4c72930180df192c0b17e2da2,106f19aa80e07eadd00058408025097f9cf2a049,,True,True,Tests_passed,c782e674844ca741d8cd025164a296c7bef12f2e6a380f003bb91835797651d3,True,3,59,136,2,True,Tests_passed,df305d0531c633179d0982aac824add0a5a02bfcd880f79ff1eea29a324e3fab,True,3,True,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,fbd9dbea85908fc3aa1f62aec9d709d1a76afd72e650d40b9f06c120f272c4aa,Tests_failed,e94445a4efba3cba5b0553c0f541f83e7b65c5f1a5bc253fe8469d1aeef1e2f9,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,fbd9dbea85908fc3aa1f62aec9d709d1a76afd72e650d40b9f06c120f272c4aa,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2,Tests_passed,cfcaf7be1781439a5eb1a74e18f134bbda3998d9e15246bc73933c7655f415b2 diff --git a/results/reaper/merges_tested/pandcorps/pandam.csv b/results/reaper/merges_tested/pandcorps/pandam.csv index 02d22bd906..2e21409526 100644 --- a/results/reaper/merges_tested/pandcorps/pandam.csv +++ b/results/reaper/merges_tested/pandcorps/pandam.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/remotes/origin/pull/4,e736609b61dd04e3f96861471d01ae60cc1a2a17,30964f94cc1b51cbcce298f904db4b8ffe4e4b92,75dbac355e592d1e833162770e5a10dcd855a6f7,,True,True,True,32,101,751,2,True,32,Tests_passed,4163be707dba47263e222b36826e25c78ec7591130d0e139cc7b76c376f2b871,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,True,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,a816d7ec410afca07fbd0cfbdcb7fbc8cad9132c27a2a60bcbbf0cad400d09ab,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451,Tests_passed,2de06af0797159b3a1e35f29f0e02ca5f3428a0f004c4a40d1ac48aaf5833451 diff --git a/results/reaper/merges_tested/pauloricardomg/cassandra-list-subranges.csv b/results/reaper/merges_tested/pauloricardomg/cassandra-list-subranges.csv index d9f42a7a71..35c5d2203a 100644 --- a/results/reaper/merges_tested/pauloricardomg/cassandra-list-subranges.csv +++ b/results/reaper/merges_tested/pauloricardomg/cassandra-list-subranges.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,3ce571f04ef9f3edd662c1de88ce5031fe700fd5,6d92e44549d058b29ab9d5364655d07ed522cbe1,0229efddf3f332210b4ca3f071e3d0d0160ba39a,,True,True,Tests_passed,28c8f53d23357fbb6114098f4789b14497f750ef57c8e179ffe9ff98c44e1961,True,2,9,26,2,True,Tests_passed,24b23da3ffa9aaca3c8f982daf70d7b1babe0d27de17607e60c692f678e2bd3f,True,2,True,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,e6d98aeeac9dd849c9f1f45486deff6283e81b825d61f1b8f84dabd38a38a499,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6,Tests_passed,9fae743706ae483889177dbecad5953a3059bd980da2df8de570afe9044725f6 diff --git a/results/reaper/merges_tested/paulosuzart/jtornado.csv b/results/reaper/merges_tested/paulosuzart/jtornado.csv index 9228098a59..e56d4d23d2 100644 --- a/results/reaper/merges_tested/paulosuzart/jtornado.csv +++ b/results/reaper/merges_tested/paulosuzart/jtornado.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,867caafa1ae38b42514802a7708dc1ce43fe1872,7a94ea1e15324a7528bf8872f84f3a6e7dce0776,9422d8460228615b9a4e005a44ee70d022eab1e4,,True,True,Tests_passed,b358d1ce828d23f153456f813d803d8aa09623189a62048585aeb9672dc3a69e,True,7,30,141,2,True,Tests_passed,f130c0df32080aabebad40e26baf48744fae4a52a7b0977fe19d17802b4aae97,True,7,True,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,7684dbead1bd3c6451eb96ae5472941d42b12d7957199c697c8e90fea6252dbc,Merge_failed,925e3baa4002f72319322a128e5d81ad5ed64af50e1ce40910d84b77c9ac3ff8,Tests_passed,f70a854d836417b0e5d9cd6b34f1bd2d2e1da8b82efbbc8e57389f8925c92d62,Tests_failed,c3e0b40da26dde63330ab7b263e4c67d9ef49b3105eda038c847b9f56f0973d5,Merge_failed,925e3baa4002f72319322a128e5d81ad5ed64af50e1ce40910d84b77c9ac3ff8,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,090b5407104432be14f166f4f06f7116989dc2a577d1d1dfb7a485eb0a7900f7,Tests_passed,f70a854d836417b0e5d9cd6b34f1bd2d2e1da8b82efbbc8e57389f8925c92d62,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b,Merge_failed,caa5687f334ec978c0075a3ab65a34054229f19085195174efa3f179a246e53b 3,refs/heads/master,9422d8460228615b9a4e005a44ee70d022eab1e4,cf843699996539a0fc61bdaa6854ff4f65ffabff,e6790e95d502a20445aad19b2770ff36ea365932,,True,False,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,True,4,18,74,2,True,Tests_passed,5d294e257ae9233daf5b86ddcae1d21da2ff5f30a14d8e0ac82af6b70328c26d,True,4,True,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,152a1d15a19594fc1752345a6912ab253d866815521d8a04586581eb62a3c5ae,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Tests_failed,243ec1745f6f7b66095c5d4bb23ebc3bfef88f519d3aa5ded383291d2938a942,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,d52f9cf5e948fe68f2b69efdca9505249236f1a6b1f0a61b1b88d785470ca287,Tests_passed,7fa46372771c1501c56236b25ebc8e9a1a9552e093807936e23f93d04a128753,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Tests_passed,c05082bbc464e4993ac5991dceb4def63cb6247417121ac9e9c8479ecbd5455d,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c,Merge_failed,b4d115067d496067a4528eb25c053572ce629f7074cc9a07c39f3612e8c6be6c 4,refs/heads/master,cf843699996539a0fc61bdaa6854ff4f65ffabff,752fdf5c715aa6e96a6cc74d876e2a7b83a91c2d,ca1ded879979e823de084d1c94e5b1058b933a44,,True,True,Tests_passed,733cee865831f53c4e7cc436ea96e6ff88c9511ec2ad1223e82da473e373e96b,True,5,14,105,2,True,Tests_passed,80d56a07132a954667de36ca8e9879877f3823d8e8af0bfbe92986adc12114ec,True,5,True,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,5f66f556d7b8096b92b87828fa004d6750998fbbb0e1450a0bcd2734ffbccfdf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,5f66f556d7b8096b92b87828fa004d6750998fbbb0e1450a0bcd2734ffbccfdf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,50139cc2044804514460464e257a6a9cb7ffec0ea1a8b7bda0794366f3bdcbbf,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682,Tests_passed,10b407a41eb08ab6dd3a71d31cd743630173fa1524d0de5591fab115ee94d682 diff --git a/results/reaper/merges_tested/pax95/camel-ironmq.csv b/results/reaper/merges_tested/pax95/camel-ironmq.csv index b8f2243914..c4431230c2 100644 --- a/results/reaper/merges_tested/pax95/camel-ironmq.csv +++ b/results/reaper/merges_tested/pax95/camel-ironmq.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,7b8e755aa410ddd2841a5471f78bf5256a647b76,99829bacd2e267749b108a0f43d791aff9c73961,2f1b5ad99c6b72f8e20e336c7d3dd2dc1b65abf2,,True,True,Tests_passed,e4f3b91ad8e832a90f5c2b0148860f7e21b51b0706800fc2741d9a5baaecdd36,True,22,111,665,8,True,Tests_passed,98bcac037fb4c79e39fa1777ec31e445378cbff424321345108d18c5f41bd722,True,24,True,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,52b5479eb7acce0e533ee45008c2270ae29371f4e989d8348f7b6a6a61a3dbf5,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,e058ee915396897c34c409293d8be54f2f52936fd2925fc9fd348f30f3660bfd,Merge_failed,8e5c76fd46add4ac468e9323562bcb40462ba2485ffb92079649c0bdf1a30df1,Merge_failed,e9651cc8f991456d3a80a85d61f4c994244724a3e7d8ed03e92c31a1782891e6,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,f45b48b537825a956fa8f0cea57a205ac866744b7feb2eacc1fb6a42330142c5,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,e504986054e31e6cb5ba37d1e8be18636e2319cf05569f3c8c8c24fcf44014b4,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,ed5b500682aabf20c025abe3b9971ba489058ea9f2a8a3d476f842cc1aebf25d,Merge_failed,b0a1e42726088f33da5d8a94e97ea89f889a48ca3bd0851589f7c63ecfec8d4c,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,05c7f6e40ffaadf8e9149a0a0582aa9a88ead6cfdf9610fd86db90ff770afc69,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a,Merge_failed,d8e5e1f68827d75fecc9ffa8d00ad0f67ff57742f0ee5a151bae393eca5cee7a diff --git a/results/reaper/merges_tested/pedrovgs/algorithms.csv b/results/reaper/merges_tested/pedrovgs/algorithms.csv index 18d9a30868..60ed7b7277 100644 --- a/results/reaper/merges_tested/pedrovgs/algorithms.csv +++ b/results/reaper/merges_tested/pedrovgs/algorithms.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,False,Tests_passed,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,True,2,20,219,3,True,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,True,3,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,b6c0da70d24e30bdadd393948d91c3d07b50a2c1af43ab2d6ff67bd2f372f3cf,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,963798546c8c846f2ad839e3d786c30a7fd48465c315804dacd9649a102e63ce,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7 19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,Tests_passed,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,True,3,10,78,4,True,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,True,4,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,0f989663818299a0c7aa64adc393891dae1962999465d1cf62fc88d3ba0b1cec,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4 diff --git a/results/reaper/merges_tested/peterisp/morphology.csv b/results/reaper/merges_tested/peterisp/morphology.csv index 921312fe6d..d24e0fb400 100644 --- a/results/reaper/merges_tested/peterisp/morphology.csv +++ b/results/reaper/merges_tested/peterisp/morphology.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,a6926c1c59e119a57a1b37a5a896bddb02cd5ef9,fc238776a6699ed0e57b7a2660b05020c80fb170,100aa04cee519d67271e308427467c03d852ad8c,,True,True,True,43,54928,556327,2,True,43,Tests_passed,86456b028f28be961d7e6ebeb547e6b33ffdf27b7d2f02f080b813d071368865,True,Tests_passed,11a7cb449fc3a5d86fc81f324fca40bef6f0fb929604e610fe2901494bd30dc8,True,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,916a4be8953444f0729c45dca965019d62680d6dbdc9352d3a1654092bc94c8d,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Tests_failed,294dcdd0ea20ee90f6227445b6b7f6127abbe02fcc3ca58106c7864b39b3387f,Merge_failed,0d9e22df099f79630af85c6b116c32d43941d0295fed09358edbc0ec3d22bd50,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,b5bb26ae93ba80cda112e7679e3da9000c8ad97a316596995b550be82dad685a,Merge_failed,a2e438dcfff267d45fc2b133dc1def46522ea9c90c170753fc3e152a8bb51df2,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,0a8b41929cb5755f0833b72b36400050e60f9e8c5a378c04c9753206831c86f8,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f,Merge_failed,edfe838bbb2b6d799f8bcf46a1a2e9ccbdd89aba29304f14a1f279e90dd1a59f 8,refs/heads/master,65286cd06540300489c1685f18339d2cd5627777,478610a255cc949b1677f191c12a8d9d8a4f0652,03e66473a31d8dd0d76b1f9c738d63e8da82896c,,True,True,True,10,629,221909,2,True,10,Tests_passed,0b023c0dff680a9a1e496cf47ae4c0bb676d726935a9e9a5b9f1b2c5e4ba3d8c,True,Tests_passed,e443ec3df2327f5fbc803f99ddffeb41df631ba8759454f7b1fb1b87a1b4ae96,True,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Merge_failed,f2a88004bd0814c7022a34aec3676c5b38b1582cd6ccb4c5c1344bc78ebe60d9,Tests_failed,4f03c8fa5ac38119068cf8005e10ec7e033f1c44d71bf28d3d2512b92f22c7a4,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Merge_failed,f2a88004bd0814c7022a34aec3676c5b38b1582cd6ccb4c5c1344bc78ebe60d9,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50,Tests_passed,5a631c81f838a75d59c07e6e7b5e0006b2a1e14b3ef9f2b9c8b213dc273eef50 13,refs/heads/master,7e42a617566d2cccfda07dce17d3d836196dbbf4,9131ae9f793e56c445dd8edb5695746b35498f19,efc39e6724353c0196af4ad1eb3bfbcfc1ef2f4b,,True,False,True,19,627,23005,5,True,20,Tests_passed,dbff3b928964cd359692856e9849e281e5483fa3975f4fa3546fc7597bd697cf,True,Tests_passed,a1fbe4c199ecb15cf1b76de1c14e40f9d49b1e07d14193f09c949d59cb9eb148,True,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,d73568106debf3a215092dbff3b3d605ba229bdb8515a04664db246c28cb60bc,Merge_failed,9b1fe11e51dc3b2de9c78e77308f58fb0a8ff8994f3bfc75c17b3578df657380,Tests_passed,9fa250d5929b36350cf2a34d1b0b88a8d46c88c3f32a1b6acb73b1ddb731599f,Merge_failed,1ec75fecfd46026a269e362f7aff8c90b43ad09b985e95ed74564947419dbbee,Merge_failed,9b1fe11e51dc3b2de9c78e77308f58fb0a8ff8994f3bfc75c17b3578df657380,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,6b32ce56b9a7bb9fa9d4c8099226ba24adf4c59e7875c81e99e552a303c30853,Tests_passed,9fa250d5929b36350cf2a34d1b0b88a8d46c88c3f32a1b6acb73b1ddb731599f,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6,Merge_failed,045fdf7c463620c5020a7f9a8d30684c90ae814c7fdd722e240925d973ee0db6 diff --git a/results/reaper/merges_tested/petitparser/java-petitparser.csv b/results/reaper/merges_tested/petitparser/java-petitparser.csv index dd05852a16..c9158bd89e 100644 --- a/results/reaper/merges_tested/petitparser/java-petitparser.csv +++ b/results/reaper/merges_tested/petitparser/java-petitparser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,True,5,13,32,3,True,5,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857 8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,True,18,89,800,5,True,19,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Tests_passed,6a90f4b7bc33e9f919ad85773990cabe2c91b61e9782786d2d7907fb2178e652,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7cb2ad7d0c4d0af9ef25a73048ab02b57b1fd70ae9f71c206f2d870e15bf7cf3,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504 diff --git a/results/reaper/merges_tested/phaed420/simpleclans.csv b/results/reaper/merges_tested/phaed420/simpleclans.csv index a9d1bc308c..5a2cb2829c 100644 --- a/results/reaper/merges_tested/phaed420/simpleclans.csv +++ b/results/reaper/merges_tested/phaed420/simpleclans.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 93,refs/remotes/origin/1.8,2244703564dec7ffa4bb40114daae24341080275,ff5157feef2adfbd33e9bd8b866b4c318e8e3290,68065a3b7988e6f0d393dc816784a3621d086302,,True,True,Tests_passed,c7232dcd30b73df118a42d7c2e87de55b3fedf04dfe5f0e238168dee1c36be80,True,31,140,540.0,15,True,Tests_passed,1b12986f72df4efaeb8dd9f8bd208c1f789fcf09e4f45a37ecc51e64607533eb,True,31,True,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,96cdfc0db7ea9d8ffeb41912f90839fae875c77493579b74f4f3a36b4e53dd5e,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,ba88f4c586ae15b3db26934c448f6a8f64259327378116ac6dae7290cb6e6ad0,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,95a329450c89a6c7e4a4011f0b31e197e50a1133a1d7396884d8ed51710e91ec,Merge_failed,2cc4b045bc08e5eddb77fd9e97320115616440642ea83d822a8e2e97fa58a63e,Merge_failed,42d007fb6451261df76a1ddb5ce916128fa158bc4ca9be09c32cde799431dfb4,Merge_failed,7aafa6d7547b2f0216f042bfa68ce767dcb28205b84e2934a9cd7f96640f1324,Merge_failed,2cc4b045bc08e5eddb77fd9e97320115616440642ea83d822a8e2e97fa58a63e,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,ba88f4c586ae15b3db26934c448f6a8f64259327378116ac6dae7290cb6e6ad0,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,c74f280b4d7e36a5247185fc7eab8bbe6a40cd20672576516be8642460caa9ba,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,3cff889dc935729764fb64410b45643af5188dae0ce22e5dca3c57511c0d3e48,Merge_failed,03275d0c2ffc63dbab0ed5a8a62d1e8dca0d45cc81dcb8d6a4d4cd5d5056c076,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,96cdfc0db7ea9d8ffeb41912f90839fae875c77493579b74f4f3a36b4e53dd5e,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d,Merge_failed,704d6028276021c148244e745ec357d9b58afcaf73d1eafdd359f4a20abab92d 111,refs/remotes/origin/pull/578,a30dbb49985fd1da095e49ef9afe95b8857d0377,b331e2c236735dc0d9497d8214b16debd4fd1b14,baf71a449293a07b34179e49ee0de1bc9e7c7928,,True,True,Tests_passed,762fe5002aa077cfcf3f7780ff3f95ed590c0badd0f944b35f16f72f73de587b,True,47,111,5000.0,8,True,Tests_passed,8406011eca89cd6e530fdc63cbf413e753335818655784ac102c4c6b3f2ff0c1,True,47,True,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,3af903d5c239a61ee36f060ede655ae558e8d2ddbc41abcdd24c3270bb79a3e3,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,141949ab537fc49e25b64d8a57da96a142796467dfe693500c4ceb91886279bd,Merge_failed,04d1a1250272a6a68becedd0cfc5f82698c6b24a4e313d24be3c535d5f7dd048,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,1638ca3869f7ac64df9aa9c53bc707cde74188ca272daa4ac3a7913f7a2852d2,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,7870fe3eb1156afc583bb9e6c173f59563ef47ba8648b431b9045ad036eb7a14,Merge_failed,f7cbaa9a555867a1df2d34ee5882b00de5514e410b5cc20fa549591475778dd8,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a478081f3e78accac49e1e5dcea57fc77b6420635eb1a59d00fa9e7c1f4ae442,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e,Merge_failed,a33e07a4985f528ea3d35f8c904603697a9478042d85609a51f25671093cf40e diff --git a/results/reaper/merges_tested/phantomydn/wicket-orientdb.csv b/results/reaper/merges_tested/phantomydn/wicket-orientdb.csv index db3d87f2e1..724ed7bd41 100644 --- a/results/reaper/merges_tested/phantomydn/wicket-orientdb.csv +++ b/results/reaper/merges_tested/phantomydn/wicket-orientdb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,19e9f8c8ff01f4ef6b39006032470baa83079eff,b7ebfd2dd8fc973b786f7c9222ab16a02db04750,ffa22e555317de565ad621df69faad83764e6d45,,True,True,True,6,9,116,2,True,6,Tests_passed,b2122492e7f0bc3e18ed7ce1df53cd90bb523f70c9186a3cdadadd949ddd6799,True,Tests_passed,e08cff51a5db84e0837c335f6c5cb3e9dd96d2ad114d121f2cb2d56ba23c34ec,True,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,ccac1cf65d870a8b3eb46ac0209a83b7372bfc1bd45e52c477967123013b800e,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Tests_failed,3dd8c7c6eadbdb193c8556b5812fa50c109d8d5ffd905b499cff64040217b872,Merge_failed,932eaf2952546dfadf9ca37e7847a1f627e163cea8a4d0af0b4a9365f326dbd7,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,fb821cc8ae6f44cd37f178f69b8c0c67e1c762d17f03e9287b2259b09cbb54ff,Merge_failed,fb5b9935936cf580a107df12bf5807d5c0dfb256b2d1f1fe2e18517270d6aa00,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2,Merge_failed,27caedc140b6ba51a92464ccc90dee2f975229b225ac06e06907a07bbc5eafa2 51,refs/remotes/origin/pull/43,464f977e4a730a3baf05339503fada6001ee2cf1,6ed823b09aac1ca2dbb4db0af7cd76e3d915561c,8ae1d5b93b5372172ea59a8765c3239aae64c42b,,True,True,True,2,5,11,2,True,2,Tests_passed,8f22e5217fb16f4ba3066f0d0444a0f5830cb036d4e104e79ab929e287dfa661,True,Tests_passed,284bb7510cf17bf06b796ddddb8c27af4d3ac57bfcfced0b6c0b628331bdcdb1,True,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,4918a4f1aa4e7cb6ab016e7dd5b8732d5d2b60378f81122caa88327a832fe154,Merge_failed,f315f88cfbdf5f9f81955516561748aa243bf995d2a4876d35c8b49048045f0a,Merge_failed,87b9dd321b234abef12995c3675a75529efc464edaeb0bddf35a49f34d24fe25,Tests_failed,d00431f473cd028ad792b446c93ad6fc2cf87a2e99a9aa498d919bfea3ffc880,Merge_failed,f315f88cfbdf5f9f81955516561748aa243bf995d2a4876d35c8b49048045f0a,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,47322e4a7d35168ef2eb05b4ffbd357b8fdb6b5505248ae782bc78d6335dcdb6,Merge_failed,87b9dd321b234abef12995c3675a75529efc464edaeb0bddf35a49f34d24fe25,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6,Merge_failed,9e17419f6639225d2a0a6b36e409726d5c8594181c5e58f283170c1e849a7fc6 52,refs/remotes/origin/pull/67,9946b0eae418dee769912f05e90f9d9516da3e97,8af4e9654d9ba1c81bce99a28d69badef75e6d38,eec916d22fe0bdb373c29a2344e75960f4bfde90,,True,True,True,14,33,461,2,True,14,Tests_passed,d44048b7ed03748dd24f7764404058e4fa6107a1ca870b486765b0720bd72419,True,Tests_passed,657ba2e35da8d29b389d932f1337cbbf3fe40b11b3f0fd7417ad03524255ba7b,True,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,7a31d63f826c9a74360ad491d43229a754795e03a95bf384179ffcc305bfd6a0,Tests_failed,49c76be6d9367e9873df70a8b82d2f5b03719bccb36ecedcd6949fbda545a53f,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,ea86ac8ace098c010c551b5fab4592f9c622e6470cb975eb1e9ccbbe67ef9ce1,Tests_passed,7a31d63f826c9a74360ad491d43229a754795e03a95bf384179ffcc305bfd6a0,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b,Merge_failed,ea7fe360eb93f04a80f227f3ec20b5cf828c7f17770b82ce31795988b01ddc9b diff --git a/results/reaper/merges_tested/phax/jcodemodel.csv b/results/reaper/merges_tested/phax/jcodemodel.csv index cabb8f7e8d..6f08c2f754 100644 --- a/results/reaper/merges_tested/phax/jcodemodel.csv +++ b/results/reaper/merges_tested/phax/jcodemodel.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,32486470c55c2a6b332600c7c693c47c9a91e7d5,3c1f47480aa985b1082bcc745d32f4651a507f00,b8d8fc639b766319a36039a4823d6d90767254ba,,True,True,True,199,203,1190,2,True,199,Tests_passed,f3ad7992197e97651fa975e95f4937615305d406301f7634661f014bb637f613,True,Tests_passed,eff388f4e1cd024d8b49700d9e4b226bce4d04e54da8d397de0b20af92f9ab79,True,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,e9db9bf0edb41759162e7e7f7cfada61b742b66d5173df2d535d00d873b396fc,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c,Tests_passed,33d11b9a3eb02c4b05387b9f6540bbbbbcd75e74199d050ca3a0148f78c0b87c 6,refs/heads/master,43ecb3931e9fe8fdb33d34de734c4e126285597e,010e0fc752e2cd642ca3976d1e87108f5a3a6257,ec12c7fbe391f0258b4cb12feff6379c75438534,,True,True,True,57,251,2036,3,True,57,Tests_passed,177dba7a951d0fe5a8fc46648e7fc5b2635826ab77b9d2a2d2ef1172f467f575,True,Tests_passed,03e10366eb5130c6c4dde61af6e240fcb02e8821f78615f0fc37526aa3937bab,True,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,6f80a787154779105664c24a596ba6da73f4fb1caee891b2bd80d08c86fb9550,Merge_failed,c6d3cb3afd91ece68f487c6a16aa98bf75f85749a21b6a2ac9310f74f56174a9,Merge_failed,c76d15edd9e9bef09580d0ca5ca4b429ccf153e5b7018fa0bbe7223f47997f07,Merge_failed,c76d15edd9e9bef09580d0ca5ca4b429ccf153e5b7018fa0bbe7223f47997f07,Merge_failed,c6d3cb3afd91ece68f487c6a16aa98bf75f85749a21b6a2ac9310f74f56174a9,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,2c6c0710468fd91e97af1a778d28b602a93ca3ec11b2fb3c7641c0cb24a44ab8,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,5273df3cbf601dd1d1056f97eb3f04fec954e6118ecfea13b82187728d59c906,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632,Merge_failed,664cddc063065dd5e4a216905685001cbc78035ddc9ef990eb0e1a8cbc2c2632 25,refs/heads/master,49b6f3104227385851c1f69782c4ea481618392c,001bef9518ad20eda5fab7c789cb3b478cb6bf8f,a1cdd8fa802617380e59b8bdd307d681cf5e45fe,,True,True,True,13,16,3996,2,True,13,Tests_passed,eeb7d3c12e41e863e9f15c59bd373e61b92d4a8eae8732c9957d483bc324eb6b,True,Tests_passed,461ddc8d274b4dad9f86bbfec96654a340d2db0810846281bef332c313801cbe,True,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,a71341f9f68ecc53033b891dc6ad4dede839ef08334fb7fc4db87878ba70e9d5,Merge_failed,bad1486da2c8ccabaef1403d793847ff04dd07cf60a05ea12ab874c7fbe25748,Tests_passed,8524a248b54d9bafaa41ce086ac63b6a95326eb0c82b0f219df6860ba0a2a709,Merge_failed,54dbe43ad5f0b1da6359cee7c6cde0d2c476fd399f988cbd23c061fe08221ce8,Merge_failed,bad1486da2c8ccabaef1403d793847ff04dd07cf60a05ea12ab874c7fbe25748,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,6a296efc055cb5e4128fbeda0f3897c58166983cc6a86df37d85c7a1d50cb3d7,Tests_passed,8524a248b54d9bafaa41ce086ac63b6a95326eb0c82b0f219df6860ba0a2a709,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Tests_passed,e95635d3fe5b324a1b2965267e3d9b09f05a7b56f506d6d1fbe47fc12cb33713,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593,Merge_failed,200c45c4fd726d08c6e7e6c58dd4816767c6f803a344e729fbc35f6825e96593 diff --git a/results/reaper/merges_tested/pholser/jopt-simple.csv b/results/reaper/merges_tested/pholser/jopt-simple.csv index 76c256416a..e5dbe43663 100644 --- a/results/reaper/merges_tested/pholser/jopt-simple.csv +++ b/results/reaper/merges_tested/pholser/jopt-simple.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,31ed6b5b2c903b5fdcadf5566bb1a652ca98fb9e,72943f9a609e2526a0de7486f83174ad8339b3ad,30588ec165991be5058ebde94917563d87b47460,,True,True,True,183,497,1749,4,True,183,Tests_passed,a79c08db02591270b89385f9b4acdddb9201a48a6fd7f3cb32f33e037f92037d,True,Tests_passed,bf17e7d14b35adbb3f33675619aad722bbe7f6e6a9145edfdea1d7201c703ba5,True,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,085e7a9becd7dbaf87c9f58db8fe96611e99db595f88d8cdfe70fded7ef408b5,Tests_failed,9ee1a768eaed5c762d37e4cbd9eec573d47cc93f0b2377652be61456cd7fa426,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,085e7a9becd7dbaf87c9f58db8fe96611e99db595f88d8cdfe70fded7ef408b5,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,9cd868879fe8e4503f85f10b052e128cd3f9b1f2193231916cf850ccfa4ef028,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87,Tests_passed,55ec2ea4c32d22f309c943a86b8eb308c9fc3db442b0ae3ff8d37a89eaf39e87 14,refs/heads/master,bdcb06831908b4976afc88a67289839a25e7b826,b6e7208e6f31aef4caf048d85a9ee3dd635a44fc,57d378a716c24651b9226e600031ada43fdc4b40,,True,True,True,177,474,1451,5,True,177,Tests_passed,f5efd32cc9e53141f7a40a8398d82906162e50c92af11371ffb0ff305c172886,True,Tests_passed,3b0c81509fa20ef47627200900cdab74556dd22b90b915fbddb3856e9524140e,True,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_failed,29d5f6eec216260a80d9d2ca55ed9e690d98faf7e96712bcc481a49dce43bfaf,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,1eff5be6cf57d454a5f775b67397cf7cd5c3a58bc834a7bba565098d5ec222d3,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272,Tests_passed,35935414a8f535839d0e3023cf056fe5ce525892968b05050476d7f662260272 diff --git a/results/reaper/merges_tested/pholser/junit-quickcheck.csv b/results/reaper/merges_tested/pholser/junit-quickcheck.csv index 9b418d674f..3d518e00b6 100644 --- a/results/reaper/merges_tested/pholser/junit-quickcheck.csv +++ b/results/reaper/merges_tested/pholser/junit-quickcheck.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,82018eb390ce060d8e32a32961554f77973a92eb,d41d56b567fe3ddcb2da98f6a199d31c0fed5765,670a37e18b46b93c691cceea314f16ba719d2a47,,True,True,True,432,469,1217,5,True,432,Tests_passed,9788013b7efd4478965bbb84574c7b0274f51196e3c50306d5045739419d844e,True,Tests_passed,a7f5b56a9eb53f57e29671109c9cb74b400b5716c585d68f1d22f4b5cb58fe39,True,Tests_timedout,9c4ab0312bbe896b1130e787c6018e929c4dea3b72cd33f837e2cb04731c8f74,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 73,refs/heads/master,523b2280d5f3239b1f8674adce708f67250bbccc,ad2e9f9e1eb9461f1804cf01891149df87b770f5,4f4a92feda5173b522fe0fc152a1d9424eb7cb19,,True,True,True,397,400,1082,2,True,397,Tests_passed,482f83810c813214f6479a226c27fddf80621014490edc3d960cbfc6abc21fbc,True,Tests_passed,a3791a687589128fa4c6d224781e907ad0e0c402a827d7218453216892e34092,True,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,15ef05c0b74295a6577da65c89a44ef6394f95dad3bfaa88710994fc04d5751e,Tests_failed,92ed45ef12e1260938cfd2b87d58c76311cce776a99725d631ef6c8c74416b4c,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,15ef05c0b74295a6577da65c89a44ef6394f95dad3bfaa88710994fc04d5751e,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab,Tests_passed,6f4fd23ab20981357e440d66f4d308ffbd8e6a1aa68792096cefe7f22781c6ab 85,refs/heads/master,522688761ae36a55f4420e247aeb70ef6a7bec1b,5d077abd00975228364512dc8946bd3becf9ec33,36e11206f2401a42d11fec5f99a47989d8a13a39,,True,True,True,188,489,13245,6,True,191,Tests_passed,e978fe4da8ee3e062aaa0ca0659fea47c076f1dd8e6c3a9a1ca84092e029bcb0,True,Tests_passed,e480885050c51737a4c4066c2feb73737dbb530a2900f77ee2197d20d8b495f0,True,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,030d441bd2fd5fe5ddc2e1e48b317ddea34a779f6fe5e9694dc8041dabad49f2,Merge_failed,5fbf937e4e921eef26ca21b116049a271dc573e52cab7720204b52847f9382ae,Merge_failed,21f2d9439d9ac5860a67b41b0bb0dc7ddd05d3e490666d1aa175494524e99a5a,Merge_failed,1663832d183689a9a620c155828b4d25ea8b4d528410729f321832a628efdc5c,Merge_failed,5fbf937e4e921eef26ca21b116049a271dc573e52cab7720204b52847f9382ae,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,e640d10b29782eeb9aefecda8831e657cc4b3740f678ace6806bacbe9213531a,Merge_failed,ac48304637bc692887b185890d3018b7a0ad3ccf696be736b87d3d229e80c6ca,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471,Merge_failed,aa5fb089e82e777bb0bd49c94f43a169f194ae24ce772d936fa52775ce15f471 diff --git a/results/reaper/merges_tested/pires/obd-java-api.csv b/results/reaper/merges_tested/pires/obd-java-api.csv index 4e75d8aec3..27523be4dc 100644 --- a/results/reaper/merges_tested/pires/obd-java-api.csv +++ b/results/reaper/merges_tested/pires/obd-java-api.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,c7a50bed5f74a5fef3eb31e4d84f7961a0a5179b,6f65fc8e18df0321892bb40bb777b777059ad29a,90ba201c98ae2de3e804dfb7d78c90d473899108,,True,True,True,71,353,882,3,True,71,Tests_passed,d08d717c41b4db8f05dac62b14bae02f3da7bad7c360dc23a71af0a117a19d8c,True,Tests_passed,6eff6345c38156ff6aed5e3d5c7fe3d49caf838f0e0173401137e19e41f23f72,True,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,8a828da2f43b5d1ba8591a30a9458f55c1a758e4b91a24e46e1a9c207c2973b2,Merge_failed,41f575b3b449d5f1a1cc1c7852276340c132cae2718bc874a7b28ed933e3b701,Tests_passed,13ba87793ce9bfe4f90b2ca043445f24d4faf00462bf687c73ca9127989bbeba,Tests_failed,e75db96ffa20f5fa7329c17a495b356424b2d73114e6682a7992f45c6012a0d9,Merge_failed,41f575b3b449d5f1a1cc1c7852276340c132cae2718bc874a7b28ed933e3b701,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,e9e777e526dff19b8d84138695f2c6f47395c4e63a16e5ab9823f29cf94f79ac,Tests_passed,13ba87793ce9bfe4f90b2ca043445f24d4faf00462bf687c73ca9127989bbeba,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a,Merge_failed,7b3becb7625d802361005f3aa52ee4fda6161d80fda92789c6dc08ddc955fc0a 51,refs/remotes/origin/pull/80,f755208227503c01478c10a0912fd469d0ec5d79,fb2058698022dc891446c1367a27a8be2356bb4b,8d61fd4c32fb3bf9d99c44b078fab8c8087b4b98,,True,True,True,10,25,259,4,True,10,Tests_passed,1e4e159a11ce06872aff10b6d1b59802a5e35c8d63b814d27778d3be6e0feb7d,True,Tests_passed,1c1ee8480eb4263a22ce92a609098eb0f6820b9a05a8291b1daf4401c368bbb8,True,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,f03dbfa05a0d36e7c029ea282f742bde703f929e510c466c916f5ecdd3ab69c2,Merge_failed,ba79d8ec0fc045b60e1e394bd82d3a980e1d2dd9f074b41636c31377ea10fd94,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,e393404a970b444118bb2ae18f9d7ae03b6e8bded92f536e0e8699e30d9e2867,Merge_failed,fddac77c1505acead596e3df633a37d074783720a2be168311202f295668dcac,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,048a3fd17da35fb7bb4a6a37a1f55be03812061c43b150bb8fbc0f7a4c6cbb84,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45,Merge_failed,16b7614724821ef2278ca668f9db06104c8f0e27be44a1f8fb98c34d00125b45 diff --git a/results/reaper/merges_tested/plaid/plaid-java.csv b/results/reaper/merges_tested/plaid/plaid-java.csv index 75a41df9e0..a2bb54c1b2 100644 --- a/results/reaper/merges_tested/plaid/plaid-java.csv +++ b/results/reaper/merges_tested/plaid/plaid-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 35,refs/heads/master,ee81fb7afb875ac137baad5b9a30d55d39e2f60e,5534569921b8157dc675f6e426aeced5a15b1b63,b5b7cd819c4158e15fdf0e3ed0d3e7984043f757,,True,True,True,622,1163,90048,26,True,625,Tests_passed,a382cbca5f9d88a546d42dc845c2f2f9a6584189ca0c257f8cbad7075660c2ad,True,Tests_passed,427f7de1f90b299e502123d844d2d2bbadec2221a38a6e61a6c12d605a1d6ba7,True,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,ce664782a7dddf13df239197719dd0d3b269fcb559b215636557ab42db2e851f,Merge_failed,14224afd86d59843267a68ab1f204040f20f35f559207f0170e2292473feedf0,Merge_failed,36e778cc3eed12c6320f147dad8bba82e57f51e5bdef3510a3a416d0507797a4,Merge_failed,b10caef8c750b281e0545eb42f9ec1b0e030638d115cc6af7a23aa8e10b1fdc6,Merge_failed,14224afd86d59843267a68ab1f204040f20f35f559207f0170e2292473feedf0,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,84c77595be66a0c240849092eef64d0b082167149d9291a7ea59c4463686099f,Merge_failed,24e89590c6b266cd43332eed2d6b14dfb267838dc27ca0a039903f260c326e5f,Merge_failed,2caf64db32c9828ab4e80265de46e9e5041f0d790788ce79cfe7c9c3dadffe16,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,4020df0bfd77ab7a32d8a95ef4914aac55e8db39b6db744829fd0963ea70de2c,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9,Merge_failed,09a5a2c4a9f1ae2e32c5d5e2e3d99405a82d8cf91ef8c8fa02fcafddd8e521d9 72,refs/remotes/origin/pull/130,5f856fdd6d1f3b51ce203c9ad056bc91471d939f,0bd56626ceb3d18c9d876dc91c1f4ae758eef0a8,abbf5df9c62aaa286ca14bacd418d05a55e9f8b7,,True,True,True,19,42,728,2,True,19,Tests_passed,c2c0e699cba818ee07aea888e5712469387d269bf32360cf5868de182e867eb4,True,Tests_passed,7efcfaed7d06ec6cd6d37cb4255c6ac00cab370f6905c5252a5107c2284b0584,True,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,efc57f60ee336ee8a505e3943f388f225e97eecdc6161089f1b0c7335ec6188c,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d,Tests_passed,5762fd08d958e23ddba9fcb9d88de0b271985221e4d4d0ca896aec7adc103a2d diff --git a/results/reaper/merges_tested/plum-umd/rubah.csv b/results/reaper/merges_tested/plum-umd/rubah.csv index 15c8647c9f..0dff28249f 100644 --- a/results/reaper/merges_tested/plum-umd/rubah.csv +++ b/results/reaper/merges_tested/plum-umd/rubah.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/pull/1,384485219562438c5abd5db59fdd0bc56061ae10,0d76b2beb5a7ea23a061221127be6e7b3ba30139,52adba8bdaf39255e685b0fee48887ccd1c4dd2f,,True,True,Tests_passed,78704f4ae6b8ef79870011f2a7bb2bf3c9a3db32d7453848720d0262ef2f55a3,True,40,268,1561,2,True,Tests_passed,b1a3a400daa2a5ffbe89e49c0fc9c886134027b526fa0ff42975a2b060af8de3,True,40,True,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_failed,4271582c4fe3884a7988fb1b2761e87f3c0b701f7afd89f46aba4c62bdeb3270,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,ab618570870b03a56a0cce2f40473355806e547182afb307521518b36131c9f0,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81,Tests_passed,aee7eea89a74829b6dbf52d3330b8876ec0f6607bbdd58fe26952bd63b069d81 diff --git a/results/reaper/merges_tested/plutext/docx4j.csv b/results/reaper/merges_tested/plutext/docx4j.csv index 9d7930a945..77f166d9cf 100644 --- a/results/reaper/merges_tested/plutext/docx4j.csv +++ b/results/reaper/merges_tested/plutext/docx4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 107,refs/remotes/origin/VERSION_8_2_0,a67ac33cda43af3061e084999466fb844bfa02b9,c5f43a09f2cbe8323354cdacf85dbef4f64abd10,157aac2f2ca28f5f33a7699432d65640b3bb73ff,,True,True,True,6,13,108,2,True,6,Tests_passed,e7be2dfa4d89cd8dc4e9d2eb24f8b41a32698c580136c25417fb9202bb0e84c4,True,Tests_passed,fd6ee9dcb03b68b2e1d553786610a2494ad18164ad0d74ef17d6a66328fafbff,True,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,52618d8185250b9c067a9a559e9aa219d913ce0595db7a01e10883c84bd22bf9,Tests_failed,2332b6790beefbc30efa89c297a2f6946be668ca79769ed5b63a1e50fc937a8b,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,52618d8185250b9c067a9a559e9aa219d913ce0595db7a01e10883c84bd22bf9,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611,Tests_passed,c2761ca7eebafc2f3a5bd6c683dbdac1190d7963f5cc5a02ccd7d2b48a09e611 129,refs/remotes/origin/pull/378,aa42a5b3f77c350916c1b790b26cb2633e9aa31c,80a43b991b62ac742367c51306a8aef824e5f415,6ee32d1afde00a15e72212e119322d81c4423deb,,True,True,True,58,146,6548,217,True,249,Tests_passed,2cdc23ee00a42fb287a38c24bc72aabd44e3daa5ee565c63e097c5337141c80e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,True,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Merge_timedout,,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e,Tests_passed,1d1a3a5263dae82ea3df1e5b56f01f40ad39ee7a5458642729ed0bcc7d063b9e diff --git a/results/reaper/merges_tested/poetix/protonpack.csv b/results/reaper/merges_tested/poetix/protonpack.csv index 2700769523..7d7bfab5c7 100644 --- a/results/reaper/merges_tested/poetix/protonpack.csv +++ b/results/reaper/merges_tested/poetix/protonpack.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,2ce321af894939d80fc347d8988b9243f4f717b6,7110d26a87678eebab7ce72e0681b1610032b7d0,63828239131b116168135220ad0182bbd09cee56,,True,True,Tests_passed,c9e69a046413afe9839ff30c10406b24d7be2b01d9f8fd812259bd6190681fe4,True,4,7,119,2,True,Tests_passed,44ea129e7a104bb904693e6b6785b5346c559663548150648ac0354c12c7b26f,True,4,True,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,f52a0564d1e55dd7eb6a4f09a4908bcc68e4d3181d67221db944ae8c8d33f78d,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,f52a0564d1e55dd7eb6a4f09a4908bcc68e4d3181d67221db944ae8c8d33f78d,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6,Tests_passed,72ed2e6bc77fc37d185d73c6e4dc03521030783f5d26f66ec86f3ad4daafbcd6 15,refs/heads/master,7f6e8773f8a428c8fbcee81aeaf42e04b45144c4,740db1ba99cc80ee8a2c54916e8e6975b629a276,65d9207fe1a022ef6151aaf0eff8a939c9083e12,,True,True,Tests_passed,fe1585c6430d0c6b8311be21f6957611b614db27f5337be349f76ad40d237de0,True,13,15,494,2,True,Tests_passed,8a4c04bec613b1a495bbb92ed4c4145aadce30e7553c6bbed6d91bbe8e409ced,True,13,True,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_failed,d2c7bd44758573b8c46dc302d5f9ecff2a7d72795b3503f9193c534c65b6934b,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,cfd9e391d07bf55eca890bbd3eb027895b9038b7fb2493f95ab816ac18c23490,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3,Tests_passed,e1223f0c3967931d17736efefd90d94ab832b104941f17d4ed034eef0cb742f3 diff --git a/results/reaper/merges_tested/polopoly/jetty-maven-plugin.csv b/results/reaper/merges_tested/polopoly/jetty-maven-plugin.csv index d03123deba..76ef69620d 100644 --- a/results/reaper/merges_tested/polopoly/jetty-maven-plugin.csv +++ b/results/reaper/merges_tested/polopoly/jetty-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,ede46d4a7b0140767b4fa80363d1272cd6513610,9ce0700e72e828ce5ff0fe68b4e5808f31186925,e4bd182147d263a680a86b52f80c3abba54d2e5a,,True,True,True,3,15,48,2,True,3,Tests_passed,ec599c4bbcec7f2cd45ac4293147081f92c93642431675667b70e483fbc5c180,True,Tests_passed,268a8a861c3e5f5d3b57bab9fc408bbf8d5406364f96db7b16cb293e86f788ce,True,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,0923eb9af392812ad6fdd9c891c7a7ab04045e99f012bcdd9e4436dd7123fa1f,Tests_failed,a7c9695f484e52a8fa07e03650c169d96ff2e82779dbd81820d34d6b27dc7ffa,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,0923eb9af392812ad6fdd9c891c7a7ab04045e99f012bcdd9e4436dd7123fa1f,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,32cd142d20a177061f41b5156180bf3afb626089b4a2301257ee97a9366da853,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e,Tests_passed,e2227904239af5d0d2399b271912e8e958145019c9ca4b9a5fcccf04c1a5c84e 2,refs/heads/master,bfc17aa246a1ff1e7c301d5a90f4101f82f8ec12,57be9f5949522592799d85e9760e748bc472a098,429f5db8ddccfba6827b259b8131eb64cbca7db2,,True,True,True,3,12,37,2,True,3,Tests_passed,da2a3914d2a8517695f29bf304ba892035004dcf7e960e27337e5a6f8931174c,True,Tests_passed,261126bb0dffb3e5730b1a54f72cdeb0945419aed050c1252ba9638e331fd87a,True,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_failed,e5c8e73840dc48ab41cba881927ee7ca067dac7b35c513f803c373ff7d04aa9d,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,6b9465170006176dc2dda2cc914b78c3031dc1ab58b6b85b7aa2c82559927315,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,d27d7842fa171c0797e80de3baa9dba9ae6575afad3c60fe60ae0dc2d7cdeaf5,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929,Tests_passed,1f81df6db49bbc63310b55284ac761137cbebac390d632d60fb8959fa2b4a929 diff --git a/results/reaper/merges_tested/pragmatists/junitparams.csv b/results/reaper/merges_tested/pragmatists/junitparams.csv index c41f137e8f..7dca72cab9 100644 --- a/results/reaper/merges_tested/pragmatists/junitparams.csv +++ b/results/reaper/merges_tested/pragmatists/junitparams.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,64099252b8751b407e9802857fcab3fdf97bc5e8,5de3e8753b3062eea40992e590e834f84d3f823d,e0b9c4d623c8765a6d5c89acee588814dfc9ae79,,True,True,Tests_passed,5994fdbfb8873554a1512119f27cef10da29fd9911663726d315c19706fcf673,True,9,22,166.0,2,True,Tests_passed,9853e926860b83c5488fc4cc3ca478035d0731d311d35de6fac8b943fad494bf,True,9,True,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,d9ae6eb2ac90362ad221ba40cd596a1badaaaa254a6a74504433a9d8c3db3776,Tests_passed,c285e7807774889cb1e3373d3ffa7976c3c76509876f3edf81f6ee0356a70118,Tests_passed,52e8414a862836b85534596950db66f169101e4a95f275f4343158a00940a0cb,Tests_failed,b1ecaed33af36dfb7f492c7e95eead565bd14fbe92469a05eb4a9e910149cdf2,Tests_passed,c285e7807774889cb1e3373d3ffa7976c3c76509876f3edf81f6ee0356a70118,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,245f71bce31840e3a7ea1026bc41e0ddb4357d931d107802aebf263a62a74d52,Tests_passed,52e8414a862836b85534596950db66f169101e4a95f275f4343158a00940a0cb,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857,Merge_failed,abf58d76c6e3a32c19737a3d1e5279d4a9302368d1052ca90eeb7d061494e857 24,refs/heads/master,7e9214c623fbaa05978f1301fdabb0aed1f35141,2d90f897cd3cf4067cb4787ff8f5ef198cda591e,c17929a91b3702117ee18d574518ee956a9f5105,,True,True,Tests_passed,619ee399a09040203abf2910dfbbaacd9c00b587b075fabc1ad1a1963dd18523,True,6,30,178.0,2,True,Tests_passed,e0eaefbea97f452204555ab069e02a779f1a416fd147254dc418d27649a7fc3b,True,6,True,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,34d7a00785734892d0de19e7453c8954855446d4a9493b0e1821c58ab30609a7,Merge_failed,39357db2edeaa06d2ea9fdc8fa3964f68afe5e4c11836cda0c67c05faf4e080a,Merge_failed,62f59386a2867013b682f72246b01ec96ac30cf0cf09b7de6e26318964d6a0b3,Tests_failed,fd3c18b6b2bb20790f33e0a8043bdd743fdca72b2bdf3ab6644a9e984e17fdaf,Merge_failed,39357db2edeaa06d2ea9fdc8fa3964f68afe5e4c11836cda0c67c05faf4e080a,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,94165da67944c013ab74e671b77f59e1e9384ee84802c230828ea86aaf36794c,Merge_failed,62f59386a2867013b682f72246b01ec96ac30cf0cf09b7de6e26318964d6a0b3,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641,Merge_failed,9e262bea3a24ccfdee68dfabf72d7d49cf6490a7107aec867a6267e74769b641 43,refs/heads/master,ed8cc312d3721cd913ce91ef2de03c7c4fac830c,d476a77d9a0f2890ea2e926b33f19bbbc36097a2,70be250815fdf6514f6b7ab0dcb773df63714230,,True,True,Tests_passed,6c41e4e8b94593d03adee479dd7cb7108c01b3fa4275176cc6a2d15d8b1457ff,True,30,153,1026.0,4,True,Tests_passed,450b5fbeced68e22f42725b697f559ff2cbcb570baeb95d89a09d7be52fd4a40,True,30,True,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Tests_passed,c8a4fa7702ac6fec50ee12472914f40fefd54ba00a5ba9ec4035214740437391,Merge_failed,66173592fe729f4caa743c1de0051aae996312c25d22d8745107e918acf2e104,Merge_failed,41d0e80aead607a982f1d8eacb0d797025c93d5c40709e0c959baba9633fa8c0,Tests_failed,d6419176b255c90fa1d47f1c75ce4fbe9ef785b18b528b1f22a23045effd6a5e,Merge_failed,9fb0bb84cbf2c8d0ca1ce1bb20d7f813b7caa61a641eae3d0dfd89a3f0201708,Merge_failed,41d0e80aead607a982f1d8eacb0d797025c93d5c40709e0c959baba9633fa8c0,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Tests_passed,c8a4fa7702ac6fec50ee12472914f40fefd54ba00a5ba9ec4035214740437391,Merge_failed,d544ac08eea99f9c63a443baf6828c3c85d9513904213307f1258f9613fe1ca7,Tests_failed,d6419176b255c90fa1d47f1c75ce4fbe9ef785b18b528b1f22a23045effd6a5e,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b,Merge_failed,726c7dfc0b102aa96dc8bc89784b08b0b54d7309b156da36de26aab6fea62d9b diff --git a/results/reaper/merges_tested/premium-minds/billy.csv b/results/reaper/merges_tested/premium-minds/billy.csv index 9b4ccadd56..1bfa7bf719 100644 --- a/results/reaper/merges_tested/premium-minds/billy.csv +++ b/results/reaper/merges_tested/premium-minds/billy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 50,refs/heads/master,b34f1fc12b6717091254cc8f8c6bc313bd2a3e38,4d7c765f34c6bd796695bded10da84ee2816d819,d113a54f81e5649a8137cb49e45313689ba7836d,,True,False,True,10,18,62.0,4,True,10,Tests_passed,7a11d2e79a1e3c09fa09674d26a46c79f386723ca13c68692d6a6534091cec08,True,Tests_passed,56561ebe92a2edad87948ea6cd1104ada423f36bfb6b22fbec7e5e6e3266325f,True,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,a2ca49b4e9796fec808a48c72fe40b68d4b8e784c1f79bf856826da92a922936,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8,Tests_passed,66b5ae7fba354bb63d3003eb6ebdd9b1b1768aaa2dbfd603c1419991f9cf3cd8 70,refs/heads/master,bc9db3332320895636598425f8927fab20c59a09,1649bfd5cee009a189334f307829da10ed3db9cb,3428237224ef06b137ebefe6563d6ddd26b75303,,True,True,True,494,2173,6095.0,14,True,494,Tests_passed,f9f27ed5e9cc5b966df4cba64f5d32bb98861b2a06d300e28eaf22db2e93d8cc,True,Tests_passed,fe8f4107eb5638fef89a9c5710d2b9e6762885458dc6f655a9a592a5d94940ef,True,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,16cfabaf7737856929c316eda01d6e6bb2a3013d70c3e6e4e3de22ec150afc88,Merge_failed,b46713e0d2a7163ca10b7a4861617e217edf5232f72feac5d9ffe50c256ea4fd,Merge_failed,0bf73ca13f23ffa7e973140e8f52bd03dc9b0d9c7625db5378f1517110777814,Tests_failed,46979ae2fc1d2f0c39178953db828cdac825540edf02e36dc5bfa7dda5df0317,Tests_failed,5b1d09f23b5154f4e18c8a34faf84a467d4469b0d289f63311785a3e067e4bb2,Merge_failed,0bf73ca13f23ffa7e973140e8f52bd03dc9b0d9c7625db5378f1517110777814,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,16cfabaf7737856929c316eda01d6e6bb2a3013d70c3e6e4e3de22ec150afc88,Merge_failed,ca90d0fdc251cfabc15b3becd01caf6295bc792689d22effe787f24141572fb3,Tests_failed,46979ae2fc1d2f0c39178953db828cdac825540edf02e36dc5bfa7dda5df0317,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,ae2a3b6826bbbc28ae3235a780e9d5059b1d89f7367060115d70bd25bdc63fc4,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985,Merge_failed,d30af63a0e60c7e365378594f60613efc85277df49df72347990ac8625454985 114,refs/heads/master,5cae873221b8d0f062cd2a11b8943b42a9f67b69,7fca19e500036c76cf1cd24a8172d434fb8e437b,c258698fea9383c9d2388165da24ac8d00e40a3a,,True,True,True,164,203,470.0,3,True,164,Tests_passed,34ff56084600916b34967c98d2b4527ef3941775536d86d92772bc2c8b9c1c7c,True,Tests_passed,83be1ec18fbb2b523f38a9947c39cc8ffc7bdce47c29a90c657c79f5c7859e4d,True,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,d8b1346b284567ef2ab16a75f26d765cd2022e5b2907b526da5307ba92b8dc75,Tests_failed,6151025cff6fd4509af8ad84e566d582705f8750940919705e7d0b6870beafde,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,d8b1346b284567ef2ab16a75f26d765cd2022e5b2907b526da5307ba92b8dc75,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f,Tests_passed,9a9c5316743f3ac2d9896f3be4957c3106d44e2ce7824e12b0dd57ce534b323f diff --git a/results/reaper/merges_tested/premium-minds/pm-wicket-utils.csv b/results/reaper/merges_tested/premium-minds/pm-wicket-utils.csv index 9a0d4a949b..d96e6975ec 100644 --- a/results/reaper/merges_tested/premium-minds/pm-wicket-utils.csv +++ b/results/reaper/merges_tested/premium-minds/pm-wicket-utils.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 94,refs/heads/master,a73b5bf686d93a29daa3513d0e62422111b3f4b6,212b95bc3d85dfec1d2d2b27ac5d5b8a4aa06fc5,2d452fa3a767f08154527af54210a8ad5805df8f,,True,True,True,83,108,589,106,True,184,Tests_passed,fc764aa3f192b9fd407e04f01935db53dfd1f9717c171532598a11b078e9ee0f,True,Tests_passed,5908c5716fb0b2b2f61dd4c09596f8c033f8348170303b8f404464df31fdb921,True,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,75a1f68499badb8d65ecdcbd678870be39e444722ab6a390c41f27568616cb12,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,fdfbf64a53a31570235ac037f6f092b13a6c69b4ac6c9b4f6124735484de2d47,Merge_failed,6ff13646acf961ea3ffcf656eb342a1356c82417f6e218afb3281f6342798860,Merge_failed,a846eb058a5d8b6bd749f8dc518e7c1287e656bb978ca65f960860bd5386c95b,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,61be8359d0b5d1e6f294f2e43b54482a9f2086b054e839c27a390b00140beb62,Merge_failed,79973388288be6d2939b13a532cf1c5387b1743eb1a5f349fde600b0b9bd8d71,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d,Merge_failed,e30e3a65d1f54c6dc822b16c82d15198e09670c844bc6f7d1d129df39012d14d diff --git a/results/reaper/merges_tested/prism/prism-bukkit.csv b/results/reaper/merges_tested/prism/prism-bukkit.csv index 4311be9903..3bb9fd1952 100644 --- a/results/reaper/merges_tested/prism/prism-bukkit.csv +++ b/results/reaper/merges_tested/prism/prism-bukkit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 33,refs/heads/master,c9fd69aac937051cc93bbc7b62a22245e0ea33cd,4b5d8a5f750a9cbe1a58cf3f67be4d025cee8182,e99fcdd4ae5a93d7185c8b575d5f14e2d15e7a56,,True,True,True,29,173,876,5,True,29,Tests_passed,f1c99d40af6b068f88c0020020babe2d879bf3f0d172935054618aefbd5c57ee,True,Tests_passed,ac53fd399251fd9e5b9f928255372dbfc1d699060b1abef16bbe395986c83ddf,True,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,afe76c72e561928c929d4144aa319bc7cd8c88cf9d819d6d1467a8e812fbac66,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,62f288082642215af32434a6f7179ebe385d6fd9bde1d09f73ffeba8a476bee3,Merge_failed,ea8660d6b4cfeea734417dc62f56a6bce84ac518ec4bd149f8d346834b568e05,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,0c22134238b72874f9e41c5376ddcec947a72e0711520019885893e57f0a460b,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,9c0b045e738ff6af1258d73e52463b6413f84242905b2185cabd8bead6940a0b,Tests_failed,3168b854b912fc27816fc86cf903c4d1fca88df1f2a2adf9fd7b782ebce009fb,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Tests_failed,be94a8816c2f1e1d703acc8c3477d247f12204b988f3db578f3ca5ac96f5b100,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa,Merge_failed,584bbdab30258c6c8a1b7f32b9ed80212b1b415012bd6cd97316ed48b52d90aa 166,refs/heads/master,6dfb9ef0cf2730eb09914af0afd8724a30f46efc,2973beaa568712042dd9330f6a181f84c8e3eb4d,9b3c5ba831844b6016733aaeb86106d9df13df25,,True,True,True,6,11,28,2,True,6,Tests_passed,35e3bf9191fe9352c782e593fc8c5502c5227e7c37a9070c5c456fb1541cdafd,True,Tests_passed,25dc46111a512af17be861328f358a73057bc2ab525c81fd97947791e194d109,True,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,e777709fa06ca8d3f1b449c7846d133eec579743257ecc966423954bae8101dd,Tests_failed,d7cd7a92cea19eb00ffd415ffb09d5ac356b823b1c5353c50b90e34bf0e8623a,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,e777709fa06ca8d3f1b449c7846d133eec579743257ecc966423954bae8101dd,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707,Tests_failed,8c4698ae626f82121422229b3e8b73a5ce14bee1ea5b417189aefbbf62a81707 172,refs/heads/master,74927cacad04dc8d6037f2ccd53c2182e12312b7,e251f02f2edf3a865febc1087a06fffb2dec31ed,29424de7915c03b635c7c6148cc4adf4a7ecea62,,True,True,True,2,4,278,3,True,3,Tests_passed,3e2b30c543c1ee24c4bb085ed006fa8746aac3f3bde933818a2da873232bc2d5,True,Tests_passed,e1e400cfb9059eee5d34ce97ff890e719f7d8b2d97fbb0c30f8885a57f1ac6a3,True,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,1e3857a5e9c01ba1cfe4385463c3df60e58b244403b44e6cb5833bbdfb977e9c,Merge_failed,3612cec06f2ba9a8c25d44c194e3ad8cdad524be197eaccdeb43604d29ffc5bd,Merge_failed,061209405c97a25d4482a73390d534ca536a204917c97328eda0d070cc8dda59,Merge_failed,ab6032ba6b95097029481a8a9b882674752565a1e05a1bf3cc67d21369980144,Merge_failed,3612cec06f2ba9a8c25d44c194e3ad8cdad524be197eaccdeb43604d29ffc5bd,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,8c0d5559c355839b2d11b6e9b5f57c9864cb2dbacb05f927c4a9fb4409eb8d84,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,16334a40eac56032020930fe3596c51866d0543f12597304d27fc31649f49030,Merge_failed,061209405c97a25d4482a73390d534ca536a204917c97328eda0d070cc8dda59,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Tests_failed,a011f08f91dcdf6f1803bc3f7e5203f4500f712ea671917e142ba72e93933b4c,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d,Merge_failed,de40a0012ee296e66c58cb0df84d10b920a984d16d1459eb9613fb7fdb8e3f7d diff --git a/results/reaper/merges_tested/progether/jadventure.csv b/results/reaper/merges_tested/progether/jadventure.csv index 707ff92696..d6c7c4ca5f 100644 --- a/results/reaper/merges_tested/progether/jadventure.csv +++ b/results/reaper/merges_tested/progether/jadventure.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,7deca2169f09a5cc2f3701736396132d5f36f2a2,1628bc864e5bd45e8d99a75484adf7d317dada07,22eddd9a0a61f8c44eb2f504762cd811b54344f2,,True,True,Tests_passed,44973629f349af797bf1793a4ae08e5d130889e9d95c6c11b1cc1953fcc243ea,True,3,2,3,2,True,Tests_passed,5a626ac617c5fe94755cb45b8431e707543b176c34e89e8f96f99f3c2c873938,True,3,True,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_failed,ee8138068cc7a5b7a3a682cc49350b2680830ff7dd55b05699b665af26972e09,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,d01c909ef652612606959bf3d3cf771fbc2d92c445711e474788f7fbc40698f0,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce,Tests_passed,03ffbb6053e6d8d38466ffa025b559a26828418c4e5853b42d20f0ec518a06ce 27,refs/heads/master,d4407d1e7708eea409d96d64ec87fba94603fa8e,3a51fdd09bbc04f54ae0840d4e9568852adf9ac8,7b192fb1990391c17c16f922a5c255b9277203f5,,True,True,Tests_passed,2b8c9e713ba827450c52d403e4eca6000b529ec5a102932209fc1a22a3a234b5,True,9,20,235,2,True,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,True,9,True,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,2b399604c5797adb8b13e8ffb66a6fb6a2c69322e40c6327115e52e76fa7ff74,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,2b399604c5797adb8b13e8ffb66a6fb6a2c69322e40c6327115e52e76fa7ff74,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,b153a37d87fc500359f00d8064efff33c207badae23af91320bb83718656b3bd,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77,Tests_passed,70c16e109230140a550ec8d7f008dceab3f88c14fec86f60fd42561492645d77 29,refs/heads/master,4668178a9c920ebca8b3619cf105864c8b83c454,d56e9d6307e8991819bda92a7b52026093777f9b,731110f6270a7ec58da823bc9c16957d17680b36,,True,False,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,True,2,1,13,8,True,Tests_passed,7eef8b8b847772e7714698930563bb8356d0c6339cf5f64402a022b9b6bb193a,True,8,True,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1,Tests_passed,e1fa4060fe70cffc318d8d18667c8d33e2b241fd8404327e18550f11eeff15b1 diff --git a/results/reaper/merges_tested/projectblueshift/blueshiftapi.csv b/results/reaper/merges_tested/projectblueshift/blueshiftapi.csv index ae6b14fc16..a0f38ad70f 100644 --- a/results/reaper/merges_tested/projectblueshift/blueshiftapi.csv +++ b/results/reaper/merges_tested/projectblueshift/blueshiftapi.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,True,17,61,353,5,True,19,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,9e18a10c3a100f154a2bf48d76421427c571330e758be5341b831d1f92f4ca40,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf 10,refs/heads/revamp,004679e5bb6d1227b91f9e1aeaf79b72c317a397,d5844b55b3f6efe95d71450b49a3723a0b9acae5,ed227f8eaca49f6d1a65ccbcea8fad55b38d591c,,True,True,True,15,97,426,3,True,15,Tests_passed,06f41e3da5a99fa1855b1ab414f6b95d5c330ab6b27fe8841c590f052e994045,True,Tests_passed,cc3198654698c2e4774f971abbf38f0045361de1ec29fe479b44312c7a19fbd5,True,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,eb71efe653a3659ab58d88f1e5c027abcaf9f4a5df377614eeabf0ca13d2ef71,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,1f948cda894d56a5f839ca01f69b0b859e0d9b61fd8118120c23d464be2206d1,Merge_failed,d85a6c0d015c66fba987a8b10ec028de29365f2675f722e8c8a0df996a3a0374,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,40778399a44c4c6d6ef949d5a830dd702b0970eb1ec56db174b5a7ebbc2d930c,Merge_failed,6fe24757cfac9cd2e746ed7f489d9155ef2553808a13b8dedae4f2515ece975a,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1 11,refs/heads/revamp,b53a148ca59225dcbceb1fc65321f98a0c5c13f9,0328aebe181d4896b2205893c521c1015eb69ae4,6dcfd0c9bf20779e4b23a3aa05d29ee6cde7364b,,True,True,True,75,253,1483,13,True,77,Tests_passed,cbee04c3151cae68ef2e931fb88dbe19fd26676962d2194b8acdef0be7b956e4,True,Tests_passed,7793f3445f483bdfc586988358a2a5506cbc255cf216f4ebd32dbf102a61e56e,True,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,295f6f04adaf67ce6ca87627ac686c54139f54adf7424f03b2af435897508926,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Merge_failed,2a113f2cb96e0823ebc7f580d72e00b0b7ccd6972752e02a436356fbba34b9de,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,1951beed01d745813875c8e3d411858af96c4d3dfbeabd03f497df133d76dc8b,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e diff --git a/results/reaper/merges_tested/projectdanube/xdi2.csv b/results/reaper/merges_tested/projectdanube/xdi2.csv index db013df646..4f0ef40932 100644 --- a/results/reaper/merges_tested/projectdanube/xdi2.csv +++ b/results/reaper/merges_tested/projectdanube/xdi2.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8b5a951af2ff940771d87e8c8062e66034d89d78,9021a1a0362290494eae3125db43191fb3932d7e,d28c88fc27ff6c761354c225f4766fbde1922bc1,,True,True,True,668,818,94784.0,3,True,668,Tests_passed,a94005a7bb82d3c9ec8d92909b074ec51fb6150323dadc373f7ea9813cb6f84f,True,Tests_passed,4772f32b6772ce9fdbee29e694879de594bdef4e3d655806be7decb4a5dfc9b6,True,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,a924859b9ee4cb2312183e449630fd45d075e3201363b14e7b7f20be6238ee5a,Merge_failed,45354e1211ad1f70e04264324fe41943de4afce6649ef886fac741d867aca5f3,Tests_passed,baf722427019578115e289859766958bfc40d6385561bfbdb1048b9c4902895a,Tests_failed,bb114105693213995b1744ce71fd9d68e886772bda15cfbdb80985655483e94f,Merge_failed,45354e1211ad1f70e04264324fe41943de4afce6649ef886fac741d867aca5f3,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,59bf4499f6a212f42ae35f0f4ae8b29f516e5ab43cafc2dce3f864a2b5695b03,Tests_passed,baf722427019578115e289859766958bfc40d6385561bfbdb1048b9c4902895a,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Tests_passed,5782b8a7718165d0621dae5db0a1d5a46757b33da7aa61a58250fe8461897d35,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa,Merge_failed,ae318a23f804a44bb4b773068063fc037720a75c93da2ddee452a953d176bdfa 10,refs/heads/master,18402a3963837f0348650eea9f7c3801c5a4f313,89652f6f7057050c1fa79d9c3d45da96adcef512,7cd6815eb698eb29b06279faa1825503e3217824,,True,True,True,262,1397,9431.0,43,True,284,Tests_passed,7530f2b35e7308defcedad3278abef362062cf0da8e7058a999a8ded0f78e802,True,Tests_passed,692c164406c776d3371b886bfda1da26b9704a31764130e518af5eb7abb74828,True,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,f09365e6225552f6c21a991080e39225988d98806f80a11486f2f0b22d2037ca,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,372a26efa19965ba9a5aca9a64a4d705e18adeef1b69e07c1d3cf66ba477e5b4,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,c805e0de02ee53f647ee4d8dbcf806ae13c573206ebdfea25742da4c7138b3a9,Merge_failed,fdef79629edaad1d361662cd4a459bb82d91e13e1d512b59e52108e1191d297b,Merge_failed,313f2831ca1e1a7246baa26da3ebb7a509c8c62e2f8d8a3fc2bb0cf1b5edd341,Merge_failed,1f997a3eaa652a692a39ef137940c3f605f259aa29b1689f266178f6c3892e44,Merge_failed,fdef79629edaad1d361662cd4a459bb82d91e13e1d512b59e52108e1191d297b,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,372a26efa19965ba9a5aca9a64a4d705e18adeef1b69e07c1d3cf66ba477e5b4,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,644127ddf492496f390666e8b5642f11ac89e3df460261c73b604be63f5e8d2a,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,a243f06460b80b58aadb6383ed3360f9d9343574db179cf608a8fabdf2a97be5,Merge_failed,13cadfb3a35e0fea9dcc2cb863d96d60c7c1a55c180061ffb89f2ae750b83e41,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,f09365e6225552f6c21a991080e39225988d98806f80a11486f2f0b22d2037ca,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba,Merge_failed,fe5ffc98876a4ad3f3e5843e2cddf5bf0d2d9008c07cdd01460a2662895971ba 22,refs/heads/master,1c1ae72b5b1c56bd825f97b7769967208035e99b,56a727901b6ec484561d08c491cefa06617fab02,9bec68dd0f764cd93aaa28f5493ba4b4ec560e75,,True,True,True,73,159,972.0,16,True,82,Tests_passed,bfa28a75d29e72e5eae3d08ab57c15450511267c2060ccf7b237b2919bfafd86,True,Tests_passed,35b44bd74869b7794ffee852a4d0c9be45a591e827e38541772a669da9cb3419,True,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,3228fe7ce8a883387f4187df81c3a77910e0e26f2f12499ce7030063a4047ae7,Merge_failed,07711ad34a12e4b099082c3a03b320b2d3fb41cd27f1cb3500e7a576b8c3a31b,Merge_failed,1c2536e290ffd5d09149cc59431a95e9c544d95edc1f1d22f02cf294def1a939,Merge_failed,91391e70772383f79fab7f9291d6a76e1c066ad4c66f5bcde5b758643b4c2219,Merge_failed,07711ad34a12e4b099082c3a03b320b2d3fb41cd27f1cb3500e7a576b8c3a31b,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,47ea343ababe3f2882d3658b0975c0254a057e34655569e83ccaaf0eb98884a1,Merge_failed,ee4ae6230431740027708a6886688361e2563ac17bf41bd293e155a02d728035,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e,Merge_failed,6946d3baf26762a09225e09736acd2e4a364087edae66d0ca2371b2f772b611e diff --git a/results/reaper/merges_tested/projectkorra/projectkorra.csv b/results/reaper/merges_tested/projectkorra/projectkorra.csv index b248a14bbe..722759754f 100644 --- a/results/reaper/merges_tested/projectkorra/projectkorra.csv +++ b/results/reaper/merges_tested/projectkorra/projectkorra.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 622,refs/remotes/origin/pull/665,f877fa16a0ae7077c564a42d9a0bc53a5f34666f,15d448d1ea349d4185bf857b94c4cb6dc6fa4457,6b656cc7117be8727b6fb8aec5d947b1ec14edb8,,True,True,True,8,47,196,13,True,16,Tests_passed,6aa7d9e4565f07285cb2fd036aa4956ad7146cb791dc8fa8f1a08f7b084698a7,True,Tests_passed,ae47c896fc6a730f642a04a2a54f0ba688fc233b9b02e56cd39061b6911ecf51,True,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,fbba7a87a932afd4f144fc65c361a9432d04b038908952e11168aeb10dfe41a2,Merge_failed,224a25d02b560fd0ac632eeb0b0491641879a5ba2f7abc8175b4f2b97ec643e4,Merge_failed,440f0b846ee711739b9c2f02d85c2101862cfe95f4884f421dde15e700e1195e,Merge_failed,bb2594e1f92deeb52db9a82b35c4081e8d8ae1ab6be68482bcdc88866994a243,Merge_failed,224a25d02b560fd0ac632eeb0b0491641879a5ba2f7abc8175b4f2b97ec643e4,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,bd6d992c32ded34e88f7dff8dbd1e090bb14f70d1d78bacd12225ce91c40a682,Merge_failed,440f0b846ee711739b9c2f02d85c2101862cfe95f4884f421dde15e700e1195e,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406,Merge_failed,cdba319346660edd6c37ff4090cf8a644782f0cee075f3262ebd09d09bc8e406 623,refs/remotes/origin/pull/666,a0f05df6f745d01f272a5be66ef778ed5ae193cd,49fbcb1134f7a1383cc805ff314383be358038be,9d15d8b1222ffe199dfaa6bb7c77758cd5954991,,True,True,True,11,177,647,4,True,12,Tests_passed,bae4ee643500818fb6536d38c2065abe7a8b9844cf03bad0da73b523eb67e205,True,Tests_passed,93d70aeac8af1abe2c35be14e9417fc76ec09089e100532f202f202a8d97ed29,True,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,4aee218bf130193cb1ce9ab6ab963f6975ebe50c281003b0795cbc12cec94a19,Merge_failed,b6289c8ea9d9467637c58e2fcaacefc590c6cb8219babb98604955aa69e64bde,Merge_failed,74382833afef677916f9272e338a922722f2d0848fadc44ce52a416be7ca3209,Merge_failed,f364e921235e7c68b3e2ce80629e432af706bad447b6214d5bbb83b770972fca,Merge_failed,b6289c8ea9d9467637c58e2fcaacefc590c6cb8219babb98604955aa69e64bde,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,014b4b06be5d84fc26c1781d13dd90f4dd9f29a329cb9cb3dc11669e8e2ead65,Merge_failed,74382833afef677916f9272e338a922722f2d0848fadc44ce52a416be7ca3209,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a,Merge_failed,6245854106eb7799f89dd67de79c6ce9aa8276dd606a89ae00cfe7bd888b0a2a 625,refs/remotes/origin/pull/676,35563df4e12844ede30f99ab645d89ff32696c7c,082176e98799dfcbb44ac2ce430ed1a5e5602c89,4ac9b8fb6e2e801ab765d44b480338ce71ca7476,,True,True,True,20,115,384,2,True,20,Tests_passed,1f24a4d760c6945120f787a801596332528289d5988e690c782d99373559e156,True,Tests_passed,10ee31fda41142b445da9538a8e7298f1d827b3554f8ea19410728716d8dbc76,True,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,cd8c8760acc098d9d5c0034d406770481a01553a3b6656c8a477f3d93a782b5e,Merge_failed,2f0c908006c91b77f6f41b2a23cd2f7c6576f89844b7ba982fe4727f60ea2c79,Merge_failed,551ebba5e70cc758d22ae4adc3d1a998aebad62f6111f1944265aa0a8982adf3,Tests_failed,959396bd533bef45be3be7a2d14dd894e62d64219165709423420af89062d455,Merge_failed,2f0c908006c91b77f6f41b2a23cd2f7c6576f89844b7ba982fe4727f60ea2c79,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,02e22a3eeec61a692b408f2fee30c4f25b406cc7ea20e69299ea060747ee52ea,Merge_failed,551ebba5e70cc758d22ae4adc3d1a998aebad62f6111f1944265aa0a8982adf3,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,ca19287ea2241cde46001bf1e0a5e1180c1853f6d52e956fcf9364a0e0b31afd,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be,Merge_failed,bbe1af75f9fd6addbd1af52e840fc32c8c3107bbf168dd217e5b0961700434be diff --git a/results/reaper/merges_tested/ptgoetz/storm-hdfs.csv b/results/reaper/merges_tested/ptgoetz/storm-hdfs.csv index df49c72298..1947dc6b07 100644 --- a/results/reaper/merges_tested/ptgoetz/storm-hdfs.csv +++ b/results/reaper/merges_tested/ptgoetz/storm-hdfs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/14,563b4340f350a93c9efb6a6991b8028d16144345,8007c40b349f8cdedbf10f95bd480db1cdbc86a3,be5eae3bcc07cfbaf49c19c57da42dac1351a3e3,,True,True,True,9,48,315,4,True,9,Tests_passed,e65dcd2daa1f316f295653444319c789f75f86ef6d433bc6803de8e994e81f27,True,Tests_passed,23795b9ee2753e1d584e00ec6fba7972b95b74e61d5218279564f331688d9f85,True,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51881ace6762cee4f94312594415fdaddabc7442cf731e8e813556e0e23c769d,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,51490bf23c4f41cb94b482524c35841d2183af2b6770f610dd0c8b800a1a67a3,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf,Tests_passed,8b0f9b05a391c63d64a5bba2f6e315abaff3740ac93935fb1967ad04bbabdfcf diff --git a/results/reaper/merges_tested/pydio/pydio-sdk-java.csv b/results/reaper/merges_tested/pydio/pydio-sdk-java.csv index 7dd4f28e29..868216f505 100644 --- a/results/reaper/merges_tested/pydio/pydio-sdk-java.csv +++ b/results/reaper/merges_tested/pydio/pydio-sdk-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/develop,29da20204a34f94644314baa2da9f9c436c3597f,dc81ee556594723f2ee47b2d264bd74f2874d3f5,5f7420e9df2f3a9a6b9908f0cada5be9930a5f27,,True,False,Tests_passed,55187d38795f66b3594e2b1931f9e059bc7a8cd51948c799ba88fca72a959767,True,4,19,69,2,True,Tests_passed,3a040643ace61f3a5682c6def579f7805282f5645df08f17344d2da32a436a5a,True,4,True,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_failed,04794da4bd4c21a82943fcf932cec8048b89dbc3925d45d4c7604ebd2aa6e90b,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,31d332f640664ab9ba7fc9b176e04cad5ef5b6ba7dd14d5550d420a4e55d81e5,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,32136695ac08baf7be0996e7ffffecdac66213e377ab57ffe4969c190a369ada,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,c8e88c29986b9e1793e24de71e65663d0fe523d8298845e484cf5b92d538666f,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641,Tests_passed,425d06e6db20ebc218f8ff63518f322af1abea2ede309c765a2951225849b641 diff --git a/results/reaper/merges_tested/pyknic/codegen.csv b/results/reaper/merges_tested/pyknic/codegen.csv index 9b621a2839..03f86a44c6 100644 --- a/results/reaper/merges_tested/pyknic/codegen.csv +++ b/results/reaper/merges_tested/pyknic/codegen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,3e0d4067f68ebf4163e850c7031571271b4893e0,c0a3be22b99918411b41e1e075253e928079c2ea,cc625538048bd84c0763de49f8cceda5f40b9cc7,,True,True,Tests_passed,e5b84acceeb2830bb1ab1d622d07db01610bb2f3b652ac09dbfd2f729aefb7a0,True,146,1034,5810,25,True,Tests_passed,746c55dcd348adf7169a334ad98e005a4205ec95baa1657ddd17fdef75ba84f4,True,152,True,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,51c0153f0de5a337c6a1fb9546b38866dd97633fb2f59242f83cfa6a891fa731,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Tests_failed,3c4f902f354f00a3f8f3ca65277c63a22ddc50d4e35da6e2870a816b99ccec8a,Merge_failed,c1c3b2de32b5cbfb1275e137397dfab630cc65fba57fc0dfa56bdaa6d3354d6a,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,07fc518a186b151ad0389931b370d645714aa17ac43eb08668fba8497781abaf,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,4da79463d2e2972e0ba67b799dfe00cc88e1201cf3adb26c4e7d9c6289798a0f,Merge_failed,12e3205204d86394fa55fb7f406d96c75f31be8d7d6b4ad4da73f3d750e498e6,Merge_failed,37d4e06fcb388d3f0f4ee5b3b847d114c15cee1d68b3e6d8d7ba7a872bd4157e,Merge_failed,184b8f7c945e41a1ec36d985a3637f071ba2db961fb45915c52d45c03d00c569,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,74d7b5a6a1e7ab897868e3ed8609bc084cf65c4c908a980febbf70abd9527753,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721,Merge_failed,46e4abf7602c40be6bf6a9887cb472e201861f53149d8d6b192b9c8008b39721 2,refs/heads/master,b718264121f2990b0cd2df982f93714ce9b2fe14,63f8adf177472d58100b2c816febc3ca66906893,d2fafacc6d78d1bd45847871f16dc48c5e7b1dae,,True,True,Tests_passed,cc9d9d3abeee51cb504f8f5c85461e7e82ef43605f9cb8f31a6baacf006c2243,True,17,46,240,5,True,Tests_passed,1b43989145121fb98c5bea85fb025080ee9c4f0dfc1adcc0f0291212973712a7,True,17,True,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,63dbe88e697ff81a0182945bc1e25957b022f92c24a9fb7296e0f056c4bcbdce,Merge_failed,6142889f00bfae78edb4642601540fb6773d36e121b8887d36f397efdc5666d6,Merge_failed,c8edbcd18bf231a6a0c584c2769b01b26c857bd029c15c284001ebcbd15c4aed,Merge_failed,ede796c1c65841c14a00d071766ad2a712875ef7262c31fcd0dc17f2950aea52,Merge_failed,6142889f00bfae78edb4642601540fb6773d36e121b8887d36f397efdc5666d6,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,30499e11f44ef4f7070676dd79723aa8772f1c968c0e42b5ca0e3043870e5740,Merge_failed,c8edbcd18bf231a6a0c584c2769b01b26c857bd029c15c284001ebcbd15c4aed,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,3a224a2efd899625aa38560b04898035d4a58fbb93a38720896a1550b7827d96,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5,Merge_failed,a83252e608aa2b291a16553ecdb2fb507775f9056d6a5e1be073253f8d38f3c5 3,refs/heads/master,e303235d2e0f90a3ce6a72974a8de27ec144599a,eb730eab8d6b2e0fc7cb8f6dbf42b1793c840114,9b8bccd742bc7457a13460777537688ce981b794,,True,True,Tests_passed,9a7d0c00c1a200e7e2f3f3431656e1373cfef554ec30fe4b3b612d4d92403b65,True,120,345,6358,14,True,Tests_passed,05b4d31b52f256ba11b18662c7da5e199929b6be4f915bb9485ffa6fea24b85c,True,122,True,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,a1e76482298533bca214b858624c0996013cd78744a14bb608eb52c19d482655,Merge_failed,3a815dfea826bc3b45a7aa36b381d129862032eb27cae084dd1fc230b35538bf,Tests_passed,67a5578c6f4bdb17a425ff8578d3c977398455340ad8542b9cc2ba4738f5e975,Merge_failed,229f80d5f57400ef58e16ea08488f3ff4a3f31d3b257fdc522cc5a25ce380898,Merge_failed,3a815dfea826bc3b45a7aa36b381d129862032eb27cae084dd1fc230b35538bf,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,a9cd086b0961d02e68270e548ba49301543c634fb3c0bbebdb7ebaddbe75cc44,Tests_passed,67a5578c6f4bdb17a425ff8578d3c977398455340ad8542b9cc2ba4738f5e975,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,487cf268bf425db6863199377d77b03fe5edcd6ac7b59787e28a12beb06b158a,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39,Merge_failed,b4c065817fa46edcfa981b52549948e8cab0ba2c461dcbf018ac7fb91be7dc39 diff --git a/results/reaper/merges_tested/qcadoo/mes.csv b/results/reaper/merges_tested/qcadoo/mes.csv index bf9fec8278..2bb7b46fb5 100644 --- a/results/reaper/merges_tested/qcadoo/mes.csv +++ b/results/reaper/merges_tested/qcadoo/mes.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 768,refs/heads/master,c6cb8180e580165fb264a0c9291103ccf555b442,684184b7c172cc38c58ba1b7092ce871d1df7e3b,01c287a7f9e0d6411c88f93824311dfb8ae72778,,True,True,True,44,229,1097.0,4,True,44,Tests_passed,848a7b558fa74a960a8a4d450559b387ad7478c15f1bebce925f35d06452d8b1,True,Tests_passed,f050ec701c6807533811e4789d73802c9b9a6c562f575547b0ce34a000868459,True,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,fa2815d9d89923ffebbdcaf224518cb6719fd9d8367c31d548992cefb92426a1,Tests_failed,a40136c6655cdd7a6e6dd4e3ee8835b72068f4dc4f0c69bee8f60f298798cc70,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,fa2815d9d89923ffebbdcaf224518cb6719fd9d8367c31d548992cefb92426a1,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955,Tests_failed,873eb8b5f98324bb62443f5a78fc49a08dabdbca096da45c64f652eb6a1d1955 804,refs/heads/master,c92e64705cd0b35f732db3a08e7c8ab590143e51,f8251b093e62addc7d934f217e9e968a986ee4ab,07c57feaaa7347045c73ac71fa31d7af2a4b2848,,True,True,True,25,68,740.0,2,True,25,Tests_passed,759a923dd866c71f0053bc48876345dfda4e22f66864a2a166ef81fc1b25957f,True,Tests_passed,d0ea70a693fa8e1d3fe60d9b71e7aa15d677ba1a2a1125520822ae6f804318a1,True,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,cea20343ad4ed7e974d68c6d243decf7d237080755921a8056f6c2f1e80ed692,Merge_failed,cea20343ad4ed7e974d68c6d243decf7d237080755921a8056f6c2f1e80ed692,Merge_failed,cea20343ad4ed7e974d68c6d243decf7d237080755921a8056f6c2f1e80ed692,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,2a553c34f13488f630ea5d040475309f11f0a7b30ebb1080ed6a0176c6b0c523,Merge_failed,2b8c8e98fdefc22ac84d31cdfe67e414dfca76e34568dc88fa5dc4a63d1eaeac,Merge_failed,e77a6ef16aad6f8c9521ee43f49ecdbf70aeebf64f138a7429d97698e5f79032,Tests_failed,72e7b56a564e3b251401bb5403a6c4aacec9ee6b99e23ac01aaf8bd5d6a39657,Merge_failed,2b8c8e98fdefc22ac84d31cdfe67e414dfca76e34568dc88fa5dc4a63d1eaeac,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,cea20343ad4ed7e974d68c6d243decf7d237080755921a8056f6c2f1e80ed692,Merge_failed,cea20343ad4ed7e974d68c6d243decf7d237080755921a8056f6c2f1e80ed692,Merge_failed,cea20343ad4ed7e974d68c6d243decf7d237080755921a8056f6c2f1e80ed692,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,b2459c8d1336a3a57176e56e4fad04ec6fc595df635be205b838118580d6642a,Merge_failed,e77a6ef16aad6f8c9521ee43f49ecdbf70aeebf64f138a7429d97698e5f79032,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c,Merge_failed,017c14087044a1293b293060eeeda82e2fc76a2e84c11ccb2dac1df8e3577c0c diff --git a/results/reaper/merges_tested/qubole/presto-udfs.csv b/results/reaper/merges_tested/qubole/presto-udfs.csv index e201d0b205..c2dc772d1a 100644 --- a/results/reaper/merges_tested/qubole/presto-udfs.csv +++ b/results/reaper/merges_tested/qubole/presto-udfs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/6,4079746bcf5db1be249f4cab5cc8dfdd71961c4c,ea67e78dbcb8e5814bef147200ca386140286494,d178b8e62619906b2405b974facb07d565a0e26c,,True,True,Tests_passed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,True,2,11,111,5,True,Tests_passed,c09e3820fb0eaabc87977c3bce3c15bb23692857af2c578944fe8056b690745c,True,5,True,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,b1ce8b983657c6d6b72a193668b73355e15a20f3806ac7a1c6c82c34fd8aede0,Merge_failed,5ef69fa6e4c7b639ad0239d3ad4d998ef69b5868736fc2d63ec2dd9b6aaf43ee,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,6041c720c9658309ed52dcbed0d82aa0c553487cad0941a29fa36376a3c85e6f,Merge_failed,11e887b757a8f9b7eebc3fbd3eb6eefc29356bc8f1d4b269a7911934082e7b0b,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076,Merge_failed,0cb064f91ca800521ce706fe960ccc76878ec726e20b283c472f4b839b2d8076 diff --git a/results/reaper/merges_tested/querydsl/apt-maven-plugin.csv b/results/reaper/merges_tested/querydsl/apt-maven-plugin.csv index 5c44ba5745..30bc806d35 100644 --- a/results/reaper/merges_tested/querydsl/apt-maven-plugin.csv +++ b/results/reaper/merges_tested/querydsl/apt-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,a665fd53a68969af9effa507810b58a4f3aa5f8b,dbb7382379247c709a4b6194e0789a7f9d4bbe39,ba0b58a11190f93a62992908bbdc2bb201ce57bd,,True,True,True,4,14,70,2,True,4,Tests_passed,e99cdecd632bb5bcab00d309f785e200449f0ce754412ae2d6e29a3dde0c0803,True,Tests_passed,1a926c173a71ba675eb682ecf9b40e8784211a5d8ec731343c50373a50a5a090,True,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_failed,0d9f5ba5dfbd45d823e3fe15ff56999c7db30cbf14db780837bd195d6da4bbf2,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,50903bd06e41b2a4c6673d0319e4d9c746137671bc2327226fbb6d90a47da9de,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8,Tests_passed,e42097d074f58db06ae753eed9f2d45d05ce6eec684fb766b407fcbc39354ab8 diff --git a/results/reaper/merges_tested/quux00/simplecsv.csv b/results/reaper/merges_tested/quux00/simplecsv.csv index e35b03aa08..794cc5bf54 100644 --- a/results/reaper/merges_tested/quux00/simplecsv.csv +++ b/results/reaper/merges_tested/quux00/simplecsv.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,e0ad6010aa7bdb86ac4b59bbf90337b6929108d9,7d4cfeea2f8674d55c5cd2227b0f4150460c4a60,b91e64b85fbd567d874906f36548c2a91328e864,,True,True,True,78,361,16653,4,True,78,Tests_passed,40551650259b743df2cedd556d58d694ee4e582fba58504a3b68e0a7ef471ea9,True,Tests_passed,b03ea54f5b4eba5d65b1b6aa57df08d733a189a99feeb63336de75039ceb8555,True,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,cf30a0b2be3d0cbe095ccdc27219ff655bd6623328493de6145062326de8c4fb,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,30004cf94dc5b6d5be669fac6c9b459f1dc5c14933b0ace2da57deea79657205,Merge_failed,0c5192b7b128a28c50366525934924ca41442e9ed06832e0315eefeab79a5af9,Merge_failed,b6edcfd81d8d52a433008adbf70473b106d8253831ee68aee153d5367ccd4b7d,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,9ea656546c19b8a624997c0a5088247ac0133fa987ba504ba5069788014ccb4e,Merge_failed,d5935322e421a72db1b8291a714d69f2c053e0ef720b2be3af471eb1b3ad5445,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,8ad01453cd031c612e42bb340b0f4b9c93805af319c37ddb93d93ad90798783b,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f,Merge_failed,394d5e40f834d2f93e598a29fef21cd20b2cbb905567142d27de6fdbc77ce32f diff --git a/results/reaper/merges_tested/rackerlabs/blueflood.csv b/results/reaper/merges_tested/rackerlabs/blueflood.csv index e6a52e1b15..1b1a93c3f6 100644 --- a/results/reaper/merges_tested/rackerlabs/blueflood.csv +++ b/results/reaper/merges_tested/rackerlabs/blueflood.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,d158fbfcd5bfcaeaff7b4d1b62984ea5fe3a4f4d,5e40635ee3b2b46bfa3cde9fa1e42f3a992b0e06,f37f1278aeda8c0b64b4b6ac1d6ee37aa6e0417e,,True,True,Tests_passed,eeb8c4c08eae5be36c3a965732fad9258e47e531af3423ae588857f63e5bd162,True,10,27,652.0,2,True,Tests_passed,5d19b3edb0cd138b14ce9be27b31dbf498969fe16fbdbb5fbabe6dda63741d77,True,10,True,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,2adc699e57ebfe848f160b0438f23e3c9eaf71d09c2b238c77aa95511ecc52bc,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,2adc699e57ebfe848f160b0438f23e3c9eaf71d09c2b238c77aa95511ecc52bc,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43,Tests_passed,e1162ffcd96ec540eb70d57f88b4b0e9b908e306f7390ef5f2c51ba049b49f43 40,refs/heads/master,f83485d6abdaef72cf27abda4ee7f1a7951f6063,8133bf7948e95ae843ec029b268d7409bf2152ba,859a6a9ae5b584fc1969e84ce7e3c41f0f22678a,,True,True,Tests_passed,c0961f8c5ecae697c6650457c732ba77254effd5d1fa7624aaa036c8619847e9,True,10,38,582.0,2,True,Tests_passed,391766fae545cc73b60975f58b7abb6a4a63bd86ff12d8b9efbc213fdec4cd4e,True,10,True,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_failed,73e958f91145ad7dac8318f1f0a1b5a685af39cee84856ca1da2f43af7dd41c0,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,45154f56c300c8ce2378c1f6b27bd80d7e2edefb3dda3d9ee9e40ec38cdfbf98,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9,Tests_passed,656d0f6a932eebc62f46127dda6df6a54f27c1d4f71c9e988ed08f1bb49a17d9 826,refs/remotes/origin/pull/45,1200c7e78484eac21969bcbbe2acfbfb7e3e227c,db78f9f62d2daec8a705bf465e54c5824fdc8869,5614569fb09c7c77bcf6e602bd8b405de02798b3,,True,True,Tests_passed,f15d2da453d89642d7df9956c3a1e089bf8307217384912a0b6685037a444f1a,True,66,65,5374.0,2,True,Tests_passed,88a5f7cc226a5ad8333e97ced7f94f4ee846e4c6a3e6c544d48e864242695fec,True,66,True,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,a8fc8ba758358ddbf628d96cff524382e5bc2a4185aeca6329366c21e54c0008,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,a8fc8ba758358ddbf628d96cff524382e5bc2a4185aeca6329366c21e54c0008,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a,Merge_failed,2472d21af4f1b17f5f5171c9a50221aa7a027fd40d73bf124265eacdbf8f8d2a diff --git a/results/reaper/merges_tested/radkovo/cssbox.csv b/results/reaper/merges_tested/radkovo/cssbox.csv index 4f8c38b8c8..0adc6f8548 100644 --- a/results/reaper/merges_tested/radkovo/cssbox.csv +++ b/results/reaper/merges_tested/radkovo/cssbox.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,a43ab1df773cd86623a45610d396e2d3048efb6a,fe025ed3eb78c1d09be279b1ff43a81269e6def2,71087dd6359c906ef07d42c80d7d0d76ae1d99ca,,True,True,True,14,77,585.0,6,True,14,Tests_passed,642adc7bd4d53f9a21c66f7ded2c0b4b342554fe7ffe665a10b777f0d64966dc,True,Tests_passed,d90d53cd2dbc93ec0047a45a7e442fb2b0d48c4bc7bf387ad381684e4e41e997,True,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,ae295d2f0d64ad31217b8011f807bfb1cff45e09a972b3689d924bab4205a046,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_failed,9b1dc6dbba2a7c7f75c98a64b0c2dec5628407ac09795d136368b071ef0b0f56,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,235b7fd09334bb937a37905fc25c639f1f4380a8b6d104d69d5224f024911e7c,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc,Tests_passed,290947419ec2dee51a7a8a939804ea639777c5b04405bbe32647aaa082ec67bc diff --git a/results/reaper/merges_tested/radkovo/jstyleparser.csv b/results/reaper/merges_tested/radkovo/jstyleparser.csv index ed8a10060a..3c73db06ce 100644 --- a/results/reaper/merges_tested/radkovo/jstyleparser.csv +++ b/results/reaper/merges_tested/radkovo/jstyleparser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,eb599195344fd6bd2a87d34ec0ffec826b7f47c4,0f8f1b537a7f47b411d9884f48d5fb69e642beae,4abff6cd8b28c3d8e48f1be9da868d59870724c7,,True,True,True,27,187,1739.0,2,True,27,Tests_passed,c5425ff8c7433b0d39bafbd94ace99df4e1c3d447cf1c7b66a0dba6452862858,True,Tests_passed,a2abf93da43c90abc6c8dda153a313bfd483deae4c8b64167ddced6076bd3533,True,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,7e1e965f2328c670919177d640645deef607bcd67423bad9ee6932b5034d18fc,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,aa755a69b7ae570fa6c8af08382ebc149abd95bdca35cf76bb0a21a06591788e,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e38d5568356d4e697875b3747f9b582affe44ec922cb9082257407630044f706,Tests_failed,4c96fcf7326f49868154734e77cb5702848417c70dde193777e58430e45db968,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,aa755a69b7ae570fa6c8af08382ebc149abd95bdca35cf76bb0a21a06591788e,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e38d5568356d4e697875b3747f9b582affe44ec922cb9082257407630044f706,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,7e1e965f2328c670919177d640645deef607bcd67423bad9ee6932b5034d18fc,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786,Tests_passed,e2908fc24d28df0287a766f45e7730b62005f89ec5e6869b4a037ab861773786 10,refs/heads/master,8f59a62d1400a52875e9d221cd43368a589a4249,c1e0f1ad746e881ffd87b73fea780f50b37071f3,c26312235c1fdd56a68dc5d240269bbd05862dda,,True,True,True,9,32,106.0,2,True,9,Tests_passed,e3f85d40a833ed92e01140759da7136c47808b873a531fc75cf86347b67e067e,True,Tests_passed,0b7e51de8e0874158fea7b7056320a1d9d802b22ef3ef394e61c1289322767ec,True,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,758c0ba1687a43694f8d86522fddf070c6ea95b5180746e8e9b8a56592902ed6,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b,Tests_passed,59081ff3657cd9de9799705fccc2484a8f1c71a8d2694c01b0e88bfc6f48973b diff --git a/results/reaper/merges_tested/radsz/jacop.csv b/results/reaper/merges_tested/radsz/jacop.csv index c5ed1ad3fd..2eb4fc382d 100644 --- a/results/reaper/merges_tested/radsz/jacop.csv +++ b/results/reaper/merges_tested/radsz/jacop.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/develop,709370e5e7ca8887a55ae12f3357138d7f38684d,a4c3d5c2677fcfde5ebba400dff84db1ba1d202d,dea313a8840655eb7f180b4bb17e3842917592c8,,True,True,Tests_passed,0b426a9d9350a3d72d790f76974937ea169be6de6cf1778fc98f914d213a09be,True,1951,6948,4410953,3,True,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,True,1951,True,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4e1f35ecfb0e04dbc1c9fced6bd6a5162aa467fa2114cfb4a8d7c661d57b84ca,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,89f26487d0cc7eedd0b31c4fd54155a801d5795186efba5f82c010cf0f79ec61,Merge_timedout,,Merge_failed,27859fbc9ef4144cd73923ff3de4d1b8ee138f0354995937f142660394bf8ca2,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,e77617464cb4cebf8f08be340789c3fab0f3558f1fa13ef5750fa4d3b95c0d16,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,4c4c9930542dc1dbc33cc57e28e93a236edd400b08eaaa5f04df628320d72f48,Merge_failed,9410eb3d41ebc27b957bc3f2373570a6abbbe6de963c24b509962d8685f1fe40,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Tests_passed,eec2f88e7e06a8bea8bcb8194bc93d564c0db97a163a99137595d55f9892c7ab,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d,Merge_failed,c1a09cf56ca80a1362a94a9230d1c96df6fb2443852f468b6c7d0667f972f29d 12,refs/heads/develop,dea313a8840655eb7f180b4bb17e3842917592c8,f2d204e02ffb65e123ddcaccf7385ca1dfd75f28,4875674b2d848e72175e1a6cdc5fa1fbf0984944,,True,True,Tests_passed,918665ff3e05bf44c7afa09a4790041fbce60098ceac25f415c4be3eb495d957,True,5,35,498,2,True,Tests_passed,69683b712a9ae236967fa107592bfdcc6bbdce4b8a2b9c51491a68f6c4397778,True,5,True,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,097b74e44d2f57b65581fdbf1868f04840cd6b406d58f8a877776ddc517b443b,Merge_failed,6f6c2560962a3d743a849fa8d85b11467de9b082c21da5fc167b1da6dec49f81,Tests_passed,f438300257ba85ca196918fcdbbf189297d931a0108b010350635ca898808510,Tests_failed,e04a7a6f25ec3bae9305ea7c99fe620b0e7435677c84f9ce6d95685585161730,Merge_failed,6f6c2560962a3d743a849fa8d85b11467de9b082c21da5fc167b1da6dec49f81,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,82f8238993e74be800b5b9909c1a6f103dbef9f3c10566d7bfad7b7a6d5754f3,Tests_passed,f438300257ba85ca196918fcdbbf189297d931a0108b010350635ca898808510,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc,Merge_failed,cec24a3697d312b0adae108c489a322b9a22385af2d36cc13f998f717a70a7cc 14,refs/heads/develop,71277a949925deb601d63cc793c5b2bf152ce120,356b911af972ec1f039dec4a3ec926e56d242a02,7f994f212a04cce6d0d871bddeadf8fbb82b088b,,True,True,Tests_passed,8b5373607437ced0daa5843eac7212e5fb0fb5779f97b38910ffc4d1322956ec,True,1357,1535,4381894,2,True,Tests_passed,842148d81455a7df777b65396be9ff02b745219858ec61174bf45e4917031ab9,True,1357,True,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,cb2afeafaf599833c91a89272c29826838b716e72f85d80568af6aedaf2c0f0c,Tests_failed,94db48dea33d16bc4291d3b4aaf606687ff87dafb91a39ab88fec02075b116c5,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,cb2afeafaf599833c91a89272c29826838b716e72f85d80568af6aedaf2c0f0c,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc,Tests_passed,fd49267329b2c20af61ee7ab711e7de8330454e36102d9b514f7f49f969d73cc diff --git a/results/reaper/merges_tested/ralscha/embeddedtc.csv b/results/reaper/merges_tested/ralscha/embeddedtc.csv index 0c2653f0b5..0a2e1d0235 100644 --- a/results/reaper/merges_tested/ralscha/embeddedtc.csv +++ b/results/reaper/merges_tested/ralscha/embeddedtc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,bfd16f6a9720ac0ff5fdcddf91a5ddd18d996ae2,d9908dceb43b0c27fa9699630dfc3714f224170d,9fec12b47ef5a0a668443caff176254d78117055,,True,False,True,2,1,2,2,True,2,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,True,Tests_passed,d793988448317818b80e57579942e79a08b6af00bac838b24f7c716c1ff20d52,True,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_failed,6fc1030734ed957f82c2e81bacd6b486859153f34199ea591b1a4d2677593e80,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,dd5e20920be25422f6b323ba080672cc8b433b9b063c0eef29af603edce984c0,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574,Tests_passed,1b604bc4029c1c23f19a7bf75ab5f49b6500cba4428838ca587a3742b8119574 diff --git a/results/reaper/merges_tested/raml-org/raml-java-parser.csv b/results/reaper/merges_tested/raml-org/raml-java-parser.csv index 66dbe7440e..406900f746 100644 --- a/results/reaper/merges_tested/raml-org/raml-java-parser.csv +++ b/results/reaper/merges_tested/raml-org/raml-java-parser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/623,ae1104a8aa2b37f92b8aa6485cb38c285310a5e8,83a2384ffbfb2d7814dbc458b27dfcd09f589a3b,3cd23b57bf897436eaa3ecd5d45358494f9f7671,,True,True,True,23,81,1030,4,True,23,Tests_passed,df4079e1916c26503d43aa89f37d730ad6f05b7a213506ec636df979c5ea58e6,True,Tests_passed,042e065ce82ddbe36f3f92807b53f66c1380b3b59c9d1bc7f1f4fc0082db6dd1,True,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,fe630290b3376c8e3fb64c661ffdc69c1f1625921074e40c77eb5f906218c6fb,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1,Tests_passed,4cd2056096ff80ed551bb9c5036d498be73502db8278fa034c3198c9dfd59ba1 diff --git a/results/reaper/merges_tested/rcarz/jira-client.csv b/results/reaper/merges_tested/rcarz/jira-client.csv index db29f5b2d8..0efd0e55ef 100644 --- a/results/reaper/merges_tested/rcarz/jira-client.csv +++ b/results/reaper/merges_tested/rcarz/jira-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 54,refs/heads/master,3bc59bcee2e94a0905d0325aa037ecf68133ca64,020046b7810822abfe7740fcd6f1a4db6802c598,83b0f75c090e1604c2fd93c00ea53907f4f5123c,,True,False,True,5,6,17,2,True,5,Tests_passed,edfd3f78755ba022452807139205e372f01f451d73a0d90caa7682a7663f9cfb,True,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,True,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,ce3d0078a812f82bead021c9a9057bf6231ce90225921ea35b5b295e7dc83e7a,Tests_failed,9d0d2f4c5296b8c88928a7a75671f64018105d2284f0117d4762d94deede0a2a,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,ce3d0078a812f82bead021c9a9057bf6231ce90225921ea35b5b295e7dc83e7a,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c,Tests_passed,af1a45db2121d1d2046e6dac6e9adc3757a645c99f4bdd383bf9232a8694fb3c 65,refs/heads/master,a2e6adecedc3d257c95533b45c83ad8be2da694d,999dd98d67f1a0a364ce721b2f77dc55f75d005c,1583879d639019e6e6c34782469bdb4ed3c8eaee,,True,True,True,33,44,191,2,True,33,Tests_passed,e9c9a8340bc7729542c85e8f0a379e865b0aad23b3b8295a5806a57cee5a7c3a,True,Tests_passed,4e50c91719837e2ea43a9c2e1e15d88b5bbf7a07bedb2c9483fb5db8196eda8a,True,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,0677b55f7b10034f48ac23f271a8a631373a3720f6e6e63455bc230ea0653b12,Tests_failed,22d9f3fba29202f345fa99fb8e544b7478e249dfd013ef03aed5282d133fa9ae,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,0677b55f7b10034f48ac23f271a8a631373a3720f6e6e63455bc230ea0653b12,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b,Tests_passed,4a08914b51ef24c2fa4d1a0e7d15fefc7ef0b82e0135e5794eb87443a938642b 71,refs/heads/master,d7029e91216bdf42fb9638a846efbdd1550d2941,f51e5f0b18c1199f59f2dda994cf3ac8f8808306,ae6ced8aa637df02afad8605dceb8813bb57ff31,,True,True,True,23,29,1947,2,True,23,Tests_passed,59c9a9c6f5e09412b085f2222ea9125453fb7d85bd6d94dbf9409a7a44af3afd,True,Tests_passed,63bfc8fa482dabac02ad1d90ed10670dfb5a09bcc265c259f54cbb24fed6a29d,True,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,fc5ba40d6193fc892ee9a210fffc3c38f5366478cd1837a817b85b6ee236e0c6,Merge_failed,628aaef7c8d2dc784b0c7d4496f89ea2d954f26759933b49143c980029c1a34c,Tests_passed,581fb8efac1127a76444cacfb65030f6de056b377fd0532a022c0b8f3a970946,Tests_failed,ec6f202c81f905f1aaf2c426a38faac85f0b2e1e7b0fc50bddbad89cbfa584fe,Merge_failed,628aaef7c8d2dc784b0c7d4496f89ea2d954f26759933b49143c980029c1a34c,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,9eec17c71032233d42a4141e2f783cc5afa2aee3402d51d20a944c85ec638ea5,Tests_passed,581fb8efac1127a76444cacfb65030f6de056b377fd0532a022c0b8f3a970946,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Tests_passed,93059be18aff178abbf04eafcb3e35c65297052218bc20c98cf4895d4a5faaf2,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77,Merge_failed,3f5a1b308adbe3db78535c6b36b9332bf9fd09607a5d7caa8f0ed84f24e44c77 diff --git a/results/reaper/merges_tested/rcongiu/hive-json-serde.csv b/results/reaper/merges_tested/rcongiu/hive-json-serde.csv index 322ef6c239..5728c7e931 100644 --- a/results/reaper/merges_tested/rcongiu/hive-json-serde.csv +++ b/results/reaper/merges_tested/rcongiu/hive-json-serde.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/develop,79f74539771c43c7d13ecb1f1ba86d01460c1e19,3d46bfb8f0eb65a2f0a9e2e9f925e2c4c1273c1a,27cf91b93257b75c3d107855f33e694e814009cd,,True,True,True,8,23,237,2,True,8,Tests_passed,d67210c651ddbba5b93b36428f8ffc0152acff776c43adf0cc8d6d52fd3e92aa,True,Tests_passed,8583d42255961ddd7854ff7f6010d4d210a0fb89d39ac1599c6acbb3e1f1618e,True,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,0840cf813f0e9eecc082b253e7795a1ab73b8ca53d79de6030144c6ff0d2eedc,Tests_failed,ab0f87eaa18c540d183b44379f713c5c057ffd33dcb162034932f01d7ea5f372,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,0840cf813f0e9eecc082b253e7795a1ab73b8ca53d79de6030144c6ff0d2eedc,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,fc5677297f9ecda7e1cd869976bd8cd21e8694849fbbfd79f85545668b237f97,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58,Tests_passed,6bf4265f9b1334ca6d364beafa90ab7d2247fc2b9ae5411ea2052cd21ed94e58 21,refs/heads/develop,86449da613900d3e02c87a2c45d6c6f731858130,1936f6dc438e040c207510141ba1e2f148c7aa6e,409c6184b8cadd945c3c44da9bde386e0646c115,,True,True,True,25,155,1097,2,True,25,Tests_passed,36144dd1f5094661f82f457985b9d51b8918a84501bb75e05bec926f40ea28b7,True,Tests_passed,259c726b8278cf3f98af08d42d9d491141c85149a1882474c8756f381493e85d,True,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_failed,e93437ddfbd7f7d846a402cbeb4434ee02a66835c51c46910c2321d74a276fd6,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,d781216a17e8685b64fc547850b7cf064b1b0ec34124cbede1cff064d4b69d48,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f,Tests_passed,43429cb3036925ea2aa6fd61d50b7a685b565e93a43f607a93bd8fc74358835f 23,refs/heads/develop,7e380ab961fad641cc834600fbcd2557c3f5f998,06a73b96943ab1ceaef770d83156cf0e37d77d41,bcba8008dd383adc7e1569f37d7d8b21acbfc808,,True,True,True,56,259,1960,3,True,56,Tests_passed,78390f0298d79af5aa9ad6cbfc2dd456dd8a71586bbadc1d37c43cfcd076d1a4,True,Tests_passed,775fe36967f76c112fa1103dfe6ff915a1394df5b532f59e0567519b36ee11a7,True,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,c1da2e432d3b396a47fe17fa5a5e9ba606c87219d2da8c965aae4d8d47fff25b,Merge_failed,8e07e934387c0b60564dc93e350f4725094b938b606820c7b8f4e064f01041a4,Tests_failed,fb672dcc8244ab21d2800ef54a7d11576fd12c46bb45d3f0cc321688f5a5226e,Merge_failed,50c0c5b2461a43f4a69213a0c17519f044ca07c2130d7ac6f9a8ad01fa34d363,Merge_failed,8e07e934387c0b60564dc93e350f4725094b938b606820c7b8f4e064f01041a4,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,5de103ec9b543b9658bbe041fb690e3ba27213f870987c8053a840e30ce4a313,Tests_failed,fb672dcc8244ab21d2800ef54a7d11576fd12c46bb45d3f0cc321688f5a5226e,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6,Merge_failed,d78a19be53a9980f82b9c7ff123900e645e2fe5107611b73945dd08ee69eb0f6 diff --git a/results/reaper/merges_tested/rcsb/colorbrewer.csv b/results/reaper/merges_tested/rcsb/colorbrewer.csv index cfb2eb1ba4..7bb2fd3ce2 100644 --- a/results/reaper/merges_tested/rcsb/colorbrewer.csv +++ b/results/reaper/merges_tested/rcsb/colorbrewer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c551ca68b2e9bdc50824f990db085754ffa6dbdb,43693ef94faa798cf7f15dd0f3557c377e9a201c,ccfe414fa1d26237f8c9538fc5ab255ac8746a1f,,True,True,Tests_passed,238fb7ce6926ddc3255f3e34385b4fa728c7ebba038d895b3cce8ec92dbe3106,True,12,68,454,2,True,Tests_passed,ca9a9f5c61fca4d9d0e96bd8e8de449ad3ec3d2133315ec76c8f6a75293839d2,True,12,True,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,ffc51d80ac1a6f8571969d141ad8f7486d339a97ead4471540a5065d7d07303d,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Tests_failed,bf79b14d1da5d4824b2978599c8f48945889403ecca92a9fbf5ff6e3ac0e83d7,Tests_passed,0fe74008778fdd74ff4bc2d26ccca5372dc0bf4d94a07ca934fad4b4600d4b8c,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,1d46a80d3d5252eb71298a5055e2d9efbaf756304b100dafe0b0d1402da52d95,Tests_passed,8c2bb60b283c23d522cd6775587b1a0edbf8369347ed91af7e0475e7abeb2c68,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167,Merge_failed,15e4874726b6735392564ed828d7158b6b2d074b11dfa044144bd5c3bbdd6167 diff --git a/results/reaper/merges_tested/rdfhdt/hdt-java.csv b/results/reaper/merges_tested/rdfhdt/hdt-java.csv index dc90f9cf6e..e56abf4438 100644 --- a/results/reaper/merges_tested/rdfhdt/hdt-java.csv +++ b/results/reaper/merges_tested/rdfhdt/hdt-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,ff0bcdef7668eee10d3bc72f1ffb13b04450583d,febc5677793217866297d9012b67d28181c7974c,3b5908ffd3ca5abf83004849193a2ac76f43d571,,True,True,True,31,148,1808.0,2,True,31,Tests_passed,f01ebc57c76d0b59cb2aeb7f50e0a1aa25ba9f2a7898be502c4cc7be79d8883f,True,Tests_passed,f688bcac6fa3495683bb16c547baa7ec7b433da837236651f7bdeaca6beb9577,True,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,917f6dac0c900a625bf4bff57b8bd3d1ab2db432381b2b76c1a44bb4b5fa8b44,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,917f6dac0c900a625bf4bff57b8bd3d1ab2db432381b2b76c1a44bb4b5fa8b44,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425,Tests_passed,bed99f9988e13cc38c231e5489e144466d768bf60d53dbabbf4ed24a97d1a425 9,refs/heads/master,d8d4b2a826b545a720460952a32d1ad2c92eae19,aa1ff09f537f595edd44ea1a52d37abc274b049b,eac943b6ef4ae65ab6e0711f6d115aafc0939cf6,,True,True,True,71,295,4698.0,4,True,71,Tests_passed,891391d210ed46682ca48cae948dd2f054044168932cfc91054c83cf45799d33,True,Tests_passed,0c52a0fc5c05f9ead21cf1c689dc72426418260e5676f0cc2ffc6d3696b15d45,True,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,9fbe0e8f423c379ec7ccfd3456efb8efed123a9882429a96ea89057566b0c55b,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,9fbe0e8f423c379ec7ccfd3456efb8efed123a9882429a96ea89057566b0c55b,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,12473e5e3bb16d910f007f46daecd9bb87ae04da22019a8d58795d744b8b5fb7,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208,Tests_passed,f0cefb5e996fc3fc22d7748b88b8d2683fcef5e5f6cb9d2b880b9f7edd4bc208 39,refs/heads/master,0ffcb4346092fc2daeb5685e0da41f91df64f589,594e5f6d7bf7bd35d010eb732f4f1bf48fac894d,fb33ab9bfe944f614db96d9926dccc991bcb592c,,True,True,True,22,101,2413.0,2,True,22,Tests_passed,77f3d37da75f025a067c20cefb982fe528f4ce79aefe29aad33451049bb6bd85,True,Tests_passed,bfefcdb31265e93a42c832c230c6dd9b1089fd3349eac70ef43e632b531660da,True,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,e892ca99c17b47fbc5850266ac32901a5c138baca6a5dd8585c528b81d4c3d40,Tests_failed,2502db17366a994bd68cfb6774ff6bdfe5093f5aee8f6066a4433e3fece579fb,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,e892ca99c17b47fbc5850266ac32901a5c138baca6a5dd8585c528b81d4c3d40,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,0befff94fa0a640bf9af265cba3766fa5dbfe3fb8b1642444f6b359a130632a2,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e,Tests_passed,3c7d989a8131268d4da301ae19c9871ee64e537fb3da3ba8f5b529362197d22e diff --git a/results/reaper/merges_tested/reckart/shib-http-client.csv b/results/reaper/merges_tested/reckart/shib-http-client.csv index a0e3876219..56a59c3cec 100644 --- a/results/reaper/merges_tested/reckart/shib-http-client.csv +++ b/results/reaper/merges_tested/reckart/shib-http-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,536fe936a3def7020da2c514f6b2c42fd39b4d11,da399ec67592ca7205a57c599e4058a69669ad3c,3918e16a51c68433085c57c3690a21e4219b74ba,,True,True,True,2,19,97,2,True,2,Tests_passed,d4c1c32de7c810aea99daef55638bb0f41153fe5af179c6c004ef0a7d7161d73,True,Tests_passed,96df33bc8056dea40d7ef25e1175ec08eadeaa5409565001c92fa916a7bf77a3,True,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,9481a734765c0317d3ca5b78a1d69ea53c6e1acc515e22ccaba1fc9de9600390,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628,Tests_passed,60904a7bdea9f9ab72e397f408adfc6dfd0730396a588993478ef08091285628 12,refs/heads/master,8f3bd7175700bdc81d604f901cf80eb70c3d4abc,1525a43c562c5665bb6ebf53e57b6a711fb4f6ee,67ee9b698d6da6424a5c94e0b4f8938ed6d7cb1d,,True,False,True,3,6,22,2,True,3,Tests_passed,9506673b337f26f02ee304a54eeb85ed07df804f85934856c8530d9104c9af6d,True,Tests_passed,e5366f2d82476cab06a370d15a2cef0af4044855fee6d6af6a74fd6f8bd957d4,True,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,a2e2b2236758ece7648fb30f2c498a92836d77afc12e0e2c9e38ec61737152d1,Tests_failed,682c546e197633555cd12d7636ae2f5c5e606e2e5592697e8a5704f732e73ccd,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,a2e2b2236758ece7648fb30f2c498a92836d77afc12e0e2c9e38ec61737152d1,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6,Tests_passed,d2fbe6d643ab82ce12f85862fc7425ddecbef5af11531363be90e835672b51e6 14,refs/heads/master,a4b0d03cf989b0794cbd7d027fade64ae6159f30,742158590f0e4815d4b9747f16c2b6ef2b4ffb29,a76ce122e90f9351ff46a9a897dfef3e55d54989,,True,True,True,6,11,37,2,True,6,Tests_passed,3cbfa0904180bd502c1f2bf15133a11ac9f93fd8c396c2892dd00d1ca296bb68,True,Tests_passed,b0ef3726ed2496153bb45a1699060eb42d7d72b8aaeabd7e53dcce1833289a44,True,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,d01a2109d05d1ffe32ee46c3eabba073f7ee45c232e06c338c5a54b7214d1d07,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,d01a2109d05d1ffe32ee46c3eabba073f7ee45c232e06c338c5a54b7214d1d07,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3,Tests_passed,8f48ceca6d3c4b522f71fa8eda224a628fa6f2a61e21af965cbaf8fc00dc11f3 diff --git a/results/reaper/merges_tested/recommenders/rival.csv b/results/reaper/merges_tested/recommenders/rival.csv index 6e11fcb29c..30ac48ecae 100644 --- a/results/reaper/merges_tested/recommenders/rival.csv +++ b/results/reaper/merges_tested/recommenders/rival.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,a8d64144a645278ab58db673a56ef5ff43417d0f,35e15a2d817fa78d5673187304b7b0db0f67b79a,ddfa73bea6cc8ac327d313fa229cbe1b56cef22c,,True,True,True,9,17,327,2,True,9,Tests_passed,60571ade857332c578d2f66add29262b732f18fe63ed4a42082b31a84978db51,True,Tests_passed,f77ff9dbf10b7cb1035c46ae951426ba231b54ccb56527d58e4237441342d5e0,True,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_failed,7f55a721b59540e9bdbf3320cb0b705c6961485cf4d9d34a55d3c03d2cefb562,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,003f46e85961ac835b58908df88cb50cd6b542ea4698b9497a384f965d836828,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,7b684d8bd30ef35e92cd4d1d67d3d27cebce60b7feb1239e2b4ec162e0962c8e,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc,Tests_passed,c2305756d455cf5909af0c98089ecd8d20074c107643ec6868f6ff1ebcb57ecc 7,refs/heads/master,939b78c783eb43056a302013d8ccf9672b1799dc,de8a07bc53bc6e654bf7140d8d9fb86f75afe6d2,ef6912c26f47636a5a827cdff3aa49e610edf56a,,True,True,True,10,10,659,2,True,10,Tests_passed,1a3daa84f0db9abbdde1c733f2fb321041f2d2dcef424cdb980164450054f592,True,Tests_passed,9c1efef58c6619d35f5692bb34262a461eaf044e40ecaf0a751f9f5f3337f688,True,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Merge_failed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_failed,e8e62e9c752c69048f058d58f0b580f28cf0eb44d3652179213011f9f2ea8e32,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Merge_failed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14,Tests_passed,8cc4130532d161330fc80de2688f2b57e3cd1674e5819779c6e773a9cf9b6a14 11,refs/heads/master,aefae91d1ce70013519cfa0bc0132c5279c0fb2c,f476737befb920041b0af4c15861dd9c521c3cd9,6f095c52065a77f7df58a96d8d4516c11ed3eac6,,True,True,True,71,424,2768,4,True,71,Tests_passed,8b458080673eb645b9b9e8c29b0caad3c3baa31d6606ac3a57347b61cec23516,True,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,True,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d,Tests_passed,7004d9be3b6ab7a343bc331068c344ad2fde7b020e4159c860716f86e6b1a32d diff --git a/results/reaper/merges_tested/recruit-tech/redpen.csv b/results/reaper/merges_tested/recruit-tech/redpen.csv index 7be0a36859..3eca7daa0d 100644 --- a/results/reaper/merges_tested/recruit-tech/redpen.csv +++ b/results/reaper/merges_tested/recruit-tech/redpen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,fa710f48dd8ca04e42fa079491a65d17763dbfc8,647b2646daa95dd8dcb77bf6c8a5b5f653acf0f6,64ca201ccd7fcfc3fbcc45f2d8c934bed01e56e7,,True,False,True,14,52,178,2,True,14,Tests_passed,68f4424f3594a8b6d46124a8aff1f6d931b7fff47fd626d27489e03070c06989,True,Tests_passed,08b7d4b08ef90917fae5c9f7c661b7f52f4be87f11cf225079798a695b65a57d,True,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_failed,999c1b539ab0edd8ca40cc12da23eabc61607b98f94134f03f459727fcec4fad,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,b053eda8663b45c9ca14f7512239ae6689530f3aa1302efac09785a6d26f376a,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209,Tests_passed,eb6fd639dce1bf2adccada80228e607d074f827cd943e21d1d7cd2c809064209 109,refs/heads/master,1d8f10467a2bd622b0bb19ef22a2cc41860a43ea,9e25814d70810b79bdba5c8dd0b536f0fa283396,f735b5c97c2f1babf6e21a12e9383095b7c9df55,,True,True,True,13,43,380,2,True,13,Tests_passed,14528e6b8a4fc99308a121bbec6244f120166d9391132f641edc9c36e24b0b73,True,Tests_passed,27833bb73adbcc500fabc3fa0c53b194c30ed82c4a305edbc47a4d05e333a89b,True,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,0bfec9b7659bde72779d0c689e4c71246e3c3929fe8772a02264c24e23302819,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Tests_passed,500c2056482f31d80d821d1ad4265dacf8351a46f82472e14ccc55af781f2b4b,Merge_failed,88bd5c0544e5989e5b77d8e1afa9bc6739b8ed9040cb1f04e42cfb4be3319e30,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,b06c4b4c259f85719ca119e8ddafad376fd5e17b475cfa94f8a90c5df05d642a,Tests_passed,500c2056482f31d80d821d1ad4265dacf8351a46f82472e14ccc55af781f2b4b,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Tests_passed,0435f363f7cdf776df87995256962ef4cc99507ce4067bfa2c87d33208fc980e,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88,Merge_failed,15934db6a67ea0b2cb4a7cbd6390c7e766b10916a78bebdfe2341745610b4d88 136,refs/heads/master,6070b11414a006e8f3c05e457543200a9f558809,cc39c2c3d3b5129d13425d83ad232d4b3b0eb35e,ccc1746eb27eb5577ccf193becad078378878e25,,True,True,True,26,70,864,4,True,26,Tests_passed,7c0dd339b633f4a0849988d01f83c1f93564991bd30b986d69ea8f7c0bf6b2d8,True,Tests_passed,8ac28bbfb4c60056451141d9d19160cf2ca51cde2de44d6c63b19200760c4e27,True,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,5db246df7e3a898ee1fec7a4ff59d37c9bed3e19caa8918749715ca3c3bfa88a,Merge_failed,f96c090efe5bec7a1b6d97bab6669211db5d24bb35db0a3bb16f933541869d5a,Merge_failed,ed4ab5fd5980cdbb0cd6b1d9225524d4b3e8353caf8240eda8c472b42d0719b8,Merge_failed,b4426a841954c21b5643baab2d43d06adc8172420fdddfbf69e5dd03ad7215d4,Merge_failed,f96c090efe5bec7a1b6d97bab6669211db5d24bb35db0a3bb16f933541869d5a,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,e97e06269c6d298c3aa30051d08d7cd1a5df9d7f75561149e17a3c7f43afb73b,Merge_failed,b14cd1987dfde604008cb859740dceb961dfa6b993427f84da596396dbf87bf2,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd,Merge_failed,fec20def332dc35c67a5159bcb9afc773b00f0710935b3651c61589bd6e656cd diff --git a/results/reaper/merges_tested/redhogs/cron-parser.csv b/results/reaper/merges_tested/redhogs/cron-parser.csv index 0b8b406f4d..58193278f0 100644 --- a/results/reaper/merges_tested/redhogs/cron-parser.csv +++ b/results/reaper/merges_tested/redhogs/cron-parser.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,8b533c72f08d906092af419379d7fc6482aa8ff9,b5a18a790367a82946f6dedcdf1ba161264263a1,9dfc6a4e55e3c69ec10f0443fe2aa8550d86ec08,,True,True,Tests_passed,41c47ba486913e72e5d9763d2560f0326a31a8b318bb3fb67f3fd7698a7727aa,True,10,34,123,2,True,Tests_passed,609c8897e7d4c6839d956bd733145f6268314b2273e8bdebd5e3dffb36aa1d14,True,10,True,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,72777731639eb3fc79473777ae9e04ee5a24b518e21da29078ef8580052a8a1c,Tests_failed,a96a83ded86c975e85cee29deefbae8c208d2bb5d318b580493155f146ab8933,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,72777731639eb3fc79473777ae9e04ee5a24b518e21da29078ef8580052a8a1c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c,Tests_passed,d908fa2c476246131438c2577eea99420becc3869130cdf380d00d439d05495c 11,refs/remotes/origin/pull/46,200e4e12bf5d866a9b127c78d5c44dd1ca5180a9,449f4a3742f32e463fc9f360f325c67c5f3813b5,e0a8d56ec328b0c3f6fc397891948545e0804cce,,True,True,Tests_passed,8f1f1e38968faf4bdcf4505d19d38ae747bc70f038cbe2e7ddcdbd16230cd2da,True,7,17,1176,3,True,Tests_passed,d005990ece286fc40fc39a12143ddc3bc898d928f007561d70ff34cd1068ac0d,True,7,True,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,9c37059bdf68f69e63f3677eb768e996dcaa2d1cb450de5a35b56407feb2f988,Merge_failed,e6f4a50194a441f2f03e7f9f2478691804751cc4326c0bf99cf8ac4e7b8a4269,Merge_failed,37c0b95c65a3a80dfc3d269a2dcad47e11041c13da39e4bc7025421a58456c3a,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,8d5a1360a9430c228f66f897e9e68996be2cdda0d98bd41e7822d313e0cce467,Merge_failed,81bfe11d6d63829c81eb6af8462a91378fffdb1d4367cd2b7fe6935982fe444f,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea,Merge_failed,ee6045bc05d64128631c66f9a2b91b21d6e01b3be2cac7cfa359c11ebc4e9aea diff --git a/results/reaper/merges_tested/redline-smalltalk/redline-smalltalk.csv b/results/reaper/merges_tested/redline-smalltalk/redline-smalltalk.csv index 985d9a9169..e9eae56e72 100644 --- a/results/reaper/merges_tested/redline-smalltalk/redline-smalltalk.csv +++ b/results/reaper/merges_tested/redline-smalltalk/redline-smalltalk.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,1130f6577957874e62749c9c1fb06de15a29846f,099d159ac5420f9e2eb900fb0f050db1b1fa2cd2,6f53baa8aaa6cc6b614e09f1cdaf44aa5c69118f,,True,False,True,6,9,24,6,True,8,Tests_passed,ec193b9bb1f4e091d033e5df7b26d57420e5e4f2688e544b4ae0fe15894de403,True,Tests_passed,a0a2bb94f8b9df7b3f93c67bb63728114c0c09b0e6faab31ae3d4168ed4c3533,True,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,9c51dcf14b6edd9823b42421ce15497a753f22acf7fbf648fec36efa78637ee0,Merge_failed,163949c5ab87d911f169ca773bf9d69bf02eb17b3d66374c83f548769accd032,Merge_failed,b636ea95cf5244c04d582f7b78e5817829aa74dc540ddd339760786f58bd2362,Merge_failed,73debb584b69b8a12e9e7594f43a2a1538e7c5431aa5a2225cfff99c46e6932a,Merge_failed,163949c5ab87d911f169ca773bf9d69bf02eb17b3d66374c83f548769accd032,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,10e4358c2b34d019647937619cf7ada3e5f8e6428c4a21c9606056dba7bb88e9,Merge_failed,1a736dae1db9340d5b785febcd07fad7130762bd3bda7bff9f7171f95c5fb1d8,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b,Merge_failed,c768b3ff6865f7a20de77efb3a9f34d7292d7f3ff49d3712e79968c5f55c136b 20,refs/heads/master,9cf94e88e0aa92bd28fbf690202b6428789fa3d2,c789c22cdb1587566a1db933c5e94e470eeb8330,ba962853fb12f7b9caa3a7f35e75ed5bf3aa994c,,True,True,True,31,82,320,2,True,31,Tests_passed,42e27e8e2ef5d8978a01c1e4d77f9831016a7ca579cdd7e29bdc09f332c2bdd7,True,Tests_passed,0a72157776f23d88bfd3527734732155be398c4591ab878e22ca52a7171d9433,True,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,f3ade887df686001949dd8648e6cbcd54bd134f3a2688611a4a83d9998297578,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,c0a9769e09d050e96b3698a7e7bbbe7d925e73c3966d181c579adc02f7551092,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22,Tests_passed,434e72171f49d3c0a2e1709b20544c19fc21a15477797fdc2d15551e3fb45c22 140,refs/heads/master,3051df27c7e8c7c5ab002198e0f7cb817bc00c89,c43e3dae0d0e480a3f3b16897ce97d335be29658,dd314b98c87a840369d8c35a7829bcdc33de5340,,True,True,True,14,26,106,3,True,14,Tests_passed,ebabf4a59a8088fc3f6c9f6db283042e327a994edb1acec70369a1893aefe04e,True,Tests_passed,398538bcd72d57a9b6bbfebb33c32f4bb9e2ce231972c4e9f36e7d6802ff58a1,True,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c30d07291a4dd5e1caeeed7cf3e46803dca545233cfd6b9cbb00fc8ed813cb8a,Merge_failed,42357bc9fbc35acae136635de92008c18777cb067b639b0edb28a6cae1fa85a3,Tests_passed,e1e255244694853e7298eb0e181ac9c1c8ce4ee865c7e375fe0734e66f993e06,Tests_failed,97bf56fe9223b1f1317f8fe53f57a9ddcc2f03623c089015e4f09a7155def8ff,Merge_failed,42357bc9fbc35acae136635de92008c18777cb067b639b0edb28a6cae1fa85a3,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,ecd96d9874b531d361d96e0459640c2c39786ac70ec0f8ac0e0e49cb1268774b,Tests_passed,e1e255244694853e7298eb0e181ac9c1c8ce4ee865c7e375fe0734e66f993e06,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Tests_passed,c53b63b271b9eb57b8b080acb5d7add0223f9545d90ecc73fd4d491c721faa05,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9,Merge_failed,c2c69195dd9bccfae333fc24afcec8387177e478bfc7373c78dced711be6f9e9 diff --git a/results/reaper/merges_tested/redsolution/otr4j.csv b/results/reaper/merges_tested/redsolution/otr4j.csv index 0091e93e04..aafcd372cb 100644 --- a/results/reaper/merges_tested/redsolution/otr4j.csv +++ b/results/reaper/merges_tested/redsolution/otr4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,282b34caf770e1c59f2aea66544055f2bac531a0,4af67307df155fa3f23361b44fa891cba63c3edd,445fe2a8ad55d7da4043a22a4adc2c09ee4097f4,,True,True,True,10,53,570,12,True,19,Tests_passed,6e088c0fc7d846359d4caf85f933d789f41d1effca1da842933a0718272441e6,True,Tests_passed,d023de0be9ef42bba48aab5a9c5631e8755d3301526b84832c7a00dda9a0021a,True,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,e39e1f452d09e37a55ace953c8512d854d0a4652427b472262ad9e7e68ccca5e,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,33683ddaf301ae0464e9b0407598931b7f57aa777edea50d542e573cdafebd46,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,7844371ffb079937dd904bc9a139d92ac6afd0411fe4e09359890575f4288bcb,Merge_failed,9c04ad398e2ba258e6398b0db27feac317cf2bf528884eaa0f06327f715b5c9f,Merge_failed,a5e699ed88a58739fdb83c2dba50a5c61589c43d0ab3a3d85e899a783ec356f2,Merge_failed,8a3a2a4e526c2c1c5207e4ffa9f635a4de6b758ca2549225a3bddb0b313008a9,Merge_failed,9c04ad398e2ba258e6398b0db27feac317cf2bf528884eaa0f06327f715b5c9f,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,33683ddaf301ae0464e9b0407598931b7f57aa777edea50d542e573cdafebd46,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,bb169c8aeefe3e7601c5458606918d9b826200e86bdd97408934082d2f8cb49b,Merge_failed,05ebcaf0846a6a21f3c8bfe39145aa4e86f0135068edf4071f619b43840058d5,Merge_failed,2cfbd82bb9cf15f1c05e185383f5e0301cf3654f523cdaacb5b7e659a9c6f67c,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,e39e1f452d09e37a55ace953c8512d854d0a4652427b472262ad9e7e68ccca5e,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6,Merge_failed,8cb280b77ffa1e2ce25a6da05f09f84dbb30f47ca3e97ec37c98ee4bfd0d64d6 5,refs/heads/master,fee9c908d0389fa3e5ae469d907f2c872a23ce39,61f4011bf4abff5d60aab546bec06f886267b848,001049afe7cabe92929fed4bdc5b639a581763a9,,True,True,True,15,86,2135,2,True,15,Tests_passed,18e903ecbd4b08fe7c00c8308ac378c77f01176f89bb5af75880d3b70baf2639,True,Tests_passed,d9d5f2b75a18c7e67a058524f550ff03fe02b2b30d0a219540b7cc50fbe40c03,True,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,5ac512d983d560539d00ec6c24c08ef9b93fbc303419434a7d931e40ba86ec01,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Tests_failed,e207537fa310f8c3ce2423bac93cb0f1fc9043e3791c3d42faaceacf3f699dd8,Merge_failed,e2590b5e87597f94529bea750537bc1f3685a1e133bd54f1715467835651e2c2,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,884af09c338f4d012e3c46f18f3bdc50a872eaa1b4cff2b7a864d52198836712,Merge_failed,f9a6c9be6b6308231f5aa55c066aff601276b448a1d9a63541e02c351a62b0e6,Tests_passed,22a182eb339a1f99038687d6ed4cf06403c77438371cc62735d5f589b114032a,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730,Merge_failed,3e259dc396fb3a8494c4c42e2bd5ada81ba183de2225e827115b42e1fedd0730 7,refs/heads/master,001049afe7cabe92929fed4bdc5b639a581763a9,ee2330ed90169480d82594be170c2daaf157b4a7,aff85957782f43df69931332eb170f5c5efc8975,,True,True,True,50,131,13070,9,True,50,Tests_passed,8a277fbb30dc1f930749b53fb7c4affe12ab7b6c45476458620edde73a5dec9e,True,Tests_passed,4b8452420e0207c362ef2f59e4c1fbe0bd8399d4681677975a71ba60d9de4c01,True,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,27585f430f28c75dbe1cc753cdaf3d2b9eeabf705570de0a9e1d614184a92524,Merge_failed,9565bef7e06f2b682a344cf33521dba1dd1093f74aae120431f76639e690d1d7,Merge_failed,4d44ab8d64084da5066b3399732b48ea2b4cd3ed06cddae61a7c6c7baa80ae6a,Merge_failed,150dd50b4eae0f82f7124a2bf85c1478c791fe3f225141975f75be9a8c9364d4,Merge_failed,9565bef7e06f2b682a344cf33521dba1dd1093f74aae120431f76639e690d1d7,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,ca1941b913e3f3bc8649e8cf70369db570b0d1be4ed3e90798b0dec8e4f29f74,Merge_failed,5dba55b3bc365eb791a8710b00685f59df4514e50931c53642891c3654d19517,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,9da582176a4f1a97ead5a6021af2432d8b44a47190af11a64138e5186ba6a41a,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81,Merge_failed,51c4889ebb91f0b4af3ff41491e08f0f9133fc4bc66f58d4666e908af61add81 diff --git a/results/reaper/merges_tested/reficio/p2-maven-plugin.csv b/results/reaper/merges_tested/reficio/p2-maven-plugin.csv index 5b2b23080b..dd6b737397 100644 --- a/results/reaper/merges_tested/reficio/p2-maven-plugin.csv +++ b/results/reaper/merges_tested/reficio/p2-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 70,refs/heads/master,d3cdd1c58dd31c5b6a2ece582ccb58cec53b684a,fe15b0719486b8eda7c323abe2d6de77a7826314,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,,True,True,True,6,9,188,5,True,9,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,True,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,True,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,99b52d7462483268a8136f47e892d776bc59b7db2603fe4be0475e4a035e7043,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a,Tests_passed,2a5f708e360f2842af31422b3c253e62b0a76a6eef680b8a7162bdd13ca5948a 71,refs/heads/master,67be923d7d2e37458eda32bdd1ae0b3021b0b39b,3af99f9ee41c4dcff10ac4dff938fae7fd3c7b1d,6afa2123158661745199250d4ca8c9a9e70935d0,,True,True,True,5,6,13,2,True,5,Tests_passed,8f926a3699ef8eca3dcc19343d795004b0cdb304863287b69516dd51f83ba60a,True,Tests_passed,a1cc5c0e957ff59c19ec5edf804d840f482ccf0f5b99d50da12c5d2f8b161ac1,True,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,5e21d4ff375c2c1a9c524393614b8daf17144cc5b0b08d5a310ec5ac96ef0422,Tests_failed,ddca0ba9eab512125bda554a5c088b4b5c4431e2fdf1dc2d12a332ad45874a13,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,5e21d4ff375c2c1a9c524393614b8daf17144cc5b0b08d5a310ec5ac96ef0422,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad,Tests_passed,43966722224b1e9fb8062e662cc20acf9d672be6d2f687d4c61c118e3f052fad 80,refs/heads/master,b8ffa656364064d932f09d197181933ac23091b3,d73872526af67acb85e48475a499c0c78d3b0b10,1acc034dff68f5b574007c121f7487ed6272c3b7,,True,True,True,10,20,182,2,True,10,Tests_passed,d3ef669190be017dc3ffb72b3676e616b0c1c315d5abd255cec43bcdb34448b8,True,Tests_passed,4a745cf3fa8e6c8e43720d68ca2baaff9782c0f1693cd4d2bf65c5fd876f2c60,True,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,e0861d7acf1adc643bb98cc7c91e4e78d04b1c4994c6be2b28e9c514a2abf8dc,Tests_failed,89965b0cac51596e0b3f81a6ae3c37c5b670dcdcffec455dada6223eb3f9ba5e,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,e0861d7acf1adc643bb98cc7c91e4e78d04b1c4994c6be2b28e9c514a2abf8dc,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3,Tests_passed,b52c784c3ad1e44ac856e986a1f99ac45814097f3d337d90a22ffdcb00556fa3 diff --git a/results/reaper/merges_tested/reinert/jjschema.csv b/results/reaper/merges_tested/reinert/jjschema.csv index a34e2a2b4b..7df88bb593 100644 --- a/results/reaper/merges_tested/reinert/jjschema.csv +++ b/results/reaper/merges_tested/reinert/jjschema.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,cf68aab8c3476922e3b59759894aba0bcc06f2c9,5a79670f46345762c70ddc1b003f6cf4132432f2,057e5f5e7c8cd7661a0ee64c4aa8a9f998330a22,,True,True,Tests_passed,33897a62816668f77765cfeefe08015c3e8da96f35af28999cd785bb0651c5e7,True,6,29,83,2,True,Tests_passed,2047e994eab0986e4c351a0361e44c3678546ccdf079f76b4e1c2beda36d58ea,True,6,True,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_failed,f77e49da6fd7cfb152e1a4cb9e75ca9587d53d90fe9519b05f428b0ebc185d74,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee,Tests_passed,a5047d49eb0c1e2c00386b6c6deace59c3f61d59ef1a31c0177a02a4982358ee 7,refs/heads/master,1276436b3b812eaaf43853b357eaa08039f5f291,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,3cda79e6dffc9bb6162bac5f926f2ec5721d12c4,,True,True,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,True,8,28,74,4,True,Tests_passed,a475a662b481575e3dcfe3f088dd0f303541a96b1d302632d87b5d2bf1f3a1a1,True,8,True,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54,Tests_passed,ba585d4f76e417b95ff037af5a18c6cb12743bbe2968bfb46da3b74bc2c21e54 8,refs/heads/master,8db7dd20d9f9b09d5a3956e97658ee91a8b2dc8c,2dc51ab95919d6e7765202332c906b7e15bb0bdf,ae602e2b5f3227f78b9892da86b80bb5df16c719,,True,True,Tests_passed,50b7061971f9cdb1e2d934437fc598b8bfaa572d5eab1b0d8faf2911293d1ff9,True,7,14,44,2,True,Tests_passed,40d45477a8bdcdc7224ee1d28e1b2614ee75b8e3bcfe690cc8cb9da0b55d8ddb,True,7,True,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_failed,4a1f43c880039b877468946582c060529a84b9d9896234a5927d129bf0575032,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,10e3df52311bf707d2bf53abeb10b58d3cd714e56b0166f0642113187804f921,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6,Tests_passed,3aea6617873ff50be89657a08635d6349a5ca1ea5782a35445b232f60bbd31a6 diff --git a/results/reaper/merges_tested/relayrides/pushy.csv b/results/reaper/merges_tested/relayrides/pushy.csv index 72d3772cd7..e9adfce6c7 100644 --- a/results/reaper/merges_tested/relayrides/pushy.csv +++ b/results/reaper/merges_tested/relayrides/pushy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 105,refs/heads/main,d3f972ec9fc67512d4ee7fdaf486621453d3988b,437fd8aa85310e472a8d45f8870bf4eac3151421,ffca8c8ac376fdc6e72985dea2bdc34299a2068f,,True,False,True,3,4,10,2,True,3,Tests_passed,e4f4722a1ff6d13db100010aadccb184daeb44fc5a12953270358f2722b7e483,True,Tests_passed,59b773d0c313fae97e4459ff913db6e31acc526a6999fbbad9c1c33b03df6651,True,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,2b98907427d98103a76ce2215d764d984ff0f3c39faf75a8b9e2f216a8dde0c2,Tests_failed,8835ec2c7db8b9a5284e9161daa7336f0899a9bf8fd5bf7699646e71f93576d5,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,2b98907427d98103a76ce2215d764d984ff0f3c39faf75a8b9e2f216a8dde0c2,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1,Tests_passed,8b19eb4b8885be3fa0384aacadc3fe27a380188bd0f75e4ff5ab0eaca25e9cc1 146,refs/heads/main,ac2b7da9562b8bb28a29cbb0e6a5787bb5964180,5b89933ea3a2f5e52c7abc790951d615318ba086,6521deebcf6f79f10bc4197dde721e9ab762bca0,,True,True,True,8,62,440,2,True,8,Tests_passed,f14ddc6e089d9e95338e27b9367e9f7eaa44dff21b19a2b7b3f6f7ce0cabd663,True,Tests_passed,bc15d1855882b465782c53d157855e35ffa10259dcec4eaf3dce58a46cad3c6d,True,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,b7ff1be0b1a0f95d3b58b43416ed5feda423ceb3375bc13ac265fbbb9c38a9e3,Tests_failed,ab90ae76108eb6eaff0c86989807dcf30a7391baf53d53bcba7963d715ea4b38,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,b7ff1be0b1a0f95d3b58b43416ed5feda423ceb3375bc13ac265fbbb9c38a9e3,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e,Tests_passed,8a9df9fdd68e0e2e514d98e0541528c4889a22d4e53c57a97faaaa9a67b82c5e 152,refs/heads/main,21150905f25ebda8cf4dacfc99ada626f5113a8d,31608c7a15eecb7c7f7584786a24d34e5d1d61e4,53e1b320e03ef4f48b2359e1d799d906a8537f26,,True,True,True,29,210,1193,4,True,29,Tests_passed,c7141dc83a26a5679e58a89624b413675bd1c50ce0da21c5fc857d98a012a0c7,True,Tests_passed,ec2bb8c627cfa495ec756777cd2d556d8661a9cc0e8c23511b65e2f83898dacf,True,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,92da13f812f253d499522ecd9c993121acab59046761288060059af1dbaa5e91,Merge_failed,1699960b91ccf223adae474b681e194bc9706c637c7781c38f927122e90fedfd,Merge_failed,6ee805fc04ae0e58d63f30c7c422167b8f0acd979c3e0ce8057490b2e45e93ef,Tests_failed,814fb5e96df7b652ead5caecdf0e35fc8b3c64b84447ed93b65bd150ba4a30de,Merge_failed,1699960b91ccf223adae474b681e194bc9706c637c7781c38f927122e90fedfd,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,173a94a4e7a4709a6726df061da5390b11711865a75504d5590207a3f05946ff,Merge_failed,6ee805fc04ae0e58d63f30c7c422167b8f0acd979c3e0ce8057490b2e45e93ef,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea,Merge_failed,ed40102995728ae49a98d1a7bcc8550278ad662e880c6e5392b09e116d57f4ea diff --git a/results/reaper/merges_tested/release-engineering/pom-manipulation-ext.csv b/results/reaper/merges_tested/release-engineering/pom-manipulation-ext.csv index 9a9b0613ab..2a010d5f49 100644 --- a/results/reaper/merges_tested/release-engineering/pom-manipulation-ext.csv +++ b/results/reaper/merges_tested/release-engineering/pom-manipulation-ext.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 195,refs/heads/main,9800d78d1ffb2a4c1b1bd0aab55bf9793961f724,6334195991f442756b3594898b61b0ba6cfd3621,6b4cb89f926efcb040f9795d473afb6db51f69bb,,True,True,True,23,77,500,2,True,23,Tests_passed,1b17812c58c7925363b8cac970ddfa8c9af30b80a62840417eac235dad16d777,True,Tests_passed,b71b4c83d42b3b2788d3ca7e00b8d14ecb9d439c77f6d8b7792306d6579efac2,True,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,0d9ddeab7b5de5bbe78cf40a4cca1eb702f11c475e9427725315702d99c849f0,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,0d9ddeab7b5de5bbe78cf40a4cca1eb702f11c475e9427725315702d99c849f0,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148,Tests_passed,bd63a175c9b823ab04488ecb0a5ed160d0cdb57355ce21e554fd09ad7f39d148 299,refs/heads/main,f742e2398f271a294be77b95814feed3fcddd144,80b6b8712f99eeef4fa92845ed66d47bbb0c95d0,2af23194cabbd906de81e134e0e54cd8efd92dd8,,True,True,True,5,16,76,3,True,5,Tests_passed,051eb4d82150dd58e8bd4f4a3647c9cd556dccf92e7347a83d492bc774760b36,True,Tests_passed,635508baf24033af50ba2b5b69c5f69fe49bc0fdb648a80d3fe61f67304797e7,True,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,4e0a6bc351cc94e1dd66ae6fe044febb57ff483c0c97a12775721e69b4744ae4,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89,Tests_passed,5874daaae113db34c44bce72a0755b9ec2f861e77c72626330a81c1827d34d89 diff --git a/results/reaper/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv b/results/reaper/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv index 3f12c2bffc..3368479493 100644 --- a/results/reaper/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv +++ b/results/reaper/merges_tested/renepickhardt/generalized-language-modeling-toolkit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b8670c933b7952cf06b007deb4668bb20fbb0b05,3c3b5d86544da2ac3b780428a856db731b3be5b1,e5f45d00d6aecf3a3803367f2629c706bc11c62a,,True,True,True,143,217,17306,29,True,155,Tests_passed,f21f858f3c3822757d28b3c9fe471abcf034e96b1cfc104a028b034a113095a6,True,Tests_passed,88e13b4ff81c6ba4bea29fea3406e43bbd51257a647cbc150dfc29df53f145b8,True,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,af288634a18ee7df1b99f67f49bbc4abd22f2fb7b86f79c13e6e1effbdad0e16,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,b56b0a618e101e88dadd0bb9d0513d0ddc2e6693ec267da1e2c83182d14d3fee,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,10788022f2b9c948ebd125b7f7a48def6409cf501ec317587a067d8eb8539bd9,Merge_failed,d4a1cee122f6f301b764b05e0ff9f3568816f0b1f19f1ac88cab46e2eadc05bf,Merge_failed,af4eb7fce5c36150dc4a9cc595453f3de92909fd20f1470f1e6dfe05775e8040,Merge_failed,d24a1b89c1ff0f797285f1aa6636f4a4d41b855f852e4f562896ee9650de6658,Merge_failed,ede05b6bc09f59f93fa22cbc4b1059c60a0864dfe716572f8b660d2ba02a4c57,Merge_failed,af4eb7fce5c36150dc4a9cc595453f3de92909fd20f1470f1e6dfe05775e8040,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,b56b0a618e101e88dadd0bb9d0513d0ddc2e6693ec267da1e2c83182d14d3fee,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,10788022f2b9c948ebd125b7f7a48def6409cf501ec317587a067d8eb8539bd9,Merge_failed,618d319ad9c8a89480921becdf5b615b48714e4cebd9ad45a5cd9a00ad165892,Merge_failed,d24a1b89c1ff0f797285f1aa6636f4a4d41b855f852e4f562896ee9650de6658,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,af288634a18ee7df1b99f67f49bbc4abd22f2fb7b86f79c13e6e1effbdad0e16,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69,Merge_failed,0d540d5846ee1f2169b4d1c8e109931a0efcf5dc123b53c9250895fccca59a69 12,refs/heads/master,f8105ddc44d47cbadcf250db7f2e6240addce1de,159a50f8e2b21ae099529ca63155ade49e5b64a3,d1fe078010338d875bd7eb034505e0bbb8180878,,True,True,True,10,69,1910,2,True,10,Tests_passed,94dbcabceb1b23a8c1a83275a4882391d257edf919655d326212e4f8fdafc8dc,True,Tests_passed,7b76b1b94de96f93eadfae1aa0f02dd874d579db6ce983bf5b16d7810636620b,True,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,4c0c2876443db869ce264f9f7ca3702520e86ee7591cb8c980d181c66a8c6347,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed,Tests_passed,633a2e7ee06697232b4474d81aab288b0c8c20769c3f0fbc576fbfd9e68609ed 15,refs/heads/master,cded0b4aa28d135082421dc12b3fb357b642bfcb,c139a75c33bd34b725e9cd57824ac59a63e0abb3,31619999e6e97ce703029d0164ef197b45d13478,,True,True,True,44,162,4009,2,True,44,Tests_passed,e38b8c244f7ae6366253dcea2587bad4749b249aa718dd36fd991ee9fd063521,True,Tests_passed,e53e125fcbd2e8d43f3f75165d64494dbe98f4087d29418abbd62ae3afa4ccb6,True,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,6982c9924b90aa09e353ef0dd249d9a9981cc6de71b07de86b8bde1933c9b4ff,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,6982c9924b90aa09e353ef0dd249d9a9981cc6de71b07de86b8bde1933c9b4ff,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac,Tests_passed,fca6946fec197533f99aebd235b33748cc1483f5ece4697e3e7360b4d10c47ac diff --git a/results/reaper/merges_tested/renggli/java-petitparser.csv b/results/reaper/merges_tested/renggli/java-petitparser.csv index 06bef5c9d3..74087f9e44 100644 --- a/results/reaper/merges_tested/renggli/java-petitparser.csv +++ b/results/reaper/merges_tested/renggli/java-petitparser.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,5,13,32,3,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,5,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,6364a3812cdc5b4e14163c71234a7b2b04c94fde57e36cc181e3def70758e30c,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857 diff --git a/results/reaper/merges_tested/renggli/petitparserjava.csv b/results/reaper/merges_tested/renggli/petitparserjava.csv index 14817ceb04..e75002a6c1 100644 --- a/results/reaper/merges_tested/renggli/petitparserjava.csv +++ b/results/reaper/merges_tested/renggli/petitparserjava.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,d3708b7cada945dc5a701a28fca04f1342d0589d,eaf7e75678216a022ad04a100af62bd101ff7c3c,f71e836afbd557221865e640a7d4b47635a4f459,,True,True,Tests_passed,ec4c8b28f4f816574709c2c39c446023b973f8cd87ccf884ab207fbedd892277,True,5,13,32,3,True,Tests_passed,664f968b1d32b6b6ff0a5b71fb744726604d7696eee0b5b56f6b7e4b0c1bc6aa,True,5,True,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,8e307ad4d7aa658784e1a270f41c14e747b4572a2f100169f12a80e93c0f2952,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857,Tests_passed,24330f4c214334cf479157643c1dbbd0e35bcb998ec682354b8434ac78f98857 8,refs/heads/main,7db98cb828534e74d877d7fd92be1dd396f45ae9,e0345d7e641e0cfb654537fb09cbed83704c0e98,0426879eee1b1cd426e0b3abc8d4c3f7e4ab5f1e,,True,True,Tests_passed,62b4c19000fbac9f59aa55d7e23b3b3367f44fed7af226db4b0abacbea81a6f4,True,18,89,800,5,True,Tests_passed,2d54884c17264a156e060ec9c3a1932cfd5bf9b57d0e2cc1922780d05cb4cbcd,True,19,True,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,3d48170e517b542d7bedb61d6312281627132cf3375ba025d4599c8195ec2555,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,65fe63f9cfb6d201cdb21c20b260b20b76a721b163b0ff5dfd35245e653887fe,Merge_failed,7c2217b5e02dec902c9d82cd143b2e639a180cf82c9f0fd509b00ff57e4019e7,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,85cdb350e3ef34101be7fffd2144198f9dbfc409bc0b4d576dbf1b0d741abc97,Tests_passed,0c9790b9a5b121749a220dcf60706551ba0ee1df1b8d88978c5e812c4e674875,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504,Merge_failed,7afc57b6d4f403b8575129808997d3a2976689f46639a4971dc43fda98ae2504 diff --git a/results/reaper/merges_tested/resthub/springmvc-router.csv b/results/reaper/merges_tested/resthub/springmvc-router.csv index 16cce382e4..3580769945 100644 --- a/results/reaper/merges_tested/resthub/springmvc-router.csv +++ b/results/reaper/merges_tested/resthub/springmvc-router.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,71d38b423902b98a187292a1c0e9a6665fe35231,3bc490f1e9e979e3189625ac19f2741a69699010,bd30ac190818c9c32c8031cac4e3000058fc97d1,,True,True,True,20,111,2216,4,True,20,Tests_passed,feb2b6df8a147fdf1601ba8eaed7f15db417fef74a5efa6bce8909e5dceb63b3,True,Tests_passed,471c3694e6663ad3811ec61d10dddef8a7abf46b0481061bb3338b069eaf362a,True,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,102e69c0660440003e727d3fab4699276fd76ffeb22aebcad00f5467613b895a,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Tests_failed,cb62aeaa9cca9562e53c67fd31855c8d90c0486159989292ad0f4fa15039ee0a,Tests_passed,c13200772015efdd9b66c116226206a4a81a6f6a4c816ea91c13838784089895,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,b69da98bfea2c23be818bd43a0d9e04a3eb5694167771bbc5fe216c82e2fb8fa,Merge_failed,655f360fed45d4400928443f03794f0986e448f05c9b229c2bcda93088329f9d,Tests_passed,c5f8d3c0a3c6a6ef122b8eb8586eff2c4974791d3a2994616405869b4d16d770,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,82a6d206f2f895099fe2f379051e0c014fe8645df598c45b46ef4b54a5b9fbf8,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f,Merge_failed,1efda5aec030f6316b34166124ab0b6ea8d294ffd11dad685e3ccb2deb45d69f 26,refs/heads/master,cf86d464ca1768fae380c8a99223c5d536fa0b3e,7522c6c3cfcc73f071583e9f5ac0700ceedbbbc2,66fc0836883492ff4e0f1c738a140942e8f29ff8,,True,True,True,18,51,2210,6,True,18,Tests_passed,627ee8df5c215c9174c67b1c381aa062c1a1cd148ee546f56b2ea781fd1a98c6,True,Tests_passed,11c3d1a933d6371e9861e31bd57d3f4bdd8a027f840df405ad217247b451622c,True,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,bc51cacf51ad15deccb4393b0fdaad5b9b3629d986862dc453a9b66f9eaf4b94,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,99d540cbd7ef714d79b792d43f4c79d0ce95bf7a9756abbe5dd32f5826a936ff,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,d95df8e72d79016a118254bc8c8e6b40cef14c8ca6055a551e9fcc57b97fc931,Merge_failed,c4244453a4bbbade9ce4f2f6666e55ca16a7a05ad6e0048c9121daa1e0adf9a9,Merge_failed,71aa689f436c6d2eeadeed58c6019b7eca1326c16255229118e227f1b1d40a9f,Merge_failed,fbe16e04689e12724128e857e9eb8b0ae1d3f2bebdf825c0fba8342300761bdf,Merge_failed,f21879f20fc84bcbdf654d9d8581b5e1a1006e9721d296ca8791ade968b52177,Merge_failed,71aa689f436c6d2eeadeed58c6019b7eca1326c16255229118e227f1b1d40a9f,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,99d540cbd7ef714d79b792d43f4c79d0ce95bf7a9756abbe5dd32f5826a936ff,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,d95df8e72d79016a118254bc8c8e6b40cef14c8ca6055a551e9fcc57b97fc931,Merge_failed,c35c6208d5e32fbe6b4749e6c07e66c5c8cafbc80cb306511be76f7274d56b1f,Merge_failed,fbe16e04689e12724128e857e9eb8b0ae1d3f2bebdf825c0fba8342300761bdf,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,bc51cacf51ad15deccb4393b0fdaad5b9b3629d986862dc453a9b66f9eaf4b94,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8,Merge_failed,ef86b997fef16f9160762e1be0f59e471f848d01a6e5c2b6c090af3e4fb347e8 31,refs/heads/master,43b5984109507a1956226b3ce4bb4641cf1f4dbf,2b4f6d9ba1e16e9e1cbb0f860d6417d7a5268a2b,e4270319fd079a7d5aeaa35a20630480a3efef98,,True,True,True,9,84,440,4,True,9,Tests_passed,cfae5d291bddee033cf78ab38904e82ccc63ad0475d81e4f282f3d6343fe79ef,True,Tests_passed,4460cddee2a34e32db6faaf676435030bdb44ef55cced86877155c3fc4af3a86,True,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,4bc810bd02feb2a59b4ebabfd245626ccec78b30a4ca313dcf8926c7acbd86cc,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,416e8b7e7b7ed1b3b4e631fcaf2ee975a7a115084f588b73bae1090180ad4aec,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,7cad7b916e4ee1ae87df4988f73ec3ddadddde494fce1b55e68550f2288794ec,Merge_failed,a9d1f54425447866a1b351d10b697b84522455cd121d859ecd7e38060ee87b06,Merge_failed,c1fa7986a464e22538de5188aa3a050bf9dff4f389e85f39266637e845a95a20,Merge_failed,a67215715887fff533f3ede3c0007930e77d0dbbd2fd1f4ee0bfe74ec471fced,Merge_failed,989df0d7df276d22f3736c48e2978b4e3bea4bc3be809767a422a31dfdf6ae13,Merge_failed,c1fa7986a464e22538de5188aa3a050bf9dff4f389e85f39266637e845a95a20,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,416e8b7e7b7ed1b3b4e631fcaf2ee975a7a115084f588b73bae1090180ad4aec,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,d93f4344fe5b1df1d3975662bbe94333a942df5dcf16708329055cd613337dc3,Merge_failed,7cad7b916e4ee1ae87df4988f73ec3ddadddde494fce1b55e68550f2288794ec,Merge_failed,dc00b08c823b75a95e5bb938d6878a1298247df364295426672146b1aa7fb125,Merge_failed,431ffb81d8b63f5b64c22c16faa772c06e0f8f9afa4e9e069498108bf55dc01a,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,4bc810bd02feb2a59b4ebabfd245626ccec78b30a4ca313dcf8926c7acbd86cc,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6,Merge_failed,ae6f869e6919e588703397465e5f1a46a4eb3a9a0c8029c040ef4968ffe454a6 diff --git a/results/reaper/merges_tested/resty-gwt/resty-gwt.csv b/results/reaper/merges_tested/resty-gwt/resty-gwt.csv index 2a3675db5c..cd78ca9b6b 100644 --- a/results/reaper/merges_tested/resty-gwt/resty-gwt.csv +++ b/results/reaper/merges_tested/resty-gwt/resty-gwt.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,867b917c43c32acbdcac55767e7f04334006c866,05733cb0d13bbfd97adc6a9eda47b4ea3dcf04e6,9d45c90a98203c46b16910b1470fead4b3ae09e4,,True,True,Tests_passed,833d3a55324d94ffa54b859d6714376079b6e3c1ecef892dad5248540068965d,True,76,362,3588.0,3,True,Tests_passed,acf6165089b11a4759d351a9b67c1f38511392d7d788a3aa22a0ba1871060943,True,80,True,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_failed,5b4de61dff6d7b716d03562d27889d741b9821b13e3bd218a9c132b7ce27de73,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,69430d30f7246502e8d43b2c989c0b80d39a13bc3aea0cb3871a085ef665b033,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b,Tests_passed,d2e006ed0bee8a9915612b35f17e895a70f6fd83be91cc93586d456ebe2ba71b 24,refs/heads/master,6b049ac6ac63e9fd3607dacd2c4aa8302e7a4949,0d2264c7b565582fe91d9b3a517ec8a88266b0c1,2432bfff9617a12060d0a4f29ba80d9361da7056,,True,True,Tests_passed,6ba53951e4ebd1105f83805a774b4e9ba580a5751c1261a7911a22516bd14180,True,49,130,1531.0,2,True,Tests_passed,6921a678edf76159b89e9c621d54cb0c9894b3557794e5f2564923625b5b6b0c,True,49,True,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,dff04477bc200af8d7be8f829945d9c1162bf8d22f9b69ad8a94ec8fc19564c4,Tests_failed,7fdfc6125a8c42d4cca4d2010019b6e5fbbd1dca5e47dbcabcf5e96b7a6735e3,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,dff04477bc200af8d7be8f829945d9c1162bf8d22f9b69ad8a94ec8fc19564c4,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928,Tests_passed,b0ecc4b7c07fb85a8fe39dd0d4f02827c9a804acd930613801257e08ab775928 28,refs/heads/master,6de0c4fa354a3ed4667376c4d14df82a5753e6e3,8e7b927692cbf2ab6d1f2918ecb6032e6765cad1,2585123b77c969d615b3952a780f1d8ed5764d50,,True,True,Tests_passed,100a79785fb4e375c83af14654dbbb84ef8735cfbc01b4d686a2d51b4f038812,True,11,21,297.0,2,True,Tests_passed,5a5a4d357b335ea6dfc99410bd0b72936c6281ea4d600d29f31582f71ae3927f,True,11,True,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,dbb55847338b245d23fafdb37fa48a8fd4b2fdb86a68eb5115094a6b1575abba,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,d65abfdf995e3aa4537c10d96831ce703df90635dcd4d1b9e93a62b07b2efbca,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,0ab1156c0513e1dcaa6f893dd4bcf1bfe6bdcefe51ccc0c925316cf04a4d0b66,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,d65abfdf995e3aa4537c10d96831ce703df90635dcd4d1b9e93a62b07b2efbca,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,0ab1156c0513e1dcaa6f893dd4bcf1bfe6bdcefe51ccc0c925316cf04a4d0b66,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,dbb55847338b245d23fafdb37fa48a8fd4b2fdb86a68eb5115094a6b1575abba,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73,Tests_passed,8625f35157b811006ae8a13f3b79b4099b9e3e7946cdedc11a63c430c3619c73 diff --git a/results/reaper/merges_tested/richardwarburton/lambda-behave.csv b/results/reaper/merges_tested/richardwarburton/lambda-behave.csv index 08a8fc3a90..5613488394 100644 --- a/results/reaper/merges_tested/richardwarburton/lambda-behave.csv +++ b/results/reaper/merges_tested/richardwarburton/lambda-behave.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,8695b135250902be1dcc7fba1dd727f372ef482a,eba960cd7f4a1e341997586a5e774d53860b64bb,225f5a428f94e6488009fe1bc3c72b981215ed7b,,True,True,True,37,103,1063,2,True,37,Tests_passed,715a5c51fed66ce04d5bcb662628fae30b6d0410f4dbf34dc98a5284e9cc9159,True,Tests_passed,75cc845aeaebf03855ecfe0fb82d99809a697560c4264ad7c65fe808049f66ba,True,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,70cb4f1a0b8acce5581363c82398c37ff415c6d9e12d1e6ced9c51e39c0efb89,Tests_failed,d2fa2032dd5f80970d0e1badef449426ffe4baa1a03c232d7765ba5dc6649cd3,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,70cb4f1a0b8acce5581363c82398c37ff415c6d9e12d1e6ced9c51e39c0efb89,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59,Tests_passed,37baf85c12043c424715f6c46e93af5663cc4dd8eef43e91c56e1ded6fa43e59 21,refs/heads/master,1122d7779dd0c352baf30f702efe19bd4852b727,cd83aba4a3445415807b25b8198eae8fcc31816d,f94034d1b799357cb1ad4d61c99951870c75ec3a,,True,True,True,23,45,246,3,True,23,Tests_passed,1f4ab1f542d90df8e1491c780eb558a0f597ed6f1da5656e44984dd62c75d1bb,True,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,True,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,7d00a2af8e60352da908b9251a69541dca840ce922502a249d3b410b605f80ca,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Tests_failed,2ce40dfd880d5c928eadede3c6f8fd3345890896a064ad25abd7f9ba6ea56f00,Tests_passed,e8d564d9e271015218f434b44ca1c6ac340527ff2b925b59331171ebda0ad554,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,5f13f16cc71d2ae8d3987645986830db16173c5cf803ff87dec00b0215c40591,Tests_passed,3d8818e2c9d5ff61730eb277270a0ef19d638a6898ad207da83066bc076daec4,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb,Merge_failed,3a8b312ea3b11559f7878aa86286016261353b661eac9d0a2bf039f79a1eb8eb diff --git a/results/reaper/merges_tested/risingoak/jenkins-client.csv b/results/reaper/merges_tested/risingoak/jenkins-client.csv index 4a255d65c7..9a27d49741 100644 --- a/results/reaper/merges_tested/risingoak/jenkins-client.csv +++ b/results/reaper/merges_tested/risingoak/jenkins-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 79,refs/heads/master,56d27735ae3aef791a8aa330fd489917c7ade50d,65516173af2f28b3b4f5f76feadd0a9120e28ac6,887cbfd64c010a702f92b171ae3cac3fd48893ba,,True,True,True,14,44,551,2,True,14,Tests_passed,d3eb9f97f751086ec1a9e98f9b157db5337b74c91f85eb2f61b89090822bd465,True,Tests_passed,140999204148a5c381e11a068b608fb303d63bae532d725c9f7b66460929056b,True,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_failed,231bc4b0e544034f5646d15fd87b8e7b2bb8b9192485453818a67af62cdd1dc1,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,b5f2e26ac3204aa607d19d08d8038869a2f545b6cc381b597f9131feb97a5550,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd,Tests_passed,f5f60a8b31090337ff8d5362b4281125b8e5ffc7758d55eb16df6159c797cfbd diff --git a/results/reaper/merges_tested/rjohnsondev/java-libpst.csv b/results/reaper/merges_tested/rjohnsondev/java-libpst.csv index 19452fe75c..fda239d402 100644 --- a/results/reaper/merges_tested/rjohnsondev/java-libpst.csv +++ b/results/reaper/merges_tested/rjohnsondev/java-libpst.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/develop,c4092b6aa4bf8d1d48bf15d72abd7de6fe8a4723,977850371bd36c57202d4e70c92d7757693846d3,5fd2c7553b3b9569bacf17faccb9a692fab459e7,,True,,True,28,522,,4,True,28,Tests_passed,4b820c146c8f3df9e7d6bc06ce475639775a0134cfa363a0ff085d18db6619bd,True,Tests_passed,a15d27e69852b33b51acdf8f6e589bdd17fddb01f12fd638f95cefc250a05755,True,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,78f33afb54026243298546a2bba8041e1dd10a3f32e2d0b56a8b3504f7466df1,Tests_passed,bd6bcbd46da5d0f7443ec936c149a1df912c4e5111d7d14e39ff447c4888c1e1,Tests_passed,c1a9a7a6692ca70e5266846e390a5e54b64128fd1f823052dc6c98c528f3a465,Tests_failed,e0471495fb797ec51feb792dcf65c598c896fc8d09e2bb36e905ec696e231add,Tests_passed,bd6bcbd46da5d0f7443ec936c149a1df912c4e5111d7d14e39ff447c4888c1e1,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,00037898c571affcab707522940546a3b879171c5d71690144493a72ea8dc2ff,Tests_passed,c1a9a7a6692ca70e5266846e390a5e54b64128fd1f823052dc6c98c528f3a465,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Tests_passed,991612d8ce539662082b71ff5403949a6c5ab40df184697f7f99aa62711ab52c,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7,Merge_failed,467b1154bd9c94e732c354a8ca10c5e36ac24d4f21e4981d9d889d2eb80d70a7 18,refs/heads/develop,8fc5a5c5d12b78425941201f89f76a3d2d0a50da,e0296adde1bccf18d25b2cea922d5955d7e98ed6,6b8a24004fe1140303f403a4e15d59ba3baa8fa8,,True,True,True,14,93,718.0,3,True,14,Tests_passed,1f0f28817352bd3ed687715154efa1336eafd178739ed3d3b7f1e9f388336ce2,True,Tests_passed,b19a06025c8ae73ee9fccdbd9340cfd5addad69285bb94c0f1de7db54fe49f8e,True,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,82f1cb83c23f1a98afde258427af72c56d1e17eee2f5876ab689f9475a712039,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a,Tests_passed,916b4ce2b8a64ef3236c8347e331ab038307c7b590ebace32876de0dcae2c56a diff --git a/results/reaper/merges_tested/rncryptor/jncryptor.csv b/results/reaper/merges_tested/rncryptor/jncryptor.csv index e9680bc265..32984f661d 100644 --- a/results/reaper/merges_tested/rncryptor/jncryptor.csv +++ b/results/reaper/merges_tested/rncryptor/jncryptor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,c54c76bac35c50d72514642ee6390435c3a93590,7ce2822d12b3e6cf2e23bc42ff6e2ff540544357,94cabd7011843fa8d95c448be63db95183b1bf4b,,True,True,True,10,31,181,3,True,10,Tests_passed,178ade38a2ad32d0c458f2476afa73460be8fc83af2a76721571a596867aa453,True,Tests_passed,2ee8b274c7b1d22c925932b64d8d4d3b95b6a6c35c042ce8da6920c5c42fbb63,True,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,f5e2d351c9bbab5044fdf67f3b34cdd560f71afc963f318c9fdfb19cb574c501,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a,Tests_passed,ff9e5a237a2dcdd6ed58e673a1658317831077bc60d88c17ec7f6c0c36943b8a diff --git a/results/reaper/merges_tested/rnewson/couchdb-lucene.csv b/results/reaper/merges_tested/rnewson/couchdb-lucene.csv index 56a37415da..19b9623f03 100644 --- a/results/reaper/merges_tested/rnewson/couchdb-lucene.csv +++ b/results/reaper/merges_tested/rnewson/couchdb-lucene.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,5a7f9c7c1b8984d91cfa707f7d69b4007bcc1679,51a152b363bc753cbe4ed6a4353b57bddd26c272,07d49de6d47196e901138e2d036ded3ac1ff7185,,True,True,Tests_passed,b74d1188f22a9ed791c386d43e0b0cee8cfe074f9618d2ed905b85159b85704e,True,9,28,111,2,True,Tests_passed,ddb48b297d148a048b8d34b7977eb38c1e61551de9ec6e225db707e62630d728,True,9,True,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,43fb7f0dd51fa89b477f1a9ffad9080b6c4b05b0acaf20299c8e2aad0f17f613,Tests_failed,dc2ce195e93b3ca47afbb1ee19f2b83211434ee5b8c266acc2ea17e6e1f9b488,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,43fb7f0dd51fa89b477f1a9ffad9080b6c4b05b0acaf20299c8e2aad0f17f613,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,686d35c75a1a80452adaf3b3b1880fb4498b925dc67e98191ab5f8f9a8c3aac7,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da,Tests_passed,7af1af7be8f8188e2cecd11fbcb97eae7b868bf45db5ee305cfa887643a383da 26,refs/heads/master,51a152b363bc753cbe4ed6a4353b57bddd26c272,4219e5e14c10df1aaf93bc8dee071ba3b81ceaa0,d957e64409599e6ddc18f741168e259bf339f3ca,,True,True,Tests_passed,91b4356306bb8d8ec23fed03379a6511576560891b71d3bc5d1535f870a84006,True,10,24,86,3,True,Tests_passed,e2e5100e41504126de4e5550b827494a24dcb9d0e312041d52e765103ead49c5,True,10,True,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,c6afa037f5fd4ac066c2e1f688f7e9ce49d3ebf6fe9e485ad375157f5b42e05a,Merge_failed,9267a58519db509b97e764bdbbae480a5a1fb254e9c5d931e83f228a9c5b79b2,Tests_passed,edf907f06cf5d7b83c0fc4e64901ddb1182ba9314eb7d08e0aa8bda138387600,Tests_failed,1868a5d86ea8b1dcc4277c4e8639702da72185b8bc402598423ad13ef46cdc6d,Merge_failed,9267a58519db509b97e764bdbbae480a5a1fb254e9c5d931e83f228a9c5b79b2,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,cd187642b567d04e3523defc684544530602174ed49b123c30f3d604d93b95ed,Tests_passed,edf907f06cf5d7b83c0fc4e64901ddb1182ba9314eb7d08e0aa8bda138387600,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45,Merge_failed,b032a0459cdadc0d11680290c6df4062971ad2f3411b2f52a2a546fe7bf85c45 28,refs/heads/master,fcb4abcf019317a1cc1c1c9d0ee382cfeff26256,4f746d237a670a1de79167e6549f3e33b336ab90,ca21eec6242b8544e69646769a2505c994984d78,,True,True,Tests_passed,dfdc419d81b61f116eb646bc99d787bac8243f295d996b5b04ab99097ee47d16,True,12,35,119,2,True,Tests_passed,e23a774266f4711cd7825cbfe81235d8573afde106e73905852f16638a238979,True,12,True,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,b95cb19b2ef1491bb8c54dff3c6b2d7004502f010bcf79c66435e27287c54d13,Tests_failed,7f18c453ed8fbc4572961dcb81fb186b575df514cf4354a4912a819c18379449,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,b95cb19b2ef1491bb8c54dff3c6b2d7004502f010bcf79c66435e27287c54d13,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,6e545ae48ecbb1307ebbfd33c76f4ff99e971b554b99409276d31391c1c123e8,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a,Tests_passed,84d20508dc37361301ecb54e20b08db0f49dab15f5ae41b0e8022d4a17c7f15a diff --git a/results/reaper/merges_tested/robert-bor/csveed.csv b/results/reaper/merges_tested/robert-bor/csveed.csv index 114a43b125..5413f8dcb0 100644 --- a/results/reaper/merges_tested/robert-bor/csveed.csv +++ b/results/reaper/merges_tested/robert-bor/csveed.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 99,refs/heads/master,6c5de9e47a9dfbd88ac154496de8e0f39008342e,3005cb13ec5f182427a825d107c5c86031de66bb,833be1401f2e231a9c10e79097a7858c903cee2a,,True,True,True,17,24,124,2,True,17,Tests_passed,22ed8a3258a42fded3a783ec83f397ef4947fd6b604bd0a40fecbfc9819380d0,True,Tests_passed,906def81e1897c982c7a1112b79ae913b8ac1616b30e489a296d67a611264a77,True,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,6a98da8714135cfa9136cadf7fff45e4e55d392a415964cb2e71e0d39f9a2eca,Tests_failed,d1832d36111a425035112da4cca32f2b43ae46aaf067d9b7401d1b2c54f4a6ba,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,6a98da8714135cfa9136cadf7fff45e4e55d392a415964cb2e71e0d39f9a2eca,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997,Tests_passed,351c928feb93c43b6d4a123b6900899b5c22d381961ca628f72df42f48c9d997 105,refs/heads/master,b99c0263d2893ce82b0cb4e45d34cc526acd4704,520c0ce425155f6353e4cafda41d9c3895a30051,84a334ca087a8e2a90ba5bbd7e3eaaf7e539b42b,,True,True,True,15,47,194,2,True,15,Tests_passed,ad361a9cb59de8aeb762342b49184f0238d2129b669d483c6d9acbd85d40b2a9,True,Tests_passed,7ebce14368dd8b9d3e5ae1585402e1da284244e452872a236d3804ac89850cfe,True,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,1e0ba7d9fedfa2b393fe3a68afef3ab974d2914691dac9ac24558ed4a40c8bba,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352,Tests_passed,ecbf8116449a04a99d307e16c34958d6c372d12c185228e0121fd291b35fc352 diff --git a/results/reaper/merges_tested/robobees/simbeeotic.csv b/results/reaper/merges_tested/robobees/simbeeotic.csv index 161d83ddf7..08f0702c50 100644 --- a/results/reaper/merges_tested/robobees/simbeeotic.csv +++ b/results/reaper/merges_tested/robobees/simbeeotic.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/remotes/origin/autoheli-dev,8b525e23773abf00d51bd55086fb24781ce52528,860c4ed1bbede9eeb2f7354f8b15205539da2376,6c55b90e9325ba2f56586e5bd8c054529e4bef0e,,True,False,True,6,64,376,2,True,6,Tests_passed,d568f343315ce56653ed19ce0f9f2b9bc70a3bd1d886f7e01dd084d8e264c2aa,True,Tests_passed,1e5129bbde22dadf2eb1a3e4521c037f432143852da03c159ab11011ee96a9a9,True,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,264e7f93d34c07fe24d50596046f2ac1ef1438db5fc138a6d54817bbca22e6f0,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,264e7f93d34c07fe24d50596046f2ac1ef1438db5fc138a6d54817bbca22e6f0,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd,Tests_passed,8517e2b262123159fd983e37705a6632899442f9e3785c39b727a03eb84987fd 9,refs/remotes/origin/autoheli-dev,d8cc9db915bb7f2fd6a528df8c173d1c08407ec4,749d71d29f5e2109d744395ac371452d3e53d26a,d7ac67438b4894fe659d052451d89690ddc44da1,,True,True,True,13,144,836,4,True,13,Tests_passed,726d92b4178350acde3e24a7432e7fe303490b084cec6f579f4f67370afb0869,True,Tests_passed,2715556027cc8e037d2c518193feafac6679a0313e79981c996a000317ced594,True,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,394a5b5b7582767cd21bf0fbd0de2f0fed4bafc3e5b1db75d7ba496be32bf6dd,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,4c38f05f55337ff7069f8e35122b28046f8e8b7277ef3977c9b97094258e8152,Merge_failed,99dceb80a691bf6cebbea82f3578ee62b518bd151c12f9dd3e44eee7e2e500c5,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,9963a00b4b68f1987bdd83ee1d420c9820cf74c8f7dbcb16471592eeee2e18d4,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,a1528b5a772c18e3fe0fa886a10bc387b67721363e26e5768d08084a65eada7d,Merge_failed,68ac5f32893111496322254a580e49dd388ca435d3f434ccdc781e382b8eea5c,Merge_failed,890ceeb23bd7c4f9f5bfe64463466775243cdeb261ad24cd095043315d27011f,Merge_failed,afa98fe8ff8b0c170727efcade5b9eccd9745c2e466d1c7992c88439e6bc5767,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,08655c72c50e890c9e82336177b80a53000c283e1171390f07e1fb81cd558b02,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae,Merge_failed,19903c69b4d78f1f4f36351c6dd4f44cc1b15da84efe896e4593c0aa3704c4ae diff --git a/results/reaper/merges_tested/robotframework/javalibcore.csv b/results/reaper/merges_tested/robotframework/javalibcore.csv index 12d600c11b..9760a8ae35 100644 --- a/results/reaper/merges_tested/robotframework/javalibcore.csv +++ b/results/reaper/merges_tested/robotframework/javalibcore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/develop,84e942f595e4fb4db9da155f4a448a6d1d76dcce,11bf4ea41799866526a7c70d40d9c76fe8be7496,f7adc77f3618f17cdd9af0ae35a485b724292fa4,,True,True,True,53,71,3957,2,True,53,Tests_passed,4544f1fcd61d4753afee64ed9efd1cfdf3e41bb35cbbb187907d23e32a2b9e7d,True,Tests_passed,60f0efe8fec3f6f504ff9a33999ba55c423a8161516ac577cbbceed27502e8ae,True,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3,Merge_failed,af1a66fa2bf8cb38ec4bde5c3707ab2f9d21c39d7956a5dedba45c86a9bae1b3 diff --git a/results/reaper/merges_tested/robotiumtech/robotium.csv b/results/reaper/merges_tested/robotiumtech/robotium.csv index cac6819ff2..e97d09e683 100644 --- a/results/reaper/merges_tested/robotiumtech/robotium.csv +++ b/results/reaper/merges_tested/robotiumtech/robotium.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,4476410ce640326a4c4dad7a6373a572b6277c79,d1fa149f493e3313b1c321e35b3ef0935380f73c,246b8682eb7977fd19f17cda345115899fe5325b,,True,True,Tests_passed,04ba55c0915cb933b3c02b8613be0264da8e0cb7d4804c35114b39b4a01d602b,True,16,72,286,3,True,Tests_passed,a8da5f92ad3447119e7bb7e7a88b6c8003056c64e33870de3cacdd7aea15dff4,True,16,True,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,86968050e9aef9bc058d5d375d463bcc33ac45a5940587bf367ceadcfe573549,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,86968050e9aef9bc058d5d375d463bcc33ac45a5940587bf367ceadcfe573549,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,bc62254f41b3e0b73a534464b4d1be104a58644e28dda2596b49ec8efd16a247,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654,Tests_passed,3c0862ce0624ac626cc548681d6206aadc52e7ce49696f8b61e7e27489067654 27,refs/heads/master,4df4cf8c0ded357fc2ac4dc81625fe0f851643f0,aecde861427d4ceb1d1d3159bf77dceca695e619,f89b3ae34bd05a97e3d127ae7f065b6b2b2cdb86,,True,True,Tests_passed,a922fb6c6f57af21d7c62a6145ac6621f3622319cd2a5ad3dbb03a3306f45f8f,True,20,147,760,2,True,Tests_passed,33a9a89344c884a5ebcd6dc8697389eefc24432e6acb942a1138f08f3cf46742,True,20,True,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,b6d677a147b41a9fa7be61498d50cd062463766a02174677829065710a989c58,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,39cca84814339ca8f16331b0924c8907cf6fb8f529c16d2741811c6e85e1a1cd,Merge_failed,685f2241a04d6ca0616dc00b804ef1a5048459c04587e596e1a3cf5bfd84b1f5,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,1ca63c9e064947f5c49946817bfb9487df93659f03e4b7269ef366390da3a540,Tests_passed,6839ebcbe7f98525414960ee17594556ad69f8acebbed210e935863e742b0a34,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,c6ba98e255305d31cba76733abbca31c6458765f95edf6ee58330e9b083c8d15,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9,Merge_failed,88c4e5ef3b1688695c52eca8b98794ccf89016cd6fddcc47b67ff6ae14e499f9 39,refs/heads/master,e4e8e55b531c08b6b551949013e9a41a98727023,bc56decc35ae1d64e8ee75b921beef4b5676ffcd,d0afd0d30d35476cea530c81bcefe924bce4f315,,True,True,Tests_passed,01fbc5b347b8130aa4200de408b98a83b3e9a1fabec10cd634859a9a412be8f9,True,7,50,232,2,True,Tests_passed,923c1d2b84351cdb2dff0d2c755e9a3471cca0ec3b04af753ec5b4f2beaa201c,True,7,True,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,77db15ad23cf9fdeba62322d1a0f0d293e0cabbb99f0946be2483e18b5da3a7b,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,77db15ad23cf9fdeba62322d1a0f0d293e0cabbb99f0946be2483e18b5da3a7b,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,7a4a71ab35be75bfa1f75a50eae35cd16eb799338d13a0252e27832048666284,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be,Tests_passed,2cdf87afa32020b5a7f37bc75b18ac7c168094f9a838f7b35a32deadac0de6be diff --git a/results/reaper/merges_tested/robrua/orianna.csv b/results/reaper/merges_tested/robrua/orianna.csv index 2fff9bfba0..ad4dfbdfb6 100644 --- a/results/reaper/merges_tested/robrua/orianna.csv +++ b/results/reaper/merges_tested/robrua/orianna.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/master,1115503e06d523ceb185a8bf300681607a00ac05,8554cdd02aa1f8d77e089f09ad94c5e7ed1a6217,a96461df162a2777b1a3cfd13f984deefdae9431,,True,True,True,17,53,3747,2,True,17,Tests_passed,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,True,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,True,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_failed,77e2b4880def2302671ec37871f01e36d8ce7e431f32e2244e5ec9123195e80f,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01 45,refs/remotes/origin/pull/14,9a25a31a4be7ef7572044ef26d11ba55395bbc59,ce872febd076a19ce53c7024de2f8e06569a1d12,87726ac82247ab8002fb2101b3e6a3167bf8ba85,,True,True,True,17,53,3747,2,True,17,Tests_passed,a8d5efce95af5be71f0a02e13cadab4ac0dd704501140906f733ae17e6f3d367,True,Tests_passed,708191c6e446054f8e1608473eb31b0caade744d1dcadd9efb97c1a5c6b629d6,True,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,ac03ebdfc1643eaeaac7c877c4e479840fa1f8554ddb4b4a30448075fc2ee0f0,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01,Tests_passed,b2d3f9a6fb85d23e0c51215f2d4079cdbd5bdf69988b72b02245f86a8cfb5d01 65,refs/remotes/origin/pull/85,69c2b5fc2ab8c8e03e989a64ecc1d582894da7ea,f4d2f99dc7af60f8605a9ce8f5e8939645417d08,f78725825d6ee77c3a298db2a614d61c1b894450,,True,True,True,39,55,2631,3,True,39,Tests_passed,c9dc01800b7d3fa1c1e978b3a86423333dc90b9dc78188418ca28253a9778296,True,Tests_passed,1b9e38aacec41232b738ff58d389ad0fdb8034106fdde7f0b5573fb8b8a5f9f1,True,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,c091566786546264d532604cb26445a0f103c3fe95ee575ab6447b68c8acb771,Merge_failed,baf0b7a528b14f2196f038dc5402de3907c3639cc05a28164977d15c8865172a,Tests_failed,47d2b9a963c81173e16d23bc531aa31fe332bb913a2640c1cc243ff2a365c66f,Tests_failed,2d7b0e8c4d16fe20c949f7be085e6cc76113426f8317dc5f16fb9515289f9a1d,Merge_failed,baf0b7a528b14f2196f038dc5402de3907c3639cc05a28164977d15c8865172a,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,bb4f05b06839c5ac4685600ad14fadf82bec00b22e889a3b9d12c5f0afea9ca4,Tests_failed,47d2b9a963c81173e16d23bc531aa31fe332bb913a2640c1cc243ff2a365c66f,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,5fe96a5177d61fdbda9e71c2c780b544c074e09f3123d0b2f4bb24d71a4be7c0,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83,Merge_failed,6634d449e62690276668e6cb8a2afba9740cdc31ae5bc275d3e351fd8327ff83 diff --git a/results/reaper/merges_tested/rocketscience-projects/javaslang.csv b/results/reaper/merges_tested/rocketscience-projects/javaslang.csv index f614bfa12f..0a8a14a77e 100644 --- a/results/reaper/merges_tested/rocketscience-projects/javaslang.csv +++ b/results/reaper/merges_tested/rocketscience-projects/javaslang.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1174,refs/remotes/origin/pull/2745,fee08d022774a000e65551fc71a74ae5f865866a,e07b9e2b96211219cc1b5fc87d1e38994ec74dd5,26181f14b9629ceb729a73795d3854363c7dce0e,,True,True,Tests_passed,758362099cc2193eaa631d765a90f790a2c19d3f9c488a4f3e57827c1a73a193,True,331,1178,18550,8,True,Tests_passed,e85dfc6d60d80af3f858131d96a7646c775e8302f46f8200fedcd1612d4c7ebc,True,331,True,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,fcbaa247b4d7599e51ab63b56f2d7740f583505fe211058f4743efe230b928fe,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b3b3cdc5a6968b8e88a43951fcbdf9d5fb68ee982576cbf1a69ddfed90a0cbd9,Merge_failed,c0f68e5f20c9c6ec7c98ad83ed32b6674fd42ea187b6ba73462e4a96aeb8062c,Merge_failed,5a1485562b8c4061199c0846b1fe3cab5fcf1483f369bb37cdba26f5cd1581fe,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,89a962605d95493b3babec67589220a84eeae458bd7921e367f22e7096a6c8df,Merge_failed,e3704272f907370a7a6481847a32a4af07242bd568f79f02d50f419ee907b746,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555,Merge_failed,b4c0f80fcf155a1085e2c273aeab2adc7607564986c2fe96a4a37d69e34a7555 diff --git a/results/reaper/merges_tested/rometools/rome.csv b/results/reaper/merges_tested/rometools/rome.csv index e6fdd44f65..c7e3b7bd3d 100644 --- a/results/reaper/merges_tested/rometools/rome.csv +++ b/results/reaper/merges_tested/rometools/rome.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/master,0de36f1a02e1eb86a90adb362239474aa26151ae,e3dc44cf971a74e5fd7e3af7b7ba3835ffbeaa30,20e07a97e16fa762d275ba80db8e7f6dd35ac4ac,,True,True,True,112,231,638,2,True,112,Tests_passed,c775a4537ef113cff864923701a73b269577fcb23ae68a103fa49256668e4a63,True,Tests_passed,29f56cc1c4f1e7d62e4ea59508aef9e70235f4f1df9de25606471fc7bb09313d,True,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac,Tests_passed,cd8fe88681d40870d45ee1c06d7f14de3787a820b06727a2ff6b5183a71aeaac 13,refs/heads/master,af93948e78009760102ec5a4d83b0dfb51351334,961a6407e11d1c1c02fab9f10e4887e324f8e9b4,29b992ba025119d716113b52a0c21da02dd210f6,,True,True,True,431,831,5956,3,True,431,Tests_passed,1c694b77a1cde4f61723b1aa62085ce5a84dd26285d8338e3adcb16b809fe30b,True,Tests_passed,0463e90e462605abb84039632350a15b9f51317dfaef3b6d1a1e3c29cef9425d,True,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_failed,b744a6e31a82288ff06945b7bba7cacac4db8aac1d44261ac1333245e144c403,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,1fb28c36c37332202fa8fa5e7ed75fe8c8a5905669f506cf2ade8b62ab007dc3,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f,Tests_passed,aa33f87dc0a14cf3ae31ee2bacd2d8bd07e40c898538ad6dc57e4633c082b22f 77,refs/heads/master,648a1f04cf5a4c55a13bfff801389cfe93c6976e,77c50c516bd562a4982e4455e96f3871dd9fe4ca,a2d3689d9f7bd66f27c956210747c9d61c82355a,,True,True,True,78,407,1785,25,True,78,Tests_passed,e021c91fac5180e7a07f5944716c752f294e2841e97ad5234b138cccb178628a,True,Tests_passed,534442442ccde2f3e4ae66d31f18370829451e380bbf49f4a146a7abb2d43747,True,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,707fc5ee14df6f3a7298088a5921375596564fab44835789cda41b3524ce165e,Merge_failed,daa9af2eb0330a71139227e2f43611edd2224536bc864b1ce188873c9996727f,Tests_passed,f3002bf7f129bfa1b65cb37231d7ccd5f9bedb756110a2c0658bda87367e6989,Merge_failed,280a29dcc876e5b622b8623abaf3125d6eb915280141fd07540d6c2c7f54a0af,Merge_failed,daa9af2eb0330a71139227e2f43611edd2224536bc864b1ce188873c9996727f,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,f62635ab9690d5cc0064f59a93ffe6b031712b19ce7c16e8c98725d7f4ed446d,Tests_passed,f3002bf7f129bfa1b65cb37231d7ccd5f9bedb756110a2c0658bda87367e6989,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb,Merge_failed,754da8c132928c4ab9033d0545ba2abe969cf2d6337976db187ba28b551c69bb diff --git a/results/reaper/merges_tested/romix/java-concurrent-hash-trie-map.csv b/results/reaper/merges_tested/romix/java-concurrent-hash-trie-map.csv index 0bb90e467e..3798b43c74 100644 --- a/results/reaper/merges_tested/romix/java-concurrent-hash-trie-map.csv +++ b/results/reaper/merges_tested/romix/java-concurrent-hash-trie-map.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,03335a9caa6fc867344c8c015d6dfc2d11ab062f,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,3e7efd43b645924502c3acc7e5ebe211090e855c,,True,True,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,True,7,32,149,3,True,Tests_passed,fdee5637855972184693f2c625baaf20f7f2e00089e0cccc6e07543bcfe68556,True,7,True,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_failed,69c07fbdef179b87e2d682ee7b17b6769f947783ea72d92695207477f1c02723,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,8c31bb0d20bbe17e92f7acdc8b4bd73a53214d78979cf077a4ec67a9b423dbfe,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568,Tests_passed,fb7263e4e8eddfe59b9cbe809e2faf0b28c0833cebd039dd5331ea0d875cd568 2,refs/heads/master,6ad8485e9c223f6cbddc72c13ab45c900bc1cbc5,d470c98061287bb08883c4867adbb785ddef1935,cae6e1cce4710b2e179c5bdaa764c2977a83b475,,True,True,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,True,4,9,63,2,True,Tests_passed,8f911f583eb2fcf7f335d79d431179293d852b4c6031d7ecdb17a3897b02371b,True,4,True,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,604f67bc97cbab602b5be7f96fdf44502819d277dfb585a86790634585617a9e,Tests_failed,d2059005e0221fb4ac767005eb820df5354cf3f0174e15fc15788a4e9e17e988,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,604f67bc97cbab602b5be7f96fdf44502819d277dfb585a86790634585617a9e,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a,Tests_passed,dcf1d8b511eb9607d7a1d7025afebd3fdd24155a15753c3f085e090f4f7e602a 3,refs/heads/master,d470c98061287bb08883c4867adbb785ddef1935,5cf056a923923ab53cfc999aca71109d71ae82f5,92eadae20f0d3fa0de3d859f285751223fee62a9,,True,True,Tests_passed,88352cd0d21a6c39f9565f2272e4ab551ecf8810d24fdb564f046a3604d2ecfa,True,2,4,14,2,True,Tests_passed,d58f52cfbab8c31b8bac53f5ded2f4fd54907856972f0de17949849027d69978,True,2,True,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,bfa7fdd8c334c9514f869f8f8bf5c930f998b7d6ee8be55004a713f1ffd5bd43,Tests_failed,df07a90ad9a654bc611d9f61ef1c0413291597d71fa5f4b83cc9d6fb3d817dcb,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,bfa7fdd8c334c9514f869f8f8bf5c930f998b7d6ee8be55004a713f1ffd5bd43,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781,Tests_passed,45e30a8b4aee52dca4e85ce721fe94f6d0f0d532655de766eae5cd72717d0781 diff --git a/results/reaper/merges_tested/rschreijer/lutung.csv b/results/reaper/merges_tested/rschreijer/lutung.csv index cc71bafc29..e01d260dd7 100644 --- a/results/reaper/merges_tested/rschreijer/lutung.csv +++ b/results/reaper/merges_tested/rschreijer/lutung.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,70e3458c0a4c096d7b1ca7426e61f5a876025fe6,8048493cf975b711e28a79be0705ff7ea8a5b27c,db1238d7be4edb64826603189f3cb48e9d8de7cd,,True,True,True,10,168,601,2,True,10,Tests_passed,e800d7eac14e7f1d8ba73ca1de478b3673b7b935b95591d3e29b3e8a576db623,True,Tests_passed,391cba75427c89f6f270f662d424c3f8983726cf48002fc8e100e0b6b8601ec9,True,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_failed,8911fba26592cd8378f5490a7da6eed0ad35a942c670a4dcbf6bd52dc78f4d23,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,7e423adaec6237ded32917cd06bd039b7e4719835d6389c8622248f50654b19f,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b,Tests_passed,3426d0f69026b546874171d57df19955a049c8e2b306d2675a5ccb8f76d0704b 15,refs/heads/master,2f65e975a8878ebcbd78fbb87e3fa878fa46b41b,7de0c05a78dd31ed2b353915c1e945eb786c7fec,7ae086f85f7e0e1a44cba41b4e08a531c2ac575b,,True,True,True,16,37,382,3,True,16,Tests_passed,336716c9d5082e067c479f7657ccf5b4bbfb61c698d8929de4cc14106d237eb6,True,Tests_passed,42ecf3a3bd19acba3ce4c3bcc49abdea475c0f298870a2a5f0e34e05d8115210,True,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,b963a9b39f06a5e45185556d128cc2418c2be64190d453993e511e3be7ad5dcd,Merge_failed,6f8018e1e0f133021c4afb787f5bada94740a043e65169da13c34f93503fcca5,Merge_failed,aa96d205215878c69e4dfc850606261cc0c02c683a4d4f6c253b5db91a76eb21,Merge_failed,2925245e073d5694335a1cb1e2903129ff1df5524ff66d9e9b6de040ed0ae8c3,Merge_failed,6f8018e1e0f133021c4afb787f5bada94740a043e65169da13c34f93503fcca5,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,98b14baf3868ba4ecf7af647f543b9e9f57ee9d982153d60b3ca67cf3858bb56,Merge_failed,aa96d205215878c69e4dfc850606261cc0c02c683a4d4f6c253b5db91a76eb21,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,a6a53df57a5a029b5a5be24a1a49a1952464d4ce914e24737eccacc5f5e9505f,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635,Merge_failed,26cd83869a4c9cd5d70e07d7ff5c2e685aeb88eab0213d2c3eb439c4c22c5635 17,refs/heads/master,747fdbc2ccde5a130386cd425ef70a475af95b27,6dbc04f02e22bb5fbee09470738bfbf427e7b564,9ae6ca12f7ce446c59aad1b9a430a74294a1c604,,True,True,True,54,266,3563,2,True,54,Tests_passed,ca5ca7c0d3de878211a231de16c105884fb2b2cf14fb8a9559b682737442f810,True,Tests_passed,3a8a500d771cdee0083494928a444f147e30f18f40c4f69c33c826cd5da0efdb,True,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,005cb8f99d34ef39d7acb63e72365edac8428b09faa3e27cd1b2f72dc539735a,Merge_failed,a6303d6bb386b8dcb5e93ea0907800fd15fb36a354263abc1a2481b05919b611,Merge_failed,2701fa9b4eb6694d0974ae25a1dc2e4f10a0efd75985c74b2def63c981b05db6,Tests_failed,98386e9edbc546d21c516fc26b7ee193c7e1ca944b4783f1b199c295e3b25dc0,Merge_failed,a6303d6bb386b8dcb5e93ea0907800fd15fb36a354263abc1a2481b05919b611,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,668f2c92c30d8f05675904ecda00c11d7ae84adcb586bb12e90ab98eed7f8f70,Merge_failed,2701fa9b4eb6694d0974ae25a1dc2e4f10a0efd75985c74b2def63c981b05db6,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,64217b066a43c8f67a7fa53efdc2b84656902214017486e9b8a67ca94647dec9,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126,Merge_failed,ca53fceaedb5fe842d7f9e15dba2e480f7f6049ae6f07b201a296b2057844126 diff --git a/results/reaper/merges_tested/rtyley/android-viewholder-listviews.csv b/results/reaper/merges_tested/rtyley/android-viewholder-listviews.csv index 9903fe855c..d28a27ea59 100644 --- a/results/reaper/merges_tested/rtyley/android-viewholder-listviews.csv +++ b/results/reaper/merges_tested/rtyley/android-viewholder-listviews.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b5a40bb804382b21052c99890298fc5afcd4b6b1,f1a4013c4f3a8d85879574f36c43e60214116b9e,a357f921c5ce966b1e8e61650d5541fa02ab2f27,,True,True,Tests_passed,52852961f97f69652d8b6831bbef8ccb09bf651c37221b84087567baf5236619,True,4,5,16,5,True,Tests_passed,5551da408aa8f3ac531f4cc4413936307e9a8553eaae4007eedb2fe74be3336a,True,5,True,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,407bbf3e6d1c5ada81b2d459b23ef25666e9b6f3136ae6bc83a772c9fb9d3c75,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,1c9aa07d0fed893515971bde710cbe56e61e57e11b814b3c37dedf9774a6039c,Merge_failed,a8f292e314032bc0bf733ea14c175d5db0c3c93022359f0ca7c17ea72c8e4d9e,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,bbe379bf6112a2739705f5190ee29ae68c12dbabbdf02cb2562b0a00352b78f1,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,efa6444b492b195b0736f3b05956ec094654a59e17548665bc9dafc94f3405fe,Merge_failed,13330bbd1329ee91714f1331474af98ee7231efe5548cb9b8818abe6243ff4cc,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead,Merge_failed,f78e7511bedc65705408ab98a3bf2fe11f531d4542eae9dd094c6abcfc64bead diff --git a/results/reaper/merges_tested/ru/casanova.csv b/results/reaper/merges_tested/ru/casanova.csv index de8373b2b5..c47c71d557 100644 --- a/results/reaper/merges_tested/ru/casanova.csv +++ b/results/reaper/merges_tested/ru/casanova.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5e273b685e538556085f1690a49b15613d18c395,245a35003662012ddd4ea6c178204f559f50c9a1,f702725b4b49ecd53451582f19732f3431740be4,,True,True,True,51,139,11123,3,True,52,Tests_passed,e9cadce2d78ddc33738bf4ffae51eb1ea9ad272d3355311a93519fbd3e84128d,True,Tests_passed,e523bc901bdcb9eff24881fa9caecb156664b44d0a891a3f6eb5c1452a4de48d,True,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,e1c80a1a7a38b3e07f4f85169a8148f0d8891c76c5ad9dbad7a8c89b5a99249c,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,12aed1dfb0e166411adf563fba2f945c694d3f0625fb6913d55af0a95586a4dd,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,4120ba62cbb62dec3f028cdf594e10cf217138b3564079227a5c9b7070b39ad8,Merge_failed,fa03aa34f7bb18f85180bef148357a8d329bb8b316ca11d80140e0089502c881,Tests_passed,03c824b9dcbd2d330a7c6d6f22c6121972c11a7d0b0a1e5b1d57d6808accce90,Tests_passed,4efb9ada580ac2dfa3f64c5108675333b87aff9970d2c9dd3ee23a63e359e522,Merge_failed,fa03aa34f7bb18f85180bef148357a8d329bb8b316ca11d80140e0089502c881,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,12aed1dfb0e166411adf563fba2f945c694d3f0625fb6913d55af0a95586a4dd,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,9ba0c54e819cac30f52d9e7fb889aa9f3483ef93c3a955d4ea5f8c7787f48e28,Tests_passed,03c824b9dcbd2d330a7c6d6f22c6121972c11a7d0b0a1e5b1d57d6808accce90,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,e1c80a1a7a38b3e07f4f85169a8148f0d8891c76c5ad9dbad7a8c89b5a99249c,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476,Merge_failed,99017ddc5dc5445913128209057d5c80c746b30aa02957ac24810e93b6375476 3,refs/heads/master,455f0369c9e8ebe41eee39f890ceb6ddd9310eda,d2932adf48fc17976dc74f3e965030522fcbfe12,1da9ce5a7695fdbab0c29966a594ca5fed796faa,,True,True,True,53,60,4468,2,True,53,Tests_passed,1149d181575fe104cc30e2e433f5aa9b440c4bd53725e9ff539477759a8542bc,True,Tests_passed,cfa82e0dd62db04aed04507c99da6acbe43353205595ef3e0a9a26fed0c26f2e,True,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,11deb7c1052e6744ac84e3eaebbf17c953e497ff4bfd6a9eb0802ed1e27ece88,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,2383dc399c19e28c137cce102727bbddef92b4bf300a50c7a33051aeda630a70,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d,Tests_passed,32832c756069f162d121889d954e14bd552529a7e9d710a2f94e863d1ee2478d 7,refs/heads/master,b0a127d82b21260d9ed9bc2e2570db1f41303216,c7408edf092333c5067054cdd400e8c8307ed212,30febd577047f776b3a3a025a20b30abae9d06ee,,True,True,True,59,143,7374,11,True,67,Tests_passed,1108e3348e60485485877a241c046c83329ece54b426d03a8da58bd5f6a8d2be,True,Tests_passed,3dc0715cfcda019617134e6d83937cc7d35379af57dc31bf42722593121bc225,True,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,cb580ba6774999ef3425c0f2b1e13370b585869e14a61519f37fd73208c4b0b5,Tests_passed,2c0c7f843c3a74ef00b03bd2052769743f94e5bff886702facd16fcca0181f0e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,cb580ba6774999ef3425c0f2b1e13370b585869e14a61519f37fd73208c4b0b5,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,1e98b6197f9dc4bc80dd1935b4e37fd4fcad46e4a81cd6092341fbc73b87640e,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118,Tests_passed,4f1c021c0831c7f019981cf713f2e507e104786a824c8812028c7ac9a0145118 diff --git a/results/reaper/merges_tested/ruedigermoeller/kontraktor.csv b/results/reaper/merges_tested/ruedigermoeller/kontraktor.csv index 79bdc623dd..1871da7e9a 100644 --- a/results/reaper/merges_tested/ruedigermoeller/kontraktor.csv +++ b/results/reaper/merges_tested/ruedigermoeller/kontraktor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/java14,b8ed9bb629b78fb9e64991252a2554260323ead0,d3ac25c82aa6fd921352e9bdf7ee3878397ebf1c,bc9d0d697ad281de065610ca8fb2298ff38f7434,,True,True,Tests_passed,dd46d9e739e4bb8a61c233ed3173d3c74d0c9cb34c6e225900f959e80d59054e,True,20,52,474,3,True,Tests_passed,966a793f07c9b1016df2e5df699c8b8159be2575f6c8fe2f0343d8d31b9199fd,True,21,True,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,dd031ec12756bba2814ae1997c83da87dd7519843f2cf0128b8462425275352f,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,7f0bab2718f5d1a636c5ca3902057806181feecf02f6977d1ae1f03b0fd82fd9,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91,Tests_passed,ade2a205e80282cb6c40a39500b382673e832c3bd80626b9c60eb2b2906c6d91 93,refs/heads/java14,541a55afaebf5674b8c9bcac87deadc1b3bc99b4,70a99e69b15756905b841f804d640f185ff1a900,aecdd2a866ec12f3cbe7b9a656d3f81a23a24e2e,,True,True,Tests_passed,b526da359d97e64c596f776ec38e16d5ab0354eda386731ef6224a331dc0ced5,True,12,36,261,2,True,Tests_passed,831fd89c2954d3f163d54adbef135f1845544a4beb3a9336b6d5e90acea49f05,True,12,True,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,ab2f2649bd212d6e2da7914f245a2ccb0d02e72f908d662ca3f260b7697d04d6,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,ab2f2649bd212d6e2da7914f245a2ccb0d02e72f908d662ca3f260b7697d04d6,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4,Merge_failed,60af3136dae6671e6b522f20d907803a11d6ac6a5731598f0a1b44aeea2a1af4 97,refs/heads/java14,54fa3de6899427de183bc5434da2d17bbee13023,812d6fe2d71c6cbe4e79118dd78b0711c9e3e9df,fd4aff27b71c9fb55c4d987a74497637dfd4a1ef,,True,True,Tests_passed,1df0f00b5dfc1e84329acd9502e3f2f627c45d8a085d4e941bb453bb95b6e07b,True,8,21,292,2,True,Tests_passed,b914d37f046b9a679d540bb34e566d01b4ae0a3a3c6b53e539e44240b4df50f9,True,8,True,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,673815e3f5d71b2528f225ca847b2c9f1247876d59a2e69ba328c292b783094a,Merge_failed,e4f2bef601e97998369437b69e9974a150a75e469b3335abe0dec8c56c6ee2ef,Tests_passed,db1b26cdfa50f96965f3bf556d20d2b570957f208d2520df9486d7cd0db36a31,Merge_failed,5e96598fb4dffd58f5e6125651761fad4b6ccb38401f147d8d3f71a39df645b0,Merge_failed,e4f2bef601e97998369437b69e9974a150a75e469b3335abe0dec8c56c6ee2ef,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,5b06806f29d0079a145ad70784c26c5965d916798cdbd16c35d017d85a5dbdec,Tests_passed,db1b26cdfa50f96965f3bf556d20d2b570957f208d2520df9486d7cd0db36a31,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2,Merge_failed,ff2220b853e4de841e68f094b305e074936b8519e76561e656da3dc616d3e1c2 diff --git a/results/reaper/merges_tested/runeflobakk/motif.csv b/results/reaper/merges_tested/runeflobakk/motif.csv index e7ee1217aa..cc34359fbe 100644 --- a/results/reaper/merges_tested/runeflobakk/motif.csv +++ b/results/reaper/merges_tested/runeflobakk/motif.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/dev,2df475c5347893eec68348da93344790f6957fbc,e2e547e3c14524f255e0f6ca55c99bcd6ef0c338,61747cd4ffb978ae2dfce019d190825ee4d620d4,,True,True,True,27,94,777,3,True,27,Tests_passed,520d919493b5743dfc0929dcd4f9e7bdc96c9910728c42bd8b18ef1d5c5f3286,True,Tests_passed,88b0b166c1d41b07354158ae5b7be8757cd81644f853c4a8a7fe2f412a5401bf,True,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,fc7e99b49f037e42d30a8055efcacaffb75b8e69e5dfd30ae0e48db1ce29a855,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476,Tests_passed,40cef30e39a45980cbbe473ebbbe17a5a25dbf68e776b80e6dd5c2d392868476 diff --git a/results/reaper/merges_tested/ryantenney/metrics-spring.csv b/results/reaper/merges_tested/ryantenney/metrics-spring.csv index 518bc8043a..39028bbc4d 100644 --- a/results/reaper/merges_tested/ryantenney/metrics-spring.csv +++ b/results/reaper/merges_tested/ryantenney/metrics-spring.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/v3.1-maintenance,5244ad0b109cc2814221012c959aee61705efe5b,32f5ac65aefa8fa8a9b4d96ad60eac5aeb01f096,ccd21978ea0d9b2ec4e5680e81093ae1c54f0c7c,,True,True,True,75,171,1945,11,True,76,Tests_passed,7487bf355c7c49ad1c8f49aff0184e5177884159b82a2abc679229a05bd1160f,True,Tests_passed,07606770b047e7a96c5615ad76379d1f66c829ada41d83970efae9a6657350af,True,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,a80ca6f0954bd07233d28a2e94c059fe84fbe32dd2a5592eeb093667c72721b0,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,bf643a544874ca6efd201eb6eb7d5a0964593049a808a217b0d0f179c7b0b1e2,Merge_timedout,,Merge_failed,755aa94d858f7bd7dba6e22b90e1d5ce90c7f943e6c420293497080fae11613c,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,882c79888f26166916b791edc5b4bdcd1ef606c305515bcba9e77b81a8d4d891,Merge_failed,d9849779c9a83752351625200a826d8b177a9a2243a7ec50e5559b91401fd166,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,5cc5db2666093d77ec8baf263a71ca5b4534e13a66ae2e6c8b151ba531164567,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347,Merge_failed,32c266efd39c399ea2dd5a55f9a87002676ffa7940f4efcd2a81cbde45bed347 46,refs/remotes/origin/pull/137,f0668b736f868eeae7c125b3aa04941fdf2bf958,1e52fbc31b9f18e095291f9b361f5c15fd20c5e9,51e5c2f55cfff76cb53715bf87229f6f103e8a49,,True,True,True,4,7,56,2,True,4,Tests_passed,93a6af2b6f2b9a6940bdfac8262ec83a4caf08027ac89d977a43ed90347009f0,True,Tests_passed,7a1e233714cd1c7942f370f91c836848e73233050d27eb5f5afa69f435c285b6,True,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Merge_failed,bdee5d0ff50073db01da55b05f5e1b66a720a0e7645c3682020944b71d4e828c,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Merge_failed,bdee5d0ff50073db01da55b05f5e1b66a720a0e7645c3682020944b71d4e828c,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72,Tests_passed,ba93c37cfea86deeb4f1a8d3f491e1b24e711e48db1f90e809f257b151722f72 54,refs/remotes/origin/pull/53,4ddab2725aa59f451c78609e432999812eee675a,3f95d1574197bc5ba49e7cbfd122557e9eb90553,a74305e661470406f594dd25954d77c9c6d49738,,True,True,True,44,122,1771,6,True,44,Tests_passed,8b590ce7a2ea16572f1fa9257cd06116f2b5ca7a6642a202534029c28422eea1,True,Tests_passed,8fe4244849f57082d479f077102c272399314b63c9292c624a52b468765f4fa4,True,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,46dec5297b3434312b35d163f31167f96d8188807b9e7b3953ffa5927b8c0385,Merge_failed,1558ffa3c5b5b9e7053c25c7a8b00c57595f1145869ea7e275689b2984a59310,Merge_failed,5c7a4281f43cbab4444cab1a79c101f0153f612149c46e88094c4a91f435ae4a,Merge_timedout,,Merge_failed,1558ffa3c5b5b9e7053c25c7a8b00c57595f1145869ea7e275689b2984a59310,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,aaf013a845b4369e82b178d136b66835e5bddae757212ee9f69ee583e87b84f4,Merge_failed,c609cbd850fc40633eca8a75fa50da9def2084788fe6f2615fbb948fcf2447cc,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,f31c7c28f5cf57d344c1c843d8bf7cc22fe4674580c078fc24c4dcca0bb07499,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd,Merge_failed,da4df8a3ba2c2f12da6027d632fcc375a66b45c1423e0003ab6ac689b84132cd diff --git a/results/reaper/merges_tested/rylinaux/plugman.csv b/results/reaper/merges_tested/rylinaux/plugman.csv index ec0c5d1c16..2e8c8f9726 100644 --- a/results/reaper/merges_tested/rylinaux/plugman.csv +++ b/results/reaper/merges_tested/rylinaux/plugman.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/remotes/origin/pull/53,cd097a5e02123e8341949738d8b0a91b9345b684,b4eb99945c41fc6f4006bdc4c89e9afedf372020,940979e30479e718afcfa6bb71a0b4bd2529f23e,,True,False,True,3,6,22,6,True,6,Tests_passed,369094163191050836bc326e7c0619a31ef18e9d12b0d546acec62ddb5104a4c,True,Tests_passed,5e9443034202cc68c8596fef46a595d4e3fb6046792be089028c0162847147a1,True,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,82334ce55c1e61b8c0c1b52f5fa0786686ecae2f1108a6ba8fea9b798b3286f7,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,bec72c1ec71f1cd2e66a81af3a01c8062ef8b35953f3599ef677f9de9b67d1da,Merge_failed,d7269860ca5eb0280b4dc0e9ba65f3c325fe5fc61c637c05c5dcb516b70d2ec4,Merge_failed,73cfd1964475ab5e523bb0dfb6cb4b4f245ef70be55460bf4fe1239f01496179,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,0bbb884e2d80f415e38b72522e66315cec632c57c5f40c37ddaf108838d12cf2,Merge_failed,03a229fb74c8bff77b1a7208efddc242513d16493a7a1e8f4eec5412338dee9a,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,cf7d86607664f9824a12da856c93d9fc93f0d7e1a9c04e95e294a0f94cc2d54e,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84,Merge_failed,663c5fd8226f392d9b61e0acd8413bd3e3c72501589122084fdb0ae60e28df84 diff --git a/results/reaper/merges_tested/s4u/pgpverify-maven-plugin.csv b/results/reaper/merges_tested/s4u/pgpverify-maven-plugin.csv index dee6889026..a0c226f418 100644 --- a/results/reaper/merges_tested/s4u/pgpverify-maven-plugin.csv +++ b/results/reaper/merges_tested/s4u/pgpverify-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 145,refs/heads/master,86423815da5ac60c8f09cdf198e6d08a50f7ff87,bc4854a58fccc72f9c68290fd4e68e6cdc828978,086cbea80d0b32b10041a57dc9e71d9c8d20ba0d,,True,True,True,10,62,839,2,True,10,Tests_passed,8615ffce9fe64589a6f708b6ac559cb2c6cfb0785d0284987708c98a52a4933b,True,Tests_passed,7bef9b09c737852d75a16f57e98c98c1979c577a83f6e945d4ec4704f32d1597,True,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_failed,c6048999a833894694521fcfe9a2a2a5ff6d8e26bfe27a4f222f6dab67989aa5,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,82429565c6e2c41ee067e0443d364016ac0323c847058aacb3926b1691ed90a7,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e,Tests_passed,c4a3bb24d4d80934410d946f706bc2c3ff2e776c27bc07de0e75d0d83394104e 148,refs/heads/master,183049d43b4244b16ed2c6df4ddd4b43205ee177,6b035ec72e6e731d9e9a17dce110bc529a1672f7,cbd2405f38c10be592123824d3532338fa732d71,,True,True,True,3,7,13,2,True,3,Tests_passed,2083af0658a30f2058b3eba4ceb615c2cd5b295e3ca320cf87ccde61b204493b,True,Tests_passed,391c2e421d5b4c09a27d006aea4472fd9b9df541ad5f40b7b446ffaadf015cdc,True,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,e770722ba1e6f886bd7cfabebcf0f450797dc1424624c993f4cfd5e0bb6f831b,Tests_failed,4b07a60928671471208648471917ad8a5d9d07190e1dfd5c70b651406050a521,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,e770722ba1e6f886bd7cfabebcf0f450797dc1424624c993f4cfd5e0bb6f831b,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a,Tests_passed,7c36233b155cdd40029dc772f11aaa68ee702e5181f17357904981bcca1f9b6a 173,refs/heads/master,f0dd58a6d1373ac33ae4d1bec076b1e7f1a8b3cb,03695f01817c1c19ba31b9d2c968906743dbf2ee,841cbccebe5b706222dd224e1f5c159f97691e25,,True,True,True,9,27,429,2,True,9,Tests_passed,8c921cb8bf17c849dcf7b34db6d63a49d05bfebcf7769e5403550310dd0f041b,True,Tests_passed,167960e1ea6edc5752d2348cae736a74e02cb1e73629216db7376c783a1a7d65,True,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,128c0656460ff5e4fcc073166e5a19fc3bd7bfe82c1f6111059b261b72fb7717,Tests_failed,e79fa68243c79e7314e6d4acf50632804b0936eb592abd4e67214866aa51ab73,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,128c0656460ff5e4fcc073166e5a19fc3bd7bfe82c1f6111059b261b72fb7717,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333,Tests_passed,3f05be18930c1c81baa8614ecfe0090d87142384417fec2aba4bf5c1f8771333 diff --git a/results/reaper/merges_tested/sachin-handiekar/jinstagram.csv b/results/reaper/merges_tested/sachin-handiekar/jinstagram.csv index 084cbd70bb..1cf41d5601 100644 --- a/results/reaper/merges_tested/sachin-handiekar/jinstagram.csv +++ b/results/reaper/merges_tested/sachin-handiekar/jinstagram.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,9dd479841addf836661d8acb523429974d029268,6e062eb16b9f4676749ae1d04e6e554622829666,b5be52ac4da86dfe8511d2eb769d44b86b802fcb,,True,True,True,4,10,60,2,True,4,Tests_passed,333e536c12b9820dbca005c3f6cb804eca42989cae05cb195cdc1c19a1c2df13,True,Tests_passed,61ea8af8111700bcbf78072133f6b26e0efdb05f5557a1b88928a8013be28808,True,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,89bf3e7fafafb25c077dffab586053d8480bf84e2d8c5ecdf03954c3842956f6,Tests_failed,415e82895fc30de0ad3c4fb52d401ac5e21da3799f0c3f11aa17ab913200758b,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,89bf3e7fafafb25c077dffab586053d8480bf84e2d8c5ecdf03954c3842956f6,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688,Tests_passed,59b45be24d763acb02cd186a71ae4d35a1b06c1ded4bdac134c606e6051dd688 34,refs/heads/master,8a29221353368d4d290973e4d8ebe90325567793,1758fa70e7a74e72c0a4ffad99cf6c7435676173,840c591a5e5cf424f5f1745ec911a79d2cd1185d,,True,True,True,82,771,9732,2,True,82,Tests_passed,9e6663596a779a6b3091f01f6e904946348a9e3dc9e332460762642c27114cd7,True,Tests_passed,0bf72301352fd98232923cf9535589946937d73fc1a2bb5c15989820dcddca5c,True,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,2e8103511cec609ad45899a6b0a46215ce9d489d1c3778771fe821195ce7e41e,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53,Tests_passed,af12b158d6650e417df3b93e77dab0a446c7177bed7b20ed7a79c67af5604c53 66,refs/heads/master,b09245f4cd9a3ac6d4fc4fb341602a30e7f13983,30fc89783391edaadf99bb70214d91761bdbc7c9,5c46f18fca43f06ac3685442dd9602f05013254c,,True,True,True,5,15,44,2,True,5,Tests_passed,9dd00a885fa0f70ea70e138aab1b565abde33bc81f65c469c43efa3b823195c1,True,Tests_passed,7830bd7d36eb45025709d792cc0d483eadd293f89a6240cd2d720101950b38d4,True,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,2bd0587e8fa88ab0411ed9bf9d9602669153aaf4214e725cf74b5b4f723e0c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,2bd0587e8fa88ab0411ed9bf9d9602669153aaf4214e725cf74b5b4f723e0c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47,Tests_passed,d0904da7f8656212bdd9fe5464340ee7944252bcd851cff08961b81bb22d4c47 diff --git a/results/reaper/merges_tested/sailthru/sailthru-java-client.csv b/results/reaper/merges_tested/sailthru/sailthru-java-client.csv index 5689556abd..8574df6f1f 100644 --- a/results/reaper/merges_tested/sailthru/sailthru-java-client.csv +++ b/results/reaper/merges_tested/sailthru/sailthru-java-client.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 46,refs/heads/main,212469894d8504e03099bac92066de1583c33ed4,89f4a682f5ee3aa15b404d2a89da2f0de32a35ac,b52c11f90ce0732b17d63f3f682450ef27851bdd,,True,False,True,3,3,8,2,True,3,Tests_passed,eceee400fe40ac018cfb63fcd210b267b7fb952dde756713d682be6198bf2dc3,True,Tests_passed,7a5b3b364665a1fc55a201528e3073994b3e13b53cccdfacf93588e0049f085b,True,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,d7134d2557449f79a0c8b05ede336c579583ef2396166027672ab01609969664,Merge_failed,a43428cdab2c91bbede776ac9ee87b26be63dbc662e53156df47ef2fd23236bf,Tests_passed,49f2914d575a681dc90a5c55bab86372c3d34b5aed9aae8306de0704721a37f6,Merge_failed,3c9b51231ed63ae508ea567a76201085ce73dc260bd60008946ce063320b7534,Merge_failed,a43428cdab2c91bbede776ac9ee87b26be63dbc662e53156df47ef2fd23236bf,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,eff8fc1f95c2248ed5d6ec48779024accee58905ebc0a5cd2cfb2924f716c4a9,Tests_passed,49f2914d575a681dc90a5c55bab86372c3d34b5aed9aae8306de0704721a37f6,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a,Merge_failed,3f3e3b71307a31fa9660d4e93f17427efb8d3f728244f43cf07f706152187b6a 55,refs/remotes/origin/pull/4,ee1f9176009eddb98d87251dfd9d8476b8684fc3,59fcb2eaa94d5b401e3a510f5deef270c613d727,2281a3407450b6811fa6483d0b54c4f954d1deaa,,True,True,True,15,39,267,2,True,15,Tests_passed,00e414fbd0762d5af9bee125b260a97e47b17f07b177702e3f360c674c16120e,True,Tests_passed,4d36e446f25b93fb1ae090e5f822e43e090098b1b84e8390d7d0413b4ec89b1c,True,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,ec276bb69517c9e6c6592b029a625de165c6a3d4cae8acd23bdc702bb806fb0a,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Tests_failed,948cade4af456ce2edad58c37373f98b646f102618dda4ffd0b3f708618a2c37,Tests_failed,ae189da6051f231daeb0427082aae05ab6c5d0043b1338dd0ccf886377b06862,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,9e205a122caeef015eff5d26e981b7f62d66241c034964d0760b76d8685f1597,Tests_failed,ef27b09a59507c70b4cf4faea0ad1bd2aca4e97ac6dffcba2926e9698cc8f7f5,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9,Merge_failed,34bc406c53ea904cff0cba8136bf3f84629523402d209fe88fb9b8d491982dd9 diff --git a/results/reaper/merges_tested/salyh/elasticsearch-river-imap.csv b/results/reaper/merges_tested/salyh/elasticsearch-river-imap.csv index 95b408cce2..9040ddcd50 100644 --- a/results/reaper/merges_tested/salyh/elasticsearch-river-imap.csv +++ b/results/reaper/merges_tested/salyh/elasticsearch-river-imap.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,8827bca9e525e2306ce7d2ff8089317e31092489,fc5f5c074e841ecdc2d686ed07f4cceff940a4e9,d0a3a8b63781fc75f3058208e41a7e1be22e0770,,True,True,Tests_passed,53ac098e9cbc12d5d43d6d6100bfe330b8ac0bb51b8c4bdb67bd51b951193d2f,True,24,147,623,6,True,Tests_passed,8a52517f62352329303c5aed8f052af3a9c89f39e9bc6d209a59e0c6bb4a67ea,True,25,True,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bd83d0006c9ed814acfeb5ca9d9cd93e61503f6e366e9671f220ea99cd421df6,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,e4dad75633a02c7eb222e80ea1be70cc3f578ce271be61aaa30dfcb2f0686823,Merge_failed,274154558ffdd3bec53d1ae82849f9c6f0b454fc9a32855924ec46782290ec2d,Merge_failed,9d87e2eb097796a8adfd8ba96411feca81663c162ab6c33392c2099c9e2b118c,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,bcbdeecd3344870d6deb209985f0d98d66c53e813aaf426a688733ffc575d118,Merge_failed,e744fa9c99211279645f29d9634a88b2632483cafb411dfa4ffc0d180cc7dfac,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,be38867780fdd1401c825a2beed97491c3bcb11e8fa3f51f6d33dae0e4b109c4,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff,Merge_failed,2295f552e5f5be05a3cb4208a9b410e09a2c3b98d538acbdeb67290fc25effff diff --git a/results/reaper/merges_tested/sammthomson/semafor.csv b/results/reaper/merges_tested/sammthomson/semafor.csv index b6db038364..a300463af9 100644 --- a/results/reaper/merges_tested/sammthomson/semafor.csv +++ b/results/reaper/merges_tested/sammthomson/semafor.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/remotes/origin/develop,b8edc6883616b185adbf9ec68e084c92c7a0039e,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,acab8333fccdf4e648105814886c8bcb889b0d9c,,True,True,Tests_passed,b1bd44f71c7281d47fc60a4cc762606c1298e79072fa6398b3c4350302f9f9ef,True,166,450,17347,2,True,Tests_passed,d393eb563070863faff959932e75659d6a660448f17eff5910e9adcce3286147,True,166,True,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,eba75aa299900bb1478cdfa89ee8f4e6a5ab8a5089d837415c9d66eaf1a8ee76,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,eba75aa299900bb1478cdfa89ee8f4e6a5ab8a5089d837415c9d66eaf1a8ee76,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd,Merge_failed,219c8a9b4be13f65f846e0472136bd5480090b148f5824ff1e02ff15e6eea3cd 32,refs/remotes/origin/develop,1b62f9ce9b3c32ea3e1c737df5c9acf3c23d27e1,4db260dd91b978ccd72a0a279dd9546413efd238,0a53b56bfd23a41697bbd84f76773d09ce8bac86,,True,True,Tests_passed,361a0fbfbce9327bf5ea2ea8f428c5bef03568a96aae5eed0937e0ea1f4ccff8,True,183,573,18288,86,True,Tests_passed,3da49e3a26b0f1705aea4d02707091d6b0b95da1a4b5896076b02aaeacff2556,True,223,True,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,630cc8fc1402c6fb6d7ebc0f6c7409b58833f43456c599eb2076fcfd698de7db,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,2ea318638e1d329fd93eb74484304e897e40988feb1012537f81c078cff69d60,Merge_failed,58e87a7dde4a6fcc4024b24dc922b2296bd59a02d76a4d14515d65e24413237f,Merge_failed,f68842e1fdc9e08fe12b3b119373544845a5161207f5300dd5f2d8e821c4d936,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,a751de74f9b449ad6ed36414c26a2bd079e82dfb7cacd45fff957331062452cc,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,8960765255226a00d56550a22ddb3c0b1a5254e32e60ea28e804224d69b84290,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,6359a45b821e2fb5bb462e70e0528c6e4510d0c6cafaa0ab9715fe5608f39280,Merge_failed,fb0e04c587e0dfbe00f275269a2883fab13b84496f2fd4867cb533b3c4425c33,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,083eb80cd93f268b460a175bd8041a6b47f876655a787eef9f33ccd5f801ed8b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b,Merge_failed,b27fff3bec1fdfd1556ad9a10fb50b21da7734d314debdde9446a732eaa73a1b 36,refs/remotes/origin/swabha,fe9b0e7715ca6847928527c8bd6fb3d5d9f2ae4d,f6e687033b862cf9420de308bce95f2a0144ff03,0bbd451703ec153a89ca22ade590a2f50e90a3e8,,True,True,Tests_passed,feae658662b731bfa2a1718f50144262ffc81e65f9f2215d967b6f2f4046b3f6,True,56,112,7217,2,True,Tests_passed,f142f91e28d594df4b506af27fe5cd91e28fbd151ca1592c4ab66cb640718d2d,True,56,True,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,88c9a465f2a048136a1b4399dfd5a26f5387dc00254b33e4c80f5574eef3e045,Tests_failed,f8a60d200b99665832b4cb4bc05b6f700b091cf76a0015f49555c2592a2ab13f,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,88c9a465f2a048136a1b4399dfd5a26f5387dc00254b33e4c80f5574eef3e045,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641,Tests_passed,d7124c592fbe1bac3ca751d879abf346466b95d8ea03e38046a138a8eaa3e641 diff --git a/results/reaper/merges_tested/samskivert/jmustache.csv b/results/reaper/merges_tested/samskivert/jmustache.csv index 3b2e461c91..3aae2b417e 100644 --- a/results/reaper/merges_tested/samskivert/jmustache.csv +++ b/results/reaper/merges_tested/samskivert/jmustache.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,940af397c4c27995bcf56fb26151d7a98a662e8a,c8915ffc3c76750c7c795225fe17db162dff43a5,d1d72031f209d864ee721c40cd9ce1e174383577,,True,True,Tests_passed,7754199c00a1bf066a8ad588e6ab14cf4ba3dd70bd0b0cf725600cfcd3b2fd0b,True,9,40,297,2,True,Tests_passed,c66c21a53b5ae8fb1d0424331487e954703c9cbd188aba10271ffec58818bc38,True,9,True,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,1810bb53c3441173b5e308c9053b7623ceca657b6e9855c6671ba3605f2a49bc,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,1618b03a4a7c9d651ec40637b56c6646b2789ea6212ec27e78db288eeaff45cd,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827,Tests_failed,a167e1aafdb13d9024d7068c35c1427d722011d9097763028f94ad7ec1e47827 diff --git a/results/reaper/merges_tested/samskivert/pythagoras.csv b/results/reaper/merges_tested/samskivert/pythagoras.csv index 15fe3bbfaa..4733394065 100644 --- a/results/reaper/merges_tested/samskivert/pythagoras.csv +++ b/results/reaper/merges_tested/samskivert/pythagoras.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,f32a7352154f38c59390d8dc569a23a492244747,c6321e4573bd15b0d3d39c03619cf6ca7d977c75,59416dca9ee6b9b625b1c16c2fed31119feade8e,,True,True,Tests_passed,914b02d70fd09cc01b836d886fd47d02f660431ffce454b40c0a11fc08abcd40,True,25,68,563,4,True,Tests_passed,ed2ce680fe64822b0b2f6daa12dfa218b440d6fd442b580134341c89fd486c60,True,26,True,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,914b02d70fd09cc01b836d886fd47d02f660431ffce454b40c0a11fc08abcd40,Merge_failed,46d0335ec3921da4255883113a628b706aa4721ecc2a1108a937bc8c4cc38a67,Merge_failed,b42bbf781a9bd5159aedf66edbb777d0829947d8783053bcb848465ac890e93d,Merge_failed,796654e9e104713c367fbf51d9072c74127c2621f2be941f342be38fd8011e5e,Merge_failed,46d0335ec3921da4255883113a628b706aa4721ecc2a1108a937bc8c4cc38a67,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,914b02d70fd09cc01b836d886fd47d02f660431ffce454b40c0a11fc08abcd40,Merge_failed,b42bbf781a9bd5159aedf66edbb777d0829947d8783053bcb848465ac890e93d,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca,Merge_failed,9173d4593ca667b650d0f6d95acb2fdee81d0611666a9b2e6620aafac6574cca 8,refs/heads/master,c521fcd74ec43af2196b7dac29bffc6f2aba1643,402711b76630c2c012b4fb1f64d2ac51a7df4ba1,923dbc128472ae335d035dd934be0bf4132d204a,,True,True,Tests_passed,a427d656beefa5f9b2410d95fcd99403d1504ca39879adcc512d52bff3bc8f17,True,53,87,1125,4,True,Tests_passed,7fa68889ee7c8397c49dd468bf7ef35fb853896a5cd817d0a887b875aef29284,True,53,True,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,8e94a4835290f1af7b01057e6c4886fe952637f9c99ec8b4198d0b78736b914a,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb,Tests_passed,7ffae26f59b04c89e47aea8f9d180e82420b867121e48cd99d4cb0280b5f9cbb diff --git a/results/reaper/merges_tested/samskivert/samskivert.csv b/results/reaper/merges_tested/samskivert/samskivert.csv index 439bc1ad9b..edb1ce24b7 100644 --- a/results/reaper/merges_tested/samskivert/samskivert.csv +++ b/results/reaper/merges_tested/samskivert/samskivert.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,d870dd2fac79ec07a7e9143cda4efe41fd3e66d4,5356672130809882e5d7d169af7d6a447ce7ebd3,a641e6c502f06dae6a0b6a4af3ed827040b05877,,True,False,Tests_passed,63a4bed6ef8c8446082eeefd4694b5b4e761688a9c19390dc16680f6ec66bfc9,True,6,15,39,2,True,Tests_passed,44b1d457e4a08d09d8f1c79a39be686a004bc4b71011ce1d41c02a017b5a449d,True,6,True,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,c860dc926dbd0881bd211f249dbccf23961c704f227b42d41e520d85759ef244,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9,Tests_passed,6cee20155d57a7ef0733dae624b6828bf3cfd9dc7a93cb89626f1340ba6747c9 diff --git a/results/reaper/merges_tested/sander2798/enderstone.csv b/results/reaper/merges_tested/sander2798/enderstone.csv index e5ac041b96..d7108f9cca 100644 --- a/results/reaper/merges_tested/sander2798/enderstone.csv +++ b/results/reaper/merges_tested/sander2798/enderstone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,3447f49bf49c20e95ab686145f937e780624c1f7,cdd8a4d95468837c815b418c4d8dee305cb6900f,a5b5035764387e258d17b2ccfd1735d38bef9155,,True,True,Tests_passed,d76fbbaf4a996bc9d81ec6d380df141ec237cc7399dbc26c4e6e6823669df31b,True,39,81,1497.0,6,True,Tests_passed,b948e4a8849750059e9e5acb9e77e849f89b1fe6878f8e4c6f1c60a883e7d506,True,39,True,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,d1b44d1c33a594ff11ecee8fdee32acbba5fb94e7a1cb163e960542e43710f2d,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,332aab35c9f658b0b10b7b38938492a70e828c54a22b5f53cfa3a2f18bc822b7,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,7bb7935b0f97955a5ec01c10910ca9f76c7ba9e5eef9ee90dae56d5fdc9471f1,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45 11,refs/heads/master,b515bac1b027442fee058b69e9c56f1d7941d55a,f3c670bc92b436f2fed3d5764c12c83904c3201b,5041a4756178745685ddbfbac216c28f075666c9,,True,True,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,True,27,130,515.0,2,True,Tests_passed,96721ab95d8c8330b1feaa337005a441183f839a065e6fe043033305a8a43ff3,True,27,True,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,3d51e3ee417085ad1c26f3e1adcaa729fe50344b5acf6f83b057fb29bc25c7b6,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,ffec8ca0a3c8f7d273f7538f28ab707054c784b631a5008884fd098748d18959,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,3c035d0b43be7a1f5949981261c6c1c75b4b089500adf321f59bbb92df561c85,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395 13,refs/heads/master,8e17a2983e231cf884b35d94c95cbcac6c4d0af4,67e753b46b2b76ea189ef8a540b2b9ba6b3c7d1a,e85904399fbc734b1d5bf49099d4863901c9c986,,True,True,Tests_passed,786e535345f93d29955491eb2b3ce05c6b4b12ab94aa10bc7d068674d810c9b4,True,64,388,1419.0,2,True,Tests_passed,e5b44bc3ec31f2eb8426e2d5bf79da91ebbea9478c1bbbf6be93fba8d22b1fc1,True,65,True,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_failed,785544fad0bf5ad01151ad584d6cbb196d7f16c0690233fb8ae9d87bdbc25d6a,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53 diff --git a/results/reaper/merges_tested/sandergielisse/enderstone.csv b/results/reaper/merges_tested/sandergielisse/enderstone.csv index 32c8eda5c4..168f924eb7 100644 --- a/results/reaper/merges_tested/sandergielisse/enderstone.csv +++ b/results/reaper/merges_tested/sandergielisse/enderstone.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,3447f49bf49c20e95ab686145f937e780624c1f7,cdd8a4d95468837c815b418c4d8dee305cb6900f,a5b5035764387e258d17b2ccfd1735d38bef9155,,True,True,True,39,81,1497.0,6,True,39,Tests_passed,d76fbbaf4a996bc9d81ec6d380df141ec237cc7399dbc26c4e6e6823669df31b,True,Tests_passed,b948e4a8849750059e9e5acb9e77e849f89b1fe6878f8e4c6f1c60a883e7d506,True,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,d1b44d1c33a594ff11ecee8fdee32acbba5fb94e7a1cb163e960542e43710f2d,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,332aab35c9f658b0b10b7b38938492a70e828c54a22b5f53cfa3a2f18bc822b7,Merge_failed,f6cca2c80a70c5c896455282431b2e7bdff9f5577f67c7da29a0f6941c3291ea,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,73f8c64050fe2baf8276890a9358a72dc25e5e368082cc812dde3a80d7d256bd,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,708b710b7b98039a21c3d99dffe2f0ca6df180d84f1207e799cbd30007f4da8a,Merge_failed,fb3ffc81b4a55ce47d9f20564cbf2891511ad9bb98281c0a1d2e318578f52a42,Merge_failed,ecba4e02042843329c0add4e2f6ae9c65c751201fa8575165abb6a2a4dd33246,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,2da1ec6b4c8772ee3a2293b85e79442db87ccd24b0dbd43403e50cc369bf2c97,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45,Merge_failed,804e2957f604e310abd9dd1e9cd65cb8ac235cf2e4325f3ce39000efef1f1a45 11,refs/heads/master,b515bac1b027442fee058b69e9c56f1d7941d55a,f3c670bc92b436f2fed3d5764c12c83904c3201b,5041a4756178745685ddbfbac216c28f075666c9,,True,True,True,27,130,515.0,2,True,27,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,True,Tests_passed,96721ab95d8c8330b1feaa337005a441183f839a065e6fe043033305a8a43ff3,True,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,3d51e3ee417085ad1c26f3e1adcaa729fe50344b5acf6f83b057fb29bc25c7b6,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,ffec8ca0a3c8f7d273f7538f28ab707054c784b631a5008884fd098748d18959,Merge_failed,c590dc054a05215323f27d314c495e8b5bbd4086fc0669b0c07fad59f7b0220d,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,46788bf113ccb572d14dbe14913d8dd14051ae43ef8ab535f21a30440e7c1ed9,Tests_failed,a40576f82b47b047231edbafeacc6dd9c606877da3ecdd4d4f0e70f85c9733e3,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,34b95fd42ae555b2fbafb0c146dba7456180a243fc924625fcb228d5df27f213,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395,Merge_failed,7d2e11c9d3887a1bf4fbca463e8a62b269a9e32e8ea4054d8d74d0cb671d7395 13,refs/heads/master,8e17a2983e231cf884b35d94c95cbcac6c4d0af4,67e753b46b2b76ea189ef8a540b2b9ba6b3c7d1a,e85904399fbc734b1d5bf49099d4863901c9c986,,True,True,True,64,388,1419.0,2,True,65,Tests_passed,786e535345f93d29955491eb2b3ce05c6b4b12ab94aa10bc7d068674d810c9b4,True,Tests_passed,e5b44bc3ec31f2eb8426e2d5bf79da91ebbea9478c1bbbf6be93fba8d22b1fc1,True,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Merge_failed,c6f9ecafdd8a97e7630bc29752384d1a32325b710b2ae0500f2cb29060a79ae9,Tests_passed,c642eb37d02398e995f54c2e09b6dbc5ef5f9df9bcecace474b128023a66e178,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53,Tests_passed,0f8f980b330aabf53adfbccb3b4e60b2913a8bc70bbfe04177fa79a9615d5a53 diff --git a/results/reaper/merges_tested/saucelabs/ci-sauce.csv b/results/reaper/merges_tested/saucelabs/ci-sauce.csv index 2711c8c6b5..a3fd0ee37b 100644 --- a/results/reaper/merges_tested/saucelabs/ci-sauce.csv +++ b/results/reaper/merges_tested/saucelabs/ci-sauce.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/main,af79f7d3ebfa4eb319de538e5a7dcbd183766afc,707d40ed7b1707b70a2c5c80111b364bafe6f597,97b2d2fbd9bafa0a0d58655a30c7653c130cfeea,,True,True,True,5.0,31,208.0,2,True,5,Tests_passed,a8412f3c3c542ba2bfacac35ddfbb688a99b9afa8835015dd6c696e6bb2939ce,True,Tests_passed,9672c4a317973e28bfa9c7a07d37abc95b9a91eab3034ba5b8fc0149b4b14ce6,True,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,b8cd2c47c920417be12260fdefd807cf1fdc66a515e7235addceecf3a0734895,Tests_failed,1954eb285b8278629994801fce5892a75011863f9ddc21af632b15dc1bdfff1b,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,b8cd2c47c920417be12260fdefd807cf1fdc66a515e7235addceecf3a0734895,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7,Tests_passed,9669a8c2552146137db522288eb90c487673ab9accb3c515c6eff2f18f28e4e7 8,refs/heads/main,46cc1e6e2bce0bd5819fb9f1045666e678ec0feb,940f484bf0fd29a946a0da6c46b7bc62d5b4beb2,24d160f16d457a770121267820d492c355c03814,,True,True,True,4.0,8,24.0,2,True,4,Tests_passed,9f470db15aa826b67b57e0bf6e8c7655fd2466d24b1ded3788639ae27449aa64,True,Tests_passed,37ff35992ce1a29d448c42f5381b0db7732dbdb8ed0c66af6b5e3bdc656c532c,True,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,0e688653194261a39f7277cc159523c140399b24b432cab6093dbd9557f77895,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf,Tests_passed,f86de6a131b8aa617694b48d60f68c0fcd329e91d4d2ad698186d3a3a50cdddf diff --git a/results/reaper/merges_tested/sbtourist/journal.io.csv b/results/reaper/merges_tested/sbtourist/journal.io.csv index 6e15e83ca6..320e1bf5f2 100644 --- a/results/reaper/merges_tested/sbtourist/journal.io.csv +++ b/results/reaper/merges_tested/sbtourist/journal.io.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,8bac7e41e6145a0dc0b5e315a5d683f54bb67172,a3ec3110f06cca7c0222f5d29d2d5621ae14baec,8e420a131d6b726abafd703d4fcaf060783f828d,,True,True,True,5,10,51,2,True,5,Tests_passed,f676f5ed2fd008313ad02325bbb63fd2f6fd868d69981e2cc6bedf98036c87a0,True,Tests_passed,715e2a1c763822ff0a9b88bcac1e5c96208d03328a6d5011538751fce365aa70,True,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,48668ade312d1b4ead2eecc9c9bac0cb16869a4a01ecc256bd8387ac4868d406,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf,Tests_passed,a394f4ff467a2898f36a0af92564394ab2969368a0b378582e8aa1e628b95fcf 14,refs/heads/master,99d7e8fb8cf93cf1d0d4537e9feb100112324778,d8e125b07439b8f4c916263b9ad0484dda2adc0d,6ca221a4fde87aa6acc1343e3f3271af77535b1b,,True,True,True,8,71,532,2,True,8,Tests_passed,8f58993fa425e8651767f813e0faa8472f328af685c4419f8d873b9d5cee74b0,True,Tests_passed,9f31a0bfe0ba5ee4855adfbc10d01f513230e3619c9debb80324fcaa89306b13,True,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,ef764c998ec50427291440d5a11cda39a7ed37dfe363231219ea539dfa52cf93,Merge_failed,92c630ce1bfe37d07bca00fe423f7ae99a8a49934e28dbc8c6013dfd6100e67a,Merge_failed,349572b62298ecca1b0da1d27c3290d101876183019722087bca993dcfb9a620,Tests_failed,8178d22e2d0b8830104490b694a8a1181f586ead2f1991b45c8c2e6579b23aeb,Merge_failed,92c630ce1bfe37d07bca00fe423f7ae99a8a49934e28dbc8c6013dfd6100e67a,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,01576977406da7ef211dcd98fb607a3d14c7502e94163133af035ac7305d6a27,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,f7cebb063bd8075adbeaffb856886d3eb8854e2e3dec3f63b6c4921bc88477c9,Merge_failed,349572b62298ecca1b0da1d27c3290d101876183019722087bca993dcfb9a620,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65,Merge_failed,4e3b29eedc2904f16f0a50846a2054c588b9c364264827563d15f80a2665ca65 17,refs/heads/master,f13d15914f40f49d860acbb2501e31185ed70a41,df94e059ee5d0e67b3353725825e9dfd6cefbebc,50c56a171411cfb9d610e531df5b5abd113785ee,,True,True,True,9,149,603,4,True,9,Tests_passed,1a236522227e9049e9d88db90781b5b846737b6ca6b0eecacc74989ca7bc7eee,True,Tests_passed,99b03de96949c677a5a1ad6b7dc2758e33dce92269af29fecd3d86801972b000,True,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,845808713bae2624b3594db76903338af1ddbe0dd05e347bf8f4c8ec7b9cf748,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,1928dccbd6b47b3d5b2f1f5a86ee68df1ba5e4ce9047bcb580df28a2ab4b75fb,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,ba252622f35c937db23d7b1ffe452e5803e524b90e19bfd589841bda9cff717d,Tests_failed,069d4497e505ee4dff4f1188ea72ec41384e24f74716783f06516894e85b262e,Tests_failed,9d33b9be50541ba8afdbfe908858085b9c4fdd2da33d33373aa88947fffffbb1,Tests_failed,76b66b2fbecd47a809dbea7120be0b2fab95fdc51852793e84da7bafda3cf403,Tests_failed,069d4497e505ee4dff4f1188ea72ec41384e24f74716783f06516894e85b262e,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,1928dccbd6b47b3d5b2f1f5a86ee68df1ba5e4ce9047bcb580df28a2ab4b75fb,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,8fc3ff51c06c30e0b654662c68321429e47603c994a85dbcc8cca77c4eaad28a,Tests_failed,9d33b9be50541ba8afdbfe908858085b9c4fdd2da33d33373aa88947fffffbb1,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,845808713bae2624b3594db76903338af1ddbe0dd05e347bf8f4c8ec7b9cf748,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430,Merge_failed,e147eb5d97e5de42f23c4b9f5a48a7062888d273bc6e1d2f141aca3b4a5cd430 diff --git a/results/reaper/merges_tested/schema-repo/schema-repo.csv b/results/reaper/merges_tested/schema-repo/schema-repo.csv index 566fe4315c..a5012c4a97 100644 --- a/results/reaper/merges_tested/schema-repo/schema-repo.csv +++ b/results/reaper/merges_tested/schema-repo/schema-repo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,f85f90da3d8305f4cd40870cf736123b49ae379f,451984af54baee5a10f21aba0da677f9299749fa,c467eb41915fc8ebb794f8121a4b9785f734540d,,True,True,Tests_passed,5e68d50ebde97a0439a267b07edc8028039372e44e046fdc4c4a40c983237b9c,True,10,23,110,23,True,Tests_passed,fd1c543fa3a9c99cbb59b31c78cff5aa5f2ba22d67d62ce8c7280e981870a0d6,True,25,True,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,9d9993feb89e5617e28c8bd0e73702e705d86c9c757d14698a11ef57dd312f8f,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,a13f319441127f91d03e922652735a99bc2450ff0758896fe31e3d65e4cc98bd,Merge_failed,c1a31a837ebe49b38ab9d9f84fe6bc0873c91fe15e628031efa21b5e4fa90b37,Merge_failed,f3606dfb7b66543e5c66c4f48b27aa9070ffe78ac547852922a988b10e81e9c6,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,b82947ede293b70f13e23e36bbee8b84bb95052c7d3757dcfa786f7b35c9f063,Merge_failed,d3a9f20a3743204bd194235bf0eedab0633986844941f64f435fa48304e13827,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa,Merge_failed,efa249c0a671281d9a1fa925171744b08a87cdf2e77025ab443c70b3f41e0baa 5,refs/remotes/origin/pull/21,0b51f83a62407e5a5c3dd0597e02b5733aad516c,ee378239b7fb40fa7959134a197a01b7ebc3dc16,4932f5494d29d461cab746b4667b728f06cccb5e,,True,True,Tests_passed,8310217bc26883a21be46d41bfb3c5ab88e9f3e9c8d1fc6d35f5bef2192c542e,True,10,16,314,2,True,Tests_passed,e4015cdca306fd7e842c03399ed18e8cca6df90163547686fe46805ee22279c2,True,10,True,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,48148a371df97c677d95f045fada3ce6d830791a5f30d5cb8940a0dd5f4b11b5,Merge_failed,53c56a133573c5dd2e9d1a10e38f424b9677d707ec8e311bc73885042a74451d,Tests_failed,a1bc7b77c21b659c9f01eb9d880407cc1c1fa8c04bb668bfde723dff95796c58,Tests_failed,443197fee9d20f77b9a5219ea61058101e9b8ccb28dd8961c42f34986147b6a4,Merge_failed,53c56a133573c5dd2e9d1a10e38f424b9677d707ec8e311bc73885042a74451d,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,64715b3a48f00e67cfa544b9f981aeb19855278b71c00303d2b986a824e07a48,Tests_failed,a1bc7b77c21b659c9f01eb9d880407cc1c1fa8c04bb668bfde723dff95796c58,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Tests_passed,a0dff17d75aa7c3606b3adf56dc23d9c4c79db3a0ded4959795d0fe265ee75fc,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572,Merge_failed,16369792f559af5d9a4fa184055dc7619ab82cf63a85dbef6f0f2878dcb51572 6,refs/remotes/origin/pull/23,f1a22946df99bc2bd9997867310bc9420c72adf2,8107439ecb425ebdb51a96e971348352a44fb89b,1653d869383df9c961ae69337b10dfc51f0b8837,,True,True,Tests_passed,5288aec29913c2d5c7c33407a8c65deee191b6f3307b83c466807bf1c6e52ce2,True,32,77,1178,30,True,Tests_passed,59e76214a74398c301c2177451ddca2e8cd63daa145dbad687d6dd69d1d5ed48,True,50,True,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,072024bdd838fcae55829175c85e6e1e3accec318aa7b05bc0a02261656f030d,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,59da9955f0ee7749555555a728977f7b9a4714a102851f673a16efe5c59496a2,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,b67ce4cd94a2808cc1d788e373e23859e0f7ff0b2e1f4c230dc1471bf4e75915,Merge_failed,58019ccc7a466f7a46db4100f2cd6666e8f6f23f48b2fbc64af7710c266a897e,Merge_failed,b5af247251610c422f2eeede60213cf6aa042cf317123b7dcf5d651d4d94f5dd,Merge_failed,b1ba73adfa079befaeda27220157047e9c4995d3e9f4da96d0a54bd573c8c16f,Merge_failed,58019ccc7a466f7a46db4100f2cd6666e8f6f23f48b2fbc64af7710c266a897e,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,59da9955f0ee7749555555a728977f7b9a4714a102851f673a16efe5c59496a2,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,62e6b056df22055dfaae146bfe3294849964c98457c4410541efd687002efcfd,Merge_failed,5436d33a13c3c0529740f5825213248e0c1f4120c900c8621cd15b6ad44aa6be,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,072024bdd838fcae55829175c85e6e1e3accec318aa7b05bc0a02261656f030d,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a,Merge_failed,8e317f711e0c6018a7b8cb38597ccd43db3923a01309e76cc3ada0c961fc738a diff --git a/results/reaper/merges_tested/scifio/scifio.csv b/results/reaper/merges_tested/scifio/scifio.csv index 639efcbc83..5e6fcd88bc 100644 --- a/results/reaper/merges_tested/scifio/scifio.csv +++ b/results/reaper/merges_tested/scifio/scifio.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 17,refs/heads/master,057b12613c528cbd789093ae86203d872e38ca2c,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,26064e23697a0eb96d77439e65ba0c097dfaf2c8,,True,True,True,335,370,1016.0,3,True,335,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,True,Tests_passed,cbb390cd83fcb1060af352741ec6d6ede6faae13f1dca8e90a7f74845067927a,True,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,cfa92e4672ddb71e93394246a4dddb7f4469dd529bc435c387889e81a6f69a1f,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017,Tests_passed,28b08487c86bd900e05589f9c899a091c31262a1ddf2efb79e0d73f4bee96017 18,refs/heads/master,07c4c757bb4a396564ae7ebb2a9b0904bdfb5851,37d1717f4aaa5b3c92f508bce69105efdc9e16d0,c5fa746372d74a2ee23525f3fc5314af9f9b7575,,True,True,True,335,364,1006.0,2,True,335,Tests_passed,26be160759408795368d5be85db9ce205999f6b67562732d6216db9b58ccf7dc,True,Tests_passed,453fee771720640f4d0b601e45e3335190a355f7fe6628939c6b2382a91cfd0f,True,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,5ab4fdd974ae392f9111ca10dae07d70ab91b74164a77b39b89e2dd845f780d0,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,5ab4fdd974ae392f9111ca10dae07d70ab91b74164a77b39b89e2dd845f780d0,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44,Tests_passed,89ed3668a550698989e34a55c0b0b05f88b3bb9523a838720ec005a8c4f7ab44 35,refs/heads/master,60c3e1f8bbb3be0292e64e8c059f805299c1c17e,bf964aab86313d499313c5c4b4a0a40b27497d72,81981bd0fc59c0dd3c3b04aca5e25d41a4413646,,True,True,True,27,125,3652.0,2,True,27,Tests_passed,2c81235c351826e26060ddf4617b653c168e982711a489af661a53552b88067c,True,Tests_passed,a26c279473d68206643098970086189f2a093a7fc1351317d2b8963b52ab2c4c,True,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,4afb9f4722f35b09946160e4bb8ae9bece954d7408b90d651b6c1f06077094d1,Tests_failed,ee90164560860956cfe89971466f4795e30a913a1cf563ce5a23c4cfd7353027,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,4afb9f4722f35b09946160e4bb8ae9bece954d7408b90d651b6c1f06077094d1,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda,Tests_passed,99e02e56b7f457331916d21526461ba5885255a83542511acfd82b1af1d5fcda diff --git a/results/reaper/merges_tested/scribble/scribble-java.csv b/results/reaper/merges_tested/scribble/scribble-java.csv index 1a6aaf8cc4..f50133f4a7 100644 --- a/results/reaper/merges_tested/scribble/scribble-java.csv +++ b/results/reaper/merges_tested/scribble/scribble-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/heads/master,6b8bbbb4fd120bb5e43a90254f149219914fca61,21fd2f48451653b3b92b94b8b376d1712b1c0a4e,b9ab0f45b86540857b3678b8ba5a4d137c255dab,,True,True,Tests_passed,3da8fb03d8ad78091323fbf54c20f315d833956d3a9c4b08f9e72f691e3d31b8,True,1321,2959,51281,22,True,Tests_passed,700e4212d7356f54ae8f54f8aacee443e4c9dcef1812e16c28db5f3f6ed4a106,True,1403,True,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e,Merge_failed,138158432ea553bbef125efc8a0c065589252835d73d04980fd09f46686d034e 125,refs/heads/master,164250d0d03a6cfb879d3ea5c5672bac5b0133ec,ea369a7bd0505034d7ed548fb26eeaeb70198517,2742ef8fd2ec92aa2b7f7a208961892a18ca580c,,True,True,Tests_passed,485c573108b2bcaccd8fdc91276e529ebefadd9467142339db70cc76d9c2e48d,True,49,132,996,3,True,Tests_passed,2d15da0a135d5e7e7502878823725924c1aeb4c5f1cee77a2a77fc89a9f2306a,True,50,True,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,1557bd724e43000449b11c959e03d2c3b1398314a06ed9c3a355dfbc61803e22,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_timedout,,Merge_failed,dfa50deb29bf72d62e73712a1ae351569657ced4ae7e2c12a1ccd62b2eb219b0,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,13f8f81110f4482ac0f29df6dd11b68de42978cd1f73e1dcf88cfa84f1029d7f,Merge_failed,166937d62fc19a96b19c14813576ebb8c4d5f6044f7ede663052a399a673e05d,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,719d14abedcd8b65491532b0af27f87b8a07dcb14b15ee9aa3424c61fcc20695,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c,Merge_failed,ec6cbf7f1a544def25c4f98881f166b0cc2b4003082be5a9a965ff8c5064ab2c 206,refs/remotes/origin/popl19-artifact,2b1e0e097b9d85a80a8d31d277d56643fa5e3119,84ed8659f50907a710e15be93bca2e0e3ab7ada7,47a53ac12fceee906fb5c230c2c750e5c55de291,,True,True,Tests_passed,2106e49a687a59d3201578efb40f5f17795cb301538d4f22d8c3fc81e4d145d2,True,219,702,18717,2,True,Tests_passed,98b21e28bea1a00d30db5d30b87249419cac492fd76e8d979702e1beff127880,True,219,True,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_failed,03c04fabc1b0d8c4bb6599bff214a46df75828d82b28925fc47a780392726380,Tests_failed,7e900c156c6f1f9ee580cdd26afda1a2c4178b221a741e40343d3b410cfdc878,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_failed,03c04fabc1b0d8c4bb6599bff214a46df75828d82b28925fc47a780392726380,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f,Tests_passed,835900c1e9cfada5c8303004d5114ff365cef2b1579d2cffc73510bcaf79356f diff --git a/results/reaper/merges_tested/sd4324530/fastweixin.csv b/results/reaper/merges_tested/sd4324530/fastweixin.csv index 9f665ff8ab..1ae253d2a9 100644 --- a/results/reaper/merges_tested/sd4324530/fastweixin.csv +++ b/results/reaper/merges_tested/sd4324530/fastweixin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,0519f3179f85a6f22a87251442e898f49ad53d7c,47807c2e49ac7e7f55c871302f817707c1eea40a,e36514545c95312ae45484a2b85539a09763e030,,True,True,True,29,100,807.0,2,True,29,Tests_passed,bff2c630b40d249c54950825d8c91e75d24e057e3732ab487763f33bce5dedd5,True,Tests_passed,c6d3e066455c128bf388ea1b88fbaebc9d775d68da74c3cb3312f6e4abc3ed4e,True,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,6849b82f983e98aeb8c91c19718c077f067ac0a757b65b2071cd296200c33d34,Tests_failed,867d5e6dbcd5150b0c153a4ab8272d128cbda16dd6f14d7618a1c1832c37b161,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,6849b82f983e98aeb8c91c19718c077f067ac0a757b65b2071cd296200c33d34,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb,Tests_passed,493fa63a1acca43b6c8c78421ceb2191ed57355f7f9e53f316185a7e5a908bfb 29,refs/heads/master,f4aa5c9e2a5e5009160e2d1062d540641e668ee1,53405b48ba245741340013ef7859304fd8cbdcac,c029ac02521337ef75360e6cd06e8631516b15e1,,True,True,True,33,139,966.0,4,True,33,Tests_passed,e53d14076a1f9a9cbf5d5b48f6a6124bf7171f48d69bd814edff2905f4ffc858,True,Tests_passed,db280075ffab9e7baace574aa523c1a00e8973c308285c92b27e3e9bbc4b3024,True,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,43382d7d3757c6beb3fffaf37d759bff9983f30f6d9f7d1988a849f318d8b337,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,6faa722c2e30b94a412009243385713eb393e883730961dac1655c3bcbfa0ea0,Merge_failed,7af6bb242f12a12b59abd240e04de9cede600fdf153c3ced02f32f8b1b1e6a17,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,4a83937b54ae152daeb19c6bd98122155480556d9bda4c9db199896d560fbdf4,Tests_passed,6ad516ec7e228c75070add55746fa77e5e406d1fdd8a9489bcdc3b7e6b9b15a2,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5,Merge_failed,92129439c011d9c390c94b65023c871c5520bb93fe10ba6c7a1c18b186aa56c5 31,refs/heads/master,b9c911aea2bd0710b54afc94fb09c55e813ed9b6,53b5138ff7f9f52933a2c6b0c0d2cb102f503b68,e9c3ba1186d3bda64e46ad600efdf11fdc65ad23,,True,True,True,23,40,418.0,2,True,23,Tests_passed,643f9e701ef938286a4c7caedccca6aa9b5961aa801405350b5074670016d121,True,Tests_passed,229cf020fede46a8c539080bce48e23e2ba5401c963ecacb57c97f725b293334,True,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,0ac8f60d1649a779765a3ea22849cafffa18ec2f175972c2af4c1cad88e54efd,Merge_failed,731a28aee55ffaf9f2098c56b78de19d8c6361978301b9a1780189f1538d97de,Merge_failed,6e21cb4b8aafd1bfc2558cc1bf2128ef83a0fbb541ec17b83923cf9114060749,Merge_failed,b2108fd802ac817894232421866153ec122cfdd3f12151774d8f3ecc236368af,Merge_failed,731a28aee55ffaf9f2098c56b78de19d8c6361978301b9a1780189f1538d97de,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,c02ef5e38e3a43cb171b8efec7f2029de1db400fbd8368826804ec41b81845f8,Merge_failed,6e21cb4b8aafd1bfc2558cc1bf2128ef83a0fbb541ec17b83923cf9114060749,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb,Merge_failed,d7615deb7d4881232f9b3abc916dbb06e7ce07633edf5bb099684bee633a30fb diff --git a/results/reaper/merges_tested/sdllanguagetechnologies/testy.csv b/results/reaper/merges_tested/sdllanguagetechnologies/testy.csv index 833256d44d..6bd32a8caf 100644 --- a/results/reaper/merges_tested/sdllanguagetechnologies/testy.csv +++ b/results/reaper/merges_tested/sdllanguagetechnologies/testy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,023b62b3a5b8622628e43128140bf7bf627ac6ba,bc559746c95aa6c5ef312343b0269440e2601773,16f86777febcf7668b344faf6dfa2890604c3c6f,,True,False,True,8,11,40,2,True,8,Tests_passed,95d60915409ad03e01027094493b5b043dc6c31681ffb52d3676ab6ad2ab6661,True,Tests_passed,e98c25633ffdffc9b363e3b2d17f5a9890df1dbe1d1b96d95ef7722d5c0ad370,True,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,b01dad5a3a706ba75b8e9d10317163e0c2f28158023267702c608d7bdbd182ca,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,b01dad5a3a706ba75b8e9d10317163e0c2f28158023267702c608d7bdbd182ca,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19,Tests_passed,5d9435d0de2ec55765f896cc52caacaf884aab87bcfb58f7498a7e5a4f9d0a19 30,refs/heads/master,35283116d46d5daf14d53f20d03dd14febf9013e,768188acbf19011d40919e75e2fbc79cd41326c4,2c83117c52290b4a071363dfe5c3b3917aff6ba6,,True,True,True,80,144,915,13,True,82,Tests_passed,630582b42e478e88c2924552056c04a571de498042299b03ef74e78e1d8e374e,True,Tests_passed,7b2022f7c24b55d7619657795207d0eff307f0deba56b4b6221e2fd22e2ec552,True,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,a95e3b4cd94f9162864d5976d47afd94bdcb022b63aa624c7260e49e85b01364,Merge_failed,ab3ccd96eba85bc0042e338e10eaf1143513537b1db990ca49e66f4c100db789,Merge_failed,8707c61ea278491233aa61884f7c328857c350bbdf3a589277514b1c95bb25ca,Merge_failed,0f53cfdec29d659d5a9479349b58507bae63309fff213c4d6f4d63fe744fc0ac,Merge_failed,6e27848c9997f7ceb3b0f0ce7b784e4769883ff16bc4eaa078baa9dc57b57d55,Merge_failed,8707c61ea278491233aa61884f7c328857c350bbdf3a589277514b1c95bb25ca,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,a95e3b4cd94f9162864d5976d47afd94bdcb022b63aa624c7260e49e85b01364,Merge_failed,b4454658e96db4bc1af8acb4fbbaa5a030f6534697fd038494ac7b450891285b,Merge_failed,0f53cfdec29d659d5a9479349b58507bae63309fff213c4d6f4d63fe744fc0ac,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,b60de571f1031c755c2abd6708d605758fde1f2a6c58c94f8749c086acf57fad,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58,Merge_failed,f5cce7c56244f28d623d5d8bee02eecde3f4904f9993eee1e5899f00f2024d58 38,refs/heads/master,d3d2c7a43ad428e03c3a24d563ca24c615c0e9e8,2078cea14de9516d6e2b64b8f985f0b7f154c646,f30cd88b296132d3f4e44156822c44db51018934,,True,True,True,39,87,1023,2,True,39,Tests_passed,4615d68507b08ede3df6b2c7b01bf46d455b5b7134abc84d2a21745e38945d6a,True,Tests_passed,84e9349995110915fe5a559845822b60d441c654a8b12cf040273c9717183de6,True,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,6c1eb476cab18a0472b496b19294b85f32a8e72599b23c2a0a0dc5adad989150,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,6c1eb476cab18a0472b496b19294b85f32a8e72599b23c2a0a0dc5adad989150,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a,Tests_passed,8fce776892f3cd65c0afb7ec1aa7a8d9802e0e1bd3365bbfcdbd927d44fb5c6a diff --git a/results/reaper/merges_tested/seam/render.csv b/results/reaper/merges_tested/seam/render.csv index bd58b74519..6adfe38272 100644 --- a/results/reaper/merges_tested/seam/render.csv +++ b/results/reaper/merges_tested/seam/render.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,5371832457e9d1037dba8e7091513b6521e5af80,14a752b7aeb92757324cda24a10eaf88a3eaab52,b380fe528888dfd752a4d43dc90aee4c781ff821,,True,True,Tests_passed,d16a0cbc2642704a82f1ac17db759746c6ceae3ed6b96761c4b77e1224065d19,True,12,83,675,11,True,Tests_passed,61819922851f7332362555523491387f3fee5afda86330e9149acc9dde441a26,True,19,True,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,48b9e50ac05d7c76a60d931f7af4a99af06ab7bcf7d3a1b52de87e51fd01fe2c,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,45881c7819193197adc2271cd4dfc31e3f413996e9b7335cc05ff5acc8a694c6,Merge_failed,ca3a7dd97512c984c42e480ee28a410fa459cd2c2270a3d5b24f9dc8d4e48ad6,Merge_failed,b0f7ed6bdf5a33b59045e15b78ba4999ce1d34e0410747946d70895c1907e550,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,653b3478610587db3032114763e380cb7f9f795e7f078e9b79aed6cabd572992,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,7184111bc7bdf25c42d513457f3106b4009d8bd4cda903a4328e26148e1efef9,Merge_failed,af0a94c1ad825ed90060cdf5c08b3d719815674b518b0a1127b11077b52c2734,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,c68e5ca9f75a7bef3830499b8998b82eb854130f93cf3207ad2f93065360cd50,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74,Merge_failed,3def5c76f7f623828680303d4169a796ee6f7281e2108552743851098200ae74 diff --git a/results/reaper/merges_tested/seanchenxi/gwt-storage.csv b/results/reaper/merges_tested/seanchenxi/gwt-storage.csv index e7d5a0fc1d..6a5013c4fc 100644 --- a/results/reaper/merges_tested/seanchenxi/gwt-storage.csv +++ b/results/reaper/merges_tested/seanchenxi/gwt-storage.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,e3b59f05a045d66d1916fdea95aa76ce1cd2e412,d91b3f4d4c4add6220a78979bb19b0691f93b9c0,75262313058cc93b4afd3dc97ad3f859f9b0ff8c,,True,True,Tests_passed,bef041c62cd50d862b584e5fe1ac283b94e77b7668e38b976ee47bd8d826cc3f,True,15,31,124,12,True,Tests_passed,42871d0a0f0153aed90956f2f1bcde3d3f8821ecf3c6064e2981aab8c43e4a62,True,18,True,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,81fcbb9cf87df0635c7d140b123f6b679d6a116fbdf4873db18acac99863c112,Merge_failed,50e8f1e12507ba4237456efa5dc405717f0f0e400cba30b5e9fdf99f14c48cef,Merge_failed,f05d8c0082d170e1d0a574da766e7a28617644cefe0c4815b56087ba313d42c2,Merge_failed,99ccc27a9033d461449306be6bad9f892fdb95c4a81381659444384216e98ab4,Merge_failed,50e8f1e12507ba4237456efa5dc405717f0f0e400cba30b5e9fdf99f14c48cef,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,a5fa807b7620d592695a3fbd3031fdc190f3eeee27d32889b5c665faa7e1402b,Merge_failed,2999579a9dc5df5c956625dee793d9632555f0e9e6bbd7d891e6f4d3e8968097,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,315fdb7697ac62351413d8146f8d4ced60a1ba3c43dbf2e75e817aab2f433d02,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d,Merge_failed,394129bacd7846132119a9083ce2ffcd7eea7ab514fea947967c7fe226e1892d 8,refs/heads/master,8ce0dc7d7973f330a05563badf54037c90cd129b,87b4707591b8e61609aa40f3a8c37568e3702e9a,f0e679c108f9bdb7a7246cc863643addcf8b5cb1,,True,True,Tests_passed,af5b7be2994a633165dfc66399ac5c1122f6215e48952a588dcb6740e51d0649,True,15,84,207,3,True,Tests_passed,fc2f89a04c8ba091c36031fd343f329711d660cdab05ff819a434ea90bf74cd8,True,15,True,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,6f98cf5dd872e0551a4dd71add1582352d899158525d900b9e415cac1a3394dd,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,b819c2457d494b2a0184f5d0ca9988f871848e2031740ef7c4f5cf369f046533,Tests_passed,b325c3ab9acf51749f800482030c07b3b30d9967487e1bba84f0d17000b9fdc5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,d5d5c3d158d0334fbc497419df2fbd9a9aa1d484274f00da61c29d6dc2cadbd1,Tests_passed,d8e71b0e0e7bba298048d67e8bac1013a5dc11588565681e37583fed304fc7b9,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5,Merge_failed,494f1c06e218ae644cbac258cc9a4cc4a1f624dcd41f5ca9a8de272fc2a278d5 diff --git a/results/reaper/merges_tested/sebfz1/wicket-jquery-ui.csv b/results/reaper/merges_tested/sebfz1/wicket-jquery-ui.csv index d218da66fb..ce17074ed8 100644 --- a/results/reaper/merges_tested/sebfz1/wicket-jquery-ui.csv +++ b/results/reaper/merges_tested/sebfz1/wicket-jquery-ui.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 40,refs/heads/wicket9.x,d26c29217ed316b58ca7daf26f949caf2866b578,b0a253173342389021a5f41925b61d4041691969,bac2626a365dc38f92e188334fbe1f1aeb4096f7,,True,True,True,10,24,133,8,True,15,Tests_passed,547f624da3a4b80f1ccb4b18cf1ad03cc2c98365c48c91e040c364cdc8f4695e,True,Tests_passed,cc783846d9edca551d7b4de62438e1bdb551221f12a4ce02c7b503dd44deee51,True,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,1c259b0a7dc8dbab14adb804048c6fccbf1993bbb5fb6a0e418ae1d7f640a936,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Tests_failed,8a995edae439ca72cf2cdabfe33869b951f2a8823b9747d5217653d3fa45b2dc,Tests_passed,b0cb90516139074c4dc6a87563558935afc4712b68f0bdf30a536593719093ef,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,e65590924c43a96b19e20f15ad0126e7525c630f2de3cf3e42d1ddcb481b786a,Merge_failed,266ad727d0925754d82fa7d780c6459a55cd1074975b4ac50420cff42ce92bf4,Merge_failed,177410e9a1b304c92a6f6030af5d106214f077512c12d0301f901a35115e1ed7,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b,Merge_failed,e81d40466d190ffbe41c7459cf768f669ede97324efdae4e3771dc8b5d84ab8b 46,refs/heads/wicket9.x,4dcd2f4760da881f9d34887f594a56c7f9b57ac2,97222065e783a69a6153f555023744ad3d130a44,84cad8af76c255ab6bf3d1c4bc8884023ee3a2c1,,True,True,True,75,232,2256,2,True,75,Tests_passed,c88ce07a85eac1161f465f45dd181f1177f1c0e7dc98b5e7b22a67e17c419f8b,True,Tests_passed,8e77d3de2395c57cb7ce603446b1d4986496ba74f83485fc62e8c04ab3c25a5e,True,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,46dab5dcd41629d78b1f901dc9601f0b280a06347b3fc9cff6d786c29b089602,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,46dab5dcd41629d78b1f901dc9601f0b280a06347b3fc9cff6d786c29b089602,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a,Tests_passed,23d57bd9db398ff3b9840264dfbf2748449f256b7df137fe4422f1bf1c9fb95a 55,refs/heads/wicket9.x,dc0322d3475d545ccadd66fa377a81a030667a19,b64f88576505738440685a2572737e03ab51474e,513b44ec26548f684ced28a5b61bc7b7811a345a,,True,True,True,6,11,40,21,True,21,Tests_passed,3e79934fa3319b32bcca39c3df300c814708bc66e3cddc76316b1c79eac5876b,True,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,True,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,7b71c3e076d9bc951a1f984b13b01ba88e7bacab926518a338ef37bdb8bc4970,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d,Tests_passed,d63cb342a9b5dcbefe14560ae348a413367859ec39029ddbecfaf27f062ce96d diff --git a/results/reaper/merges_tested/seedboxer/seedboxer.csv b/results/reaper/merges_tested/seedboxer/seedboxer.csv index b4625f4725..89c4792c56 100644 --- a/results/reaper/merges_tested/seedboxer/seedboxer.csv +++ b/results/reaper/merges_tested/seedboxer/seedboxer.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,5e0fa8ca27d69574dfd18124ba1f877fcc8d9ba3,6ddd15e9598f167b2c3015b80bef4c5b0f2abe22,d33c6d2728f200bc1f515ccc4d7d605c7735e89c,,True,True,True,39,118,2382,10,True,41,Tests_passed,11e911a534e7271b7c7ad2d0b5d71cf3b9506cade7495dc438320d3ca8596a1e,True,Tests_passed,754a457984f7571f2771421e01adeb101a73a0fbd9471dc50d355a6307eae918,True,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,19d431e63047089cf5760d7ca39ea8e732cc56f9788e61a96d823d6666352994,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,122c3e6f8ea8060d822b57725281c382f6436a2fdfacaea36ce285b3bb16cfdc,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,9999598db70028f9c14952a9fc649cd5b52bc209d097a68016d187b117c4788f,Merge_failed,2f737f8ba51d7c4610a48e665b418a1e9e40ef51bdcec02c8b04424ed21ccd99,Merge_failed,13b868f6cf5ede605ca7ac08499aa8c1fe5cb1a6e19571ec5b7e98e9754b4dc2,Merge_failed,13b868f6cf5ede605ca7ac08499aa8c1fe5cb1a6e19571ec5b7e98e9754b4dc2,Merge_failed,2f737f8ba51d7c4610a48e665b418a1e9e40ef51bdcec02c8b04424ed21ccd99,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,122c3e6f8ea8060d822b57725281c382f6436a2fdfacaea36ce285b3bb16cfdc,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,735ed9f24657ffb5c88adfebcd4a5e08ce1820442476c0e47fd76f67a2d982a0,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,19d431e63047089cf5760d7ca39ea8e732cc56f9788e61a96d823d6666352994,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133,Merge_failed,003c51e37d7c55a73feaec37a401e961e41e538825c1d554a2960b10ee3bd133 10,refs/heads/master,0076809898ee1ef1330ce41242de492d4d0a6de2,b511ab595ccc81bed5d9daf8ce078e5ce56aa1c4,dbf23fc6adbc1bc80e104b619f9c62ff4688ab8d,,True,True,True,18,31,553,2,True,18,Tests_passed,4b2bde9116dd403a8a389bf6734e535cfeafa29dfa704ee37ad948923d074de9,True,Tests_passed,d6a7aaa7ce3dfc87e29c2a916469d0a1ec7d18850070fc139bc6e5fde91de778,True,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,ae13efdf806126163dfcd8115b2185c06c66db6dc00331eb6cdc128066e9c486,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320,Tests_passed,697b8809e691c542800288e42a824db160e3647a914b0e26f44367666f116320 diff --git a/results/reaper/merges_tested/segmentio/analytics-java.csv b/results/reaper/merges_tested/segmentio/analytics-java.csv index 15367058ec..4bd374e85d 100644 --- a/results/reaper/merges_tested/segmentio/analytics-java.csv +++ b/results/reaper/merges_tested/segmentio/analytics-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,0d4a7b4e69e12cd36b44e1cf7392fbde416e2934,7e6903c8a63a7f257d5270bad03feafaa9a7a220,e923b62314fccf28065c046a5f4a59953a961baf,,True,True,True,7,58,627,3,True,7,Tests_passed,508e28a846c3ce4ce7d716c0b40f449d6a1728fc5a7f1fdb4e6adcf6b536286b,True,Tests_passed,66c02208678db361042f8447846373dda51f49a370bb750e1f826c9470cc96c1,True,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,d84ddc6f37f80b8a1edbbfe5aca57765d1d7f7c8c01c797bef8ff5a95fe462f1,Merge_failed,0cc7c00cd8a6de3b2687fedc12e0e50c49149f4bfc3e4e213e3cc66972440e6f,Tests_failed,3a193e3f2d3b63a9421489af5ec372ae3890e99f0c18954c7d7b0ae607599acc,Merge_failed,a6b1ded4e3f82c8caf978b8dbf1dc4b4e95851eeae1139dc9a3fb2d70788403f,Merge_failed,0cc7c00cd8a6de3b2687fedc12e0e50c49149f4bfc3e4e213e3cc66972440e6f,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,59218d14e97371de9beedaad415b8e0e920364c7646cbff1fe751ef9e8d380e3,Tests_failed,3a193e3f2d3b63a9421489af5ec372ae3890e99f0c18954c7d7b0ae607599acc,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483,Merge_failed,822572e8fae637b9e9f46a6675935df657d1ccc441afa7404c69a75a31d7b483 114,refs/heads/master,b5a96236e473740ea83e5d1ab0548deea21a5656,8b7b1ee33b59215e43ce3ef57e6f9d8105b6f19b,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,True,24,111,1451,3,True,24,Tests_passed,da4e67631ea3ecd978882cd78108232eea8d19af4c470cb7ab8459b99230408c,True,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,True,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,52eae83a36e79f019592d0d2e39b834f3976c1ef6956e2eb171047f3a4cafdcb,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,1268617b4876dbfac9e8eb0fc097fa78249233bf0189e759e21218cefd9d904a,Merge_failed,ba8728064075a5ed16e9273e37c42d5953d33cf783e77e5964c03420b4c88459,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,61a1d306a43c1bc70d02c5da36a79f005d22c43fd095cef91adfdd492dcc2ee6,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,fdb2b5f00ec9149a8d15efafecff71a19b8af23f90242e00af5a1cc85257f1e8,Merge_failed,130d72cb2a54e4706845c47cadf2d6deac53156011644b67fc8bffe90b73e6b3,Tests_passed,84f0ff50261ffe494024f1a35adfe972098dc17ea2ff1f663c32115073bdaa26,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,9f28ec8984f596114700aea8792851914c9c0e89ece70bb6ccb22a808e778e7f,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99,Merge_failed,47f74501ce39db6f77b514caede107c3ca547bb3c9d844d66ad5413371b00e99 115,refs/heads/master,b911863aa857887e12c7fb9b2bf92fadf20cb8c1,22960eb2684000f19e7bcf049d8678124850e973,c5dc0a20654e46d2b401726ee65d3f846a1ff9cd,,True,True,True,24,98,1259,4,True,24,Tests_passed,88b9d69c60739777781739e3beec8d11e7c76ff360bcec4777516d3ab821eba5,True,Tests_passed,e906cd0c296941b996871513f4fec5d9b76d7e58f3bd99d8ecc519b57fffc139,True,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,36f35e74c9983d55b462c210ae1f8b230e6d9e523858ce6d56be289e4a71c911,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,5c7215f8571f023d3446c8c525eb16e8283652f40a476f55c3562d8d667ab9f4,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,988cf7b50b3467f6ad291359eb14fd950be42beb7756b9f871bb1c83a4561bb5,Merge_failed,318b356aec04c01b9c54474846000e9fd5a0265b8661a48c087f855df6df2b3b,Merge_failed,e360df0fc12118fa25986cefde0582b87914c965b55088f4751ffdb6d4dd413c,Tests_timedout,ad2e367e00937f189f1fc80b7b1f905ffb6e7c7678e24697dc03791a94b3655b,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/results/reaper/merges_tested/semanticvectors/semanticvectors.csv b/results/reaper/merges_tested/semanticvectors/semanticvectors.csv index 468c240432..f763dc0ede 100644 --- a/results/reaper/merges_tested/semanticvectors/semanticvectors.csv +++ b/results/reaper/merges_tested/semanticvectors/semanticvectors.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,58058d15d12a3b15eec26e609c5f656f5d301e85,73590b42957e7f7f81c31238e01641121fe14060,f5f7370a488ffa4a1ac597cf0dc773b507923662,,True,True,Tests_passed,75366712fad34f36ac5538c8ab1608ab52beba580beb4c1e14bf6bc96fcf8454,True,2,76,415,2,True,Tests_passed,eed294b4ad78a10cfa60efdfa14ec8b15209ed846077b530e65baf6955e6abbc,True,2,True,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,6551b72a30caca58dede218f656c77b0e7d8c60faae34a3e168be31bec3c9954,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,0e950f032ad4b1f23e19c69284ce73a4c393cc4a5c29361f80956cb2a7bf3bf2,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,3e36338a6068a73a219886714ad3910d632379ff75a6a7f5f24fd56b5816b754,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc,Tests_passed,30ce5b878586e0c1315279688d991c32e092577cdd316f5111ef8c9cc5dd59bc 19,refs/heads/master,4dbe868ff9d66dd4343f90cebd909bf887b81f21,6796d2aacc7f8037afe5fac951515404bb4a11c3,183b726e5b2acb12fecf0e40088cb9201a1c6ead,,True,True,Tests_passed,d4235ff00970bc7e6569fb27e719d6dc27d88e6329f253933ff332df36f251b6,True,14,22,571,2,True,Tests_passed,ce2256ef316a9182ed487132926010f15cc6fb0b8831435aa12b5e98fead7198,True,14,True,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,95233ae85e4d484f0a2d523aa573a726d5a90e175bcb283fd7270fec038cb2bb,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,95233ae85e4d484f0a2d523aa573a726d5a90e175bcb283fd7270fec038cb2bb,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba,Tests_passed,b8bab3e46119ab986a499d4910077227787c2d17ddbc71c029abede389e750ba 21,refs/heads/master,9461e75688f8d1768140ecd58f13adbbc2d4c93f,dc54ade056cf4aba7ce5056a7c1216aa4622d5d3,b679d17bec13345488974a7500a0252f140ee506,,True,True,Tests_passed,c7b1f52d0dee879ecf343bde2e2126c02051c7fe707c00e2631663abce159769,True,10,65,397,4,True,Tests_passed,3aba0ae8a22f40bf10eb56af98421d21c038394d93aa5ab69c6e77851fd6b7f9,True,10,True,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,a3e5923d9bff81764081a0a64796d463b4c53edc5a88cfd93b7790a85b47bd86,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,c5eef8863888bec7eb284c5df39b2834b331ec7768f48e5f807474de18a0dcd8,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,a09bcee3224f898ec1ea9e286a839f85fc5580594aa51152cc0fb2871a487475,Merge_failed,45ffc2a25fcced0bc24d1bcfe18e4870ecb8465e00064aec462ea5355ee3cd0e,Tests_passed,44bf418b0faff6d4058cd8f96c2baf61036bfb48272a913d6fb7baf5989cf240,Merge_failed,7adf6f81e9ea68e5eee3dc463dc9b709501726b2ed5c9bca962702d818928085,Merge_failed,45ffc2a25fcced0bc24d1bcfe18e4870ecb8465e00064aec462ea5355ee3cd0e,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,c5eef8863888bec7eb284c5df39b2834b331ec7768f48e5f807474de18a0dcd8,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,432dac28409ce2c79e8a58f5aa7d2c50da0d50865bc7e7fee65c71c0a4ddf8ca,Merge_failed,06509ff4809c45af6f8ae8c38d9737d0102a84ece8b9bcd5f59621389db21d78,Tests_passed,44bf418b0faff6d4058cd8f96c2baf61036bfb48272a913d6fb7baf5989cf240,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,a3e5923d9bff81764081a0a64796d463b4c53edc5a88cfd93b7790a85b47bd86,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2,Merge_failed,0fee8d3f414804c2d238def6776cb3d301a4b880954e3f561a4585b2b550e9e2 diff --git a/results/reaper/merges_tested/sexyideas/moosificator.csv b/results/reaper/merges_tested/sexyideas/moosificator.csv index 7126309726..269c9e6797 100644 --- a/results/reaper/merges_tested/sexyideas/moosificator.csv +++ b/results/reaper/merges_tested/sexyideas/moosificator.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,ee20cd848ac7ccde1208ef59fba0aa9b8f6318f7,51490f87bbf813d01164e101fd6cd32ec4a21596,f6f2a3c84faca1484ea4f6b85987a3cf9a1ff9c8,,True,True,True,7,27,341,2,True,7,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,True,Tests_passed,256e1e5e278762a53386362dfba1e6302c22bc4441a27dbce6ede9c30cbb764c,True,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,bf0264f86c5e3781826452624d082023fe050bfceb8b1e5b412147180812a7e7,Tests_failed,317e6a441ec0447add37ff354440b731ddadcfad513b61ad035d9749af4d6cd9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,bf0264f86c5e3781826452624d082023fe050bfceb8b1e5b412147180812a7e7,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,7b3198a5b3d25421b8a5a7e42558222d9745d6035e893f6cbc18972f717a67e9,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17,Tests_passed,0eaf7466776e11587dc4015215e29a8f3b703bb062314e88e2e308a7d5817b17 17,refs/heads/master,51490f87bbf813d01164e101fd6cd32ec4a21596,a662006ee08d1fd941f2ae7eab1812acedf6f232,6b6a2301e40919efa350a5d9f5f2632e85f9393f,,True,True,True,3,21,181,2,True,3,Tests_passed,42e4d036a6e455454b2015304a532ad0b31c348d59b8353a80c96391841fb2df,True,Tests_passed,d865536fe26ff93df8cb6861c8a2f8f6f42db0d3ef81c10a2e1c70dd2d5bb33e,True,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_failed,b164b9ed0b51315260d180745556879aabf8734b0921c330e187673d0f261edf,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,2bbebd30ae2ee6289fd335ffa1b9558b95e8face63cf835c7130bb5ee5cc462b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b,Tests_passed,1429d347cea26f9e4d4344e063ecf5654161456f9ded10eeba98c6c8507c049b diff --git a/results/reaper/merges_tested/sgoeschl/jmeter-sla-report.csv b/results/reaper/merges_tested/sgoeschl/jmeter-sla-report.csv index 2284f5ad29..4791875a76 100644 --- a/results/reaper/merges_tested/sgoeschl/jmeter-sla-report.csv +++ b/results/reaper/merges_tested/sgoeschl/jmeter-sla-report.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,e398d0480f4f1fabbebfdbec5990cdee3303866a,55e5a5540aa2b35578bd70272c329b9c978a5aae,ce8b6a104566423401985a00c7041961ca9f0dcd,,True,True,Tests_passed,efad14fdcecb1e4a104275a4a1035afd319eee8590b6c6e04295cc80af0d6a11,True,21,131,558,7,True,Tests_passed,bbd3dc0356dcf23a2f909ea69509ad62a83a1a1c9671c60fb312bdb28fad1ca0,True,21,True,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,2fc449e6f33f6d1e4899541d6090246ebd4146c6bfba73d4951b445975b10cdf,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Tests_failed,0ca14efc38b9542fec6950f38cd79741ae650f3196b5f0428043f4b11d68427a,Merge_failed,4b35ab9f7d9ecc8627ef914b451726d3f6b26cfc0a98d7d81450cf0c4cf990bf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,37b6a6eb9318441dcd16be4d478ab92a42d016f68783144d8eb92e03f6e2f287,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,66c9feccb94786765fd9414e1dcbe1385e18bad9c320ff442b671a7036c946f8,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,d0a57503e87a34700da60f870f70d7350ddf76ded84f2e1e0183f731515a7cba,Tests_passed,3379bdef5326237a20fc6f92b1b8f8aea3678c766a0e2d6a60db87cbf4f25b7f,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf,Merge_failed,9276d6c060cc61ca2f0601217691c841896ca3da1696f2f175385231abd609cf diff --git a/results/reaper/merges_tested/shazam/shazamcrest.csv b/results/reaper/merges_tested/shazam/shazamcrest.csv index 03eb8639d2..d813c69d3e 100644 --- a/results/reaper/merges_tested/shazam/shazamcrest.csv +++ b/results/reaper/merges_tested/shazam/shazamcrest.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,9be9807f1cf79c5a11d69fde25afc99f3fb2f40c,c4fa05990bece3e3ead865e456dd2cfd3fb345d3,fa139e6f61d0cf631855edc581afb7afd724aa8a,,True,True,Tests_passed,871b1e77e5a4f82e1512f575042d7d5ddd28ff65efdb7c092e6e4a3aa6515604,True,3,7,42,10,True,Tests_passed,981bdbd883d0d232276f0b421b5a5776f0f6bd73038539a46610bec2d88d1e79,True,11,True,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,5fe1080557a0136608a0b99663f0c9534a1fbe9ea668a53285ae33e0bbe6d0d9,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18,Tests_passed,a180c4aede2d0358aca6862691c21cb0f0971a08ce0eb9ca5e168b952eb7ef18 7,refs/heads/master,5bb33c89041258a0f9fa7bc50a06026e7ecd0845,c2c745ef1585634d30110046e472b4b9d07dfc5d,ba45d3bf2608da528a3a24a0180c373e73e84a6f,,True,True,Tests_passed,22736595da2c6b768170c6894ded10f25e57d107eb0df79a086a2bf230065e5c,True,21,58,818,3,True,Tests_passed,8abb8640a1eb064bcf3051b9dc36003933c3944c596296e4efca084943187aaa,True,21,True,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,f5a34947564b2d8599e423604ccb161c1cf14168b073fabc201cff5e6e92954b,Tests_passed,0ba9bee03531864b94cbb5ec5cfa86b2493938605dfecea5fe896089ef2eabee,Tests_passed,3923280bf3f0c193766e54da91c5c75a47e7dcd61b9f5aab2e35e2564d5dd3bd,Merge_failed,7b31946f2acbac50710a936f103e18c065b7e0243b3f8b5431e8ca744f584c83,Tests_passed,0ba9bee03531864b94cbb5ec5cfa86b2493938605dfecea5fe896089ef2eabee,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,0155eab4c7c19eccc9551f286853d0ebae9babc3571a7d35bbd4941f229dbd82,Tests_passed,3923280bf3f0c193766e54da91c5c75a47e7dcd61b9f5aab2e35e2564d5dd3bd,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,6d39ef01dc74e7ecd0027deb7d54a6e3e5f3db344c373e3f4acfe72830b399ad,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614,Merge_failed,776e314a5918cddcbe120d545b2fd9f482350625f2e73ee69f946964e2946614 8,refs/heads/master,218c417aaaa48a7efc6e836d99eed00a215f2227,62468df247f55fc00b941d0e7eefabbf7c8b1871,0a75b2df440e7f419fb13f0ffecca25bd4a7e64a,,True,True,Tests_passed,b32fd0958c8d26a6d9577139b002363018e3da236179e1f916352e2953f053fa,True,20,90,985,2,True,Tests_passed,124ca9b4cc80d405be98c5c456a6e407a57cf515108a28377ef2daf695ff66bc,True,20,True,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,2e623fa32a94f74141fc85c3e218470d23c9d806d0ec0d42f148984a9001d3c7,Merge_failed,007887d9f2eb16ad787a2ae70900b660874a2b8a622084ebbb43d38b15d04953,Tests_passed,34d67577ee4a9afe963dd2c450da4d12ae52575ee6a6f56bf1af26551ade2a58,Tests_failed,d6383d4820e12d071b964fb1daeb36c913f0065b67656cb618a8cfbf37ca4dac,Merge_failed,007887d9f2eb16ad787a2ae70900b660874a2b8a622084ebbb43d38b15d04953,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,42d4f214b9e3f47177ce647466dc00736d5122da5b2fdf757ed4089d3bc84180,Tests_passed,34d67577ee4a9afe963dd2c450da4d12ae52575ee6a6f56bf1af26551ade2a58,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,57a44e1eaefe68fc4b59b74343e551332a66403641b87cd3395e0a3f0a14a64f,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e,Merge_failed,971b72871dcb29013079a8127ed86596e77a38641f47a032c2ba63fde8949c2e diff --git a/results/reaper/merges_tested/shhs-coding-club/drugwars.csv b/results/reaper/merges_tested/shhs-coding-club/drugwars.csv index e6981bb205..1ac1314a36 100644 --- a/results/reaper/merges_tested/shhs-coding-club/drugwars.csv +++ b/results/reaper/merges_tested/shhs-coding-club/drugwars.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,db4ab6c35e1e7da152fb4b2c12e0d2d83446a1e7,7dfc5293c275f0c6db1e6f361697ce18c6633904,77f4cc00672ef96c23aba8c432f14838655f85ce,,True,False,Tests_passed,e0fd58c9686e22cb377467551911e2a1c31f3e644f8cbcaa97422821f694ed86,True,4,9,36,2,True,Tests_passed,a8ba466c50f71cdcf9a6b3b994b856aa3af2745040a47053d1ff7189521d5e97,True,4,True,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,34814e3caad3e8d21ee9cdd72ec93db9949e92ccee21e60bfb5d062aaa3df951,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,34814e3caad3e8d21ee9cdd72ec93db9949e92ccee21e60bfb5d062aaa3df951,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,df5d1606dc562882c56e3f08d9030761af7072b820dcaaf5ccf408c1592073a3,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b,Tests_passed,7f934811e224e695493a68b79b11fd7c6e11876e2f581536fff02b806fabdb7b 19,refs/heads/master,f07c4b5d24a5a246a9de55940bb80151684c64ea,b8eb50bedfdf55ec6b51691779e564b80fd60799,c5e4ce34f82b7ce324f28144dd63d4f2480ee1fc,,True,True,Tests_passed,fdb5f107f879b7555c9c649995501707e845377ae68221f5ad5c5abf9842eaad,True,7,17,54,4,True,Tests_passed,15e928c0cb5581dd85d110f3ac905ccf0d68d81917a73e963c36c1905ce41329,True,7,True,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,de071cfa8128d6c528f9bcc11742a8d2d4c6296e8758bb64ff03e1e0c3f19d02,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,c28f5139bab47198f554d98887585c1d56efc549ffe25da7129051a984b0c252,Merge_failed,c326faa2409af95cc862b3e1596a45b27db656bd8ecb55852a3446c3fe99d0ce,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,feefd189a090f936fab49fed3f3f46bf1ca051f791a336c3c4a3cc07b9877da7,Tests_passed,f31febd062d0252e12764aa5fd2db48942a6103c103f606a3f1253c96f9833b9,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,58a2bcf83f5a85dd9f5474879060d0f19e4cb321c50f8270323368df2409e063,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417,Merge_failed,768c917c01bb38a98c9873fd4fdb8791c14f0ad1c4b0dcd3c616283ca99a7417 26,refs/heads/master,c4e30329d753ba87176104bd8a1f90275ad14266,8bffb29c3e309b089e80c9555b1ef5dbc81177f9,e9d05a0436fe2f5f172ef83ccf8c890227938bad,,True,False,Tests_passed,f860d16be9e047d38a1bb1ad7e009104f965dc48d94fdb2ed25a7ddd6510a43e,True,5,10,111,2,True,Tests_passed,c1b3cfd4d72b545a11128a20daddeb6cd7860f53d2c26714fca2b65f3af953db,True,5,True,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,dfc9b7e3e39a9f4ec709b085c7109b5fdcf8ca2083f51241b8a85f88a08682b7,Tests_passed,5ae68f46527f1e1a392f2d4a522426c36525481c73f814f55bf0422fda47cef8,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,dfc9b7e3e39a9f4ec709b085c7109b5fdcf8ca2083f51241b8a85f88a08682b7,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,4d749ce61ca72e3632e6e9e9e99ae7747628e5b19e212a26442c1ea0b6b3488c,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1,Tests_passed,9ff5aa4caa17153cbacbd5ef3dbe3548d7321ddc12fd929e6f134375c9bcbef1 diff --git a/results/reaper/merges_tested/shimikano/spring-jpa-bulk.csv b/results/reaper/merges_tested/shimikano/spring-jpa-bulk.csv index e34eeec5d5..d8bea81af2 100644 --- a/results/reaper/merges_tested/shimikano/spring-jpa-bulk.csv +++ b/results/reaper/merges_tested/shimikano/spring-jpa-bulk.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,1bec64a7690dee7f6fb602f4d81137e45f9a419a,76c2031d5aaa0b245efdaa7addda008b2cfc2292,4a12f402b921fef6c1af92b29ae26e8ccd6409a9,,True,True,Tests_passed,d1cf6c3a02e28773666284e44cf2e36148791c486dc0c7d608776586ac4829b6,True,28,78,787,3,True,Tests_passed,3bde474f695068c743ed1256f637c5abd849f3b04092a69b40a3fc031ad493ff,True,28,True,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,7b9a0f59f2a208f3c3bdcccc3d0714ad4ec1b044e0336d736bbe6f36fca66e77,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,7b7f184f0e12780797f3a11b678db01b85d1e4a7a4ea23b9eb6f2deea33c1fd7,Merge_failed,71a8338cb50ac8f29c5f9b76fa7a12857bf6742bb19af9bead13bdf25eff41cb,Merge_failed,c5ba5bc7cc543e48507ac41a5e0e3e5d9fa75ad0306ed07ed4e5f4787e4126f0,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,fdcff5035c1ffb2235d7cd1ccfdd999af21881bafad6e0842718357d7f6e1206,Merge_failed,a93ed9f287610e0015494bde2248ad611a425ac76344583d091902c3298e96b4,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f,Merge_failed,b78b128d9a1f0ad523ac3127f6a59d8275b9647f51d47c3d1428baa2c1f9612f diff --git a/results/reaper/merges_tested/sijpesteijn/mafia-maven-plugin.csv b/results/reaper/merges_tested/sijpesteijn/mafia-maven-plugin.csv index 1e00b7aab5..c3e8fbf63e 100644 --- a/results/reaper/merges_tested/sijpesteijn/mafia-maven-plugin.csv +++ b/results/reaper/merges_tested/sijpesteijn/mafia-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,397e23f5f00948ceb35a9ab4cccdd34ff9543f01,911a3f7b5dd59a6aa1461b862ea42f5bcdb232d3,007abfe5eea0e36631d43093a83e58506b181921,,True,True,True,28,65,1145,5,True,28,Tests_passed,a7236748e684460349469fb9eeb09ea553e940206890ddfa0632bc0d54fd75b1,True,Tests_passed,3b4095e53f2aba162d6420ca26749f10c40d1f7827f2adfb0841b384db6d4c1b,True,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,f69abb0af99933d9aff2cee99e1cc9605114cbf750710b3645a5c220f9c2bf63,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,f9a38a6e7121bc9be8023d1fc0ecc68f1deb15c17afd902a23e3ddff6fcb1349,Merge_failed,ee6be996eb565776150070f34ad39e9339c33a0d00a8ea6466d828aba19f9559,Merge_failed,2d9b9b16f1cfaaadf7fc33db8b375a146d0fdfef893dc8ad4469a64f7974d29c,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,a471aa366d65d49fc01ad6d1dd98de2cbfbcdeae08624334905804020a78d79f,Merge_failed,a9c45a54ec77b814175c47a1ecbd51e0b2d9b21733ec84c78ad5ca750710d7da,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,59f56d88936f23006c50ba9c6e4f518755de402ba4ce3935f131303fa80d6dfc,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3,Merge_failed,b7368188a63a0f05d5ba87876081bcc59e5655983f42796964682f711a8146f3 diff --git a/results/reaper/merges_tested/silverpop/engage-api-client.csv b/results/reaper/merges_tested/silverpop/engage-api-client.csv index 0fa2a7db82..ba6fadf286 100644 --- a/results/reaper/merges_tested/silverpop/engage-api-client.csv +++ b/results/reaper/merges_tested/silverpop/engage-api-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,0c3e3e535b5514a92bd19280f2ce4bcde989ad23,c534abe100affbf873e577db76543f6a44c02a8a,1c532fc7d21e4a4a5ce3fb120ba7114626a02739,,True,True,True,42,113,1102,2,True,42,Tests_passed,10b3da864cdc0fcf0ceccbad7aa306cda1dc4e9c1608c52157660f71927f5377,True,Tests_passed,5a66e59d1d9995a540ff79fdddd6a68ce9906e2df384a829e4583a4994fac446,True,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,991587433d546e83dd92f5b63e92c238aed8fb5cfc78b5d81398815c7f7cb092,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b,Tests_passed,9e88b307913a9603aab322a375d617d2239be1c10d353036387c8182c00a776b diff --git a/results/reaper/merges_tested/simasch/qlrm.csv b/results/reaper/merges_tested/simasch/qlrm.csv index 4e0c6b9a77..569d61ce82 100644 --- a/results/reaper/merges_tested/simasch/qlrm.csv +++ b/results/reaper/merges_tested/simasch/qlrm.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/heads/develop,e03f1617f3978b3a1906f96e92317514eef243ff,1d2aa4ed9d6c383f7b0e9c6ca0c6a286c553b4e4,14a5cd7ede23d4a472bf95090457ad367252378f,,True,True,True,11,79,866,3,True,11,Tests_passed,bc57a5c7fd3664d95670d140d7fa248621474729b14d763d1976e8541001731d,True,Tests_passed,2a85a98cbe62197750309e38b2c9a99ee0aa18034899e05835c0d0f31fd91eb1,True,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,d730020cb1f6084ef5dd870f73e66230ddb0aeef7ca27a97afda387c0aa75796,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Tests_failed,62606285ea34c262c9739ff9674da19e8ef5e22fa988a487cfd4e1084cc5fdb9,Merge_failed,761fc944a7cf76b5ebc13fcadb0658a1080a0ff5683a265afbdc7038cec65bc0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,937d9ec259691859232cd5d7c39d30486af2bede09e9fec906950a8e678a94a0,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,fc51b584272dfe592325bf49355b6894d1c7726add0834275cbc928f6b8fe871,Merge_failed,5c28ce7d89bd392f544c8bfb7006ea26b00ca3482e56abc3d54c7d68f2b3a5a3,Tests_failed,423b858ecdea10e490371e46a513341fb57098bf4805dd0e1af3b1aba36b6e0f,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,5fb9c9ecb5405624c8217a860bab642da56c9487b31a1a0377857249792ff2cc,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e,Merge_failed,9973f61b5cba442bde24102951d8468b0f4694c9b0135a8a3a4e532373ff406e diff --git a/results/reaper/merges_tested/simmetrics/simmetrics.csv b/results/reaper/merges_tested/simmetrics/simmetrics.csv index 5477f7206a..3413aa8fbc 100644 --- a/results/reaper/merges_tested/simmetrics/simmetrics.csv +++ b/results/reaper/merges_tested/simmetrics/simmetrics.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cdabedae8e4518093e994e091aaa8664172d72e0,8f4e8b3cd613438ff791f101718af89cebe473cd,1bb0d24c9a2b5fd2f3ed838fe385d2112469210a,,True,True,True,22,94,267,2,True,22,Tests_passed,00ed6f3f31fe1ba4f6e367c561acaa7ebb11303645ea9ce9393270c206b7a49d,True,Tests_passed,7738b0e29c953b69755bc334bf29547709fb9e01885fa9761aee0981e12e5c85,True,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,9a84f438682cab901aeb752b4efbe80570381c4d42e7a3a00e927fa08642ef5e,Merge_failed,4e174464c194ab31e3e1b9271e88a8d5d4b00a545a54302b781de9107dc392bb,Merge_failed,309b3c05e7ffb87bd55c84ddb8fb686df434fdbc1521f3d76d3f0c348e45bb07,Tests_passed,b673af49dfcb6f882f4c469a803cdb4f3f3087382ad2ce8e2f980752099bc784,Merge_failed,4e174464c194ab31e3e1b9271e88a8d5d4b00a545a54302b781de9107dc392bb,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,e5c4d4346022720e769987063567967e1acc28aff9f95edee172bb5ae7e95bf5,Merge_failed,309b3c05e7ffb87bd55c84ddb8fb686df434fdbc1521f3d76d3f0c348e45bb07,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c,Merge_failed,4efda465e059c0acae5896b1f581edd0c80ff05df06e990d97f6f0785be1894c 5,refs/heads/master,26ac3158598828d1bbacf766272aa32bf4a1d370,b270ab278669cfe794899a550518de9ebb0863ba,53f9bf59fd1bd05606e52f2155e2cde1052a5931,,True,True,True,83,360,5580,148,True,166,Tests_passed,e4c9482f6ea91a6495121a97334763f520ddd851403d84ebd8fdece46047e54e,True,Tests_passed,07c3e4d3b44e0b98327e037e2c4dd02506bc2596b28653f3535941e5e997429a,True,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,49ed1802ee2c4bf6d97c5d37651693aacf86ba6b1f5046816f7409c86e73a9d4,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,1ee407ddabb70d6701681329145cc46278633954680068e207f4b8f770501a44,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,aa0d78f8c39bfc8c63d3f0595f0ebca2642a047f0f6c4d6c36e3723d59191c9b,Merge_failed,bfe287600887dbf4d608c9f193235430cdf8b3a5038978614de0e92cdd79f573,Merge_failed,05880e4c8a7233f3a42c40fb0ca35ff85fdc1579c571fe750f87d095c93f3dab,Merge_failed,3ae153c8a6d9632e631646e048f044ec4855917169681bf886a63a2a8eb50d01,Merge_failed,bfe287600887dbf4d608c9f193235430cdf8b3a5038978614de0e92cdd79f573,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,1ee407ddabb70d6701681329145cc46278633954680068e207f4b8f770501a44,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,7d6533caccb44e77c7972827b6a6a2e417dfc5238f45da9ade5c1848e4cb7451,Merge_failed,c16a7a44a18654c2e1a11a1ac58ed42d6d00aca4510e0efe846b78e8df59805a,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,49ed1802ee2c4bf6d97c5d37651693aacf86ba6b1f5046816f7409c86e73a9d4,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381,Merge_failed,d9552bcd14facdc6a54599ad5d3c0a0b47436b57ff7663696bea0649a3f8f381 6,refs/heads/master,b270ab278669cfe794899a550518de9ebb0863ba,6403e182314163ef1a1840d42a666e5b5da8eedf,0a195751b2bdbb29248aea5081ddceb87cbc61b3,,True,True,True,148,235,537,7,True,148,Tests_passed,1439d8f733bcaecd84b492a6acb0f974872c4fcba50ec1431688ec8ec7c0bffe,True,Tests_passed,9772d303dda432e9ac93d353ec677f9604ac1b8d85a62c0eeeb4c0136b4dbcda,True,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,d1aff45bc0aa260c830e2316c9cdd21883cfbaac444aaf42d9f0ff3c444c722a,Tests_passed,80c34d0a1c8a64defb7b6658d4445ea04fe709ec56fed7b9cc95bb9767b2433c,Merge_failed,f3221291586f2522c6c6ab19fb6aaec7a1cce4ee7db4610db3a1fd63730382b6,Tests_failed,d97e74a621cbc851a3843aeb2dcb116b142a0a1b4199db3c3a756e68bf240e7d,Tests_passed,80c34d0a1c8a64defb7b6658d4445ea04fe709ec56fed7b9cc95bb9767b2433c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,feb8869905127eebec8b7d2a370180b19b6b5b7722299d0e46f91c30416aa879,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,f75809441bf35919b6805707baf22c7ffc2329fb84f1a8e51274dc08f1461d0e,Merge_failed,f3221291586f2522c6c6ab19fb6aaec7a1cce4ee7db4610db3a1fd63730382b6,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c,Merge_failed,3538f591edc41c2ba80632f219f253e520875c48d568943f1ce494c461ec251c diff --git a/results/reaper/merges_tested/simpligility/android-ndk-maven-plugin.csv b/results/reaper/merges_tested/simpligility/android-ndk-maven-plugin.csv index 384caea49b..90424ac155 100644 --- a/results/reaper/merges_tested/simpligility/android-ndk-maven-plugin.csv +++ b/results/reaper/merges_tested/simpligility/android-ndk-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,0432151e0e8138a983c601b2819b1545c8ff0385,c1740da3713bd8140e942082ba1b2c3a25da7fc3,f4c21f525979eb3b3741d55e9d9efd794ee8c642,,True,True,True,15,40,690,2,True,15,Tests_passed,89faae25697a9ab681135ac573afa485389fe5b2b721e64ba8fd7c90cae6d45d,True,Tests_passed,8973991a3ca3a68d049175fd377f64fe5af2488773f4666f4833fd8b12ef198f,True,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_failed,569cc7c62abe9d97e2c4e83f2f2acdf0946882546c95be491178c7c72ac932ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_failed,e82cd3593ce620b99cc221b6ccdd56e4d2bc1072877ba00aeeeeb0d3bf990e9b,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff,Tests_passed,adfbaf290b272cfcac09f6eef9efed9b9a8c4634b57c9fed717f66a8a58998ff diff --git a/results/reaper/merges_tested/skyscreamer/jsonassert.csv b/results/reaper/merges_tested/skyscreamer/jsonassert.csv index cbec65df9c..836c2b6399 100644 --- a/results/reaper/merges_tested/skyscreamer/jsonassert.csv +++ b/results/reaper/merges_tested/skyscreamer/jsonassert.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8af86e361dc13ad476fb1dd6900f24018e774ae5,f88b66943a37709c02193bd39541a17458347a8b,b4307f967459ff5369f607c40960ca43ddeeded8,,True,True,True,13,97,1142,2,True,13,Tests_passed,4b7003eaccffebb8a1a2cdd4715fa9418ca0727ffe556cf2286a02f2b536f362,True,Tests_passed,bfbddbee92caebbd10b0b5be3fb61e32a8fea256d487e355a3af2b7981f6dbbb,True,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,4b188af25420fbe69b3deba975519c1dfbc02deacf2f3a6d961c1df25dd4f59f,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,4b188af25420fbe69b3deba975519c1dfbc02deacf2f3a6d961c1df25dd4f59f,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92,Tests_passed,92726ce70fc6900ccd604635f3334bfae606540279319a151feb0dbeadc29f92 13,refs/heads/master,2c6ec3c693d465934a99fe0c3d99218965ff74f4,9abc2bb5b97e2d075aa3f8c5f6e823f45ae8f2ef,054919c5723680b2821cc2219cc3b9fb72151b5e,,True,True,True,4,16,45,2,True,4,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,True,Tests_passed,e124194a166f50f012b045ce08509dd5f9e7e8b3ca9582d3a36f48f23f6088f0,True,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,38c7d5bdd75768347ca688b1b40a2620d2cdb51b9022820db51859ac2d923eb1,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec,Tests_passed,f147d6c9799134bbb39cc087fa2047b26f75a9fcd77111048b10cb3385330dec 29,refs/heads/master,8b2593cd7449b1496c9ff3844db6f0592a049052,6d531e1a295dc54f6a24df8b8e740f3389b2ba8f,99b9a783c6f817d02a39c5175c119bf161ea8b18,,True,True,True,13,89,1148,3,True,13,Tests_passed,bf0255954c7ce04fcd0791a6ec30f3f730ca6df2b38123429aeb4eb976bb0367,True,Tests_passed,658193ace0f111718a0bf0ccd8d215c35b7f1a01c65138aa7224bf6f425f9837,True,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,3132132c8e5bee604d8b6cecab1eaf8ce84794e9187ab83a9fe8a721b5bdb2d5,Merge_failed,379b4c63c320671fe08d932cefb034be28ecc31f4184c972e113717b2391e38c,Tests_passed,e9157cd4b25545f885d74382d13976c978131eef8902160e5e2619d79c2606dc,Merge_failed,cd21a2f2c6b142d6a53316d90ab15e3a4c9cf01c20d83a0ef08358362a3a9a3f,Merge_failed,379b4c63c320671fe08d932cefb034be28ecc31f4184c972e113717b2391e38c,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,89462cf8c1c390862417ad26679387b7dbaf60be394f2a18a40a2a92be96e72d,Merge_failed,5f584c5957c8e7fdc63d753262850984c7a27ca07f75ec2dab50d20a10329b6f,Tests_passed,e9157cd4b25545f885d74382d13976c978131eef8902160e5e2619d79c2606dc,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7,Merge_failed,ce2b63c22a8b7d760a09486ef42bc04127aeb34cdf6945629e0c964c37ab2cd7 diff --git a/results/reaper/merges_tested/skyscreamer/nevado.csv b/results/reaper/merges_tested/skyscreamer/nevado.csv index 6cc9acd751..d90e19b1a3 100644 --- a/results/reaper/merges_tested/skyscreamer/nevado.csv +++ b/results/reaper/merges_tested/skyscreamer/nevado.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,cdc23cde46c079ff30c9c1ca4758e54fed153620,1c2c2c37de204026e89eda86fb29a72a4c37883c,af182b41de95f020834932282f190a6200df419d,,True,True,True,11,23,120,2,True,11,Tests_passed,6c35c9628cf2e72824b5c98402f93df75e854c3fdaddb3b0825b5ca2ddf00208,True,Tests_passed,f4de6f489aa4227434f3089dbd9d85e2fd92989ae45931a0c7b9e6f5cd03e1d8,True,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,8b7d2a87c71ab3f7453b6c3b7d8f6387cc70b0e12fe6334823c6f67c8f538e3e,Merge_failed,7b50d27f910da9c5a05c2752ba6081a4e3f2c2ec6fde1b086c40ad1743f86b3b,Tests_failed,28277aab23c84ed4be5510d20e4119af7f8b7c209cebbfbfa4479a37f45bf95c,Tests_failed,37b87c4e65f5026997d00ba615eb71fb15d996a31278435da9314fc982519f19,Merge_failed,7b50d27f910da9c5a05c2752ba6081a4e3f2c2ec6fde1b086c40ad1743f86b3b,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,292274f20ba0c65a43d4d20a8cf180458fa10a76c002b2afb35d4053da1cbd7a,Tests_failed,28277aab23c84ed4be5510d20e4119af7f8b7c209cebbfbfa4479a37f45bf95c,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,d3201d9e14851cd08d280f1a98d641d4cfc18851eb6dcc2a41ad9387a0a51ef0,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de,Merge_failed,2c0e33dda367213ffce81714dad86a186bd0b2dd08158cb3ea9f632994d2c8de 47,refs/remotes/origin/pull/112,cf100f0487d532b8ba2b16e2cbaecfcbce149f46,2f08cfbb74a3e4dd089d0bff9ba74f791718ab62,e56a0d771e3e40b14cfff69c49d9c87cd6ce720f,,True,True,True,11,26,141,3,True,11,Tests_passed,f0295fca35e28d616df73be758d533453fc4dec81413bbbf915520dde2913de7,True,Tests_passed,709040c3aea1ec645d19220eb6437517b54914585cb7ff657f8f5d60a368cc98,True,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,12add52f71003afcc0b9e94cc16fd34467826ca838e4c9eb805ae92ec51ea96b,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Tests_failed,e551ab3a517c7aa55f7e1c8a395469d9824325b52d3523447d18e3c11abac1a1,Merge_failed,c572dfa50ce0de3577777c2ef87c1bf94b3cf24e06b57d3e76b1d8d9a3d8cdc9,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,99e715e779e1a10daa907fe6191e4aed0c78a8cf496a43892aaa77d081b5c13b,Tests_passed,a6138f0717408a4c6c74c087fdbd9f445ac97ace6810b49a0d39153619ee03b2,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,fc5f3b53badcb4326a6d5b026abab0a34a0456939d30dad72c17ef3ae9e18a6a,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c,Merge_failed,814fd742115950399eb9d9add6aaeaddcc743bee6adef39a5cd735b63d9de49c diff --git a/results/reaper/merges_tested/skyscreamer/yoga.csv b/results/reaper/merges_tested/skyscreamer/yoga.csv index c9b7657d47..179f2e5cc3 100644 --- a/results/reaper/merges_tested/skyscreamer/yoga.csv +++ b/results/reaper/merges_tested/skyscreamer/yoga.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/master,1f22844c51753edd813e117213a7e336d917d262,cfdd480dd2b83b4ac26b1d1e5299939ae961dd02,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,True,71,311,1977,8,True,71,Tests_passed,f98b9b65692bd9500811a1a4cf0c74804498fd15039f75a4a8f4a9062aa3dbe3,True,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,True,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,ef27fc35ba7014340b6554ef0e99be793788558fc396657f0e31e0af1642d9e3,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,e97de2bb89b055588b0b7ec5b0b86f010ae7c750be970f20e12c8925722b754f,Merge_failed,2677e044961ab951d915db26abc586274a53533cd969455ff646fabd1215f9b6,Merge_failed,5910c0ce999f434b37f5ac8e4f6139e9e7a33d32b5b00a90241ff485ed6a3476,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,d7466d03e37c2f38d33970942edf65d7d379dc532afd60c5ee2931f063c0e3a1,Merge_failed,ba570deebe5d0adaf19eb84f04b60272b6f4ae00b91f0214042381af7ac1767f,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,75708479820152b789a8e1f991fac3a164ebc06138bc1ec8dc9ab246c384bbca,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57,Merge_failed,576d10a1df7f96692f3a5f6b33186ffa2215bebc9b133d26dc5766bc6f603f57 28,refs/heads/master,a2314b3372b8426599ac46223a72706ea6974384,4feb70091c215bc6ccaaeb6e3f58537fa48e9263,d4a48bc0cd2edfeb5d811525eb2c516c661401b9,,True,True,True,70,314,1587,7,True,70,Tests_passed,df9eae2b745e25d6defff9dd4948ad3204158688c49284c18c1bad3ddb42056c,True,Tests_passed,6052122dde5c73ab3e06c959253212b4b3e0bbdff7a90f0d688bfec59565ab36,True,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,b7034e4484afa275cd70125445ee471e7e0a2805e8eb197b81ddefe3beadd97f,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,b7034e4484afa275cd70125445ee471e7e0a2805e8eb197b81ddefe3beadd97f,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,e3bc07ff28d6d0fb605e7b3196cb1ec571ca11b6d9bcc8b2e073ebc680d89065,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be,Tests_passed,fbae40dfd3e3922e0a9a45fef2a4fde54731382cb81643de201e2e4a8ab121be 68,refs/heads/master,935b0afdc7cb576ca50d3b4e4d02eed29f418d30,62cadd15bbfa249728f8568b4d9039e7b90aafec,6faa4d551bfb748f5ab92c396f0c2b212fc43fa5,,True,True,True,40,96,609,3,True,40,Tests_passed,9936a16c6a9a8badb5a6db16d038fbee39e9122b5c157a049380006cc6eda44e,True,Tests_passed,c3fbc1b247f70445a4386232a93824ed45453a6fc8e02eb6f159cca9f344e8ec,True,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,094095392ad9e44adc1ffe86f0935e78b7aa1448e340fa1b41e8108e3945bd5d,Tests_failed,36b5a0deb75f911a337489b0cadcf584304e208d536723115ef43f3f7c42df14,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,094095392ad9e44adc1ffe86f0935e78b7aa1448e340fa1b41e8108e3945bd5d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,9854c8942b9be82bef1468133baaf72086a384bdd0a9a4a29f2598da35d6239d,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0,Tests_passed,8724a4e62b4a6b5135a3e362c87941906d9f77c58064d05f07b6346e375791d0 diff --git a/results/reaper/merges_tested/smartrics/restfixture.csv b/results/reaper/merges_tested/smartrics/restfixture.csv index 675110f76b..c887db4807 100644 --- a/results/reaper/merges_tested/smartrics/restfixture.csv +++ b/results/reaper/merges_tested/smartrics/restfixture.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 34,refs/remotes/origin/pull/38,d8c6704346b6c678edcfb02a11c914f6db985b21,5a7acd31fd8fe2417a14c50f4b27dbc4fd9409c8,bfa6c9c2940e3ace3f2bea11ddb81e33a84d5c25,,True,True,True,7,16,116.0,4,True,7,Tests_passed,c0280a72c4e322859dbf07d9c240670206e9c076673d770ca87a39501161424c,True,Tests_passed,42f3798d7b235524aac0c29c067f427ec48c23d5e73e810a99ff36c1699f344b,True,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,311b66c4af3b13ce0a5bbd2bdd8b50814c44f2b448456f89b0ed857440d1a803,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,b99c1229d50061675eeb87d187d49510e7b6d68ce58649c874b822f3b406a0d8,Merge_failed,24e4214dac4c1773cb6537c6ca260640f8c693ea454a0259d7172dfaf1678be6,Tests_passed,fd4e9da334811112a0af31d52dda05e69df6d17cccc2ae573d9ffea1c6404a0a,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,df75ed661d5a920a32ba18d5144a64590ac470f3a1b983e75d48a16eaebd25ce,Merge_failed,0676a2913b152de6f369a66ffeb4a30655274bd0e683c351d4355281d5c5305e,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,aa0e0915ed41577b64be9b9296bd663c792d50bc1effd8d7585d253eac1f6a21,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c,Merge_failed,a067be6cbeddadb418585f1ce421d663da7d8e228467ae1c5568cb49c63d874c diff --git a/results/reaper/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv b/results/reaper/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv index 03ee1e3219..261b37cf83 100644 --- a/results/reaper/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv +++ b/results/reaper/merges_tested/smartsheet-platform/smartsheet-java-sdk.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 71,refs/heads/master,e3a8071836d7e5cf8949174a783d1f0d9525934e,23244c7e820d404fea45d0d7faee587730603333,411e1cb4c61d34b5e6f11e5ab55e9b350b02e248,,True,True,True,40,122,1784,3,True,40,Tests_passed,f864f2b8307072228bd2e7800aad334f799ea82a087fd83be06631af41570b8b,True,Tests_passed,a436be6a4ddf84d6c7294ff5deb0323ec6c09fd4fc0e315afbe164f0ad7a4cf9,True,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,6e7fca5436adaa2fb99bd42944d194a0376f7b69696f22947d106c5eca82a1e4,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff,Tests_passed,fc049cb86c7082d604f7b4a06e45ef78cfb13e4479b4fa798876707f7d9c1cff 79,refs/heads/master,1f165550865167adebef205696294cfd60d94993,9ae8ab9ca4381ec6b3007b6f04dfa926b9a23f38,484b20f5737e615abdff6242896af070d2a83524,,True,True,True,656,4145,18827,3,True,656,Tests_passed,4237edacf5c4efe9f0fe2bb816eb531cd45526347a2f29bb13573eb318fe9707,True,Tests_passed,acd140674213412cd93acb5d40bcc7ceb634f8fc690092783a7702e401220360,True,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,fd742648980f1a0d969cd1aef59944001384a8832d599de6dbb06b8101230d83,Tests_passed,33e83acb3015b1c56a8c2178424b8ad92cfc12ca01ba980e3160138f392f8593,Tests_passed,17dda8586295562ed0a4d45fcd5ccff2202a77d573200aef0062c85f9e472fbe,Tests_failed,809b0e2d5e3f5bc40489be7c194b8bf321751456c2f464aea1d7952da0d94156,Tests_passed,33e83acb3015b1c56a8c2178424b8ad92cfc12ca01ba980e3160138f392f8593,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,1965c9cf5755700caf3b0f4ec4d1ac2dd77d112f5f443d2d9f6bebc6aecd33d4,Tests_passed,17dda8586295562ed0a4d45fcd5ccff2202a77d573200aef0062c85f9e472fbe,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Tests_passed,7c915700a3719c0d94bfaff58f3c1ded9450d863eca30ec34ce064a3f89736d0,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23,Merge_failed,2f33115efbd34ff7e8334baabf4dbd50ea91521e933f4b1ce4d2485789ffae23 85,refs/heads/master,1fe3f6971fbd7a61b7785d8d0082d5622241e047,9fad80b636b4158ba14c2fe7c7bada55f7a84376,93082c445ba4ae6b40e6c118e687d925d69bcc02,,True,True,True,29,179,966,2,True,29,Tests_passed,686ebd3b99f11f061b2c756f53f8583279c9277453f8dc9a972f92fd43006b3c,True,Tests_passed,0be9924f0490d8c7d6c160c1fda202f53cca88020b71cbf638752d3750c26719,True,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,fbe4fd6d7e889c5ce898a8366464aca1f2f0dd34a7b9d5b89c6deedfc4e30102,Merge_failed,6c93e21192af63cdbb1c94ad099c42f26802fee96fd8085041ba4c9aff993297,Tests_passed,30f71cd3eea2f18c40bec31c77f414b11a5961f198869fc1febd97ffd7378a3b,Tests_failed,438c27db6a7d91178cf20e86fa025236517899a6234db364fa37192529de68bd,Merge_failed,6c93e21192af63cdbb1c94ad099c42f26802fee96fd8085041ba4c9aff993297,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,0e309be22301a43e67c7967a1e74e66cae29bcc07260649fb4143fb429166e74,Tests_passed,30f71cd3eea2f18c40bec31c77f414b11a5961f198869fc1febd97ffd7378a3b,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Tests_passed,5931ea423d58c60f231cc8d4502a566a3cd29efe00f9048e2a39e667078284a9,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752,Merge_failed,b9c0cf91a817ad0ed41059c77ce5df812f70bb5630bcc9418dc506f8591c9752 diff --git a/results/reaper/merges_tested/snazy/ohc.csv b/results/reaper/merges_tested/snazy/ohc.csv index bbcf4b7b25..7eca798124 100644 --- a/results/reaper/merges_tested/snazy/ohc.csv +++ b/results/reaper/merges_tested/snazy/ohc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/develop,cf706bb89ebae023432c2bbd949266bfd68401e8,3e7f87adb7c65086351661cf5376c73e3f20d7c3,4d69670710441527e4a81f19596960986d30f63e,,True,True,True,33,162,958,6,True,34,Tests_passed,a2a902e5dd16d024e7ebc5166f2b160f12aad1c411be6dafcec88b8a16207552,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,True,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_failed,d76a7d3cf28ca4eee58e94ab59a9ebd7ba0613c7365f94801885758884a43c5a,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,0776e907df095e13d257c596228b76116e98a9b9068a51e44360f902d5ccbdee,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,54d0c8271e403334b3be2665bb12e4537dea7f4123be9a6b05f0c8383e6fea8c,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d,Tests_passed,2faff6e9ba72443b4788aafe398bdaf05907ebf84b377f903e7891473381623d diff --git a/results/reaper/merges_tested/sndyuk/logback-more-appenders.csv b/results/reaper/merges_tested/sndyuk/logback-more-appenders.csv index 2610c2ced2..bbe5ceec8a 100644 --- a/results/reaper/merges_tested/sndyuk/logback-more-appenders.csv +++ b/results/reaper/merges_tested/sndyuk/logback-more-appenders.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,ae3f6ef3d318598fc3cd1587a59a6358e3ea329d,5101380a368f76bc2fe058486266b44656f99360,e16baa5f46a753149085e2aabbcebef477f88064,,True,True,True,4,21,90,3,True,4,Tests_passed,154111fe41ba74d57075b5b0da67bc1b014c8d627344a82e5661b3da2221594c,True,Tests_passed,ead0b4a977837688584fdb15f956559587f7dfdcb693483376211f53455f507a,True,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,70e5a3c8f71007296cab7e67f82aeb376ab11ebf62e9bfb4120ef953118b9d31,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17,Tests_passed,6a02c5c4b58a7e50dfc984bccc97edf416a0623c688e63252f7409f2c55a3f17 diff --git a/results/reaper/merges_tested/socialsensor/graphdb-benchmarks.csv b/results/reaper/merges_tested/socialsensor/graphdb-benchmarks.csv index 8d2aeae025..14f65cecdf 100644 --- a/results/reaper/merges_tested/socialsensor/graphdb-benchmarks.csv +++ b/results/reaper/merges_tested/socialsensor/graphdb-benchmarks.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,87e995db5654b3325daa07c4181e8e358faaa887,93a1be1010118acc6c154755359f84b2eaa1eac1,6691219b7fbe7d54102ca0641348f6a1db78f7d1,,True,False,Tests_passed,097c95d3f82066d5e9650bb2b488f52475fe89603d27468b522631dd75e8278b,True,7,14,51,3,True,Tests_passed,a5ee3685ac75680f07ee698e1b883ee8798e30a9c879731073979fa195dc147a,True,7,True,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,3b4e835410ec25b7288d9dbe2ce687d7eb3b9c5d57dd60cc4d7d33d9faad1240,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874,Tests_passed,de88cfd9e3fe606f8efb70daeafc52699bdfc8a6a6cc01471be65dde6aa64874 diff --git a/results/reaper/merges_tested/sockeqwe/annotatedadapter.csv b/results/reaper/merges_tested/sockeqwe/annotatedadapter.csv index 3ecb575a3d..6477b3521d 100644 --- a/results/reaper/merges_tested/sockeqwe/annotatedadapter.csv +++ b/results/reaper/merges_tested/sockeqwe/annotatedadapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,62c7d43b5adeee8c47a42f4ab48ff106a6444b7c,32dc59ab83720ed5891a8701647211050f298e5c,ae79611e8f48cf8be3b0168e56c457d9bef2cad5,,True,True,True,4,10,44,19,True,19,Tests_passed,ddaf68a6e7bfce4270454ffee8333a997cefa1115c72af36be631a80267b60fe,True,Tests_passed,38cf0f39aa1a0ce50a77d650636f7d5784473604919a97c116fcee9e556382de,True,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,05a5f1a4e82cc3ece27e0fffcddadc5f4b9d5cb936f62139709a54de8e625dc1,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,7a67939a410ed774b4a073244d26a241a84b2883513b604f3e02dc2b1d48220a,Merge_failed,f7f1b1705ddb59e50c356eca3ad51c1d928762746189e82af4f7ef8e9779a283,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,363bfaf7be16ee5a6a218f17f9bee8d9803aac5d45752c05d0c287e4fd061d81,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,9007a179b972333ee68554216b6a703d1dc642a1c98a665f22e92b3242ffc101,Merge_failed,27c82c9230027f9d221ffbada1b36102a5edd7932e04f0110d7431df5e1179a9,Merge_failed,1baf33f091684ee949c85870b4de42ff7417fb7e921f09d365e3326c850a6b57,Merge_failed,fe4b8eca814e80c85c2bb16868ac5481d88183f0e3e2b4e0c90eeae3bd0c4bbe,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,fcdf879a856dda2855b563675797bfd3e6b5168aec2bf4c1170db64459c90207,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e,Merge_failed,5283efd26b255f7e30e19b52f957f46e9a9c491dc385ec4e6ff02435076ecc9e diff --git a/results/reaper/merges_tested/sockeqwe/fragmentargs.csv b/results/reaper/merges_tested/sockeqwe/fragmentargs.csv index 8ee1c59044..0b526169a5 100644 --- a/results/reaper/merges_tested/sockeqwe/fragmentargs.csv +++ b/results/reaper/merges_tested/sockeqwe/fragmentargs.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6e9506af9dd9fc0662d32080a9a5365ed7bffa0a,ba404aa9b8d30efd64ac6c6f281ef44a7c5958e5,64a24cd37a6707fb7dc88da55ffbee72d696a20c,,True,True,True,6,10,41,2,True,6,Tests_passed,56a4283b9c9abceeea3f0f2a52461d7fddda1fe780466a9b8b1042e7ca518802,True,Tests_passed,9d18930b60a1cc89aa0e0089242978e2751f707bbc392f421641c679d4f6425a,True,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,deddd6b8665eb93511175cd587a014fb2508828119609a00a663c6466c764f34,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20,Tests_passed,be5afdaa1b998ebeee252b4bf2d447b75a8d4d662780c36f3ca23b419a4b3b20 diff --git a/results/reaper/merges_tested/socketio4netty/socketio4j.csv b/results/reaper/merges_tested/socketio4netty/socketio4j.csv index 681511ba83..2afcfd565a 100644 --- a/results/reaper/merges_tested/socketio4netty/socketio4j.csv +++ b/results/reaper/merges_tested/socketio4netty/socketio4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,6f75c7857711bda80083e0cebb0e3bd0aeca0fe0,ea46d3ebb741215b74195e2a386fb17454fc3bf9,ae617f16da15273b5014e1ee68a87c84965c1fd7,,True,True,True,10,30,294,2,True,10,Tests_passed,565df6cc25fd8dc1f5038ba090e67fc33ce94226cc58ab178bcfc2b40289cb82,True,Tests_passed,3a430ca49746b711d89f4488dfb728d8132d02a971fbaf8dbd26b3c619ee48b1,True,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,981786c0fbac21cf3076d21fb9f4b0e62c8cea42c116438187e65d856e38d5c0,Tests_failed,3e65088d8bd3d94d25ce74d89eb830ae0be5deca5d54986a7e59bf8068b47c5d,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,981786c0fbac21cf3076d21fb9f4b0e62c8cea42c116438187e65d856e38d5c0,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34,Tests_passed,084fe5b28e2565a718d37f7fec7c4d7cc25fa51aaf1aace7f20c1fe7363b7f34 36,refs/heads/master,813f83b673ac76d5e779d19f146833e1646e09cf,84a94c3b791dbd85b99a40a88a75343fe831573e,f49db6acf7af63f796342cd2e201c119b4f327db,,True,True,True,23,73,440,2,True,23,Tests_passed,4484a3aa7796e1e5727ca87c88ee09918915f20bac17188b87a28028c0ecffef,True,Tests_passed,a1bbeeb072df1c84de322caf57d0c13456d868d1ea0443836b24f86819135767,True,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Merge_failed,c8fc43aefcdcfd56a5d5fd71edcb1152497cc85128e2151e658c432c0079d61f,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5,Tests_passed,33b522864d66bbd66d795ffb3ec64118e346b0c4aa337045d356ee0a273c66b5 diff --git a/results/reaper/merges_tested/softinstigate/restheart.csv b/results/reaper/merges_tested/softinstigate/restheart.csv index 7959d7afcc..98caaf3830 100644 --- a/results/reaper/merges_tested/softinstigate/restheart.csv +++ b/results/reaper/merges_tested/softinstigate/restheart.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,98dda32101d0e98366363d2f331662406af522b9,644eeabfd15b4195a051479fb711ddf368fa931d,07e9d6fb52186f08143b3ba973589d565498c48a,,True,True,True,68,185,4055,3,True,68,Tests_passed,eb325029575118e6ca4e1bc3a020b9a672f7ccbf025835029e0f660401154f34,True,Tests_passed,385350c8fcd98e4472faa0ef087b64c901729ba536ac5e64a66cbbf85cb03023,True,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,bc95f65d3649f8773144abc7cffd0b4c3c7aac6ab5e38105a3662b1e967ea4ff,Merge_failed,43d1c188d66dd3906ac6c458528f5abb7e882c0ab0ecb7de47e501e72b32130b,Merge_failed,8e9c074cb09e62ed88d026687128bf1a61564d0f4b5a1bb5b4f0b07afc71db68,Merge_failed,1796caa3f6f5820470f33e9fc31336ae9439c144153fc6629fdc0d01ea4a8fb7,Merge_failed,43d1c188d66dd3906ac6c458528f5abb7e882c0ab0ecb7de47e501e72b32130b,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,534078e7ceb9e8d36705e875cfab6793d1c44728a9d26adec02927494c2fb1d9,Merge_failed,fc38193ef835617c27f4ee965c90adf117468a0de5bb8a99f7d0127c3c72f399,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11,Merge_failed,8b96453902a26f2cd4180b4a1d13781a1980e0f6dbc13eb8ead519c196c15f11 8,refs/heads/master,dc5b8e51b4c329b3eea3e8be98ee8edc496b4114,653ad64f19264fa1e76ce8d53473e94ffe0d0276,c49e8331213f9fb0c5212d68ee05506579f13d45,,True,True,True,52,98,374,3,True,52,Tests_passed,25c81cba04d202ea23ae8ddda29763f77d8bbc3f09acdfb768ea7822b35e5e55,True,Tests_passed,e7c0834a93fcc52ffa3a7250270a4b91a37284b8a29ee887ac8ef9c2ea031f0a,True,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,4d235746b4502facdd5667f0b32eee69fb2e3797c3aeb2f8aa6a686baaac5f89,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,4d235746b4502facdd5667f0b32eee69fb2e3797c3aeb2f8aa6a686baaac5f89,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197,Tests_passed,73b3cb0c7fbdddb0e93d54ef966424515661779dd7d41d99a30e4a6d6d536197 9,refs/heads/master,b196d4fc15bb19a3a3c21b8a39559ad4405acca3,2126eb7d3410965e98c32c4e9264b27b51b90d06,95ed7534c2ce685ec19b36bbfbbb8a33c338707c,,True,True,True,149,1667,12132,2,True,149,Tests_passed,467b46772f57e82830506c3feb95e7f9e7453f806302260a31626ff299c8bdce,True,Tests_passed,8f20711e1e78ee8905efa9398433282d608a284dea1893bb5e754c60fc8ab3ce,True,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,e5345769a48efd465ea72d458e9dc9d3f525f63523e9b8a1825de0a214c57276,Merge_failed,48ee960175759de873cfc5245e5fb21296cb5b245044ec549ea74fcfb4e38c7e,Tests_failed,535b8d74132909773b52758c01ea7556f23bcbb2141e0d62d14907c47432a65b,Merge_failed,b1a4bdd892e2223ea37cf235f22af09119fe27028faaf7a549a7c785564eb72e,Merge_failed,48ee960175759de873cfc5245e5fb21296cb5b245044ec549ea74fcfb4e38c7e,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,74cbeda19e246f83366c2e3ab9e897df72afa0574902d54b2c8b683fb6b8c4fa,Tests_failed,535b8d74132909773b52758c01ea7556f23bcbb2141e0d62d14907c47432a65b,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c,Merge_failed,624d1d76de02979b346b30e6cd8068bc0d271c17a7ea42474b98820cd2d0659c diff --git a/results/reaper/merges_tested/solita/functional-utils.csv b/results/reaper/merges_tested/solita/functional-utils.csv index 886dc88d1b..0cb37f9bf8 100644 --- a/results/reaper/merges_tested/solita/functional-utils.csv +++ b/results/reaper/merges_tested/solita/functional-utils.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,a64f974e8d33134ba7f1b5e2450dfcdf9e764731,0690e9cfb6695662bfa7971480c5787864adb3cf,c9832d266ab93c8270c0a775404cd92b8cf73e18,,True,True,True,46,273,1424.0,2,True,46,Tests_passed,fac7f7c2141bfb63e58ce4f40f70e6525014f603c7ee68ce29aa925661097cfb,True,Tests_passed,13e2792f96dbadec538ca821da28f9f954ee1993bdbfb6e08d2eee7229d68edf,True,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_failed,927db1cea10b9d041045382cff0272f56ac745b9c2656bb14160ea4fe78d02b4,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,21b30d3cb487cc584bf02ca42d5b06b897e084e81651c5aef8af5cee821a7c46,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,0b5adc040c20e8c8a6d910d8081c52d7c061f0d730ee0c4abdff084654a883a5,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d,Tests_passed,d34d267079b27d2ca3370cb6d9a5234fd81e59baefc5fa87f413ae43d77cc64d 7,refs/heads/master,40cf23013dba22c6fb9af523f59036fff29f9e00,3c3a83bac008d48926302e6a58c3eb0fa381bde2,e7d8ccf77f4c675332131ab70c0ce1b4f9b0f326,,True,True,True,8,13,236.0,2,True,8,Tests_passed,ff6d1af3e838cc2f09f49888b89873f64812811b72cf62944a1b62b0d5354392,True,Tests_passed,1b5db2e66a4e7c95737c560e310e6ae1295819abe2646cedb7dc705e55646d93,True,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,c786cb813daa2b652c6e4de111852e5d9df0ba13373d8846b446efbcd98d2c4c,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,c786cb813daa2b652c6e4de111852e5d9df0ba13373d8846b446efbcd98d2c4c,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172,Tests_passed,428d3f2b04bf1299aa5d425da85ad49594b0f29fec6de69a8da998ae887fc172 9,refs/heads/master,396886272a60f4a5ad21a5277071f7bc9c3247b1,2d4530ed4fa4f1cf86235595759720d5d622cae2,80a2b66a68c0b2db255627804c09df2b6b2dc22b,,True,True,True,24,71,705.0,2,True,24,Tests_passed,8a454a568877358759ef2518cb37ec43f98201237d361d1c3f8a6b8cad7d3ebe,True,Tests_passed,b514b73a6975a3555888f4aa0d75b7dfa756977661338170db254a526d6efbde,True,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,f6a5060eb290bd3bf8c2e74f490d3246143e39cc5911b9a80d60b18455ef37c2,Merge_failed,743b63f3ea9b3b96d723ef54ab9e77b21641fefee7799bd4a29a6eb60e0dc31d,Tests_passed,91363f2ebd82099e1b825fd0a896d9f6794f805a4506ddf1298d9a157e22ea7e,Tests_failed,57d2d9b2ca4ad45a1f84b3c6c5925aad868709a4050dc5190e7642992af39413,Merge_failed,743b63f3ea9b3b96d723ef54ab9e77b21641fefee7799bd4a29a6eb60e0dc31d,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,78876444fa4cfe77b618e12dfd3c1c1f6b1b9d12308a2a03d562dc550838b525,Tests_passed,91363f2ebd82099e1b825fd0a896d9f6794f805a4506ddf1298d9a157e22ea7e,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,9a0bb62998e140059098b7c34bf65d058dbf7048319bd47f002e3286bed6d9aa,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6,Merge_failed,d2b20679caf39f7e59cc115b8f8f1a861c0fd7d0447151af479310b844994db6 diff --git a/results/reaper/merges_tested/solovyevk/htm-cla-visualizer.csv b/results/reaper/merges_tested/solovyevk/htm-cla-visualizer.csv index 2a85d672b1..d28c173ecd 100644 --- a/results/reaper/merges_tested/solovyevk/htm-cla-visualizer.csv +++ b/results/reaper/merges_tested/solovyevk/htm-cla-visualizer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,94286559181db4d3b19d0d0d814a28efe3e1d783,f7894cf76d0b1aa1f1066187a6b2213b3630e338,ae607d6bcb18f27ddfa008da90d4de8aae5c57da,,True,True,True,18,47,513,2,True,18,Tests_passed,68372ceb2273588a76f20363acefb67058292d041bab067a32be34a01cc47197,True,Tests_passed,a068a97a3867cd212869da1291a42fe75e14bc6ab07c450f558ac3baa9c7fabc,True,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,3bbb62580b67bbe4f49e288ec017cacf568b012a0695e2e535e8fe2023866398,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de,Tests_passed,bf843faa3dcec1602e26c758fe9b2104f81ce0072fc4facef6c04ff5053ee7de diff --git a/results/reaper/merges_tested/sonarcommunity/sonar-build-breaker.csv b/results/reaper/merges_tested/sonarcommunity/sonar-build-breaker.csv index 2d4281f19b..07e8d668ab 100644 --- a/results/reaper/merges_tested/sonarcommunity/sonar-build-breaker.csv +++ b/results/reaper/merges_tested/sonarcommunity/sonar-build-breaker.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,0a474ef6d91248a199a65c9ca24556e598116fd1,937870ed1c0f1c0f785b318bbd66d91e2080e043,6654db7b83ce2e7900c99d2540bdcca57a9fd3b7,,True,True,True,7,13,817,2,True,7,Tests_passed,25357fd119adf4c68630353ed196eb309a8c4d6aa66b280a1eb22591ed7de169,True,Tests_passed,c4ba271d24bd7adbf3b7ab6130671ac90c9701f8e93d1483d9f500e5bde36c52,True,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,6bb2141e158e68f022858f9e3e4d90c367561d41f2bc4818f1cd26ab96ec57aa,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_timedout,,Merge_failed,499d1ddcf477b38a17c2e78027999d45b5333296944803a661739860028f9bc1,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,31c078189bb846184e8dfab1d3846a4282f7ee7c2c8e7799d83090ec13e4461f,Merge_failed,2c54eec14647d617d30e973a5cc1d0f3d82d632ca2dcb3bc965602936e0cc145,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029,Merge_failed,ed462d88861dab7e26a9be0639d35c5189b8d4b166edae8340914417b22fb029 diff --git a/results/reaper/merges_tested/sonarcommunity/sonar-ldap.csv b/results/reaper/merges_tested/sonarcommunity/sonar-ldap.csv index 8d63b0c877..5fc9c20dca 100644 --- a/results/reaper/merges_tested/sonarcommunity/sonar-ldap.csv +++ b/results/reaper/merges_tested/sonarcommunity/sonar-ldap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/1,245133355f897caada1272aff129ffe56d3ad4a2,6a81bd5a6f17f247f39784815ff5cf3966ef2865,6b7fb9409178b44ab52175ba3b2265554062d089,,True,True,True,31,186,3936,32,True,32,Tests_passed,89ef06aa7e710d9e8ee37ea428148cadb047f8db7b9b1be99338c239e5ff39ed,True,Tests_passed,9b7200002758d949a0b1fe19afc07b4d22e5a8fb3dc7e5eed52b5812075a5492,True,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,e78f0e075844e298179d7ef737648d6a3fb4cbd04da9eb99f17255b7b1da4c92,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Tests_failed,bd26361dc8dbec425b786b6cd75b65cf6afd6f857c70aa25d21e82d94b222b7e,Merge_failed,01098758bed885bc467a2c43d3c31c6d6eea28623f6e55612319279ee6349544,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,60237e4627f33dd1c3a8aafe99a19a0d3ceeb70bc448d05c470b49112b618a0e,Merge_failed,fffa77d4d5c00b21bb189d964471048df898019b19d99aa67ed2ae404338f42e,Merge_failed,59aace462e3f4630515a94363e4466d8a4aceb14dbe290093d23cf6b94bb90ba,Merge_failed,0eff9b50d1f6a908c6bfd500465b1a267301906cbd96db6dc3930b4a68ab831d,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,7b3abd04d183689877424789146898643f741388e6a600789870df0332cb61af,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1,Merge_failed,f94c8b92c12588fef44ab5683f20c24f1154d6c2290092c87516d8bd427cf4b1 7,refs/remotes/origin/pull/9,ab7831b6fffd82a5719fa7300316c4244e366a28,26c25448fafeebab43aaeb50cc8c5ddf5d6b0e2a,9c23ebddae98f5a705e5f44de41f59fe8d8a2f5f,,True,True,True,82,198,5388,7,True,82,Tests_passed,faaa0d2a9c06f953ab6c1b36c27684499aad5c85cb746e06f791bbd700976e4a,True,Tests_passed,3395cad6859a09647739bd4e05ed13971c3a051e1d97fdd332fc4374e6532c49,True,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,307d6c20847d85776adeaa062bcde5a60d6e6a0b94940ece8b8de20a3d9cb05c,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,6a43f18b9d2ed2aa13541a43a5f284b0d5cfba0c7e2b76d2dc9ef145519e49b9,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,5c0ff86db0ac3094e2ab48df27efef55a9a9257bff60a6a71c1804f8fd1aa63b,Merge_failed,ebd1473bf44cd9e49198a83146984e1343e91cf9669bfcf48046316387b36e00,Merge_failed,8c6362d1bf45f8d8eee1606f465be41c7da4a688b1fd2021db085c917fe131c2,Merge_failed,a878dddc34222ec9e539c44350ea73ee6e50511724ac9adf85a901907db4051b,Merge_failed,ebd1473bf44cd9e49198a83146984e1343e91cf9669bfcf48046316387b36e00,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,6a43f18b9d2ed2aa13541a43a5f284b0d5cfba0c7e2b76d2dc9ef145519e49b9,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,b0fdb13cee15bb71ac72d564b38261ed412f95df291311c9b2c0bfe02a18d570,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,8a32a3ef830e95c374838b277e3bfb5b61320a653b6c82831b2855d09d75cf4e,Merge_failed,cd1b4569129e1db06087ddc3bbfa75c4c0337add5c6edb38a0c5be71b9ec138f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,307d6c20847d85776adeaa062bcde5a60d6e6a0b94940ece8b8de20a3d9cb05c,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f,Merge_failed,9086e55c2c79abb6539c957455e4cfda5baf3d51766f5a4e4d79aa803345141f 8,refs/remotes/origin/pull/9,f2c7dc67661e8fc7757772065ec3e45481cfe626,f04698e5cc70e8f0b326ad8b3142407b5e6df418,764ac670978e5cb37566a96d2d4795e6d920ecd5,,True,True,True,11,39,288,5,True,11,Tests_passed,6bacc3ed877fb9c0eefccc4fa7a3d86e440e90c3fa85ad95ecbb6ce1f502870d,True,Tests_passed,e4d8d9e55400ecc736518b55f979c37baac43773c0aa45923a96c285fc396d9f,True,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,fb2926d99445263d5998a31454c4d1bea3d85f939bd3982d5fe7200c7ff8d04d,Merge_failed,b304a6f8c995c9fe1de9cc42f03eae02633b0bad98292d78b69f251fcc8b0a06,Merge_failed,c923a802a4efacb6cc1be7a9513be86d0543eb1a9dbb2ccd00e098fcc58d4701,Merge_failed,5fd45b02d79bc8b32dc6574815d0718b961cec6177a1bdc03cd70687dc4ff469,Merge_failed,b304a6f8c995c9fe1de9cc42f03eae02633b0bad98292d78b69f251fcc8b0a06,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,4a2cf82010040e293ea7bf866fa109e2ad967586d05fd5cb7ead57c6df480c69,Merge_failed,113754abee91f334f1d8059e2cd5dee5fdfed14af1bf9a6296c39a67a3541e19,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,d99cad3f6245a32a69e4847efa30584b21cc49982245cb8a3e3b077e0578335b,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e,Merge_failed,8a8bacc01507ae3fc9991dc4ef6b4f161b11f2e03df7b5d04fb2430df321256e diff --git a/results/reaper/merges_tested/sonarcommunity/sonar-php.csv b/results/reaper/merges_tested/sonarcommunity/sonar-php.csv index d1c775405d..771ff43704 100644 --- a/results/reaper/merges_tested/sonarcommunity/sonar-php.csv +++ b/results/reaper/merges_tested/sonarcommunity/sonar-php.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,76e939e3841dfc3f0d15b4e61ea893242000a417,e3c63aa81d12b083b637e1c16fcbf82bfa5cc013,0d0dd226a4ddbc20968f0b11a4b591563e63fbd3,,True,True,Tests_passed,8d052552724748e5c1a59027b02274d520c8ad318be27fb392f6cc5b18805ab2,True,265.0,748,4254,3,True,Tests_passed,23e9ecd12497cd9f223996605fbf280c911f4391b69bbf07fd50cd53b8a7256e,True,265,True,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,974a4bade30be5d3884408b9052f7cdd66014cb584a40288a9d97ce10864b4dc,Merge_failed,841ca268c63cb94d738506a9e9c2834df528f36005d293b6afa4fcc0608ad460,Tests_passed,e27acfccb7adfca4801a886ce8f5ab4a5de1f3c632d9191a8ae7d62ac4b48179,Merge_timedout,,Merge_failed,841ca268c63cb94d738506a9e9c2834df528f36005d293b6afa4fcc0608ad460,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,ffc2ff1464e04e43b9b7561f4ac1f470614343eeca986530ca3cc78289f823f8,Tests_passed,e27acfccb7adfca4801a886ce8f5ab4a5de1f3c632d9191a8ae7d62ac4b48179,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,726346b990e38b1cc9fe443ba5b23b3f95d4bba54a847ab0e25d49cd1b240fb3,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c,Merge_failed,0b151c1fa8f6adccf8afce5f1a32011c00532d7b45b3cfeebec8c25cd10b4d2c 7,refs/remotes/origin/SONARPHP-1358,ff256d1615e1f9920551f3b66592fc8de1bf5e37,8af44b30460bb53e092d0709345dec8217a5c051,6b95326c8ed571c8e90316bef4f2f1373bfb2295,,True,True,Tests_passed,1108b31d5f38b0ed9e9595bb87c91c6da87ed58a330521aafbdda670d826790a,True,12.0,18,477,3,True,Tests_passed,f59a6416f5213bb4fc7951d0555dace35702e19b1a57011617adfd2b39e9d077,True,12,True,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,103761e96ef7f3c1f83b480bb1d828e6536e473dd6198360c3b95555aa580550,Merge_failed,6e07b3ddd6ef7e810da4dffcd46dfa585c5938433642943cd614bbafc4e23526,Merge_failed,559aeba3d01da96f05e0011408b68ee6cc2ff649fa83aabf16d08af1a899b2c2,Merge_failed,61ffc78258a6065d218511151981c3f6f9d611738d94cfb8db6b47044d9b6e94,Merge_failed,6e07b3ddd6ef7e810da4dffcd46dfa585c5938433642943cd614bbafc4e23526,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,66ebe8d811b15adf378dbd1dc81811aedba67950608bfb8688b6deb441cb6351,Merge_failed,a1d75dc77737a63c10b1a8e1cd44d6649d4d8c77bd1cb4b6b28778f1fe0bbf8a,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899,Merge_failed,6497c5386c058939298fb220e94446d59c5e1ac036177ccdb035ea583db19899 12,refs/remotes/origin/pull/1097,3fe8547d35d0746be5678d9dbc0abb839cb52b5b,00b56c0b20bf01d498343709267afbca737fb1b3,867a3015d9e12e1ecd565d4a22aef77271eda652,,True,True,Tests_passed,472655e51f482840f99aef10e48265c7a8235fd22b6fb35244693b17a041a115,True,844.0,70251,186467,2,True,Tests_passed,d42f7cf0ee2af4822aee739e2f50b74a63fef4a65a0c41bce09b2b09aab0ae21,True,844,True,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,9dbac954f933c0f42575b53087eac620c8c02e56e2468db4ebd8787ad26f25e1,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,9dbac954f933c0f42575b53087eac620c8c02e56e2468db4ebd8787ad26f25e1,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc,Tests_passed,6f0c78063bc0e9416e84f96cccb4650db45e0309385469f9f794f32fd42d3bcc diff --git a/results/reaper/merges_tested/sonarcommunity/sonar-pmd.csv b/results/reaper/merges_tested/sonarcommunity/sonar-pmd.csv index b51897ce3b..01855049bf 100644 --- a/results/reaper/merges_tested/sonarcommunity/sonar-pmd.csv +++ b/results/reaper/merges_tested/sonarcommunity/sonar-pmd.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,2301c0627b5ab5276acb103f933e68d2ab6ca3be,5effaff6010a887d22f3dfa1513dea659c7969ef,fa5241298cb79608748b371e11710daedbb5180b,,True,True,True,10,27,78,13,True,20,Tests_passed,a2e7d5536e4edd0058de29d50908e7abe9465e214e24f080de0458783676c19b,True,Tests_passed,90c8618c14ec0db17474d96e4757dfa215202d5f14bf11cbddee27dbd6300c99,True,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,254a5210401309d05b245002c5f232798cb8f5086f0518df41b350cb0f0ebd04,Merge_failed,aecad6f4b5f1b852c8eaf7488b2ee1033e38759852bb44ad4f09bd451e66e17b,Merge_failed,8975dc28dca166e0ec6044e7be1191f1f2723be2f1d7aa8c04b32e51fd2920df,Merge_failed,c0ee2be68ae461eed8aed3ba221857f4be2c4d26c952462da52b1649aaf345fd,Merge_failed,aecad6f4b5f1b852c8eaf7488b2ee1033e38759852bb44ad4f09bd451e66e17b,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,ea1a82ae5c6b43f677807e38c5d39d25544e393c41d1896b99badca58a4d7000,Merge_failed,8975dc28dca166e0ec6044e7be1191f1f2723be2f1d7aa8c04b32e51fd2920df,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c,Merge_failed,81d892699cee97a18cf8806cb79727a2a7839901e103fc4dec53a6db1afd752c 95,refs/heads/master,933775819973c32cc8a831ea756e9a6c7a10f113,0a066a0b69aba7799612a24ce4647dedddc07c2d,b118e67f15d4f913fcd4e4952ad31b56291476a2,,True,True,True,253,640,6597,6,True,253,Tests_passed,4eaae77b2157c186abf57a4a21fdf7b72784dc2173c933c310afe8a94f077f01,True,Tests_passed,9fc2f862b927e7ae6dc2d2eaba7c186fa270202ad600af9dd62af7f06802d825,True,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8d8403ac294aa879cf0c872cc04619a9a9649dbcdd19e6a1a7b45a84c2be5737,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,6ac9740e775a8a7750f43aed5e62f206175f6d42dce94ceb258d21571e1221fe,Merge_failed,084ac0b4834afaf8faee710ddfd8fc04c8ea184679df110eac4a19de6b0272eb,Merge_failed,a234a5c1112c8624c8d7603989288af723a7f94054a3f9da627248a7b3bb7954,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,570603a882e4b5c4cb38e05b6d69b12130c785c340b7004aaa56de1b66715e1c,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,c4986aa863a6c60b0cda27a54433a0eeeb3bfba6c7c69bd690e4307f78e728e7,Merge_failed,32f8742f1e821e061d98cb4aada94ae18b93d47d1bd81edc797e3f725b40e3d1,Merge_failed,8f91023b1e0e6c0841fa8f32b2b531666e04a2d5493e6cb290c3a9111b86936e,Merge_failed,322246225c204ffe32985abf12bc4037e8322a8784fd0d0d48b61e24cf85c09f,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,b05ea932ce801ca79fae8acc68a4044a7eb5a76a488c80898bf79a1074ea9d37,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454,Merge_failed,5890b4527b100d349151fb2e5ad50a81f859fc0635c488c71d06383bf59cc454 diff --git a/results/reaper/merges_tested/sonarcommunity/sonar-scm-activity.csv b/results/reaper/merges_tested/sonarcommunity/sonar-scm-activity.csv index 7dcd79980b..90305962c4 100644 --- a/results/reaper/merges_tested/sonarcommunity/sonar-scm-activity.csv +++ b/results/reaper/merges_tested/sonarcommunity/sonar-scm-activity.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/pull/4,eb6d39619d9c570d93b08239891ca2983e73e85c,2a004dc73737229a24009e64cfe68d8a9a4796f1,11e3ca2815a75f93ff30d276caea7caf48562f93,,True,True,Tests_passed,d415eab3e2d82e969d504dc93244f445a5337b5d4628194e23749b95d3370da3,True,50,228,1473,3,True,Tests_passed,2c4ad171e512e0f17fc186fb4f2773595f48144e8a01d634b63174b33bcefd9c,True,51,True,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,821133f4d24858a9d7305de5dac2feabc9205af64efa352cc26b26591f4694af,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,08a86cbda8b72f5d7c672fdef2ed11f8123c0302a9f887d6d014537acceb1fe8,Merge_timedout,,Merge_failed,18d70b42e76eedec2e930562a4c5597a2c903f5476b865aa53bc4df95a78a27f,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,1d44e2213a9daad2d6a4d716de004b417c0b1a8ccaa9da203039d5179213d735,Merge_failed,fa57199e3af30a1f39095fb39616b8225efecf9577dd3446c84c50e0ec33ebda,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d,Merge_failed,f942f40d181fa3517eb6dd12e33613c0b4ad7c0d92ef4716a42a9cce0e2fc52d 2,refs/remotes/origin/pull/6,5cc251bf86feb0684541aefacfab932916d461e7,f8059ff6436f09759485b58e060dc468ace1d74c,ec5d0b030682df1a3f8e881cc2b856df3a15f69b,,True,True,Tests_passed,2943ff94b02a0c5d6e32b983a4ab291fafc59abd743168cb787de7e064b2598f,True,48,227,1272,5,True,Tests_passed,d28646f1f02161542c3cebb85ae5908ee1b2f09027319408500f4ee4f7585034,True,48,True,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,fa3c61b264e3a14cb5188d1797d58506c186f42229b4ece81cd6fe018828f41a,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,ef4c3e5cfe141df65560328534c041bab9cc749e205b742fa4288068ef28d236,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,3188e68ea25e5a4f51231881e5116e6b35754dcfd0ecb6ccfcfab2299ee9a4d2,Merge_failed,4f44908c9c4f8950e37c97ead29890164785efbea4994278d2a4c84e50625a46,Merge_failed,b018df2678efa79ab9952419ebfa46708dbc0b61265c9072736892e6a4eb87aa,Merge_failed,3b3233279fee6c90eac854c24d1561d7fca0d3a00009d415e476a319d93ded5e,Merge_failed,4f44908c9c4f8950e37c97ead29890164785efbea4994278d2a4c84e50625a46,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,ef4c3e5cfe141df65560328534c041bab9cc749e205b742fa4288068ef28d236,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a6a344bdc1e08dab8e90b894bd2623d69deef139f50aae815190073149527212,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,8aa69e785c018e8eeb18d7baa231a08aff7523b5f13c8b97576900589d32fbf6,Merge_failed,b018df2678efa79ab9952419ebfa46708dbc0b61265c9072736892e6a4eb87aa,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,fa3c61b264e3a14cb5188d1797d58506c186f42229b4ece81cd6fe018828f41a,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8,Merge_failed,a186a931d2b1efa4d16955fbddcb3e9b9bdfb59d560ffbd1f428a20c0a35eac8 4,refs/remotes/origin/pull/7,e078d44db1d5faba85e98ae78d74ff6099de7c3c,70249a38586653f8b0fd2843fa962f7478eb26c8,ec5d0b030682df1a3f8e881cc2b856df3a15f69b,,True,True,Tests_passed,7fc70831a9050af39a17625ed8363d4728a5af5e241e27b57ec4ca50a95ac06d,True,56,237,1884,6,True,Tests_passed,d28646f1f02161542c3cebb85ae5908ee1b2f09027319408500f4ee4f7585034,True,56,True,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,4d90e91d330aca96c3b8cf67abf83ac432b8f03c74b68c8e816d817488d52a6b,Merge_failed,0c17629af5ae3c1ff9b5b48b84612f5baee54e88628a455771dc4cd22b2845d5,Tests_failed,4854a0ecf78a509389336bb93a0567ba8dcc70a2e8b91f02d2876e1e80f02dec,Merge_timedout,,Merge_failed,0c17629af5ae3c1ff9b5b48b84612f5baee54e88628a455771dc4cd22b2845d5,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,4dac7efd9e2da82e8478ea3cfd329b9eac7b40ae53970e2f98bb479bf950585d,Tests_failed,4854a0ecf78a509389336bb93a0567ba8dcc70a2e8b91f02d2876e1e80f02dec,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,960b84cae088fbb1451b1a630f13505a963ec57d148ca0b2fda11464a981493f,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd,Merge_failed,41b63362908e35ba611000414e4dcb8df87a393d924873444fa7363640bffdcd diff --git a/results/reaper/merges_tested/sonarcommunity/sonar-web.csv b/results/reaper/merges_tested/sonarcommunity/sonar-web.csv index c2e933dee2..350a1092d3 100644 --- a/results/reaper/merges_tested/sonarcommunity/sonar-web.csv +++ b/results/reaper/merges_tested/sonarcommunity/sonar-web.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/pull/117,2034e49e0066e082d7277df1af9a7e54a33b1db2,aa8fa56ccbea9002264b8ee2115ea71e4727888b,9ed6f9f8f8fa18c779ef1de752b0f883496aa5e6,,True,True,True,14,18,3407,3,True,15,Tests_passed,f77444fa23342a75cc2be7e7a9773744d4c681f2b075bd848fe7cdd2b2d21bdc,True,Tests_passed,3b7a5f003b18c0b117f2688e0861e617fde0ddcc67c9dcaca346b61a999c9edc,True,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,0d78dce144b77a9c8e19fafd93360efbdd520c0dfad46d780045e7e7561090c0,Merge_failed,fd72a0d21944c6f2f80cf8aa9447ec3059345e5b20a36091bbe13d6afa677e04,Merge_failed,b4e87aa63aaec93a9912d5f70c2dda9a406ec20625665dfa175141a9789831fd,Tests_failed,7aec1d8ce20ef02e7ad22d964854e51f26b8a83bf08c35152fe2741d2bb5eb10,Merge_failed,fd72a0d21944c6f2f80cf8aa9447ec3059345e5b20a36091bbe13d6afa677e04,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,e517b39e5f3e9fb8d9784f7aa16a5f4c900bb68ed310d41ee89fc4d9f883be76,Merge_failed,b4e87aa63aaec93a9912d5f70c2dda9a406ec20625665dfa175141a9789831fd,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203,Merge_failed,3223ad6f9f97c81194179f57c7636d2fb61aad31b11323350551ec166c316203 4,refs/remotes/origin/pull/117,b6a68a63c42d8f2dce3fd92a208351b3cf4f2857,b4c07004f18f2f89123e2f56316d1cd221efe878,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,True,19,31,11733,3,True,20,Tests_passed,5cb9e4a18671d81d619d4dab64820ba17ce46aa2f7f79d4e18020936eb734b0d,True,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,True,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,ca8d60db0082d675bcc3b177f267a487ca325771cf096b3c11cfc6c520184c4c,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,63ab2da013a8b9d10c44335a4adccc519f9d208e106e193d46b740f1549929e2,Merge_failed,adde5491deddc3f181201ae0bcccdc5d9b85a0e20c19146217d088694fa6ff00,Merge_failed,43b49f959fd9db11dbd7ec877f76ede6f828cac0148ab6be82d9f0ff382caf2d,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,bf16356cb79d728266f6698a912abe6c0c08cad726a56066f36c9501b6b95541,Merge_failed,1fcb3fd4559c9db821d535eb1786b6dde36382e6b9761d2b4e73da189d26b2da,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7,Merge_failed,13a7b8ae943b1c362334767ddc83365365b47ab91b25e3860821c54469521dc7 5,refs/remotes/origin/pull/120,503127154d0327868045098d7a8913339cdadc49,51bad826266ac08d6f20b41834be992a3ce2340e,d0da1ed51fca933c9028b4c6c60559f12481e617,,True,True,True,20,35,14683,3,True,22,Tests_passed,cac18bc8450793d3333966f6389324411a10f02120ada095433282104f9f6a11,True,Tests_passed,697a13e1ce5d0b35b8bfbdd68ea8ac4d08100b42b7a05224208e05ff85721334,True,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,567a8e4261353e129570460f8886a1852bcfd159f20a4ae3eee07bc907de7d18,Merge_failed,9f8b68083666705a7fa2235e8d1d2d820f24ddd7cf6009dc374ba46b199ec382,Merge_failed,bd5258fb4bd4f65c5e930651c082d31d56471a5bed3b02eabfc4e372bf9c3f21,Merge_failed,d977668c7d381f76e4c98ea2b6900fdc467ff0e03ec39d557a11f890fc01e84d,Merge_failed,9f8b68083666705a7fa2235e8d1d2d820f24ddd7cf6009dc374ba46b199ec382,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,9673f0a45686835b806b4acabb02ce485c10f2332d789a14040ad375c8bc8649,Merge_failed,bd5258fb4bd4f65c5e930651c082d31d56471a5bed3b02eabfc4e372bf9c3f21,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b,Merge_failed,e9a684f56ba631447e8f942d88eead378ee841af699a9a2b3f352f34868f3c2b diff --git a/results/reaper/merges_tested/sonarcommunity/sonar-xml.csv b/results/reaper/merges_tested/sonarcommunity/sonar-xml.csv index 8199f77018..bd37045478 100644 --- a/results/reaper/merges_tested/sonarcommunity/sonar-xml.csv +++ b/results/reaper/merges_tested/sonarcommunity/sonar-xml.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0e1fee2967a660d9ad773b8279e8ffe5ab4d0908,7c4f9c62a54532c13a302793523e6c5ec498c54c,90964790a53ea2e1c81906221666a3fb33ab68bf,,True,True,Tests_passed,a77b55b7a45b441baeef7140fae50e2f005e93b8f7eaff4939fe71cf5b7f54eb,True,23,117,624,143,True,Tests_passed,a138b393b01e2f41e2588142f289fbe748e3795bc997e13f950a5f5310ace78f,True,153,True,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,65539822e0d594d5630b4feabc46ce2239216cdec3c716d65c59073641653d7e,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,5dacc30d3d17647f1644931d3371538e2d7053eaccf75866b9ac90492a247789,Merge_failed,3b183e936be6c80740ce0663a042bfe1a67871a054d79866ebb98403391bab00,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,95a4b9c6714137ea2436e8a5db47749676d4b4fb46afe1bcd297f2f97f7dcc44,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,d77a1c23044cacf628a4287c8f9041210ebdff417ba20db14278cbe761876437,Merge_failed,fc031b63ff79b330dbc1bd92ebf766f8e0f4a1e755c9283f3f6b07434bfda7f6,Merge_failed,7c41aa6c1f84049b41e613e27ad6395109545901f0279b46f04e2dbc640dda13,Merge_failed,840fa02ed1a028cc3f3cef4b80070fb94dfa5d764e956a7a11c84b422b81a413,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,509dd3987a5657293ac205efc04756ada4cf5a112e72b8649e411b2d35140c6f,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779,Merge_failed,3035de6e52138ea6be5f0dcece1636032a464afe4d6147ba6ec6b4d77473c779 diff --git a/results/reaper/merges_tested/sonarsource/jenkins-sonar-plugin.csv b/results/reaper/merges_tested/sonarsource/jenkins-sonar-plugin.csv index c3e3e8a195..a1fed97674 100644 --- a/results/reaper/merges_tested/sonarsource/jenkins-sonar-plugin.csv +++ b/results/reaper/merges_tested/sonarsource/jenkins-sonar-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/remotes/origin/pull/123,b784e8f5f5d9658f4e644526211c2806df5b73ff,60097ed39284e2fa7816e71c832000d6f5e8fa0a,8340b8e13e11955c5a46b23cb223b663a1b0912f,,True,True,Tests_passed,35fb471c69fe2dba78f3be1756c41a1aba51752d6c7dd621701ad9b2abe38316,True,23,57,433.0,2,True,Tests_passed,5474fcfc72d5bcb42b744508f1bac21dbae35c025d458685e1a1acad5cc1022c,True,23,True,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_failed,8b703787aef7d1dc57ba4f1e984c05ab17b72f1019587441c2aafadc0b996f72,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84,Tests_passed,a776efc68131f05e9ff67a35023dbf79980ac58f807cb8792907c99f9aae4b84 35,refs/remotes/origin/pull/175,ffd5c4bca45dd46beef89274d9038c75674ebc75,8f1211f8bc2315b76bc8069e8634109c89824177,3ccb62e49f48393112a5de43295ef4ee474cf6b5,,True,False,Tests_passed,030ae5f4f6367f13cca4292050fa23065fd5af3beef9f5b416b229bcbd34dc85,True,113,119,264.0,2,True,Tests_passed,10c0ee8982cb9b767179e5529f3b83de2a6b7d2d894db1afb6a05a49c01e7eb6,True,113,True,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a,Tests_passed,6a3dab35aa8ce5a61aa885b91d9cb89fe7f7c445d4c1c9f7e684c870b480ce2a diff --git a/results/reaper/merges_tested/sonarsource/sonar-findbugs.csv b/results/reaper/merges_tested/sonarsource/sonar-findbugs.csv index 55f8911944..f4b9b6a249 100644 --- a/results/reaper/merges_tested/sonarsource/sonar-findbugs.csv +++ b/results/reaper/merges_tested/sonarsource/sonar-findbugs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 77,refs/heads/master,bad6dabc5d6f9efdc87e67235050ea501bae51c5,f8927f65fd0008a729d47d75d60c4c91a1a5226a,59a19c839ed6014bb32ed482580ef9e597d771cb,,True,True,True,37,207,1361.0,3,True,37,Tests_passed,9ee7f78053c3ee226f34451f18f9a6948f0c70e22f1dd19574ff396eef108f7a,True,Tests_passed,cac278112d2c5097a31572da45056703ebc4d7e582e2dcba1dd0abd7a10de2a8,True,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,102f368c4fdfdad905fcfe790d8db1beca50d12cb05b9aed8ce52a47892c9575,Tests_passed,34b43537b470953796cef621e5d9405b066db5e17ce9fc6593d3ff780a3f81b1,Tests_passed,aa7e980fbd4d3cad76296a1d80a5c043e95654c87d107a82967be9e667236637,Merge_timedout,,Tests_passed,34b43537b470953796cef621e5d9405b066db5e17ce9fc6593d3ff780a3f81b1,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,ca564d81ab0d2aa00733ec1741d4019c2eb9d07beb5f0192555f9bc7d8b0a909,Tests_passed,aa7e980fbd4d3cad76296a1d80a5c043e95654c87d107a82967be9e667236637,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768,Merge_failed,e70259cb92f595b7f0288252482256470e76d4e75b5654c650e6cbd6dcb45768 198,refs/remotes/origin/pull/513,91cc3c30b31fa91cd854d16ff0d4023c5eac065a,aef8cbaff11057158ef2684e2eb0134ba6d744b3,56846fa0ed28b02a6520922c30764993b397c286,,True,True,True,53,292,2921.0,4,True,53,Tests_passed,e3c33e798bc2970818156b9102a27f894434c3f3bfc7b680d02507f645326924,True,Tests_passed,02469ffd72167de21f4a18b3bd5b1ceefbbdcb1b379c6c8509cae4d490d31081,True,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,35a472a66d5947c329c94c7a039a7da63621889d51f9a0a614d8f15d79badabc,Merge_failed,4da3e853a19f79174d2dde64998f686e31d9a4c8b7c7e57a70c17cb7f249c84d,Merge_failed,a696f6a548af65d9248aad9c4a986c6b020dff17ff8b7c6cd32482940e9375bc,Tests_failed,641e6db6fed2a55226d58809ca309e117a6f9f4be42f3879089f797ac4937e56,Merge_failed,4da3e853a19f79174d2dde64998f686e31d9a4c8b7c7e57a70c17cb7f249c84d,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,310fbf28784adc043158a75f29cb540e8444894a17a12cdd83ac3a360620ad24,Merge_failed,a696f6a548af65d9248aad9c4a986c6b020dff17ff8b7c6cd32482940e9375bc,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,1e7b9a5e31e6244c20f484dde22a87f8ce7486d5447b78542102ec3a2d23744f,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257,Merge_failed,6f9755a399eb734dbb06f26c3e9d85d8fb79e2124cf95f176a771bc0e4e93257 203,refs/remotes/origin/pull/718,36fe7fdce5bb537ffb0c12869eeaf72f19ed1d6d,4a8de43c4fe22d8397f9fcaad2f27b202f875a7d,3abef2ff3f4fc6cee8f135aefc80ceb18837296c,,True,True,True,73,264,4165.0,6,True,73,Tests_passed,ead6e6d3a31f4b9ae04366c5ae506637809575ef4212889a4c4bb2ef8b5719e5,True,Tests_passed,1a338fe4059066d6cc17c3ceaa0b01367c569b2357b5ebb2bc8139712c9bef35,True,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0027032c6b3c0bb37aaa804d71575b4de2a53e95862546f9e4cdab001b5466d5,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,60ac881483aee97419357c4d6eb5a907f2a06bc43747289dde12fbcc9119346d,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,1816306f7504c00b06001e43a9da793879ac5868008c529927fa42fab531de8c,Merge_failed,24105b0c6bb671bab59079116bae84f1d92cc47f61e6bc291bea760c7158c37d,Tests_passed,1fa161d020e71a468f77637fcf5ed4753e11c32669344698bf70611fd5a72fd6,Merge_failed,bf4001120920f7e96aadb2ca4580faa0ac4c090b868a2eaf385e5a44399a2736,Merge_failed,24105b0c6bb671bab59079116bae84f1d92cc47f61e6bc291bea760c7158c37d,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,60ac881483aee97419357c4d6eb5a907f2a06bc43747289dde12fbcc9119346d,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,77f996914e645390204841730af020dd2c5afd09433a24b9d36c3192e85f33f5,Tests_passed,1fa161d020e71a468f77637fcf5ed4753e11c32669344698bf70611fd5a72fd6,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0027032c6b3c0bb37aaa804d71575b4de2a53e95862546f9e4cdab001b5466d5,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97,Merge_failed,0033d8067da592aae54c2e3fbf062651061245462c267876e8dedaac78511d97 diff --git a/results/reaper/merges_tested/sonatype/jgit.csv b/results/reaper/merges_tested/sonatype/jgit.csv index 71fb70eb05..30ad6f13a2 100644 --- a/results/reaper/merges_tested/sonatype/jgit.csv +++ b/results/reaper/merges_tested/sonatype/jgit.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 38,refs/remotes/origin/struberg,7ce2207c2b66c7fec63cdcb816bd570c534fb829,ea4903241e2b096d85101dc4697b0b7b9749f820,6c5dff4f907654ffb7ba99887d36d57bdd0d1f74,,True,True,Tests_passed,4c7c9f2cfcfef5418f353e07765f9500e1bb03ab765c5b671e226773ebdc8e1b,True,28,179,2745.0,25,True,Tests_passed,5422cfa265a3148065a2dbab138da2b11f35aed165bafc57bb3669a1ff023ae8,True,50,True,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,8e5d2dee98b55f33840e00467dceeac83d81a45000bd4e96df1a39ebf7736235,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,e4400e1c2757720d6a118418c3fde12535c757a86438ab8f2b46e35a615b4795,Merge_failed,cd46f08fa7e8aeeda19d5a4b773cc638a0d3b9ea4f15bb163261b45461f84994,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,da1491f4001f955051bb20683e7a27dbaf361dfc04bfc868be0efebfb3e3eae8,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca,Merge_failed,948a92ba91acc1ccedc05dd451a54bb68198785845239e35cce768465821faca diff --git a/results/reaper/merges_tested/sonatype/plexus-compiler.csv b/results/reaper/merges_tested/sonatype/plexus-compiler.csv index 7933c12f78..a273d44927 100644 --- a/results/reaper/merges_tested/sonatype/plexus-compiler.csv +++ b/results/reaper/merges_tested/sonatype/plexus-compiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/remotes/origin/pull/36,379b6114536f2f3d363d096fbe2246f5cb3b8ad1,3eb04b388662f4f3394b51983837b3065b3aa3f9,70cce375cf186440ac930c41e026b1ef614202cd,,True,True,True,3,5,83,2,True,3,Tests_passed,c337201bd8796ab798364b29a4c5b47c9a1d1df453ea8b28f0ea82885c32afab,True,Tests_passed,f960cde03470289072c5f5033ad4910a9f0242fbc89f908d5d46ddd0e7968905,True,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_failed,4c0567bd18a760ef2290fff6f912d2bd23b82a3c6e1567ffc471b758d7f88eb4,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,1a2f003e0062d5ee3b1d5bd782e5acc90f7fd434df0233e11afd76abad21cd79,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,a0bad1ae0a584cbbc1cbee081f4ce772a537b98340e40fcacbeb907e3e871a60,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe,Tests_passed,bb4276bd22f88a0df291889a80b5c55b91ccd9e20ab8b53f9645d114a981bcbe diff --git a/results/reaper/merges_tested/soundcloud/prometheus-hystrix.csv b/results/reaper/merges_tested/soundcloud/prometheus-hystrix.csv index 0ca73ddd36..b93f3d3e14 100644 --- a/results/reaper/merges_tested/soundcloud/prometheus-hystrix.csv +++ b/results/reaper/merges_tested/soundcloud/prometheus-hystrix.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/11,fd664ae55bf754fbd5764a2c19019e1ed8d5ba14,876af34a18e3dec75c57c959a230921f32cbe529,7a8337d0fb5d70f209f5bbe6838e55d9789a6b57,,True,False,True,2,3,3,2,True,2,Tests_passed,0ed23bef9c2183e93b691fd4f1a2a737f46f1947cd24aa480fcc22a80f0db15f,True,Tests_passed,d703dcf1d53b48eb9b34cf5e1ff00a14c6d3c065c93a9cf67b27ab97ea397d0f,True,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f45f889ae4fcf16aba72b23a8819229366584fdad84bb4e6351917ada1e3c63e,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,9c79bac3f0b5712d3a17343102e6e09bc8639fe4b97974a442232ebd6a582fef,Tests_failed,cd73ea4244ddb787f54fafc779933b0ce96e16d1c2e0a1b5a7696032d9faef00,Tests_passed,23d13c0be48592d37293794407a89207f585074ab3f17e74ae9b4592218cbe92,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,f517bf2eb64df6c3c49e17eff2eeacd3391d9e71b289f4a74077d8abfc017841,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22,Merge_failed,a16cdc2d0e00c13879b5c94b26d770b363df12093d02b64e67a3bc7cdbcbeb22 diff --git a/results/reaper/merges_tested/spigotmc/bungeecord.csv b/results/reaper/merges_tested/spigotmc/bungeecord.csv index 165c5bfbd6..9ccfe56171 100644 --- a/results/reaper/merges_tested/spigotmc/bungeecord.csv +++ b/results/reaper/merges_tested/spigotmc/bungeecord.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 148,refs/remotes/origin/pull/2217,214e03697a5ae301bb33f1117c2476a0acabcddb,8d152de6a6eb9d450b47f59e7e81af0d7cca01a0,017f3a2424e0a210d5bdfbf45720aa1ef073a223,,True,True,Tests_passed,89109765826854e68d7c6b4ec8981dbf85359d6874bd308a63822511f8bd145a,True,50,363,2283,4,True,Tests_passed,8aadf8e204d9ebea1c376b31b146dc3eb08e83bca58e1640eb90ccb32887da2d,True,50,True,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,29f4f7bc94a0ade2657173f2d6d1b6cce158dcbcd911786ef7fffeaa793d27f5,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,29f4f7bc94a0ade2657173f2d6d1b6cce158dcbcd911786ef7fffeaa793d27f5,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78 158,refs/remotes/origin/pull/2241,06deaf18867ba169efbe23ccd20c831f1ffe370f,414b1281a2e4181d73553c03314dbb03a9a1376b,bd5a7e5b26b698c57e6f99933452bfc0659269f9,,True,True,Tests_passed,4316bf3bd51785c873e07bac786e82c07f0921d88eff0d46d778ffa5d1c2a7c2,True,52,349,2036,2,True,Tests_passed,bd4fbd92783b16f5da08da678d5b98cc85f6e5a4595153c52344711816933e57,True,52,True,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,9b3839425dfa845caeeee743b6a45fe0927d100d792b4b24c1e5b58a1f2da125,Tests_failed,c1e14dfddd77d730f1804cc630cfb9269761cf7bae5065f52f7752da368d259b,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,9b3839425dfa845caeeee743b6a45fe0927d100d792b4b24c1e5b58a1f2da125,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61,Tests_passed,672d5cf527dec2e3b959d2c0d8de1bf5b0636eaf9026ac75d843fc182f24be61 161,refs/remotes/origin/pull/2241,7c146a9b0553145ce14a78957402b027d4c57da2,214e03697a5ae301bb33f1117c2476a0acabcddb,a1f9c2e7d4ab917ed8d12ae3303a3f4357055564,,True,True,Tests_passed,b7f3e301234c313b24b6b9f0f3e9e33f715448d4f9457fce429e91ab889e3e78,True,57,515,3324,10,True,Tests_passed,28354365f4db5f70e875b139c96f3717167105e3c3e77d12d19dc02557647212,True,57,True,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,067707184844a7a4207719066dcd0d6c19878d2486ef520af0006936f779f81d,Merge_failed,ba40594379f227f0cab11fac55015aed9cae547f046775d937b17fa0813b4e18,Tests_failed,a2b9c207c284c665e80c614ed532135524ae6083e3d1600c9a645ff29d5a1c55,Tests_failed,ea1260c9755cd7d301032942beb83e43c8cb2b448dde122310600fe4eb18a749,Merge_failed,ba40594379f227f0cab11fac55015aed9cae547f046775d937b17fa0813b4e18,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,79c2290263387a34e28b5260a79c33348074e8e1579d3ed78dccce7110995156,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,5ec4086c20dab4c26ff6ef4b3ee56f3ca07920e626c40fa9ff812b2b3745221c,Tests_failed,a2b9c207c284c665e80c614ed532135524ae6083e3d1600c9a645ff29d5a1c55,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,4c017c65b310d49a80888c90cbc7dde7ee8f544b36ee4f4b3351166946239bcd,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8,Merge_failed,90aefdab07df49f17b4459ff88810c4bbd193c82e43df3d1315a045f10b2ebe8 diff --git a/results/reaper/merges_tested/spinscale/dropwizard-jobs.csv b/results/reaper/merges_tested/spinscale/dropwizard-jobs.csv index 73d8c64e00..aa3e74dc23 100644 --- a/results/reaper/merges_tested/spinscale/dropwizard-jobs.csv +++ b/results/reaper/merges_tested/spinscale/dropwizard-jobs.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,f10957c9cc94f1aebe4eb4416353065fa0fc4ba1,2c65c4f0accaea4a891af4e8cd063b3c733a3a95,8f70c45b5d1ebb3d13081a504a66e686b52dae99,,True,True,True,14,49,233,2,True,14,Tests_passed,e2e3fa4cc027cf9846be2fc5a9c019227dc2f044a8fe8628234e7e576d4f179a,True,Tests_passed,591c3c4baf550ce5eb82adbbfca17fdae086a3e951cda4972de6e0ff8a276109,True,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_failed,7a1dac1af00c467f9e88064b6fbbfdcb9098c07ad51324321509007f43acc51c,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_failed,81d41c8e3641f0848646627c9e457c3cb72012079560e459e4968cb726853322,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0,Tests_passed,ccfed1b88902c52e0b3609a1695b26e0f8ff2809b8078c2f0b40cf4f511228e0 31,refs/heads/master,7f683b73cae2a338656deb368e2e76ad9616e23b,46c4ba62d418f11f7ca73426cb7087034eba83f1,2084c91ddbce16a3b10e81d359ce971779fc2624,,True,True,True,37,104,698,45,True,47,Tests_passed,e9253a44c8e4541677257ca73d5643257771e91c03826a9e15b9fcf08dc1c06c,True,Tests_passed,a04929918cdc088362935d7f41def518d8bd7e8f6097839da6a02979ff5eda5f,True,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,80c49634a236063fa1df33a29e4087cd87b3bdcaabce56f68ac38c9594675089,Merge_failed,10464dc42e12f9feb7a6eff021ff4a5ad723cc4648da95e36d106250f1932e36,Merge_failed,849b15d28280ed6fb60f254bbd4e264b47d8a9e51a65cb405ef1616404e48730,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,475e86740df1c6c9c35ad9830c6ae0520ab3834711a809cece978d6655db14b7,Merge_failed,a856f1ae089a6624df09ff22488fe088525c110c90686bce4a9bc0bab9398af3,Merge_failed,44435bf24449cfb9a0178f5970e2daf318171d8d3862bd7d9cc83edaa58312a6,Merge_failed,935f33292038539c11cd7319c87a4048e19dc87c36b068a78c9a43fd71c5c88d,Merge_failed,9b6d13a183d806977b814e3a084d953293d54617cddf08d1c7e052991aa9155b,Merge_failed,44435bf24449cfb9a0178f5970e2daf318171d8d3862bd7d9cc83edaa58312a6,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,10464dc42e12f9feb7a6eff021ff4a5ad723cc4648da95e36d106250f1932e36,Merge_failed,849b15d28280ed6fb60f254bbd4e264b47d8a9e51a65cb405ef1616404e48730,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,39d0f969dd5e4a733fe139d837dfc0a057a8edb648a1f8f756109313a3f8822e,Merge_failed,475e86740df1c6c9c35ad9830c6ae0520ab3834711a809cece978d6655db14b7,Merge_failed,f8b523fd6a70036110ed0ece75f4d34a36c32673b818ac7c5ccc7d706b214809,Merge_failed,9c0efbb29480f31eeafe0202d29ab65e44d6d28a6af9d6585a772d0f540e232c,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,80c49634a236063fa1df33a29e4087cd87b3bdcaabce56f68ac38c9594675089,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b,Merge_failed,764e2b3271bf5225e47ccdd52d9649ca4e7170507d81f2473956ac22adc8f42b 34,refs/heads/master,7d15f031907935bb2581e8aa7f5736c82211b819,b43b867b14183dc99438505f4a2f6d967433879e,a2230e0a2b286eccf55a5f4f0d3c044da9da6a42,,True,True,True,32,47,694,3,True,35,Tests_passed,14e5d341d6015e940e80bfb4033e74c539204bfd8762c3dfe50b5910233706f9,True,Tests_passed,473b318d1410cd1723de39cb75b529e2b8ddf1ce2f22b8633bca164addbad19d,True,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,0c71ba2489659ea2187d5722983d125f0d980f2cb75a46cf3fb1dba7d1dbf173,Merge_failed,08d609882ce87ae5e06044ccbfb4fd0d35cc8b4113748107778e5d0a842c781f,Merge_failed,5415ef63472c19c0a928c8366921728b06e32da8299d9be04511aff0d5f00df8,Merge_failed,d03f93589fd9cd9d49cbb9bdd7ebd95dd2576386afcb01f5f7d6a572aaf1366b,Merge_failed,08d609882ce87ae5e06044ccbfb4fd0d35cc8b4113748107778e5d0a842c781f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,cc9fb77ba4ad24b43b6e8b06525f5ffb93c21e8b863d99d46ae3169de876fc07,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,51ef901b52a4a512ffc4f222652d7d4e8df7178719620191e5175948ed3fe37f,Merge_failed,1f6e8c59eb7fbefa92f759d944750d33acc6612a436ffb53c0c6f69854a9da6f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,b1dbcbd5c9b3937a01315fc53ee907a46b5bbccfc21aae4ddc47902963aaf22a,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f,Merge_failed,55aa7579ebf54d7bde756d8af578b99c9fa509a0436774f7cbfbc0d8b85b934f diff --git a/results/reaper/merges_tested/splunk/splunk-library-javalogging.csv b/results/reaper/merges_tested/splunk/splunk-library-javalogging.csv index 0304ed6e9f..9a6e21b770 100644 --- a/results/reaper/merges_tested/splunk/splunk-library-javalogging.csv +++ b/results/reaper/merges_tested/splunk/splunk-library-javalogging.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,f7bf37732d5d097c791341d348ef6e4ec67722ef,7319aa987d781b5ddb907feb22c7a635d994cbc8,82c4a568341449828699a6877e9221d9cb772bd0,,True,True,True,27.0,179,998.0,2,True,27,Tests_passed,fa3b9a1fdf2a2df1a7fc15bcdae0368daada85b4cd7125e40175b15c1041c371,True,Tests_passed,ed93738ff2901a1c51683a26509e73ea560c3e58a918718eb864bb13e0ddda09,True,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,0334064e64f0b8184c2552a2617fc54301f74af60518403c4730d110576e856c,Merge_failed,1330f95baf31e157d8119d457350993f1c47c61d80aa2525097e745b4cb609d7,Merge_failed,c8ce2411b66b85a96826311fe8c3ea00c58dcb3ab56d34fd9466acb6aa47e4ca,Merge_failed,29d0080fc79a9dc28cdc6dece74647d6015a188af103e8fbf39ab2c6153fb241,Merge_failed,1330f95baf31e157d8119d457350993f1c47c61d80aa2525097e745b4cb609d7,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,ec53f1628671d44f9bc5db66df3a66a5784b033119df738d2ec78cd2440804a5,Merge_failed,c8ce2411b66b85a96826311fe8c3ea00c58dcb3ab56d34fd9466acb6aa47e4ca,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171,Merge_failed,35fce208abd39548ac54ce7b41bcc26cbf0fc898d46bb4e0249972f564ce9171 13,refs/heads/main,eaabf143fcd981acedad944e96014590671bc8c5,f4c5d7d45b0dc154b2a4f2fedc4b02d0248767c9,256fc35520f005d938eda5b4bfb960c280a51580,,True,True,True,19.0,129,739.0,4,True,19,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,True,Tests_passed,47ca92145bf0073c74bb275215ae8322a50b96b68f71364744aaf45bb9d643e2,True,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,b93c6032e11261f6c0e61a6a80e8c3bff5d8b15a85c656d422b42af14ebed0e2,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906,Tests_passed,d35d93099cb3d66a2c7c072ae2fc475dc6a342f8d3e1a27ea1f08cbc7487b906 15,refs/heads/main,d54c807b85871cf89f4eb6d252111bb671a0bf23,84e48fcc43984335dfc10ad7218d5a0a657df063,cd9bf61563086f87332484698affa5b909c3c179,,True,False,True,14.0,43,214.0,2,True,14,Tests_passed,7bb4d0f5319c622775cefd9193462806548fc866838508bc3adea66a30f3e5f5,True,Tests_passed,51c45730318841ea304ab1152d20d04d2fd0279339c29173c2a8b7daf00e04e0,True,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,9a57bc604b8159181f91c2aa3a70640ff4c893aae532840763da12df5d23b548,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,Tests_passed,dd7470f1c537437abf734ec34341fce5599358d75f9b96f50b2ae34a8be15f61,Merge_failed,aa3239732b466a4801211c1310de28976aea187ac27cb669d3697e3b58bd64fd,Tests_passed,b24eed2aa4f54f7e3b3b2bfcafd16ad02d1806265513f9fd60adcb75386ebc4f,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,4edbe111466c420c885253c10d85406ce811d2f35f02a82c7fa10fdff6269b3b,Tests_passed,dd7470f1c537437abf734ec34341fce5599358d75f9b96f50b2ae34a8be15f61,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8,Merge_failed,5574aecc97423160148abe987fda715c1dd93873f93ebfd4d24d80d24b0c7ce8 diff --git a/results/reaper/merges_tested/spotify/elasticsearch-index-window.csv b/results/reaper/merges_tested/spotify/elasticsearch-index-window.csv index 4a90dacf66..4fc93ed35d 100644 --- a/results/reaper/merges_tested/spotify/elasticsearch-index-window.csv +++ b/results/reaper/merges_tested/spotify/elasticsearch-index-window.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/es_1.2.2/master,32d09a063be531c17ea178ffd24c1d250b560e80,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,ccf1d21762244db2a4231715da4fbfee4a0f2306,,True,True,True,3,14,68,2,True,3,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,True,Tests_passed,b598a96eaeee7daeb50b1158a49626dc8ec0dda0c7855797644849dfda7515f1,True,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_failed,18531d744b7a41919618935f086d96557c2f92f50d8530759b4e8deb309a5615,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Merge_failed,886fd8605f4a93a09f9dfcba10290f02c1ce8e9c45958afd0a3f1f8bdd7ab3fe,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9,Tests_passed,d486127eda543f6b4b2e41f1942164ba284311c26b7efea8f61dc721722b04c9 2,refs/remotes/origin/es_1.2.2/master,5b3824bf910dc1fea1654f85fcc9c9c694b5b93c,01403e3fac4280f520171b57f441e624fba56eba,99d232bbebac7a4908a39c6f25eab4724c25909c,,True,True,True,9,23,336,2,True,9,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,True,Tests_passed,aabdbee5663ef6d5d6fd58beab4440c83ac6981f9dda3b163cccdc454f784b1f,True,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,7b8e7bba28c23857da3a10602d58a594a718162ac91df404c9474c9500f0c04e,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,7b8e7bba28c23857da3a10602d58a594a718162ac91df404c9474c9500f0c04e,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b,Tests_passed,2f71ba4e533edb298d0f45f9613f4d0ce3ca3b5b1c5e57358921d1c990bde29b 4,refs/remotes/origin/es_1.2.2/master,634335d9919069b9e58e38c23d82b2661251d787,c704ee65869330622a1459bed83874fd11515054,0dc5c8b1e324b092b5810e32d312880e7d4d3194,,True,True,True,4,15,50,3,True,4,Tests_passed,71b0da4069b384fb4ef135d1ce4e2456b08e402a946300fb1ab369fb9c69aba2,True,Tests_passed,7d0c17294d85070440ee05041755123516df10d0620c82cc7be992766256b1c1,True,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,8ac371bb747849ac12ffa28fa42705fd1d5628f47016c609c0f3954e86e60eba,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,8ac371bb747849ac12ffa28fa42705fd1d5628f47016c609c0f3954e86e60eba,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f,Tests_passed,b919ac5d973dd9766cfdcc421f4dd43beb17a8082718cc610a5751fefbed535f diff --git a/results/reaper/merges_tested/spotify/ffwd-java.csv b/results/reaper/merges_tested/spotify/ffwd-java.csv index 717e9bf132..d3597f45cd 100644 --- a/results/reaper/merges_tested/spotify/ffwd-java.csv +++ b/results/reaper/merges_tested/spotify/ffwd-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 72,refs/heads/master,f03fcf1bdf4070e224e56d26eb0d2da20d71bb9d,a66a58f4683f76cd189f7c976497b8d3b568722e,34934670b4760870bc03ee52ea80fc3ea32815c3,,True,True,True,38,104,821,9,True,38,Tests_passed,8bd78f5802142070f576f5c30820424e9920556bb69a1bab3d14c15d80624163,True,Tests_passed,a67c13e0249d404dfb9d623d7289f385a2bae35904eb4996f27cdd7bb257d2f6,True,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,1173d04ad56ce84febc9f6c85ef948093742d8de804fc44365362947f3a3e075,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e,Tests_passed,dbaba0c22818ce705eb9adcc41e8e9f495bca55896d31c029ef2ba8a4e7f457e diff --git a/results/reaper/merges_tested/spotify/hdfs2cass.csv b/results/reaper/merges_tested/spotify/hdfs2cass.csv index 8ead9cd28a..6dabe3db60 100644 --- a/results/reaper/merges_tested/spotify/hdfs2cass.csv +++ b/results/reaper/merges_tested/spotify/hdfs2cass.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,d9ccc2bac7fe1bbb5a690b6a95ab80eac4e0fa36,7a757f461ac3132b81d96d92b7a033ca7c05bb45,f3a003a8385c087bbe4b372cfc5b3443696c2167,,True,True,True,11,48,214,3,True,12,Tests_passed,55a8f0595daccbea9e464f212df864dc7c8becab629047ad413ee8045a6a75e5,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,True,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_failed,c52724fec2478112b1e9835c831cbe4e8ef1bf59fceca0d627263bde5e860dc3,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,3f7b9d656eea62cfa31ce8ca81041304702297ffd4f367ab4303999cd6f3d343,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,e4f7e2f950385f36b2473df6b4718557c2edf5982d505317257f363288b198cb,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77,Tests_passed,f65d2780922669c52a06963e35698005590d6f0c4b9b2c7f2fd944bbbd4f4f77 diff --git a/results/reaper/merges_tested/spotify/netty-zmtp.csv b/results/reaper/merges_tested/spotify/netty-zmtp.csv index 635ab42245..243a612e8e 100644 --- a/results/reaper/merges_tested/spotify/netty-zmtp.csv +++ b/results/reaper/merges_tested/spotify/netty-zmtp.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cb6e3fe690f29ece9fb8ac166218227c6017fe4f,2c6761f2ba7fee6e481ba5c4959cf1ebda37f208,b5532900553f804307b5b973c52be2da51c892e6,,True,True,Tests_passed,cd278632d6cdac79965bc60616bcc70802d5a728be1a026bd267e8e3140bc503,True,93,126,11777,9,True,Tests_passed,b14e185aa6d175b15e69f325239ea96c5a00dc5653e1862d98cd0a17d5863aaa,True,94,True,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,cd0bcef0352eff452e6a8445ed8c0d04e1ba086027f1251becb5b089b1df30d9,Merge_failed,5d010612d0a28bcd1efa957cb74233bfd600da79900067a1b69546aa6e9ae137,Merge_failed,595bb3dee6eae816b95e2c7f5b5d289db9d664cadd77999372892beb3d5222a9,Merge_failed,595bb3dee6eae816b95e2c7f5b5d289db9d664cadd77999372892beb3d5222a9,Merge_failed,5d010612d0a28bcd1efa957cb74233bfd600da79900067a1b69546aa6e9ae137,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,d21bffb70bc91e66e957f6bd7a84786ed2c25bd3099b70a2e1ffa740d597dffb,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079,Merge_failed,8819a5372a4e751e5dc7475b4d6f5c9482483f8410d93efb1864184f716c8079 21,refs/remotes/origin/pull/12,8d02651ebcbfc80ea17699b5547176248b2635c7,7effbc621510cc26959f25d09d5857b663f46550,21fd8022c592b2c294c77090c16654ebb493a1be,,True,True,Tests_passed,cdc535f07b4716c09bc13a1e68c7f375a89c65152118382a129bef76c574b480,True,32,227,3832,13,True,Tests_passed,6770f99f75ba645ec74aceb050a396d4616d279fb694a65a6e5f48b59d7728d1,True,32,True,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,3c624374762e5c56605311228d7e31ccdbc83fcfdb1532c7f5cbe48dff4cc6d0,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c1bcd0ccb245361dbbf8ee9a3ebc490211535c0334c19c08271b805e20294e44,Merge_failed,b4a4bccec9561164c8e3031b3b677278fa90153b3b9e7883900200d320a650a5,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,0e4d6cc76c23b2ee0928e2f93abf52c3c07a7cb87037f3a30b312e52cf451783,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,98bcbe0b64033339527739dddb816772ceb797fc6ccaa432bc21c4b6810365de,Merge_failed,af239688169eecb371acf08c33975da268ce0fcb37d701f4539a48bb5d514d55,Merge_failed,e72dbe5a38a74a11fb950f7ed0853d8dad669ba15f5bad9a29dcf3e004316d1e,Merge_failed,d27e4624c0bfeb83e4c767db993f2b55336606250a102c4b02f83643f4587edc,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,d1230be418df261204b814cce3340ebb8f9d43f1ecef081973c8b5e643477047,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd,Merge_failed,c0f0a38a744a75070328c61d5774cd0a20a6cb0b7b75476796f73ce9cc0269fd diff --git a/results/reaper/merges_tested/spoutcraft/legacylauncher.csv b/results/reaper/merges_tested/spoutcraft/legacylauncher.csv index 33f8080f42..983ea43f75 100644 --- a/results/reaper/merges_tested/spoutcraft/legacylauncher.csv +++ b/results/reaper/merges_tested/spoutcraft/legacylauncher.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,f9e908c1bb0aeee99c390de2f0a47ae11fe83b7a,1bef15d9c1f7353f5b0a9468f7f40f5677cfafc7,0d6aa1e1d8826e2033771b88b4ef12bfbd61efbb,,True,True,True,5,16,207,2,True,5,Tests_passed,721d3d7c4c19d15641d337c22f1ec433386c8c65692c15ca3817ec804ef42d66,True,Tests_passed,51f5185da67ce77be9c9902f3fea5dc9b86ef4bf909c83de0305a443b361ab44,True,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_failed,78f86d7e8c2c4cd6875d7a1d6c9ff501de9d4c84cb03a7a80ec517ad37a2fb02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02,Tests_passed,68f1eca69e21a99738e08567ac92975e0fd481f92c7cb71c7dc28fecae288f02 18,refs/heads/master,143fbc91db93fa38c442809de8d9e708ab9cec15,4381af6344a34eb9d80cfd6bd240bd705378bb49,03b1c8b0b5d754dec8045de19914bbbdbb2c72d6,,True,True,True,13,56,208,2,True,13,Tests_passed,41014b43cd20791300aef5e28d331d037839d86cd3779617a172c06bd5121495,True,Tests_passed,d6ecb107a68eebf0b7b1f8bdd4408ed50d4d15163546ed28524785c22441be59,True,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,2a5cfc954ba9737728449985be775a21bc6fe55396be735441fb5ceab132de52,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,2a5cfc954ba9737728449985be775a21bc6fe55396be735441fb5ceab132de52,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4,Tests_passed,cd5e91ca87e43da7164026d9682af809c896813382ce13d5034376762495a0b4 23,refs/heads/master,3999072ba8ae7e5c51a5620baacf1611c27f6a0b,866a8fc0179f55821dfb9dd4569e3bf863c541e0,be7273680c415e0ea68d6dbf223ad29174951fb0,,True,True,True,7,20,87,2,True,7,Tests_passed,a4fca68c7a0cf9cd028c4d748032cc239c20d5e481d607937a2b8271b7cca10c,True,Tests_passed,f43766fddce793bc6d1dcbd1435253c8d361b9dac10bdb3c8b7113d4bb31ef58,True,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,e6c517c9408ad795d9e530af0ea8596a3f491f194b065eb4f8eb13f61dd477df,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,e6c517c9408ad795d9e530af0ea8596a3f491f194b065eb4f8eb13f61dd477df,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e,Tests_passed,4fdb00c8cc653746960d4ffdedb0ff3eef6ff28d7f8f0a036ec844df0d81c84e diff --git a/results/reaper/merges_tested/spring-projects/spring-guice.csv b/results/reaper/merges_tested/spring-projects/spring-guice.csv index e63bf0283b..c8660d5fa4 100644 --- a/results/reaper/merges_tested/spring-projects/spring-guice.csv +++ b/results/reaper/merges_tested/spring-projects/spring-guice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/pull/6,3cf16afb341868108e4b2bfd50dd6b80dec1880d,097a86e4a2005206aaa0701657afda65a1730265,1002284360c3ead3989c89d8f185aaf6f48943a0,,True,True,Tests_passed,56a38d7ee159e751444d30b9cc5609a7a3f9f1435d9876c5a5aecbbeadf819bb,True,17,75,623,3,True,Tests_passed,7912f0e692e80a35cf51a88f0b816e71118aada0a890a6532833c1f54707ef2e,True,17,True,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,e4a89858995b5b3a0cca4ca6b1ae482a530a7cf48a4e693d704d5c0b308e78b4,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,0bd07d848d5b3f7f544c2858dfc163cb1823c17e13c5cc51534378f24d6b7ad7,Merge_failed,c9323937d26a378aa8cc006bcd465b27b616f950af15b45e36d543de3d04e7d8,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,a8058652de2332aea9e8bf1dce7b372e1bd97991ed9211aeac7ab607b593ffb8,Tests_failed,b4ea50518c011a80788ee11f2b93a9e5f44ed9467fe1394281c0dbdfdbe1fe92,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Tests_passed,c626fbf347434a47fada505c971bdbdc155fd36d45e2ff5fcab07778a9dec26d,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b,Merge_failed,f98465cfc66f6d600c0cfa2be18fafd961ab5d3384ca734256b0eb8c7a202d5b diff --git a/results/reaper/merges_tested/sps/pushover4j.csv b/results/reaper/merges_tested/sps/pushover4j.csv index 4f6ba77506..df6ace495f 100644 --- a/results/reaper/merges_tested/sps/pushover4j.csv +++ b/results/reaper/merges_tested/sps/pushover4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/11,88cd636fabef766f358a3a81d802a07e940a5ceb,552d38a52a74750342db1341dc0547a23b0e66ba,edd25b58e3dc39bb01e3305f27ca4b8841be38bc,,True,True,True,11,50,472,3,True,11,Tests_passed,b4f52aecc8c8b4fc911d293c0dd059d1d5858ed74989b9c4ac929ada6d258925,True,Tests_passed,9dff968a536cc3c242a52f95638c895f20bd63963f3634f3a71ecbc153a12e1f,True,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,88b3416928043aa47e2a5c150fcf201f1dce9446019ac61bda65c3f8df11a457,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Tests_failed,148074370ea7c0cb0c848de2c7a4c303cefe7f1baa29a8025fae8300d22226a5,Merge_failed,354a93293985288afaa1d78509531c382fdf155a3397a4b14c36ddfb1a0c882f,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,fc2e171fd95a34e3693e149d01f51bc8a2ce5bcfef00a79cd57c023c35e389d6,Merge_failed,5097b4a9fa3660ae406222febe0e0a231c7dd0cdce72b3e7959dbfa00ab42c90,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,539793119299ed372b47d2f2b6e35f5a0272bb2050d2a68a7a7a7e3f5bfb99d3,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e,Merge_failed,c8005fc6ce3b91719fc2a33fbc1a417145caa9afd634b04a6b358edc7aaa3f1e diff --git a/results/reaper/merges_tested/spullara/cli-parser.csv b/results/reaper/merges_tested/spullara/cli-parser.csv index 62f92ef730..6bbbf0b7d9 100644 --- a/results/reaper/merges_tested/spullara/cli-parser.csv +++ b/results/reaper/merges_tested/spullara/cli-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,a22d6462c8282339109510d2f810bc07fc09444c,2abb7cf0c7d114c33a521485910696d24f1e7ccb,7eac8a0be58bbcf8bfd82c64ec0a8c3f2fd572fe,,True,True,Tests_passed,e51d6970040173af365bfe572f4f8a1bba650f21b06e9d2b205e6c74d0fb25ae,True,5,9,42,2,True,Tests_passed,1ee40283cef307e10d83bbf2db9fbe41d5acf38cf19480bf77a70403792e4cbf,True,5,True,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_failed,b055054fa3520eb2951cffadfb2bb2c85b9de4aecab54da87e55537e9e6617d3,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,13a94fb3ebf79cf679e978347d792606415065eb7c1922ff1603535f6a21063c,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576,Tests_passed,c143d00192e6b473a062932ecf4f2775446d33b6dd70d785950793fbd21cc576 7,refs/heads/master,5c50a599331413cf2f88915bec7aa35761861ebb,06f5ab6147cc2b8674677d42e7e6e33896b7b8e5,90dc1ef6b896073565831fd33312e5254b5e02fd,,True,True,Tests_passed,28159fa1e3b500579f2b30b721ac71e30c52b3eb15ee00f4d504236ce900d671,True,8,25,200,2,True,Tests_passed,f561d5db64539fbe4f04052c9e35d9b6657be0d8b5ae0b971aeb84c564ef810e,True,8,True,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,b8882a3ed83b50288407c64199cafcc696dc66d645bf13e65107dd52f3667d3e,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,b8882a3ed83b50288407c64199cafcc696dc66d645bf13e65107dd52f3667d3e,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2,Tests_passed,853eabb83bd26d3b8a1268fb589c4ae9b7cd29ff867a3aef5eb3bff713ce27c2 11,refs/heads/master,d9275478266689c863a48898e019c6e13eb5680e,f02304ecce920e119913a893881bc9bca43ef7de,6bb1296cea485751ff0da629866de0bc896077cb,,True,True,Tests_passed,208b6cc9c12d408afdbb83b93c7578be282da6951b9a5bf7807ed37f991e4996,True,3,8,51,2,True,Tests_passed,acaa5b6103b8170063061e6215fb3921c7ab32d59e994c40b8857177bba4abac,True,3,True,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,dd0c6de8ebb78fc119dca32576094d7fd173139086dd0945809666f8b8d84900,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,dd0c6de8ebb78fc119dca32576094d7fd173139086dd0945809666f8b8d84900,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,2e97d0d81c186de00c1b9eed3f8c708a61ada7bb6d20e6598fe4bc03b89639a9,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2,Tests_passed,d37b2ec3dae4709f901a471b4868a841cc8f6ae69e36b126383d26cef76467a2 diff --git a/results/reaper/merges_tested/spullara/java-future-jdk8.csv b/results/reaper/merges_tested/spullara/java-future-jdk8.csv index 998269bf68..2015eec998 100644 --- a/results/reaper/merges_tested/spullara/java-future-jdk8.csv +++ b/results/reaper/merges_tested/spullara/java-future-jdk8.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/remotes/origin/jdk7,0e8ce31ebd03ba223dda4339601f61b8ffd53ace,fa524323c0baa78224724f5cf3fc4871a4648e80,5f9ff75e9c4894e2cacaea19d87c5bdf5c00e23e,,True,False,Tests_passed,4e2a131c64eecbe0fb8936dab27bc856c2d180a28970affe87098d716d216a4e,True,5,31,79,3,True,Tests_passed,e057cba81f411c057ee988a51ecb046e23141ccaf9248c9af781b108d2187ad4,True,5,True,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,7478d12b713baa2dd4a01bdd2797d17b7eafb83406a7422ab3061b90d7c8b62c,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Tests_failed,0e9a1df776432dd054498f89cd8ed2d1d4154ffec691886425d0a26f95c9fdda,Tests_passed,aa9b8fcc385dd0eda2dab73325f43bfd1632874a9d739df2c28e72265408fcaa,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,648b4903b1c92e2d7a9ec67e7e317a2fd5907fdeb9c2e8ff3746157e36b9b8e8,Tests_passed,79f4ff6e2f04fe77f97fbc4fe37eb8d64cb36362cc96e11398a530f5e80a177d,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf,Merge_failed,4285534ee82a6c82ae93cbcfcb0578470d5d09a560fa57fc6cda244391b368bf diff --git a/results/reaper/merges_tested/square/burst.csv b/results/reaper/merges_tested/square/burst.csv index d1ae0a6050..93c0ce4c9a 100644 --- a/results/reaper/merges_tested/square/burst.csv +++ b/results/reaper/merges_tested/square/burst.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 32,refs/heads/master,08629234e54b58a5477fe85f3cb7ddc115e343db,dc83bd281d0fefd7638b8a4228d810221a1b0a0c,ee3143a23bc1ea3c1cf2a5d2c150ed3ffac08e35,,True,True,True,4,20,104,2,True,4,Tests_passed,72d1bb911712919c24acd89d7729cdbad18a9ca0311c4f6b410c32aa72affbde,True,Tests_passed,20adda77977d15c38744d88224b928144162215bd388c8c934d97b45adafa5fc,True,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_failed,e7c3b03e714a82a52d1efb13c23371b4850a1e20bc34a07e75dca6f46b112f9b,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,8360309a824e207a67b76a091b8ddb64f52627ad6a95bdd51994a5710fdfdb6c,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7,Tests_passed,d33c4a1af05d1133134fa5af73e57122801004f655f9de9cff49996bf61f5af7 diff --git a/results/reaper/merges_tested/square/javapoet.csv b/results/reaper/merges_tested/square/javapoet.csv index 43ec4e9227..275da561f1 100644 --- a/results/reaper/merges_tested/square/javapoet.csv +++ b/results/reaper/merges_tested/square/javapoet.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 85,refs/heads/master,a6c9a7dd9433138c81ea40cb8f06009f0486d614,325ebb43e08bb3b7675e33ff44a0da775e3560da,19e1b4e3f253a3169853863199c932f36c5b6584,,True,True,True,7,12,75,2,True,7,Tests_passed,8c66b5a3b890eb88bd06b64f35002e2eecae5aefe3bdfc7ca0bbcba5b105adc8,True,Tests_passed,ccf2d89aff1333e5b248fbc0659ed47e058b522f5edc30a1a479c60167bb4c16,True,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,9537c534776be0ad2aacc8021d13ad60fa0dbf7c04c2e8df34786f54ae1de8ed,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,9537c534776be0ad2aacc8021d13ad60fa0dbf7c04c2e8df34786f54ae1de8ed,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507,Tests_passed,27388aed23f29cd7ed72af03e4e41d55e2d3e9247d5362bbbbdc613b6949e507 295,refs/heads/master,270570874f5b8697768d5fc4e1fd20964387cd45,e66d8ba46f82eaa4bd1842dfa8fcfb5fe1d2ead1,84da75698782a506b2c6a6594e183591575f87ad,,True,True,True,3,9,51,2,True,3,Tests_passed,2be8d763726898300fb962972f9d1508fe4adb0856960131a184dfcd77bdac0c,True,Tests_passed,6d4cc9d590ec4d75875b3c95bf2c71b359c9eac3468f965e831a87504a66580b,True,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,4c8511131804d5d01e8334e770d49717eb5bcd0a6ff1703fce0615517bfe22ae,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,4c8511131804d5d01e8334e770d49717eb5bcd0a6ff1703fce0615517bfe22ae,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677,Tests_passed,f9cf74e139938af1ad0c1510de3dddc5e9098a35631e9eed02a490947dbc6677 297,refs/heads/master,c0f4a89bc087d186bf05ee86ae9de4c12ff17130,98f792d249948ae559f7ef99a84fedeb6c799f11,35c59c5a2d7d03ef42726712bf28c53c665e8c1c,,True,True,True,5,56,375,3,True,5,Tests_passed,6a7687f7dec647c2b1d2db0e290e61fc7c06557351e4edff583211cdc0a8fa2e,True,Tests_passed,d33729cc5789140f90cf784553452e2a183d82278dc3ff43176ca98987527412,True,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,f554a5df723a21c1767148327659c588cf3d1eded1abf5dfc7abc3fc6fd38600,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,f554a5df723a21c1767148327659c588cf3d1eded1abf5dfc7abc3fc6fd38600,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f,Tests_passed,21dc949975f70e9ff51f0fb1684139c510c1cb5adb352aff32c3925d3b17666f diff --git a/results/reaper/merges_tested/srdc/ontmalizer.csv b/results/reaper/merges_tested/srdc/ontmalizer.csv index a2cc4a593d..976ed63de9 100644 --- a/results/reaper/merges_tested/srdc/ontmalizer.csv +++ b/results/reaper/merges_tested/srdc/ontmalizer.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 11,refs/heads/master,b20eed45e9a12168948f7c951699f7d2533356e9,92303866bd71e360416678e98c895e8f49dfb0d5,535e8c7861e8f22b042f46f624e5551a85bbde9b,,True,True,True,3,9,38,2,True,3,Tests_passed,e9a250ca003f14fbfe09bf418f5b6bde5499f78658d501b59f29eebd25631b09,True,Tests_passed,40a96c12c202781df45badc26d0df7644d9cfee73b84a7518f09d9f3597c3a32,True,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,68e9acddc8aee71f1464905c03a799458ca8429b48d9126593f89314aabefe45,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,dfeac60162acde909fa0bef9829877c563e1d723854af7fd2969f07aacb45161,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c,Tests_passed,35d158f9e251523bb648cff1a2477ae60168bf4a348fdee4faa2ab967c6a2e5c diff --git a/results/reaper/merges_tested/srt/asterisk-java.csv b/results/reaper/merges_tested/srt/asterisk-java.csv index eef60e9c4f..35d4bf4694 100644 --- a/results/reaper/merges_tested/srt/asterisk-java.csv +++ b/results/reaper/merges_tested/srt/asterisk-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 213,refs/heads/master,d051cefe929eeba446139b2480f4e6006502d896,5273f26cd083822e05ed63cc91e26ad6acee85be,fa6da8b9be4642c1d3b32c40498c7dfc00168331,,True,True,True,22.0,215,3913,8,True,23,Tests_passed,a797604d7c46fdae42ed0d7f9fe97dd42456b339579e74e2617f56dfa715882f,True,Tests_passed,e0360943d0b5c1294606cbbb66bc45cafaaf0e47d254bcfca182b33fb7898f7e,True,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,9f2a0dc9a619ce730404f44f352f11cabc348dfc6eda03063079ab292fcd5778,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,7694e977abc83a68882e5658dbf352cd8f0bc6870a3c542403231d1c105e8821,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,dfd5260d3565d546b519c40bfd6e9882a52fab43d349a0e16cfc8568794e26d0,Merge_failed,533ada6043112008393398e187a95a1cea8ec4eea4c59e4b94ae3f77314a3bb3,Merge_failed,f802eefcd5a92ecbd741a152eff7850d2b80541ba51b9c81b2b352d8458bded8,Merge_failed,6dc3606936f11d91340f14619ad08dcf2c5be32d40675a8388dd28aff19607d6,Merge_failed,533ada6043112008393398e187a95a1cea8ec4eea4c59e4b94ae3f77314a3bb3,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,7694e977abc83a68882e5658dbf352cd8f0bc6870a3c542403231d1c105e8821,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,a1ef6afc086e72211dd401257d7daba1d0c044b5e86953ed8f846d7aa1586ec4,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,ed96c56dfd531a755616e6b4fadddfe083585f87bb0105357f32d2649f6a695e,Merge_failed,f802eefcd5a92ecbd741a152eff7850d2b80541ba51b9c81b2b352d8458bded8,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,9f2a0dc9a619ce730404f44f352f11cabc348dfc6eda03063079ab292fcd5778,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808,Merge_failed,d4a0e53a4b63913d9c52a0ce30982be8481cd6a843bfa552be33576ec7d65808 246,refs/heads/master,a4b27137cc92af086da78fdfb634a441cb07e1d0,d99448f4a1021ad00bc2d75899852f6216cb62ed,93cdc9400b591aa3696bb2c07da548985123feb3,,True,True,True,217.0,1043,12580,4,True,217,Tests_passed,834ad6bf4657505b30c60af9cbb4c03fb4587ba30e7219bfe9dd98f15f78690d,True,Tests_passed,1f2e983d86b24afdbff5f3f8e08fcd61965a41351ef0040d23d3eadda256a9f1,True,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,3b6246c1ba273090daf815ef99b7a09f54168ac10337e5a3af2001ca9e0a89fc,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,bfec755b7828093274620c70023065911184c651fd4318081f6f90989c4e80f5,Merge_failed,2bc5141faa3c32dbcf446c03b7e010b82786ed6895101618d0a96e05c238c01a,Merge_failed,e516650bf5cd722187967e8e46d053fbc3ef6e265538e858dd6b49c01781d690,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,c84db5d22928a935aaedf4faae944b97341e0017cf8c4518bbae0492d4ea032e,Merge_failed,d16ba4cc69d555a78cfa5a3dd4b16b1f82472e75d64b893b98b6c1cf385444bd,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,6818b9bfc520133403fd2f1fc6207a63fbac655187d42280abb5a3c13d4fca73,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131,Merge_failed,42ac145431e181463e83b7833ab002385c89f762a4206a0bbaa5e01a289a8131 257,refs/heads/master,2131fda1860f47da7d05dd3d494922e7d90b2ab3,352b3bfd5907ed0433f46bf3fe06dcaf5c928a38,97c3fe3f49a0912ca95b6d3d7ccb297150f53e76,,True,True,True,117.0,303,3413,9,True,117,Tests_passed,87473ba36413f3fc52740887c305936db15f13612b3576f22594113a714fb1d9,True,Tests_passed,91ad0772100461b15216af64bc278010e60271253fc41428764dae7f757dfee2,True,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,1625721b8941d28e30c9f7e6f2be6dfb4ab2663a2d12bc18d0ffa0b653afbe4f,Merge_failed,fdb94b51f8bfa01b78eecbece6732d8335e520598128ed15bcc9c64264caac4f,Merge_failed,7f644f672881f3e17250f2f903259596cfe45ab537c57a922ff96049580d13a9,Merge_failed,50ed30ced28fa160090b44249de331f3358f721b2ea3df593332e365a68ee19c,Merge_failed,fdb94b51f8bfa01b78eecbece6732d8335e520598128ed15bcc9c64264caac4f,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,0657618bd3a6e2e8d3cd99bfe2204dd8fd621c1b845073d2b5413686828ee0cf,Merge_failed,7f644f672881f3e17250f2f903259596cfe45ab537c57a922ff96049580d13a9,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,a7b1651409e8909dbdffac25c3614023cc9ad522a83b37c781ec86671c632ca2,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0,Merge_failed,f8b72d37eb5022dd8a2d35752aea223a554e899f80289160aaaffa3838c7a0b0 diff --git a/results/reaper/merges_tested/sstrickx/yahoofinance-api.csv b/results/reaper/merges_tested/sstrickx/yahoofinance-api.csv index e70ae49a3b..4ddfd2c674 100644 --- a/results/reaper/merges_tested/sstrickx/yahoofinance-api.csv +++ b/results/reaper/merges_tested/sstrickx/yahoofinance-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 57,refs/remotes/origin/pull/177,105dbce94577989bfa366066c80d02b4be55cfee,cac7eed9b46ac8871831ff37d8bef4cadea3f0d3,2df2e65e84e36ee71abd8d1e5e2a07284eff3086,,True,True,True,6,17,126,3,True,6,Tests_passed,06933f95f324ab6a01b6a80836001a2d86ceb7039990548552f0486cb0eb5374,True,Tests_passed,7d45890047f12f07314fee4a3543d193b2681466c209866949d890c4eaa87af8,True,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,fc3c327328d0a20bb647413e62fc7042d7fef7c82a4ffe6ad253d4de9d3bbbc6,Merge_failed,bbbeb90ed9ce7b6f06bad09b7fcc5b914640dbc7e3289cb961e43ec6b3866008,Tests_passed,a1fb78293057f69bacb4cfd9f9c7aa11bd9a3a2cbf111328f53c6d88b0f3bf39,Merge_failed,0debeb3f38b28cf919949fccc4289e6c61369343c99dbb3c5b44cfc64a4953f0,Merge_failed,bbbeb90ed9ce7b6f06bad09b7fcc5b914640dbc7e3289cb961e43ec6b3866008,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,ce70fb8aa002df92e0273d74a7bd1f7e1fa6d996f2e3a7bc5b414674c7f34e69,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,b4d81384112ea756006e48be835239e554ab5ae30ef0c97e52dee2b355b5fece,Tests_passed,a1fb78293057f69bacb4cfd9f9c7aa11bd9a3a2cbf111328f53c6d88b0f3bf39,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff,Merge_failed,0a58711af8535ca06c1853053872a121c5ffa2d358eeaa20b408bc4866875eff 59,refs/remotes/origin/pull/177,c56607f37b486c62e41828b51ac752381d2974a3,1ad6c0d50ee724a2102cb3771ffe1fa93b4f5764,f06a1c19bed4df9b6ca31df7d293ac3ae7691a9c,,True,True,True,7,25,138,2,True,7,Tests_passed,96e2cbbf850b49e779ba8187bf989dfe7f02efd2bb12f8baa65231db43ac54cc,True,Tests_passed,46c1136d45572937624c8f0c9a04adbb3a80360652f02d07e764534d3bbad1f4,True,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_failed,af391b0548740e152582afef509fee2f55bdd212463161e121bb3c30228e4ce3,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,55575181119ea0e665f82af39681a70abfd0b55aa5a689c200edbd8ce884ad61,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,adab53bde0a737325a92dae266b03ecfe2e35839a83005fa558d57d01d60e42c,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a,Tests_passed,bdff3ae3efaac9b32989ebc7396bf6189806a26acf0f77fa71fabe452557c67a 64,refs/remotes/origin/pull/179,216ad700706d88020b9a9f8529f023327700320f,7dbc9be62a1d9cfb80c08c1442cad3e0c165d822,f4d60cc41ad61637b8a179598c474487339b852d,,True,True,True,9,40,301,2,True,9,Tests_passed,d53e14af08e6a3646bf43a495645d2fea68a4b6597bf738903f1121c0f6ea055,True,Tests_passed,508983b6287aec8b2a578a902128afbaed934ae5ab21c9ee27495a212657535d,True,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,f3c435a6ac6ddbe2238b317c64e833c0dec78fdc0440b48fc76ac7ad81eaaa22,Tests_failed,f9de5c7e1fd1709c722d5c02d710c9daf0fbc809b3c2c5d87373d3cf5b6126dc,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,f3c435a6ac6ddbe2238b317c64e833c0dec78fdc0440b48fc76ac7ad81eaaa22,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6,Tests_failed,221d0e3297840138261b4cce5a63173261ff361601d4b2e32b2c3edb8f2f9fc6 diff --git a/results/reaper/merges_tested/stackforge/monasca-common.csv b/results/reaper/merges_tested/stackforge/monasca-common.csv index b49d622c82..4a0e58b39c 100644 --- a/results/reaper/merges_tested/stackforge/monasca-common.csv +++ b/results/reaper/merges_tested/stackforge/monasca-common.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 114,refs/heads/master,856542f7e63ab0de3f7dcd4c6428ae30210a4ee0,f45ef6a540ca83b78fa11330201eeaed529b70d1,d832aeed98ccae4a192c61d24513b358f7837f69,,True,True,True,8,33,94,2,True,8,Tests_passed,14a6d00455b889e908fd0aeb80b1591b99e2e3668493ec2954be193e809dcc96,True,Tests_passed,62be44340c23642979c33b417de7f5cc9a0315cb1a054ba735e2c2211aac638c,True,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,d952900c125f7b29f4c1c7ce21f77cb1b74784e32b14c6a6b2e96db7cb3eb75f,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047,Tests_passed,c2937abf5f321cbb7a13d0876c984c31a53be0d9b837cbdb9cc210082ff41047 diff --git a/results/reaper/merges_tested/stapler/stapler.csv b/results/reaper/merges_tested/stapler/stapler.csv index 27a6889450..ecbba481b8 100644 --- a/results/reaper/merges_tested/stapler/stapler.csv +++ b/results/reaper/merges_tested/stapler/stapler.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,e4c10835694bc8f5db30ffa1c15c50469c60acd8,93a11d2d52296fb4b622a61baa26c1d7a6a84fc1,a9519c27c7c26e92706ae40f03a75ba002e21f6f,,True,True,True,27,75,391.0,2,True,27,Tests_passed,105ec030e9c33296de9002d165d8cc09c95586fa5b615f81613af28af71929af,True,Tests_passed,50730b41fe09bb9bc597bdd89773766c895275de7426d87f7cf97850ae4af7d0,True,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Merge_timedout,,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,d929dda042d3a6aded76651ce3a77a942b71f68b6528ab01eaf785c884696d3f,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80,Tests_passed,9f6dd9d32e2580fe4c11c774f3102af775ff53581d6d509447419b335a746e80 57,refs/heads/master,81fbe28f9ae423dd16875f0efa768a7130b04575,6bb635895e7c27b96873ed711549a42c6a50ff65,a458b705aa1e88a129b76de719c823dce91b72f4,,True,True,True,44,137,385.0,2,True,44,Tests_passed,1c5370ba464ce19d1d38923c812a603968496a95eab1c01fbab237a9e8aa6b21,True,Tests_passed,52245b79eee217aa26eb5f252c949b58fc283c6bc3de35acbd739caf564d7660,True,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,20f19cce80bf119501063f2fe67bca5585c9477070178c2e0055951eabf50066,Tests_failed,43bf365ac15ba8bd9346d9e44d604407cbaf3e626e7d51b270a066feece7801b,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,20f19cce80bf119501063f2fe67bca5585c9477070178c2e0055951eabf50066,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58,Tests_passed,1c4d6c779a10eee81d6296a9ddae45a07e3193fbad7a3d1e611a7ce68ea4fb58 63,refs/heads/master,b7b6502611c4fa5a8921f486b1d1646ee9c515c8,c32f9659033756f188d8d84664b15bef217c7cd4,8c0c83f98c413167126c1f87a2185f481808dcd6,,True,True,True,14,33,85.0,2,True,14,Tests_passed,2899bfbe9aa23f613cc9078e34348490b227a4d92aa036fc4e1396fff8af8927,True,Tests_passed,d05642ba15f3a93e5a30990a645b4367bf136ac2232895decf62dfb56597ce17,True,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,5b97ea73293d076a266ace7e80f9843274c8907241dc7604ebffbb3221286bd3,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,5b97ea73293d076a266ace7e80f9843274c8907241dc7604ebffbb3221286bd3,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37,Tests_passed,bcdfbd2a0692f88428cdc85d15c2039aeb1009363d8dd64f2188ce4a8e3a4b37 diff --git a/results/reaper/merges_tested/statefulj/statefulj.csv b/results/reaper/merges_tested/statefulj/statefulj.csv index 04387a8ec8..fb3c36eff9 100644 --- a/results/reaper/merges_tested/statefulj/statefulj.csv +++ b/results/reaper/merges_tested/statefulj/statefulj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,04a51e8f65b0c1d909e035b63f77a12578cf0611,2fd1ec4bc04c51134b4d8f9be03713bf41cf47ef,68f69b76111e99a70e13b00fcc186531eb2cbdcf,,True,False,True,3,5,37,2,True,3,Tests_passed,7780dbed8659d784b31a924e4d8eecbe72642a1f2ea88080f7fee7f04b3efa45,True,Tests_passed,8ab6c1b017b3ebd08f66fb343f3f7cef463c4a3e4ccfc91d3d6616e30e5a59f4,True,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_failed,b69946fc3c71375276ef0ce2a0f15c2eacfeda5e464390c40938422ed3500536,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,b50f1a4862e8b4b88752b88fca1659803802bf347a726b96ffdf0888d80b50ce,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,ee45c83abceedf0a31a94235c1ad317d34edafd4f2ad937588a5cbc6d42477c1,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec,Tests_passed,f3de732c10b4118724054ee1b1d5c1151d76fe7a5a2d145fcdfa5b7b5c7f31ec diff --git a/results/reaper/merges_tested/stealthly/xml-avro.csv b/results/reaper/merges_tested/stealthly/xml-avro.csv index 642fdfa858..9ecc5d89b5 100644 --- a/results/reaper/merges_tested/stealthly/xml-avro.csv +++ b/results/reaper/merges_tested/stealthly/xml-avro.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,4459180f2931d596524621a3b388e756cc4a22e9,d0868a18ab93de4462f37343af37b1c448431958,41fa7820085f7a1b2c1fccb8bb65d1bbb0d4fa93,,True,True,Tests_passed,afcb3c36b18d285467c3bde9f18283be752fe8c1c627a90fa7d5cb38cb5b09dc,True,5,25,77,4,True,Tests_passed,6b88d04e18ef20ddd964f81a4fafb07c894e88ffe99a90d6a6ebba6ada256b6b,True,5,True,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,4e9f48a4503fcc91c2e516e5ec986b104da3162ce509c3360185a9cb9ca1c716,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,86919f951feb17b4b8623737cc1e03fd6d5228d7b2e9e319f73019cab6759e20,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,81dcc0745ba212e9d08bc6c5a82060bfb5afd58d73e7918562982c92daba7aec,Merge_failed,35bf85436622ce6f3065d41cbb4a99c6edfef6af9c73a1ab9169cb82db500828,Merge_failed,c4277c21d9933cf828a04fdca394375f26c5e6e1b4770bab81f5da24d8a4957c,Merge_failed,be5f9bd0991b5ee1668562df8f2a4fc586a43edf156a04522996b7d8cccef81e,Merge_failed,35bf85436622ce6f3065d41cbb4a99c6edfef6af9c73a1ab9169cb82db500828,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,86919f951feb17b4b8623737cc1e03fd6d5228d7b2e9e319f73019cab6759e20,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,dcf48b896cc0d32e02dcff99e2ebb534ca6f5d698008d23dfe314983bc964c07,Merge_failed,c4277c21d9933cf828a04fdca394375f26c5e6e1b4770bab81f5da24d8a4957c,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,4e9f48a4503fcc91c2e516e5ec986b104da3162ce509c3360185a9cb9ca1c716,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f,Merge_failed,8a1c91299cfc1e11a4661fc9ce7b65b7598a4c3c11ac596aff1d6616a6213e5f 7,refs/heads/master,4cadd7d11f80af746499bcba731b0559642e621e,ac3bea4c04b2d23c845194634ab600d700989a37,9b30127c7477a4977b3a01198b06a334a229691e,,True,True,Tests_passed,c01c9bd493a0bec33888edebebf8a2960416874d5cb5995fe54506a1d48e6f74,True,7,14,151,4,True,Tests_passed,504469fcf40bd00d054cea9564f90575d4bf1fbce2e62023b5f75a8675a1490d,True,7,True,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,119972bf8169046c548d0a6183dac2b0493162bac86d18621963c2c4d9739a4e,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed,Tests_passed,e42c53cfe5f68fe9a135202b640ad5007bf049e81e80b8b6360c284c231697ed 10,refs/heads/master,feac27fac88bcbc7a1161e18bc15e63c3a3e4949,ad0d1a9a2158e4482248099acfb658fc31a86af3,12fd7407f9ac7f9d1fbfe6c2dcec035f9811152c,,True,True,Tests_passed,011873e7a02d53140f053d5ad8ee60ed39943ae479e90d38b205573fffc4908c,True,4,11,110,2,True,Tests_passed,6ef5e5008f1df1eeeaa3e1249a6dd074bbf3d3ea2c1e0e5d75ae160fa1a340cd,True,4,True,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,73abb852763082d0a6fc0dd9966782a8f13f6316696850c07f123021ce1c5a15,Tests_failed,461c9118f33baa8dd3e7d8c661545226df39ed09d3940d5469756cfac0f81c74,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,73abb852763082d0a6fc0dd9966782a8f13f6316696850c07f123021ce1c5a15,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8,Tests_passed,b594be623c653b46c43341048d3bdb48950b313a542779a96069f53799b832e8 diff --git a/results/reaper/merges_tested/stefanhendriks/dune2themaker4j.csv b/results/reaper/merges_tested/stefanhendriks/dune2themaker4j.csv index e1475f5d14..7711ab5d6f 100644 --- a/results/reaper/merges_tested/stefanhendriks/dune2themaker4j.csv +++ b/results/reaper/merges_tested/stefanhendriks/dune2themaker4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,8426f1fdc3f2eb6556747ed43b0e222c18609cf4,840f47146f6f489d8a505cc11ac1e512dbd8568f,dfa8b828c94b016577870380a09501516c78d17e,,True,True,True,16,58,699,2,True,16,Tests_passed,a2cea90b1110718f8bc327e77c03a6a087da9807860a131ea03b514821e40712,True,Tests_passed,4bf82fab00f13633cc4d6e8e4ee891ec15c63199ad8e2f75a8bce04be6870c70,True,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,1720b37c6c3bc6f70c57cb450684d13c448153badaf09de7397075ea8200e59c,Tests_failed,438ad1103760105cf368e7f1aae5733a61d25801f756f495612be0993c328570,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,1720b37c6c3bc6f70c57cb450684d13c448153badaf09de7397075ea8200e59c,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4,Tests_passed,05fdfa92547f6f38471e05e6d4723a367c00063f80ea0b8f2c88910462c87ec4 6,refs/heads/master,fa32851fce4806699ba6828e72e145fd0107837b,90456df635b83ac37be5033d96e119f530546d5e,846229488ab051e5265797975731d9cd8ae212ad,,True,True,True,61,236,1808,3,True,61,Tests_passed,bc6e14b3e17641792dbbbd6ef8e66a86acdbab4678d16b7996d5eb9e3db49848,True,Tests_passed,57cc38753454497d67a6657a342c1c0cc4b2865738524f4c2fbc3a52174cc3ab,True,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,7857064672993b15305d334f2dea2d4651a31402a9e971bce36bc46dd8aa531a,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Tests_failed,3289f320d7fa69a2f3c161d0f59485dc6f8d04e55dc1ad60fc790b880c906df3,Merge_failed,71d894c02c686adc2c6ff105893237a9e5a6d856a786c8f1d91826eb3aa23c5e,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,89fb0782f5470d1644316e9d7d3487c35faee1f9d23ee5077c2ff85dfa5bc4d9,Merge_failed,d3061c3e58ed8bdcb0ec7d8485b335f5d36b59af29b468365567baa81bc5f6da,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78,Merge_failed,45c91d774526a5e9cf018f29d8f6c35541e72fd96ab78e4a1ef43e2b8a33ad78 diff --git a/results/reaper/merges_tested/stephenc/high-scale-lib.csv b/results/reaper/merges_tested/stephenc/high-scale-lib.csv index c2d6fcaa41..8b128651ab 100644 --- a/results/reaper/merges_tested/stephenc/high-scale-lib.csv +++ b/results/reaper/merges_tested/stephenc/high-scale-lib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2d63f18a07e62c62e5e72666a35d36bacbe95798,a8867cd95e0131f8c2fd9c757c6550d2e3a5aaba,634dceae3ff00fc9ae1b533dc77e5e53f969817e,,True,True,Tests_passed,a7ec06cd2c0def7c6c313ab0a02b06ba721613f829754576fb694db950fc9de3,True,30,65,696,206,True,Tests_passed,dfc44ff8513b67e1bad86a919a8cdcf6d11563b2fa4d18ccc57d4ea75e4f5c71,True,230,True,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,ddc604ba3d70cd1dadf956a0b6c0e32ae41d17776553654d45fec9bc32164e40,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,2b351ca15081d3a8b7ae16c58d7507bff86483185b3c7d5776b8ea963619394f,Merge_failed,1603069cf0e47cb88b1263ecf0e840e996678a9db83b3b1b8b9ee85597c0b06c,Merge_failed,2746ec8c1fae9a03398db4e747e3ff85f18e2a44571d4f390a380f1b6e8cbcad,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,9065c29a2172ae33102b985608c1164f15a45dd957f37cfdc1dadc9722d7a97f,Merge_failed,e4eb2ce5c35bb70b634b7bafb809e2d18c7dfeb0532bd3216ef8e9eb12ce5e7c,Merge_failed,56fa4711ac756afa44154cffa884adc906068f40c5055da418efe256caa4ff9f,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a,Merge_failed,52bbd93713f3c7192f0b6bf52069cca8fc3a4ac6e4f954265acdb134fb61e59a 5,refs/heads/master,ec85ecfa8178b3c3d0d6da35144c2230adcb7c6b,59c7b863b410edea5a43498c851c13a4c519d36d,7ac5bed87d157f4bbc808165e16e95b4bb85974d,,True,True,Tests_passed,1bfb57051a2ef143aac676ad0ac894c52d9638b10f5b4d08522cfef55486a4cd,True,26,35,823,207,True,Tests_passed,ae0958f7da679d69b1ee701de4cfeaa3e3d6ddc3bc9293ffe617764fc2f338a1,True,230,True,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,10791a80d092c0aca2509d0af09d6eda0041c06eb891cf64b143fbfd3a188918,Merge_failed,d12a3aadef2fadc5f59d114afd6e2cd756d272b4398a99dacde9bf2b8e64f535,Merge_failed,7aee608b74778bf3b80e2a8e1a1eeb140d861587579188727793dd56564514ba,Merge_failed,af89533bd800c7e1fe69417f5d09283f7f775ffa6c9690ce327a81ad10ed840f,Merge_failed,d12a3aadef2fadc5f59d114afd6e2cd756d272b4398a99dacde9bf2b8e64f535,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,add0c0a43c116a69d5bcd51fabdd62bc6b1bc8ed339dbdcab62780df630b56ef,Merge_failed,6f2750e5ba69e2bd6a21df3fe9f70d4cb823cca7270b5992767b13115823f6ad,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7,Merge_failed,6efeaebfe8b65663762861e5a1cbd4ea00c38b78c2a5fa7c224ef3bd6b38fea7 7,refs/heads/master,c907304364b47bb9e246fe608cabaecaab110576,240830a93ffd5ca811403f490365d81fc0dee781,3fba09a7d6b12d2e3693778614bec5e2dc5f38b2,,True,True,Tests_passed,0b8e6853e47b9ca5f2f17a86de3c4f3fade9b241a604dadb6e5dd73b13b9ad5e,True,36,147,2497,189,True,Tests_passed,cd8472f5281b7b5fafcadcece97627bba5a64c3b1399da13f33f1be32edb9df7,True,224,True,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,e6e85e4e389d47642053a392555fccb9afae5b04ecb7f82bfc2dc375e3f31c61,Merge_failed,83678a38bed7b855f6796c2139dd8e2a5acbf7dc842a1b5686eb22cff5a4f2db,Merge_failed,0fe43f21a45c44b9edef0594641c969fb77228d99724903e8f1330e55bd874ba,Merge_failed,0fe43f21a45c44b9edef0594641c969fb77228d99724903e8f1330e55bd874ba,Merge_failed,83678a38bed7b855f6796c2139dd8e2a5acbf7dc842a1b5686eb22cff5a4f2db,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,1c8bd86ca7ca9637bb16e923dfd8ebe42bc3be8320a38cd73a451a2c72e2da84,Merge_failed,9263b4030a2db30b0f1ceb25ef76c6255ec536cfc540ca7871b1b5a1decb0970,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc,Merge_failed,3d7f9d50ba9b675e91facd91e2ee4bf36e11fb2c8d13da8182891d344d6b1cfc diff --git a/results/reaper/merges_tested/stephenc/java-iso-tools.csv b/results/reaper/merges_tested/stephenc/java-iso-tools.csv index 617ea54fe5..ccef2a0bad 100644 --- a/results/reaper/merges_tested/stephenc/java-iso-tools.csv +++ b/results/reaper/merges_tested/stephenc/java-iso-tools.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/main,abb37e3cfda2f2774f128d2a4f8299b4d721b452,f1d38f9cb55dfda2daa2fdcc17450748d48e5b69,e19d5289c8764302aa3b53fabaf9b1d03742d5d6,,True,True,True,32,106,695,3,True,32,Tests_passed,cf6ee7b8f349e6091661786faf71744a24ed828424573aeafeabfa71d8b7e581,True,Tests_passed,1b211d7188d7dcec5f00c10c2e40047a2281ccfbb5ead8a303a1bde7b9958485,True,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,9c05a984098a3fa0c4e2e3708454523f67e30cfdea032124e45d9768abef6dc4,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,1ce65bf3b92d87f0970e31767226b6d380ccf770e44d6d78699b5abea3ed1836,Merge_failed,39090be796b7e9f4e9af7e1fb31d77f2c8b90eac258bd864e4810ca38e42fcc1,Merge_failed,90579d366750a46004317eb60c5021d3396ada24176563400369dd77fa34989d,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,dbfe9b393650cf1481a7b95e2795304760acf58e1b5c561bedb8f5f11ea8634d,Merge_failed,83c7bb83693783cc548ee3edda5ac9f8ac361e1cb22ed160d05920fe2de0978c,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,c803d5746dc47224e84493a542e7ebd8c823cf82edfd3f7c4bb7cb97dfb9829f,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00,Merge_failed,3199dc6616957a5f4ee33890c0975db7c24ff12846549c8227ce4d56f8522c00 diff --git a/results/reaper/merges_tested/steveice10/mcprotocollib.csv b/results/reaper/merges_tested/steveice10/mcprotocollib.csv index 42987893b0..5c14efc54a 100644 --- a/results/reaper/merges_tested/steveice10/mcprotocollib.csv +++ b/results/reaper/merges_tested/steveice10/mcprotocollib.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,8b5631f78529bbdcc859bcf819b236e2c286e16f,b767a94417ee3392b2e294548b1cabcefe87acbd,a52397949ef05aa9794a917204b63fdaaf21cf83,,True,True,True,44,94,299,4,True,44,Tests_passed,dcc6e8158452a56028131478c553b1c70f0bd0e543e8ff5086ce2ea991998774,True,Tests_passed,055bb2eb391f1ff9ae3a72a6d483e67caca8a3bc1b818854ab88cc810265a9e0,True,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,c2c33ff53d4d2b00aff0bda887d3d1164c9758d7a764bd286d1ad1563f683123,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,c2c33ff53d4d2b00aff0bda887d3d1164c9758d7a764bd286d1ad1563f683123,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d,Tests_passed,2d9969eab322d891b6df77dc62a0e65458b1f576c2d5fcd6aa8c63c33faf9c3d 8,refs/heads/master,b767a94417ee3392b2e294548b1cabcefe87acbd,8008081eed651c5d131aa8cb8c28ad89f38f84f8,60547d54fd5b67a596183cfc4198c462ca750331,,True,True,True,114,205,4776,7,True,114,Tests_passed,786067b1b87560448b48381cb3de6cd8709ff884543515a8e1045fbed9c0384f,True,Tests_passed,71f6aa461df2a0f9bb14fe5082d0f661bdf308d76eabf2820a40c0c1ca0895ca,True,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,8da3bba42c4d90ccc50597afd9b81a37c6f98f3c2c3e347aa8ea4182070c5e21,Merge_failed,7a41f1f5c1218d46c2fbb0da509bf2b8de83c74f7134a02f5626c2decdeb9fac,Merge_failed,48f2679419779d18f63b0e45b7e1a0aef5f6837121d4d6c89efadce9e7b687f3,Tests_failed,c4c3f74f58e388f1ced874d436920ba04e1f383e4150fc14aa4bb30a43912b81,Merge_failed,7a41f1f5c1218d46c2fbb0da509bf2b8de83c74f7134a02f5626c2decdeb9fac,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,21176b04b764a30594beb3d3a47eae9d362641374dd23e61b17e5260ca942fc6,Merge_failed,48f2679419779d18f63b0e45b7e1a0aef5f6837121d4d6c89efadce9e7b687f3,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71,Merge_failed,fa01ddac2a98a0ea88e9db8ed50a21aefa3f89cf02e82e69be82a6665dd2ac71 10,refs/heads/master,3bc9926a38425d608c601e301bb3f89c9668ab2c,867e5e2bb66c3e6e8d9c3dc399a35895e694dedd,70b0fa1bd42c28c3d7db886a92e613709dc9e1e2,,True,True,True,94,167,4731,2,True,94,Tests_passed,c1558ad1373c3fc08d98049053cf01a8439697807d9ff02fc875350be252d74d,True,Tests_passed,a728992cfb951923482349028db085684dcd462d860812168c5c0e18a3c9c55d,True,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,0fe75b1272ca6195cbf405d21c5d99b11ead8969d41a4dfa26e5d9b7846280d2,Tests_failed,639c83b25032d4fe88db3c7e3e0ec3529680200b6f6641ba65268d2b541b79d5,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,0fe75b1272ca6195cbf405d21c5d99b11ead8969d41a4dfa26e5d9b7846280d2,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d,Tests_passed,96b8bdfb03aa00c3ea171db6a8a2255206c185622a1116557d86e9e0aeaff05d diff --git a/results/reaper/merges_tested/steveice10/packetlib.csv b/results/reaper/merges_tested/steveice10/packetlib.csv index 3ac57bc581..445c872281 100644 --- a/results/reaper/merges_tested/steveice10/packetlib.csv +++ b/results/reaper/merges_tested/steveice10/packetlib.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/remotes/origin/pull/38,6fe86c063737c0d01d8ee7a1df92a887d4aab3fb,ccfb1aa94d25e4ad4fad52755d59fb88b10fd71c,9d4b476d200d07177db68256846441e177f18501,,True,True,True,19,68,825,4,True,19,Tests_passed,848143eb085b2a346571ac07c520751d038dd51a215c71fcc965017adda17cec,True,Tests_passed,b28d8e5bdf21eff371ed29bcace91a020365145edbec7b8771883239faef8882,True,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,3a1a009e8872c83a1f3ce36c0e879cac9f50a22ef25cb139664f872ccece206b,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,dcd91a4473e7271afaaa56d6c852942ef5ffd97c1c0a90ff45a6346c507587c9,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,02532e122397c343653ba8a366d3a7e38d5ddce4f4bf2ff10b8c8e5def20d681,Merge_failed,cd6024681578b1a2c5f09a8504652f6f48ef236f697843b205b8ff3a22ea9fda,Merge_failed,0a53ea84df467b9753a0f2c636409bb55a77846274306837e7cbbc26dc46628f,Tests_failed,aa5bfca88c8943e457fc97ef7c842aa89419e4398b4eeaf12ac3b0fa64288e26,Merge_failed,cd6024681578b1a2c5f09a8504652f6f48ef236f697843b205b8ff3a22ea9fda,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,dcd91a4473e7271afaaa56d6c852942ef5ffd97c1c0a90ff45a6346c507587c9,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,2a8523f385ce77137845c653471c3b1cc957ef423e70c3af8943b303e4129d18,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,ca5e67155faff226c55967dbca5d39c18367874efaf5ef0f330ec70afcfb81fd,Merge_failed,0a53ea84df467b9753a0f2c636409bb55a77846274306837e7cbbc26dc46628f,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,3a1a009e8872c83a1f3ce36c0e879cac9f50a22ef25cb139664f872ccece206b,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76,Merge_failed,24f8317ded4ca40df63d627196eb5741959215f7263aa603c11c57a8bc0f8e76 13,refs/remotes/origin/pull/38,295cf3e47add5dd28970797dbf371a7afde444b3,75e3b5a85416dfd0f0ca7e9a8eced4cca810810d,0b7557069e3f8a7ab42caccf5b0a9fed7a7b6028,,True,True,True,8,18,571,2,True,8,Tests_passed,913cb9b9fa839697f26e14177e9a166fe63bf50986f065a9daf5e30ad90c625f,True,Tests_passed,f3b747ed50cb104aaa357420855a6955e9f034a1f452a4c2f119a96018c8b5dc,True,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,6d66af17c2528a95cb003fe3633867bf5b0212cb645093f8b91b8d389a8256de,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Tests_failed,3bd1246f6b80fcf1cb7dbc845f6902e6ccf5d38702b9a516850bfcf53453a414,Merge_failed,20b49b592a47331424ae33598268adac3bee5374c10a3a873e40af5ba59f253c,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,f855097dac92189650393d15e7e4e0b8555604d5d15784c9d00b03e89715cb1f,Tests_failed,530f0dc4b5176d9ff7f8c33efeb325600925c3f31ab454f4327986a81ab36a4f,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d,Merge_failed,81a2880adef759a641edf7dd4a999af116819c3e81d2bf9a1c167d2f3e1e039d diff --git a/results/reaper/merges_tested/stevespringett/dependency-check-sonar-plugin.csv b/results/reaper/merges_tested/stevespringett/dependency-check-sonar-plugin.csv index 346f3cded3..b9d54bfab2 100644 --- a/results/reaper/merges_tested/stevespringett/dependency-check-sonar-plugin.csv +++ b/results/reaper/merges_tested/stevespringett/dependency-check-sonar-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,f0032e903f332c22e4beb65b317edcafb7fdf2cf,0fbbfe26315c8cff715b08c614670989901aeefc,801282bd403a83d7c7bbf8fa83dc4ad6b6f5bbc0,,True,True,Tests_passed,656f067fa50cd57bcf73058e6d9882cddaf19c9271e07f1072e7423058fff067,True,26,145,913,7,True,Tests_passed,5adc31a7914b605c1fe722fe4946e32f8e984b5514d83c3f2fb748e8ca09fdb7,True,26,True,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,fa20fee3761b10f0e67468fd9e2b8248dbbc1cb864565157f745495e0c9146a9,Merge_failed,4804daad8b3a66539c0e0745ddbb9eb01ab0d17fbf77168a37d5ea2f77964b35,Merge_failed,c0a829b882794d0c66091e6f70d72008932485bac83706c6d132fea435fc20d8,Merge_failed,6cbf698a4dece8d578f2e9af856bb898b366f364fd7dd618aa4f3cc2a9f48b4a,Merge_failed,4804daad8b3a66539c0e0745ddbb9eb01ab0d17fbf77168a37d5ea2f77964b35,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,2763151a248858c02f9d6776f097bb8a009c44d5f435cb3100bc3a070043ca87,Merge_failed,c0a829b882794d0c66091e6f70d72008932485bac83706c6d132fea435fc20d8,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,e3e96b9ba479d8bcb28d986dc52f64ced74de32924a5ea82c439af267a9e1c52,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623,Merge_failed,4f4c577e29d7cf9b69e837553c53282feb3de73d4ac4078afa6a3a681c823623 45,refs/heads/master,b3cbcd1d5b0a89d5651398bc0afd9bf04b204183,64e5a244761eb7c11334ee42d9b6f5b734b202bf,64a20550b8633495a6442fdbbbb3b562fd7b6b73,,True,True,Tests_passed,c1b23d5024b473a4add1e2d3edee58616407786d2c1ef6ef339644e4ef7cc861,True,24,126,788,3,True,Tests_passed,76ead37b6f8e0f9dd7baed602b49fb6a0552487afc863e9bb1637d3b96eb15da,True,24,True,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,65a2acfb2f0c042363f3f5918ba8a792443ebf8165042e3fb44e44d936056bed,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Tests_failed,fc5fc2c2c1b15d8bd7d3a83d2070b89187d39587d707b06819a392851f7612a1,Tests_passed,55eed69b2a9d7f1e95853bcc3bbcfecb21c77b794a1fd89cedbdac514063fdbf,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,b7567b3094d964fd1dbf037eb9b9cba88b2b3fb39131cdcbe283d158851ed5a1,Tests_passed,8531a04f2edc8c7ebafb8e32aaf9934c7746c95da43038c807b264c5f4a6f335,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Tests_passed,44d17e941b37bdab32e165f03d57a76ad6fc945454801ff0a7488dfa11203319,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7,Merge_failed,6064d2a6af3fc26deb5833d8a4cde6b0211841965601a6d9b4b56e23ffa4e0c7 50,refs/heads/master,4860447c5040360d0bbfa21c8da9f0eefb60b8d8,2e980f513612eacce7a5a9b89303cb4947b52720,342ada025b42c92395b314eb7e3a3d9a9c6e8409,,True,True,Tests_passed,0683fd35defb0479bf68eefdade5398df8c6099a581d36371779bb4736fad8c6,True,16,41,134,3,True,Tests_passed,87d8480289fa29d565c4b7de440676e7af019773700b8b4ca4a54dcd5cd5b4ec,True,16,True,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,f6fc1f69a748a1947c765af8271db104a2d18b4fb32e524c2e8aace066f04414,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,f6fc1f69a748a1947c765af8271db104a2d18b4fb32e524c2e8aace066f04414,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63,Tests_passed,4240f420a54b8d62b43d4a77ab3f01ba721cb691627edba602fe6dbe9fd1fd63 diff --git a/results/reaper/merges_tested/stoicflame/enunciate.csv b/results/reaper/merges_tested/stoicflame/enunciate.csv index c203f191e1..f54b17d661 100644 --- a/results/reaper/merges_tested/stoicflame/enunciate.csv +++ b/results/reaper/merges_tested/stoicflame/enunciate.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 151,refs/remotes/origin/pull/1191,46949ae95bd07a25a0c66af8bd4e523ae21009d0,e5132c25ec1e98c91c9527d5b8e33ba4a5289572,1d6fe66363d73eedf0e9ba1fdb46a2010e752aa7,,True,True,Tests_passed,cd0b8a7ad85ec9c762cbf5bcccc0bb20e235aa8dd5526110672b209085d746d3,True,9,18,1552.0,15,True,Tests_passed,a5fbd41a2b94dacfc242203b7ffd37b4d189c4c01a11acaa9545edd6805d1d5a,True,22,True,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,94221563edf43b1330de689fdff480ccf874ac9774f48a02bb8c68b120d8aaf8,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Tests_failed,7aec0242fe2020399f3860cca7669db3947b1b1584d5543ce68ae4c4eda24c1e,Merge_failed,568297df29a45b0d9da776adf01b7b227cc1c761ac0ab0cc3bd7c22dcf6df45b,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,39b05506380a0906cde745d61b7a7db089540e0c8c38004d0277361ac37fdd9c,Merge_failed,910534bc4c436ec2236359e49b165ac4d30dd2c06efbce834ecb31a72c3fb302,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7,Merge_failed,138e77adef3f0e2a6228778155026ce75fb99052ce0caf9e8af2c3dcd2f689c7 diff --git a/results/reaper/merges_tested/stratehm/stratum-proxy.csv b/results/reaper/merges_tested/stratehm/stratum-proxy.csv index 389ca745f1..9a34077732 100644 --- a/results/reaper/merges_tested/stratehm/stratum-proxy.csv +++ b/results/reaper/merges_tested/stratehm/stratum-proxy.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,8c4102f284113c997d59037ea34224af3ef3b185,992ba71bf1093b04c68d4a938610e26b7d676d91,7fda0004f7456e0f43c7c7ac17945199be7e2290,,True,True,Tests_passed,90bf57f94d28323b9ba153bd612d4791f35508ff1eb2e67d9ee87b8d9a49b69b,True,14,49,651,2,True,Tests_passed,082c6eefd696ab9d39299fbb6eaf55032db2ba8849d81610b76b7ad3e3536d1e,True,14,True,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,23435d687be2fe7c7b632e4da358458039b0d0c00bf8a543076d8e90f67aabc7,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,23435d687be2fe7c7b632e4da358458039b0d0c00bf8a543076d8e90f67aabc7,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01,Tests_passed,d4968cc09770dba83e8a40324782057276a8015d71d4850993ad3b05533a2d01 8,refs/heads/master,185a97668a9fa06017dd079fcebb91ce44fa2ef6,9a9b1254809deb4643c384d8b67485a226781852,c03b71882dba613280d87d11f9377e9b3dde3406,,True,True,Tests_passed,1991d719fd78aa7b9a5778f694c4626934bf650d9406f2512c64cc9468d3f430,True,36,72,10240,2,True,Tests_passed,114c06533c0fe832eebd2da2679cc984368e4702995bf1ef02a468a87b985f32,True,36,True,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,7b38f35b0c64308f82602ff86fa2726ba4900a3785eed28fe3d512a85508e128,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077,Tests_passed,a9cb97114e9a0923b3fce1570c189366d2ba3791ac3b5a950304807590775077 9,refs/heads/master,3d9c994eece6a6a6ccf078915a9d6910c45b2f03,3fd5355bd4c07a05267725f0e00666f35f741388,63b33eb55d283001972542ea87b2c67a0235e60a,,True,True,Tests_passed,c652865911836fd6f08c345caede665dcb77b47c7b19f1adcb67e0ce5eb82c51,True,31,74,8826,5,True,Tests_passed,d11b4e43aa177597722b106f1c84f1afdc670630108825cfc9566689208a5e3d,True,31,True,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,03db79b9c7f278577ec591661402fb4b9b7fca35ea3e25a413ddf38467acf58b,Merge_failed,be7d65f4c309e64c80e2fd87c84e7e4ace5bb24fa352cfec4ae9e87eac3e6c14,Merge_failed,07f14037c86966089cd360e966943dda37d1e2e867fc99b63a3950cc772b5da0,Merge_failed,6f28d4a3892b2bf2d744d0fba7eb6c1c7616dbbc29eec5c87f84ef301ef36a9a,Merge_failed,be7d65f4c309e64c80e2fd87c84e7e4ace5bb24fa352cfec4ae9e87eac3e6c14,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,f69b53533f1fbe1bbbc444e4138a5e3e268c87c63fcb5346cf3a7569a77f6078,Merge_failed,6f9e240b36de19edcf8ad6957aadffc2d4599f413ab2a9bb8616791eb0f449ac,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d,Merge_failed,c3c412c9365dc2529c752458f3dfd33887f99fca8e03455af1683cee7e46421d diff --git a/results/reaper/merges_tested/straup/dogeared-extruder.csv b/results/reaper/merges_tested/straup/dogeared-extruder.csv index aab536418c..1549b21860 100644 --- a/results/reaper/merges_tested/straup/dogeared-extruder.csv +++ b/results/reaper/merges_tested/straup/dogeared-extruder.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/heads/main,9e1591ef45445b96c16a787ed817e71b333c295c,d7748a9ee58f3533bf9eca648fe11baf96d3f0fa,d1d2cbd7e3fda4fcffd32aebe80b9a7f4950fcc6,,True,True,True,13,35,97,5,True,13,Tests_passed,afb54db05a64eda23dc414eb296bf85c5ef3feda7d07bb63e6d1b4cf53f825d0,True,Tests_passed,4871eec25edef1f1af4c46029de144e6f8ae8242a748452592b8ee898b0f360e,True,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,4e9baca37d4e98840cfe2b8a94e55206a210418f168a48bb57bdc502a28e9e2a,Tests_passed,e21d23fcd1b700d388cbd90f636706376a9c334ae75c7e756ce7a8e8daa05a89,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,4e9baca37d4e98840cfe2b8a94e55206a210418f168a48bb57bdc502a28e9e2a,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529,Tests_passed,45b50ff1b4033cee70a4c884d6570f269aa86a43f6f6f65b386ce1e15d9b7529 10,refs/heads/main,0176ca61e4bac5035afc89e56f3063a206c3a660,4f94ff016cdf80bfa4d4484fd90811cccf32a24c,033b2ad62057286ac831cb111a73fb198852794e,,True,True,True,12,57,518,4,True,12,Tests_passed,502193e884edab48b986df72b3bc764320c2e1029eac743334a557e206b73592,True,Tests_passed,cf551a3072e83514947fc3c543d6854819268e726746c374175de33e4aea2bc0,True,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,b2f9d005b4d460d986a0a47b2f4d876c7318fd917056e5c0eb4b2a9aabce7d40,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,e8c402eca4edaf12a977d26fa4871730ceaa2d1fecfdbd05d5b5746ed40d76c3,Merge_failed,b6c30ce5bb58752e230b937dd7b227313973ddd06384c511068f0c2a914dbccc,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,7e67e5cfe2409d39644e35ee5774cccaf3172ede49d6cda90561f01d9aa7f2c1,Merge_failed,46a4261ecc0aecc701a6103a66cdbb0df08e6ba46880604378c84db05c661c93,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,21dd779db7290a6bcd5c34c7a90486db6c96138d2bf795d473aa35723ce46fb4,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28,Merge_failed,c31519a0b204a020d00381a869048bf2d91426eda4b64f9d984931b96005ae28 diff --git a/results/reaper/merges_tested/stripesframework/stripes.csv b/results/reaper/merges_tested/stripesframework/stripes.csv index f0b7f48e36..c91e6daf37 100644 --- a/results/reaper/merges_tested/stripesframework/stripes.csv +++ b/results/reaper/merges_tested/stripesframework/stripes.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,2d7384a930c879ba29b87d3464de2d5807763e4a,74d8ef7c3c30424fca6af159678edf3c312d0a0b,a1ef07de7784fa30b030c310c5be86e25293799e,,True,True,True,337,6006,32922,3,True,337,Tests_passed,9f5556528269e22743f80cf773e53ac0c835c050362c97f0253df0db16f5d549,True,Tests_passed,308c7026258a2e4186b7f5ab891e4ac58d05b1ea0a61fbdaa43846dfe41558d0,True,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,aeeb95c15210762dbcb3f2f38da5dd7e139e2708c5c2e6e0b3a3f2909eb27c1a,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,45a934f626032f480a4024366f9e26aebb4027b5dfd1838b8700add8cd9906e8,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,ff57aaece3f644f0856a6ecda4119bb85b71aaabf84d6bf59a8a9376ed5fc48a,Merge_failed,e0f2e381c38bcde6fe0010d45f33f424a678c3eb6e4ac1c1d84a3a3a066d1d64,Tests_passed,9aec15d562cf90032901551d11d29fae286c92f001d14b030c28b2e35caf2ad3,Merge_timedout,,Merge_failed,e0f2e381c38bcde6fe0010d45f33f424a678c3eb6e4ac1c1d84a3a3a066d1d64,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,45a934f626032f480a4024366f9e26aebb4027b5dfd1838b8700add8cd9906e8,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,f36b90a0bd3d90899852f5beda9489694c6ade01fe4977b762d36f09c52e8f68,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,14ba9a1fa759fbd3d83dce7cf60f67303c6a48f0d4fcd58c27365a0412d302ef,Tests_passed,9aec15d562cf90032901551d11d29fae286c92f001d14b030c28b2e35caf2ad3,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,aeeb95c15210762dbcb3f2f38da5dd7e139e2708c5c2e6e0b3a3f2909eb27c1a,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c,Merge_failed,7616140d0a594bb1e9ce6989f2b9faaa66b821cfd99397fbc5beaf8a05db7c0c 8,refs/heads/master,28a8f08ed74f8c2082076c5b6cb79eed3a111150,61e31c483e62accafb29de9ffef8186870de57a7,a06cb5f3e874c90489f6d7f96eb22fa2546a2411,,True,True,True,32,60,395,2,True,32,Tests_passed,20c6d325506af3209c7697d0e95af238cc1fada4a6ca4e1afd01baff3889c405,True,Tests_passed,6f6fb3639d976afe3c4dd8831fd3acbe894df671b47310088ab0075f9576df97,True,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_failed,412dd7ebce9c0ebc5fc0a65b36704ff4ced3755c5a6eb0a3c746916be03787a6,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,ecaadc90af23e2c12a157e1b771115c459bc5f4d1d2358d6bd9f55e8626a6436,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9,Tests_passed,63db750be8116342ec674c82b3673c7536e9775ca547671e0c56dc651853bbd9 17,refs/heads/master,6259f1ec1d8a7156eb18e010862b43eaba824692,bdc83997aa9cc5774b6e10da63e5a5e5331b2632,5c39159f63128060d297d62332f2d9f176bd3160,,True,True,True,51,131,2311,3,True,51,Tests_passed,56e6c6e1113fe315814976b4166aa19fdb89dde97dad1d0a836c466f7076b22e,True,Tests_passed,f0aacfaf38245b944eab8c3b9a0e96e54cadf420ae2f884629256a8490ee83f1,True,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,1ebc1d07fa3b5dfb7538e9f2a1dfc3b7fcc72212ad9a84db17639aa47c412095,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,1ebc1d07fa3b5dfb7538e9f2a1dfc3b7fcc72212ad9a84db17639aa47c412095,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e,Tests_passed,89f61520aa0480968821267e5b0036feb837d560dbf0a01d811c221f69a0e21e diff --git a/results/reaper/merges_tested/structr/structr.csv b/results/reaper/merges_tested/structr/structr.csv index cf0d38833d..218bfaebc8 100644 --- a/results/reaper/merges_tested/structr/structr.csv +++ b/results/reaper/merges_tested/structr/structr.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 220,refs/heads/main,6fc7c9a53b47fc2815ccf201c3bdcfd41ce40604,e4a61bdb2b0dc86c4ab2e5941d42bcd90f7f3dfe,43de2c909844a3a8be59080e4d3858bbef4696da,,True,True,True,81.0,565,3985.0,3,True,81,Tests_passed,879ad76a33a9111cc49adcd78160d7982225c52fb47e5fa006729cf63e5a30bb,True,Tests_passed,e3432ed84ea1bcc117f09e33907550780b48c106a1861198f8ae26f873a76b3c,True,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,056eff467ff502a7cb0d8ac1c80a634f9a683b68007c5d04f17d4e2f85058e7f,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,6c5e09e263640558fbe39c085f06fe8d6f09b5baf275eef5b8803683e9f744ad,Merge_failed,d22ead3ef7782a230ce1e4234ff9167be107e6216d94ff3e1bad64e3936181e0,Merge_failed,a39bdd6aba5785847bde41480ea4943b8c459f3265ac3a871e6b52302456b6cb,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,b3fda1ddf12ca48d8826637e69cab47e530675b6efebc10512cf1db526f4e05a,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,6f6fa314859bed9893ad0d07e38eb8e029e64c387f376f0aa0e0ccc38ac111e7,Merge_failed,cb706e1550f9fea0ec26a178747983715afd5e1145ddc9bf38d8b75a8654f69c,Merge_failed,2b81d082c3157c22719c1e0d9ac51abf910052ed69dba904926d4aedb0e3104c,Merge_failed,5c83209a2889044494a554f185284477d433057118182657d06e8cdd204eb170,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,61f7e2741f32f2450644e28dd3c9d3916d31659a08d89d74c9dade131f503a3c,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a,Merge_failed,ce7d3f67e8e6eaed9470ea6a31676b9c3f07ffed0e10f2db5cedec4aa27a053a 223,refs/heads/main,3dce42885d3c184a95b670bb56a641781d444fc9,ce1ad23175c5e2672ba580911885ba5c2394adfe,afa586111ff02c9dec4c10a94163b46960f548dd,,True,True,True,51.0,114,372.0,107,True,130,Tests_passed,b12efb9121fa4b88bd1c119dc8eafc788a142a0ab088d0872872413beb563aa8,True,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,True,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_failed,e9763559b48adf250f8e86da5ef50ea32e1d5c3947708a21f57e7878a4151f0a,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c,Tests_passed,26565a15acaf31c46bd13971c747c5a6f98acd615ee195190f8fb83b0c97744c 281,refs/heads/main,5146de000000f34dd0324bd3eeeb199d2556ab34,42dd2cb3ab143baa6ab809a4590bc56efe968eea,4d5a8f894710bae0fd7e674137604ea197230747,,True,True,True,34.0,139,2085.0,2,True,34,Tests_passed,313c66d9fc69bfc1e561fa7a75ed80405004c07b1ca4339653526d4d25ede093,True,Tests_passed,b8f6de336171b28df30f185e1816ed750f0cf569a71c4f0117d8dc72d6633aa7,True,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,53d40c6f80660c528f640f446dd3d19815e33596b44898c375b98784b4260ff4,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,53d40c6f80660c528f640f446dd3d19815e33596b44898c375b98784b4260ff4,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc,Tests_passed,58e95c500b9794c296cb95b1fb4eef50aa13a3fe1743eed44cd51c5b60bcffdc diff --git a/results/reaper/merges_tested/stuartgunter/dropwizard-cassandra.csv b/results/reaper/merges_tested/stuartgunter/dropwizard-cassandra.csv index 054260a730..4b89cad8be 100644 --- a/results/reaper/merges_tested/stuartgunter/dropwizard-cassandra.csv +++ b/results/reaper/merges_tested/stuartgunter/dropwizard-cassandra.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/remotes/origin/pull/24,41f878d01c4d9c8015295cdb67599294ec53d75c,1b66691a6f4f32cc2efb2748087d357277877aeb,3f3ac96ec64bd26c14dc3111f343f87054621fe2,,True,True,True,34,56,1363,5,True,34,Tests_passed,e575dfbb7d65d89c1209175e6f85c6cb8d1a1409dcb4559dde26d4038e774788,True,Tests_passed,c3af472c3d1db1511e290e0ceabaee839e53cf4c361839e20b5333c6d2630bcb,True,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,021a0ee7aba501164086d79dfa960105811f554911aece30c4ad1243ff77a71a,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,22d5ac28a0ce649b0ba23e633d0ea4c74e03f973ef9b10da4dd90686fb677b7c,Merge_failed,571f90c8d10d267c5fc3046eee9deee0d5e55f6534f4bae265be019385300e7c,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,0c1448bd18ac8255265710d8f5078cfc232f96d8e9c83887c2093e37eb6fe213,Tests_passed,bf4b6ed9a30631e4b96cd92872282b45e8b285de681571178362c61e6bce932e,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3,Merge_failed,6f3e7f99db70e54a3effc0caac5a1bfac1cafa853ec8753048e81d8ab4318fc3 diff --git a/results/reaper/merges_tested/sviperll/static-mustache.csv b/results/reaper/merges_tested/sviperll/static-mustache.csv index e443a24c75..f4dfc7e9df 100644 --- a/results/reaper/merges_tested/sviperll/static-mustache.csv +++ b/results/reaper/merges_tested/sviperll/static-mustache.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,271693c779061cde2069af7507b5721c208da8e4,98354a47addf041d851017ae5af25db72d481fa5,85f6735c24b80909fb2cef22a1eb133c7b651f09,,True,True,Tests_passed,fc7abdfc47de3fdbe7c4b5773135afc05e4fe616ea6ed47b66286fe43784ab10,True,41,188,1230,4,True,Tests_passed,5416ff038be468f55ff05f041e8725b6acf330f3dfe928100964b6c05f520a80,True,42,True,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,39c0484515dcb3f813fd9c1f07861d57091775e6cc2e74caa829ff07503aa6e3,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Tests_failed,90d78b93ab6b6bf5957420760f252f6f6d0e30574eac9943535a1c2dac967e3d,Tests_failed,a529f4aacdfad7fc09beb88a22aa21a48be11f5b085a0e70f4d339e9642b6ef5,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,6b8ee1be8877d034fa8d0a04485525a5306053c4b740979aeb923757ef917189,Tests_failed,97e2d9073e2fd318a971619369ef1d5183a1db44f7c472af26c9a4796c83ab5b,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282,Merge_failed,8b5597cfb30a00bbf5cd959fe7e4f7ad44975d2e10ce6e089145ae199cf9b282 diff --git a/results/reaper/merges_tested/swagger-api/swagger-parser.csv b/results/reaper/merges_tested/swagger-api/swagger-parser.csv index 826958e445..8cd51eb100 100644 --- a/results/reaper/merges_tested/swagger-api/swagger-parser.csv +++ b/results/reaper/merges_tested/swagger-api/swagger-parser.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,9c6ec9e5c91fa04147c9e52ad7fabf9bd7caf192,58fe433c6572bb5ca364fed5c568a7d845f6a510,98e8a4e27d42a270b530fe15a3a772334390dd21,,True,False,Tests_passed,20c1799e360412d3fd52574fe812708c804abbab2c00f39925d3948656c3e011,True,2.0,9,76.0,3,True,Tests_passed,af5168a0ef53169f3669daec10cc09c1b5140468b45768ee0929be7dced3c4f6,True,3,True,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,7534add66c8c2ec798b9a78ef0db20a9cec3c251fa2e473c0532bda246a70567,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Tests_failed,325244ec0d1a0a11c79de33da0944bb197762d21f167265a6267d03b551132ee,Merge_failed,86aa5091ebab0585a5c3ea0c40d0f5e37ec7976a2063baf7dd9951aa33011dbc,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,c54f74f01a4cbfc466ba08af744049867040f7a03de74868ae99c2af4897a3e3,Tests_passed,18899ea702fdb91ae909da01057bbd9977d5b485c13c269ae2f360fb37a1588f,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59,Merge_failed,e68bfed896a5763ef182f93cc0340dc9ff278f8820d73837ccb9fc29daec8d59 19,refs/heads/master,a3857500eed34256a0504a36d2451d69cd7e7309,c1dc15727c98685204adc64f2121b0b0c8a0c2cc,08a76302e2501b3465b4febdafca733262a802d7,,True,True,Tests_passed,0993b576fcd9bb82f3b245f8578f4b841269b923d812d334359deb7a0032d68f,True,29.0,121,1159.0,2,True,Tests_passed,fff2d3d67e567212941a8f540d111821df0eb644f002d16a22970cfeb03a3472,True,29,True,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,6d718df58391b4294dc35ca63c5ae0e370b61c08342984bd90c7f37645ecf04a,Tests_failed,8e86d87a408fc100e66d9672d03041cc61e824f7e6ccaafd422033cd0f6d08b8,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,6d718df58391b4294dc35ca63c5ae0e370b61c08342984bd90c7f37645ecf04a,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2,Tests_passed,9d0cd6a5ca5dbf55e2442f92690b920076945b66b593ce03fec6a61d87ffc6a2 27,refs/heads/master,d163a6c5aedd0f6405c3825998b14df8fc3f3f83,bf01547fcd2ec03dca5d1836a4ebde38d3f7dc4a,4e31c7395c779167cec7fd50dd11a6308aee260d,,True,True,Tests_passed,af9aa0a0e9c7efb9cd2dedbd2656cdaa715bcb38e93261d63166644f501a8aab,True,11.0,33,450.0,4,True,Tests_passed,0c7e295ea51526bcd83d22a0ad496b0dea622e1143f5ff7d1f88cde8ad326158,True,11,True,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,fb6644d55e509b5c0a98b017afc65c6ffebe9bdc8ddfd976d5f68b405822e04a,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,de1d2b45e5022c9500509d5ebd48de0db76170d7a018546ec6fb86de97abc57d,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,feafd194cb56435be82ed3bb907d0e66c2a5822c473e1a323d16631c03384a4a,Merge_failed,3f4cd976dfdb8421a0bd5f7fd6015f8866acd1f435310f4a62aa688a67f8f738,Merge_failed,deecdcd6d46fb0cc0d1e6b3fd992f0a1ed4e27f95d932f51ba01c067b6505c6a,Merge_failed,09e25e5f5241b1c33af6a02aec251052caf4b1cb5c44125951e72dab1ca371b7,Merge_failed,52a5a0704d068cbc091216c1ea3e18b10c887824dc32fcb80594d4d92a4440c1,Merge_failed,deecdcd6d46fb0cc0d1e6b3fd992f0a1ed4e27f95d932f51ba01c067b6505c6a,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,de1d2b45e5022c9500509d5ebd48de0db76170d7a018546ec6fb86de97abc57d,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,2058f507a7007d7d8c37a1014de33423f304a18e0243afd6479bdcffe05ce7f4,Merge_failed,feafd194cb56435be82ed3bb907d0e66c2a5822c473e1a323d16631c03384a4a,Merge_failed,1399ce0bf4936d4962ddcacd66db0b91c5227dd3dfb73b456315830daa3d40f9,Merge_failed,09e25e5f5241b1c33af6a02aec251052caf4b1cb5c44125951e72dab1ca371b7,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,fb6644d55e509b5c0a98b017afc65c6ffebe9bdc8ddfd976d5f68b405822e04a,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe,Merge_failed,0774dbd89c1410973a5b3bf141b284742ee4bb98225686c138cd3d7de3b50afe diff --git a/results/reaper/merges_tested/swagger-api/validator-badge.csv b/results/reaper/merges_tested/swagger-api/validator-badge.csv index 2966345f23..2ff14ccb0c 100644 --- a/results/reaper/merges_tested/swagger-api/validator-badge.csv +++ b/results/reaper/merges_tested/swagger-api/validator-badge.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 79,refs/heads/master,4c639d2905ec3696b846c1cb8ca0927bba92cccb,a103b035880a9d19da895504cde07b8f7c5c06ab,003d31acb9a4d4fb58db609f0eb2ad1d6b908b10,,True,True,Tests_passed,289c4c3630601c6af205206c7476db3d77c6f947e1e8c3cdf3f820b674789f59,True,16,21,1054,3,True,Tests_passed,b9ee81f88d3f7caf72d5f8c1b22c26e2143bec6e75e8a6e4098fad028ca5e1db,True,16,True,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,4197390b95cd34f5f584b78a5d3a05bbfa9fb45edf15c63a400f252a5166ab85,Merge_failed,ba5c4fea85e4a56c9e9583010edfcc9d06604c3fbc6f15de2d9391aa5a7f37b0,Merge_failed,676950d8e8ab47452d9d5f610ec7b0b01577bc7aacd59a6a8348362e6c1f33ba,Merge_failed,96cb0bc839384473158b18717daaa7d9c7df6fd90bd3c350f0e751a542ae7b14,Merge_failed,a1735f2e6374786fc216a0c73630014d971a2dedeb01f412e61b39fd5bdd996d,Merge_failed,676950d8e8ab47452d9d5f610ec7b0b01577bc7aacd59a6a8348362e6c1f33ba,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,da743cedff82f7871fd5dc594d6ecee5e22c2bb1e5f40888c8676aa91f7173ff,Merge_failed,4197390b95cd34f5f584b78a5d3a05bbfa9fb45edf15c63a400f252a5166ab85,Merge_failed,83e7405a95d4831d6adb8d283214ac0ca24ffea397754b628b9866bb954aebe1,Merge_failed,974c2601a937cdf897450454149681b0454db2790b2f738d8827ad50a48f5bd4,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,1fc3ecde46b6d70dceec06576b9d342dfba3ccb3aa5f8146136079ee56e34e18,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc,Merge_failed,298d3515513bf24df7d34953df8c7dfdd5a8a8b856753d07d5e867796bc39cbc 97,refs/remotes/origin/pull/20,2adc075f5b157cb6cdd555e4757691aa3a64bccd,7dc4cab9ca327e4717ff60cecd03e816e669cdff,faa0dbe1995a027075ea369c41b369baa9ab7c15,,True,True,Tests_passed,50c8add3df8a2d8df425529ca8ef8758412ea256b517762c667244cf876a96f5,True,9,69,1789,3,True,Tests_passed,c785097acfede3937a05ba66e846c855c1bb74aa94ed974a680e05d1afef20d1,True,9,True,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,95450ef69108b32fad2ceedc780f7b057f5559fd61e6cbaf643261c4e60452a0,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Tests_failed,8ba589c435226f7818b1210ac2fcca4ceb3a28244551786ac4caebaf2e576189,Merge_failed,389f0cc6c77eaaf7ea70997214e03da62852e8d4cd483b056e185c3d4c13167b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,8239064f497e137614f6bd7dfbda3d05e71dd0ea90deb0fb4b25e8296a1f5823,Merge_failed,6caf98cc5402f280afb936cb281309a5f733f59964bdaa3c2ca1b2b9f6c6f9c0,Tests_passed,5e210e77e967148b76b3eba0a4a7148499086dc22480045b853d30863037c2cb,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,c33077871244075ee10a148ac4efc1e670af18f2fc93a1e60f8d703e74e68d8b,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1,Merge_failed,1a5e5c082d0aa40c7a8a83a20b87bc2b7e7bbc56c1a746f9728ad09e9f51cfd1 diff --git a/results/reaper/merges_tested/sylvain-bugat/rundeckmonitor.csv b/results/reaper/merges_tested/sylvain-bugat/rundeckmonitor.csv index d0c716126a..d25089a42e 100644 --- a/results/reaper/merges_tested/sylvain-bugat/rundeckmonitor.csv +++ b/results/reaper/merges_tested/sylvain-bugat/rundeckmonitor.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 41,refs/heads/master,4072a5bef34ba969de10ef3aac0401f487632ab0,3b94c80a8dcb04aaea5b51494afe4d495163c4d3,47dc44315b4dc9e09a3d37384e14a6b536fcca20,,True,False,True,4,14,54,2,True,4,Tests_passed,52d21b457040105f6ed59b54c43f4c86b377194348b308d23e73e9c2e3c11252,True,Tests_passed,dcfef962eecb9455166d77c9a86cadd2f7cfdf2c1f9d53c981e9b4d3adfb898e,True,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,f4a275297e471ebba832afa682766a1af48344ae96e6c938c49b895c32066a82,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,65a1fadcc2d562f54f2ad4b3d9f51c52ed394b96e9393dda727ebbe2bfa36e39,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66,Tests_passed,ce580053dbd6fe941955b620336113d53deee4466e5c8aac39f5744eb2329d66 diff --git a/results/reaper/merges_tested/synbiodex/libsbolj.csv b/results/reaper/merges_tested/synbiodex/libsbolj.csv index 8dc2d5990a..895509ae90 100644 --- a/results/reaper/merges_tested/synbiodex/libsbolj.csv +++ b/results/reaper/merges_tested/synbiodex/libsbolj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,0ceaff01a914de507b9e40736a6730d9038c022c,92859a9bd3fd681c0e316af0472d00337d803ea4,39258e9b59518bcebb9c6d5a174b7d71ac2a5cdb,,True,True,True,10,31,560.0,2,True,10,Tests_passed,af285d8d27b1e3142d62ffc0ff5deedb4220a4d8be04bac04ae3d4c70bad3af2,True,Tests_passed,b57e30f3ec812c0f49f3783627bb97f37c350c4f35775f0ef80a7600ec992860,True,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_failed,6a83b7d989d81a85a631e6bc56dc96ac4bbf36a2c7090a4c84d6919333ddcf99,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,a6df97897354a712f32d044e7f3da1e7333cd383585288d347b62f63dc52b04e,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca,Tests_passed,b52fabd0383b90f0a3134762f349efdb3711bd99c5d00814c16e3ff0f1820eca diff --git a/results/reaper/merges_tested/syncleus/ferma.csv b/results/reaper/merges_tested/syncleus/ferma.csv index 89407fdbf1..5df213088d 100644 --- a/results/reaper/merges_tested/syncleus/ferma.csv +++ b/results/reaper/merges_tested/syncleus/ferma.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/master,f113f2c4af4aae68f922c437a4c3d6acad4daece,f1e3ab2409e5fea718b17f5d7d00b6d21fa97a0a,c89d36cdc198d6b4c6e9036e746066c98b1919a1,,True,True,True,52,193,647,3,True,52,Tests_passed,2065aef7e8b721079b788aecc58a7fc6c2df07fc6cc66e197abf007b325b55cd,True,Tests_passed,5d9f7b3e8ecb7d7178f78881cf17daf90771e64966a105cc5ccd9798deee2e8c,True,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,d9ad392644fbc4e8811c12fd31222571f3ba5250a7f01cc60f6cfe8b60cc11e7,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e,Tests_passed,3d97d1945fa97c220682a86acc27517d441141ea6dc3e8b4c3482819792b104e 24,refs/heads/master,dc1fdab4a237f587cce4868ebbdd3ba250e24926,3b4258b7d414d002eed5cbcad9ba41d807988bcb,6ef489bc4b5a1ebca644244532d951416a00705c,,True,True,True,11,28,122,2,True,11,Tests_passed,98eb3f29d6c223d4ff2c32dcaa7970244dfecb6d3fe16e4d113235bd8f700953,True,Tests_passed,32f4d5fb1514540d8f7455b815e29c0de5764cac466474c6ef7a2c3852174f24,True,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,a65af06ac944e2dc8aa0a0e2487c8c1ee661b87bb5089b8176025c72fb6dc201,Tests_failed,d61149365b6aabbbdb34e1dc5ebaa03d157ca658630b68802f0c97a0eccf3e29,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,a65af06ac944e2dc8aa0a0e2487c8c1ee661b87bb5089b8176025c72fb6dc201,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654,Tests_passed,c2b0b9dbd991cf056fe61f969e673a024a777128d2a403852b4de5a56f6b2654 33,refs/heads/master,b273f174b303afbba124b948e959de1f0b4ea1d4,bd1fcbdb8897ab9e7b3bb0144fc8911f6004199f,560882f584624eadd08737518d6c2ef6b63e01fc,,True,True,True,18,81,1992,5,True,18,Tests_passed,67abd69aa1c78844723a848dd901e34d3b234e5407a0bb88d0b5ec9d4fc4e29d,True,Tests_passed,ae0431048c33bf4d606c61458bfe2a5c9fff769c11c861580bec37138b779048,True,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9a4ab58669f105571d24e418fbd93f0f2c33b3f1c183690b30526674d19cc7bd,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,c644f94d0c59cb8848b63449110b67f7b4cf91824031aea511747c8d23d3631e,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,8abeebc040f412d2fc1c78eb29394d008f884e2bb68654331a8b3c6a3f3ff317,Merge_failed,e07c2351edd941abf9e1e7ca8aa329480771786da81ac736a74ff991274f083b,Merge_failed,fa5d56073050c94cea23aabb18611e2a379e9aa3bcdf04c91072df3f58ceed66,Merge_failed,3fe29431511e5646e4067962065f7bd69f47013b271686634b2a1402f12396d1,Tests_failed,d609467166fd67d5ad6c8362afdfb574b2b9d215c9415b32ebd743b0c80b080d,Merge_failed,fa5d56073050c94cea23aabb18611e2a379e9aa3bcdf04c91072df3f58ceed66,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,c644f94d0c59cb8848b63449110b67f7b4cf91824031aea511747c8d23d3631e,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,cd4fe44df371c2dcd68d9afb1ccdece853fe9e8546c8f2d2d85687a73452ba38,Merge_failed,8abeebc040f412d2fc1c78eb29394d008f884e2bb68654331a8b3c6a3f3ff317,Merge_failed,7d9d7cb87b5c7277db9e79574653db3193ff801dab4410890ab07673bad5239b,Merge_failed,3fe29431511e5646e4067962065f7bd69f47013b271686634b2a1402f12396d1,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9a4ab58669f105571d24e418fbd93f0f2c33b3f1c183690b30526674d19cc7bd,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2,Merge_failed,9b0af35bf40421b4539ee81e336a0d8199f3a6db13ca43d633b4bb25bd9963e2 diff --git a/results/reaper/merges_tested/synergian/wagon-git.csv b/results/reaper/merges_tested/synergian/wagon-git.csv index 02367b8f15..eac3aa6035 100644 --- a/results/reaper/merges_tested/synergian/wagon-git.csv +++ b/results/reaper/merges_tested/synergian/wagon-git.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b56e7945f404c808deb3efd468a888226dca89bf,b86d4a227212ac808ab985a4d1c66e13dd0e3080,284865d5c003c3cac22dd04ccee674be985f1e29,,True,True,True,2,1,2,3,True,3,Tests_passed,5aad08b0e2f9dd4ad1dd81c8f11b002e7cb0aab6958ebade9101d3473017642b,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,True,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,0426862bd11111015e8e53454948fe7336306125a5eae91346f31f71c047296b,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367,Tests_passed,312f57275805900e5bdf153c6e66657f8eb3bd00c85fe06035edbe93a1c77367 diff --git a/results/reaper/merges_tested/t-oster/liblasercut.csv b/results/reaper/merges_tested/t-oster/liblasercut.csv index b8c804bcfc..0e8b1d2b20 100644 --- a/results/reaper/merges_tested/t-oster/liblasercut.csv +++ b/results/reaper/merges_tested/t-oster/liblasercut.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,1b8d7560d2e41b046bf2141db37a0026ef3cac1f,b1a2853dbb655ba49769907231c486fff2ed7815,cf14d4d95c09f27c4efaa35b2ebc3b4530b06315,,True,True,True,15,21,61,2,True,15,Tests_passed,6a4aadcab00381ab8c6b16c5b31b2cb6163486c7d0c4c500abd726bc6b36f687,True,Tests_passed,ca59dda4d0ec61d0c35e61e10e3625837bbbe79c2055ba483b7af0658082eeb5,True,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,ab158512fc572e1ebe23c238b4149f71acc06fae15c2502eadab11a8757d6c9a,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3,Tests_passed,0b1d57c1c26fe45ae7605f250f81a134251ce18e10af4b7410b72b506407f8f3 5,refs/heads/master,fa6cc8f9a28e09fa9900130012d3278ed7db7c6b,0f99d85a07cab01f500bd4e6a3ec193e0265aa20,8fc7ec1bb59ce715144b09e69aa60c70166be315,,True,True,True,41,70,245,2,True,41,Tests_passed,1f95b27264646efa36eb22a9e6907f1238a3bb6aec5a586e533957455c6e49e8,True,Tests_passed,afb86d4a6167a977f05d23a7f4d82e04f497f102ffb0abe593c11861b4ba374c,True,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,575fac3af63875edf1f8764729fff130e8f3966ae54b38f64e70be15bc09c3ea,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,575fac3af63875edf1f8764729fff130e8f3966ae54b38f64e70be15bc09c3ea,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6,Tests_passed,ec48378ca0714092d376705b4d377210fe225f1e3df8e302d20af3376e226ca6 99,refs/remotes/origin/pull/175,ba71c74a624199edec998d1289a51ba8d613f0c1,1579437be2222bba25e19c11cb060fc4a380ed85,24d94e2815796d022512f74c9f82860b942f250f,,True,False,True,3,18,83,2,True,3,Tests_passed,d8dc900841b18c92219112c614249d305e6ff5e595d76ab5d47fbe79c84d41f7,True,Tests_passed,3c4af53ac132588e16e5684560abca5e64542c85013897c0dda1acee9993a92c,True,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,461badfbc4a0ae6af203e391042c1c9a535d8c6670e606db7125befc697c6a4a,Tests_passed,d8dc900841b18c92219112c614249d305e6ff5e595d76ab5d47fbe79c84d41f7,Tests_passed,08e636787e970920b163010ca89be184a810dcfe8a631fa1fe1bf4064c700227,Tests_failed,8ceaecae6344fa7b23b0f0a6206369f05d1bab67213fa2394e69f8256a0dc17a,Tests_passed,d8dc900841b18c92219112c614249d305e6ff5e595d76ab5d47fbe79c84d41f7,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,ceb768999a0f00a86d3c4429032ba47a625618dca3dc40ddfe62093648dc1717,Tests_passed,08e636787e970920b163010ca89be184a810dcfe8a631fa1fe1bf4064c700227,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783,Merge_failed,32c34f9e538480a88267d257dfa8f5c5acf7bea3c6ae42918a7807538b2c4783 diff --git a/results/reaper/merges_tested/t0xa/gelfj.csv b/results/reaper/merges_tested/t0xa/gelfj.csv index 2305118c92..da6051532c 100644 --- a/results/reaper/merges_tested/t0xa/gelfj.csv +++ b/results/reaper/merges_tested/t0xa/gelfj.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,c56a08e9b339a99cbf8e8292d35c20fa63091260,39c835a8501b8f4b37132864a73fc860d6b63cca,2d6f667c4cfe5cca4fea00f9aa18ab870255ea5d,,True,True,True,2,4,17,2,True,2,Tests_passed,b56220ec575ba65f7aa0e2dd0e1a7b5593540834b9232cc739f34453781d3ce9,True,Tests_passed,8d9e29d6504de1aa5ea2871dd220870b5d034425ecdfc68899ab0d75bc8fc590,True,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,53ffaeb4af4f01fc84b644ca7bc483c2e816260b167cc8400d4d7f74791e3f08,Tests_passed,6a16bbb032bc88c4a1631fdf7b9fec8a77567021f00be4e90d8d3814bd479058,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,53ffaeb4af4f01fc84b644ca7bc483c2e816260b167cc8400d4d7f74791e3f08,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3,Tests_passed,29beb6f80b1f8d73d56d8464bb840b39a2dde6eab3e06956f63835636cdcd9d3 39,refs/heads/master,f57a572d8c372b60afde1f1f300fdb93e3d1a194,12b0e906d74e71e914a53f94d127a54f65cc5886,6a073dd4aeab69bfe117076da40f41433126bc74,,True,True,True,14,62,212,7,True,14,Tests_passed,4ac95891390d37748067ac2a2e08f79e1f2969c88a163ffa3fd952b5d169fd73,True,Tests_passed,ad9f380f9ad1fe692f75c7c87c3bbc1c64b31f26ed925f28fcab37e64d0f2e6c,True,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,10ad6a1bc4e4d5a52bcb0af16670de6c0f76e725b063edb9dd7e40478facbcbb,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Tests_failed,4b28297863cb136d94fe8fb8d33d259e9f365dbbd3fc8d830af3312729267224,Merge_failed,2508b67acd702f1b793c16487a2c6a65b76e99a57483baac68dec50450619b4f,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,5154b5fa04b08c60b0c354e75414e00479f7ac18da64e6098816de4a1b2f8bbf,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,e512f1ab331c69957459b64b6df9739f0779316c9db7ee3036db385ce5df3f49,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,8f86ec7a17563dd31946ee497bf7fdafd525d3ddce8584d553fc17e36647de9b,Merge_failed,6fef99733727664e92918d8ca1670b1dde2ecdf24e0171806a4e17cd445188a9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,de6c4c42c6646f88e4ed12743c2ba7862847870cc70b3b8d7abc9973aa7b1b1b,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9,Merge_failed,fe1a5c2c20ca921a38e9e3ff18b38cc6610a6e02fdf1fa6424c78fb6c4dd69d9 diff --git a/results/reaper/merges_tested/tabulapdf/tabula-java.csv b/results/reaper/merges_tested/tabulapdf/tabula-java.csv index e231d2e709..3d1d1a9df9 100644 --- a/results/reaper/merges_tested/tabulapdf/tabula-java.csv +++ b/results/reaper/merges_tested/tabulapdf/tabula-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,7e024fc13371c195639b213f6de673be2107b016,a747549eb66bab9992a97957e0cbf98f8026a477,adb7738c87f0019cf95519ff37b58e4d4992c51d,,True,True,Tests_passed,fb9cc791b56602f71224c4bc96cbf7c7e253aba1cdf0a8e37e7b314fa8ae54b9,True,94,984,11808.0,3,True,Tests_passed,f0674227958866131334c095755a454dd45e0943bc44322633adc5f85ed22e73,True,94,True,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,ddff885d4f2d8a1adaada44e09e79eacf02113feb5cd44e62cec3f6019784b19,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,aa1276b30149efcb68b0c630f1492488a1276e4bec61e44bbbf97c586a560cca,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,90bbc29a74dd824519ddc5b6912ac9bd53943e187291ba91bbc6ec144639efb5,Merge_failed,976815eeb8b1040a416068d8cf641a03348aa87611f17f6d04b9e0a31977b75c,Tests_passed,b33a3e5d6e7ed4e7fc21231c3ff4b04385c637d0ed8b4e41e7589cffd3badf1c,Tests_failed,ea82cec54679eebaba4aa14eb0ed036413c54b0576c1985b9530ae4799e14e51,Merge_failed,976815eeb8b1040a416068d8cf641a03348aa87611f17f6d04b9e0a31977b75c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,aa1276b30149efcb68b0c630f1492488a1276e4bec61e44bbbf97c586a560cca,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,60f8192f2694f36cbb9ccab01f3167d45723a2329bd67afd38cdc3f7e363254b,Tests_passed,b33a3e5d6e7ed4e7fc21231c3ff4b04385c637d0ed8b4e41e7589cffd3badf1c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Tests_passed,ddff885d4f2d8a1adaada44e09e79eacf02113feb5cd44e62cec3f6019784b19,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c,Merge_failed,f8b4f245ef97eafc1435f3b75c88959768d4a3238def5be9df48478db178546c 11,refs/heads/master,2639edd65dc370068bdc9b438daa70f29cc5bb00,5cdb22fc1ef951cbb1c537ef4afe8aa10679a295,4aa9568a70b6748d28491648e13598e5cc097c3f,,True,True,Tests_passed,e1f5fac83cd6db3b5c655843cc76319c57c3019e4c4a6b6e35300c0e5b552d33,True,29,126,636.0,3,True,Tests_passed,a2109752e10162913817e206ffbd840a6ca61aadc1d9d6104e111c3bd43503c2,True,29,True,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,8b9f482f5a2923211191fb02d650d594de3f8ae96759ca45fc7267ae06e50204,Merge_failed,324e65a99cff254d0bb0f59c30fe92106d2756f8c66699bf5b32c770e9c53423,Merge_failed,f9ff3e96660c4ad236c67bf5499a0c4ce004668bbd9f190763b19c5e2ea9afb9,Tests_failed,7c3c6edd9c0909e7a2445d147864d48e1651952158c0d4d7e67fd0d5ff5db83e,Merge_failed,324e65a99cff254d0bb0f59c30fe92106d2756f8c66699bf5b32c770e9c53423,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,fd391fb1d73bdf14ce4400a01b76224da690de670260aaaaa8fc4ddcf42f64ec,Merge_failed,f9ff3e96660c4ad236c67bf5499a0c4ce004668bbd9f190763b19c5e2ea9afb9,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,f293239a26e94c4b7f53ff63e78f34051bd3856df0e7834644346824d7d0d750,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344,Merge_failed,2ae9ed4e97108422174ce5b62c407f0cb083e0a39e4b4d275b538b30a01f3344 12,refs/heads/master,4aa9568a70b6748d28491648e13598e5cc097c3f,fde2527605acf6fb7f9923e97a17644dfe2fb96c,f2f64cfd2e1813b1d85e36192f775d1561c05e5a,,True,True,Tests_passed,a5d8226985a58393f64e86f8fba7d49d0f63210ce24a027dac7542743b50c422,True,21,76,374.0,2,True,Tests_passed,62f1e74d4b458af575398a1d7985ba0caf456ff552a82c3e85fa68133efb2706,True,21,True,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,d53f637e84deea0509f314bfb01003ff6417dd8ac903dc62b1e46dfe24df5d82,Tests_passed,bde86508d1f1227b92f929415bec77993598fe7a0bb61e363ff1a6b2d0a26d0d,Merge_failed,5d3e3976c7eb022081690b6135f3b0cb23a2872e817ea3ce1637e142852af0d0,Merge_failed,409b3aa696c3ebc9f79b54bd82a47cdaf17185e92b89433fc149e7ad8cedbe90,Tests_passed,bde86508d1f1227b92f929415bec77993598fe7a0bb61e363ff1a6b2d0a26d0d,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,36539070de755caa0889575d4e692a476d104a0b1fdce15a6a683728a7f76bd8,Merge_failed,5d3e3976c7eb022081690b6135f3b0cb23a2872e817ea3ce1637e142852af0d0,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,2aabec26fdd41c4bdc1f2c71ed975113d6585fa18d9c0adb6b764c50abf0f90e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e,Merge_failed,54765396d61579ebb4a584b56c5326f7c63ee2bacb99745e337c8e409e0ff77e diff --git a/results/reaper/merges_tested/tacitknowledge/jcr-mock.csv b/results/reaper/merges_tested/tacitknowledge/jcr-mock.csv index 45730e4c87..69039f6085 100644 --- a/results/reaper/merges_tested/tacitknowledge/jcr-mock.csv +++ b/results/reaper/merges_tested/tacitknowledge/jcr-mock.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/heads/master,c73aee7bfb9d5c3488412b84d8f83961f57abcd2,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,439a077b1b18513bf3f5098302d0ed60bf8f8b95,,True,True,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,True,6,37,216.0,4,True,Tests_passed,f2e6f1df83fd93d10934762faaebbd3c784216a6e0fdde6cdef6fa00cdc777bc,True,6,True,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,7f6b25d333fcc462b9152cde69a9313af3b9b71d4d353eb2c5ebcffe5b173844,Merge_failed,c9ef29c38557d8c49184bd504ca3bb64e2a7b2b00492055fd2525b72f3581876,Merge_failed,4825ab61ae374d4ee946273b714ac18896920002ae04488c41ab41d070f8b0bb,Merge_failed,ca195c913bcf7a4d82d1984f302e9db409bb587f5feb753c6044a5df5e779393,Merge_failed,c9ef29c38557d8c49184bd504ca3bb64e2a7b2b00492055fd2525b72f3581876,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,bdd04b421a99817536d89e0814785d50d78dff1076a213e1d454b4d0ff3406b7,Merge_failed,4825ab61ae374d4ee946273b714ac18896920002ae04488c41ab41d070f8b0bb,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d,Merge_failed,fe6e4275f7430e4e594bc0388c152c8bb9b5401143cc0bc5e5ec4581eacc5c6d 14,refs/heads/master,5c7849bea5cd1f26dc97a5b85f069a3b586485ed,cb49187d9a84ab070a49d6af8a16bb00b59da572,399a1ef752b17491e80b0fedc1f4b2668e51ed36,,True,True,Tests_passed,1b7bdf6ccaca77f530e33d4247aab27392b865be1741ee544661d01ccaa061d5,True,6,27,194.0,2,True,Tests_passed,5f9b74f3ba14a3159e310483d79e86567f1d607d607205095d5288a11ded26d0,True,6,True,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_failed,d00c0556813aafd5d8714c2f62cd94925a5a7fac1677f999c369da01f6e3cc8c,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,2e3e63333f91ba664e687af90b2f21f1d75fefbd7994bbf1677ac7fc77c07181,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d,Tests_passed,d714c4a766c21dc385c0d544e7c5dc50ead5d01e4766b7677a5c5bb21ec12c8d diff --git a/results/reaper/merges_tested/tackley/dbdeploy.csv b/results/reaper/merges_tested/tackley/dbdeploy.csv index 537da6bad1..bf7af1fa5a 100644 --- a/results/reaper/merges_tested/tackley/dbdeploy.csv +++ b/results/reaper/merges_tested/tackley/dbdeploy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,50e6bb3003bf2e91512f9263a966f9e30fb17113,22c01a36a381eea3fc3650a2761bd55c14c84e28,d879c80b39966a526add4c1917914fd609194273,,True,True,True,38,79,1000,32,True,60,Tests_passed,13ba18ea3211bcde7d10dd3ba2c942c8c3555683e1f05456f3770576345438f6,True,Tests_passed,a3dbe934c9df25f77e2804d71d996605a5d5c712105a4f43af8b6a188f2ba0ee,True,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,7db308de47c446f14384d467d7e5883ba65d167327da25a909a5bf10c15bfd24,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,fb914efb04b7928ab7ebb9b937f7352943bd7639c52d0933b29120090e2610f0,Merge_failed,ea3619407f3e9007774c4c21425d79abb5ed7a2663e2c82b8fba2f5a35634241,Merge_failed,fa72cb477bd8b431823e397804c445c05d2f4df50857f480af177b89b5ff6dc5,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,239c1bac1e731df029611814709867a1eefe20d9abf1b2a24b9d670f6f88314f,Merge_failed,00bc7d8c5f2637915d80ca262a5b1929d2ad4d3236d168013d2d54aa0ac198d6,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,dc0bf29b9fefa2e6e2baaf7c9583f7ae6cc6e5b6003470d291f2f53dc7a58025,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28,Merge_failed,b78d4221e7a2bd12f9277d569f922a23869e47c74533deab3aa222f0c4543e28 diff --git a/results/reaper/merges_tested/tadglines/socket.io-java.csv b/results/reaper/merges_tested/tadglines/socket.io-java.csv index efe5cc780a..2490a2b634 100644 --- a/results/reaper/merges_tested/tadglines/socket.io-java.csv +++ b/results/reaper/merges_tested/tadglines/socket.io-java.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,aee8aa7b44022cfac0a87bd27282cccb1f3b388b,1b9dda4e3cf3ec5419599ec37868a28e30e0fa22,66fdd460f188f787a382aecd1161efbf9d465b58,,True,True,Tests_passed,d43900df37aa76cf21998e900a8a9bf85e4bd9e5f6ba8bbfd54ee7da35a822e7,True,16,163,1738,5,True,Tests_passed,2c5d2040da44e3a14e50fd6dc944e889a3225ff8c6b40323c598dbb65785060b,True,16,True,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,bd9c68d190760b63ddc30f45fe748656d7feaec4024391bee1a2e8e135210b86,Merge_failed,8ebd6b1044370070296126f98c4b6b9fe00e184e3d5d063d24d4a5a4565a5d0e,Tests_passed,5aac389bbafbf9a1b7d96d52d5aa010001fc5dda2c91cad6f266d1447bea245a,Merge_failed,c978c9b3d030e8edafa54bab8cb1b7b1f171959c8bd0c30fc10396c43f1fa23a,Merge_failed,8ebd6b1044370070296126f98c4b6b9fe00e184e3d5d063d24d4a5a4565a5d0e,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,3f8af57b492f8b3e781773770461c202068b5a0a86613e5dc6dc6630d921a8ef,Tests_passed,5aac389bbafbf9a1b7d96d52d5aa010001fc5dda2c91cad6f266d1447bea245a,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,0921e5b3474922e41cabdc4fb22055cc57452e6b2996a37f065358e3ee37ab6f,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63,Merge_failed,37bd48d43bacdabb393bd38ab09c21337dfc934d89b304fa630dbccf03297d63 9,refs/remotes/origin/pull/5,0b8d2cd18442e598db6bdb1df67e815bc23b0e24,8e7d52406fd6ab70d0f536846c547179da689598,9e85c5a5b25fca09c22322af5b99dc6c77986cdb,,True,True,Tests_passed,4702dd6ada2d6c527be42fe3757e01ccdb6d201b21a29c284a2b33476ae4fd5a,True,100,203,5642,3,True,Tests_passed,dc317441af3533bf1923b17fdbf79590fe733faac43f91aace9952a1c33348b2,True,101,True,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,604f000927785c46a80ec3fc8956abeeaee2fb33a6b8f31c52249107f514e646,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,d7b4982b99e0389c22e167ab4a063b3386410857d08ce186df4a6deefbccd637,Merge_failed,8cca3784c2d25562ac20fc69ca078a72fc0efe0653352cbdaa6db2cdb4cc9019,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,1caa06a37b2f0fa3c86a439d5635a751f4c2a93a96ae74638f8ae058955bb8a4,Merge_failed,6450628ee716ae5e4bfcefa3265d2f7389d2290c899600a1f09e7688e5305f50,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240,Merge_failed,8a035e4d7cbd4e7389e4cb7e6dd6d20f5a5dab5f3ff31be9002492297786b240 diff --git a/results/reaper/merges_tested/taimos/daemon-framework.csv b/results/reaper/merges_tested/taimos/daemon-framework.csv index 18a757fefa..bad0d564d4 100644 --- a/results/reaper/merges_tested/taimos/daemon-framework.csv +++ b/results/reaper/merges_tested/taimos/daemon-framework.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,f1696c8958a9311d29297b106064211abec721dd,f0d0273d57f9788f4ec9f67e775b72cd3f67989d,734108ae9a6c9041a6cc9d2dae044288a15a5914,,True,False,Tests_passed,36e16e2a7b16c01841741244c419038c7b176b2b6ad930d96fbb491c9a40ea02,True,3,3,6,3,True,Tests_passed,23e98da8783a222b4f3eef095527de5997fc4f2df434492d0e43913138abe462,True,3,True,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,695108cb5cc5792fc21d161fe390c2f8dada4a5f6c99f3147224f54fbcd8c6e2,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,482605dc79de940fa50c2b5abe64c904203554de03a2ffc0451665caedd1f523,Merge_failed,ac760d4bb31cfac6c106dfdca47545de4a8d1ab3bbf00c7ebbdf386fecf8418e,Merge_failed,19cc72c179a9a0703765a62890b829f989d7b4b70695109eb308586e510dc812,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,8c25adc39395eda546923934949b906b4834d0b7c6e92bdbf569dc6debd862a6,Merge_failed,3c7523c0e223bb3fb804820b51d52800ecd2f21b954a4f3cefe5c2636a7eb135,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d,Merge_failed,e37f9fa99660936ec91743518ad199fc9d39a4b20d8ae880c8cb8a866446155d diff --git a/results/reaper/merges_tested/takari/maven-polyglot.csv b/results/reaper/merges_tested/takari/maven-polyglot.csv index 23c80f6a48..56adf2be16 100644 --- a/results/reaper/merges_tested/takari/maven-polyglot.csv +++ b/results/reaper/merges_tested/takari/maven-polyglot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 112,refs/remotes/origin/pull/257,746ef5141b10b1281a83864bd72ff5b78816762b,81f25ea0fffb6c4e6f06b45fbf095ec1cd5c8faa,64c31c9ec3f960f91c03c9190058ce46015e92d1,,True,True,True,189,325,844,6,True,189,Tests_passed,b467f82db537e206fa5bb04b80cd2d9cfd68ef9a4a64c9e2b042012887ac8311,True,Tests_passed,9f6c159422c4e3c711e033a45403aed025b389ca66eb5de3ac9d11cd54d9baf0,True,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,4e30b7a9c9a034e657831f288ed056a7396ac78aa914f6a3469454daf14417d9,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,e08ed24e65b4f80ffc67cc8efbe016edca9276f3f374d73da0b47b56cfc3e27c,Merge_failed,0d9a72dcd41dd6794888fea88d34f018039d46faa4413f373bb095f42a5ef78e,Merge_failed,ce3a8437917873301e767f9ef62a3dd20f0a3c7f36af96bd4778552036e73916,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,69ddbf407e8db56ef69c9e32d8e8d1b7a4dcdcc81a9ff23a6739f1a02593f17f,Merge_failed,1f120238937b0e6c82df1cc15501044514f140487d0eb116345876bc961bba16,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,f986a206eb42085bab549470bc6ac66cb354642ab14139d440236a05479990e8,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff,Merge_failed,93ccc5224da9bdba0a7a955a955a30734d47d1947eae327e98a22ef1e22b08ff diff --git a/results/reaper/merges_tested/takari/maven-profiler.csv b/results/reaper/merges_tested/takari/maven-profiler.csv index 9d94a60f59..933d771ed7 100644 --- a/results/reaper/merges_tested/takari/maven-profiler.csv +++ b/results/reaper/merges_tested/takari/maven-profiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,2d7f5eba094953230771d27e6d178cfe31373c6d,1b28f199e81f4644158ce00777be0a01c9ec352d,bd79a8b0afb29357df3d1e6567a4a08b8fee6b07,,True,True,Tests_passed,62069443749a1b72cee7ba90461fc8b46c73539adbe0031cb0a851e36898629a,True,15,28,289,2,True,Tests_passed,acbacc44c3b64f710cbe0eb3d76b2e42ff12df0cc78a946c4ddc765bdd747ed7,True,15,True,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,237b60a9d7ecef48390b0a7d41e5940753a453249807802133f53246b30a9bd4,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Tests_failed,060b51bd82b48feb35cb776f367b829f7b7e2c6bed0e79a8ac24eb5f9968cdbf,Merge_failed,f80d5892ec9ceae4058a83e96f9d4d1a67b584bd6af4f60b1579586f1bada9e7,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,d33df7247d603e08e318e45456bec75d87947ed42e4688d2ab58efd69e7fb858,Tests_failed,61ad7bdb7f277510ccd8bd3b0051aa1cd9dce29c7af3ec0f004a4726808f79c8,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,27467345afb96f73487a8ec3f843e79e38df59303f00465ae8d3a26ee2c7b4bd,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83,Merge_failed,7a6f837a93761ef1e0b7c18a9ffefcb3b08351cf3f02cb8659ba2598fd963b83 diff --git a/results/reaper/merges_tested/taotaotheripper/sault.csv b/results/reaper/merges_tested/taotaotheripper/sault.csv index cce03e0dd4..27b19a42ac 100644 --- a/results/reaper/merges_tested/taotaotheripper/sault.csv +++ b/results/reaper/merges_tested/taotaotheripper/sault.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,c42a266c8aca381fb541ecf5cabf1ad9594f7026,933d69d97a75b7e2b5e6f8eabd004a6bcf789e86,9cda7b949bf4e8acfb7afba7dc17e83307b83b50,,True,True,True,13,80,481,3,True,13,Tests_passed,a916198305d4b0c58d332060d3084a179fa14278dc36ebf80d30d62fe86cde03,True,Tests_passed,0863541900daa4d3cad7f5d42ce2a82a639377ad1192b6b490b0b778e8ae51a1,True,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,b87e902701bccca60a6922cbd3fcf6a887ce9d0705e434ca47e7cec8132a0162,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Tests_failed,32b8b708a7176f441b13e0eaf4fd1c3b942bb774df46c37275e5b4e6f09e800a,Merge_failed,006107fea90dbbf6f2940dd14e27ed1be7dff95d025ff8bfc5764fd2e06bfbd4,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,1da4328ea7ebaae33cc1619a562893edddfc6cd829ee9dea5f15da0526ba5db6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,75ebc1152a4f1f730dcff681d89ad906f84127c11082a30fa27c00ebd3b9bb74,Merge_failed,be1c4d78fbaae13794a4adadeb966a5a1aef8a16ebc185db1a330a35abede5a6,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed,Merge_failed,7c2f150bde73c026716025bbcd539a8a97c85cc486485b0f81ce253381b06eed diff --git a/results/reaper/merges_tested/tarql/tarql.csv b/results/reaper/merges_tested/tarql/tarql.csv index befd81a679..384a1e2804 100644 --- a/results/reaper/merges_tested/tarql/tarql.csv +++ b/results/reaper/merges_tested/tarql/tarql.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/pull/83,0644473c2bd9194e86eed5131e12cc580cf2956b,343224e3375158c06a2e4fafc7f4463c39a3822d,8f17e28a9cb099b6c1c4dfe8e03f800c8d947a81,,True,True,True,5,14,119,2,True,5,Tests_passed,6a39c94c100e8e5f5435520039216821f405f5bd3435be6742f2c7ee147af28d,True,Tests_passed,e62e083db65054b04132adc83c650d77d3b07ec2da039b6a31904ca3a7a1fd83,True,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,eb15c4879377776fe522e35b7ea78a8f1a107b02c114c62292dc1dfd80f6f6ec,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Tests_failed,3846195068aa790310619ec837c5a7e200d3adb646ae3b120bdf0615121816d5,Merge_failed,50b2fb67941c2974bcd2eeafd268f5dbaad9e7fe3c27fcd140f8ed4d976144b7,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,01f68e9c33b9583f4da597e6c3f24344f08b9c712ada87e86a4c1c7d510520a9,Merge_failed,37872c4957878b439f6f5215fb277ccb8b47dbd0a551807345ff7905c11b320b,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4,Merge_failed,a50db29964bc52bb47ed26c5914f9ab6b45fe81bac8445ad733374821bbb03b4 diff --git a/results/reaper/merges_tested/tasermonkey/thumbnailator.csv b/results/reaper/merges_tested/tasermonkey/thumbnailator.csv index 129ae40e14..60aa8b4d4e 100644 --- a/results/reaper/merges_tested/tasermonkey/thumbnailator.csv +++ b/results/reaper/merges_tested/tasermonkey/thumbnailator.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,658ca13b2ea59e424ececd86df21d96abf3faecd,d1eaa5ea1e75df953f5411458e5deb73acbc023c,a5b774ffb53f86f36b97d39dbfbe0741ea203438,,True,True,True,7,109,972,2,True,7,Tests_passed,db26b1a0544f1c8a11a5351fe880eddeb51d289f71cc590ebc23dc64ef6561a7,True,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,True,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,fb4aaa4c76bdb5a627d391afe5ff0c8b942514e25bc58ddcd9438b03975b53a3,Merge_failed,9a03e1241e2067373f501060f41ce082ab43b9250c8bf74763984040c3f6db29,Tests_passed,d47a8eaac750f1b67ed390bbba2466fe9b96a99aa9963d59dbe833d3ea28679a,Merge_timedout,,Merge_failed,9a03e1241e2067373f501060f41ce082ab43b9250c8bf74763984040c3f6db29,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,bb9df7086f70537fa8d2f78751a2cb126b3cc484344adc6aabb435cf53a19a83,Tests_passed,d47a8eaac750f1b67ed390bbba2466fe9b96a99aa9963d59dbe833d3ea28679a,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d,Merge_failed,1d85deb972970acc3c0f50d6bb852debe0a6c876ef9d01552baad0003c08420d 5,refs/heads/master,a5b774ffb53f86f36b97d39dbfbe0741ea203438,f7798c6a0ce4ad760eacb103bc33cefd3e1f6455,1576ec739a73e4416fe431f8249aeb74aa6e5b97,,True,True,True,5,16,997,2,True,5,Tests_passed,fa3b945e2f9a7d0d09f0a740b2685a5332a9694ade8b0bed86b5a69b6c2cbf86,True,Tests_passed,2de97e5c3df6490ed251b3184db36772e6c29b89f81972a053cde7015cddd5e9,True,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Merge_timedout,,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,d53822221421a3dcd49383b32660a8da024edaddf67cc2faa33200ecae5b6541,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb,Tests_passed,193feb6fa34a14a94d601d764ccb499e1d6f76b25c3c73d2b9eaedbc71ec30cb diff --git a/results/reaper/merges_tested/tatsuhiro-t/argparse4j.csv b/results/reaper/merges_tested/tatsuhiro-t/argparse4j.csv index f9a28c60f4..292692cd2a 100644 --- a/results/reaper/merges_tested/tatsuhiro-t/argparse4j.csv +++ b/results/reaper/merges_tested/tatsuhiro-t/argparse4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 25,refs/heads/master,c3b38c0b78286623022b1bfb8b4cac5a5d732e8e,05f1be895ef13eca5ebc195863a901093d9c63be,e05ab77b5f2e5562b109f4669bbaad0ab6113b5f,,True,True,Tests_passed,4d1b2e312f9a0da65efae4eaebe70fb50d864c7d88bdaef362d831fbf69c6eff,True,40,189,705.0,7,True,Tests_passed,1143f6a8dbb39ab2a96152b6ffdd09ce909ccbf0a52546980c6458c4933a2630,True,40,True,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,879cbb8f3c22d29763f1b1925c6c837a6facf162bcd1101e1b773f3de95ba758,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f,Tests_passed,32afd9f1f218d52294691d1413a6a032c6f392dce1b167f9e86cb505dd61006f 29,refs/heads/master,b8440ba6c3b618ffcfc5e2bafac672e048e15c5c,609fbe564c3868dba09a56e48c685aa73f2ba814,da0f73c66a84a939275104887e56eb37370810cb,,True,True,Tests_passed,2a6faee7e8a8247962ce7d2589204ef2461594ae968478d821ff475835ad1ff7,True,24,97,667.0,4,True,Tests_passed,d37323f82188536be01e56ef73a40897085bcba15e02b42afed3c8dfcf81c821,True,24,True,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,3a7b15e9a29d7045725e0346c2298330b931c720389783e17ffa1608397e0ea7,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,3a7b15e9a29d7045725e0346c2298330b931c720389783e17ffa1608397e0ea7,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef,Tests_passed,203b25b965001670d118d605cd0b2980796fc4c9def2152939e1cc49f23111ef 46,refs/heads/master,ecd18960004f843b2ff2f9b373db0b30fdc322e7,f34f010834d92fef29a24056dd3c0f5fa9066d8b,b36f8b7a068f31d6f82a93b25a14186ec72c8533,,True,True,Tests_passed,add87a243b86698d78447581770d52b8a1f178ee49842a1071559558a06e2844,True,5,9,52.0,2,True,Tests_passed,7e9590f402399523e29a68fc5e5cf6d0490e15922f7bfd1821e8c8387447cf05,True,5,True,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,e6f5555d47c1a68b090914dede9a8e29486474ec5d669366309fcf8034cada8d,Tests_failed,417422fee648d91c2747260155e150982715c207332ba57b52c7b5b8083f631c,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,e6f5555d47c1a68b090914dede9a8e29486474ec5d669366309fcf8034cada8d,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13,Tests_passed,a5f275cdb72ae6a29805fa5149bcdc27f8266cb88bd70ac83f82f1386cb68e13 diff --git a/results/reaper/merges_tested/tcurdt/jdeb.csv b/results/reaper/merges_tested/tcurdt/jdeb.csv index fc7cf366e9..c6b1a6b66f 100644 --- a/results/reaper/merges_tested/tcurdt/jdeb.csv +++ b/results/reaper/merges_tested/tcurdt/jdeb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,ee0f3d4470642db81ebb0be600934b61863d34dc,ffee60c7c591da9d3d359b84110612a97559404e,5f3f5c73b72e1d38062f40e0c0d2c4cf99a05dbf,,True,True,True,81,400,1828,2,True,81,Tests_passed,aaa28a0f4cd86b88f5134dde37a39c1827c7dd04a61ce37f2f52cf2ccc2058d1,True,Tests_passed,861d79b1fb9e64dc96a7cf57a9a08522a1f1008c262eb9e7436db703d3550190,True,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,051e1af36681192251e71a7b1eba2d728baa779b8eb873f71339a5f4684278a9,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,051e1af36681192251e71a7b1eba2d728baa779b8eb873f71339a5f4684278a9,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4,Tests_passed,dffd6a6ae486ff8484dc4c4f40eb9a4ead3775bb4cfc727e2f7b107433bf2de4 13,refs/heads/master,d9b8ae4994ed1a742e205d42e49babeffe200531,bf268c7c1ae38c40712233a8f3070735e590613e,5152ce927699e6c9ebf7285232076dca8616a1f1,,True,True,True,80,404,1891,3,True,80,Tests_passed,561e2639fa23196be29a2192901aa94554256aa8b1064e65497a82f503a87205,True,Tests_passed,7f239ced3c635b4a616adde4fda3003d232e513fa7e4525ce6f8c43dba7e8098,True,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,e050b215f9c175a8abdb803d4683d301b5fa0092d362b3ddfc4120495ebd6c51,Tests_failed,7970f1543fe937adfcc31fd02a553fde1dedccacd165166c8139fc2019f47c1a,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,e050b215f9c175a8abdb803d4683d301b5fa0092d362b3ddfc4120495ebd6c51,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60,Tests_passed,98db846202fa439184a587aa9ea0833598708c24e6dace385641b5422553ca60 25,refs/heads/master,de300005f033a22b2c6424745628cbbc1f7cb509,e8d74077f2669e40b84150ee511c12aaf3088f35,cf388cd07945edd6c5a94735b44b68b83ddbc924,,True,True,True,17,68,391,2,True,17,Tests_passed,d660b78da129c0d3fd4beffa312259413c88a6887de4760ef400cae4289a76f7,True,Tests_passed,05ab0097dd96e7b08c9c00b4ec91a42547707693329be247ada26422bad7274c,True,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,576909d7d7708601b11ddd335ca189dd849a0200b3ac3557a2229332362b3309,Tests_failed,2fdd0d2e83adfccc5fde6fafeff482a207ba8b20e43ea7511cb246b58095d267,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,576909d7d7708601b11ddd335ca189dd849a0200b3ac3557a2229332362b3309,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,cd56c0aca1edf00578ae78f77b602ff518cb0b5c0626dc42a18dc28774839431,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c,Tests_passed,e2c0ef768bf4bc95b0c73e12ddfd01284aeebcb6f646619de842dd699c65574c diff --git a/results/reaper/merges_tested/tdebatty/string-similarity.csv b/results/reaper/merges_tested/tdebatty/string-similarity.csv index 93d1502fa1..a090c7330f 100644 --- a/results/reaper/merges_tested/tdebatty/string-similarity.csv +++ b/results/reaper/merges_tested/tdebatty/string-similarity.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,2b2930e1f500efd5f9efbd95891a62ab7da3a818,4f03e3415088bf26bbef62b06090b525974a7cd8,25ac055200fb6fc1f762258aee8cf30d166b0cc1,,True,True,True,5,8,134,2,True,5,Tests_passed,f8ff744cc3f1436d03a0f83e3199e8eb96e1b55d3191e23453c641baaa17ee35,True,Tests_passed,f51968e07c00a98b945404ab66db082ac8a53bd51cf50a948c54c1ca803f354a,True,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,b00ede1d197a5939dc211eda4e5a00a002bfb0e44aa407f8f1b061f443776c8e,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,ed9a7f5d930117d6b1016d2a3ab2a1a9f9d9f872ea71ee3f488971b9e4d7715d,Merge_failed,d67afda1faafb6225a250f27bea117ae73f7f6a5984861b381b41a8ce659ff83,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,bdefd09bcaa2aa921d347fbaf7cc70e0f507495acfbace6e3d1b319a47055692,Tests_passed,b082e4c7d83be3cb7a8cd61caf604caf294d73b258d5b1d7573a7a8c544e03b5,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d,Merge_failed,437bd82e8d2ad79530dd0541fa845ec2823c10695413904370771417719a678d diff --git a/results/reaper/merges_tested/tdesjardins/gwt-ol3-playground.csv b/results/reaper/merges_tested/tdesjardins/gwt-ol3-playground.csv index a5f8701361..ec86708df9 100644 --- a/results/reaper/merges_tested/tdesjardins/gwt-ol3-playground.csv +++ b/results/reaper/merges_tested/tdesjardins/gwt-ol3-playground.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 112,refs/remotes/origin/pull/64,89bea69f8eea1dfa5e8cc75c0dc1a941e6306aa4,5550df625dfea8ee9cdccc0c0cb4f4c68fd46fd0,92604b1effaeee499cc82b3e833466c1303bec80,,True,True,True,36,133,1188,14,True,36,Tests_passed,1b2b48bdf7513b63b9be55f04eaf0057a560a16a7a3ce244c4ec83569cd52ec7,True,Tests_passed,54b465ab5a627006d402301d7c245fafd6ef29de9b2d2c6e192f94d6417a8997,True,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,c02643b2efdd21d2b9e2a247f6370d22beb7b4060cc49169b4178acaf16123ce,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,dd8f339e65965937767b23a452a9d847306c1f98859f3c29e4786c87e05c1b67,Merge_failed,ef5a374c9424ed4f345c1af43558b4f92656085592b8a3190159020fb2f18ea1,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,b210ae4024bd29b735ff23b28431c29ecddadb617de0cdcec0b1eeaf6341f6dd,Merge_failed,9bc7cd4f2029c1b4f556644f17d6bc6d696d66f830f826fcc753ffe8895b995f,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,339492c7a79844f5615b619820055536070d131924a016914126589664cc8941,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29,Merge_failed,7cc28f595bb60e7fe879d80edd8f2ded6872a66cff4d7ced87d0d7b560ce5a29 diff --git a/results/reaper/merges_tested/tdunning/log-synth.csv b/results/reaper/merges_tested/tdunning/log-synth.csv index 5e3817c034..c60fe6a1a3 100644 --- a/results/reaper/merges_tested/tdunning/log-synth.csv +++ b/results/reaper/merges_tested/tdunning/log-synth.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,83316ef849229d87b24ce5d0d6d54f1f76764759,9dc731e51f7aff44ef46e482eff7347ccbb7f964,0bd3362f7812caacc674024dc4cda930a158e634,,True,True,True,26,74,944,4,True,26,Tests_passed,c51ac52e88aa2f1e3863298a11b40c3a9a99311e221123f8a4e613c91f702922,True,Tests_passed,83b269ceac94ef3691fcb2d40c6afad1169c46a8e7cd406812a82538efac5c61,True,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,56585a9fcb31b1620e93ec10d1c477609e029ca10790d94b5e7d06e3edd302b8,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,17cd769645ccc98c31a139a7df609a9f26d2310e2b6d7b752e3eb142732bcd63,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,18fd40e797293b6fb94c21da387c79252acc5a846a021860cc16d1e4fa121b6c,Merge_failed,6143455cd592fd3f48f70feae8ba8ab5697bd043c04fbfc1d0d8d867ee39cf96,Merge_failed,9ce9410fe9796f37b5a53cefcff51218473799fb44d32dc843498eae60fb2812,Tests_failed,c3c67d16f9dac772625e3da2b8f715b00e883269a4787b29c1c9df6a8eb39368,Merge_failed,6143455cd592fd3f48f70feae8ba8ab5697bd043c04fbfc1d0d8d867ee39cf96,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,17cd769645ccc98c31a139a7df609a9f26d2310e2b6d7b752e3eb142732bcd63,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,0cd4d9617072735935af9d17a224809219f55ad8e21267a2496f997c46c2938b,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,af521d1f82e89e9ab18609eef332d19d8b3bc665b4fcd93af505467ebb7370d7,Merge_failed,9ce9410fe9796f37b5a53cefcff51218473799fb44d32dc843498eae60fb2812,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,56585a9fcb31b1620e93ec10d1c477609e029ca10790d94b5e7d06e3edd302b8,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0,Merge_failed,8c16f4e9d8906ecd09e9312fb18da7848b47e7a2fe03f8e3f5210493203ff0a0 9,refs/heads/master,2e2af435a69c21d5c6ad352db9c030ae8e0abf89,1b65c0f09bb7cb301c4bce5ff90700ef7b43b24b,c8fae8ddb4b84601bdf5ab75e1674b512a129ac3,,True,True,True,8,9,42865,3,True,8,Tests_passed,4512c6e152d4ea54ff471d3459ee563966be8d63a6f860ceb09c9c54c7430f81,True,Tests_passed,691ad4c2f8927ebc887c33c802ba8031ba86bc423406f275a570edc990691176,True,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,924bb9c83daa2b2a366a74efc2dda24ac13404c320092df74eb3498a884d5546,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a,Tests_passed,124b0d823f2eaa050b9405314d1b756213c7c2ec3ae3ab08abad79291db15e2a diff --git a/results/reaper/merges_tested/tdunning/t-digest.csv b/results/reaper/merges_tested/tdunning/t-digest.csv index 659d800adc..39e27ab2c8 100644 --- a/results/reaper/merges_tested/tdunning/t-digest.csv +++ b/results/reaper/merges_tested/tdunning/t-digest.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 30,refs/heads/main,f028aa397892b426fe384f551b7ccc36b2f1ade7,2460bd11d91a2a9a2e1b4eca0c20b005e856effd,f0ca2a55413b4b8346a7e7a7ba0bcbedfd411aff,,True,True,True,13,55,218.0,4,True,13,Tests_passed,783d6dbf5fa1370e7c447d893f1ced461f7194c88d0c06ebb460ced4b9651709,True,Tests_passed,f9cbf54b3bba2f3f6dfc3ea779e24dcd02e273a0839a3289b86b6576d4efd874,True,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,2528ffd2545ccd1450c96984330fab98b8d99526e24547bf9a50bcc30681dd15,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,1762b27e2256979dc9493caa2382d27eb93664ee816945f9d99a3e426e958a5c,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e,Tests_passed,a5da650a93d9756810b9345bcd9482cadc3c3836c3ee9c76007266b5d4a5343e 34,refs/heads/main,396e56c59c883e657776cd2b3e915f5d30dee5ec,c5342cc739b07c100a4ea194f77f1527b75626a3,a0360a481db2005674f43f28a8020f1b27cde83e,,True,True,True,12,16,243.0,4,True,12,Tests_passed,3d0428614c1e35ac346aafaf592bea8dfc22db7d48f50e2f7a8e24ce5c1ad361,True,Tests_passed,731679c5d3789c513ca806e0efe0bbd45f781b685cd1e7232548cad81e971932,True,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,d114622b3ceb782848d4b74f1e89a86382a29305d1896ed1a22837829ee712c6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,d114622b3ceb782848d4b74f1e89a86382a29305d1896ed1a22837829ee712c6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6,Tests_passed,4199b378d506e28a66a5b0b974b81c4d8f6eadc073afbf55ce61834fe3a417d6 37,refs/heads/main,09d73eff96297b9bdc793e345cbf8c1e18f7457a,7be70e77c8308e870c6bddede676fe9d9584c341,ab39ab0ed737509e37533c4d7bbe226a05ca7b02,,True,False,True,6,12,69.0,3,True,6,Tests_passed,79dcecfeee0ba4d41c0941dc592c410ccecf630f2bb64b3e31f31f2555ae064b,True,Tests_passed,22439211afd42851d9b1419ee01e63cafb703b1101d89f7c8b8c5f5c4f818cfe,True,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,b0942791d49f7163b7e54ee57a7fc77f8780fbd03ca28e88435836b4cf939e91,Tests_failed,ca3afa9c5bc30406e72144c7fa1995d73c01edf4f4e9ef140bb2174d9bd8789b,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,b0942791d49f7163b7e54ee57a7fc77f8780fbd03ca28e88435836b4cf939e91,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a,Tests_passed,61beda71f9d5087a1e7b1c06040171732b66fc904da004236a1991a9c9ef422a diff --git a/results/reaper/merges_tested/teamed/qulice.csv b/results/reaper/merges_tested/teamed/qulice.csv index b7646740c3..b35f8f2fc0 100644 --- a/results/reaper/merges_tested/teamed/qulice.csv +++ b/results/reaper/merges_tested/teamed/qulice.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ad93f0b28b154ea6cbd4901d05f3bedc74a0ec82,d577051ce5ead53e8c888a9be4624835169cfc68,4b1608ac72f3a55879cc4583143355faf3982981,,True,True,True,21,47,384,4,True,22,Tests_passed,ecc11d354ac877a3b85318e386e12953880405b21d219f54a7a9bd5172e8e594,True,Tests_passed,02d78e81a6e221767be4ff4f33fc7c29f8c16406a4ff54afc6981d0c7a40c334,True,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_failed,5ea8510f9be11f455bf7b158fac29149510b7cfeb13bdeb0b66610ba7a76f4cb,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057,Tests_passed,327215a0ecb81088cf87cfd1c52d9a836cedd2a6c9ede759381c4ee2bb4f4057 diff --git a/results/reaper/merges_tested/tech-advantage/sonar-gerrit-plugin.csv b/results/reaper/merges_tested/tech-advantage/sonar-gerrit-plugin.csv index 8035bd3e48..024224706a 100644 --- a/results/reaper/merges_tested/tech-advantage/sonar-gerrit-plugin.csv +++ b/results/reaper/merges_tested/tech-advantage/sonar-gerrit-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 31,refs/heads/master,7599e6becd5b64bb5a00786c488b037f257b2f20,fabf6eeec8809cf1b9f7e775c07db71a41578dfe,df0d909e3fe4165912b13a76ad6ee40bca8b2eb0,,True,,Tests_passed,0d70fe434f25b498fdf5718709d7e7114e72fb25b78c94f2186f16ed2d7cb286,True,9,15,,3,True,Tests_passed,2ae4f768488199e8511c6de69c952047a050633ad5b1bf1397d6f88898ad8ed3,True,10,True,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_failed,a0ebd7c8629b7063ec6ce839fa9ad0c87ee31b1d7ec5bc8e5dc0ea8506ca3d30,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,76fccb837b11e0280ffa1c266a51509836015408415b40d6f5743690ddae0bd0,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f,Tests_passed,d4d684e79571243fc246b10b0a3e113af0559ba89c5e1738d5dc06de4756365f diff --git a/results/reaper/merges_tested/techblue/alfresco-restclient.csv b/results/reaper/merges_tested/techblue/alfresco-restclient.csv index 34feba807d..27898a11c7 100644 --- a/results/reaper/merges_tested/techblue/alfresco-restclient.csv +++ b/results/reaper/merges_tested/techblue/alfresco-restclient.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8e71d5b8d714d63b1c3cdd4b8d70de278f04bc07,039b6f1fd1e3d214a90f74ff0c60319be73f0e24,d803b272aa0c08461eb4e0e9c63e12be5ebda020,,True,True,Tests_passed,7c128dff941dbe2fd39139010b2994aa344030a8cc92ed36f19c8095c583a2f6,True,30,92,847,2,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,30,True,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8af751f284d8f9da90fb47bb9aa293122e8459085c177f1f92696d4bdc908a96,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d,Tests_passed,8bd1ce7ba526cdfcdc41c7f2dc40706e5521801fd76ed33c92f06735710a288d 3,refs/heads/master,d803b272aa0c08461eb4e0e9c63e12be5ebda020,90eee0a764ea101a01fb540a9866ff3aa892db47,0fa7725dbb9300d05338e9d1437c4c796c6ace63,,True,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,22,65,750,7,True,Tests_passed,ab261bcdf25f8c027a4136d17c8e199cd86c49e0ac2cc8595e80ba16e03f4773,True,25,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,b84f4096e9da8905e67eca879d4647ef01fb5587042532f5344fb969ff83bf8a,Tests_failed,20e5ca37a2150b8a75517d21686b525a66984b6738d55e041272d80305656fe3,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,b84f4096e9da8905e67eca879d4647ef01fb5587042532f5344fb969ff83bf8a,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac 4,refs/heads/master,90eee0a764ea101a01fb540a9866ff3aa892db47,4c9b74a8e152894c7b6b34abf5558cb5fb99472f,87d56a1dfd92cc7c21a08fd21d9d45ea79ecbb9a,,True,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,True,25,70,763,2,True,Tests_passed,3b1cc69c3401ca24fb38967315871885dd78e59e9f4e4b3cc5dcc1bf6dc7b3a1,True,25,True,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,3024d4c1650e7ef20a6781cee67a931ca3bf2034249011fa98dfbb4b3d5c8de8,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,3024d4c1650e7ef20a6781cee67a931ca3bf2034249011fa98dfbb4b3d5c8de8,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac,Tests_passed,53d0a41787ec55dd2ac86dbaae3a91e149beede903f667fb597fac5db6d4eeac diff --git a/results/reaper/merges_tested/technicpack/launchercore.csv b/results/reaper/merges_tested/technicpack/launchercore.csv index 39a14ff747..52ac635a20 100644 --- a/results/reaper/merges_tested/technicpack/launchercore.csv +++ b/results/reaper/merges_tested/technicpack/launchercore.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,c1401798cf940d83580de9cf12c2dce57c096b2faa509ab14cf33dffdd4c6001,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,d043b07a00f09f586f211cc5c188eef7892b5311abf7f9819bf0d44f3ecbd7ab,Merge_failed,e08d0809606ab61492b275ecd38d75eab7991a9bf3f5d2960ccb5773c54a282e,Merge_failed,4ac1958198ddcdadd9ae665e250037300118a39eaa37f421fbb1179721aa556f,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,3abe4e0c69d0f2ba93a3a2bc5b8221af24f154936c6914b34f21daa64877ae04,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f,Merge_failed,33344f2923bd98b59cf3c924faae6142304c2d276ef3b82731fa6731dc390e3f diff --git a/results/reaper/merges_tested/technicpack/launcherv3.csv b/results/reaper/merges_tested/technicpack/launcherv3.csv index f94c4ed881..9f7db168ff 100644 --- a/results/reaper/merges_tested/technicpack/launcherv3.csv +++ b/results/reaper/merges_tested/technicpack/launcherv3.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 42,refs/heads/master,dc5576913ec4dd92a37970d71c090d7d30cea252,d701f674de55069d03c389667d9a44abe38d351c,3bb4f8e1e39e08783e4df21021c37bc0d00ec3ae,,True,True,True,172,405,12003.0,56,True,197,Tests_passed,8650dd66d34330339eb4cdfb9d619cbc4280a9bb1e17cc891e4b4985122e3d8d,True,Tests_passed,52a76a22b16d44d65391071675d005fb07f84f5bb701a0a67de9d2aecf6200b3,True,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,fa00f2e7b1ae394710e8007402bd0ed1e64ffe7b2caf827ce919d73652128c5e,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,d8d8763b8c828f741c68d76561e0e777b0259d2cd00f292751178ae47cbc5b92,Merge_failed,6e268244190b4b344a9e6d34f7c25461b03dfa2e3cc09e86c830ddc4806ee82b,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,7988d1de58d8a7cd6f179efb89919b82a7fe3837e271a16a5dac2720eb5e2e9c,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,365aaa98aa090f7781ca55a14f37d9b6478d5e82e0b76ccd9ab028bf6af4175e,Merge_failed,af5ecbc5920bb2ffc39c0b81d52f006b2503c2ca69d626bbec29bc86acce49d5,Merge_failed,ba55fb901c65a2e130f31db1fbfabd7a2eddce5282b72bcf6d0bd6ed63fd88cf,Merge_failed,73aacfce690d139d1fa86ba6f3d994c9be921f8fb6cf6b1221bec6ba4b8ac603,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,686958292312c1ab03f311e5899a5545a9996636d5b4da2c54c2d94f8daf4e0a,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576,Merge_failed,436d5cca694e246527d1cfd4b5e4b97f6b8813b793ca1a49f70fd02a288eb576 diff --git a/results/reaper/merges_tested/technophobia/substeps-core.csv b/results/reaper/merges_tested/technophobia/substeps-core.csv index d824030946..90edf250e3 100644 --- a/results/reaper/merges_tested/technophobia/substeps-core.csv +++ b/results/reaper/merges_tested/technophobia/substeps-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,07b94728d642a789e11b45c284432544e6a013a9,982720d6b47d67d338b4af39487f52731500066e,0e08102f130e1d739ae7817224315b4608324526,,True,True,True,61,668,4287.0,5,True,61,Tests_passed,c4037c0e6b73121199741ada7d8c9765365744051cf7ffd757a5a731822f46f8,True,Tests_passed,452f1ef83993cfcc6a3c675604ff2e7a4bba5bc0c0b8707c4dbf64de774c2a83,True,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,7a8c68287ec73b6318231a953d726c90b83eebc65b151022475206187e9d81c0,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Tests_failed,dc7d72b4a2c22735e07810d3e97c5fb422cf327377be7ca32179341f4bfb82fe,Merge_failed,0a9f1ba970a505687304bfdb0653cb43a1bd9e21e54bc76be6b271639f3ef44b,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,733a967d53962cd5b3d2f387162708b9f4a8aeaa435659af9ea6e4a53ab68521,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,d5dac0af6372a16344812c12f4e14f7614b1d1008041cdb7b3cab8cd594eea1f,Merge_failed,e2a5142f9ba5046c872765537b03d16b056181f1a8d4cc76bdb82d99b2152804,Merge_failed,d767b91373beec30dae73f9b6ed16adbbbe422c5aae5dcfbc28d5a4b8f4b87d3,Merge_failed,0870d70e8504501cd927edd00c8f3190034234ea214dda86f924a94c7aee7078,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,7468da8775fac3348ebcf43cf534bd6d2b9c5e9f5af7928b9f47d54e02010913,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a,Merge_failed,59ad76225dd893c6be2a47826d3dcc29da2382afb5bcda3abccbbdc941d98a6a 31,refs/heads/master,f51e19b36c2a13d3d11fe9744381a0c910d61c6f,a171a4aeb953834c6a2526fb0f47dd7a1eb2b6ff,c4c32777666ccdf3fda101cb9a55a3199021863a,,True,True,True,40,365,3556.0,5,True,40,Tests_passed,10847221e373837f11789ec152df874adeded28f573cf65b9ec55205ff038bd0,True,Tests_passed,2f2a2d670e154042077a9917a28e3dc2886a87b171edab42ed286e03e69c3749,True,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ee83a3ecf5a87cae376c90b650d4b586f5442a2c3a9b4600acf952dae6a15f38,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,58418f1cd5a1852fd9d3763a2a08b6af1e61a0d1343b09a614c911b3b3a765a4,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ca315c71525a5fc2a8210e3298fadd7b5d753a43452477664b92d0c09638f0fe,Merge_failed,b3718983f6bbe2f59f6ab6abc114099271f581b759c093aa94e3bde0a71de698,Merge_failed,52b0efe40de37c5a7a4275a17f8677a250848ea26524b2d6898bd78a98227151,Merge_failed,95855e8d32d43f37248e0ba9a42852f5bfbd8959dbb0c54e4a80f453a830b623,Tests_failed,ebfb6165437c11ede12bdb93a601aefee03f6cf1433bc5f4fd996ac3c230bc99,Merge_failed,52b0efe40de37c5a7a4275a17f8677a250848ea26524b2d6898bd78a98227151,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,58418f1cd5a1852fd9d3763a2a08b6af1e61a0d1343b09a614c911b3b3a765a4,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ebf53cc96063a7e7c2b811f613f1e26ab38735b41e52c73a0fa1f4ada8bf042f,Merge_failed,ca315c71525a5fc2a8210e3298fadd7b5d753a43452477664b92d0c09638f0fe,Merge_failed,9162337c4da733eccf6872d28e1377cdb37ef7e949e4b9fc1f8e4301d4357642,Merge_failed,95855e8d32d43f37248e0ba9a42852f5bfbd8959dbb0c54e4a80f453a830b623,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ee83a3ecf5a87cae376c90b650d4b586f5442a2c3a9b4600acf952dae6a15f38,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f,Merge_failed,ba4f69e12d1099aa16fe19f3c21528390ca9b1c5864cd3fabd0ca43e22edec6f 42,refs/heads/master,158700c1f3b0f4508a9b2b75fbd43be18f5fae4f,c0f252e6d61bf5940daa407c0e754d200da7710f,7f88b5fd1e4f634a002902e393e3cb1f1f1c177e,,True,True,True,12,96,2307.0,4,True,12,Tests_passed,6488b7ce89e9e1ed52e2cf1e3874d947b87c3dd122c16a457d7a5231567054b2,True,Tests_passed,795ceeefa61996f8d731b42ee34e40890bbf4db1d6e222c3546ba544b20fd7a6,True,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,1c4ae906fbeffc1183393f0a45fd1a75227bda4e1edf21dd5410f4ccc30cd0b9,Merge_failed,1bc0118173592da297bca736be1ef123f8bc4de0ffea6dc25e9e4030457d012f,Tests_failed,30a6338b143d113f5812c2f70fe2d022baba11fe131fa527297325efc5de84b8,Tests_failed,2c787928ffa030b1991264d3d79a4b3d0edbe063d1ad3012c0d3b50e541a8ddb,Merge_failed,1bc0118173592da297bca736be1ef123f8bc4de0ffea6dc25e9e4030457d012f,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,7d8f116b54911eaf57182d6ccb349b6563e88589b4715e5a6b89d51a693e9734,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,eb635e31823a3e004347c4e5e48480256908a51d3cccd8110c126769b71bfb49,Tests_failed,30a6338b143d113f5812c2f70fe2d022baba11fe131fa527297325efc5de84b8,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,c3cdf806a79d8be37c64fafa6f17042039c83894738830041653a72c889ed6ed,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e,Merge_failed,994851df067d3c279be0f2beedce44bab647df39fd9584a416bdd4897aaa8a3e diff --git a/results/reaper/merges_tested/teknux-org/jetty-bootstrap.csv b/results/reaper/merges_tested/teknux-org/jetty-bootstrap.csv index baca66aa93..d540ef964e 100644 --- a/results/reaper/merges_tested/teknux-org/jetty-bootstrap.csv +++ b/results/reaper/merges_tested/teknux-org/jetty-bootstrap.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/develop,6a9f52a5377a484397eeca4b0511f356f493696f,b5d69b0f71bc1c237a812300dc16d329c3168af9,17deab171882d57f5d02052ea6e631cb11aa0d55,,True,True,True,26,138,2386,2,True,26,Tests_passed,d16c36cf32321568dc09a886f2ca9251ed8dd7a9446205f671072016ca8a5ad5,True,Tests_passed,f2e4909ccc10ba1af65a62ec0cae23af0331e8fc10a800aa2ef2aa9cf7df80b3,True,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,423e42fd9f24726f4b24b0bb6e4b2f88f73aa656f4dee152ddfcc7212913ed6e,Merge_failed,70ed7009eafae7f56fee0ba752662d02de6386f91d7a46d911755a6416a2d6de,Tests_passed,d0b92e71809af297130f296fd4e21c588e6ecc2e5e13ee97ae4551cfa82177f5,Tests_failed,6132b1b41239be17928385f026aa4df360b067336260495489851b0e5d353b10,Merge_failed,70ed7009eafae7f56fee0ba752662d02de6386f91d7a46d911755a6416a2d6de,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,2da746fe714499c3fde379d1e8d2a151fa9a917262fb171c6a6379faa1d7180d,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,ea1b9b051df7221c83b28ad13421d163bf044cd61775d0a499a69aef4f10a8f5,Tests_passed,d0b92e71809af297130f296fd4e21c588e6ecc2e5e13ee97ae4551cfa82177f5,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,1c248af72539d7d630031ed58159c5dc9efa908cab8a7d3d4657d6723950f5a2,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8,Merge_failed,b3dfefad31fe3ad268215fd8816a3ff7a1ee20745415b985bfb391cf9691dac8 5,refs/heads/develop,17deab171882d57f5d02052ea6e631cb11aa0d55,46488ced29a30f06d91e594c3e8e31e4345410d6,9f9fcbcf522fd5cf99bd44b8dfa146bd4bfecf8b,,True,True,True,17,105,1757,12,True,19,Tests_passed,d048ccc41e8a36c201a618801271ae063c616800933def0d128a3d0418ef2901,True,Tests_passed,7061200a232d54e21761bb3a497208a97c2d70466f7787f4b61516b866987e72,True,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2b8a6a2902f9fdd51646e5e1120099e0bafbc3cd9f1b4d7f84f2d4057a81e5b8,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,0f73de83f944567a46dc00878a55d6f9f063678d3a318a4580a67a0ec5b88c41,Merge_failed,65d805f0945e58f9bde1d89336b36562b9e523caffdfc158dc0e50a574f14377,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,08310630116a33d78f3cd13b5bddb3e4c3eb0facf3e7f0e72cf4116bb9e5a721,Merge_failed,d1cfa35c165c3410d4865b09ade5dbed9016fdc520674b1477fbb02c475ed724,Merge_failed,2507f6fa45e99cb3e9ad178ffaefc69d1b64aa40d707858cbd5e61c7fd09de2a,Merge_failed,cf724f55cd08470d33615fa849e487b84caa7ff81082404b8bb67e37fb287406,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,d76358c26ec47f6a789ca250bff5137b2ece7f11f9ca52a78c8f423c1b810b5d,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896,Merge_failed,6c35f05f30b320dcaa775e51960797847f2bf932ebab1f05e9234baf19a98896 6,refs/heads/develop,2852e8553b9363628dc21c1186599e714ee1cdad,d6643caba7549416e944aa90fb9d77341605ec61,3b2a04639e85573dcdb099ba8d72c7b8f1856404,,True,True,True,20,147,791,9,True,22,Tests_passed,aca73dba94f9bb09dc9195d79222708b927473c64afe13c8f9713f32e7e17d0a,True,Tests_passed,84afe341c70057a6df2407fcd28d96f2a19fec95c0ced69c792befd83e2ca558,True,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,507ed489997618b4815bbaeadac28374553527a1cebdb8a7fcff0a16a2ab37ac,Merge_failed,c9c1feab03f2d9bc55a24d731caf27f77f1c9f27c7e466cfac33599d2f199c9b,Merge_failed,5322122fa164647f5ad6879d0a8f289066bc592165b2b664ac272b1c95d0eef0,Tests_failed,b8dc9e7e441911a25f0138468d007d7e861029cbe0e9e26e583031fda66999e3,Merge_failed,c9c1feab03f2d9bc55a24d731caf27f77f1c9f27c7e466cfac33599d2f199c9b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,5c12f3bbbbdac050d201a4507f1fc44ecdc5414c7f2687a2694351a3f4ef3969,Merge_failed,5322122fa164647f5ad6879d0a8f289066bc592165b2b664ac272b1c95d0eef0,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,3be99bae35230ebaee415dc4936cf785cda68b7ae50269604372f2fe1dfed49b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b,Merge_failed,f077adc7c5e317e1e46128c8b73e7782d6be3607782807c74b0582443585667b diff --git a/results/reaper/merges_tested/telefonicaid/netphony-network-protocols.csv b/results/reaper/merges_tested/telefonicaid/netphony-network-protocols.csv index 1993054f08..46383c1741 100644 --- a/results/reaper/merges_tested/telefonicaid/netphony-network-protocols.csv +++ b/results/reaper/merges_tested/telefonicaid/netphony-network-protocols.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,07041eaa5a5fe329a0efbcecbe079f3323b65462,cb0053c31186271ee39b7c5daddb1eb9fd88daf7,d4e3ea6f26bb0413528ccc36a566193cdcff34da,,True,True,Tests_passed,c4ae8338aa0fefc439526a3c6dd7d2ede514a3caa2f1984085402ed266637269,True,27,69,2109.0,2,True,Tests_passed,df775d0dd2635c873fa4e808030416ff7c2e73ef711d0c2d28b3646664ae040f,True,27,True,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,32f7e5c26f583c074a6cdcbe90e96ecc2dd442ca78ec7329d5771d7114454d67,Tests_failed,c2590ec7cb13de70d05b819adac396dfc15ebc3b6328206b2a35c9907c4a5e22,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,32f7e5c26f583c074a6cdcbe90e96ecc2dd442ca78ec7329d5771d7114454d67,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11,Tests_passed,39c40d7146db70cdffb2d4f476a7eff9a841b48d1b1e7fd934e7a5d362828b11 31,refs/heads/master,44919e4a94b5992d04186779c82da587aa5e3bc8,ef3cd2327f0ddcbcf186789fbf279ff312c45d7f,6c226b6329de94a4a026717628bad8f9eda81b02,,True,True,Tests_passed,a95fb0bfc0ead9397c75ce5ad54d0f7d11d1c76db19311af2f085f7f13556c4c,True,20,51,1698.0,3,True,Tests_passed,6f494c650b125f509d23c1430260b0c7f266bb80bfa8631a1274d4d7a9a8aa45,True,20,True,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,4a0ad4325e08006f95ba15fab41f12e4446b3c83a33e6120bf13fd8d39a15970,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,9da1d56e80501a1ba7c402731ce25215abf476ff7f603aab0a118b4fa754b694,Tests_passed,fbd1d8d433db4afa8da0bd36b6be4110c3e56291dcbcabebffebff42fcb3ae8c,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae,Merge_failed,b2b348fa859f0bf3d7773d8b67f456df7482431ff27bd2701d4dd4a18ad29cae 103,refs/heads/master,cfab35baf55c9496446ba24b76345d8e52145511,55ac1055522700bda8d43cbabd6ea90fd4a7a188,ba458655337348a8057c877871f821315713eb82,,True,True,Tests_passed,b6ae5dd67077039308a0a66da76c755f158b8cb156a23992e0f7097c9cf3669e,True,10,79,325.0,159,True,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,True,164,True,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,a9f32ca3c2c3d9a318972aaab793e218a5e690bbc24f6d622cc4fd595ff98a40,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,a9f32ca3c2c3d9a318972aaab793e218a5e690bbc24f6d622cc4fd595ff98a40,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959,Tests_passed,d86b94f624d66dc44715c9ba9ecfd9037ddcd89eaba1cbdf3d0c98070f0d0959 diff --git a/results/reaper/merges_tested/termd/termd.csv b/results/reaper/merges_tested/termd/termd.csv index 276c0e2f93..13e66b988d 100644 --- a/results/reaper/merges_tested/termd/termd.csv +++ b/results/reaper/merges_tested/termd/termd.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,True,True,Tests_passed,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,True,28,172,796,2,True,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,True,28,True,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb 5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,True,True,Tests_passed,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,True,37,181,2394,2,True,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,True,37,True,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a 6,refs/heads/master,75f5c20e784c95a7d810d61508d3c6be690661dc,5c19495d24ba0737c9f85bf776587389fed17523,7fd15df092a23eafe8f3c6cd615f711beafc2679,,True,True,Tests_passed,427dfb68096f9363315a1037419f286f2f35fcee7cf60774d0139d7155fe0a83,True,41,168,2290,3,True,Tests_passed,95edd89cb94de2919294dece0ad9636a2079fa89387d94d1da037fe374c6d162,True,41,True,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,dbfb948050938f46582462c612ef25d4d3c9a719300d7211939192344c12b7eb,Merge_failed,1f888f86dfe02e7873c91d8c72d0cc8ad2ffd109e65993d2f9919e09dc34c678,Tests_failed,e0d413352c7e33ca89d09c184dd5a05c24f312121a2fd763e12bf35b6fc656a8,Tests_failed,47ee8a6a0be73497914f3ac836a561121336d2088189375620f5ff5dfcec9134,Merge_failed,1f888f86dfe02e7873c91d8c72d0cc8ad2ffd109e65993d2f9919e09dc34c678,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,1b17a44036c9fa6ae1eb8c1fbe8eb2c6e37fd00070854a38c4ea351756b389ce,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,25d1faac356bd356a8a242ace3cbe1a27a54f996166e6acd2110f8b9b0943ccc,Tests_failed,e0d413352c7e33ca89d09c184dd5a05c24f312121a2fd763e12bf35b6fc656a8,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,62439d0e5b3c746cd0575f78cbabc3fe0de5ed08943b9eca8eb92622da4f036a,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd,Merge_failed,69ddfdf46eb46bc6871cbc6948b5e9417fec8bc30354e4cb7094d1d287fff8fd diff --git a/results/reaper/merges_tested/testingbot/testingbot-tunnel.csv b/results/reaper/merges_tested/testingbot/testingbot-tunnel.csv index a0dedfb87c..6d4c8605e8 100644 --- a/results/reaper/merges_tested/testingbot/testingbot-tunnel.csv +++ b/results/reaper/merges_tested/testingbot/testingbot-tunnel.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,03f9869d5ccd78ac84c044fcb9fdeeed2b7dcf7e,f0d54b7695c5d52d74c1c9fbc1e3d1ef0f9a7f21,d2973a80f7035752b3aef640becd903bbb2e5daf,,True,True,True,24,187,1323,23,True,28,Tests_passed,e2e708ee3eea597ca1059b6ed69476d06c126eb0d644ea56825e9d157c4e09b1,True,Tests_passed,5fd252cb12ca97c213229b976901c529310aa6c65d1b9cccfd2510d0d46df22d,True,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,df9ce9f170360fcceadc84dbca0dd73faea4e13bd90e269a4ef0b90de4449913,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,374b4a70c40e37a740f15b8b1963237b53a4438f056aec63adeeba008fbf512c,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,e5266797ece6ee3eca5034a9c8524ddb41dc335d8f1514fa13cc31f71466fca4,Merge_failed,9ba20b4c70b24e496bf9a22838a8c616707a454fe06ae936fca0aa2d98518249,Merge_failed,22ba0e6379c8e026c5f213625f2ccc23325b954912fbf2cc643645c7fb74ce2b,Merge_failed,3f51d1cedf7ccabbba54b4efadb9c4dfb4f9773a8879fe3f4a538507a2b5706c,Merge_failed,8b94440aa8577ed1048781768804cd4c3416116983d593e5ad8e749184aa908b,Merge_failed,22ba0e6379c8e026c5f213625f2ccc23325b954912fbf2cc643645c7fb74ce2b,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,374b4a70c40e37a740f15b8b1963237b53a4438f056aec63adeeba008fbf512c,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,cfee67efe158bced57d6fb4b10408531a83bba7c6141a846fcdff4c5a2932a19,Merge_failed,e5266797ece6ee3eca5034a9c8524ddb41dc335d8f1514fa13cc31f71466fca4,Merge_failed,8704afdb4de48c75c3686163fc1733d878343ac63e7d7a771e74d961973805f6,Merge_failed,577568bbb6f967b4d4a358648cefba4532724f5d1baddcb5ae9ecbc0b6a277ed,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,df9ce9f170360fcceadc84dbca0dd73faea4e13bd90e269a4ef0b90de4449913,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf,Merge_failed,2ef2f393d82fdf1a4e1e4e9aa5803265b7f410f78f73fc4dab691dd44a065ecf 11,refs/heads/master,ce11672c43fa8e85ed7201f026f455e7382da7e1,32db181f6873158694db8e270063e62fef2c5947,facda2b071f90624ea57358b6613b9979dadb7b1,,True,False,True,12,23,181,3,True,12,Tests_passed,76ca400bc42ae691ec4003653e48bf9597a12cd525506661e6038f171f133a22,True,Tests_passed,ea2398f2962636de879c22b9fc3ad3835f7e0889dc3ffe426deb884e2223472a,True,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_failed,d144578ebebd1f9f08c1e0bcbadf52ff98df6b1d9625dd0fcc12802d5fca251f,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,f91b222d1b4c95aebefc0c21dfcb7bcd3ab5ddd4c6a07bce9ac057c2948c7909,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,9e5f08f5505b8b5d12cd72560a1a3cdc977718ac1018502a69e47d8d508feaad,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70,Tests_passed,2471f5b99886ea2957bf9163f6a7f4ece476654c8c4d1890d58330cd884b8c70 diff --git a/results/reaper/merges_tested/texasdigitallibrary/vireo.csv b/results/reaper/merges_tested/texasdigitallibrary/vireo.csv index 591a6d9365..2795dccdc6 100644 --- a/results/reaper/merges_tested/texasdigitallibrary/vireo.csv +++ b/results/reaper/merges_tested/texasdigitallibrary/vireo.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 67,refs/heads/main,9a9673c6c4970c9bfeb73611a371af40e41fed39,c5263f945ffd9bef76999ef2449c9d91e412633e,8350566fc6903fc90942378a8e4068f310e55d14,,True,False,Tests_passed,440e976e8c1d90f72b2a2f0ae9c394c5081ad26ef3bbb231cfba6b23fd0b8322,True,5,17,55.0,2,True,Tests_passed,2859cf8dea3d94633c15890a36c863a36451ada8af25cb542978db76471c59c5,True,5,True,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,9e1c96127ae268013fffe5c83b5349991273041f8ee30cb77e33802342af4e57,Tests_failed,0a6582684c43a6ffbd2c722e9934fb653468efa8eb56b438a4c77e7bca4fb77a,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,9e1c96127ae268013fffe5c83b5349991273041f8ee30cb77e33802342af4e57,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c,Tests_passed,d49bbbdfbf29360ace65d013c68c4d524c45b3580d4bea42d024f56a5f2f282c 80,refs/heads/main,4b5dc59cfe12549b797941e4dd561c0b6665b5cf,652d9f280761401d9f774df9769214bcf6091696,7d947fc0539bdb535cf3f63e51ee25f056a79dfc,,True,False,Tests_passed,db129a66d3a14cf0aa68dc89350f975f0f81a43a9fd301bf781dc447e4ef5745,True,8,51,241.0,2,True,Tests_passed,83e5c85de437b95fdabd72c20fd98096ff1958a8ebc0b76b5cda9957f71a3f9e,True,8,True,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,f714c078afeae3b76deb4c68a9595a4a087c4ff0da223d2ea305386ab962bb15,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,e7af0e24a3a1e50acb8216e22e43d95a50ab41cbf573d3123212919c1c91691a,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0,Tests_passed,2f96dbe38bd77c08d3735afcc0c8c784bfbd8d397f762e9e84d08bac11e6f3b0 88,refs/heads/main,968cc413bb0ccda9ab8fd5f9b4ccbf326ddfc606,40bff4fe50d3ec7c18c44fcd2983d3e7898d7ebd,8af62e6220be32e7db5591a4b802fe169477f10d,,True,True,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,True,24,33,146.0,32,True,Tests_passed,90dc7d9681fd68a246e217252b866c0bff4424cd1c68a5f3d498ad43c2529415,True,49,True,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Merge_failed,5bb59be4063eeb4ed329b45ec7db2f821e3175cc82caf994ae8da3377d24edb9,Merge_failed,07ca926bd4e8fcad221e2f716c0557f5b5e0da87ec048f14286e7f0f922f170f,Tests_passed,db10c263cff40b3e7f70afb19452741f9da9591fd026a66d9bfabe59f109082f,Tests_failed,0b7f6d953e84bc9eda1348f7f2840e35d8d233831f31cc7465fd21bc6208e69b,Merge_failed,07ca926bd4e8fcad221e2f716c0557f5b5e0da87ec048f14286e7f0f922f170f,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Merge_failed,61d2008560bc67b7dadf36bdfa51111c3be1c8b86b53700273de64b5698f7f14,Tests_passed,db10c263cff40b3e7f70afb19452741f9da9591fd026a66d9bfabe59f109082f,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508,Tests_passed,b09f1fb40101b1e47d1440b314cf6f7b79162f874c9693cf03242699d4145508 diff --git a/results/reaper/merges_tested/tgac/miso-lims.csv b/results/reaper/merges_tested/tgac/miso-lims.csv index a1c5367406..e488929228 100644 --- a/results/reaper/merges_tested/tgac/miso-lims.csv +++ b/results/reaper/merges_tested/tgac/miso-lims.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 566,refs/remotes/origin/pull/2747,fa7593e209edb54b5a5c11eeb0b07103c0b02a94,4507173cbdcd0d2389767fe4aeb43936629af24a,0955feeaaab386ffc307e46d7c65bbbaa953ee8d,,True,True,True,4,40,209.0,2,True,4,Tests_passed,36a1c96b6544b5018bbb56254c2f658744a0aca87cfa1e7284e6fa1b78384261,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,True,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,39c4338a9fecaefacf887140db1e315af14172a22d04d3c4ed5e02caa209af90,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,ea80f00b676ff7183f62c18f1bc985e1dd6e26e5fb78fa7637cde02d347d99a1,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8,Tests_passed,d00ad4abf296b8aebbb03216bed1fe1111c75ede2a216d9c0f401dbe5ef6c2c8 diff --git a/results/reaper/merges_tested/theholywaffle/teamspeak-3-java-api.csv b/results/reaper/merges_tested/theholywaffle/teamspeak-3-java-api.csv index 8bba999a96..27dd93577a 100644 --- a/results/reaper/merges_tested/theholywaffle/teamspeak-3-java-api.csv +++ b/results/reaper/merges_tested/theholywaffle/teamspeak-3-java-api.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,d41446711b7338794a8c348f50c7a53b99a08d4f,4811ec5f9bf8b712817248a7808bc329a3946189,a43548c29475a68e4e6b2b5a2a7dca5d803691a0,,True,True,True,13,52,534,193,True,203,Tests_passed,5f3c598a5cc7ecc43addc7b2286c8f86b8421a79ff9f5155e95a9374cb0bf4e1,True,Tests_passed,58c91f8610af1f116ca759dc3c846aea399da76a38be8d75dd8439f9f4311908,True,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,50953d3d312416299d57dfbf6c596b26e9918bf0e52b690c9b6b8fb79f85822a,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Tests_failed,1184b5050180d5d3bf7e361da946f8cad30c35110fa4b5f7d907d1eb6cc8d856,Merge_failed,f6b80922488a10de770ed993715c85f81bcdfa7308885f79b4ea439b91eb4c5a,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,336e91406d3e1131a1fea268e8847455674fd179e16017ff262787bdf20c7fa5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,36ca8d78a00d29cab06692c09a03cf60f2c39c3c126073a957d47640a1fd34d3,Merge_failed,11e3282b63463f2807d37f7fb8757fbe41d4c39ca03a7ce375fe3d0326f43bd5,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,359b9f3ad758e5e9190a5f0b4fddf9cf83c0018c1d76f7289ac3694ea2020820,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03,Merge_failed,a812d9ad7ae804e81073afd63f39c9bda11daf3f97ab5a36dc714b010fe47e03 diff --git a/results/reaper/merges_tested/thelinmichael/spotify-web-api-java.csv b/results/reaper/merges_tested/thelinmichael/spotify-web-api-java.csv index 16bb851fdb..2856fa4bce 100644 --- a/results/reaper/merges_tested/thelinmichael/spotify-web-api-java.csv +++ b/results/reaper/merges_tested/thelinmichael/spotify-web-api-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,486691eb608d4758d2b6aadb231913f9d1f0dccf,d78ea37c1f9171e9394128660eedbc0fd1d6e186,7683a952cc154155e775f98e41aeb23fa70e9d77,,True,True,True,7,28,456,2,True,7,Tests_passed,de790a0d58cefb7e3c67ff2e97297f288ae8364b76be222223da3399933612e7,True,Tests_passed,b79d5e3c4efbc0d8958a39c2ba0d689cd7a7fddb8832fc0e7b20825ecd040fe9,True,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,15b721252d88e66a1794367268e0e85b39519cca8e195e36f599787ecfb7827b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b,Tests_passed,8a35729fc67b3f7c820d4e08f1dee6643b64032cdca7730cbeae6617c888ef8b 12,refs/heads/master,8b0d292b1217c719fdcda58447b0e1d7218ceb2f,56776d05fcb1710309af5c974820e029321d1fcd,c94a32ab6fe2ffa6f5736d530f511df3bf8d6008,,True,True,True,137,351,1946,3,True,137,Tests_passed,d1a40930bf4cfe60db845bf7e056416fc8ab6d308588f0f1892264bd27febf53,True,Tests_passed,f2d93c53a1a952b0952b1f2e142931c018397a110346a2298acfa14f93d34e4d,True,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,6eb4f3164afc0c0bad6b1e6e7e4a53cf03168dedc7136bb3a0946deb27fb396d,Tests_failed,8ab3a670a4dcf834edf2d0b5343bfc5f6df1491eb6d2a26f4c258d06639d39c8,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,6eb4f3164afc0c0bad6b1e6e7e4a53cf03168dedc7136bb3a0946deb27fb396d,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e,Tests_passed,a491fd55e503b71c05d6a8c1463ccbab8a7bd7f00c89d5450f427ce76883943e 95,refs/heads/master,fdd0be7353b2a99469b5e243b7c3405d865fa6d3,edd5c033477820e4401328b7e9944105acf74e00,9c5f81366f25a1d3c4068978e6df695cce2ac4f6,,True,True,True,993,50452,268870,3,True,993,Tests_passed,5ddc224a8373d328ed931ffceb797dbf201f377d29917e7ee01b20da4d5d4d6c,True,Tests_passed,59e52e58879bbe961eca07a5370cedc462c6fd530eb278e2130ab124802b764f,True,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,867bcc7c3a8af60bf46807969a5b7bb563b661760d2658cfb0ef9150bf47eb0f,Tests_failed,5aa02850574d541b45c00eb223a268cf81eefc2d0a780a9bf426667dc1ecf14f,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,867bcc7c3a8af60bf46807969a5b7bb563b661760d2658cfb0ef9150bf47eb0f,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb,Tests_passed,80e40a0f15d485d25e468a9f7d873c0b6e9febad3a23c8148c040c44987123bb diff --git a/results/reaper/merges_tested/thenewcircle/spring-hibernate-20120924.csv b/results/reaper/merges_tested/thenewcircle/spring-hibernate-20120924.csv index 4f002d25d0..6cf6c7ee2a 100644 --- a/results/reaper/merges_tested/thenewcircle/spring-hibernate-20120924.csv +++ b/results/reaper/merges_tested/thenewcircle/spring-hibernate-20120924.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/remotes/origin/new-cheatsheet,7ec9c1b4bb69e9fbd58d5bef0bab16a09ca7bf68,a133049b147a4e77cbb9fd22068680adec4a8dca,28040ef7891dd8179ccfb25a3d3b1ef7dfa40553,,True,True,Tests_passed,98a80124f8d4c0863a2bd42439a176d63b90d0530f12a64781de8351e97140b2,True,21,41,496,2,True,Tests_passed,68e8015eee2df1f6c36c9288f4ead74cd1dd26d81d1b9470ff64dfd53a267937,True,21,True,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,d542f3bf343081fd66267d4fb614e02725311c37563457de5dee1f880ae3004f,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Tests_failed,04c806debd70d435e5b6bc15b3af7ae276b4d00d3b74f25b608eb8ee0c7323af,Merge_failed,e28d919ef2309e1d6343a458e87c450ce3f288aa32857d0699bccee82c4a0db0,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,5b3ca6ed9131191cc3674406d33dba169ec1c179a79587f81bf868fbe1cb34a5,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,2ab7ac45c464177f8439deb09eabe6dcc5487db8deab366c665f84b48a1d6082,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,deb2ed6dfb51761fcc829efa45d3aa3992c64141dc338d688a9daadbc7599ad4,Tests_failed,06c617e3a161245ed684e5935157f1259e697b885d6cd1185720341b32afe6fc,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049,Merge_failed,c25d093bc32389bdcd953f2f38b58455bf5a44e61bf5ff62bb59b24083217049 diff --git a/results/reaper/merges_tested/thepoofy/foursquare_v2_java_adapter.csv b/results/reaper/merges_tested/thepoofy/foursquare_v2_java_adapter.csv index 3dae76ecd9..337a978ed9 100644 --- a/results/reaper/merges_tested/thepoofy/foursquare_v2_java_adapter.csv +++ b/results/reaper/merges_tested/thepoofy/foursquare_v2_java_adapter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,dacecfc813308901bc17bdf1bc849c3ca820eb01,8a91258647f7283dfc59c43c5cb9e6947e668d16,7251dbe912796e499451016170d0dd1dca2bb969,,True,True,Tests_passed,c29ee449380aa2417cfb01a4e30ce6e1a22810275ef08fb3d474cc4c47fdc3bb,True,13,52,159,2,True,Tests_passed,ba1018dcc74b75db03bb7a977ce73f721171735346fcf70550b72f44be193aac,True,13,True,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,2dcb801ab82596fcc1e662c5594a3afba3770b10e1da5f65d02bffe533f1ae34,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_timedout,,Merge_failed,32e9717807e1661398127271feaed52f1a5361cebd3d9631499db97b473423b4,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,0dba0631590c7d401dec9e2c10e6f11ee894f4f49847bfa9362815914c40a2aa,Merge_failed,2c4807e91c103ee9dde0ecb8562fd440e93ea4da964592d00aa56dae8cf2abda,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,8d0220356866ecba470e7636bf7d9dc89be0ea6dee6f6dd89feb170ed201cad5,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6,Merge_failed,bf40535ebc6ca5bd0fba8f6f4d88aadc360eb18577469d9405609f9a6daaecf6 diff --git a/results/reaper/merges_tested/theupswell/appengine-counter.csv b/results/reaper/merges_tested/theupswell/appengine-counter.csv index 5621e523af..6aa21c220c 100644 --- a/results/reaper/merges_tested/theupswell/appengine-counter.csv +++ b/results/reaper/merges_tested/theupswell/appengine-counter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/master,303ad503d31a1b375af2a85f46a0c512ace1dfd1,40b139ac04cd6c2e2a4ddfe86bf2fff7b90a1bbf,2eaf5b5c27c22c411eb066f546cb5051b1a73a9d,,True,True,True,17,163,1959,4,True,17,Tests_passed,8ddc69f47b9783365844b5ca259198e29c2cc640bf60ac9b5bdda52451107b18,True,Tests_passed,185dc3f8bb12a351eb4fec64ca8012277f6264c27174b768a1320c7c08c8b5a2,True,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,769b3f8c4d88fdff7e27819dac57fac0a0d2e7864a1ca54d42c97e59d9076bdf,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,2e2635f3afd564c2d2f9269f54a6751def0a60dfbe55351b0f7a41a0f09a8192,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,c11450e65388eafa37a6074009aea4fffa667e85c16bf76abee6952b08a8e97a,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6,Merge_failed,3066acd9abe948f3ef1be888cbad336f4001fbfced637065aecfe69a735acaa6 diff --git a/results/reaper/merges_tested/thomas-joiner/hunspellbridj.csv b/results/reaper/merges_tested/thomas-joiner/hunspellbridj.csv index 177550d6d7..e673263db5 100644 --- a/results/reaper/merges_tested/thomas-joiner/hunspellbridj.csv +++ b/results/reaper/merges_tested/thomas-joiner/hunspellbridj.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,fc1359b4df627beb16aa657b3d6944e83b72fb9b,d1d5bf43bcc12996715030a6e73461cf507d7a88,275ff63bccd4e5d57f763840ef9eb118616bf987,,True,False,True,14.0,10,69.0,2,True,14,Tests_passed,b8a2e2248c52cb23a5e8009aee6124142b3988a3fd94effbc60ec6f585b509bc,True,Tests_passed,34077f203c3b3faf45c45fe12d6ebdf626e4e25dd64df57b67f8eaceb1adac9b,True,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_failed,1d7e619363e00637ef9b4b83b86022a0734323d9ec0fbce7d59830f4f2ab38f0,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,5a4ef5da0e3d0dbf8851ca7edcf98f8055abed3a8b3ccb4e3a967c1b857366a9,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8,Tests_passed,31f118eb40865af2c49feefe0e7d669b2ac75df070041f38ac953d4db40908e8 diff --git a/results/reaper/merges_tested/thomasjungblut/tjungblut-math.csv b/results/reaper/merges_tested/thomasjungblut/tjungblut-math.csv index 27a31181e0..b757318867 100644 --- a/results/reaper/merges_tested/thomasjungblut/tjungblut-math.csv +++ b/results/reaper/merges_tested/thomasjungblut/tjungblut-math.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,e93e48e4d4a1335c20d31794ba41eea7641603d3,87ca2f19f4519fdc576c7344aeda35855a369dd2,551e96fbb6c1231e912ea3110c677e2d0c8421df,,True,False,Tests_passed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,True,5,5,39,2,True,Tests_passed,0176f50d794e17693f7406820808543e7951cb19d7d44d4f2e8ae980ad90907e,True,5,True,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,3fc0c01ca386e9fef321d14e0c43291c1fec12009bd29db2410ab4ffe5ea4868,Merge_failed,7cada5d2a29cb68c216cebca2bcd7a4791ab6f5ab65b9bf0f9075a2456baeb18,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,63a4f7375fe5a525e714fa429998cb23add1095a2fdebf912a61388eeb75ea72,Tests_passed,cb8476440cb0ed3c9c887c73d34384abfa8a5da5d234f1c9f0b0b0a66306bc3b,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929,Merge_failed,e7a7820c1c1819475563754d94366ad128a8c3b3d123a2dfe4f05015533e4929 diff --git a/results/reaper/merges_tested/thoqbk/traprange.csv b/results/reaper/merges_tested/thoqbk/traprange.csv index 07a21ba7ca..425b08f9f9 100644 --- a/results/reaper/merges_tested/thoqbk/traprange.csv +++ b/results/reaper/merges_tested/thoqbk/traprange.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/remotes/origin/pull/22,8227158f2f52cc7a01bb3775e7dd0b6a3274e0a3,7efc7d786d536bac577259823f5425dd7b357bbc,2fda0c4474fc8f1563ec41b24d631118570f5203,,True,True,True,19,88,1466.0,3,True,19,Tests_passed,4d8e34a5097ed424996d23ebc356045a3d3ad38c5dcada4bfc800ff23535cfa9,True,Tests_passed,b95b1ba3a6af63749572a2696a0d13ad71bb37198d8fa3ec6ff260b1c802f19c,True,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,29e3b54d712a223cc40f98977f472bb8933b58c94f3a4ffdd6855fcabafc1a9c,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Tests_failed,d27fc4c23466aab78773b034ba8afbd2266342da5212f53c06e424ff9f0ef4f1,Merge_failed,77dafa6896bd1256d835ee1949e4282ddfb1cc06cb21e46c6041085882a40d34,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,f5ca52ea27430c56fc3bffb9e4efbc80cd59f2720eb668f35545e29b5a4463cc,Tests_passed,dded5c880c0124031a66c8e47064f74c61a701eb9a585c6cd17b0a54757df2b4,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,0fd6f976482f21efa0e2774199d61fd8a901dde4d1b1f81c02991bbeb9453f20,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc,Merge_failed,57e5e92599e380f2b137ad8d380cf5ed7661860b36a15d0349a58f796d41b8cc diff --git a/results/reaper/merges_tested/threerings/getdown.csv b/results/reaper/merges_tested/threerings/getdown.csv index 545bc021d9..5ecb524da7 100644 --- a/results/reaper/merges_tested/threerings/getdown.csv +++ b/results/reaper/merges_tested/threerings/getdown.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,ad32699ca3156b8423fe198b0486c346f18cafbc,b18f96c1d69599132c94fa352308223a715559b3,0a4bfe65c4f08e8fbff4db6a88211d742258e913,,True,True,True,44,241,1845.0,2,True,44,Tests_passed,86c6bc37113b6aeaf7f5814c861100e6d42e3fb15e95e595a0801e3bdd16d389,True,Tests_passed,6c2df12e2287a4cca52bc982a184f8f8d4b45898266f644526251394d75e5be8,True,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1062e27bb89f6581a031307603b90980ccc765e9b7bc7a3b42672734d369ef1e,Merge_failed,e38e3c41b366f9e0478a15b062a4dd5404dd670eb02849212ef0ada0c6cd91e5,Merge_failed,24522581c9a85f20aba00392b01ac3acbcdba222f4d3c136a238628fc0e862b7,Tests_failed,baa8592eaf50781aaf0295e3443966290a10f0a9559797b8bf90ed45fdc7c16b,Merge_failed,e38e3c41b366f9e0478a15b062a4dd5404dd670eb02849212ef0ada0c6cd91e5,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,850eb64637fb8e4bfc2ef066ecd9086eb14d3db5a23bdda8f66e703417b1dbcf,Merge_failed,24522581c9a85f20aba00392b01ac3acbcdba222f4d3c136a238628fc0e862b7,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,1204144a09a5f1c93c60d296378b4a77ae923cacc62a9bfea2c2134ea4e10066,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770,Merge_failed,60c142c499d2550c92e7926e0e904a6745d237611d99bc3200037e93910cd770 20,refs/heads/master,f087863098a6bc43551643f94cbe1893348773e6,b57524d0d6eaa00a1cd5737d446fa015c8980849,6af6081648724ebb7bc62448e44f2ef44159d810,,True,True,True,34,138,762.0,3,True,34,Tests_passed,9a1df4730b492bf5218d149a2e26d94b262b58a9711ba7f5ef62030d4f523877,True,Tests_passed,5539a376de9ddc0351d79618bd7c088a6340f9138643df1f7599881475381ef5,True,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,3a98ccf6b5314ea07a43844c18af944502f36fb94d0178643c68cdb63eceb31f,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,f283cf5d4a1a74e4f6e81e8e456e83f085bb06c6885f969529e1ec4c1e1c01a0,Merge_failed,e2b3c125122b99eafaada9277c85eb1b25bb8b8f6cc1885b62cfe672238a1715,Merge_failed,b091550ee257de719158ca2bc66af55a72e20d3bba043a1d545cc9f4b7a4cf62,Merge_failed,8e82ef666a4e29ae922e075b189b601501ce5ea455fa87aab546bdd4569c2d14,Merge_failed,e2b3c125122b99eafaada9277c85eb1b25bb8b8f6cc1885b62cfe672238a1715,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,d44e4030f3d7c30b926c93396442795445f0008a5107b4ddb7bd10039e8735fb,Merge_failed,b091550ee257de719158ca2bc66af55a72e20d3bba043a1d545cc9f4b7a4cf62,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,3a98ccf6b5314ea07a43844c18af944502f36fb94d0178643c68cdb63eceb31f,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1,Merge_failed,587cc43b18a9b34f94ae425844f74080de7a8a3be06bfe90df7609be96c278b1 21,refs/heads/master,ac499c1e3c4dc81fadfe3e64e617357892c5d0e8,c45615f0a028cc373788e47a58f9b7aea03f0b63,0d384966a6af9556c2838d3d5ceb401e494e5b5e,,True,True,True,6,29,141.0,2,True,6,Tests_passed,880e83997fa9290fa375e8aad3f400d3101df484c76f7f49a66119484c774da5,True,Tests_passed,81a59d05ff685c264bbb7f7a7fa0ebbdda7ce3f13fb857a9ec00a802763be5de,True,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,09a01c09e5c4f72cb8984967221ad4612f456d76b47f863d90f65e45cab35417,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,09a01c09e5c4f72cb8984967221ad4612f456d76b47f863d90f65e45cab35417,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f,Tests_passed,4ec799e2dda3fc1eca2d4fe8451aede02589d0bc254d45ed76eeab27e346f31f diff --git a/results/reaper/merges_tested/threeten/threeten-extra.csv b/results/reaper/merges_tested/threeten/threeten-extra.csv index bc849b3d44..a8824aeb5a 100644 --- a/results/reaper/merges_tested/threeten/threeten-extra.csv +++ b/results/reaper/merges_tested/threeten/threeten-extra.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/main,f0bf686f1738f1d253e907670e43dcb57789a592,28f100b913b407c72fdcb509ff02eb6de4d68bb3,01f5e014d8e158e32353355b1c09956794c6d8a8,,True,False,True,10,27,235,2,True,10,Tests_passed,9414c830421dc01c4c1fab23dc6a1e2bb71e5db052b083acdedcfaf63e634cf6,True,Tests_passed,2798aab0ee424cc0d2efb1c737ea81b5d4b883790ec8dc6d5e6ee42e88e9abba,True,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_failed,76beeb909d7884bd25040e4ea4cba2087f7bdbf163ed103363cc0d27e9fdb332,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713,Tests_passed,b8dc26102859a852ec9fa1a5d67b8311e9c35a593009a0ee55e92f89a1a43713 3,refs/heads/main,0dd15948cedd9c1fe21d94982cf724bfd96753bb,dcbcd59e11e8de1e8b16f64fa7ce1b95524b51de,bc239b7c65adf8f3f708c8db0f14b55d044f3157,,True,False,True,3,4,94,3,True,3,Tests_passed,542e0c032bb22a350774bc8eb21e132bffd7028b6b46718664e1dee3c704803e,True,Tests_passed,c245b472a748f1588b9e6b0f8819fb32fa93562eb3a141e2b72e915f209505dd,True,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3,Tests_passed,86cbb07da1083787325ced9832a0826992781bf92b9a44f0727864ba2c3b70e3 26,refs/heads/main,a291dbf8192d922e5fc5f9e98d9ca768e0d62603,ad315416100173b72b82edd5eb74c5edd58969c4,85aa6b71253c8071f6103c3d1057f562d9295c26,,True,True,True,38,1086,5679,2,True,38,Tests_passed,822987c45baf110b58f3e339ba8833f30cba0738f80c8069307ed955b7ae1504,True,Tests_passed,757de6d242ade9a43a4c1b4fdca72465fabe1a5ecca7abb034da767a9387233c,True,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_failed,aab5861c55d84e76945f3e2f0f4ca79597a5e12be0d5abd90f1fe3c708e96203,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,734f25345ce032e2c60b7d1ee50072e501ebafb31fe61c535232a6bca62c6dbb,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3,Tests_passed,46e2f781ff73844d8d2221f9e1adfac4a8e3314a97f94b29db8d0e43571f43a3 diff --git a/results/reaper/merges_tested/thymeleaf/thymeleafexamples-springmail.csv b/results/reaper/merges_tested/thymeleaf/thymeleafexamples-springmail.csv index 6b57a897bb..5dd25f3d12 100644 --- a/results/reaper/merges_tested/thymeleaf/thymeleafexamples-springmail.csv +++ b/results/reaper/merges_tested/thymeleaf/thymeleafexamples-springmail.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/3.0-master,158fb6406b10311f114054c66f6206dc7e915917,9210b250b1667cd62f21b06849ca55d4fef2764b,2e149543aa353adaf99eaa544f2c78ad5d091bbd,,True,True,True,24,91,472,11,True,29,Tests_passed,aeb3adf5ff75668d4a1a0c0f0534aabf158afcd762f278d5a30038c51711ea23,True,Tests_passed,49691c320824661f6155e51f0219bcf10423dd997edd806f0e05c1d2e6429aa0,True,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,03cad3ba7bd5bcfcbef1e1af5cce620cd4be49dff444c1c25026294b270ef756,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,687a3ae1da9fdc2f4293d61eb23a5e46421372b37b9c937eafcbf2310b76df20,Merge_failed,bfe2dc75997ac853e7614c2bc1b704808b681fb7495994cd383f2a732ea3112e,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,7bf06174348f301075995d58e893bb247b6ed217b4a05c12591439f5dee4a2de,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,7348104793de2e0639d3f00b28fa6ea6995dc5bcfb75da2d22a7a5fbde26fd6e,Merge_failed,603e6290faa506118f9c9fe59a7954d7b96bdd4177970730f270bacf4aeac6d7,Merge_failed,2328255226c83fb52041fa76a4795597a961d52ba53ea1b6f300ef46312ad162,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,dccd9a7574f2966cbfc38d187759a66529fe280fbd43185214584c37fdeaa344,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1,Merge_failed,85307134829c7a36d99b0dc7e8fabed199c565463dd629b9e13ac2c879f19aa1 diff --git a/results/reaper/merges_tested/timroes/axmlrpc.csv b/results/reaper/merges_tested/timroes/axmlrpc.csv index 9ee7d22bf1..eda06289fb 100644 --- a/results/reaper/merges_tested/timroes/axmlrpc.csv +++ b/results/reaper/merges_tested/timroes/axmlrpc.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,be8156e8c76bb2cfede311ce136ead1916be2fc4,860c8ff40e85fa27d30c0c37fa6ebfe6688197d0,abab2528a322425135d44257e6efe3e7e361b6d8,,True,True,True,10,23,107,3,True,10,Tests_passed,3c502d00da89828d147caa07a3825a1d61ec315548c61a269234de0073303b98,True,Tests_passed,aec16f12a61218c227c51387c6fd8227e3d851d404262e9a122500dc548cf5a0,True,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,85427911b19bea8c11de42d025479b40d753f54a2ff53bdc193834d03fe9d44e,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,0644185610a260513c6c9fce0b58d5394e84f6c71cb11d37b6222cbe7ee733bd,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d,Tests_passed,fd197ed29baf1def6c039e595f544395674ac5a5a4783092e40a3b954cbfe61d diff --git a/results/reaper/merges_tested/titokone/titokone.csv b/results/reaper/merges_tested/titokone/titokone.csv index ad48b15555..bbbe4ca903 100644 --- a/results/reaper/merges_tested/titokone/titokone.csv +++ b/results/reaper/merges_tested/titokone/titokone.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,b4ac484b6a1a0484bc131e305cb531835efe9aa0,db2a1a74458f65887c532c52c60ab73d99eb6021,642f4a961a4c51b8baf679211a7e4de1bcc17b00,,True,True,Tests_passed,74cf1e3ed7e57adc6162b7432c67b363b79e4df1909f3524c2142fa3b2172d88,True,60,539,2631.0,2,True,Tests_passed,a23397a2d22680845537fca02f46c85344b1b7f5dd9abdeaefb9491263eed114,True,60,True,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_failed,71926a2dde501078bcc30f481319647fa8349af681ceeb5af9d2521b162e67a6,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8,Tests_passed,43b31786d2665839d51f4c47cf5ef62df4492f8163343ba0f141c203e480a1c8 diff --git a/results/reaper/merges_tested/tkelley-eg/collectd-fast-jmx.csv b/results/reaper/merges_tested/tkelley-eg/collectd-fast-jmx.csv index 84c35d51da..6e97edb311 100644 --- a/results/reaper/merges_tested/tkelley-eg/collectd-fast-jmx.csv +++ b/results/reaper/merges_tested/tkelley-eg/collectd-fast-jmx.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,da86adcc3eae767206ff283909d43d4a94cdd8b6,292d4b40fc4f7ce235ce8055efce4b5c272c8a07,b4562fd17641bb0a03449bea9ea4651d6ffc9f5d,,True,False,True,3,7,32,2,True,3,Tests_passed,c5b1f3bf2be7ec9cfe42c76b3634ea618b20bb92761fd92f0c63d7ea91c71e15,True,Tests_passed,96c4a5b285385e95748c2e79bd97cf6fcd80f2716d6d3728dee6b8d59eedc4a4,True,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_failed,cb72ffc0e807bfe83cd517c2a8feb1ae247bd9e88eaae3e8fa4209b105381c33,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,4bbf2eae730d792d8c1268ccad00a4bf6293c2f1bb0f2873b1e05a5b4254c168,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8,Tests_passed,360babdbb5e770e10a0cf7748cf10107ea72d01f7332ac30974a17fe85cbf9f8 7,refs/heads/master,558343d132f14530e6461b63753ee2120bb064b7,6b09298abb7a483dd870302bee69e3ea335b2ae9,d696a953632f0b4bdd2ed629504263151e2615a5,,True,True,True,3,6,204,2,True,3,Tests_passed,e7a9080c01a9157aaf6bcd93b47bb17d6955bd2077e739d54075a98c2cd37ac9,True,Tests_passed,3194e75f813adf9aecd15547376529f034f68218b5741a4eca14973d1f83945e,True,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_failed,d1969d8fbc5d77ed8c98c23e4682102171f594511e511f958d645bab01ac5770,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,d5c31caa2d1a93378bbd25f4cdb118f603c1c010f7b080f44f54217da4bff3b6,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,7bcac5fe3c17febf026a6d27d96a55f79500488aaf78af852777a718a7c65103,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170,Tests_passed,c9431e4ef3659bc93279da9e23ad9ea10eebf81893278e397ded96660cf36170 diff --git a/results/reaper/merges_tested/tntim96/jscover.csv b/results/reaper/merges_tested/tntim96/jscover.csv index b329566b04..694f9d98de 100644 --- a/results/reaper/merges_tested/tntim96/jscover.csv +++ b/results/reaper/merges_tested/tntim96/jscover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,True,True,True,15,45,1706,2,True,15,Tests_passed,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,True,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042 diff --git a/results/reaper/merges_tested/tomitribe/crest.csv b/results/reaper/merges_tested/tomitribe/crest.csv index f0d40ecab5..5a791de26a 100644 --- a/results/reaper/merges_tested/tomitribe/crest.csv +++ b/results/reaper/merges_tested/tomitribe/crest.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,bab409d203df1b8681876ae3df368f630f5ac104,6c8e1a6a9c929cb9095009cff33c612c56e9e0bd,ffcec54f11b9471df920a004acd68fb1cb9cc2d3,,True,True,True,32,70,592,3,True,32,Tests_passed,98753b4a77b11a3c08aca4f3af00ac38c6e30961f88a93a51c79aee98cd33d1e,True,Tests_passed,3d2646136b11fff4df80bb5ade0eebb6edd3d0deae041b1a15c6ba8b33f99adf,True,Tests_timedout,1e20848ccf797449813b3662b204ec617c7f16fc1831238a1ab750d980ab2b0b,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 27,refs/heads/master,d23c256ef0e1c28707583fd2f1738b932dd0e832,7b4318ffe350c221991bd51e6d59053743f284aa,81d39d8b802bb3a45408b0f4c0fca973010199ba,,True,False,True,16,24,91,2,True,16,Tests_passed,dcaabc6052244ddc997dfdd2a00da997799d6866b2fc621cda352ce59f8d11ad,True,Tests_passed,05848175f35a6b36a10f9b8f5de68e9b60fc17ce94d52e1ad85eb2955d745de6,True,Tests_timedout,5355367bc173cf0ad15bbfbde091e10b04d97d779ff761201b4ab29fa7032730,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 56,refs/heads/master,73469538cdc04b36ea4d09dccedc1cc50780904a,92bb9e363513aa63b82d539c7e641d117499084a,89c8e37844dfd7b4ae2aa96e246b466f2ed53c33,,True,True,True,11,36,493,3,True,12,Tests_passed,08a32c0f5bd630bb4ba391871d425976c34d70ca8fdcc8c7ce141a8f390ce1db,True,Tests_passed,a99f7de1c30f7258de8ce1ecbebbf3e286d6df86aa2b75b5d95ad831ed97bf3e,True,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,527d69ed31a7912fa6a89fd9daea9327527ece78a558fac540d50967136fdd4e,Merge_failed,05ad7f9ab85d5c7df720a5a60f2c267f7acb97ebe45e4dd5be6f86f683275cbc,Tests_failed,c63a4b1b3867d743146661abb4ea3ecbfda49a7235a6813036da8b52158fe551,Tests_passed,adf026f7dd139f1f9e4ffdfcab07f6855613ac11a83b12edba854ce8a279100a,Merge_failed,05ad7f9ab85d5c7df720a5a60f2c267f7acb97ebe45e4dd5be6f86f683275cbc,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,df61c5fd5ff869e830848f44a1ab51e79a76baf52596776ee6386d26580e1a7a,Tests_failed,c63a4b1b3867d743146661abb4ea3ecbfda49a7235a6813036da8b52158fe551,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,1603184e4ec3ed9b950b9272c23c741361f92356c50ebb06dd207ca10e38e330,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b,Merge_failed,e75e834ffa4c52ed53b20b34c378fec05bfbdf51a68755ab53b7fd010943090b diff --git a/results/reaper/merges_tested/torquebox/jruby-maven-plugins.csv b/results/reaper/merges_tested/torquebox/jruby-maven-plugins.csv index 1a3bbc3d50..20ce16e3e0 100644 --- a/results/reaper/merges_tested/torquebox/jruby-maven-plugins.csv +++ b/results/reaper/merges_tested/torquebox/jruby-maven-plugins.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 28,refs/heads/master,1571b55f4b470341a6ff1ef05e5ef3410cbc0418,2c944d6a12023c5ed33046fcc8ae99ce6ef6d146,3d550d56429568679fae47c9d1d640e2e3477cc8,,True,True,Tests_passed,fb5fe927362e284a846fce49ddc75a818be3bd204c48efda9267b523a1b8c7bf,True,8,21,217.0,2,True,Tests_passed,38490cf7d91b2434f63c5614a2d9495896940e09efd5847e0a3fc6c7d3bb6e62,True,8,True,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,afcef4196d1f34d65f80cf05cce9079317d7177fa2d06921633ce6142a7416b6,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300,Tests_passed,b3d240b9b169b03905ffa923b8104d2967ff6713d35dcb218fc988532deab300 diff --git a/results/reaper/merges_tested/tpietzsch/bigdataviewer-core.csv b/results/reaper/merges_tested/tpietzsch/bigdataviewer-core.csv index a765c254b4..e3f13bd001 100644 --- a/results/reaper/merges_tested/tpietzsch/bigdataviewer-core.csv +++ b/results/reaper/merges_tested/tpietzsch/bigdataviewer-core.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,572d4602a6282501870c01d3660fea9b22a817f6,e864f1f1e4d68db74b726e700642bbeffd9aa0b0,b9e308b70afb1addf3ffb8c5199d2db45f55cde1,,True,True,True,77,589,13633,2,True,77,Tests_passed,88a97b0a639adf9b7d3a072fb57160985a73b231e5e329dbbe0eb7cc7bd3088a,True,Tests_passed,adcc4f24589e64f9b43272f5bef04f30282bfdcf61b844eeac3c811426777890,True,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,8875db91331758210eab280667ec532ac48e7b446597d438c5de503fcb9af0cb,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Merge_failed,90a941b4bce9074fd99ef9f4863bab33a616e579ed2010c8c48008367401936c,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,ab39aa64c9e8408bc12edfa16c035b150b4bb41a1fa1f6b7bd3a48800534fc8c,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3 24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,True,2,5,36,2,True,2,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b 27,refs/heads/master,6a23498e499ca4705744af0848c6a07407b65c71,8020eb38683b97e2322a72c064ecb9963274f59e,dc5c477dec555f8dfedbb590a877421bdcd60281,,True,True,True,7,25,227,2,True,7,Tests_passed,41731725d6e3a3a69eedc42ae593502d2cfa47ba543312519ab64213d184c1e7,True,Tests_passed,2c7099a0e60764b445df1d134b448b23da26732f5a16bf5891f30c816ccf8068,True,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,f4e4fd46d54f3029f840f8afc08131a2156eadfcd390a702786ee9ba1f7834ab,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Tests_failed,1424246b744f1365191cfe7f32748550adf662e5d6255d55a20e6730040f824a,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,81b317e637a46ca09ec022392a6bcce240663751d2824ca46a60a4b06e9bdd03,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd diff --git a/results/reaper/merges_tested/tpietzsch/spimviewer.csv b/results/reaper/merges_tested/tpietzsch/spimviewer.csv index c71ebdca7c..f777d8a6bd 100644 --- a/results/reaper/merges_tested/tpietzsch/spimviewer.csv +++ b/results/reaper/merges_tested/tpietzsch/spimviewer.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/heads/master,572d4602a6282501870c01d3660fea9b22a817f6,e864f1f1e4d68db74b726e700642bbeffd9aa0b0,b9e308b70afb1addf3ffb8c5199d2db45f55cde1,,True,True,Tests_passed,88a97b0a639adf9b7d3a072fb57160985a73b231e5e329dbbe0eb7cc7bd3088a,True,77,589,13633,2,True,Tests_passed,adcc4f24589e64f9b43272f5bef04f30282bfdcf61b844eeac3c811426777890,True,77,True,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,8875db91331758210eab280667ec532ac48e7b446597d438c5de503fcb9af0cb,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Tests_failed,c0fa7caf2e0abefb2ff914b2a90102e83c75f68d647238e5e6de629adcde43a9,Merge_failed,69cf3265a6dd22f5cb66abab242aa7867e15671696c70362260ae63872b1ae11,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,09e465cd4e0bab32ad6f6507b3f47b3c988dd0a84ff44da129eef0c48792960d,Tests_passed,77b95a722cfad92034f57fe1d8cfc62bb0280494580438b38ae9d6fab15bdd0d,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3,Merge_failed,5024065ff1e40b1f5014676fbf19a7b9b6c4648410c6cc474fffa9d13dddcbb3 24,refs/heads/master,54cb54b307c27f74646dc0ea78db016fcf9cb0d2,693aa90f8e2ad7e12850fae4280db5bed001b8a4,70b11c5fc8bef3857117dd52b3c14571e18c6f10,,True,True,Tests_passed,6a60cbcf84d82f34dece0603bde589158428bdf8534868849dcb77708fe79873,True,2,5,36,2,True,Tests_passed,1c4a94dbc9686d023001ccc2807332f8e93c34619261212ded6c77028ebfe7ae,True,2,True,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,71adb9de7dcaa990e585b84230739e2d1de8da1e4ed47db2f89965d22ea5376f,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b,Tests_passed,f8408a753323758a2f63030db8df47d58a1f2ca32ec04e635b2016adb45cb60b 27,refs/heads/master,6a23498e499ca4705744af0848c6a07407b65c71,8020eb38683b97e2322a72c064ecb9963274f59e,dc5c477dec555f8dfedbb590a877421bdcd60281,,True,True,Tests_passed,41731725d6e3a3a69eedc42ae593502d2cfa47ba543312519ab64213d184c1e7,True,7,25,227,2,True,Tests_passed,2c7099a0e60764b445df1d134b448b23da26732f5a16bf5891f30c816ccf8068,True,7,True,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,f4e4fd46d54f3029f840f8afc08131a2156eadfcd390a702786ee9ba1f7834ab,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Merge_failed,22eeb156e3275475a5629ddb3f935ce36ca02f716a616f0f428b4678291cfd2e,Merge_failed,86118e91aa681328b2a61d4fbf16c17fc613c50e18c5f8e88735ba1ca16dbb2f,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ba7c8455e230453eafd74ab25339694ed49d112e14f84a4c8cb87db587d6a68e,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,5ec90df551253cf75e611a63faa9d60b34b7b3add5c82568de51ec1f08b61853,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,d850f236fcb4b432e985a052fce5235ebbe79980f73e0f9cc559d424f37f0ba3,Merge_failed,ab0036bb8a8a4a05fce4274a676e89cf63319f56fd2b0357b4c35feec8dfe3b0,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,946bfbc7f42ebb72180436e0c79a9a649850f54f680773b2194f91b563eb3153,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd,Merge_failed,ec94d0bfc8009fe0b96fcd90d6dcdaed98ed44577a2beccd8e4d4c19a8499acd diff --git a/results/reaper/merges_tested/tqh/uglifyjs-maven-plugin.csv b/results/reaper/merges_tested/tqh/uglifyjs-maven-plugin.csv index 5f0edd3fa4..ede7695e03 100644 --- a/results/reaper/merges_tested/tqh/uglifyjs-maven-plugin.csv +++ b/results/reaper/merges_tested/tqh/uglifyjs-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,c77d67ab1de02ab8fca05ea264d59a50ef71cbcf,9c75486c84fc0a219d63db87d46e782f6a771030,4ec7118d75ff23876d0d08e8eb65884bf64fc7d2,,True,True,Tests_passed,bbbc792e3b4dd1035526207693bf33adb93d8a35482fc4dd0bc2f37b692addd7,True,3,21,97,2,True,Tests_passed,dcd0ad0bfc7a8d47966134a33190681ec1670d6807f6d68ba179a7e9feb0551e,True,3,True,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_failed,2684607450b18a6c5056911fa3fd253ea4d9987f4aacf1fa45e6446275a1bc4c,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5,Tests_passed,2d72fc5750be49f820b6cbdfc60f4ed156ec15dd276d75ca6aff77a750875fa5 diff --git a/results/reaper/merges_tested/tracee/tracee.csv b/results/reaper/merges_tested/tracee/tracee.csv index ed90a5c723..46feecfd74 100644 --- a/results/reaper/merges_tested/tracee/tracee.csv +++ b/results/reaper/merges_tested/tracee/tracee.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 94,refs/heads/master,f75ef3990515f567880ae6045fed482ce05cc02a,62baa332cdbfcdd7955a7c72e827929e58254b04,d787ab20924a98d77c44dc8fe5ce5c27046d9b5f,,True,True,True,53,224,1825,37,True,57,Tests_passed,f4d6d2d762ce4d53448fe934fe38e8e2da67dc9b345ae5814b95fb39cd6e7020,True,Tests_passed,de969bd4b3c296052b56f85266ed185ab7c16b3cb53566781c5b510d78bd29b6,True,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,a38b6a5d40456754b09574e65a89bc30473fa3059c02f3b99684f747f58a7bfd,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,2e925bf820c236b24c3613242ebe42501af08ae8c5f515a7ac4699b584871e9a,Merge_failed,7714d860a0112a70558201c7d0643c322e7edc24d1a0ca34258e09ac13ae2228,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,4878cd826c1105bf47c8ef2afdf6d899e552c0efb91648e113fd64408846a412,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,f1d30c24634c17545c80e3009d86ff1bd80e88b1b602955bd66f7f82d7905b5f,Merge_failed,ea8b8ad9e0750ae6bfd9c596bb9523b677d8e0e85e43b3cba831705b6e1655dc,Merge_failed,b725cfa0ac1b6f5fd689ad8e521c86f05c29bcb7aee42170dad92f865e4ed271,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,e75a7bb8392ecab607f7b77cb01c638b0fb09242ee8ecb529323216116e08e03,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2,Merge_failed,175035c694330f6def932b3fb7af6a95db8b3f3569f0f018dd72dccdf3f375a2 101,refs/heads/master,330e569b8ab546597cbd82d43bdcc0b340e1c633,1688ed6eb0b27d1ea475493cd66ea2df3a50b3bf,09cb1f3663392108d2ca112b8e38281abb8076b7,,True,True,True,102,98,1199,2,True,105,Tests_passed,f080e9594aa600e4e59f74d06092a41ef34907ad7b60255463e3cfa4459a53a9,True,Tests_passed,f968a4088497317ac1adbee39163fd3544338af539d79c0fc824659a393f5b87,True,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,fa881d2d06452a85237f365143e8888239d7221c2dfade9ea789ad11a2a484ec,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70,Tests_passed,28f9536b50d7cd36e1784630caa1a8439af48e610089e7ea8f9cd7273f5eea70 114,refs/remotes/origin/pull/90,3d7cba11dab61c3fae92e9539b254198ffeafa84,eb1701c1733258f07f31d3c527524910048565ed,f233800337a4aeb33aa18ab3e1fa3270c07a4a66,,True,True,True,36,130,542,4,True,36,Tests_passed,4ea13fd34a9d788e365000e5225d13fa55f13cb68ad0e35b30713fc99ef6166a,True,Tests_passed,bff90d8ecabb516d85f47e3a59aa3f037b5e813fb5277185ef5ca972f1d48052,True,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,c4d30452813448d06419f0ac2aa873bdbc64fbe57c3d9764984b72182faf900d,Merge_failed,26df2eae3138f0b37a17ecdb1c2c951f646ed2fb76c0ac7fc922e0cb6c7f2684,Merge_failed,ea42db4d3c13953c41bbdf76b08647cbeb6ebd6613d426245425aaa67404044d,Merge_failed,ea42db4d3c13953c41bbdf76b08647cbeb6ebd6613d426245425aaa67404044d,Merge_failed,26df2eae3138f0b37a17ecdb1c2c951f646ed2fb76c0ac7fc922e0cb6c7f2684,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,42e0f1b88d3a5f50553cecf71bca8f9524673a49ad470787deeacdc6261d73cc,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,4e400d81d0e55c4796e5fea5bd73f681739727fe8cd030b1f9db0775d8306247,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474,Merge_failed,2d547eaa15799ee9d95c2c83f93e89735261ef69884cac3619cb2a5d9d897474 diff --git a/results/reaper/merges_tested/trecloux/yeoman-maven-plugin.csv b/results/reaper/merges_tested/trecloux/yeoman-maven-plugin.csv index 35eb2c0e5c..810373b051 100644 --- a/results/reaper/merges_tested/trecloux/yeoman-maven-plugin.csv +++ b/results/reaper/merges_tested/trecloux/yeoman-maven-plugin.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 9,refs/remotes/origin/pull/31,5f3e6016a840a88e18f554d79d9d94de21a070e9,fc5039fe2138132a59acadd539481f1bb0e43aab,d56218d04ed9200e1eff7e35f3498f604aca4d86,,True,False,Tests_passed,f96a464abd63f497c626ffe37ea864f36d70d8e417529dbcbe274d34cdfe4ea0,True,3,6,60,5,True,Tests_passed,97d0ffe23c8acf9e3c4c101a2086e6cd3e238be91e42c10ecf6e6c64e600e30d,True,5,True,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,a7de7def47def04c383a986b3995fe6a74ef00f581c34a2886f4a26c3efad223,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Tests_failed,b12103bc467459b95674a2a1d35e196ef9830d683c4c62a7b7c336a43fa69605,Tests_failed,055f8b3d25031b119a32de4a09de86ab28079827280c5984b7b7b0ae8d549f46,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,6588cb9136b178fe790e4277b07b91a5d2d1affee24c3c10d714c2265440eade,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,3041254b31bef81d09e9526f8ed224524ba48b1bef0d2d9473841fc81334a8ea,Tests_passed,db7c23103369626c155c92c8d1980131b8e51f58c75d2118b425c2e113b67d73,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,ae804eecd9ed27803e592d8564e082c0ae5c7db837e60afadcd7ac0aee9aa5af,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c,Merge_failed,102e5545345a08ea960e0c1223e0dca33c716fec8e1822bb4d1df1f1ea26973c diff --git a/results/reaper/merges_tested/tridentsdk/tridentsdk.csv b/results/reaper/merges_tested/tridentsdk/tridentsdk.csv index d44fdf8af6..45f2516fde 100644 --- a/results/reaper/merges_tested/tridentsdk/tridentsdk.csv +++ b/results/reaper/merges_tested/tridentsdk/tridentsdk.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/revamp,5f8547d9368c73ccbc2ba422b1efa3775af4ac61,6ca6e931a18ca02f2a9d420de96a459c6e7a6281,5668256c052e477a1344916db73f2ad1e3ba6db1,,True,True,Tests_passed,af5f52231d7c7c13c4d7af0320ab353265a2f86076e8ec9076d76e97e1c87474,True,17,61,353,5,True,Tests_passed,74a8fdaa096d6b359b0c9271cd2ca6840521036dd80b904698bdcd85543a6c0d,True,19,True,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a276b0731767c997618581725cee17e05178244fb292599eec12ee5526b47d62,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,f6468148df18a158e1420f23777c22e82f6dc5cd891265b29a7679214604fbbc,Merge_failed,b8cc9acfb94d49b1483444e18c0bb38ee9969991a429571dd50158cd0dc0807a,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,a33d481a2f096378f2db34c2db8acc985f5c920c978e018c649631512e7d998f,Merge_failed,2a176f6af594781567a36f206a18c3c8ef9e7381e334e2680be0d7cb7a0110a4,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf,Merge_failed,16926a7b36d4c5ae63085a7686f8404e3317667ead354c43f067942648f713bf 10,refs/heads/revamp,004679e5bb6d1227b91f9e1aeaf79b72c317a397,d5844b55b3f6efe95d71450b49a3723a0b9acae5,ed227f8eaca49f6d1a65ccbcea8fad55b38d591c,,True,True,Tests_passed,06f41e3da5a99fa1855b1ab414f6b95d5c330ab6b27fe8841c590f052e994045,True,15,97,426,3,True,Tests_passed,cc3198654698c2e4774f971abbf38f0045361de1ec29fe479b44312c7a19fbd5,True,15,True,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,eb71efe653a3659ab58d88f1e5c027abcaf9f4a5df377614eeabf0ca13d2ef71,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,1f948cda894d56a5f839ca01f69b0b859e0d9b61fd8118120c23d464be2206d1,Merge_failed,d85a6c0d015c66fba987a8b10ec028de29365f2675f722e8c8a0df996a3a0374,Merge_failed,743b1f58714cf024d35d6b120c2b06e699363d98e58d5b6d7b7f4dcd1d5ac056,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,3f8c50bfe26ac7bc5d801ba81f4a8d2f56d9a5209ec8d83fd84b7ba2d2e02ddd,Merge_failed,6fe24757cfac9cd2e746ed7f489d9155ef2553808a13b8dedae4f2515ece975a,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1,Merge_failed,7f510081608bfd3bbfc7e3556d31664504d4b2d6cfb0fdf29767a404acfb7fb1 11,refs/heads/revamp,b53a148ca59225dcbceb1fc65321f98a0c5c13f9,0328aebe181d4896b2205893c521c1015eb69ae4,6dcfd0c9bf20779e4b23a3aa05d29ee6cde7364b,,True,True,Tests_passed,cbee04c3151cae68ef2e931fb88dbe19fd26676962d2194b8acdef0be7b956e4,True,75,253,1483,13,True,Tests_passed,7793f3445f483bdfc586988358a2a5506cbc255cf216f4ebd32dbf102a61e56e,True,77,True,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,295f6f04adaf67ce6ca87627ac686c54139f54adf7424f03b2af435897508926,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Tests_failed,975ce6186f7884bafc18bfc6a87aa6519ca75cc245ca9bdbbde6e371958032a5,Merge_failed,6ee14298dcb77daf087a22e28356c2ea034d3d04dcb51ec23fa14c000fb0f9f9,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,7d619bea96ce9ba2b09ad1bde2c15fbefb585103048cfbc06157b50441db5f6c,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,5475555eb270e056d764a03111e351057ac9e102e8822d642bb20a94fb4497c4,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,f5858a9c9491667191f32ee10f69d762097887cf6a29152c72f3c2a6bf2c8f54,Tests_failed,b176459df32f9e7c523e47c6e225632f15d92c8e885001ca0ffda17119814950,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,53d9354b579f645a059abff32598e71c57a378c8ecb7555e1e6d63dde29b347c,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e,Merge_failed,321134e95416b7b6a2f941905ef798cc62c03a874323aa4ab249d8832322bf8e diff --git a/results/reaper/merges_tested/trung/inmemoryjavacompiler.csv b/results/reaper/merges_tested/trung/inmemoryjavacompiler.csv index 6c9915ccd0..2d4325e1d5 100644 --- a/results/reaper/merges_tested/trung/inmemoryjavacompiler.csv +++ b/results/reaper/merges_tested/trung/inmemoryjavacompiler.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,6460eed46a2343e156dcb3a6f13b286a75f81667,da1628c7396149475825220594931c207eb15862,96b17fef2e11ceccd9692d47656462c019bbf72e,,True,True,True,13,33,548,2,True,13,Tests_passed,859d798bf3f7727b6e254cd7787aab1bf9d5c15dfd8823498c954250295b78cb,True,Tests_passed,97230600688253da51b6eee31a61603fc85734989eef81ea6fa8f7fba9bd0a94,True,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,0412aebef45f173e7cabaa7cdb28aa40e9e502b30955fca48da2de65c4354c45,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Tests_failed,de6480414d085ef1d577719fac7ceb6e3cfafb9f24043f952999f39c3f7b3da5,Merge_failed,1295dbce13d9f9588d70100e1cca04484d4107df07bee8ab8e6b945a1a6fabbd,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,7b7a970caa29205339510732139e628322972eafc19b7324780ce2dd86c2fc21,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,57badc2a8d4eecb8625eb51c4a9c9522910fd0399a0f6e9ac040d983995d9c2e,Merge_failed,1bfa158fef813e526b1558caee3127281d50d73d74741cbe636e37e9f61492d3,Merge_failed,04b80fdd569236c3dd35e8ed8e54b6334c9f7a11911f08140b9304eb21d482da,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,784367622affc249831e9dbb48599d57bc3025123c3543c590fd02a6231c879f,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0,Merge_failed,bee3ab91b54d0bb1a5627c0d5bfeeec29754f47d83d43b4c0d208ea2d3c84bb0 diff --git a/results/reaper/merges_tested/tuanhiep/mqtt-jmeter.csv b/results/reaper/merges_tested/tuanhiep/mqtt-jmeter.csv index c69658d923..0f9ebe638a 100644 --- a/results/reaper/merges_tested/tuanhiep/mqtt-jmeter.csv +++ b/results/reaper/merges_tested/tuanhiep/mqtt-jmeter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/remotes/origin/pull/22,0c9d74cdf98412aeadda94cf3267e82549b0a391,3536c9e59f9eca285fa7df740b2bd3175fd8b36c,8fbcc8f2e694e9a9b112219606d4039a529e5876,,True,True,True,6,15,400,2,True,6,Tests_passed,c871a2a1dd1d1ed7d57d77dd426daa961fac9a317abf6e6ba566a66279e3657e,True,Tests_passed,ca69d46e29de6a208e5542bfa77e620c95b8c471501999ffd71b5c77f364da92,True,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,8c1b13bdf5924604714bf1bf9a1f9c6fd97f3190cffcdabdae6afa200e6adf78,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Tests_failed,afb9daa7db495d06e62417076e81d9c81d0c41d2905d1406a36ccc23d268ce3d,Merge_failed,2eda00c1e65bfbd7e5face992e43c127ef0a9647b25380518423bc8d4ce61ffe,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,a05828f86b08ce516300b0cc6104948ccf249a5049583dbd2fd4f2c1a9848529,Tests_passed,2f61b00d108abd32e970492bfd121e51553d0e29200edb6453df8cd3748f63d1,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e,Merge_failed,7902b9f1bf5e59950fbee879b89db6d0189a119889cf87f4f0318b1cb68d487e diff --git a/results/reaper/merges_tested/tuck182/harmony-java-client.csv b/results/reaper/merges_tested/tuck182/harmony-java-client.csv index ce4d9791dc..4f85a2764f 100644 --- a/results/reaper/merges_tested/tuck182/harmony-java-client.csv +++ b/results/reaper/merges_tested/tuck182/harmony-java-client.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4ab8d439f5706f4c11ca28f1f14c3f060fda010f,b328837d846c4861b10d467eb35c0771a566ab9d,e2edd039c10ade086fb67a66b335cc1329fd288e,,True,False,Tests_passed,37fcf09859c16b7d744c75dd60a0020375196eed20b34364465137bdae3a93e7,True,6,8,49,3,True,Tests_passed,77a02e052778244f66d16116433bc51648599d26db012e180c720e68e3110f59,True,6,True,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,a822966eb5ee706af6e684590d2121da2468c696143e9c7d2367c1b13b01f244,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,a822966eb5ee706af6e684590d2121da2468c696143e9c7d2367c1b13b01f244,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,dfd89199bc4d9d779912a13cac468dbb1b146890de70f4d6770cc8b3b47e0c9c,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9,Tests_passed,e90a67f86704b4162796b9c608f87bd62b9321806948399989be75a01ec638a9 12,refs/remotes/origin/pull/18,fb735c719e4cfcc69791ce5365a58de81b892eab,c2b95a0ce01f03de824c68ffa44a724186d543af,208518395654bdbe14e712d57f61edeb25e5fc10,,True,True,Tests_passed,061bc76cd8427cadaad08e053d52ba98ccbc23919e9a6700a523abe9fe264f66,True,28,154,2324,8,True,Tests_passed,9b4ab486b57fedd69bd48c6d57310345381941388b59153ff6722441b8354998,True,29,True,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,b70925fc078c93576c38aecd623833730c1c87abd73e8c5c821531b82344fe7e,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,c034c11ab26f4ff3a13678fcf9b63e1a283dbec3878e2e49cca67c13d514636f,Merge_failed,e17224a247560c7038a0fd5e36eaf56c05a1bba5c3bf79419072a4e9d76b6005,Merge_failed,efde38bc676ddaa78a02471f1a8e84e084425f16e65f3e7b14c26f94a11312a8,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,e9dc9be65b3949e0161e01b7d9f7880d07d25b5c4c5aef53038c135f19bd2fac,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,0464dfbeaaeb3ae273e70cd53e759377e03f0354480d715e3a84d0988014570e,Merge_failed,16dfd1f9e6b30c37bb5de73c4c6b0b3083b029d8ff170b8bc8051c4146f8c0f9,Merge_failed,21e06b3fd4f90ff878b0c760b31227a20b203aab033032af8e01c2a3267077bb,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,3bd9226748e9fc6a8f42cf0b1bb90ada6cfd1ea85012fedb0e429909ae8a9d6d,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168,Merge_failed,ec9733aefcd3c4605f95bd441f1573cffdd6caa231de997a7545c8b696714168 diff --git a/results/reaper/merges_tested/tumblr/jumblr.csv b/results/reaper/merges_tested/tumblr/jumblr.csv index 69b3f651c7..45395d67ed 100644 --- a/results/reaper/merges_tested/tumblr/jumblr.csv +++ b/results/reaper/merges_tested/tumblr/jumblr.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,68fa791e60021902a52c62792948b169c466f6d8,8f3b5d754b620e791d5839dab64d072918ae7b73,06df5ebc964fdcb7ffebd69b52e8804cb2074ecc,,True,True,True,14,40,193,2,True,14,Tests_passed,e4bca14a4582b88cf6e24169b244151746528167c2566033b08c90e3dab11d2e,True,Tests_passed,3458cc5882c6af6103025ef73fdc17d70503186d6131a851e8ca1458b63a239c,True,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,ccdba10d7e68aee234ea8bb0164bff2ee7f3719977c805ecb3ff6d9c192b6bcc,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,ccdba10d7e68aee234ea8bb0164bff2ee7f3719977c805ecb3ff6d9c192b6bcc,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a,Tests_passed,aedddff70ca043d40e77903721e81ad7ef330eee2171d7c449a78fb2f43eed8a 18,refs/heads/master,31bd6f83359d9dfb9b9e37ccdc397e7db3fda35d,05daabf2b00fe7252d6da43e5a42bb2ac357eedf,1a8c269e91506dd1f050b30a6fa6d16fecc3bd43,,True,True,True,22,97,708,3,True,22,Tests_passed,211efe71c6a879f7786af3d12a8e7dd9ecba17b3f12ee4f1e19b47583883ec64,True,Tests_passed,8f3e33ebf166441fb8ea3582e145c90dc6cfd3772247873157bf6cd6a57087fb,True,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,f77513a0db72e1bc9e6472dfa851214868a7ed306a7c209f4f983f5f341a3871,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,f77513a0db72e1bc9e6472dfa851214868a7ed306a7c209f4f983f5f341a3871,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,687c3b098637a11787996b63393d728b733d94529b3188437b3d9714288b68ef,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68,Tests_failed,e1a1fe2e4fcab86fb0d6f54b5d6eb58c88cdc92fc349b3320b1a134ffb6f5f68 20,refs/heads/master,e826df70c8772e95f1327bac233ce0ca9d9fa46e,2fef8c416e54d353e9d0eca1de0c88fb49d8ec6a,703a299360ffa0a0dd3eb1fe5f9c09c7bd677863,,True,True,True,24,90,551,2,True,24,Tests_passed,e4f0286cee91db3fdf7968c079330c90a1c5a5e4a1ce0e8dd25bfaccd53a2651,True,Tests_passed,8653adea3c6acef2fe056b0aee097ee51c9dc87eab1a178f3565d1ad8b1794ee,True,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,b4630275ac6fc3187472287f20d41f41cd63e9d0b3b70f98232e3c29aa044129,Merge_failed,cdd54153ea18b98ac0112d0375a78cbac1939a7dcfc504314ff9b524c719d31c,Tests_passed,fae242d085a666c8f30cdc8931f537b462a751d3f95b9063fb2f10b027665175,Merge_failed,8ce8117c40feffd4c2a407c4d118bebcb8a4895f05d717864402676cbbeb82f6,Merge_failed,cdd54153ea18b98ac0112d0375a78cbac1939a7dcfc504314ff9b524c719d31c,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,0fc99d015a04999312697aa34ab37381f354a0ab534aca93f29631678b4ac228,Tests_passed,fae242d085a666c8f30cdc8931f537b462a751d3f95b9063fb2f10b027665175,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,ed5341703175b3e08dbc5f62a6cce1cf86c0cc01001449c1644a4a72ceb94674,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7,Merge_failed,6f1eb0e735f54817518be9b2e62fd34f17bdea5b81880c78d51b15193effeaf7 diff --git a/results/reaper/merges_tested/tupilabs/tap4j.csv b/results/reaper/merges_tested/tupilabs/tap4j.csv index 8f70ec5f5f..83a78a29f1 100644 --- a/results/reaper/merges_tested/tupilabs/tap4j.csv +++ b/results/reaper/merges_tested/tupilabs/tap4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,99628e2c44b0d5f5c4d7bad5e525a56566d16080,2620ea5c57e3da066aa1af75070a704a80854c2b,2fe814a4e5272af1d0976c2b24cf5b67160f810e,,True,True,Tests_passed,fafa762c385d191ebc2ccf86b45b1862bbd6644256b853ad21a0859ef06bd6a8,True,2,10,48,2,True,Tests_passed,948c1d31ca76688fc9ef8dbb95e608922e207e7487192d18c168a57937ad9bef,True,2,True,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f5e2f666323b7ce58014406d6c777ceb1c72ab59be24eae81bb4ad47e2914dd3,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,c2f5a393ea683e2831c88321eec57e19fe57bc45ca9006e23dd77a2de270c88b,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,f8acfabf612315db36afd4d8e4da28643f171df75c58d1c800744444132ea309,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53,Tests_passed,6e2247ac2a02b0de7e91672597a22d07bd7338c695933e32748a0d9ae3528f53 diff --git a/results/reaper/merges_tested/turbospaces/turbospaces.csv b/results/reaper/merges_tested/turbospaces/turbospaces.csv index 7e330f5c67..abb218c98f 100644 --- a/results/reaper/merges_tested/turbospaces/turbospaces.csv +++ b/results/reaper/merges_tested/turbospaces/turbospaces.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,8ae57f28d98ec897164b09822d86603b02833a83,0fd7d6b196273b3582b1ecf415ee6e853ac37bf2,5ff57c384e86fcead8f20be720e12a30b992b22b,,True,True,Tests_passed,a17078563d25fe2d807d3342993548764250989e81abc3e63441278ef670ccba,True,22,117,1267,2,True,Tests_passed,e94f1dc1fe358a84c77af71e0d6009644a002e7143af12afa909faac31733a40,True,22,True,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,05c45eaf6fa8ba097a261c7405ace7043c279b8d43fb0058f4ad06c160d1ed15,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad,Tests_passed,5701558ef425221f6e3dc2cac67755cd46c66f97d8f0253884b69278a29ea9ad diff --git a/results/reaper/merges_tested/turini/vraptor-authz.csv b/results/reaper/merges_tested/turini/vraptor-authz.csv index 6de64d19a7..cc0a4fb108 100644 --- a/results/reaper/merges_tested/turini/vraptor-authz.csv +++ b/results/reaper/merges_tested/turini/vraptor-authz.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,ff9a0b0405f0d759760b73d8963d788c837bc9d0,603809922d1ebfc28b76ced0a454f82ef3b822a8,c8106473de8fc96beef50f5f9f9c778455d23a08,,True,True,Tests_passed,342bbf7d6a11eb6cf5775789e02d3f32b3458ed218a58b408f08bd8bcac41351,True,5,10,59,2,True,Tests_passed,c874ace2b4c4d01a77fed200bcfd28dacf648237071cb058e02cbdd98fc371bd,True,5,True,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,d777f521f416c7ef2f024cccfe3d37d1eb03805345a2342132af6ed15095a2d3,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,60ab4b9ee6f3db69cb2cf7dc11d6f0ed562685d8f39a4ac0aee3fefec34c45ff,Merge_failed,b43a484b311b86466a88300b55fd5008e4d6ab385e492233fbd71a84e5b7c0bb,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,9aa3812552d50d957c15444cb670af1445cdf4c86dc1a038d1ea1e76110f6103,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,562eea3702397b7157cad3a4a87b5671271836bac27714869aaabf9ad7977eef,Tests_passed,2fff4e6ab27b60c191866805b215f221dac7f3daee53abe5ad8898ba7cba88a0,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,3d6916e17e02abf3abb15388d5066c31180d0098e0e0d0b86e278292b0abac16,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7,Merge_failed,98a79ae07f7d4b83a7f8fa8a2357bccded71ac5c9098d4e67db770194bd069d7 diff --git a/results/reaper/merges_tested/twilio/starter-java.csv b/results/reaper/merges_tested/twilio/starter-java.csv index ab8f2e8237..d175606079 100644 --- a/results/reaper/merges_tested/twilio/starter-java.csv +++ b/results/reaper/merges_tested/twilio/starter-java.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,01cc9db061b3d98083e4e49d56aaa052434a1f2a,c5eaf35629aa4f1ada2a42df3a6c0957ba65b1d0,c9dba43c85333197b7592dd083fdf6e3dfdb7294,,True,True,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,True,3,2,4,2,True,Tests_passed,4f6d043d71d56d02ccc2f94323e736bccffdea3ed7fc33702df7b11607f727a2,True,3,True,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,8d6c4218cbf798d14b74e0bbed5bc7dcf0d08233197b7f7489344a69f001202e,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,cc3db33559ad68eae3b56591a6358a9ca97ac0df9389e2ee4e59f42b27cc64fb,Tests_passed,b94bbd4de85917f46c6dbacb886d13c445a650d93c92487be522a42d08f2654f,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,27a495d4874e3690f1ddce84544979539d974c01ee3eb0f0777f693775ced5cd,Tests_passed,6fd9dcdb738aaa4fefd6ff659677ce58b0c3a72a7a85ca618c766acad69d1364,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1,Merge_failed,40d5a0ebb7c6b61cf9d2e14a7052d405f2e8c3ba566f96cea49ed756dbd8ffd1 diff --git a/results/reaper/merges_tested/twilio/twilio-java.csv b/results/reaper/merges_tested/twilio/twilio-java.csv index b6f03388c0..c09688a0de 100644 --- a/results/reaper/merges_tested/twilio/twilio-java.csv +++ b/results/reaper/merges_tested/twilio/twilio-java.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 138,refs/heads/main,509423448344d02b16e6173ffabdd76035e012ec,15f06feb157874b975e905e32bb77f0a3d0d3897,b2fdaa7bb7b4347c850eae3e5bd629ea3f183bc2,,True,False,True,7,12,25,2,True,7,Tests_passed,3f6cab55ca724e707182e203a155a75908052e179898787768fd4001b978ff50,True,Tests_passed,ba0a1645a5ed2893f5af4eb49fd4e2913e77d9b627ebfb0b5b3954689c7b8f35,True,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,47d542a201e64f244ce0808378bc9df70c3bfbf3f503f77bdf875e02d20a4539,Tests_passed,d17580dddcaacd17852609bc26a273fd4aefbe573d6ec333a9a4525072ff8b12,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,47d542a201e64f244ce0808378bc9df70c3bfbf3f503f77bdf875e02d20a4539,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2,Tests_passed,4802e6616a87a0a7da5c39f84a50d7e49fe9f2dbe9e18c5f574a84a3b259e0a2 147,refs/heads/main,da7bfa5df647e4ebf4b074892143028abee0bdb6,b21b03e6e1ab2a1ce8bd61e84c56626b2069547a,3d0e236505f0ac0e1b7d1ff7f2da8daae17de785,,True,True,True,27,70,554,2,True,27,Tests_passed,62e835ab0e19498a73df01df0cec6aa334d047471f18e9f0e3efcaaa21f64b98,True,Tests_passed,06491f98033557195a2bbc6e35ef5e62092762b734c343a62ccbacfea758d7bd,True,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,bf6f78493536e4039bf4c9d7c156e14d3a0569fbbf8f394a216965a118e6bef7,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb,Tests_passed,880a355d3f4826e12657a624db68aabc85b5e3f6b3361a541ce5707e05205fcb 148,refs/heads/main,5a1cfdd0af7bfe792d29745bd0efe09a0d86c58a,271ae3b3a4d52debdbe615b2ee048614ffc8a48a,c5d4cb76d07b67091912d99f4fb978ed29112211,,True,True,True,18,73,435,4,True,18,Tests_passed,f5fd5ed791b7ac3f00c15179b79e6630934869caefdb16fab2c04d452be67174,True,Tests_passed,8adf75e75837d5d07651718bcff62d47ab75606b40c2e8fcc93b8e4d8952411f,True,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,305b60495800313667d6f362914eceece21ab28d2a21099e682a8cb29da2f699,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,b1b72d3771f3ea13792db2107d8b93a49527820080453b15e3e7187b93459eb7,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,1b42018955fdc92d6e2d033187eb8e067af3dae044d4f73a1bb577ccbecb2a94,Merge_failed,73dde6d2a66df014d87695815933920531f0b2cd38ab14a3079c7ac81a83a824,Merge_failed,08486086c4a0f6e970f0874485d0b6ea513ffb961fecf34e216fc3a99d86a728,Merge_failed,5fbea1f8c7f5025e9b2b00e2a977f6840c87fcbc7e61f6485b36552a2b3d4bd7,Merge_failed,f89295561e9cba971d27dc4cfd1c87a894896af081b07a830819aa30e957ec90,Merge_failed,08486086c4a0f6e970f0874485d0b6ea513ffb961fecf34e216fc3a99d86a728,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,b1b72d3771f3ea13792db2107d8b93a49527820080453b15e3e7187b93459eb7,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,62cacf192dbebea5cbe655551c865c2f02f447923d4162ffcea849c07603faa4,Merge_failed,1b42018955fdc92d6e2d033187eb8e067af3dae044d4f73a1bb577ccbecb2a94,Merge_failed,6e52a26de257f3c0d4c4ac08b700dfc574c2b73eb5a9ca10ee09e607cbadf14f,Merge_failed,5fbea1f8c7f5025e9b2b00e2a977f6840c87fcbc7e61f6485b36552a2b3d4bd7,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,305b60495800313667d6f362914eceece21ab28d2a21099e682a8cb29da2f699,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d,Merge_failed,d72a33f6ac06c4cda5a7aa0cd352a4f324cf759004dcf3c20091e8565f88328d diff --git a/results/reaper/merges_tested/tyagihas/java_nats.csv b/results/reaper/merges_tested/tyagihas/java_nats.csv index 1e6a696f65..e212bdc55a 100644 --- a/results/reaper/merges_tested/tyagihas/java_nats.csv +++ b/results/reaper/merges_tested/tyagihas/java_nats.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/remotes/origin/pull/8,2d1935a3170dcf60976924026ff17aa76a431ede,65f9995df7708f4b6024bc1e9d6128203b1255cb,e4f2f8ec702eb75455c011207ee9d2dc85d5fc6b,,True,False,Tests_passed,6ce70efb79ce9699b31aeadbd817d9332e5fa61ff930f5cc6b33a44c3cb68904,True,2,4,8,2,True,Tests_passed,c66d9976b329a83e46b297b76052df81de0509566661e4a8a52712da94d41f2a,True,2,True,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_failed,3b6c482fa49eb2f42ecc4b19bde3c7898f2672808f44cf65b1bc6d7bf45b61f6,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,1165e27d850e26fb6d6b5f88cd077862c42ac9d86977e9e5b40d7d50f16e72a2,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,eec6c2a7de7dd11d98cfaa265dd43c1b4cb9a0b75828d2819c71ac8713e7472e,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151,Tests_passed,cdeef3dcab5121b71305fa985fc3abe2549940391ded7c436372ae7227fac151 diff --git a/results/reaper/merges_tested/tynamo/tapestry-security.csv b/results/reaper/merges_tested/tynamo/tapestry-security.csv index e202a930f1..0ed8992ae5 100644 --- a/results/reaper/merges_tested/tynamo/tapestry-security.csv +++ b/results/reaper/merges_tested/tynamo/tapestry-security.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,568cab9871a77bfa6a90c2b463facf1b01df42bc,f5562e2b7a8700bbaf146edac5b015dc88d21aa1,c4ff9efea18c287783bcde4cfcf94b91d3372ac6,,True,True,True,11,21,136,2,True,11,Tests_passed,8ad7c7efae6dde5c39e3110d28ffec139463bfa76e230538e432308d40a83dce,True,Tests_passed,5d0c7c533bf3144dec45f5891a79ef9008fe18aff62c5aba55c96c99942f5d5d,True,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_failed,e96e414a96a5fb84d86fea33adb7411a43979220e253ec6b1170160c3b8dd494,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,23b34d331c3639ef98c7f0615f6171511e70a917999e2597e830594b656a954a,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950,Tests_passed,a1f27748ac1d8e5bf7e524efbb203e5faa18628d48011a38b201c2bf3ff2f950 10,refs/heads/master,bb15cc313d89fbcb2447bfd8a018bfa7adad2ecb,301414d707dce777c982e56ffae69664ab0bb312,505c2943579e1a15a69fbc8038d4d8f04af54732,,True,True,True,11,61,343,3,True,11,Tests_passed,ccf4faa88f4f71312961bfd4bef3907feb099edd50c3068de11b0e22c1be6f08,True,Tests_passed,40673e0fceec636fa43e7596306eb0200879c054cb72392335dff6a06c6242c6,True,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,50586eebf6d009d554adf8822179b4d9810838fcf02557d9831457a36cbb0b7d,Tests_failed,1b38ed3660ea5926d74eef0be56df7ada508671ef03c2c4d5c6bb78c501d0fb5,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,50586eebf6d009d554adf8822179b4d9810838fcf02557d9831457a36cbb0b7d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,7d598bc859ebddbde3069e8aee73fa504fbbed5fc729dfa248bae07d44dfd92d,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080,Tests_passed,843c6200d5722eeae1657c69fc54f9bc9d0edd594679eb783f75c6375c306080 16,refs/heads/master,42d2f1a5acf9b27b85456e8c4f325c59fa07e4a9,9b12556291957a952b82584267a23c7e84e7493c,868f3267d4a5e52bc54c9948a67649fb31e4e3fb,,True,True,True,7,13,55,2,True,7,Tests_passed,56dfd182f8f18f4d5835277b622665059d8e021d10019fc5da2f0b3293da3fb4,True,Tests_passed,c07ca4bb82a5ee79e41a530fde87443e765f943036323a7ef341e89b4fd7fee6,True,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,c3870b6d0ab03b5d3a2969661de640d17cf92344986feb057e057480e5964f48,Tests_failed,25d89752137a5cc6d828ae874112332fdc234777eb077bb2f5c32e00fba78f99,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,c3870b6d0ab03b5d3a2969661de640d17cf92344986feb057e057480e5964f48,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403,Tests_passed,0bd9a394a4cd963899021002a18cdf6e1f300dc14f9a56a72fa6d4c329dfd403 diff --git a/results/reaper/merges_tested/ubervu/elasticsearch-river-github.csv b/results/reaper/merges_tested/ubervu/elasticsearch-river-github.csv index 14eaf8e4b6..a8533d95bd 100644 --- a/results/reaper/merges_tested/ubervu/elasticsearch-river-github.csv +++ b/results/reaper/merges_tested/ubervu/elasticsearch-river-github.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,261184e89701acd7169b001d0dc58293ec680512,3e590fef47b5eb9b167659841295e40f298e23c4,e8b07ad4428dde2308166ef5e48e0c1f98ceed44,,True,True,Tests_passed,d78ea6fa704344eae1441581abe96566e8bfa96418123e8b7bbee7cd0b3845d1,True,4,35,243,3,True,Tests_passed,c3a6bf77979d06d0c5d5001209afdf15283038697cfaac6c97e119a6dcb50a45,True,4,True,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,81cc1a3606d60bec7525648bee539e11188ce56108b4a6c76eca784a96a005dd,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Tests_failed,e06e85507b97b75bc30267cbb8b51fad2aee88ce5f10e9ddf5855c9681fdf7f9,Merge_failed,08e3b651b78a3d1e107c54f9d5384e99096c2cd6de41b3c5411fd56fc2141b05,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,676d8364975e775f1c66a09e6bee548da5d26f356947697d04f42deda0dd48ed,Merge_failed,3e6d49e822613cdbf847898c8ce614193c54ba77c0e2f6edd88ad9d15be35123,Merge_failed,995746a518383563de600b181a00722d1dac639d11bb3291f158da789ebec57f,Tests_passed,8d69f7d42042dc32d31e270f27a8623149ac81e449bfebc5265dabcdb4ff1335,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,0bfbf1b0ff85ea1c82cad9ef83b14d40903fee001f8e36ab81f552c9dfb24229,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e,Merge_failed,5bb848b95df5b7e5b1739e21b8c2774fb35311ced41e8cb63cb225e8b7641b0e diff --git a/results/reaper/merges_tested/uklimaschewski/evalex.csv b/results/reaper/merges_tested/uklimaschewski/evalex.csv index b892fa7c39..2e877bf1cd 100644 --- a/results/reaper/merges_tested/uklimaschewski/evalex.csv +++ b/results/reaper/merges_tested/uklimaschewski/evalex.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 16,refs/heads/main,c152bc8eb6d302460f56f989e91c2967cc3a0894,5d9db79516070c1cfb1395891de45d9757fe188a,b9cb3eaadf28e6de3dfd222689e25d3195667421,,True,True,Tests_passed,b69601d494c5ebb798cea0713432b207347ef3c775ef3f89e5d941ddc6eb502f,True,3,21,212,2,True,Tests_passed,50c67c674c272dd26b4e936e2c710d3d80bdfd873f0363ca295436a3c81e4718,True,3,True,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,ca0f93d868fbe46c3acdd4e4843dd3f1cfc840057bbb944950def87c8d3619d1,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_failed,531d3ac94c678bc7ad613f1832fd7b7c2787a031ca3f55b62fe7b29f979956cb,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc,Tests_passed,09ff371e7c84859d4695722a4c6de39541be05f0ba0eb72e16e46e882995bdbc 29,refs/heads/main,b712e336e13c0bc27119d445050721515f71f6d4,3d9cc3f853e4c6c83857cd4db8338c5ae668af5a,b707c2b2a7fa3dcfbc829d5df4b10295fc269744,,True,True,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,True,7,74,727,3,True,Tests_passed,99b24a147f8d8c87dfd6d13af42962cebfba1158838bc64d1f6e8c3fa3929d11,True,7,True,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,7f5d9dcbcaf27ae6ac2f00a92ae381d553e2af0a0d105bcd57a45c3d808f61a1,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,adeddaeef77f23b1a19acc1b0dd4682a72e260681e45d191c1a58091d7be457d,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,5a11bf8cab0ea3fc8cd7fd261f68c3258eb520bf487d78d49fa28d8fb62581bb,Merge_failed,e40e02d3bc11dec641f90297760e7e88be07a30f9e4f81ba5794b6d922bb1da7,Merge_failed,23964d5adaa0e633e5fcd611212c0a15bd4c9057d3a49839f3bb62599b8a0a02,Merge_failed,1edb4cad5cc28a3c0be5af2d40be62d71e84e2fc36881ca23f3afb7baa65f7bb,Merge_failed,e40e02d3bc11dec641f90297760e7e88be07a30f9e4f81ba5794b6d922bb1da7,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,adeddaeef77f23b1a19acc1b0dd4682a72e260681e45d191c1a58091d7be457d,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,229cd8e9daae9e014cfdb0475bc168016abfacd1edf739116fffdf86a8a04565,Merge_failed,23964d5adaa0e633e5fcd611212c0a15bd4c9057d3a49839f3bb62599b8a0a02,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,7f5d9dcbcaf27ae6ac2f00a92ae381d553e2af0a0d105bcd57a45c3d808f61a1,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56,Merge_failed,16873842abc0364c69e33458e57e4bde25bcf668750a99f1d4f4c8d750ffcb56 30,refs/heads/main,3d9cc3f853e4c6c83857cd4db8338c5ae668af5a,6395f70e114c4525aa633320cb622a94db7f8ade,9d08aa70b8819f097b16f845e33230671a0680bf,,True,True,Tests_passed,808b269710add5d5e6da9137195f176747e4eb74de195c8c432bceb5d379fc0e,True,7,62,693,2,True,Tests_passed,f416ba97aeb62a830baae0373e391a023eb26596e425c72c6a1ccf64a395f36d,True,7,True,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,b01231a8e56acfbef246f0c5e14c22dc2396b80f9a3766b1566888b86299fd5b,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,b01231a8e56acfbef246f0c5e14c22dc2396b80f9a3766b1566888b86299fd5b,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,3676e1c47ee63667053bc5ec3172781f125e4d1a20f9fbf3064d10fee136998e,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353,Tests_passed,ba1fb4cc976ff19d62276defaaa7dbc0b3dadfc1c2422f1acef4356ac7b31353 diff --git a/results/reaper/merges_tested/umut/spring-social-salesforce.csv b/results/reaper/merges_tested/umut/spring-social-salesforce.csv index 62a9dce3db..07a2a1a88d 100644 --- a/results/reaper/merges_tested/umut/spring-social-salesforce.csv +++ b/results/reaper/merges_tested/umut/spring-social-salesforce.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,c0ba949826659e6d82e8cd4b958530add191586a,d2f14b90370242638f71cecc14ba6c2b880fa5a7,641d0c91b8ddddfca7f1c71fef1b195a5ccbb804,,True,True,True,20,36,1168,2,True,20,Tests_passed,a3f13e088e4c881b71e471946d45563600eb277e27d598a38675636434920b65,True,Tests_passed,5001d457983015612622eaf150d0cf15dbdfaa1f516a18fe18feb7f4ef093169,True,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,20551bfe0132a95905e3fc4c9a3e90afaf6ef8b332e43c6507a478caa527797f,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,b94ba6f961b879949bccf9a98d953a995261227f1a5786e3fb7b6847c3c2c313,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370,Tests_passed,3a13d2b2c328a86c541723ad6ebaabcec8554615bce1fe20a9d4de52d6d61370 diff --git a/results/reaper/merges_tested/unitsofmeasurement/unit-api.csv b/results/reaper/merges_tested/unitsofmeasurement/unit-api.csv index 9a7423cd49..3d10429d6e 100644 --- a/results/reaper/merges_tested/unitsofmeasurement/unit-api.csv +++ b/results/reaper/merges_tested/unitsofmeasurement/unit-api.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 53,refs/heads/master,f16c43f7b6f090819c2530ac4d282e4e87f81307,bcc17012a1c8e32c9fb7f8f498b9ea457598b1e0,af3a3abfab663d442a692e5d1c503dab05665afe,,True,True,Tests_passed,d19d04c4db94456c187551ba428eb5340ef88fe763dd66667204af7520a5f3a0,True,5,26,280,2,True,Tests_passed,dfd2a48bb8e3fd3cc4225a0aafd79faf1bffa172dc715f2e90466d1c12497091,True,5,True,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,8630b13b727dde8db9356a95321f7e1596e2bfd8550e1174ca33d9d8e6b3a9b2,Merge_failed,a964d69738b7288af776095e9c0a7b3efb4489d451fde48b117e628d6fde9b53,Merge_failed,6656759097d7996c8a3a3d1c3511d99cb5d03adaa9b03996d613991d141d4910,Merge_failed,6656759097d7996c8a3a3d1c3511d99cb5d03adaa9b03996d613991d141d4910,Merge_failed,a964d69738b7288af776095e9c0a7b3efb4489d451fde48b117e628d6fde9b53,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,04e9b0d29f8a1b93fad4c62a124b24bdccb70c723a0178b6538ecbf7f9616c4e,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Tests_passed,54f5d64221f65a05b89cce5eaf9b45ec83884f29b61e5ebd5e5c4b16afa5d0c0,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404,Merge_failed,df85b8bc6564bfc192e9e8872b88c2788209ebd1af6c775b1dad3f5125796404 56,refs/heads/master,af3a3abfab663d442a692e5d1c503dab05665afe,83afd3ef45cb4af71be258e7f5863b6384b7db5a,049ade04d1087a5fe8f4357c19db95b3fe167916,,True,True,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,True,101,121,15500,3,True,Tests_passed,6fce6f2b06d9bea3199a032dde14a83689ef0ca2d55f44103c5b3c819cdd5fdf,True,101,True,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,02a80495312b6003f1768b6f87473fcfbebd9fb3282233abb478c40fa09058c1,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,d5ac7cd88cd4ee89ff64bd00afb58eef5ae42081b32f32dae64971e02112c8f7,Tests_failed,157a2be2185b3c87d408afed6446e9a9f3a84af0326831c0d280a7e5dbeb6684,Merge_failed,380442dcc52aecbef06c886058c643ddfc057865241f8f0d01e6eab1c69b6ad7,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_failed,b874e359b01ab8ebf3d572618c0331db819bb899da832e1d12f7b19bf2e8bc14,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,4a3eb11f598525bf7190aef02c3a8dac1331765f7e79892419640a7466453752,Tests_passed,a37ed6142edabad00d93bfbc854fbe7c782285a65194279ff14ff2767a36abcf,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Tests_passed,68738da39c2368ce43648c545ca7e0867735414361f1033002864fdec44f354c,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30,Merge_failed,6829e5a40c47644f572d4b2b6d9ad165c3a7d99403a98c979250a5f773dc1f30 81,refs/heads/master,94a6c1870f42d1953348b06105b5091951a3e442,5c9f2dae369afc0eba4a41ae82e0c6595c83cbd3,bf284962861418412da952acf9cdb282e41c380b,,True,True,Tests_passed,d9d1a607c57ebb19412ccdb661d47e143e6f0d41b6d2121713f8d069bba23a59,True,12,91,245,4,True,Tests_passed,1e9bcea2ff9b7187f49b56e20a3d6b484b2ed0160917a3bb0e388d2751a8a64c,True,12,True,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,3758702a37becae5c8d60528a928a1f522ddb28be1bfa6aa32a37e36e76a59f1,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Tests_failed,29f0ecb30143fccfd719b305a472237ce0bcad6cca102ccee82b4e2257a7ef50,Merge_failed,ee10846748486095ac31708cf225cd3e38516fed31afc994acf0f176dbcc6302,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,8f7841ec304394a28c2e4681c07f8afc56066df2c8274a7802594ae4e538f9da,Tests_failed,29f0ecb30143fccfd719b305a472237ce0bcad6cca102ccee82b4e2257a7ef50,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Tests_passed,9cfd10600796646c60e61e698a62497fa7ed63d535c6a45473a6a72abe1704bc,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65,Merge_failed,286d58f8fb74b071e0e8dec2adc9f51c18cad86de7304f52f380e3c29b117f65 diff --git a/results/reaper/merges_tested/unitsofmeasurement/unit-impl-se.csv b/results/reaper/merges_tested/unitsofmeasurement/unit-impl-se.csv index c24295d256..bdf29fe6e0 100644 --- a/results/reaper/merges_tested/unitsofmeasurement/unit-impl-se.csv +++ b/results/reaper/merges_tested/unitsofmeasurement/unit-impl-se.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8a4c4c4961950dc6135e931dd34120e29d511a8e,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,64ff92d8a8f270edaa7d86c16f1dc13de3c41e1f,,True,True,True,17,59,431,3,True,17,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,True,Tests_passed,7ecce53e60cc01bc271ccdf916618bbc9da40642667689b7c161250d407562ce,True,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d 9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,True,16,53,270,3,True,16,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36 diff --git a/results/reaper/merges_tested/unitsofmeasurement/uom-se.csv b/results/reaper/merges_tested/unitsofmeasurement/uom-se.csv index 57b02e3413..5b91d3fb71 100644 --- a/results/reaper/merges_tested/unitsofmeasurement/uom-se.csv +++ b/results/reaper/merges_tested/unitsofmeasurement/uom-se.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,8a4c4c4961950dc6135e931dd34120e29d511a8e,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,64ff92d8a8f270edaa7d86c16f1dc13de3c41e1f,,True,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,True,17,59,431,3,True,Tests_passed,7ecce53e60cc01bc271ccdf916618bbc9da40642667689b7c161250d407562ce,True,17,True,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_failed,404ce818d8a646e24441357a64c3def8c696d8fe7e134cca99551aabe502ea73,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,02a40716c5d745232445f9170e49c6b995492f88a33d57e65e0ba9acd6a78dc0,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d,Tests_passed,2c8d7c1651e3bed0f2a19085b4b9ebddd141e07e516fe20965a5b3ae1ab83f2d 9,refs/heads/master,c2ae9d4caae67b22c9abbbe6e14102ac6372d32b,08ce15c5b000b3d4e96c8e399385d2c24964aa24,1927606d944dc69fdb865bcc500a1557691790f9,,True,True,Tests_passed,eb67fd5122946c5489dfedeca590da78b1d2751db86f2394d26483e169970b97,True,16,53,270,3,True,Tests_passed,2b08021f5ee882bb39b07809de09c3620408ebe0d2c640924def93b898e3e6cc,True,16,True,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36,Tests_passed,a9bfc125ddac4b053b0aee425a22d349d0d480327047ada2cc892ee4688bff36 diff --git a/results/reaper/merges_tested/univocity/univocity-parsers.csv b/results/reaper/merges_tested/univocity/univocity-parsers.csv index c8cee133e4..d92cb394d0 100644 --- a/results/reaper/merges_tested/univocity/univocity-parsers.csv +++ b/results/reaper/merges_tested/univocity/univocity-parsers.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 22,refs/heads/master,9426fbefd3b6e57649e45d79bc7d4fdf674e9377,04cf38831b7fba1fa265e84c1deac9f0274046c8,8a463847eca82abb885b4203d1ac17e5f4384d90,,True,True,True,4,7,207,15,True,17,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,True,Tests_passed,060f8700b83b0afa92d6348c12c5fb1d0be6298dc82b019c2ceb1027cdc4bf72,True,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_failed,a85faab50cf7959f923be10f679eb94be242533ef47506d0393b5e4dda315ca4,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,48aed5b525d3aa4f344987a1c40e5cb3023edabff168876dbc41eaf8c9ceec5e,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41,Tests_passed,99ccd0d5486c88366b0574d8469344ca1635c55c7953264ba97c1079d80a7f41 27,refs/heads/master,771ba721d9da416a5318353393497d9bdb1008ac,0beef50e1093930ee90ae97d15ee7ba49fe59381,b1d826293ed6d629e10629580e7df3966d444e69,,True,True,True,90,318,5993,13,True,93,Tests_passed,2fe99d0e5854dce39ed1ae175276edc21afec11cdbbf75807de61bc10a37efad,True,Tests_passed,16052c48cb00624d1f75766299fcbd5c1e51b3a92bcee8d095d8be95c9778541,True,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,805686accdc4506df4db41bdc73d84d2f39de8ce2340022c328156191ddd4ad1,Merge_failed,52e1e2fa9a7946bb6e38a01c5e7947d43a2b49d162f48bc3ed56af1a867a2989,Merge_failed,07db4093259864bb9b102edce84a29707e1dd16e4e61a35522ef7e10f5e4f482,Merge_failed,0c24bf27ddd1cc75d4d717d7adf01980972d07f60970980af303ccadf04cf3da,Merge_failed,52e1e2fa9a7946bb6e38a01c5e7947d43a2b49d162f48bc3ed56af1a867a2989,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,a83eecc7fc6aa0730530f90dfe1d4e67ac7d0a87885ae864c7490a125b39bb23,Merge_failed,cafeb57dbf853a825149b89d357edfe3143a65f91dad4ca7d3f94ffc757be01e,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf,Merge_failed,12c4f647617acbe5c467b94cb5d39c63b95051b9ddceabb8430221a8a455abdf 28,refs/heads/master,4fe97f1e8b7a4487e66c4e653065dd39c79ad963,da594a5b017f58f2e56dfc79873ffda0254387ec,00994ff66979755cc1af7004019dbe7bcb56ae22,,True,True,True,51,194,2401,4,True,51,Tests_passed,17070f4f0dcd6015e5d5f93e3b1b18edd3fb0d22c7d9237285613693df6facdd,True,Tests_passed,e5ea7e3b1509f9e9d20b01998160108f0402ed43d1c9762774c163a0c890b8e1,True,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,70690c6041a3f171b1682379a7f84b566ef35dceb6f6021b22d8ac30312a1818,Merge_failed,f70aaacfab47ccde3cba6d93a307e0841fa40c03cbed2ed43eb48eb563ce2b5e,Merge_failed,d0dcba2c8061e12245a84bd1c0b57d17f8fee0c1fe1dd3c6d0b611b66be8ae10,Merge_failed,a8a93cb99ae0fe4333a3610ef9e5bb456718002243ed958e9197b4d44bee7562,Merge_failed,f70aaacfab47ccde3cba6d93a307e0841fa40c03cbed2ed43eb48eb563ce2b5e,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,0a1612d196fe1f78049cbe6c643645df18bc82c0690d53f280c0b5aba6ff77ae,Merge_failed,c18d14f2fa6de01cc5fd2fd921035d43f2e5ce8e0c1662a3c459730ffb7f9cdd,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d,Merge_failed,7e7c8cf597ef571e618f9b19eaadf6a8e30865808941e8cfcda2a476c3190f8d diff --git a/results/reaper/merges_tested/unruly/junit-rules.csv b/results/reaper/merges_tested/unruly/junit-rules.csv index c61f72c8b5..d77fec3efd 100644 --- a/results/reaper/merges_tested/unruly/junit-rules.csv +++ b/results/reaper/merges_tested/unruly/junit-rules.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,9f9e68b409b45bc46b8210c50964508e185dea8f,7b70c0ebce2dadfa3c20c95a258562889b923e2e,492670cc827654754a93d59b562cfe27fad84c57,,True,True,Tests_passed,19aac3cb0894586e9cd50dad5781d0189f52adc3994e50d3432f48822ef6f374,True,5,12,114,4,True,Tests_passed,1c066bad00671b7bef3b5dc2ee06e82d0097162cde2f44de67d11d9f6addd734,True,5,True,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,11e610e9b8b910b9bedb0e57f82f16af16ea698be5043be4159e208d96197f19,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,fd014bd2375d4630eb6ef13e69652fda2d5c4fb131267f77a11375164da8b3ff,Merge_failed,9a175b93970287cb5b812a3b6d692a3ad212ede0170addd1e4a2800d8546eacd,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1d203775cda1701552b32f92c72bf1b0cf542b9478dac70514396119c1bd2051,Tests_passed,bd06a61e0af6c36c9dbad0783fad0e789d791688f019a2ad29d028160fd3b324,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806,Merge_failed,1b6c2f51cf64a4e1141b35024643d7389a68082ee1bb1378bc1b664d55c54806 diff --git a/results/reaper/merges_tested/urbanairship/datacube.csv b/results/reaper/merges_tested/urbanairship/datacube.csv index 51c1d03493..b7ec798624 100644 --- a/results/reaper/merges_tested/urbanairship/datacube.csv +++ b/results/reaper/merges_tested/urbanairship/datacube.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 43,refs/heads/master,2d5233dbf1f428b640c818f8e61234e24faffbaf,991174d89fbb279389fbc02f59cecd0f1f481453,6fce4b819ca2c04cc2272cb394e39f8dbb81edb6,,True,True,Tests_passed,5c3bf260c5a3e9a4cb68191206ed39528c455a27f352b327c84bbdb61a6ebbdd,True,20,239,1708,3,True,Tests_passed,30601f51e9486b2e3554e03271d283158b835a8c34ecaeabddc69e96fce0ccb2,True,20,True,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,279791dcaf9020afbead17205deee0d36595f54897a3c580d87453a5decccf4d,Merge_failed,1a86f199b4a84b7a6c9d280ddb93804957f44316d5e053f7f2f75f9255b67862,Tests_passed,e605e2a42360230d4b70c8cda8fceba5e5d05dd44c9c57cbea8ccf924630f5be,Tests_failed,bf2a175324a220219f2be4a9b73a1e32898d3c855b06adeff3bf6bb6be335c7b,Merge_failed,1a86f199b4a84b7a6c9d280ddb93804957f44316d5e053f7f2f75f9255b67862,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,6e4626c87fe68fba1a7e38700fb96f827142bd3c4aee9fd1208ee8dd3a42c098,Tests_passed,e605e2a42360230d4b70c8cda8fceba5e5d05dd44c9c57cbea8ccf924630f5be,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,b3ae1fd07d6e439b50cd9432baa8c61b15f9a77ed11fcab00d67f03c1a7ab312,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377,Merge_failed,4cac9a9a5c5005febc490963ccda0aebf7e1770a45f4aaa4667fbb0e52771377 46,refs/heads/master,e98794fe0b952cfbec98456698cd0e1c8226173c,c176fe3f098b025057d82bb50e327d227f3cd154,b4f7933ed957d5b8841ae731e7156a70beaa2c37,,True,True,Tests_passed,3965a63425c8f76c65ff240d62a0697307679c0fc9ca6f389840bb9d48bcaa87,True,5,12,75,2,True,Tests_passed,298dbae6f5a26224c6fd0864e294572e10f950671ad2895d866fc426f68c39f4,True,5,True,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,0d28d9e58c2acad2269c2860af0db723fb9cdf27c7f7ae91a5662ed14ef61089,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,87aae03584b919b4a66ab0752bb12f5a876229492987d3feb53466f6a7ca7173,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035,Tests_passed,2345066c3dc4e5d03005ca4b40a7ce8bc08578129eb60c45338043063ba71035 82,refs/remotes/origin/pmd-dev-redis-db-harness,641b92c0fc573ce4f284ef08917c0c68bb3eecfa,61755d7739de129b61dc18a7081377ddc462c5c0,c21dfca4a999de9d837aca533fa864106858b30d,,True,True,Tests_passed,d198afe53f3ff43c944d7f2cfe87d519bb0ce9e614d7c4e52dd27019c7199908,True,91,864,4050,4,True,Tests_passed,80e46d06124651a216cdb603e39f54c9bb0d01d576f9c090e34c5e5b97a4bf49,True,91,True,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,289cbba16fa3ea0377c7d7ea0cd15858d5e55b8328eccfe1f7add1e1da4cb33a,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,a123e2b45853a823d85b7f401045cd5c376c1a58aabb1ac92520856b2cbd2942,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,0b006815b2340971fa4078e26ecc4bf116bd134e24b774323a2bdb1893f2d44c,Merge_failed,19ad885f0a22cc07744eeb158c5df5076ea0f4cafa19a29da8e3098e4e98e024,Tests_failed,804dc432a34c49d648818c03789c62b930d0ecc0ebbd1ad7b80c5f9810b637b6,Tests_failed,9b47b508c5a2c174810f3788a730e8fce24084185d730cc7ae2f494706f0a801,Merge_failed,19ad885f0a22cc07744eeb158c5df5076ea0f4cafa19a29da8e3098e4e98e024,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,a123e2b45853a823d85b7f401045cd5c376c1a58aabb1ac92520856b2cbd2942,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,05e441d324e3157b72e3c563399ce88b188480370849d425f753e6bd759c2837,Tests_failed,804dc432a34c49d648818c03789c62b930d0ecc0ebbd1ad7b80c5f9810b637b6,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,289cbba16fa3ea0377c7d7ea0cd15858d5e55b8328eccfe1f7add1e1da4cb33a,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb,Merge_failed,3677fe36cdf8925b8eecf0301123efcd8b445517fe4b53ee55e39785ce2804cb diff --git a/results/reaper/merges_tested/urbanairship/java-library.csv b/results/reaper/merges_tested/urbanairship/java-library.csv index 586f7cf3e5..259e778824 100644 --- a/results/reaper/merges_tested/urbanairship/java-library.csv +++ b/results/reaper/merges_tested/urbanairship/java-library.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 57,refs/heads/master,bbe0297a107727f3f58629274f6ca5e42356e146,339d4f74219edaaf0bc250f689f0e4a394a418f4,2bc8dfddc90c867d8878a4251f8fb0ef8338419e,,True,True,True,19,64,959,3,True,19,Tests_passed,fb9c9df6772d3dbea0ffb4fce3a20e82e91d0e04196365b5098512f4ef7c7822,True,Tests_passed,13507b592b123bb58c6c378884fc56a29bd7e61a5adae10d0be06c71abf44ff6,True,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,65e89943b4c447ae8e1aa6d6422c787fc39be71f5df8dc27b627d714c0c5120d,Merge_failed,aa2313126c7826d8a3f02383fe2e91de3eba5d6477a8982791c234c03ecfa316,Tests_failed,7fa7dac3d023a0b3a1a8ee128e440d040da3d39d839c3617d470fb8ec79556fc,Tests_failed,c29c1ea111eb0619191895f0b6441e43ad32f7a3931071b3d94858d4b0ea11cb,Merge_failed,aa2313126c7826d8a3f02383fe2e91de3eba5d6477a8982791c234c03ecfa316,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,d7c81f742fe8b7ea5b2e5fba3948e19a2f664cc95d9d7ef16082ffc765990a0e,Tests_failed,7fa7dac3d023a0b3a1a8ee128e440d040da3d39d839c3617d470fb8ec79556fc,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72,Merge_failed,8b99b8c738b8bb2dc69551cd54b0dce4db2c969780be24061a027e87cf9e4e72 85,refs/heads/master,4be3d18ac5d8d4f21dd63731ba9cf92aeadc16e5,dd350b3bd64c7ecec5926bf19c999ea77893f5b8,9f8273317362999795cfad1aa6f5fb82d38271b0,,True,True,True,5,14,30,2,True,5,Tests_passed,d8712d36339ffd9c2bb7b2006dce6bda868a989651256d2727cff7d549e9c8ad,True,Tests_passed,704f38aa289e58cc08ca0da8dc47c5017bab946462644f5b309ed12f5ce4345d,True,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,929531a547dd74ae1723adb7a5c040a5711cf722a8be8fab375dc525f2a7252d,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,656b483fc5eaf7402260cbf2042707288d319725888f2801cb391c5f0d6e5574,Merge_failed,22821efc993a69966dfab75b659589b0fa6f0dc8190caca70cfdc954c8051f51,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,ad792b2c1065307c8bf3eeb766a7282553966d803ab0a31ca2022196bcf12f2e,Merge_failed,af868e0c8e71e4ffbe0590e4233f602d3fdf88733fcde2c478f3485b4f72898d,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3,Merge_failed,6f30b7c28fc09b41c778b1ce03c83f7ab7a4e84111e042f9141305703222eee3 112,refs/heads/master,c47c46d2ea05b3999eedffc0fe659e3e28eb89a2,ba00daa3a769e4d2327b413ea75292229ac5af57,b4d282131d27dd2014d1b9e4a0442c3d5e6d54ec,,True,True,True,28,99,765,22,True,40,Tests_passed,d4290906aee4b84083b09e3f3592b0f3bd97423b2b4f1403a07d7382ea0a34c1,True,Tests_passed,5a706f39bc03a655c9947b0de1ff0100bf3bee73f0150cf992cef311cf654202,True,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,08b4f99baaf4b3e704643d34ecee7ec2a320c3a26fde82e879639f38bb060d76,Merge_failed,3b32d3878153d339d0bc16424569342b3568ebc16176977b964acfeb0a97db7d,Merge_failed,1f91f7c825677f3b61e3c75bfa6ddd9d6a088a5ae1845f00911be7774ea0d445,Merge_failed,d01755ac82b12422814be34297e108f802b7281dab95ea0daaa8cda544cb8c45,Merge_failed,3b32d3878153d339d0bc16424569342b3568ebc16176977b964acfeb0a97db7d,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,34934b3119bb207ba69c0c77f5fc38faf40afe192ec13efa9131cda83b447315,Merge_failed,1f91f7c825677f3b61e3c75bfa6ddd9d6a088a5ae1845f00911be7774ea0d445,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477,Merge_failed,6c482c1a2a3d201ec52fa577e1b00edd55e632b3e3f4b236665f48f0b52ea477 diff --git a/results/reaper/merges_tested/urbancode/terraform.csv b/results/reaper/merges_tested/urbancode/terraform.csv index 1acb7223ea..358bca282c 100644 --- a/results/reaper/merges_tested/urbancode/terraform.csv +++ b/results/reaper/merges_tested/urbancode/terraform.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,c4253bb945f73b671cc8d21349ef88f05d92d42a,ac7e8bc99b2f5d1b35dae800e96679463cdd1852,57aafd37764a669662cdabe3107bffe138d069cb,,True,False,True,2,3,11,2,True,2,Tests_passed,b79f7d7bff97ce62875facd258db4862b5a99aa286e8652d48aa77ade84884a8,True,Tests_passed,6067a9de2743a1815b615ed6adf925c697044d84b54fb4881ee271604c0e464c,True,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,4243320cc663497bdb59b136b881aafcd00aeaeea1eeb974cda4d164182529de,Tests_failed,47f70167023037531fff4f8e8ca9a55a926159102060b4c259c085703dd6ffa5,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,4243320cc663497bdb59b136b881aafcd00aeaeea1eeb974cda4d164182529de,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab,Tests_passed,92f8786548ac93a1c58b5349b39d714488abdc849fd56e6518685e67091836ab 3,refs/heads/master,23cda111d2be54f22e8222a29f71f29bb61f3188,95b28fa95c875e4c1e7c85d1e0164f5f2783cbd9,7da71a46727f3db5c199f4ffa765cc95c16997cb,,True,True,True,8,32,345,2,True,8,Tests_passed,79d4a2f1c49febe7730103f9e960f015f5cf3e76dd3ca2df46144e260e5e1437,True,Tests_passed,b0b544f09b12a5d7cd396660e3f709ecab62e1ad918da0f9f83023e57ac9897d,True,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,ca6d61dcd21a17f86b12a4453d5d7340847f0e59739d1f2e16ed09c017a0061f,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e0eeb42530b3e98720ea65d7ab0af1cfa8c8940127638a134b774d5198e25606,Merge_failed,f40594c1a8e8729fa605a269467b4312ddaee6617c73c0c132b136694b1d2642,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,8c63d880ad6a9d5826eb371c3f7699bcb3b518a0080a22a8691ef425e4c12887,Merge_failed,1256bbc2638df5e64a1e909a8b60954f40af0434432d99decac8a518f0726b1f,Merge_failed,cdeb9345c7723faacec467c70ee9f4e094cb004cb075bb1404a001fddf600a9b,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,266bdf93cd9673b6bea217369c514cb71ca88eed6708cfe9c4d464984c82cb9a,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16,Merge_failed,e44d9e52cd7337ca13d7d3963a25e4fbf93b2262c75f3b79e1a7abfa9a029d16 8,refs/heads/master,22ba463ff5e8f14da07637f3f580fc8720ea9be6,648f7f8f85db00572cd401de98800709ceafa46f,c7596afb71454a5cc64b1b0528dd8ad3b45dfcea,,True,True,True,32,82,510,2,True,32,Tests_passed,9eb964c649e02a0d9f0a48859b63a132b04f298bbfcfe543242efbd877a15799,True,Tests_passed,cfd2eae528a8a247c6ed10ca00c2428dadfed82637302b04a7b9828c9dbc5270,True,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,d0dfbc9b967dde11f108cb531058d96afaa814ae2473079eee0bcfa5afba5ec7,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,d0dfbc9b967dde11f108cb531058d96afaa814ae2473079eee0bcfa5afba5ec7,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802,Tests_passed,784602800015b6a38cbdf0497b7975cb55bac368182648adc330da9fe6dd5802 diff --git a/results/reaper/merges_tested/urish/gwt-titanium.csv b/results/reaper/merges_tested/urish/gwt-titanium.csv index 90c2a7712f..7a9c5a203e 100644 --- a/results/reaper/merges_tested/urish/gwt-titanium.csv +++ b/results/reaper/merges_tested/urish/gwt-titanium.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/remotes/origin/emul,8283194660a0d362eab3f08a61e31d400d9a56a9,a22853e43bd0683d9a09f4e409ac0ed431bb99ed,18650ec3760d6293ad56fa70c3eabddcb24ccf02,,True,True,True,153,257,34067,35,True,153,Tests_passed,20c475afa38390c216f3a9a0f9deda4e64dfba181ea1d2a213561fbf541d7f4e,True,Tests_passed,070e30656769757e7cb688bc5a2d3d9fea500e09bb5aa28da515f8dcd5029901,True,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3d8ba7b26749216bc3de5c4bd583f73e5d23d329aed370dfc50e5ba33ba2880,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Tests_failed,35129bb7c9a10431e89331c05256d9aa956b876f0a6758bb38e679ce85d78712,Merge_failed,3f43a91d3fae7567a44da03710e0293387de62f01d412c5bb05df3ccc34e9f3b,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,f3c5eebd57ffb99e3148b8dd5b240541fad2108c894df3f31385204cce1ddb0b,Tests_failed,84b8a18a7575b4a68a99364c185a0d690b81950f135da36abcde851a448ef160,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Tests_passed,4c88063e5d0ff927c7a7dec9c3364327af5bc33c5db468d76c8f0ba2c395b8ba,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7,Merge_failed,b77aa296ce8331d3305f5c81fec7bb83e0a16ea9ad178cc6e007aab0f50fb7a7 diff --git a/results/reaper/merges_tested/uwolfer/gerrit-rest-java-client.csv b/results/reaper/merges_tested/uwolfer/gerrit-rest-java-client.csv index c178062385..730db25bca 100644 --- a/results/reaper/merges_tested/uwolfer/gerrit-rest-java-client.csv +++ b/results/reaper/merges_tested/uwolfer/gerrit-rest-java-client.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 114,refs/remotes/origin/httpclient-android,63c4c0de93ac1545662f946e7b8b821c6c85da68,db86712fee757b5b1808098856d6ac77837c2801,6b9cfe0eaef6462b8405ca2362a4b8a54b062fa4,,True,True,True,178,639,3533,4,True,178,Tests_passed,6abd3aac8693c66ef661bfaccfd62caf6b63bc2f347ae65add0a4058db77eda2,True,Tests_passed,8eb92b00d86730c2de3dd37ec19a9f8a15567df3237dd74fdd6a3e4152539178,True,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,4f003efaf94b98bd4d4da6e1ebcd7cdb009c96892e3b9f2e82d2c253c37a9698,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,dff161dcd17e4fb34650addf26e521ff5eb124cd505b3b3dd1d316a98165a417,Merge_failed,d701cd79053e9c2238cfad06a80993ef5b995a729f3f9efadeb7b8ec992770db,Merge_failed,717106afbef252b1e8cb897e965d14ef6e46ad325cb33a11275d7c7b09c77bbd,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,593f349be4fa0a69de0aa9cea9f3c2d4b20737e3205fb82a977e7b161b6f02f0,Merge_failed,53e21196a543cd5fd57979f751a6e935c34a30d1cb307234c7d3292c4c42aa14,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7,Merge_failed,2726fc406915d93aa84e5408a032ff71b43cb8d63bb541281de8787b804f2dd7 116,refs/remotes/origin/httpclient-android,35856ab8bd9a7ed4d6946e68a23f2653c94ada5c,a7f5d5cf65b3f363a19d72eb799ac70c94a39843,e86602dca68a90bc04aabf1b2de45cdab104bd12,,True,True,True,70,182,1913,3,True,70,Tests_passed,4a98ee1c2d6c37a2c0c71d67bff5438614b2e47b2c78fb1993754a48c2a64922,True,Tests_passed,46627b95166ce4b2c4b09615d4e8d8d8718963e46ddc40c2f22a1293a2f026ef,True,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,299e00c9f4e8c3fc14ecfefd90bea6b3d28e08d1d97f3e2214e235fb142cf6aa,Tests_failed,164785c4edab1611adf1b7da1a5868c516a672227f655e1de28e58df604c19f4,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,299e00c9f4e8c3fc14ecfefd90bea6b3d28e08d1d97f3e2214e235fb142cf6aa,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8,Tests_passed,2117898a97e0f7d0b29689d4d8cf6f4b5dd170bc9e1e470b6b0848a08a75cfd8 120,refs/remotes/origin/httpclient-android,fd4ae7d03dd1783b33f38e7dbcfc6d908ca135c0,1091b6047f4913f26d45cf571186f2b9d86a44d6,beb8b810e0bbde2cfe89ed43eb85eae0f042e394,,True,True,True,27,80,854,2,True,27,Tests_passed,06a27c65e13b9442b9c3104265a621ea901306da39f43a9ca8368a9c7977024c,True,Tests_passed,7fb1d2b4e40e9fe3d8512635613c9bde7abdec7ff046d230bae41903924679b5,True,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,887742edbda8f16c8ad84d8da6194f06512e43a916d9326621ced03e0f95686c,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,887742edbda8f16c8ad84d8da6194f06512e43a916d9326621ced03e0f95686c,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d,Tests_passed,276731cd3f564a35ede7cc727eeb3bdc9daa44af58eb43cbcb90fbbc4cc9f10d diff --git a/results/reaper/merges_tested/valotrading/silvertip.csv b/results/reaper/merges_tested/valotrading/silvertip.csv index a308c310d2..87c3535355 100644 --- a/results/reaper/merges_tested/valotrading/silvertip.csv +++ b/results/reaper/merges_tested/valotrading/silvertip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 27,refs/heads/master,9d31f8111075f508c9ecfbe3680b12d13a48f927,47b363321c14cd5e46ef5d2eb91463007b8916c5,7be1073b258791c55ebb6a8d499f0b8ad76e6cc0,,True,True,True,24,33,445,5,True,24,Tests_passed,80df0a65c04ce8cc250a78293d6a24c463f1564052101bcaffc8a04e27f74d05,True,Tests_passed,984964b6a6d87f1e8c8d38fda84d3053daadcd389a6a6376443b81db4dec6603,True,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Merge_failed,ddd701b42e936f7b0120dfbde6474a721fa2e1bfbd26004b50090fb35256c107,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,e4eb81b4976190a8a4ef4a1510a164f8e759191875866ca234355cda17bccee9,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4,Tests_passed,ed97d9284878470c5eb8e38670672f15e354316ff3ed73830d1476ffb1a356f4 diff --git a/results/reaper/merges_tested/vandurme/jerboa.csv b/results/reaper/merges_tested/vandurme/jerboa.csv index fd3fa46043..d1900f8efc 100644 --- a/results/reaper/merges_tested/vandurme/jerboa.csv +++ b/results/reaper/merges_tested/vandurme/jerboa.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 13,refs/remotes/origin/pull/4,263efef5a3a930b599415d8920b119ce0aa9b698,6b05c1b87121f315477c79ea137d25f32d1d4f2f,05251e54e75667b526fc42d248ffd3e65ff26f34,,True,True,True,51,290,1528,3,True,51,Tests_passed,f4ac36484b9d165debf20fc38569957951d3afe77391c3b2274685931be3fcfa,True,Tests_passed,62e3f63bc951103ddbec95806a175e673b1c7a691c791ddb140c48bc304560de,True,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,8c2057dce7ec0799e02480b6c5f6871881891ca3f6517aed5ffc30edb08f3c45,Tests_failed,e00bee7c927b5e9212d3c6cd4f8f8c851e07afea9e50c8d55d08cbf243b74522,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,8c2057dce7ec0799e02480b6c5f6871881891ca3f6517aed5ffc30edb08f3c45,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509,Tests_passed,9655daa59a8597aa7e433e32464fcf3960ad68295a597008a1635dc8ab86d509 14,refs/remotes/origin/pull/4,3ce0e6dedb14acd3be38b052f4158734778b4973,d4b49e2bfb050626774cc3f3fb654993a3fcf099,6f00c6fe70e86fcb6f6e78ee7f1f590108cecba2,,True,True,True,45,259,1260,2,True,45,Tests_passed,9e7b018019fc6c5fbca750e359a122d184930595e31bd19f4e6830848ab2522e,True,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,True,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,2ddc0b1a6a4c96d97009f9b701988102e8509d838287fc20bbc487b828967815,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Tests_failed,c812b70eed7120580b5a83568f6cbc0b613b1b69e996da5eb2fdaf80cea455aa,Tests_passed,6ede4518db09fd30f1c3ea96e92574ac278e70522b3e52892a092ab46d8a48fb,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,87bd5a077fb44facbd3efb647b96b9599142ccec7b213134ebab1ae50a94c3bb,Tests_passed,529520fd73d49fb23ec7e6496fcbeb9a81ab517c6a1516a2768696b5b5a7ba51,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,850c3c6e3d3d3f55f7a17ff4deb4b1433515a578caf89e748abc99f1bdae8a7e,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b,Merge_failed,6fd6981947cc09764abac3177338f2ab194261ab48226e90b8a9f91146bd0c6b diff --git a/results/reaper/merges_tested/vanduynslagerp/enml4j.csv b/results/reaper/merges_tested/vanduynslagerp/enml4j.csv index 0623447a3c..be9473b6d7 100644 --- a/results/reaper/merges_tested/vanduynslagerp/enml4j.csv +++ b/results/reaper/merges_tested/vanduynslagerp/enml4j.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,61e72c5c3568a9dc49d49cc19ef79a19972ccd26,83c3de81ff9b7fb8a047be4abb0a9b3b82256cbc,0e08aa59830a000eced31b31a2d556531d15283a,,True,True,Tests_passed,21b135e72d860adb5d727b37f264cfec4eaa2832ca87e463f67daad48912d812,True,17,156,697,2,True,Tests_passed,8cbf4b26ee339dbf2eb63874a67d64436fd103bd089d1ef397a7ba0d02448ea2,True,17,True,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,d3c673a974574947296fa7f4b66b0bf130cfa1985b63fe062e8bcfc81761b111,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Tests_failed,544d1d32813f91e4d061daa8aec00227e9fcd666e7a3a22f51b6578c013ff4c4,Merge_failed,ad52abd850d142b1f3c3c7b2bf0b9e47b86a391c9c0cfbefe3447d591ee669d1,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,c0a54544fb2e7251030b6a27b916589dad872c46bfcf1e0a6e1b31d3d41627f4,Merge_failed,825c45bff429c5a4d4e7b0a1ed5f1a162523e9808d0c4cb7a6a1c63b1b6472fa,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af,Merge_failed,b2ff8b342587310465052b4f9d3e48f275d2a923c32894fc06a25132b4f2f2af diff --git a/results/reaper/merges_tested/vbehar/rundeck-api-java-client.csv b/results/reaper/merges_tested/vbehar/rundeck-api-java-client.csv index ebcb001a9e..c47bbda68b 100644 --- a/results/reaper/merges_tested/vbehar/rundeck-api-java-client.csv +++ b/results/reaper/merges_tested/vbehar/rundeck-api-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/remotes/origin/new-style,ca48a23f4bc9ba6e23057d3615272938e61eb670,564a3ce90f61dcb10c46c4553e68e6221f516248,2206d677247431280a262ccbdfc9d3f4b2e4065a,,True,True,Tests_passed,467a2fbf1959be604c388e7cebadbad43fdc77005247cc7d2be077c506c5a757,True,24,73,1496,2,True,Tests_passed,c43917a5a447a89393e014c98848fe09f50a3bd0bc22f2103a0977dd936a4872,True,24,True,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,7ef72a8bb28f7f2d87126799cef5f2fa19cf54eb23f57c587e7ccb6219e470cd,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3,Tests_passed,4a32559c954203e1b960c8b6a4843873952883b0a7d7f074505299e3d52341b3 diff --git a/results/reaper/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv b/results/reaper/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv index 0d5a99c177..57baceb30c 100644 --- a/results/reaper/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv +++ b/results/reaper/merges_tested/vdenotaris/spring-boot-security-saml-sample.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,88d2426c11714615322d84934cc2e1ac72fd08e7,1874da0eac0466062024733152861fd994f2d863,ec64add49e8afbc99404f1fcfe15285457553b68,,True,True,True,40,101,797,2,True,40,Tests_passed,6c082e8c67aad2fff9df716176724babd11e8c014ae326571b9f2963ae2a035d,True,Tests_passed,eaf097aa2d90637a13cbff55442df88b305635dbfbbb27ffbe78fcf92905646e,True,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,65e2c707537d3826be17d3d7c61bf18548d03f64f17c238e9097a16b835b07e2,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Tests_failed,20c9dc28359056a064f47fc783e7ddb6fdc9ae3eebbedd83db235d249679b9d7,Merge_failed,f61059955a32e9672b1c9f385143de2b08697360b83d0fbce4c9061e2db4d954,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,30d1d1468ff7de72fcea320c29ca85452598cbf2ce35eb7bbb0b9d6abb15db90,Tests_passed,5309f0b12bcf7b2ee0fd8854a2cf15b6c03b92f50e7e796390b4ece4767f8696,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,e5668044b35d9ad7210fda7aa24e2e34abcb22487c2b86ecda757315cda7f492,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b,Merge_failed,1df7782c99cfd3524e4f197a04caad04b9e75817619bba262ab3bf8e66a12b3b diff --git a/results/reaper/merges_tested/verhas/djcproxy.csv b/results/reaper/merges_tested/verhas/djcproxy.csv index 32037eab27..30e379c566 100644 --- a/results/reaper/merges_tested/verhas/djcproxy.csv +++ b/results/reaper/merges_tested/verhas/djcproxy.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,db3b9bf7957d4a0e56fda33ca5d5e9340d9625ca,9db5e5b7908a16e773116d2483bad160803e90d9,a32513a5d9a409c995562fbcfede61c982301c1c,,True,True,Tests_passed,009f8e66c25a54003cef9139b7e8e98abc066415a86c566d47a9d44ddf037dc9,True,5,8,77,2,True,Tests_passed,60f6295160ce31bda21ceda8a75c29c9972f48f79b234c93ebb7e034b6d2b832,True,5,True,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_failed,c34de71dc51846a2aa4c913bbe2e6a564e2b3f4b9a9b21a90bdcd5ca950a865e,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,c365c56ea051c2b3c4c4ac70351e0a6eb0d57919846013614875c9114d5d8ffb,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a,Tests_passed,45296325bede736bdfc7ad1b6478346a0458c35569fdbb163d373089c5efe95a diff --git a/results/reaper/merges_tested/versioneye/versioneye_maven_plugin.csv b/results/reaper/merges_tested/versioneye/versioneye_maven_plugin.csv index d05166f9ea..60b3ef4984 100644 --- a/results/reaper/merges_tested/versioneye/versioneye_maven_plugin.csv +++ b/results/reaper/merges_tested/versioneye/versioneye_maven_plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 29,refs/heads/master,fdaaa77a460d09c61bd2b8448f9debc6200e840e,a369f0e6806ad651d877692e6993fd76f0e2e884,65f4beefd4f5366ba88e67722f4101c33a368c89,,True,False,True,2,4,14,2,True,2,Tests_passed,81d9fd0954392a3921d1776561286442abcf219c1e0cf5f3e2b0641b17d2018d,True,Tests_passed,80034b578cb108e82027619ffcff57ecf721582048a11e51d072e06f75aae2bf,True,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5709842f4912c63ce723fdbef53d7c7502d1fbd1ceb90a4d517ab2106dd37719,Tests_passed,a5c9614b99649b339967536b37a29ade83a5657fe8604f2d7f689c5331a4efb0,Tests_passed,f677fec1bbba90c70d7b126a6c2a3eb95611c46c3ce0089ec4488cdc01a29b68,Merge_failed,02ac095aeec11ccb08b30517e15a00ed58f02ac3cdc120a6e949434ec1b846a2,Tests_passed,a5c9614b99649b339967536b37a29ade83a5657fe8604f2d7f689c5331a4efb0,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,dd69e2182b0f4f0d928b844c860fd1a5f923b01b6331454d6ed318767ff22bbc,Tests_passed,f677fec1bbba90c70d7b126a6c2a3eb95611c46c3ce0089ec4488cdc01a29b68,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf,Merge_failed,5d21a4774e6f17687c11a669a3e511e406dd68c04824c2d2222715ffcfec23bf 32,refs/heads/master,a890d82eb3698c4a20b2035eb3fd1e871bf52aa6,fbe5f5fd02487b865ec5b1b63891b56c8ddf642e,73fa448ea55736bb6281bb34d6bb5efb4e618fd3,,True,False,True,3,12,47,2,True,3,Tests_passed,34047f9faf00864135bf7eccf1f5de85c653b53251c2a6b385f63f5e53f2dd55,True,Tests_passed,82f3effcb60635228fe2447d9a023afcc33b523a47b7bd9dd27a313efc33658b,True,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,48e722fed6be979719cb9ed2d36df6b4b284e7ed1254c745f4dcb692e0a2a0ba,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5,Tests_passed,c2e2163b862116395362a22c9f4890c848cc7e9482976b44989620d42965cec5 diff --git a/results/reaper/merges_tested/vert-x3/docgen.csv b/results/reaper/merges_tested/vert-x3/docgen.csv index 777361afcc..6e7d69c17d 100644 --- a/results/reaper/merges_tested/vert-x3/docgen.csv +++ b/results/reaper/merges_tested/vert-x3/docgen.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,9134f5b15fc02c05c55070e38e6d186817873f09,34b830c5d7ca867dce2374899b5b129a89031998,3f7283c63d19b9677b7987b626713c40e5f95b57,,True,True,True,20,38,614,3,True,20,Tests_passed,260e28288879ce655d414fb0f5c7607bc0a30bb39451e990efd84040c4cde309,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,True,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_failed,bfbab5320f9d672fc867ff58ebdc9bc251fe5d04070518243a451318412a12cc,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76 5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,True,9,12,152,3,True,9,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_failed,152f18f9e467cace050f36e036d75ee86685cb9fd28b66f02b24e43deaf1792c,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098 diff --git a/results/reaper/merges_tested/vert-x3/vertx-docgen.csv b/results/reaper/merges_tested/vert-x3/vertx-docgen.csv index be9ebc4bc2..ac51b1d127 100644 --- a/results/reaper/merges_tested/vert-x3/vertx-docgen.csv +++ b/results/reaper/merges_tested/vert-x3/vertx-docgen.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,9134f5b15fc02c05c55070e38e6d186817873f09,34b830c5d7ca867dce2374899b5b129a89031998,3f7283c63d19b9677b7987b626713c40e5f95b57,,True,True,Tests_passed,260e28288879ce655d414fb0f5c7607bc0a30bb39451e990efd84040c4cde309,True,20,38,614,3,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,True,20,True,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_failed,7d659178ef0ae8abeacbb0fd5ec48a8a10b8c70706192ecdc3b6bac952fc32ef,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76,Tests_passed,6a90b743a469c5431a3f73e43fa7f12c43fcbbdb45b5685b7e8dfedd420f3f76 5,refs/heads/master,3f7283c63d19b9677b7987b626713c40e5f95b57,2b8d11b5588def5a0038a208e08e259876a51a0e,8e3d48b4a25f2dbf55e9455905a1fc15f774fec8,,True,True,Tests_passed,2c81052ea8917dcb94578c2caf4d54a49b2ae4d4c430d429cb0fb296e031761e,True,9,12,152,3,True,Tests_passed,60b28baddb4a6a393d93910e632e48c269a07094e4130a685314ec8ec453607a,True,9,True,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_failed,92dfc6741534791d47e0b0dfccd62b86d60a7634f35681df6156a5261411fdf4,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098,Tests_passed,7525cbe344f9119cc76c9ca9c2f4066f89179e6328c702bb60bb58f1b977c098 diff --git a/results/reaper/merges_tested/vidstige/jadb.csv b/results/reaper/merges_tested/vidstige/jadb.csv index 5941de77c4..bb64afe134 100644 --- a/results/reaper/merges_tested/vidstige/jadb.csv +++ b/results/reaper/merges_tested/vidstige/jadb.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 15,refs/heads/master,6c84fe654222121475fb066fd217db3143fb901a,d3bd5c5ba684549f03086c46c0223f2e968af32b,3db1b31a0c4f5e74503cf43bbdcf1d1dc51b8ab5,,True,True,True,20,61,165,3,True,20,Tests_passed,824287fc2c4692fa431c4bcfee647a51b871eb82fd3feaf20a2544de1ddfd0cc,True,Tests_passed,c473f07bf2bcff4853b65549831a6b7ee9ee89f9fa3a44eb65b9e9ce7af4d29b,True,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_failed,c39b4b16d4b80274439e845e1d3e6354a38ee017172322069881ed869cc08e3f,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab,Tests_passed,15562f8e0e2ba1a4bd8601717746c53abfd4ce46f14890eaa81fb805264833ab 37,refs/heads/master,70ea021bf0319649a94486d083d83810fa9f3ff8,46045ce24198a66f4684f8326ffe89af30be30c8,db5d9e13bcd894015e8d234fe100b42de37b21fd,,True,True,True,7,19,201,5,True,10,Tests_passed,eaebaa64154ed235f09f8e0a6ce7eb4afdaec4c192f90862a55d60931369c46f,True,Tests_passed,bbf279edcd2a991906bde541360492cd1494d9281f1261bdda67ecfd295e634d,True,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0,Tests_passed,81df7796839cc76bb6c3ba63ccac9e738048e377df6b377df6aac9a0a0fc61d0 66,refs/remotes/origin/pull/54,a48695a428d2f228d108f3986533b212c68f61d1,733818773b8ce2a6e4d76f202f0e99aa60fcb805,23d185b015746afab7bbf329fc5e915cc2396975,,True,True,True,15,27,2362,2,True,15,Tests_passed,e27c8ab0aafa4b820be550e33ab01201504563778c0c91faae6172f96903bfd9,True,Tests_passed,0c15d208394aa3fdfc7908f5396c9229551876353189971cb0cabeacc623ea4b,True,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,0957222fe01d4f5410f265c38618efb852eec6addb666e3d59f5ab02273619bc,Merge_failed,3f5c63aaf77191b5c04b1260b9d45d33ab764016554c28449d92197cb1b5667c,Merge_failed,1f7a10ab97c61f51f1788d249a14c7f95e3d0d217ec3009fb5ff80e49bc91e85,Tests_failed,31bb377907ca5b50c23778a0f85b8906524b2579512bc56698780824bf6b1455,Merge_failed,3f5c63aaf77191b5c04b1260b9d45d33ab764016554c28449d92197cb1b5667c,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,a65083223e2991fb21146a8040d7e708328dad24f5251862d68fcfbf27ad98b0,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9,Merge_failed,c4cb2c496173cfc40ede0e5f8aee89bc640c5fca81e6f1f936f6400619a0d7b9 diff --git a/results/reaper/merges_tested/vietj/modsh.csv b/results/reaper/merges_tested/vietj/modsh.csv index a38ccbe33a..79bd5d00a2 100644 --- a/results/reaper/merges_tested/vietj/modsh.csv +++ b/results/reaper/merges_tested/vietj/modsh.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,19a671985cce2db348b07fdf8481409a45b6dcb4,5a8501c46c9b1fc7ed5ec9285f11e5e7967f36fc,7e6b7a094b2b465243053bd149d66eef6714fe55,,True,True,True,28,172,796,2,True,28,Tests_passed,bd13331eef5933ea20f4f5e7e84465d0616704b65b5094e13eee7fda24e46435,True,Tests_passed,6c1e8e98b61e4af0b0394738dc6850bcaa8c34cb3c62db5c4d92a1c3140ef811,True,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,2b223685f826dc953deae30071b50259f2f77ea0e79ebe7d284f714e1d4b060b,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb,Tests_passed,0f7f70bc33786c7c660c1fdd35748f0fbe17dbe19bdb445f4877c271a4397bfb 5,refs/heads/master,a687b0bb0261d502f8bb8c7ab2d1daaf394359b3,2be2e828f9f02487973c32a989c4b25126c0b36a,bbfec44c17e0b010e4ca16b5b3f6f1dfc33e006a,,True,True,True,37,181,2394,2,True,37,Tests_passed,5e123d71ea36a8d1f214010c65d0ad3c8223c6551a602799d31110a3de91abbf,True,Tests_passed,d08fd6ce32c9ae5c48d1a382bb1429b8c74985f63143809d16acb411af076d23,True,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_failed,874f796cb2c0cedaa36ff1382f01dec2ab9580c973e91fe195bc73753e3da1ee,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,0dd693da5fd16d22a0ab86ded655a35a62edead126720d344f32d69758d0c34f,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,04d18cccff01daa42bd72ac6a9de81ad04d644486a42a4f7f4bd4df32f41af87,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a,Tests_passed,2e5ef07811ea106d6e3db1514a0a6992fac23258007f99688dc9e7514f856f0a diff --git a/results/reaper/merges_tested/vijay2win/flume-cassandra-sink.csv b/results/reaper/merges_tested/vijay2win/flume-cassandra-sink.csv index 2312a35369..b71407301d 100644 --- a/results/reaper/merges_tested/vijay2win/flume-cassandra-sink.csv +++ b/results/reaper/merges_tested/vijay2win/flume-cassandra-sink.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,38cdbeced79a3299317c1d44123c7e5c60e42a83,c7587b8c301132433d6f7663c31018f9ec44b503,981bd79f59b939b49f342d12b1c00c3805b632a1,,True,True,Tests_passed,23aeb5e858e4a85fd9e1f890f98b3be9facc42b5791ec1ba9deec9ef8cf35726,True,12,22,324,4,True,Tests_passed,584006bd6823b8480436f8d3d00324548d86af8d085cbf82f2cb42c5fe2547a0,True,12,True,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,5232c7e8251e8a8253f5a9b3be728a93b845257dd7f4a94874b0cc8e30b252e5,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2,Tests_failed,457d594617538439ab2f7a5030c99bb864c27c9798f30be78adc1b2973668bd2 diff --git a/results/reaper/merges_tested/vkostyukov/la4j.csv b/results/reaper/merges_tested/vkostyukov/la4j.csv index 8eb85fa0f8..93e3eeb07f 100644 --- a/results/reaper/merges_tested/vkostyukov/la4j.csv +++ b/results/reaper/merges_tested/vkostyukov/la4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,965ce08afb0f6e85991ea707d72c97a293b2010f,1229fcf1bec83b678ae8655fac893dc14b8e70ec,4d368a0cb4622b1b99298a3f1d9890e44bd38dcb,,True,True,True,4,6,40,2,True,4,Tests_passed,df72f84ce360854d6c2155728c1ec9accc5c607c68778a1bb3ecb5ef5e03d718,True,Tests_passed,8da09d8986e8ff637f6d693f78be703219038d12af19ba43e5214def4f1c4952,True,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,87615da9afd2073b25e9c246fee1c914fad5e3b5d24f4b3ce5a217542d18ec1f,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368,Tests_passed,48543f4025ad7b9e3003b37465598d7115f3d340f267f62ec4bd422a230b7368 5,refs/heads/master,f0eb677360872183b98f8821051b6cfc9aa8bdf9,296af31f54e1501dc9efea807fd6da62c01463d7,b0c4057efd2065d5c4269b1a41923d4de98ba0b3,,True,False,True,2,4,17,2,True,2,Tests_passed,65caff6501e85b1a79acb9dc320e7830bf023793207fb62cb78c093e2c5bfb7e,True,Tests_passed,9f20ee87bc159c58e2f73ed7fb4abe5e51bc827d8bd36f6c3d4126275d4e7347,True,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,f62c301f502f54e397bb7f55bdda81c14f05277453ede5b918a0f09c84620e6d,Tests_passed,bf3a34a0795df44303ebd8235e98b7707301c61ba2651bd9fac59e9b1bbed879,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,f62c301f502f54e397bb7f55bdda81c14f05277453ede5b918a0f09c84620e6d,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7,Tests_passed,0d6cbc8fb61274f728731c8c19d27cd0446230ecca835921486dd3344e239fe7 28,refs/heads/master,07f02eef0043d0f9b6857ed3e1c67882fe9b9159,0b36b109a0da0105400cf94a44c156beb7c67683,1bae40823ae1e0ea4b6962d6fc777a7ae56e9d6f,,True,True,True,11,96,561,4,True,11,Tests_passed,c6cbd82357bd8cba2aa0ea26ac8561b79f34c4d517ce5ff594db68d577d9e69d,True,Tests_passed,ce52a7bc83aee7f652418bba5c0e714f77510decb730dc6a555206f45967b080,True,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,119f4f765f489fb1379896835a73640df897504d08f6e7915a8a111e4baf453e,Tests_failed,7bfa21eadbd758d3341bb97967127c30b96e17f31a31802a91fc057be362fd00,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,119f4f765f489fb1379896835a73640df897504d08f6e7915a8a111e4baf453e,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,0fa5153fdb2302d13b550e015f4a3b520ac66a6715fcf906befa576fc12c8e1f,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd,Tests_passed,31cf942befad00b8eeea29f010ab6e0caf727ae004a8156eeb1801f90dee90fd diff --git a/results/reaper/merges_tested/vojtechhabarta/typescript-generator.csv b/results/reaper/merges_tested/vojtechhabarta/typescript-generator.csv index 6602e36713..be0bc47b89 100644 --- a/results/reaper/merges_tested/vojtechhabarta/typescript-generator.csv +++ b/results/reaper/merges_tested/vojtechhabarta/typescript-generator.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/main,21e67d4ad2285b28c6abba515a8aeaf823083c25,6bf3790e1a165828766d008ea774dc5ab44bb63f,fcd79415718d23a5142acb80b46ae8c6eb68a8ff,,True,True,True,25,62,420,3,True,25,Tests_passed,940f160fd1cd3bd11904eb508c50579b7fff355006474b37f16acbaec3ca7d3c,True,Tests_passed,52b40d523a47159e37fa9aab00fcdb3d332dc0b8c49115aae5b5ac5d23ec62e8,True,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234,Tests_passed,f9fbf865c87cd75c482c2c64d90f738154f1e5b1c1b1b923908a161e696ae234 17,refs/heads/main,d44a704cd00045c731f3d66de3d6a2079567af88,597446625e1ee9ac77a1c3a0b012a8771febf5de,39fd8bd2c598e485354fed47fbb6c71134aecf84,,True,True,True,38,148,1667,5,True,38,Tests_passed,9b865674ff9a3d091bb50383c2253a06d66f4b7d1014751021b09399562be737,True,Tests_passed,23ee0c8f6900a9f3235f037224842e33ab18524498ed8f8c7ed6d8db15b1ea20,True,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,3ee6bc2410ce8f8b57d6ea54075e16d5dda680e996709ee3f343a38cee9e656a,Merge_failed,667710ff2d7aecdbc1baee884379028f15788efdb2702bcbbf1a1035379528b2,Merge_failed,e0162443d254dbbeb0f30cf74304de0ba6cb00c232bee19ee78466dff8072347,Merge_failed,e0162443d254dbbeb0f30cf74304de0ba6cb00c232bee19ee78466dff8072347,Merge_failed,667710ff2d7aecdbc1baee884379028f15788efdb2702bcbbf1a1035379528b2,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,bf052dc58a1ca316738a12a683bd31b596485b276c463a0a9351a3d4bdcd66fd,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177,Merge_failed,6b3ef0e3bb8cb3bfb48b97c2d37d182795b16c4b7d095516bb786f96dfc81177 24,refs/heads/main,d35af8140a6870436d9ff2b8f2e47164d405af58,22b28594442ae4228113d8a867df5451e9240947,9d26491e9b5859135826e35bd1250bdd563af58d,,True,True,True,38,160,765,6,True,38,Tests_passed,8c53029031cd7b52f3572d0612cc6e41521cc67a504c2014afabd4c75c696fae,True,Tests_passed,f14a10a9936238762fd2a02ab85626162ca9933473d7e2ed857daa0674690262,True,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,036b4979ced1868e4f43010f0c9c971099f7f5ff0a43b9015d23f3ceaf7b4ff8,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_failed,4723d7554ab32d1f9553b66f0597957d2969cb0fd95ef57e0958512ac3b09944,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,036b4979ced1868e4f43010f0c9c971099f7f5ff0a43b9015d23f3ceaf7b4ff8,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7,Tests_passed,7adf6ed9f6aeaf2d8d8db1f6bf3924b18ce05707bd36f2d705f12ffa9aa16ea7 diff --git a/results/reaper/merges_tested/vt-middleware/cryptacular.csv b/results/reaper/merges_tested/vt-middleware/cryptacular.csv index 65c4a38152..29b3f30d82 100644 --- a/results/reaper/merges_tested/vt-middleware/cryptacular.csv +++ b/results/reaper/merges_tested/vt-middleware/cryptacular.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 21,refs/remotes/origin/ISSUE-31+32,beff926fbd2c8940c25922973b25fa29f403375a,236c0a813a83cd2f0db82e3c713c484d0fbef9be,c105eb282f4fd13f11db26207b342e3580646abe,,True,True,True,26,62,1046,3,True,26,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,True,Tests_passed,678b4849bac8b899bf8a78b88b9296570468df858afe01c8db38dd66ff5718bd,True,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,23f906dd6f61ac74d587d8a9f126b714cdf8ea5556d0c6c4d59961c8cbf6b4e2,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10,Tests_passed,f84c373dbeb89b00c7685fc520fc19108a9295a76eddd0ecb901293799b6be10 diff --git a/results/reaper/merges_tested/w3c/ldp-testsuite.csv b/results/reaper/merges_tested/w3c/ldp-testsuite.csv index ceafb6678a..10716ce14d 100644 --- a/results/reaper/merges_tested/w3c/ldp-testsuite.csv +++ b/results/reaper/merges_tested/w3c/ldp-testsuite.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,72e5a506c66eb3f3864ce1830a7d6a26e24df6af,7dc1d3f3988aa7bda988107da8c95b0bf55440fd,74c5d493011cf0c3c15badae87203641aeb24fa0,,True,True,True,18,21,145,3,True,18,Tests_passed,38d6d2624deeb297aa74862539c30e08603ffa924faf13429477025272e9ce7b,True,Tests_passed,f9068bde2818932cf899c1ac77e4f5a956782a317a79d0006e320c0c55079989,True,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,ab392a9e6efa6b6b27c58239853aff8d25b1e8c624fb0907d37b49607579151f,Merge_failed,1a43032096deee04624616b94942dfb24aed69e0c41a1e212d4d0dd43edb7990,Merge_failed,fa71da161d7a7988270a410b8f8e1a4cbb62a888c820744add6816935d67c56c,Merge_failed,c6d403dff264ec50701dc74ce8b4974d6c7b822eabe6184bba6416f6982a7631,Merge_failed,1a43032096deee04624616b94942dfb24aed69e0c41a1e212d4d0dd43edb7990,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,bdd67bf049c8cb9c63c5f540705b13882af4c4c9c936ebb05d567ebb85f7ef76,Merge_failed,3a06894ac9d4236a103527ec851c3f7b745e4fae6667e616d7a1bf07c1a28f6d,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0,Merge_failed,b38baca250f09acb815b7f661caaf25ddf47ca05d811f2d5ea7e36d7a709a1b0 4,refs/heads/master,bfcba1b108acef92bca7a67ba2662f5de8b3599e,3ad28f105961768a22e962fe98941376b05a1cda,2648740b2a27e79f02c2e4499e567c226c87a1c3,,True,True,True,10,81,310,2,True,10,Tests_passed,ef5c1504ace69ed2ed45f9fb692b7ec89475a3052766f7b3991188c12a297093,True,Tests_passed,8c0f65e92df7a0415ea6d9e3f23ed3295599105fe9a00e9e59765851350759f0,True,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,978694f3f46266d190c9e4a73039342cb27b74ddfaebfad399ceeb449ed4df88,Tests_failed,d0989db836bed6b3422dfa52616fc297df65a20c64da68b853a00dbd1385cb90,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,978694f3f46266d190c9e4a73039342cb27b74ddfaebfad399ceeb449ed4df88,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530,Tests_passed,09acd6f9d401284a054664c72c89a0806d30491710e058b3cadc7a9840f50530 9,refs/heads/master,dfa115c56a406470cd38433a006ea48ab74e34ee,2a1792eddb8695dc2151961d129d2ba6e44c3184,02138c959040aa7188c845b798c8a92663560f4a,,True,True,True,2,10,82,2,True,2,Tests_passed,460227aac595894ad762f27747d9b5e8d92d06673757bb85f36c613c66eb3246,True,Tests_passed,5597b39309eceaf62f7ecd190d50f90b568ac1ca8c114dca170d1c971dd851c0,True,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,d0f7bd2e7685fbe7e4aa22158fa38f72c1cd6c2edd3f0e32fbc8faff215e1b4b,Merge_failed,5029f428ddd41c6104296162677bf72cbdae246b78fa27073f057ac7e2564738,Tests_passed,db98b257ffea71e3286da69541bd280ceb10cfd748b4c39d2195087ac5729dbe,Merge_failed,f5bdf8ade2502a527af9e3a6f05db8a2a2e64a78ad312b0e0fb2118b76e6bb81,Merge_failed,5029f428ddd41c6104296162677bf72cbdae246b78fa27073f057ac7e2564738,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,97ebe04b86f6c95215f2a0a0282f42c2731a86b59905c533951e59944ede5f82,Tests_passed,db98b257ffea71e3286da69541bd280ceb10cfd748b4c39d2195087ac5729dbe,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,2b1410d57f43fdd5f2daf926187f1f573d324dbbfb59f5e7975af1961934b725,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e,Merge_failed,3b2391786207cc775e94abfb704828cd761f40b2e9ff13300bdb5a4f22927e7e diff --git a/results/reaper/merges_tested/wakaleo/game-of-life.csv b/results/reaper/merges_tested/wakaleo/game-of-life.csv index 4103474133..126d0581f3 100644 --- a/results/reaper/merges_tested/wakaleo/game-of-life.csv +++ b/results/reaper/merges_tested/wakaleo/game-of-life.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 146,refs/remotes/origin/pull/352,7258b0fbb99566d83323598cf9d967be3ad802a1,3491940f2e3c15c32238222acd0c3c13516bb7f8,281ffc55602672c845b42556686edeb1e5fb3cf8,,True,False,True,2,2,8.0,2,True,2,Tests_passed,1f04754b935d00526aa08c2768a8be2fc319e87f832cbf44dfddbfd6c699125f,True,Tests_passed,69e2ce682257a43805c94cb3be34686992bf761e616c5e9670a05417d0aeeb8d,True,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,e7d15ed2aecf895d8a11ea4f6b107adc9077a1c3f89b4d1ea3d11e3eeabed6ad,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc,Tests_passed,2c1260b13ea6e7fec324f8644ea6327bbe53730cdb2430c37dbfca49eaaa56cc diff --git a/results/reaper/merges_tested/warmuuh/libsass-maven-plugin.csv b/results/reaper/merges_tested/warmuuh/libsass-maven-plugin.csv index ad2557eedc..9eaee0eb52 100644 --- a/results/reaper/merges_tested/warmuuh/libsass-maven-plugin.csv +++ b/results/reaper/merges_tested/warmuuh/libsass-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,b0dfdbd7a4774d227a6a5948d44506345ad9d08b,e6325978b1bee1bad13457c5f480228a3de74a85,b5df2be37584aea6c16fea9ec19f522dc98cd596,,True,True,True,6,15,79,2,True,6,Tests_passed,a2bcccd161130e7c75904de293529ef636d286e6086001004175f0107eaff51a,True,Tests_passed,719c603b43304f7de93e239e6485ffbba739ec166552f47083ee3a38f9871a3b,True,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,8849260f20818d9557e4e8ccae9cefbbbb2b6157db3299cefa9369d916412114,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,89e34a42e4878537b7e8bd523cbcf156a86f435d0fbb67d032dc710dac9cb7f3,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4,Tests_passed,05f926cd7239b05c596965e4ecf5b2bc5536a4642527546330c38a3e24de3ac4 12,refs/heads/master,5ca7b3f086d9f586184824abd3d00aab62d629cf,616e14a1dbfac214b61874339b24be34e2798d4b,01c75a9d37f8ed49993239d5cdd610fd354a107e,,True,True,True,6,15,642,2,True,6,Tests_passed,6518d09df6b0576f609699ce43437b31406e3d5f9fe3489a1441d5b3640b79ff,True,Tests_passed,932e417e6c6b60d38996dd138c7d2bbe310a42b86ee05b34d7572a75fd048ba2,True,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,9677fd70cebdb9c05ab6f24239982d1baf5e10e41edffac3e8bf150c86474bca,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,e39dbb0ca128f0fb483b501a5ff483a22103dbf1064daf2fb87b9bf5d17480eb,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,f49015ec7c4af248e9bc6b6294b74aac4b1841c07141a9876e455b772e007224,Merge_failed,afd71c1740d834922ffa95bb3fbc14c73878d411dab434e9e29e36db401ca11b,Merge_failed,7ff82090dfaea48d6e1c8ac6543c18e8bcc65ce63736b2a599e9d84063893e2c,Tests_passed,c57ffac05524ae77b204f6f5fdc8a7f97b385aa57896942639eea71bd60c6d85,Tests_failed,96aaa8e2cc9135c75d47f061fab24b434189a2e97eceb94519a67e0b3b448c6b,Merge_failed,7ff82090dfaea48d6e1c8ac6543c18e8bcc65ce63736b2a599e9d84063893e2c,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,e39dbb0ca128f0fb483b501a5ff483a22103dbf1064daf2fb87b9bf5d17480eb,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,f49015ec7c4af248e9bc6b6294b74aac4b1841c07141a9876e455b772e007224,Merge_failed,b2ac1d46e08083bb5d4bdbe4d7d4823960029806d093c0b66ae4ffb4cef176d4,Tests_passed,c57ffac05524ae77b204f6f5fdc8a7f97b385aa57896942639eea71bd60c6d85,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,9677fd70cebdb9c05ab6f24239982d1baf5e10e41edffac3e8bf150c86474bca,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f,Merge_failed,fff5a77c097c75823c00392f3dc1a53bd939b0207604e7eaf5201c3a3c8bca1f 28,refs/heads/master,3f55235a63376fa8cff15dabc9138d7a97d92832,5453d2a506cebc68c6b6ec938477d137aa281fd8,62ffde8c41b182e88b47793764a91ed36425d648,,True,True,True,21,47,807,3,True,21,Tests_passed,570b8a9771cac892a3bd8a57f66f5d6222444cfbc5f8da4ad38dad970f5a1929,True,Tests_passed,d4242314716c4a1f13f5a91780b79d424ddd5908d64d0162dacf5cc2e50c31ac,True,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,083b73c26d322e2cbda813834f1c5c4d7e8c66d9c594a965d6d5f770c63be625,Merge_failed,62f928a7ff9ff58c2e0d75f4166c43d0b2cddb41ec72b928093d59a367720c3f,Merge_failed,24b17d10456f5fe8be580cf33b0237ee1a51f339ea8b91063f17df83e782e02f,Merge_failed,8f41035ddee3bd6eca10e65a9ee9281ebda68d67142f532399eee778c7715d19,Merge_failed,62f928a7ff9ff58c2e0d75f4166c43d0b2cddb41ec72b928093d59a367720c3f,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,58b43416d921f9282d7388eeef5c231e3c4a9486c7d6eb3870e6fe82dae86a3e,Merge_failed,dc7239a526f2da876a36e3299d42d0a119be4ab6e5eea3210947a29544ad5b55,Merge_failed,f7bcc73dafbb2c987279092290953009894073c6ebe09358d1e54688a32a00f2,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Tests_passed,c753fdf022c38ba217016c7427cf3d74703dd32ed8b9e57b59e937cde404a0cb,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3,Merge_failed,ee8490ed48eed4d4e21632503fcd83cddd410d5ba276c63fcc984a02b2f986c3 diff --git a/results/reaper/merges_tested/wasdev/ci.ant.csv b/results/reaper/merges_tested/wasdev/ci.ant.csv index 6e3f1d0aa7..1508c8f986 100644 --- a/results/reaper/merges_tested/wasdev/ci.ant.csv +++ b/results/reaper/merges_tested/wasdev/ci.ant.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/remotes/origin/pull/37,efb665d50069552d430474f751de1200b18c1ffd,f3495fe4c5c4787e38713e4a970b45f344363cb1,79a92e604d15aa4001563419b192ee44a1aa9bd4,,True,True,True,21,132,856,3,True,21,Tests_passed,f0ae1ad6024d95e54631d8187f67961f3c6dc551c84d1cecc6623c0ae917b667,True,Tests_passed,b1783fc936ea374af8edce8d3f105bc8606aa4baa496c948a4161ccbf2f89fe0,True,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,7cb5090178320b6c7ac7ad04a47677d6c6e68c1723a6839564d3cc3988e6b406,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79,Tests_passed,4ad8db3ae2ba28c9d032294c39f6738b2f138bf062a385ba37036c342cce7e79 diff --git a/results/reaper/merges_tested/wasdev/ci.maven.csv b/results/reaper/merges_tested/wasdev/ci.maven.csv index e92f6fc26e..9f577a04bc 100644 --- a/results/reaper/merges_tested/wasdev/ci.maven.csv +++ b/results/reaper/merges_tested/wasdev/ci.maven.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/main,e89bd0b2b6e7257272066f402a8532573a1607b3,33146088d4bd577ff80e1c9e46e29b0b33cfbd76,d7c279b42e0116f9910d8cff4cbb1f3b8abfa936,,True,True,True,71,275,3355.0,2,True,71,Tests_passed,ac2ed92811a5d6bb30a733ed954a78e8395d2e187b65dcf0b161f1b6b517f93e,True,Tests_passed,41e993ed19abc571332f6bb2227566cafb2cb03ada61919c841443beb88c0815,True,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,35a79b3ff8e36304797f93cac1be4c3e2d73d34936acff751ab43c8c2eaea909,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9,Tests_passed,73a2ce2e8b623c3aab48410f7a9888eec02f6791d45596c60eb42a3eb6afb0e9 437,refs/heads/main,cb3e380ef1b5cba7e829084eaadeaa9fc222a5da,664f0befcf20efb7ee4a6e4ded74b0f77214daf6,58ec62cd460ef1d38c4c19da9d01a959fceacba8,,True,False,True,8,15,37.0,2,True,8,Tests_passed,74d1926cedf2d68e55aea663a30540ad7a5a22e2daff12df4dcf8c92e1ccdebb,True,Tests_passed,42303a1c583040817bbb647e23d37e87da5f7e0246ed3f91af5499e2c0be91c2,True,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_failed,5464bde4a5e39f4afbe1c5cd2070dd8cb2b30cf8faecb8c33bd3b13104c93af8,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,087f5f7c045dcc76892c914e5ea05fce209e5c3349e26f750a01b49d42b934a0,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,b0b9313add90181fafe03cd03430d1307ff48bd8fc3e5e0bbb65d8fdb0c51ee1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1,Tests_passed,dcc4a47cd855875dcfbf1cdac16a0934f4ec035a0d2535e52ec1e9be590f10b1 602,refs/heads/main,dbb259b09f43e546683cf3f913241c3e66f04f3e,ba6fe0c8aa963ce2c574b7fe6af5dc347009348e,1a56e9766dec62ebf6c59c3fab7af59d6158da31,,True,True,True,12,147,603.0,2,True,12,Tests_passed,583d5e091a48f6b50a6bec8db9973c1f6596007f35e48d0113a61a5b848e9495,True,Tests_passed,329f6271d1ef407f308c74eac82981a582c51a87bbcc7b8a2d867c53881bc3cb,True,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,7f59fdb7334cc5303dc9c2188522d003b89683bf7b15f97c202bf5b9f90286a5,Tests_failed,9d5c3c1bfdc0b4ec28daafe0d54eb8a89f2fa7d8b6893119cf95e3c6e820856b,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,7f59fdb7334cc5303dc9c2188522d003b89683bf7b15f97c202bf5b9f90286a5,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4,Tests_passed,536b0b6891e72b7ef6f3b289bb561e79551945f2ad6712d2a4dc77ba95729fc4 diff --git a/results/reaper/merges_tested/webbit/webbit.csv b/results/reaper/merges_tested/webbit/webbit.csv index 01129bbeb7..ad596835cc 100644 --- a/results/reaper/merges_tested/webbit/webbit.csv +++ b/results/reaper/merges_tested/webbit/webbit.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 66,refs/heads/master,715b22a19aca478ab140eef9d9ab1767c9cef8ff,2b83a04996b3aaf9f5cb901b83f9545262ee64eb,1dbe3b9b2bad402db7bc50b00f35dd56313ad949,,True,True,True,25.0,52,163.0,2,True,25,Tests_passed,696056b601a512432cd1c53fe5cb044cf592cec0f2bd9d5952cf969ed459f5ea,True,Tests_passed,5d5d0ebd9f54b53ee69f31a4437826fb8aa6c8ddaa719f32bffa7d8d126b681e,True,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,137cfbc6e244996e93035b2e61df5d0bb3622b1f1aacf21ced4a84bb076ae15f,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,137cfbc6e244996e93035b2e61df5d0bb3622b1f1aacf21ced4a84bb076ae15f,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29,Tests_passed,7543b249d84a055819fe7954c2fe7f9be0b5dbcc1224ae1e11406c7cf7a47d29 69,refs/heads/master,9d2ee1bdfa18f1df22260361a5005f52a5a6934a,474607b64bce97663f3ef42fb8298a4d2973c5fc,f5b8e55ad46b1e8a8f7f303f6deec1f629af98bc,,True,False,True,2.0,13,42.0,5,True,5,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,True,Tests_passed,f4368f73732f333c3a9039a5c8a2499cd3042f744cb0d9d602487e9e32b9f840,True,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_failed,dec7fa63657acdceed2098b975ab809fb4409fd64d6d25bae13a6d10c6c6bb40,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca,Tests_passed,eeab35781d00026becd67692acd3a71743500e3e54f8c0070d5510d1faa1a8ca 78,refs/heads/master,089c664c71c95df14a01f361316dbe99a27b0182,fa8ee66d296f88482329d1892e47a07e945a4cc1,da44853aa65e0b995aba560405a87c47059cbeb1,,True,True,True,60.0,172,1527.0,6,True,60,Tests_passed,77d802b4f4dca44dafb442874580983195c1168b4d1f27be2dc3ce558a690faa,True,Tests_passed,180d541903c12c6512a6abf5a3723a2bb55d1b4110d39442321f06d22041ef6b,True,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_failed,2ec3c89aad3c5086d2a01114622abf5e84031b75762b37d12a1df4c23873665f,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_failed,2ec3c89aad3c5086d2a01114622abf5e84031b75762b37d12a1df4c23873665f,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b,Tests_passed,04f78ef47bc0332cf918e05875f9dbc223eb403a7ee2e9b89d3affbb350dbf9b diff --git a/results/reaper/merges_tested/webbukkit/dynmapcoreapi.csv b/results/reaper/merges_tested/webbukkit/dynmapcoreapi.csv index eed946e1a8..edbda5bb89 100644 --- a/results/reaper/merges_tested/webbukkit/dynmapcoreapi.csv +++ b/results/reaper/merges_tested/webbukkit/dynmapcoreapi.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,ac66071a804ee6c7946eabc804948c54cfca6bff,682b3f0dca03e0bc60c929bef9a3d0d29278f34a,905966ed4556fa95ca1df8566c0315bbe8e4120c,,True,True,Tests_passed,ae6436802ce4f311a9102e90cc4296e3a1032213d0cca7251435b24196257806,True,13,43,100,2,True,Tests_passed,1cc4cc7d62b08ada071354d1e4663b68b83d5ce2a48b9b70e479c124113fe24b,True,13,True,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,5d62152f702d53dda4494de09028e26ee60c122a33955a2266d5b04c51fcc0d6,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,b541a286a8360ddb317a34071f3780b24523cb2bd26841d888570dee35e4743a,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552,Tests_passed,58b1d5d9d90b5d1b5feffb8ace9d76c2c46cc5bb982d3555a2cababf78c47552 diff --git a/results/reaper/merges_tested/webjars/webjars-locator.csv b/results/reaper/merges_tested/webjars/webjars-locator.csv index d26525deda..f6f106a271 100644 --- a/results/reaper/merges_tested/webjars/webjars-locator.csv +++ b/results/reaper/merges_tested/webjars/webjars-locator.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 98,refs/heads/main,f1e9409c5e7d0673f11f706f24a057fa10543437,f48e291aa4a673d9ee9caa7788b60e4991bb78aa,dd6ff5b32dd139d765a94292145f71b277f3ab74,,True,True,True,7,6,175,2,True,7,Tests_passed,d2bc5223325798f1e7fa75b2f18e3d7bae0f83ab4dd7a73e5f01b176a6350f84,True,Tests_passed,2ee20809e253d76052803b83942c528b3b60760af0fa3d0d7117b4bbc53383eb,True,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,b8e5637a91a40d6485add7f396880845c7cb64c38b1f5cd10dbe7a2261659f50,Tests_passed,ab041cb5653ba12657eeb468e9119496fda3036e9c8c2500fce17e11cf2be275,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,b8e5637a91a40d6485add7f396880845c7cb64c38b1f5cd10dbe7a2261659f50,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Merge_failed,ea047a1fa205bf02f8ef7a6db60dfbf9e4965d3563ab5f4e36583de755b5cae0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0,Tests_passed,2998d7c4ad794e503ee7d248e18b69150bb3aedae8fb7958419c2f2974c138e0 105,refs/heads/main,15dd8b3a1ab2c18d94d61298070d2cffc27ffe5b,be05d7649c5e2d84cf40e61c04eafceaa9af2939,4d6d1579624536495b3ff568f139e4a524b61659,,True,True,True,5,37,441,3,True,5,Tests_passed,e842e670ce94390971e192f9f2f5b22e0b47bce88018a7d831f4e5d33968e418,True,Tests_passed,12fd811e54cb21e34645fdf29fd240cf2861297a084da0732765b5d3ee3f77f8,True,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,46d2bf5e79e70a5a11c0f511f21e789d0e3de42ef3d82959865fe2cbaa5604c6,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Tests_passed,f8ebb7564e7b42a921c98b15883522585bf4417f84404fe4bfb7ddadec43f630,Merge_failed,b5d8cdd3bea37418d3dca22223311a9f7ca425883b3609b6e504927fd4dad491,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,84cddfc954b27c4eecd3a74e24a482f8833caef728e5450ec280b6460ca62c95,Merge_failed,c8703fcd2584676a5dce8dbf328062411ca29abb83f451a793b5c4afb5898605,Merge_failed,3bf9544ec81ff963b447cec10fafec7e850d5fc07d9123d470f4072c388e49c7,Tests_passed,12d25cfecdded1748e428aaa55b9e0ab3ee8866d758efc5384995f8aa83a315d,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Tests_passed,b4b2b51a46d8de5619ba03b37851533ee24ebefe791920b5753678540c0350ee,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69,Merge_failed,79fc2d291da3adaf0cca39e92818f6f3c29730affc53701bef6b07b89d293e69 diff --git a/results/reaper/merges_tested/whizzosoftware/wzwave.csv b/results/reaper/merges_tested/whizzosoftware/wzwave.csv index bb04ed4d0f..8650e9ba08 100644 --- a/results/reaper/merges_tested/whizzosoftware/wzwave.csv +++ b/results/reaper/merges_tested/whizzosoftware/wzwave.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,7edcd6e59b0a91c926e32931ea28db8ff2db0bb1,8c1d455a4da9988de13007d2d320b496f92d4db7,6c8e3e9c2006be210db5c5c2d703ed64ad9d1b11,,True,True,True,81,446,3095,3,True,81,Tests_passed,947f00e2b8939a892a828f83b228f87f7e7e0889c90d149c0e1339303d975b48,True,Tests_passed,4ad717a2eda43345e2d613dccac6bdb86fb65e0b6316b549546eeb06b0723e50,True,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,82b4a8dff80b163d60469e989af68181ad694e785b712ebc66c357d8aa9595ed,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,82b4a8dff80b163d60469e989af68181ad694e785b712ebc66c357d8aa9595ed,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0,Tests_passed,dc6ae29d1407f8d55b5814d363d542561d671dfe4bfd181ec4c037999431e4b0 26,refs/remotes/origin/issue-24,957ba2027da2ce9a5bf458ec36101136224e2711,f9a9c84695ac50bb8a33092b3cd49ad05dc3a31d,fa8e6835b13278aef2bfd1b0e521c1d0cf096061,,True,False,True,3,8,44,6,True,6,Tests_passed,12d1cdeb5b6905d5e398a04d5362d6197fcd1c92494d4a4f493908da87f23de3,True,Tests_passed,c9c8250933a872e65495d71fc0cb00be4314f1a496f9738831d7d1a6e037160e,True,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,5703d69f10c3c746bc60870267019fff3aa3f5bc75d6079d5dc7b357afd49e71,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,449c1c093127c59e89c225b54eec21af13f6198a683df6eb1afcad6ecb070884,Merge_failed,f21dbc6d95da2a7273b7ac89781272265e2adde710cfb829f437ba7bfdf9764f,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,a7c11461841d5f2ecf5aa587db4d221f3b1046a8b2b5e336ba26a7d76854153a,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,d2c1885286beeaecdf8765f731503c3d3cd079fb4820b3a471c8acf1e13ae806,Merge_failed,4281778a310cc382b5914927ee941d263f88a682adda9e980205c0b8f7134151,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8,Merge_failed,686de9e7097b7e46199d49d1a0a8553dedadc7b0b97ea3eac931cb8b931a9af8 diff --git a/results/reaper/merges_tested/wikimedia/search-highlighter.csv b/results/reaper/merges_tested/wikimedia/search-highlighter.csv index bd9f5d8942..38e875db05 100644 --- a/results/reaper/merges_tested/wikimedia/search-highlighter.csv +++ b/results/reaper/merges_tested/wikimedia/search-highlighter.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,b871bfa5025d79dff5ab9324144558ac61319b47,96cf93e041a289e531e7b2fa54a603926442e700,4ca041a8710fe41d6e6bbba1eb22998c7d9b2537,,True,True,True,7,17,142,3,True,7,Tests_passed,208ed4a9c1f937c1374a6206501fc7100cef30f602e4c7fa45af0e528294228b,True,Tests_passed,999e708a253838913fca82306cd404567920cb874aef1d685b0e028a269e61fb,True,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_failed,f2d7a575857547b3c885db21a66c75decabda15681198fb5565cae123ea58225,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,86c5d12e0b639f50784af76c86c4e258859f2669bdfa31da153c4fee39d1086d,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e,Tests_passed,f3c967e183981eb04d49e800f83764068b3ded567b246e7e7b5f2afb92f7f54e diff --git a/results/reaper/merges_tested/wildfly/jandex-maven-plugin.csv b/results/reaper/merges_tested/wildfly/jandex-maven-plugin.csv index 8d0c6a0602..cf84a2105a 100644 --- a/results/reaper/merges_tested/wildfly/jandex-maven-plugin.csv +++ b/results/reaper/merges_tested/wildfly/jandex-maven-plugin.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,fc8c548a01a12414b6cd29b3ab989a9bcd6ff5c9,90a4465a8f2c38bdded0c6465192ad5ed62b0d0c,f9d792e8db337e6bf9c75975e42ef081d49b8fa5,,True,True,Tests_passed,ea110df99ae5bfacff758e03849525665e7749ded0d7f88ac5381fd10994cdea,True,6,29,72,3,True,Tests_passed,c154a3c0618cf08de56b92e8aeb45da04eae0b6bb297a465ef30e29f796e427f,True,6,True,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,9ede9af94ce1b09656562d57b3437719f7b4e3d21e997b5dec58c4996de5b79f,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,9ede9af94ce1b09656562d57b3437719f7b4e3d21e997b5dec58c4996de5b79f,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11,Tests_passed,3ab50bdb308039a121210374570b2b52b45a2118f5eb677584ac47cc6c16bd11 24,refs/heads/master,15cf92691e506ecc0f08820c7745c4e922d9a6ea,328a4172c6252066abe263160dbb7d7ac3850e82,bd0d4a8a73f6b72cc8262ac7796c50fe1b7057cf,,True,True,Tests_passed,ba67dbe65fabc8c0679f77914bb9bb0ba75efc0dd2c4990ad8a2c2fdc8bf4cc4,True,7,18,808,2,True,Tests_passed,e2b1bc8f2a07af67292efcc1945be51206063ed19b81f8da4b1d9c6e203d3a13,True,7,True,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_failed,0ddd76de99706a063093fd559615fdf9d3b449e71cb11379bf9da98848a1ef84,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Merge_failed,6520995c4c9211ae284949f1d49087d5e72c11ea48800adfdd76f9f4df44b568,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,4cae7ca5dcc88ef084773de6afa057ac0528e1ae8212b1da456c23673ed1e74e,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a,Tests_passed,ac5a52b681221f899bae30e8461a6c391b0636a4f5ae9b5e9072a522df1a065a diff --git a/results/reaper/merges_tested/winder/universal-g-code-sender.csv b/results/reaper/merges_tested/winder/universal-g-code-sender.csv index 1fa4bf0483..837dcf1ffd 100644 --- a/results/reaper/merges_tested/winder/universal-g-code-sender.csv +++ b/results/reaper/merges_tested/winder/universal-g-code-sender.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 300,refs/heads/master,337afed03660c93e9b299d686e2c3629c0c2a563,6e709807faa349dadb8ee68df1251798a1fb7762,39db73e390d0ab7c533868c6955264f136ac9633,,True,False,True,11,69,1338.0,2,True,11,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,True,Tests_passed,dd4470793b378bba12d0107d580407910701e0bd939f5297a2442de3f73f64e8,True,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_failed,832fdcaf16b73f26efb721807ca6ed24ffc30e1ec9bcc3858e510370c8502caf,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_failed,832fdcaf16b73f26efb721807ca6ed24ffc30e1ec9bcc3858e510370c8502caf,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21,Tests_passed,e46131b8548d38669c0967a85d234311cc1f37d52c664840c273d04aff5aab21 301,refs/heads/master,6e709807faa349dadb8ee68df1251798a1fb7762,0a30eafb121dec262ccf527fffe51fa8cfc31787,5e4e69fad60b9e69dfa38d9e7d289654f363bcd2,,True,True,True,18,40,149.0,2,True,18,Tests_passed,a1e974322c6207d1edd0621949ab2514872fc03843513cf721d0c1ea47eb2f04,True,Tests_passed,9ef284815b4c22af6cfa49bab7a204f5821cdbc290d6fcde6ca23373dbec0d4d,True,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,8ec0c6a2093dc12bd6dfc83d180ad2145017d9a2caf6231b98a8c571a90deba8,Merge_timedout,,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,8ec0c6a2093dc12bd6dfc83d180ad2145017d9a2caf6231b98a8c571a90deba8,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6,Tests_passed,73055199f02a4fb3addb252903c9211ad043dea87b07a310748be20541c025c6 320,refs/heads/master,8f1015bceb298de27146fa3b9aa0274fbd49e807,6ae62f7321ab2424a35c8f7a05cd9a39bed4d993,e2dfd725cb62fcf3d8af6e785b4038f0e63c55db,,True,True,True,82,261,2191.0,4,True,82,Tests_passed,444b575c870296ceb5f3f839038b5a77359fa1e9b8efb35e18c553e3041895be,True,Tests_passed,2eae53733eb6fbeb9df0f242edfe0cdc511c658d6ff9a6283f2451e14f8badd0,True,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,ec6b80c66b535f9cb365c0c054b65efb66a89b3ad256916a277edf11f04e82bd,Merge_failed,1856a709d2321d9f8a1c1aa33727e3009f496c0fd101f395c08db98b770cc017,Merge_failed,b805fc1ab284f9cf7ef2cdf23425e559bcdaa246058f266df322914518ba1aa6,Merge_failed,4032f46d47ef458a84c720af467a25c915963051438382b1d98e03649e6a0ae1,Merge_failed,1856a709d2321d9f8a1c1aa33727e3009f496c0fd101f395c08db98b770cc017,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,5b6fe55ae79731734d55973a7fffea12ad3ba203b53dcc6ca14a146541042979,Merge_failed,b805fc1ab284f9cf7ef2cdf23425e559bcdaa246058f266df322914518ba1aa6,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,fa3a592483ee835f12e306d4af901ade40016f474694d79d1a72f26cb8648deb,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48,Merge_failed,e9fddec3dfe43fc4272da17c3ec9a692d0e0d0afe028c67a4ecc18c2e0f2ff48 diff --git a/results/reaper/merges_tested/wkennedy/swagger4spring-web.csv b/results/reaper/merges_tested/wkennedy/swagger4spring-web.csv index 99a42aa06c..b2e8d966df 100644 --- a/results/reaper/merges_tested/wkennedy/swagger4spring-web.csv +++ b/results/reaper/merges_tested/wkennedy/swagger4spring-web.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,7dd2733c22ee77c38df42d845c0d43f669528b3d,e47cd3336c793529d944af45d39864995b0a0d9b,705b69c4994795fd6223048f8b7ae501a4f039cd,,True,True,True,10,46,377,2,True,10,Tests_passed,fdaff6f963d2206d94beb989be08e8f0e7132f5b8e9e99018e504f3dd09687fa,True,Tests_passed,3a81822f6b8512b92fd844968ace77ea03934aa29c191ea3fb9a582507e022e3,True,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,c1afb8b861ff4ebd1486869f70809a70518602664e74a9e213e3f720386e8b91,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,d2ba77b74645f7e877ce8465b81196f21f649b93ad57d389db88ae8e4de8e5c5,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,42ee629bdf76b060b7d8afe1aa9e2ae67a67100d7f3ba1a2cc7eff04dcd99a07,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c,Tests_passed,6bfaed74535c8a5068ceb990c070a837872f51342fa4be40696357729085fe9c diff --git a/results/reaper/merges_tested/wnagele/hadoop-filesystem-sftp.csv b/results/reaper/merges_tested/wnagele/hadoop-filesystem-sftp.csv index 7471c5be66..f24089212e 100644 --- a/results/reaper/merges_tested/wnagele/hadoop-filesystem-sftp.csv +++ b/results/reaper/merges_tested/wnagele/hadoop-filesystem-sftp.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/remotes/origin/pull/5,dce4039d7a7b792e1fca28d344a305891a078538,30e07e8547f680141604c982af385bd5fbd7d987,0ce4d472c88e79d65b8f8857da67d8b117d716d8,,True,False,Tests_passed,0e7a5187b1789c0d122ab5e4e383e12c7fb970a53890a3bfcc85af3b859c78a7,True,4,7,72,3,True,Tests_passed,c541504b64e0eff087d9f381abd1ae627071529e014870379e0c097183c08782,True,4,True,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,7d8cd21eff4c78f81f27a7570e3b155938519c71b84d3d7596921fa63b1ea37f,Merge_failed,10f92a9edacb6281e143f52b4f8000da1a329dce69f126622fd94c0c391291b3,Merge_failed,09a0bda95077849c88a66a109fed1988ae2e93f2186b8984b60651ce28eba1d8,Merge_failed,6c38c92f82bb27ef262bd90c0e125fb6689ee16bcc82d5864ce2faa64f9c3ca5,Merge_failed,10f92a9edacb6281e143f52b4f8000da1a329dce69f126622fd94c0c391291b3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,0b4723c099f31b77f6e37f7cb5cc0e3ca16eda493dbab40f45791803c1c9ae64,Merge_failed,ad18405036482b165f20233841c6484305b15cd88e3aaf62b507c5163b0c4a50,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,d4f6be4225e57c4835557eecaddf526b32e44293b04d763b86a61b62fdec8c58,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3,Merge_failed,6472b4f358b96acf0361096158fdc4f015388480580acc5a724a69148ab98af3 10,refs/remotes/origin/pull/5,4251b394791f3e0fd46204502b6a6dccc43dc08d,2132dc226541c0ac0317a6a607688408074498a0,7dec3d9fe4cc308bb0654b315347877cafc10ee3,,True,True,Tests_passed,40d3b11daa126236987ec8f60d93fc346ad89db239d3fc1505c62b84e685155a,True,6,69,379,2,True,Tests_passed,21cbf9e028e10988382431d337e3c54abe6f7d8774edde878b126ecc8b1c0a15,True,6,True,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,81a8f18016ab66dbdbbf6556ac9c94f7694e19eeedb5b13f2210e9cd4d56a7ea,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,83dba2724114e619895d6a4bcf126fd12f6a0ac5088bb989e2a7f669ca0455c7,Merge_failed,b960b4accfdef8fe6fb3f735b56cceb73cf435828b2f260e915ad4c0686a9a23,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,40ea5e2997ed5cdbe87f16063c6c1570a3ac3702c6fc657adfce134fa310c587,Merge_failed,5877e45023ed965509039a48bd7ab6ceaa6ea30677844536a690ca5ac67f35ec,Tests_passed,198c37bd80d15543ee3db79ed9426e75ee99c53da2a2ee9c3182d3dfec63716a,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,09fdaa8d5ee517b52826a9372e5819b07b25ca17f1c6540b3d94c4d943238049,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63,Merge_failed,bc85b193dd2b6c617248c2ec9d15ac680eba84d5b024d2eca53e01df2ab9fc63 diff --git a/results/reaper/merges_tested/wnbittle/dyn4j.csv b/results/reaper/merges_tested/wnbittle/dyn4j.csv index 34d16526fe..3c53044824 100644 --- a/results/reaper/merges_tested/wnbittle/dyn4j.csv +++ b/results/reaper/merges_tested/wnbittle/dyn4j.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,b6c114ea1ff974840b5daa3092732877134ecda2,63f89ed0cd89ddf7076f252e57a585909f931326,0a67375f798efe71e1ec4c5e20348a35962ab0d5,,True,True,True,247,1282,34297.0,37,True,250,Tests_passed,55cedd7301612cbd29284787291e7eb4978585d765b75e4c301cfb6a69771b3b,True,Tests_passed,45e9ddf50076845b8a4c5548a2078ace4239c3a51b4e25a3ec3921994e512552,True,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,75f5aa7d8a5c5de16491c4af76409d532705d73f0d1376932a2b4a7ea83e830c,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,20c66693c31cd2a87805f310e9147b66449be149f1f7083bc5d62241ce65fc5c,Merge_failed,805ebfb3cd846b7986a754e06394b6875856b8e0b0a6a58ffccf46ee78955bc7,Merge_failed,8a764da0b010ca6ab017c321e53bcb5845b80be75b51ef030874f7551aaa269b,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,b170558f0785fc2519f95623eff863bd0171156549fe4999ec638ad49e763528,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,6a728f6ca0f4da76c972af92557aa3649ea3326bc49f5ecf7223bbbc9422cf26,Merge_failed,f66a24dbcdb3681437b64ca0427194302d3712f2eebb7b6430da4f6cd0c1c16e,Merge_failed,bed7c8474539c1d2fd0ec65da74f791417ef592f8ac886b389c11178698f546d,Merge_failed,78ad608afd7e5ea8f0b95f568af9d214907c2320ac946500ee33fa1ce6942b09,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,13731f443cea31cc661effdf159fa8cd9b80715d9517e7e21e39b4460c09409c,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9,Merge_failed,d58934520b68a9d7958739dbc1b0dc51028ef8961921eb0729a30bde659588c9 13,refs/heads/master,bc4a8d51912dc9956fb3d64324b0323e238bf5cb,4c30329c8e6a2edbeef81b32a3b0d4dc93066002,5c61b3d55841797a96287c892a68dab5bb65b8ba,,True,True,True,17,70,374.0,7,True,17,Tests_passed,15361e6b4309664c029bd8d9c4bb224d028181cfca6ddf062bd6c6deafdfb79b,True,Tests_passed,f0a2e245eb78bd5bdfdf1e73aef4fb0d7a21eabb65fe756af30b7691c4d36b89,True,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,dae52bbee0155c4a072d074a50387c15675f1593474e8e55eccab5714487b3df,Merge_failed,81b991295164683025876d5f1577cf1d6ac6ec1f2ce3d96a5088f0c11d11181b,Tests_passed,d272892f5cf1f96be25165ef9201641d6e2fd91b625017a106d52e56a728df89,Tests_passed,f08ebd9effeb5bea4292b46bfaf37dd347a2987fc91479f827cb7672c39cf978,Merge_failed,81b991295164683025876d5f1577cf1d6ac6ec1f2ce3d96a5088f0c11d11181b,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,e125f1f261165728625866878f19d40c117d27bd9a48f99a3f0dcbaefab8b35b,Tests_passed,d272892f5cf1f96be25165ef9201641d6e2fd91b625017a106d52e56a728df89,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68,Merge_failed,13f573c2527ac3af3fa118ca25c0b7307f26190bfaf282be7ba3a1bb09689f68 25,refs/remotes/origin/pull/57,ec92ecfb6a92d441058d670eafa0c2ed22e6dbbe,ef08b7d2590cb62fe275c660121a880b8d71dad5,128bfd8b48c36b6e84446a0203b2dd55b67a1d94,,True,True,True,16,95,1246.0,2,True,16,Tests_passed,6f11f642dbb8ca3c2c2871fe44752a8d8673f7867b3e0915769309954ef3d616,True,Tests_passed,9e68126b86e0f0c976630e68194b4ade2302e8bdc4dd0b0ba143b16d1c39fd73,True,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,1bfa6b90bf201dd01179128c988c7582c803ed1c7a4506207b67b2390c2439ee,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,034e69d4d1979d3c334c279c74a110ea2826c42148706af0079450da979c6555,Merge_failed,84afc66e7198f6b93a01b38445bd637d7804eb0cda2f5c69efb0745591b23a41,Merge_failed,4cafd5ba9df2124a84ed9ffd448b2c6ebf60820684a1ba157a6e38ad626a6638,Tests_failed,92c3b916b8feade5adaadf7b6b5be2809a72b811802f49608bd839fd330fb3ef,Merge_failed,84afc66e7198f6b93a01b38445bd637d7804eb0cda2f5c69efb0745591b23a41,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,d78a65ec21abaa0ca5c3ffa0969df1dc0439e904510e11d14bcd1fdc5fa30c0f,Merge_failed,4cafd5ba9df2124a84ed9ffd448b2c6ebf60820684a1ba157a6e38ad626a6638,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,1bfa6b90bf201dd01179128c988c7582c803ed1c7a4506207b67b2390c2439ee,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526,Merge_failed,2ebd8fe6eb1e94869701037ae3024ce0219808f3377efd640fcc0c368b101526 diff --git a/results/reaper/merges_tested/wocommunity/wonder.csv b/results/reaper/merges_tested/wocommunity/wonder.csv index e53dd4e47f..dadc4f2c65 100644 --- a/results/reaper/merges_tested/wocommunity/wonder.csv +++ b/results/reaper/merges_tested/wocommunity/wonder.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,6829a78f8f8a42271eacb3c382d62a60c37c6c81,0cd2aa5aab7ab4a12b830da1a5d0e34136e3eb20,fbf8deff2330de216f21ec24cf390f2e5e189c00,,True,False,True,2,3,8.0,2,True,2,Tests_passed,9e6ffa91ec04b31ad61bdcad765ec90de37bdd721bff2f35b83bb326fb87c0e5,True,Tests_passed,bc61d500a00a1717e7768d0c3cc864c2e9f4eec267c53e112ab2bd04c288381c,True,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,ba51907d4cffe95786f0d8528723de23786550912bd6b2492bffb3e165b09ce0,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c,Tests_passed,e1fe2b02ed8af33355090ee681e1efba5fd31a9646e977345598e7cdf810999c 23,refs/heads/master,87766daee1a98fa029c2811c4df0b0771dc4c2ef,a09321cc27e5562323f5aba04a69bc1bc2cfe0cf,14d3216ba7d0bd62a96f592f6d08e2bce0280771,,True,True,True,49,175,1338.0,2,True,49,Tests_passed,7bb5434ea2c0097f636e7d2520759f85656b45867ad23236acac60f95e90659f,True,Tests_passed,fa854e01b06ba5b8be2fb7c81f6e5dfd0d05eb5a3d4beec382de3a42e7f9cc62,True,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,f296dc641449395ff3a5f2d8c0d2910132975c464bdd497359569eae10d4c78c,Tests_failed,db85e90660ee3aaad69d6ce309586a14c883e76c2dd80e6568127e24ac2c038a,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,f296dc641449395ff3a5f2d8c0d2910132975c464bdd497359569eae10d4c78c,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,63fd6f0aeb83af2c541f09eb368350d6640fa5dc4e9c1c7263b63edcc63539b5,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1,Tests_passed,58925999c701371133674a4ecdbbf559771feddd5d3c22285f5ac0d4f71803d1 946,refs/remotes/origin/pull/939,4b8ea8d4f52275fb43ea92afa9649b036e84de7f,e52982341d3c4adbbe27d05873d17941ab713624,d31dab704f580a5628581e35e50f48ed0d9d242c,,True,True,True,6,25,287.0,2,True,6,Tests_passed,11a7692c765aa26902d2bb1ad36c2efa83803c2aef4105ccf5e0cf88c98d3e4f,True,Tests_passed,22c1448d898534362f9b6cfb1d8a6fba5602af91720d933e40fc0862b414544a,True,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,4ae2a7de7ffefa74b7910264cf180f77056e7569447ab23d1c40b253831aa4c3,Merge_failed,77ddf9e2d2d1f681751321ed175ef14107bebff1519d8a0e7e931db4ee332ac8,Merge_failed,635a542ea69a8facabbcff4a485ded0ef53b530ee8f012db3fcbb709bdbc8887,Tests_failed,d3f9b51abad4d9e6bba2226369babca565d49ba05de303a4cc00e0371449f05e,Merge_failed,77ddf9e2d2d1f681751321ed175ef14107bebff1519d8a0e7e931db4ee332ac8,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,ca573bd6b0be619548711f4a6b5d6f8b6285b48c4d821a6e2bbc5955496b683a,Merge_failed,635a542ea69a8facabbcff4a485ded0ef53b530ee8f012db3fcbb709bdbc8887,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,b806f03b5c18a9c49d106df5f02c6e9dd4e328b2fc8d170c004e329acb5c83d6,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c,Merge_failed,a14509a7b63c500fefbea7c632362b078c4a7de5e6cad5c328729c97e6a6c11c diff --git a/results/reaper/merges_tested/woder/torchbot.csv b/results/reaper/merges_tested/woder/torchbot.csv index 8c8b5c1366..123c31dcc9 100644 --- a/results/reaper/merges_tested/woder/torchbot.csv +++ b/results/reaper/merges_tested/woder/torchbot.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,6abb7ded348003f1b3c925430650708220cc6b5e,991eb240e66262bb532a1d5ba813d7b9668c51a1,03dc14b732b486a232d57ac55af1030dc2517c8e,,True,,True,6,30,,3,True,6,Tests_passed,09ed37b4747641f5fd1b228e0fbda09240d5a2125f8b1cc6a5e1a74bc0a4ccfd,True,Tests_passed,bbb15cd30102698c469849041e9edca587b9698b50ab6589854fd4428cff00ab,True,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,8fc87dbbaca3aaedf340e68bd4bff05cce85add278cc6cfef27338cdbf457e75,Merge_failed,37026c8f8eeed8b2bc8b48b7430515586420e9d86bba9d15422a56995e610876,Merge_failed,8a600bcca95ebc1490533772eb14eefd0669124557f467880e4cdaa8a8bf6c49,Merge_failed,8a600bcca95ebc1490533772eb14eefd0669124557f467880e4cdaa8a8bf6c49,Merge_failed,37026c8f8eeed8b2bc8b48b7430515586420e9d86bba9d15422a56995e610876,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,799c2ea1b50370662759d3c1bbd2d5f7b714f45f6313a5d57c1bf7d85f16e461,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Tests_failed,ab97840c258ff10fd50756ff553ec9dc5dbab015c3ec33146c862cbc4d24ac41,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5,Merge_failed,70d32b917faccbf19ebac2b7a282365f33c57bd78d64479a17a71ee6536ea9b5 3,refs/heads/master,975c6e38b77419ee259a8f006ef9d342280c90b4,f9b31353053bc3293bf227153a4dbf156c842d9a,edad798eae80caa51a1413172f0101ce03ec2967,,True,,True,10,22,,2,True,10,Tests_passed,cff7260d3f4f22d068d2e081599c67ec136280e625053ef0ad8cc6bbd380254a,True,Tests_passed,fe9c192a65a8c9a8388aaac49041e5d08a4b74fc352668c73f3bd40501c46f97,True,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,8e801544deec94f7faa3c907a1cb327e22175d3683d9d25392318013a8449fcf,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,83acba2d5c8a89db82433d43a9617106ee045737c500892ff81d9b991fd1fa4f,Tests_failed,f9500ed2f4c611f3596a0c8920a985a14b0819598e68a1e23e41bac4a19a511b,Merge_failed,97cd683a6b18c5520fad48c8e07dde1eb463bab6d2b4cadeb4c2cae6a53bb0c1,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,ddaf765efdd253ccb8bb4241122e336ad26a9019f6b5fce3f0cb24eb3dc76a12,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,0bd7d47582c4abe83bbafc96ee75a3f002545b861469714550775999b7fc0fb8,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709,Merge_failed,fc53dc4d74915d5f112328c41b61fae333c0ada4af510afc158f6066a026c709 diff --git a/results/reaper/merges_tested/wokier/teh.csv b/results/reaper/merges_tested/wokier/teh.csv index 9b54a5fa81..5ea1820e24 100644 --- a/results/reaper/merges_tested/wokier/teh.csv +++ b/results/reaper/merges_tested/wokier/teh.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,4291bbd98f8d30d9c9df931de88a54163764af15,8f90b419fa41ac2c4d00f280faaa163fb2316269,5d71673e219de860eef417580d6f93dbe7219ef0,,True,True,True,6,36,194,2,True,6,Tests_passed,0ed4fbb524c7a334573205ea7b3066f81cc588f11619052bca4aa1579120091e,True,Tests_passed,31995b7b6d111cd611f080a7993277384279037be6c34b011d1e4f6e24199f7b,True,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_failed,79def38101000ee453f030a27a17137b9dda63b0e1edb918c73e056307e9b576,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,160d888e292b332e357e098cf8c3bf795707fb3d8e1ec9b9afbc32a4e5bdd7fc,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,0299042daea77cbcc3fe7dcb682d0a65afd62c0e5f14c356b5b8abe381b49086,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed,Tests_passed,48d12187b9b118a263b534541b51d40d6e4357a753642c83e67bea36093ce5ed diff --git a/results/reaper/merges_tested/wordnik/swagger-codegen.csv b/results/reaper/merges_tested/wordnik/swagger-codegen.csv index a97d973a1f..94d6746161 100644 --- a/results/reaper/merges_tested/wordnik/swagger-codegen.csv +++ b/results/reaper/merges_tested/wordnik/swagger-codegen.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 80,refs/heads/master,e00d102c471a4150da186b30d36c468d2bd72b60,8408b97771f519253c2ecc9f26349d2a958564b3,e104803781270b91c964a2cc17dbaeb1e11e35ea,,True,True,True,132,520,6237.0,2,True,132,Tests_passed,303d1ff9a7aa2322b787cd2857769b550800fd4076d3ec2ccf0777038f3f12fe,True,Tests_passed,08c6109b0f2a509e68299ca15d2d567e00a98e236bd3cfd78033c6e534e53c7c,True,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_failed,d6f5f0221b3493ac88df9a2ea40a18cc6401d37f19996f681086dd7a106fcbc7,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,11c83a4fe7e7adc4584c03421cfbafeca916eaa9012996eb26be21c5d1de402d,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09 1282,refs/heads/master,8836644d3773125db40e1e2c2af3adc3838dd6a0,e00d102c471a4150da186b30d36c468d2bd72b60,c07e30b8cf487282680f33693fc77cda917272ab,,True,True,True,50,61,3510.0,2,True,50,Tests_passed,45b1805c7619aff977755f66c99528ba75663f473018f5bf6cf5013cdf2b3b09,True,Tests_passed,6fe60368d048496904b7ecaba5cd9fd57966cc8c9d209dd2bdbdd6e07cff2891,True,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,75cb7532bbbd4715c00faa7f547caa3c9f75a617fb54649ab02c8a68c2bcde5c,Tests_passed,c207cb65e6b794276a956546492fff31774bf3f019a74ee5d5ddb5c8deaf3bd5,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,75cb7532bbbd4715c00faa7f547caa3c9f75a617fb54649ab02c8a68c2bcde5c,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,0614f679117f55c4e05abdf2ac132b11d20006db87ab9d96d4340a315f45be9f,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb,Tests_passed,4ece3eb98b03cbb2aa04c94f283c9d3fd130ff91806e2e4d6722cdd5c39873fb 2018,refs/remotes/origin/3.0.0,02f30a27f9cf8368098d39ddce2c1607a989d1b5,f32dd6f7bc4b8ca43bd3969290c709006d73cdb8,5b4e8a8ed5f36b566fe71be1b5e01918f3397d0c,,True,True,True,1331,9263,103328.0,2,True,1329,Tests_passed,f507999218efa981df5bbe9bcf6ea0d6f1eca9dd6cd33c871e4bedc5d46e88c4,True,Tests_passed,7c4d4e470a9d6ba2a2af2a1db3c629758e105b794997e3c6134541446c3767e3,True,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,ada9194638fc1bf9d957b3cf6299097562bfb2101d74c661a236985207d6f083,Tests_failed,c8289f8e8147ee833ba21173768b056ea49d044aebd6f81f4d07bfb81e709e03,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,ada9194638fc1bf9d957b3cf6299097562bfb2101d74c661a236985207d6f083,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649,Tests_passed,5133853d2652d3ef4db86eced88480ad83d2877da1492ee80cea0e46c086a649 diff --git a/results/reaper/merges_tested/wsky/top-push.csv b/results/reaper/merges_tested/wsky/top-push.csv index 0fc5d9efa7..a3d577594d 100644 --- a/results/reaper/merges_tested/wsky/top-push.csv +++ b/results/reaper/merges_tested/wsky/top-push.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,0ac546979c7028031ed0a6185c669e92174f774d,1013cf1396bf0c497c182b73439735136da8fb5c,1c9739f2f9f1f88821a92f368bc572b150385702,,True,True,Tests_passed,55fcddc4a714dcf25d676f6798bec57b75ae35ebb7d73aa3c75aeb4bccb6f0d2,True,12,47,139,3,True,Tests_passed,2a45fea9227624b6171e839e4ede06613fb376d84fb5b518d5306a9334d6d42b,True,12,True,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,ae1f7e8de0109a594e4f97f6d6a4a250939ea3a7018a00506bcdad319b845043,Merge_failed,180b273bf9282228ea241dd7b78ced7d2157801152d5b9fbe7f983ebfe61b0aa,Merge_failed,8418afd6317a0452f04ad71e1bded2cfcd33ca490df70c6de44d574c78bea138,Merge_failed,dd9e01300b4b2768719d50b7aa1ac27df76916471da48c674ff5f971e90e7fa2,Merge_failed,180b273bf9282228ea241dd7b78ced7d2157801152d5b9fbe7f983ebfe61b0aa,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,083dcfc820207f2809975471def7820558f973848bdba135c9f56c700b7c1f34,Merge_failed,a2922d0e2b12a56587e1674533572b30bf45636b92de6e1798454064829f316f,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072,Merge_failed,adba098fe3204e4a3e7f848f5663572e710153d0bcf9fc8efd858650905cc072 2,refs/heads/master,9867decdcc897cc8538400054ffa3c2fde517cc0,37da8398d50cf30b90d81a0245f989d85fe1a534,f0fad16e227c00a986cebb5919b2ef9cd2b5e114,,True,True,Tests_passed,fac2c1b6ea7d391b3bc039ddf354e6dbbe37fbed34d89c34c5a610821cf897e2,True,8,30,165,3,True,Tests_passed,f6109671b473744080bca0224a8175e4d4063cb85dbabea311a709d1e04fbb5a,True,8,True,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,97327f0437154f64909b44ad5ceffa8bff0a1c4af95cf36461975589354b15f7,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Tests_passed,fa245b0623251d0f8e5ef8cb95295088e3e0e4b0aa629d7fcf95e128016896b1,Tests_passed,12e3c40d13450db549060d9d2cd168675544bf9d608f33fa83f7943ce6edd67b,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,eee4151a19b24c2cd7adb270c4b8d7d2509f4c171f3c07940a8bdda0e90471bd,Tests_passed,f7747138ee9cf7523113dc3ee7cc79bab733a398a4c3b0a489f284afa325748e,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852,Merge_failed,591f2dcbc10faec88ac06d6d8f24f5c65acc7e6a79ceb465ecd1cd80c0b29852 diff --git a/results/reaper/merges_tested/wstrange/googleauth.csv b/results/reaper/merges_tested/wstrange/googleauth.csv index 5a5f605511..35f821b883 100644 --- a/results/reaper/merges_tested/wstrange/googleauth.csv +++ b/results/reaper/merges_tested/wstrange/googleauth.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 41,refs/heads/master,bb6e4a0c6f4c595a93bcd3b06c05d0c55df8e365,ba8ef98003e0d88ad03b458469c00820482cf3a9,faf4deeade71408fa33bc8030ace85bf7b791f16,,True,True,True,9,51,576,4,True,9,Tests_passed,a178687b0494ce929058cea330860811825bc49d857294e4a2980421ec6f42a2,True,Tests_passed,7110f678829647334a2739db4aadf76582173dd04d5730a18d9ad874958e307f,True,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,46e5360d5e0b97e8ab490a0e058a30f201ae3c7416a3bcc35588a3d877bdc366,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,b7b09533a02d3bd79e8b8d118e8969bf2c90a14c6ba064c4ef727a1da4a19874,Merge_failed,23fd23fd6da1a2008375ab3d36ffc27a36fb41dba4d3b348659010777416a5e6,Merge_failed,89d005916f6c94976f1dbf2c7277a40794d699bb0f82be36b40d5782557bf02f,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,f33ed5593f08d21bf327f05e32265378d6f04590b6cd9194733b62049e78145e,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,72b0996127214c0b211b65b225df739360d51eaa4c2e20c4c3a8e620a03d88c2,Merge_failed,d013123a1e8b44e2ff6dae546798295bded4a0b57dcfe24e3f470e0ee9aad707,Merge_failed,97ba6b02f06cfe9caca51c4302542d7f84d05591294876d314ec8639b625b3b5,Merge_failed,bdc974ca89cbcb38fca6dacb00f0cb94baea8f233b8494477f6c46dca7c59236,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,ce431237114283d0c549451deb2e4d02ca76b9a0b19e61af6977c72c290de837,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03,Merge_failed,cc8600684794d1ebe0a50735aab3e80f3fdb4ce66d9a3f3e684900b974f9db03 diff --git a/results/reaper/merges_tested/wvengen/proguard-maven-plugin.csv b/results/reaper/merges_tested/wvengen/proguard-maven-plugin.csv index df7899df4b..e7393584d9 100644 --- a/results/reaper/merges_tested/wvengen/proguard-maven-plugin.csv +++ b/results/reaper/merges_tested/wvengen/proguard-maven-plugin.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 99,refs/heads/master,f451e7e614d307e53025ba5738baa26724d3ad54,277db877cf85bad1c0305bc25b20546f317379f7,65fb4b434c390988653d6eec5ae61a4a60ef3f7a,,True,True,Tests_passed,489a443f3fb03dfc6962f316ecde516476aa6ad0a470c63adcc554050b672c67,True,7,49,330,3,True,Tests_passed,d2bb6c310e83e3e8fa7fdf5930a06fcd0303e93eae4f8fd1537413695e332b85,True,7,True,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,e95d87613b766e75d69948e272f575436d603742555d07f5e1c03e9f494b0f92,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,37dea98cb8545e19f3d4c95aa139e8e658dc856c2d03eb73c450c8a657a692fd,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,5f0adb809e7d370c4ac5e29ec377db6a06a08c4a126eeaab0b76eed0fd25ae14,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,37dea98cb8545e19f3d4c95aa139e8e658dc856c2d03eb73c450c8a657a692fd,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,5f0adb809e7d370c4ac5e29ec377db6a06a08c4a126eeaab0b76eed0fd25ae14,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,e95d87613b766e75d69948e272f575436d603742555d07f5e1c03e9f494b0f92,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f,Tests_passed,c21cb63f921fb10db461d70c0870b7ca4586c8df4da8e718fa2b5be73b2ef97f 102,refs/heads/master,abfad8528e0374a1dd18c74264bad8bf20fcffc0,f3e58ee5a050be49aeb4517afe3842254bc61200,06af46adb278389a5ef6e0cc00a57f3e4916abfb,,True,True,Tests_passed,2f94bc288ad2b3d351b4dd567ebddcb0e235f70cafad7a5a2a8046b86c155aad,True,4,13,70,2,True,Tests_passed,e2fe2b4c3e682c3633a5da4a71aa9e0f19fa1f6431c89d7ff1b7a0c1d9a507c9,True,4,True,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,c5d92821508bf241194e5e23792bdca3c8f1fc074a3ab57d1b1f6af027145cfd,Tests_failed,f539f4d534fd776bf202c67e41c83abf91174eced6d99def4ff0bbb8fbb67d8d,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,c5d92821508bf241194e5e23792bdca3c8f1fc074a3ab57d1b1f6af027145cfd,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5,Tests_passed,23e5d5e44e8b6cffdf1385a3fe15fa844b5b5b3aea305de5ab676df7b6eaa1c5 104,refs/heads/master,65fb4b434c390988653d6eec5ae61a4a60ef3f7a,3a353feaa7ab44d735723a01a34dae6531d7ce72,1cc9601e1f768db280d6fed0ef6e70d2dc85e099,,True,True,Tests_passed,e3f640b17dc2f431f9c0a3d08f9b0b97ffe04b89f859cb9b84ca38f3879f7f46,True,6,37,226,2,True,Tests_passed,ca995cf24d9914ba4d6608aeb19bf1074366d1c1f0083766f509f9ce4e7bbe3c,True,6,True,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,a4f572e5e644f52af2fd6add8cc91c845b83a1020073fc210411c668f5c07ec8,Merge_failed,4a82bb035686713ac56f02f5f1936f65689a4c89c530c94fbd8d9d12f304215c,Merge_failed,63d1f59c8ee7b7f78fec09ae08e2adb4e2461cb6ce22aca4dbfefab753b08eb8,Tests_failed,9c635007499da71dfc655a3f0eee75d20e1c2aaa9ace4aac6f75a311e92ae709,Merge_failed,4a82bb035686713ac56f02f5f1936f65689a4c89c530c94fbd8d9d12f304215c,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,9f57fff7883796b60a68caea76d0db47102e87c82a0cadb5a4b5728c0ad2ca33,Merge_failed,63d1f59c8ee7b7f78fec09ae08e2adb4e2461cb6ce22aca4dbfefab753b08eb8,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,457de2388833b3a04babb77af19b7882db5ac5ef5e82db91b4e323b0dd679f52,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f,Merge_failed,c0e1d240274d5e51c425736c2a733caf8b2d0f83f79c2be862e80f1ccfb6df4f diff --git a/results/reaper/merges_tested/wwadge/hbnpojogen.csv b/results/reaper/merges_tested/wwadge/hbnpojogen.csv index 9540e0e06e..ea747fa82b 100644 --- a/results/reaper/merges_tested/wwadge/hbnpojogen.csv +++ b/results/reaper/merges_tested/wwadge/hbnpojogen.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,0526044550f5e9a82f65772029462a7434ecdd5c,17f4316b540facffefeed00c9470a34e484ff797,1df8c78acca6f5acca01d5166dadfed10d786df5,,True,True,True,7,17,97,2,True,7,Tests_passed,4d11c52c775a4602495d557fb460462c92116143625c73cf58cd4e7c8c93abef,True,Tests_passed,5e8b096cf5f3beec7e69bba8efddaa9ba27bae35da51bdf902cce9e11f21dcd9,True,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,1b7fe45d40590e95198e2d7759e2e7cc9530748713575cafb763ba22bbe9c409,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,1b7fe45d40590e95198e2d7759e2e7cc9530748713575cafb763ba22bbe9c409,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5,Tests_passed,7994d171829da61fb453f398d083344de8b4840c69621a39c3959c38423058a5 8,refs/heads/master,16f458ccc0b3675ec72a298481794ed4afd70666,583f67a93208929c28782528af94a6befa838c22,c05e424bdf26cc9587415dc1b34ac3628e6f0ea0,,True,True,True,11,22,136,2,True,11,Tests_passed,a8cbd141c88bbc428d841e90389995c171fe8021b35d1d0f6e6c75b6d96841b6,True,Tests_passed,5c9430292c82a9aa7a9bb357c563cef9def1a24418578eaccb2fc6617a018e1c,True,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Merge_timedout,,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,c54e0adc44d14e525fa08349229bc03ea77283417ce6c9f4aa497aee5c92128a,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,61ca230bc4ba46d452e2cb3cccc20ac13df3c65a1c64696e3d20e27eb9183a0b,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11,Tests_passed,f56871e703af83b7bf84a5ff117995d0c0bd5d147e3ba5c907fbe9b07f68ef11 diff --git a/results/reaper/merges_tested/xaverw/msearch.csv b/results/reaper/merges_tested/xaverw/msearch.csv index ccd6a7e830..936c1a18f5 100644 --- a/results/reaper/merges_tested/xaverw/msearch.csv +++ b/results/reaper/merges_tested/xaverw/msearch.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,ab544f9464acace234ed164113e9d6fc42fcc898,cd770473148aa5a7de33b3505b2257416a605c55,285cd0684d635bc4f6288be7b66d5513ff2f5268,,True,True,True,3,18,67.0,2,True,3,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,True,Tests_passed,cb4d57b07771831aa03da393176ab13571fa7b995235e5419b3e5b6c9fb01a0e,True,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9d45eb1f4284a70a3e4093ab5cf1141ba1bc8e1014bf1976e7c125d7b9b71ed2,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,bb84efae233f35826bd693c5510ffe64c92afef91b86b6605c058b565e989171,Merge_failed,6c961be7719ec1df936e9bf5148f09651083f9a38cb5c6613edb55e5b2acb9b1,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,742dd1747c3c2a5f283fd7000a032eb92c067b5964edcf85752f664c30968015,Merge_failed,0ed61f769d83aacba9f8ce6023988d2463c091f8122f0ad168678831646cc881,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201,Merge_failed,9578d4e53ed8e107bc18fe2a8b29f00690d6ce23bef7df7f9ff084fe868e3201 6,refs/heads/master,cd770473148aa5a7de33b3505b2257416a605c55,cfaa2e961bf0bad111f7cad90f35e189c6d84d3b,24ae6009efadf158401862338e84f7ba0cf2b354,,True,False,True,2,14,55.0,2,True,2,Tests_passed,5be751f454d9664567e919e0770325cf00fef50d41ad017ffc965ebf30ced2c9,True,Tests_passed,0b582440d39422f485d79cadb4f8af78a592d18ab2062cbd39107f42983f7a6c,True,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,dad490bd0dfa1b9c62aaad8fad7e4e613ddf9215c70bcda50b75ac3c1db5d2f0,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,dad490bd0dfa1b9c62aaad8fad7e4e613ddf9215c70bcda50b75ac3c1db5d2f0,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066,Tests_passed,27c021f53b1c025ba2f3875da9206efe82c470d6c057117bfac6f8886fa06066 161,refs/remotes/origin/pull/113,89f696aad5e1bb5b729a747dee346381a944b4e5,3ce720ebdb0b1146fc680b12b2732231918a7af8,7025a6b6fab263926dd1f510df0d4957f4c49221,,True,True,True,13,110,613.0,2,True,13,Tests_passed,9213fce7a59a814a84733be932923b3e43fe8e4f05a618fbe1ea181ca91dc0bf,True,Tests_passed,6e43af11a7b7bac07dfd0ce9565de62eb45070613911933e94aca6b978e953a0,True,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,21b78da7e3ccd57d42f406e37381a37f6979193e6125c4795947efbaaeb2f694,Tests_passed,fc220527189fd15caa0f210d1dc2cc9fcf068bda36f4bb597b6d57026cd044af,Tests_passed,ef26567cb942efce929abfce65ca256700c13275f25fcaedd03d1d84ddc7a866,Merge_failed,c87c227b0d8b2254c78cddac43b3f1b18354c3b781772179fdadb5f498770b18,Tests_passed,fc220527189fd15caa0f210d1dc2cc9fcf068bda36f4bb597b6d57026cd044af,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,b57e15ddd68f63394c5f20254485b486d41b4bf9318eb8129840bfa2a6c4631b,Tests_passed,ef26567cb942efce929abfce65ca256700c13275f25fcaedd03d1d84ddc7a866,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95,Merge_failed,9f1dcf0656f8d896f9c3396d18dd115fc001e125c29ba3d39f1e14b419a14d95 diff --git a/results/reaper/merges_tested/xceptance/xcmailr.csv b/results/reaper/merges_tested/xceptance/xcmailr.csv index c4f232ea00..b43074e261 100644 --- a/results/reaper/merges_tested/xceptance/xcmailr.csv +++ b/results/reaper/merges_tested/xceptance/xcmailr.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/develop,d2595e205ca2e2c05d51c0005d2a0a476346a766,57b3825589b9a4df633d45657f2f19b1aae327ab,e0e4311c3dad42818e9d6069f6a2234fd2dcf42c,,True,True,True,22,65,597,6,True,24,Tests_passed,e640551537f04f760b1f31e060acf3edeb744f3db132a70947b1dbf55fc86be9,True,Tests_passed,5cf7025ad9cd77670ad2b8f14758f387218dbab9ddaf72f3f23042a63c3bf3a9,True,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,aed7a1d9ca44ad3c06853689b0351782dfecb60680ff99fa34defaa077bc7da9,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,477173b308636e58d923a33ed366217d68443569a734cc900f24504318a22b1c,Merge_failed,59ae6fa4af3b91d013b16dc2aa070eb96548f4500ecf0d1ab0adb7fab6386432,Tests_passed,77bbe3666e2c9c4481d5b0dbf938098c8480c9c8c1284072991d2628d766b409,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,b85a9e782ffab18630979a93c23d353d1efd3ee2a5b85879ab7fcc7106664402,Merge_failed,26094e3bc6a080df84e924db09e7e7374d4b6bace096c7234f2983178a7e2803,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148,Merge_failed,21fab76de8ec04493642b640fe7b2d87c6aca574cf4bbc445f889d87d013d148 12,refs/heads/develop,d4168af7f11c87288226e057ae48dbd7788e6872,a43b911c16cc9b2ccb7b5996af51adc26c12a77e,ec936caa793e59240acca5239105707e9aec9c37,,True,False,True,14,29,128,3,True,14,Tests_passed,8c117f7998d83ec08d9647cba20fd0fbcd7f29847e70c8b2d3629a63143bb7b3,True,Tests_passed,69e2cfa4d05eb87ca733e751a565a6bb20b41a757562c439bfbadb5c621980b5,True,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,e8fcf279f91cec2bda5a0895eebca8b4dbcfea218a820fd91537d3d29a75fae5,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,e8fcf279f91cec2bda5a0895eebca8b4dbcfea218a820fd91537d3d29a75fae5,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,05a11589c34260f79657a26a8e5d2eef11364a3d49818a752717f525fa5386ac,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931,Tests_passed,6bc99e2684bb78c40209496c08b717bdb5607db0e947eea51c2483b30a1f2931 13,refs/heads/develop,0e8854bd70c47bd4aaa4f232e05028e31935d1a5,720afecf7da67eb5be30d191b74df8a2e9d65217,b9a48f0bf6c626a6be573165fa6763560ebcb948,,True,True,True,13,29,106,4,True,13,Tests_passed,4962ffb1273064e43260bf5de97c149b405d11d859b54b77a7392b96b6a74221,True,Tests_passed,9ac452db09e0b81beea72debd698e706102f7b00361ac86437c30d0618390fe6,True,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,092c01dea283b61a0a1c14823fbb671c6ec47f0dedc08e60eb1ad67423335bad,Tests_failed,f5c220b6b6c4d4f27065935637190ac37f35b28cf36f84c20badb907c11dd54e,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,092c01dea283b61a0a1c14823fbb671c6ec47f0dedc08e60eb1ad67423335bad,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925,Tests_passed,a7eb7bada22ab47aa2b73117f6fee5b870203bee31a032f77deb1459639a2925 diff --git a/results/reaper/merges_tested/xebia/xebium.csv b/results/reaper/merges_tested/xebia/xebium.csv index 3c9f6be750..d64e5a0d99 100644 --- a/results/reaper/merges_tested/xebia/xebium.csv +++ b/results/reaper/merges_tested/xebia/xebium.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,cbfab438393258e91f8f54b6020f3fd8c8c4cc9f,8aabaad9e4eb4feff9436848ac7f91661b68e4bc,a7659b3b11a3608328a30f64350703a798ff2c39,,True,True,True,5,6,140.0,2,True,5,Tests_passed,9b0f0a91def79e8ce7e4ce38326b5adcdcacc682b74b5a4f63a1932e277fa20c,True,Tests_passed,fa8b543b3168badfa92f35276d83e9d1529206cf008ac6bca2170c266f2ceb8a,True,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,a1e8db274c3cba320cf03f3ab213362e8da50745dffa9a6537a92b854bb58c8f,Merge_failed,03b92ea667e7138ea14633aa2a3210561ee4a526356984f0d9ceeb4eca7379af,Tests_passed,b84a7bcb40808b9477d72b2500b5ab21de04bcb3e0fcc3d81ae7cd7beeb8117c,Merge_failed,08c8dfa0999f58b820f06e708e540c804bc53358639c09d923abc7917ec8844d,Merge_failed,03b92ea667e7138ea14633aa2a3210561ee4a526356984f0d9ceeb4eca7379af,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,3b714398439361646f2f3e66835d0d9345288a017058796381209c2c5244fe37,Tests_passed,b84a7bcb40808b9477d72b2500b5ab21de04bcb3e0fcc3d81ae7cd7beeb8117c,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28,Merge_failed,e8b2a94ee90444c72709da8f8c95738f34cead2d0d052e64412d59d3d66fef28 16,refs/heads/master,2808ba14a8b8932184099d8a63e9c5a4d69d6a25,5741e34076818d5ab03d55067a60a4a9db37a064,3a99245672b2f98fe3de5600d1012e2625201edd,,True,True,True,17,26,1083.0,2,True,17,Tests_passed,4fea512beed85924066989703783ab13254da091cda925f5ed2852253fb602af,True,Tests_passed,d8b3cef5ffdc8707665176455fa4c806a7f94cd22a6a82fcd9fd6ab724e940da,True,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,11fbe24fb046172c5104ad8794af73d3d6d8b91373c573e5395619cdc1492c4e,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,448a1aa97d368c10d2e21846887d4b307f49e298b4f1ef9ab96b1729289fc901,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da,Tests_failed,ece114872126e99e2d6324c5065a830ce926945b113766cb749d6ccda5ef15da 18,refs/heads/master,a9304edb1a04cd4905ea1ec9569e6c2b8e63a1c2,45267eb71a65cf11fd677661e1cf75aef3964f8e,ee545b883bfd6bf65c05b9b419b0d3b437d815a0,,True,True,True,65,162,867.0,2,True,65,Tests_passed,1521d1bd20e473119e6163c24ea2ab6b791ff888c646013318f714c160a75c93,True,Tests_passed,3e6730e21ee9fc1e10715d215d64494536201810fbb88eaa890a070f453ed313,True,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,7bb69dfa1b3ec285d678bdd6a918bda6b4c8785bed0c58feefce1aeafadc0fe5,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,7bb69dfa1b3ec285d678bdd6a918bda6b4c8785bed0c58feefce1aeafadc0fe5,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f,Tests_passed,fbaa77fca1647b937b34394135445d64dd2278ee188f50b096b407775632765f diff --git a/results/reaper/merges_tested/xerial/sqlite-jdbc.csv b/results/reaper/merges_tested/xerial/sqlite-jdbc.csv index e3b34c1ee5..88f14d428d 100644 --- a/results/reaper/merges_tested/xerial/sqlite-jdbc.csv +++ b/results/reaper/merges_tested/xerial/sqlite-jdbc.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,1b28e87bebefd5dd7deb7b0712e2ab5729a363e8,60bcbe8753b72abdabdcf203381c7615e7df499c,a987e5deb8ee1c54c747ef5c364c83cb2425a8a9,,True,False,True,3,9,46.0,2,True,3,Tests_passed,90b3f767992119fe56afe43f9484afc247cc18627578d400bf1310ab5c2c153e,True,Tests_passed,21877632a27041a36fff6fb23c59ac8be08845afa59e64876c2c7fbb23a88662,True,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_failed,1a2a1fcd930ae3808f37abac8efb41f3d87aff234102eb7f31695811461a47bc,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069,Tests_passed,a3c061fefd15aa22ea22a5676515d3323f811337c6108c246d6b620eff879069 15,refs/heads/master,696d6b2667e37ba8fc340cb20eea87fe3f13023b,ab29e9ee3c3513a43848ae77f077cfbbd9e2f75f,7c33d754ae1cd10511cee6500b80c56714576b77,,True,False,True,18,19,167.0,2,True,18,Tests_passed,6f8866634877a63f7907107ef5d0208ee9591938d038d4be6c673ea951cd3d89,True,Tests_passed,454285e778a57428964a7bf6726934812635e738ab09ec4ece4039f51084771b,True,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_failed,e5095729da289ab59c6bc21b7750a91cc0cfe6122280d76a87211e4b6e52d070,Tests_failed,2cbbeadbcd01eb36e5d878ba0fe59840fbb5f96196e4f6d9b09a023c2d61f85e,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_failed,e5095729da289ab59c6bc21b7750a91cc0cfe6122280d76a87211e4b6e52d070,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c,Tests_passed,fac741abab462b50e66cb0b9cb5678c691281400a64366a902a894f4cd48520c 17,refs/heads/master,e84316e759a76facbe26c590c3196b497fc46d51,203354fa561fa24f820dc445a49b410427427419,fad840fe0af3403a333c9d4ff6397f71747729bd,,True,False,True,16,6,24.0,2,True,16,Tests_passed,3badf12ce0f728c23eb00d8bf88ad2d1faabe2b6fe14c2f06757ca151b923aa5,True,Tests_passed,b2c3c163a0f05fbe94837bdd83bafead361b0cf445e5ee7241074c8b637ab9a0,True,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,74d5e8e0788dce8ad6f44a2e3fd3d4714a3880d26025abb808f4a7067e8b4e13,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,74d5e8e0788dce8ad6f44a2e3fd3d4714a3880d26025abb808f4a7067e8b4e13,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf,Tests_passed,95e31a11f0c5eab423bc081ab9b324352845ca3e543f5bcdb029833d7c3746bf diff --git a/results/reaper/merges_tested/yandex-qatools/ashot.csv b/results/reaper/merges_tested/yandex-qatools/ashot.csv index 037ce93023..63e36a205f 100644 --- a/results/reaper/merges_tested/yandex-qatools/ashot.csv +++ b/results/reaper/merges_tested/yandex-qatools/ashot.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 74,refs/heads/master,c885c16709720ca016eeaad7056c0a39a9490878,3f0f936d5420486e0fc81188a8b910efd658d527,c4dd51684fd9c41c3007a2738ea5956eb3de894d,,True,True,True,6,12,51,5,True,8,Tests_passed,fe30a35cebd8fd18b96194edc73b49b9ee0f724aa8c4e548f7bc6022c2d7eceb,True,Tests_passed,5241c4d02046c03f064e714c909160493feca3f1ecf6295fbcf1403682a0890f,True,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,de3f02302a8699e9a6cc8fcd5ce44d8a36e0620929858d65cbe60bf0f47b20fc,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Tests_failed,a09182471537a72fa3bff2dddf834528c4e38be5fcb84877045fc9b1833c05d5,Merge_failed,e366b7ac6f5f57f267f2565e4e236c0900ad083e62ad4afda6ef502d2d0b5ef9,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,961403e5712aa0c40d7041f5ad661b8791c0baae6adfaaed6276fb9d19991d12,Merge_failed,79faf3c8fdf708528b4457b2a9feeb225d3548fb98d792ac6129270e77787b51,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6,Merge_failed,89a56eda2fb75b1b0332f4ff64b238d91e1b4002efc93bfbfefedf2026880ff6 diff --git a/results/reaper/merges_tested/yandex-qatools/postgresql-embedded.csv b/results/reaper/merges_tested/yandex-qatools/postgresql-embedded.csv index 65e82e5219..90a1b578a8 100644 --- a/results/reaper/merges_tested/yandex-qatools/postgresql-embedded.csv +++ b/results/reaper/merges_tested/yandex-qatools/postgresql-embedded.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 24,refs/remotes/origin/pull/70,ee78f139b59e3ca8a016ad361b96d95fc4440360,bd6f0c784969a4a641f0d0daf5ec8e1f6cc5efef,db9596df0e2f7c0168d9f789a6b76c6f0fd2074f,,True,True,True,15,21,220,2,True,15,Tests_passed,79843f2d5bf1606ee8332c6424107715ecc282f10a209e8bd3aa8de443cda3f1,True,Tests_passed,d5e91f64e1972ea95773642726ebdf45345809a698f74c2e172d0612ee07150e,True,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,3e459ea88c093936a438a2bf1b5642ac89fabb2b85daa9bfab41428235f4f4e9,Merge_failed,f26331705ffe2224c9967f3ab4e6f5881d336def8899b091aab16a591d160850,Merge_failed,feff1ff4e5e125dd4100369c1aa285c5a69770782ad60029b36b38995ae6eb6b,Merge_failed,49743f65b5bae3ab307220d6891ecc9c74530d86cd8d0d27c32a27a239bfd4ae,Merge_failed,f26331705ffe2224c9967f3ab4e6f5881d336def8899b091aab16a591d160850,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,c8e737041606c52311ed9c406c7f01a078befe3fe06e0742aab478d64eaee906,Merge_failed,feff1ff4e5e125dd4100369c1aa285c5a69770782ad60029b36b38995ae6eb6b,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df,Merge_failed,9286c5f2581e0786c7b5f547a8a84bb75ba86157e2777743d310a5efe68b35df 30,refs/remotes/origin/pull/82,a3c37f7112acccd27f2c75daa7c0414fa495845f,b07cc8784d865c964493bdf10d4180719cf2c825,c9281552120f7d0ffb2b5a487e4f4cdb4138fe19,,True,True,True,11,60,305,2,True,11,Tests_passed,ca95662991c6369583c4236a41049b9b1551eacd2beecd145668229f90d75304,True,Tests_passed,9e1fb8c13cd003c9648748e88fb969fab05fbc039dad492b0bc05fe8c3e05465,True,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,7dba4a92afb17ea3d8b9fbca44eba5f21a698c99fc60682b6a1857e217bfd121,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Tests_failed,24ab39477d327cf5f0f9ae824bb5a7d02ea1cdb17ec98e90a0aa54e3c0292cd5,Merge_failed,b67c2c5a8b0d2df36a7d4273c2770734eb78e925767beea4d23c32999be8d07d,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,858b8a296a72be5a6e0298fc8e5c0ab82c2c259d50647ab057bcf1f2d1e12efe,Tests_passed,22debfbe49ea66eb668bc6e6f200036a6f99adf20136e717f9b7a55b8d25828c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,33b4e6d25894cd3315dbec35ab6c0f7665a8c4f4ebab0c0eec3d4c4e3bbaea7c,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7,Merge_failed,fdcba5efac49381971320fae0f637f72443d94c01ef1fe5e0ee0a3fa0d149dc7 31,refs/remotes/origin/pull/82,6e15a53c7ee51c0199c28d591a40e17521ba06ca,08e4e7806823ee4cc2822164907ea56a708b7a08,6355501812b37bd670fdf9cadbcdd3d49eb54d15,,True,True,True,17,79,339,6,True,18,Tests_passed,ae6e96bc8d654323e7fd5e2a66cef7693653d2e127ca6fbc626bc459cfc2e719,True,Tests_passed,56c7a068a4f25e17e02b84072b25da90cc6feb1dfe173a418f523b00b8b3260e,True,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,679c3f9adbb57eec273886c63ce6fce5808b5ed9b0b00a740410854bcec5dce1,Merge_failed,4638cf48ff1ea6489c8ea1d488299b956057329486874d0c673e1ddc9c72a8e1,Tests_failed,cde51843466c8c6cf90cf9ba32b3b585be971b754362b2aae291bee9fbb68527,Merge_failed,e9773cb68ae34eb454365545bbfe5e35f6010ce70a9200e515afcce8a71087a5,Merge_failed,4638cf48ff1ea6489c8ea1d488299b956057329486874d0c673e1ddc9c72a8e1,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,321ae04313578f90e3dfd5bed66fa1439b3234807f52fa5868462f41e20eba94,Tests_failed,cde51843466c8c6cf90cf9ba32b3b585be971b754362b2aae291bee9fbb68527,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,eacd11af20e25c300b9bfd5fa97084a83117419678c5e6802b3fa2112b13b530,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46,Merge_failed,77443eb59d5217cff1a04ad3988f15ae3c706355ee07249982649eae825e3d46 diff --git a/results/reaper/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv b/results/reaper/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv index 9f89483986..9fb65048c5 100644 --- a/results/reaper/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv +++ b/results/reaper/merges_tested/yannbrrd/elasticsearch-entity-resolution.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 18,refs/heads/master,8918c24485205f725d3938fd5907aa0720faa326,0d3d7acc84e7a0b7fa0f34e299d0e1bd0c556d43,c0a771fc9886b28fe7e92c52116288b9bb497466,,True,True,True,8,25,463,5,True,8,Tests_passed,54b6422a1a2bd07869251c311059e159d2e5a4a600a2aa489e5650c5896e2c0e,True,Tests_passed,93607cdae7043222253b7ba823c1181bb2ab10cf7d0500b5f3036a66eb31c120,True,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,5272e72c437ecee7ed05b509166b3e83733094c8f2deb28575ea902351d606e9,Merge_failed,44de1feb7b6bcd2d7f6f1f92926a852dd6855f041156bfb5c98d06f122a67c68,Merge_failed,f1b8576556485115ca7d9a137c418cb82f4a698a6891172b737716203f561368,Merge_failed,f1b8576556485115ca7d9a137c418cb82f4a698a6891172b737716203f561368,Merge_failed,44de1feb7b6bcd2d7f6f1f92926a852dd6855f041156bfb5c98d06f122a67c68,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,3567ebfc96c6553d37a4c5e9942703a30c32089c379b47347560f57dc6fe376f,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d,Merge_failed,dc0930f1fe0f11c639a668c3a89e898584dda17a171d8d19470309850600e11d 20,refs/remotes/origin/1.2,5bf2597661014520aa35d0746d813bc012422c8c,33e6486562edeec6be5e0a90c6e7c868bd94381b,618ea967aaf811d96411c1ae2d921593de57446a,,True,False,True,3,5,10,3,True,3,Tests_passed,3d0810c58349314c5d970dd2c552f45a4be8836cdb5e2ab031cb6b788856009c,True,Tests_passed,9b8fe86f95fecb955372aee2fab01b5e27f066ceda4c1ef385a90bd58cdd3849,True,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,9a4244f358a7427417fbb4a913c1380cb724db529f7e85f3094cd47b323818ab,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,c3e27d5a25b6484fa789e337fb508f99380ede8582329409191a8774f3706f7e,Merge_failed,d0b0c0c833e3793e76a31f4f0f5842f417263e46009c0b3c9c47c69d507ceb37,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,003deaac3ed01e8d7dc15fd6ac8ee03bf9da6050f54bf3186a10513b6bed854d,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784,Merge_failed,88b03edc4da2d1c2d569534a22ed1fb8c7eebd15e2a6f09511a9fb2e522cf784 diff --git a/results/reaper/merges_tested/yegor256/rexsl.csv b/results/reaper/merges_tested/yegor256/rexsl.csv index dd7263ab59..73a54b11b1 100644 --- a/results/reaper/merges_tested/yegor256/rexsl.csv +++ b/results/reaper/merges_tested/yegor256/rexsl.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 12,refs/heads/master,0c8dac7b6c144a3f260a7ebcc1367f9b1efac767,caab13af375e8059b2bfcaeb1af74d0b167f5d56,3dd37ca97a34b46cbd1185d9ec78bc0484f86497,,True,True,True,123,174,1505,2,True,123,Tests_passed,efa53ab5735db2aa4dfa9eabd58f983054d92c643607d66a704557a122eff0d0,True,Tests_passed,0113baa9e2be37aba416881b8dc77c0b4e0d4a0d69322a9066c6f35fa2aecc15,True,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_failed,ed636813ff8dc0381591bc5434fd4e1d16874f5d0b0394e6bec571aabad722f0,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a,Tests_passed,6e24941356340658eaae73890b94ca5dd4e08e450bb22d6fbbee9faff603899a diff --git a/results/reaper/merges_tested/yegor256/xembly.csv b/results/reaper/merges_tested/yegor256/xembly.csv index 676ded3c36..fd802b3a4f 100644 --- a/results/reaper/merges_tested/yegor256/xembly.csv +++ b/results/reaper/merges_tested/yegor256/xembly.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,e279293590e9d10fbd09353bd505e6f97a060c8d,f058e1333921e0446563e5da54b16fbc6552832d,35385af641c110c21c0b6af59835b9370a5d674b,,True,True,True,69,264,2406,3,True,69,Tests_passed,2ae3bb884a481812716afec81dd4f72536ed652da690448883864a80c18dec35,True,Tests_passed,94eb3887b406f32733b84e93944f71dcf3f36fd960c918b9180870b2c4f1f16c,True,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d,Tests_passed,6e91d0e6e0c21a78c72ff5bd76d93afaf2a5016d3cce98cc19817795995ebc0d diff --git a/results/reaper/merges_tested/yfpeng/pengyifan-commons.csv b/results/reaper/merges_tested/yfpeng/pengyifan-commons.csv index aa41e79650..2edbcc1fd6 100644 --- a/results/reaper/merges_tested/yfpeng/pengyifan-commons.csv +++ b/results/reaper/merges_tested/yfpeng/pengyifan-commons.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 2,refs/heads/master,b896ec045faaf724ad11e9be56250fead3826ca3,20a39e77627495e9e4b5c63f8d50542b20f92691,2bb2ef36d9a59a64326fd42606238550260309d8,,True,True,Tests_passed,0ef90fe962f6f9ec829a69ef98aa8d4b3f97536f276d0a3dce9f2389bc175403,True,17,27,57,6,True,Tests_passed,7ff8b6ecc8a183def870e63866b73294cfc759aa1f423f62327cdf79f7a3e4ab,True,17,True,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,084d106a794f685da928d22681f8931602e147d446f74f69bd777d5c24cde447,Tests_passed,665caad39ae88ebdd5f3c9be674cfb2a130238e197fd0c0dd2c79d25e44237e5,Tests_passed,3745429c5eaa345b70afa7d85b5a68f6b40afe2491cb43326a811bc9d40f93d3,Tests_failed,0f6afe5f2fb0699aa3571a5a962eb9a685267eed523d06b6082998a6bbad56c4,Tests_passed,665caad39ae88ebdd5f3c9be674cfb2a130238e197fd0c0dd2c79d25e44237e5,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,07772756a4e10016012081a419ac1e1630fc711377f1c86211832f221a3dc637,Tests_passed,3745429c5eaa345b70afa7d85b5a68f6b40afe2491cb43326a811bc9d40f93d3,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146,Merge_failed,075f991b243f1e1c6717f6791804d04bab61f8e5f355934cd92b691ace028146 9,refs/heads/master,12b4284589d4f1e0461def2ab4b95e07f51ad9f6,495932109e40fc131106c796bcb3357b3549b286,8292eeb7786230f3b080ff8b29868eea46a0d6d0,,True,True,Tests_passed,e10885075e953e4c4f2f35796af07521e202243ee79b80079ba91b7fa0d8057e,True,15,39,86,3,True,Tests_passed,7c1e8134a2ec2052b46ea435402026f23d79db6dba164631bd53820ed1359cc0,True,15,True,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Merge_timedout,,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,85e67baa4cf1728cb0ada560616c2556b9060cc117f541f434aa68730e52e76f,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d,Tests_passed,80558986c3e1e9079397e323855ba0cb55a7a005e756e8b28c845fed2cf6cd6d diff --git a/results/reaper/merges_tested/yfpeng/pengyifan-leetcode.csv b/results/reaper/merges_tested/yfpeng/pengyifan-leetcode.csv index ffd82a4e2e..e7243a5c02 100644 --- a/results/reaper/merges_tested/yfpeng/pengyifan-leetcode.csv +++ b/results/reaper/merges_tested/yfpeng/pengyifan-leetcode.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,bb9b165e9b6f5db5725394be827250f61e87b71a,307fe1c63dac2e5049efdf21a478ed577fe1ed66,79216680be9c17f819e516efb5c9dfd210dad720,,True,True,True,13,15,334,2,True,13,Tests_passed,7389c76b28bb8988108f02d3f429c9a276769fc94c3b5b47a4382b34d600ac87,True,Tests_passed,732cba39f762d73abe26fcf138efdb5d481f7589c86d81d831d0f4957a95da99,True,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,f4e97aae0be0b94aeaa440bc929d863e40d627c3b89dc4449bf29ebf88247f12,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Tests_failed,5fc08050b0aecaa0915a9369f0745dda6f451f9da36dffc1487af0b7b18fc25f,Merge_failed,3b1c48d2a662959c9de18efefabea88b50f74c34a27903dbe55a4acd95c012fc,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,a1e561e0e5a53bbe5c1e80806ed869fb91310b89b463b863961aa1df839d0e53,Tests_passed,f9586a760a1b9f11aee325e8facb564257016374ee9143e2b1f51da854544857,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca,Merge_failed,fac7d41705f06857f427a81a78fa6d372e6968ea0c8b4780b36800ef94fd10ca diff --git a/results/reaper/merges_tested/yinlou/mltk.csv b/results/reaper/merges_tested/yinlou/mltk.csv index d1c51b511f..71047176c5 100644 --- a/results/reaper/merges_tested/yinlou/mltk.csv +++ b/results/reaper/merges_tested/yinlou/mltk.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 4,refs/heads/master,aa8e5f1f4d99c36af8e66768ab191547ccedc4db,d3ecd70f387e0568ad24f699003559a11869fa80,e9aecefe38d2f9dc6f596fd0422a18605790895c,,True,True,Tests_passed,b7e3343811556dee4b7fcfba690bc197290d1da27fe5e6cb873b5d27aef86c56,True,15,36,530,143,True,Tests_passed,44006b0289c41adf62eede8d99552a8eb7358a193757eecf9d3d25068a46243f,True,151,True,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,b9d74d55aa377acf2de063cc8df0e88dc5075a3a5e1c0a69880b8a27e4baed64,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,1fea5342e9393c1ac6f98e48a83594d1317ddba4b5f80c7953e3156af7b882ca,Merge_failed,e49f92c70f3e660bac71f7bb0b9fb63f21cdb496d216aae16655f83e199a2045,Merge_failed,331fa3932314eec41c57319dbfe6604286601e5cf5bca2a8b2252650a39ecfc3,Merge_failed,5f4bfb9da2f45a759d09cec64dc21478bfc8867e36dbe1ef60e892687fbfe4b8,Merge_failed,e49f92c70f3e660bac71f7bb0b9fb63f21cdb496d216aae16655f83e199a2045,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,45d31e41c68f54d2c6a0a941c8b1290421f376186831434bce0bc1fca7b49f1d,Merge_failed,1fea5342e9393c1ac6f98e48a83594d1317ddba4b5f80c7953e3156af7b882ca,Merge_failed,bf1d305a6f0ef032267316fdc3e9a2b73fdcb0193dfe6a6d389316c8ec284c8e,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,b9d74d55aa377acf2de063cc8df0e88dc5075a3a5e1c0a69880b8a27e4baed64,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857,Merge_failed,13962883bc0c88da8f39135beafe443d3b26486b351974f56b2e104776837857 6,refs/heads/master,d8ba61b83ab596ce5a69819325449353409fe333,1e2122a2841cd7ebe466af889c6e69ff6361864d,2fad94a58127f000fdcb9674e1c9a4591e23fd09,,True,True,Tests_passed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,True,43,80,184,143,True,Tests_passed,dd3673f125e6e0e5f6681bd64cdfa150aaca6ecccb350eeb99cd597ba33682d2,True,144,True,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,1034c047b0d0605bda212c41dec63863dd9b110b2a96df63a89d8ea6d35d9028,Merge_failed,052e70e76be12ab9c57ea9752d4548408368a55e3bfb5fda98bf1c21b144bdfc,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,9b98815d726bebcd602bcbb9eb7d0bbf54775fb85268459e172aa171d891feaf,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,efe4b06087387d834c97b062407c7acf7d3c19b41b06652e066d1e0686d49c1a,Merge_failed,a3b06675cef187d21292baf23921c59197b35f2e6b5488bf356864093adea8a6,Merge_failed,e59907e60154f5029c340d0ed61ca19203c5f29b623ef401c2544fed5d647f3b,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,2a3ff1b474ddf905bf73a2db8e34d44bb6ba4370bc90b234cb0ab287af313dcd,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5,Merge_failed,753c88df8f6c3705d1c5b892d90a8efc04219b5fe86d0c8a8cb51b4fc060ffa5 diff --git a/results/reaper/merges_tested/yinwang0/rubysonar.csv b/results/reaper/merges_tested/yinwang0/rubysonar.csv index 4da7cbd3b2..e833979ad7 100644 --- a/results/reaper/merges_tested/yinwang0/rubysonar.csv +++ b/results/reaper/merges_tested/yinwang0/rubysonar.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,ba5f907f21493bf5ba964075e0a86118f31eec65,9066c7fa26e0bd041e1ccc6a8c285560f4db5959,e1cbdd9beec38b27307a5bdb42bb1074ce285486,,True,True,True,62,261,3126,2,True,62,Tests_passed,daf542615ad8bcab9170a650d71008e1e0553adf3a8a82d240e140211aa743de,True,Tests_passed,7e094c29bee19c611285d26a1fed91563cc553cba68f9addca80e92c6b9b2dd5,True,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,a8e980c84309f94d9284d93ef5052847b0423b5182842c596873411f7f2f7010,Merge_failed,a0d89b5fce477d16514cf6644b6bee070195c42f9c6ddda75c2898e17d90ff2e,Merge_failed,e4d1865046c78387fe6ce808700cc09912db30f2a2e57f0f1b61805cae81af76,Merge_failed,d409a47339360a6160d237d5ddafb8d473a0b761564c9c9bf3b265489f4490fa,Merge_failed,a0d89b5fce477d16514cf6644b6bee070195c42f9c6ddda75c2898e17d90ff2e,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,1615ef65180370cd36d2f5cab9ed23aa2711b2cb68e9fdbff087c6f735a21ee7,Merge_failed,e4d1865046c78387fe6ce808700cc09912db30f2a2e57f0f1b61805cae81af76,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,8cc01f8996fb49e027d832bd9533911d40a530af9d619ed3605c79877bf29717,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36,Merge_failed,daca0daab2ee2e8ab2fad17020c6a4f900dbe2886c4f5eebc5feebc42dd84c36 15,refs/heads/master,fe4005af961bdc19c4f47fd0d60dbea83278b782,b216073a1f42d7eca77a755a5ca50289a7138606,1f10f0ded03292220c69999e0577a96026569dc5,,True,True,True,35,222,1323,4,True,35,Tests_passed,738502cdf6141889aa60d232a8b2b18fc3864f82cad46ea9c1a5ea2370fb35b8,True,Tests_passed,2f8655afdab831f4045ae6d708c557be0de01a5fc7273ee4181a49ee634144e2,True,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,8a03a5db56d203fcff8d452dcea1142fcd33ad1a7ac5fd52571ec0df5994d0e4,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,1bd907e6d2991ac94e9c7e31203e84893631e1a0217e815942d7b67b6f261e33,Merge_failed,37931d9e30f66e35390131dacc2eff4f7529bc33d6ec6e8593898751eb76d151,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,b164bd0bbc0354a4def7fe37c104e0373a183ca0a8d88b2ad746f277814e0bbf,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,10aa3e4c47ba7e65c34be2e3902ff1979b77e41d19b46b5a723d4b76a58ff4a0,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,c1ed7d37cdf7cb670516863274cc11adba961ffbb04479f2be7a94fee57ac598,Merge_failed,80f7e34b88a83c45947c7694401fe69db5000917f08f984953101ba3d0bdca03,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,84c17ad89606e384869d0ec9ab811e7b6b404cb650b4ffe48abb6c5a89f973f2,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926,Merge_failed,d313a0869d0ee4920ca1ddbc04e7ca4e723536d7a329a5772ffdb181287bd926 diff --git a/results/reaper/merges_tested/ymnk/jsch-agent-proxy.csv b/results/reaper/merges_tested/ymnk/jsch-agent-proxy.csv index debaf337b2..ab6701b659 100644 --- a/results/reaper/merges_tested/ymnk/jsch-agent-proxy.csv +++ b/results/reaper/merges_tested/ymnk/jsch-agent-proxy.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 6,refs/heads/master,ea7c6959a2c0acdd8bc10e88adbe25d680351b08,be10f22b86225a1829a2ff4074580f1a0482a5af,65aad5306572127275605244d7c78ddd4eec411e,,True,True,True,14,26,457,7,True,17,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,True,Tests_passed,013b7e275f48162a1fe3124ad12f40989ddd9501122b42a9b5d73bb8433cc623,True,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,489caafaaf523258a81649b84d47ee6cc61a2a51a96dcfbc7319c8c65a363f09,Merge_failed,f5afc23553df2ce93db55d19dde2c04e256f899e870f5c555c61ba683fa3b6ba,Merge_failed,03078803ca8cdda4ce05b86950ed8dfb08431a71723a89b7f66e9793b8f434ad,Merge_failed,03078803ca8cdda4ce05b86950ed8dfb08431a71723a89b7f66e9793b8f434ad,Merge_failed,f5afc23553df2ce93db55d19dde2c04e256f899e870f5c555c61ba683fa3b6ba,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,150dae63af421d88cd4df312fc296f97d50b9f36f28a5f223b42e0b7b7bc2576,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3,Merge_failed,ecfe742ebbdd4580f50c7843dd9a266164d69b1ecebea8fd367a0514235b72b3 7,refs/heads/master,be10f22b86225a1829a2ff4074580f1a0482a5af,939214e7588fdf67c6efddaf4ad33b869fbd8146,4dd2606f9629045e4fd93c424e706d40bfb73cb3,,True,True,True,8,10,233,5,True,10,Tests_passed,20e66fcda3a3c4469312b95fec33cc22fda7755a2892418a7e645c8ca90150b4,True,Tests_passed,4827da6cc889d3a053eb6d882d30754efff45091167de6f34709f88045fda768,True,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_failed,4db7da193569eeaa2f9f47b2b2a0c027ebdc6c795b20d0889a7fdefbfedcf8ea,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Merge_failed,f60f8bdfc7136400536e9227e14f08f2873c989e404c0b27dee02d88acc8dec3,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a,Tests_passed,b510bfb4e08fd848dae0eed84b5f416f4fd6c3cc11a0e0dcc28fe8d241fc105a diff --git a/results/reaper/merges_tested/yubico/ykneo-openpgp.csv b/results/reaper/merges_tested/yubico/ykneo-openpgp.csv index 4cea2278f9..a99935217e 100644 --- a/results/reaper/merges_tested/yubico/ykneo-openpgp.csv +++ b/results/reaper/merges_tested/yubico/ykneo-openpgp.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,df508d799167e2667bf3488214b6df53e5f647b3,998a7e0f1d376b8b0cdfbd4ae512c0aef227923c,3f5a582f98187b408aa67180a2224e041436d945,,True,False,Tests_passed,68482b384a81381b88328b4f324dfc1b16589007875c4434d72af0007d01b05e,True,5,25,236,3,True,Tests_passed,f98c3c7db67ba9142cff006db01c9e15d03dbc09e2324acae7bc311a2f4f0621,True,5,True,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,dddc955e04460ab1921f567c95f4167eb6994bb7fb40a133aabceb93fe1f4a77,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ecbf9e8e532de5fe21fa9fc9d0ddf8b9294e5361a5bb6233c1dd9ec916f757f3,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae,Tests_passed,ed5f414975c4114cb45a2f9aec9066187906da83f45382be86651a9e25073cae 4,refs/heads/master,2766bd74444ce9ff9205bf215c0cd05757331503,021f572735c8bba4bdb7f58e59ae8fbf10aa8fbd,e99c8df1f2e1d0e9f9fbb99de8ecd1a198af22d3,,True,True,Tests_passed,d59cdf31440f2b3f24a20c3a4eec402473dbeca7aaa6f5d1d64d7e2a3fa7b00b,True,10,161,1307,3,True,Tests_passed,cbf859e666367e84d595d6c28a97673775f237aeea60c7f2f1ac17fe8b453c25,True,10,True,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,406feb02cc4aa74dbe2e2ef80bd384bf990606c3702dfa749f3e0c84a1ea918c,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,406feb02cc4aa74dbe2e2ef80bd384bf990606c3702dfa749f3e0c84a1ea918c,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,714c87841820799c21a4b1b7e649815a7ea25865ed9152f529f811b17dc44fc5,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07,Tests_passed,bf6bddf63370700c81e8edd3273782a0733393721e8e4c2ca44960d590278b07 5,refs/heads/master,b145a6bdbc0b2dcc49cb2955bd7977e949bde7e3,8add85e590fb4e36e9e29b4e971aa1dfd75367b5,4bc4947cc5c1c481d5968f58f54d69a23674f77b,,True,True,Tests_passed,12c82574ffcdc024d16d1329e6633c9730a9196e845316855e611a4205624c56,True,5,141,1083,3,True,Tests_passed,7eca057a902c3279229d8398672a7918a357a9da0d65fdd788c959114fa8840f,True,5,True,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,a4c7eb9bf88b082090519e92f1dba3363296e1e689420388a7903037f6929585,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,5d20bcb6ef223f831579ac47e5eaf58ce79b96c29ee830e5d5fa6335b49f3c8d,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,7e89bdc2e3129d727cac9b25083c786973814ae3e49b9546861c29098b64e81d,Tests_passed,f42692973d6eb21969ad4a2145b80319563bbecf85453ec635389f409802b20f,Tests_passed,c091b66c3729d13b13c741b83410507420669a78ed7ed56cae5a970c15aaba92,Tests_passed,c8e748ce875c8f1190862a9ab0aee6afd6fbe1e3aa46b5fd647db549751a26dc,Tests_passed,f42692973d6eb21969ad4a2145b80319563bbecf85453ec635389f409802b20f,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,5d20bcb6ef223f831579ac47e5eaf58ce79b96c29ee830e5d5fa6335b49f3c8d,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,9dda205379f56aa2b1eaad110051b2386cafa782dfc4e74fb19ff97a3820e9ef,Tests_passed,c091b66c3729d13b13c741b83410507420669a78ed7ed56cae5a970c15aaba92,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,a4c7eb9bf88b082090519e92f1dba3363296e1e689420388a7903037f6929585,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5,Merge_failed,19ec9e518207bc59ea7de9801c82d9842ba56f490e26b10134b61c64a7526ff5 diff --git a/results/reaper/merges_tested/zalando/java-sproc-wrapper.csv b/results/reaper/merges_tested/zalando/java-sproc-wrapper.csv index 4053c58da4..f24871768b 100644 --- a/results/reaper/merges_tested/zalando/java-sproc-wrapper.csv +++ b/results/reaper/merges_tested/zalando/java-sproc-wrapper.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 26,refs/heads/master,d748054093c85a1696a2acd4b5183d47da342f4f,f4be887e89736120593dec1076df7e7f4032ebd4,bf69bdb95870794d0419e564ca5af1073ec1afcb,,True,True,Tests_passed,1427d00dafdcb90797233a1c08a8622d648fd043547efcc06b9f896183ce2a1b,True,27,60,254,2,True,Tests_passed,648be499fbd7eaaeb5eaf523af3e664e8bccb536fae3927d8b7979193ec47859,True,27,True,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_failed,a9ee9a2ec46030784c43e4c8d50863c05442b66821bec6cbf409215a760fd3c6,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,0e4f398d1d718b46826c71d92741adfe3dff80d489149f79a1342a0236e7f028,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d,Tests_passed,a2be8ff8d8fc23ec8ac578c749952b00163828f3c5cb0684e05cdcfd79abf72d diff --git a/results/reaper/merges_tested/zauberlabs/gnip4j.csv b/results/reaper/merges_tested/zauberlabs/gnip4j.csv index 1966b92af0..9f5a0b8f3f 100644 --- a/results/reaper/merges_tested/zauberlabs/gnip4j.csv +++ b/results/reaper/merges_tested/zauberlabs/gnip4j.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 39,refs/remotes/origin/pull/60,d35413b32de39d510c4e83135bd19d0cde193cb5,8a565c2b37d45cde9afc9cad81792bc487885e17,dd812c3d70cfc1d1c38f7880ce6a60f67b7649ff,,True,True,Tests_passed,4d6e1c007ac90b5747bd6ca343549ecf0593674cee7aecd88576b950b8626011,True,38,82,232.0,3,True,Tests_passed,1b1d7d2e30d2950d052ed3cd0e8410aef64481566968c1eb29f8615fca02ac6e,True,38,True,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0228ecf40c74513b11087fcc171c0c0ab3a8f4842db29ca84850db7f63fb5786,Merge_failed,80b6e47c20a5849aec20e359ae614c2daa6c51f7a4daa8a98f41662e4e3ac5da,Merge_failed,153ec9ada2eeeaf09731b314ede439773244daea9fb2668460558a53cda05765,Merge_failed,7e81dcd298ed837ff66b66dadfd7f1227a88621d67f694f45dd4fa44dacb41bf,Merge_failed,80b6e47c20a5849aec20e359ae614c2daa6c51f7a4daa8a98f41662e4e3ac5da,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,c25117d953d429d564d6f08f44b281f01d19dd24f467abe558f646c9406e28d7,Merge_failed,153ec9ada2eeeaf09731b314ede439773244daea9fb2668460558a53cda05765,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c,Merge_failed,0f35b3d9d81856104b2d255529d415debe2029e980da4abf7e66aa8a70caff3c 40,refs/remotes/origin/pull/61,88be680a758bd1873bbabef4cf0a70d52220d333,f83b201e645e716eedc4c3164078612d9d571274,a4661012e34163ba24fa216b5d252831a25e6546,,True,True,Tests_passed,32026961cc0cf7ef2360fb62d63d102b980828a121a33adb5eef06445cc53ad8,True,9,19,123.0,2,True,Tests_passed,41bcb0b98c3473869ebf9a04842abd4900e731b14db2f64dc3b4b854c2a34126,True,9,True,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,ad5cd52fa1a7a994b4f1a507c146c0efdbfe3d7412e2e21413e7cd3294b45e4b,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Tests_failed,f6de7d7464608998f6f3c5bee70f24426b859252c1e2d1f926587ae502f832fd,Merge_failed,b45366e982ecf79489985b7d9ba4c90c28d3ec6f7773fceba599cccb32634a33,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,be35a284ad53b2d9e44ed23154039573076c74b8064e81e5d663ba2652bb352c,Merge_failed,e1de6bcb3eb832901e327f4a02b8884e3a3513ea19840f1040c123c337150403,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552,Merge_failed,6491867dfd78370d8542f529783122d4516bb86edb7c0baae5e830da17cf6552 diff --git a/results/reaper/merges_tested/zenria/weed-fs-java-client.csv b/results/reaper/merges_tested/zenria/weed-fs-java-client.csv index 148ebef807..58002ebb1c 100644 --- a/results/reaper/merges_tested/zenria/weed-fs-java-client.csv +++ b/results/reaper/merges_tested/zenria/weed-fs-java-client.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,9cb89da92f92cc11798e83769c332241e6a70d47,dc03761289040c0875e3108602f290c8967277ed,b19e89ccdcf91b972a4160ae81456acf548282e2,,True,True,True,5,13,77,2,True,5,Tests_passed,00e8db58db1486806e1bef826b0fd5723fa6c8c8857c616603f9f3975953cd0d,True,Tests_passed,a3eca0cb6bb9c0c8a8fc7978b5ba76b2b80d8105804d55824eabb903c80cfa02,True,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_failed,2655b588e351a6d571f1e8735d8d35be9ec6bbff353973e3e4a2b8e2de98a8e4,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,fab8f8e8a4d230f514e37b6ada5b9c1cc53e60652b179bb160e76451557f26b1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1,Tests_passed,b22084d729c83afde4b8a35f5e3ab7f659924f70caab35d89f99ff80a1abced1 diff --git a/results/reaper/merges_tested/zeromq/jeromq.csv b/results/reaper/merges_tested/zeromq/jeromq.csv index 1808515fac..16d6a1921b 100644 --- a/results/reaper/merges_tested/zeromq/jeromq.csv +++ b/results/reaper/merges_tested/zeromq/jeromq.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 14,refs/heads/master,82bbdf0b66f2ebaf8cd845c77dd4762b96982363,c424e02c02e5e8c86082b1de353664bbfd858716,f5c6ecd1da3feb49d3cd6f4dcd53c457b062e519,,True,True,True,6,17,50,2,True,6,Tests_passed,50ca1aa6fbfabbd1446bd4915e1fcbafd586bb322df2649d93a0649bee5281e9,True,Tests_passed,88af2617aeddca172e8c4087af3e2eff659b15cc2676c915a143040c9483f60e,True,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_failed,69f72544125d7779197150f51091e8b6da12e542e7719a4e18b998dbe775936e,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270,Tests_passed,0125e01199418235a0e297f4286a1396fcde9057b3a4105c02e6c675f4768270 93,refs/heads/master,c529e392bc595c92c3b134c2b74df8e59d182e0d,dd079be1a78730359a872fc99f99c112cfac0fa6,8fb8f1b3f8884aa7381e76f03ab84f4536ca3f3e,,True,True,True,81,246,1006,3,True,81,Tests_passed,c0484d75d4defb1eaa5d1527d2d7cd67d7de6766c98e20bcbe018558c75d5c9c,True,Tests_passed,ecac356c79234ee2fa8ecf775d2a9a3261f3bd94b17aba7a1ba6918cdfcf95b3,True,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_failed,c02f17da7737db91604f73eb64da9fa08ad736b870c706c6cf14d761216a7eaf,Tests_failed,e52808549b1eb965049794ba21c2805a6befc112d1b8c7baed3f92fbf794f534,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_failed,c02f17da7737db91604f73eb64da9fa08ad736b870c706c6cf14d761216a7eaf,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,267e9da2e6e85ccf32ebc6c1ae212104a453abed179214a8319a51eae5cf39e1,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519,Tests_passed,d8683785a91e70f2aa731c7460281dd7fe32d2d0f3e2e3425798b7b8fc8e8519 143,refs/heads/master,15d7299ba8224f96a4874c41398520ed37696631,422e8617b6fb771778c7fe0cef7f224938106635,d89fa27eabf9b72fa6edcd1b48ae7f1a63b7963d,,True,False,True,3,14,60,3,True,3,Tests_passed,6a4b4a419eaa912024513c4a447ca6349fea4c70806b72f39a58f2ef63a7935e,True,Tests_passed,9b91c6d561666fc772171cae5322aba666f871a61e7a06572f47bb6c9930c64e,True,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,e27b26c2811faff4dbd8d98b64b16afe06ffa7a5e9b118182acc86b9cd0badf5,Merge_failed,edc2558eaf78a8530c3c90fcac8b57abd0a9ac3547d5371b46f390d4a4cd3758,Tests_passed,70929b82855d56fc316529d3492cbdc64cd9c4e1ee40fdb1788e0beacba51aa8,Tests_failed,170d2d05346525bc2d30d3f0cce9deb490ca97ece593adbd442f43d39961e804,Merge_failed,edc2558eaf78a8530c3c90fcac8b57abd0a9ac3547d5371b46f390d4a4cd3758,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,1b7327c7c635a26ca91dcd8593f801e51789ffa94b6c284fa2f46415e46444e2,Tests_passed,70929b82855d56fc316529d3492cbdc64cd9c4e1ee40fdb1788e0beacba51aa8,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,68219f462152c87b2f6d19f3467cf3512fcfb0ff90fc047ccdc99f631e62cb2e,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2,Merge_failed,0b855f40c60d9ae2dee4467abbcfa376d7936aba09308d16aafe36265f286ab2 diff --git a/results/reaper/merges_tested/zeroturnaround/zt-zip.csv b/results/reaper/merges_tested/zeroturnaround/zt-zip.csv index b805421084..fd67184e5e 100644 --- a/results/reaper/merges_tested/zeroturnaround/zt-zip.csv +++ b/results/reaper/merges_tested/zeroturnaround/zt-zip.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 51,refs/remotes/origin/drop-pre-jdk8-versions,ce0ab9ec996a81db498e43e0b8d1c104d5c0f479,e077c8e83048c78c0ac13ff04c22d4098a556a99,6933db74aacfc56f2452061e2360386570228a82,,True,True,True,27,92,1149,2,True,27,Tests_passed,48a6dced5edd2be8368cb73d2b2018c9d987796d8ed4eb1ad643440a197e0810,True,Tests_passed,1bffcf567ab88edab1e9c2117b20a6a3b427c0370e72ac0847e2c082d5196b4e,True,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,c2c96189346997b1ecb29e0c28f52a33bc106076b50f4b4d059288c80e309832,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,1468feb88cf2e0e4579dd002231bd0977e4b201932dc31739a920bb0c46ad0d2,Merge_failed,9baa379d94562ace8df80a59c65194fb538b0c8c3fa3d8db0c676e95e04f70ca,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,9c2a0ef248022e4f7288ece0dd891b10ccc375492e66a7c15e29c738a858c2ef,Tests_passed,20450b358218c0c15c1077f50cbb645b4807c40d1db08c71ba37da3dffb4bbe4,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,0ccc950abf04deb65e2e21970738da216836e787133923bb6ddd5036855a738c,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be,Merge_failed,e7c0bb0b0568d91fb0258d854ae25a93db1ccb9a7ac6f28ba3325a5a3c0255be diff --git a/results/reaper/merges_tested/zextras/openzal.csv b/results/reaper/merges_tested/zextras/openzal.csv index c31863a2f4..631cb7ee16 100644 --- a/results/reaper/merges_tested/zextras/openzal.csv +++ b/results/reaper/merges_tested/zextras/openzal.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 701,refs/remotes/origin/pull/245,31fd311a6e3a8491ecf72c7a6bf8f020aeae7a63,c62df2463b60f8a3b79e7416db8c36ccdee3095b,3a719c8f2950f3b4a4d77c57510fa8a1766ad099,,True,True,Tests_passed,a31de397b1eedb12cc7d0ddf0392369ac4cee402a23dffc3135e6e7480be8143,True,5,6,71,3,True,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,True,5,True,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,956f282fe6889b8a5094fa580c771b54fa9da4d08510b9f744ae4c8bb47da7e4,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,7ac826d71842c96c4357e01b9e5bce40b4332c827bb18aad39a5d3461b8b89d6,Merge_failed,1cb11174718b2b634a8d651578725f3616057cf06fd4863d94b2b12568c4eb05,Merge_failed,26f113e8b64b4ef5f3f06774fbfc7ecfbb4ac96a4f89c383073812b168392e3a,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,5d8a6fa408fdfaad6b55d57ca3af9106ebf0cabec86562a3ce9e80f498153e29,Merge_failed,b32b603ddb69483e1c01d42fb082693d896e2ef47121da412a76149463b3100c,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181,Merge_failed,80f503b544d64bcf20d049159a1e919b96574ebdc04a0667c3a4dc8f40dde181 702,refs/remotes/origin/pull/245,5ec31424d8383e1fac60e1ac381f7fec5a4483ef,7b4d095a9b98fcfbe9bef711dff792c21fba5593,62987f02bd374d6337fd9d01e32fed9aa3a98ffb,,True,True,Tests_passed,6b0d99755da3b1b948ec2ee1c426b2a0f46bf48b56da92466e9d3fd1e700d622,True,31,41,3072,3,True,Tests_passed,881d20997458a4282bfbc2faca17e8fda3c3a57fe98ce8d08d77e5bbe8de8de5,True,31,True,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,1de5bd535c2583b7feb356bd06d0b3d126b97fcecff0865a9d35b032d104bc52,Merge_failed,97dbe3466720d48483d9dbb8e5a1f86d3115fa362f9f48b749ecdbd2e25f6d44,Merge_failed,d39ff1a20482bb3caa15dcdabd38e5071bf195a28a6ee07f679720b90f665049,Merge_failed,8d52a108ce91a04ab13c44ab8d17e913627d89e09732a4063ff8df0973cd08fa,Merge_failed,97dbe3466720d48483d9dbb8e5a1f86d3115fa362f9f48b749ecdbd2e25f6d44,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,acd5001576c1c8cc6458b3673cc216455334bf8d4cefb779ebcbb1b1db48a43b,Merge_failed,1638b57e1852462fde8c329aa77e3dca42312e02fe2809b2967a01607acdab35,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3,Merge_failed,fbb91432ca8ad02ad4c6dfd29aeb0c0e5592868419e4279c4a5fa83628ed47a3 707,refs/remotes/origin/pull/252,6c8c2b2532f8912f8020337fd39683b2705216a3,9fc96d51546c8f46699b2663de38f2ac590cd369,2284ce50ec3dc190b7bd982e2e4861faeed9bc4e,,True,True,Tests_passed,d8706a06ad0e011136a0a8481956a204fabd226e468bbde46ed2779f324344e7,True,4,4,27,8,True,Tests_passed,18158f5a824fbb0e473477b27ead6bad376a7e333f3bc96a5dd918718a3d69e1,True,8,True,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,df11c86e19784b767fe0f3fbbf6c40dd66248073d56ceb3684945d22767c6b91,Merge_failed,9b456ad4e9f45f94ad44a0600ba7be51d8b2f190bed55989c73a7e71cc8dfc36,Merge_failed,5fc6c7c7066fc07a4ea09142c7e0547c914635e0a41725d4ebd9677b357fdec9,Merge_failed,ab929135166e197ecd116303a92dfaf3882cbdc8c31f6b84dc402039be678899,Merge_failed,9b456ad4e9f45f94ad44a0600ba7be51d8b2f190bed55989c73a7e71cc8dfc36,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,0ff8b2566a3a768619d99bbd7c259538faa6458fb705bf01b76bf3f462678483,Merge_failed,a22abbf8c25e2d4c8b09e46c44af6c1c4b410b09db808eaf15a131ed5edca8ee,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891,Merge_failed,14b62412a9f4b82066c37401b840c2630cbcbe4276fef6c36ac24088c4785891 diff --git a/results/reaper/merges_tested/zhegexiaohuozi/jsoupxpath.csv b/results/reaper/merges_tested/zhegexiaohuozi/jsoupxpath.csv index 560df3fd0d..7da9a65d88 100644 --- a/results/reaper/merges_tested/zhegexiaohuozi/jsoupxpath.csv +++ b/results/reaper/merges_tested/zhegexiaohuozi/jsoupxpath.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 8,refs/heads/master,7bb89fc158257cd01fef2bf643314aaa8f2bf782,a5438e9e638b6593a77c41ddd175d7df6b5e23d5,639ea24ff9343207d50b749d4801a17158d15374,,True,True,True,4,6,43,3,True,4,Tests_passed,b88668cb21b8192c55948800c4e03633d6fd7417403eae3b04ba47e9cfc3e514,True,Tests_passed,ece76845511886797b5b611be08657b27f963f800cff4b03ef1cdb4b7a482c84,True,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,a75b66b96bdeb2ef73c2d72ddf53179ba6811cde8b649b29896d3c51d2ebb433,Merge_failed,e62fc3ac2e3609500befd559319d6f687b98c7988dff2ee04635f7cbbd0c1e6d,Merge_failed,501db65761d0a17f05590c934afd26f8cc65e431afa4d75ae8ddbd5316ae51db,Merge_failed,b8c7efd44380a56c9b0688c35c6e3039691ebc415e46d51f218a14ffbc66d998,Merge_failed,e62fc3ac2e3609500befd559319d6f687b98c7988dff2ee04635f7cbbd0c1e6d,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,7e89dfd328781538a916eac2bb5d5ebc506631bd3bc06d74c386f4ecaa77d8d1,Merge_failed,f95cbb76b03199e6323f9896ca229f4112a73143d0b63c82e6871b80bca8efe2,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e,Merge_failed,509b39ac377832e2b254f19d013f33968f540c94cd3c66296c588ba0aea4790e 13,refs/heads/master,2183475da7a4f5a050c6fc4532e1f13052826dde,4ad42a4a0203c7391f2cf3bb72c2c5f6e4203ae4,0f3909ae5d5ab0939b7efc62fa018a0472055713,,True,True,True,6,9,58,2,True,6,Tests_passed,890b00a3e005a713a0fbc72e5ed456b539291c1e90e440feb7577f923bb62091,True,Tests_passed,bd233b41fea7dd70fe2c4fcd3515c0dccf504d794824b8032896dbe0c70349f8,True,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,ebb006d8ec3ccb1efc7dd1bab118c10ca3f3ec5e57d3f89ade21eed0ea2b71d2,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5,Tests_passed,5d706d13c49174057f3127d6eb16e36907d12474ebbae313c1efef88701090a5 48,refs/heads/master,b5b48646d4cb7d0cc7344fff98ae6572dd808d6e,ef652cd7e7db3243b83965732b7d3111ff70fc60,7cd6b3a9f1493f36faeeec307b468aa025b09609,,True,True,True,25,37,314,2,True,25,Tests_passed,6445f053c84538278194528303787261098f9db655f105b2f9b7259ab77b6127,True,Tests_passed,bd309886fd8ed4d74e02675581bbb18e3092206efef8f7ccb0ee2cf315278dbd,True,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,32a83f8ee11eb71ab380b9dce0174b21964367fea2af4fef3c41c89decd4a7ec,Tests_failed,381d0bcfe49c51d0458d3b2b27f7d47c82e6f615bde9ebfa8cce39e5401ecb2b,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,32a83f8ee11eb71ab380b9dce0174b21964367fea2af4fef3c41c89decd4a7ec,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee,Tests_passed,81e0b3a2f47aa165897b49993f5d11a9e9106cf55cc5b7346ef04685753d7bee diff --git a/results/reaper/merges_tested/zhongdj/lifecycle.csv b/results/reaper/merges_tested/zhongdj/lifecycle.csv index 2fc6a0b259..4724169fc2 100644 --- a/results/reaper/merges_tested/zhongdj/lifecycle.csv +++ b/results/reaper/merges_tested/zhongdj/lifecycle.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/master,39a2a8f6f0a2ec3438245cb3df6adbcd827aef55,2a89e793fa9216d9929f1790e2387daad170e513,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,,True,True,True,14,111,816,2,True,14,Tests_passed,d6cb0caed4fd529b6fe9079b62b6a75cf9d759f29762006a5bf74d57ca2539d4,True,Tests_passed,c11f0de75f55061f7e4ddaa35725bc6a7f3ccef8de6019009cab885637dac8c7,True,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,3b47e1603e7183eaa1ec780bc3e623322b15e604970253131f9e1468261187d1,Merge_failed,789a5cbf303f3d1812eb538009337bc18190c528f82986d6f858ff9fa87a59fc,Merge_failed,45dbe72de046067f8601abd705760bf28751795c1cad165ba26f6195bef6df23,Tests_failed,7c321aff906007286c5a06cfd96871dd291decc3c9d4e4ba895cf16a00f0014d,Merge_failed,789a5cbf303f3d1812eb538009337bc18190c528f82986d6f858ff9fa87a59fc,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,115f10a3024d6bc71ef32594eda0df38e4ac9fcea6ffae26e7f3606e329f0526,Merge_failed,45dbe72de046067f8601abd705760bf28751795c1cad165ba26f6195bef6df23,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c,Merge_failed,c14e9f0f02fecdfed7cd2e95a173dbdf98b3a5791f93036591c24e64b4245a9c 2,refs/heads/master,2774133dbdaee5039e7f7f21a96a02d2d56dfa29,de6837afbb460ae88d2aa2d580826df2933b151e,9fd474cd1551609c8d62449c15d40b3f40d03454,,True,True,True,42,214,2511,5,True,42,Tests_passed,b5a291465d69b1aad03f86c46bebc956dffa1380541490030d96e308a45213f2,True,Tests_passed,30e7d005cf53167db338ccd86721317803a435af87bee95e9cdc45650dfafed3,True,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,aa8ad9d0755398357318e1f9375172d90dd094f1024b9669189a61f00d54bd2f,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,024f97036a5eac7e7855040f83ec7ec34ea4a2c1b8983f041cb627938ab4afbc,Merge_failed,67b70d4c68e138049f7f365df349f7e1c82d68b56032bcb17e7b40139571a8fb,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,50785ebe8c366aa38188f860e5480cb2ea6038ae7023c67816e610a177b5170d,Merge_failed,01cbce66c871259ecb3786ff40b6bd7d497ede14cfe884fd202986b67df423b5,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,1de655b42ff7f8fb2583302d4d918e3b428276158f832b494f16e4191a0f0af4,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d,Merge_failed,0f89e429c3cfa4769dbc639ccced9b5482be519fcd9bb9a57bf0c5040bf4752d diff --git a/results/reaper/merges_tested/zhuowei/raspberryjuice.csv b/results/reaper/merges_tested/zhuowei/raspberryjuice.csv index 20e1adc9cc..ae40869ca4 100644 --- a/results/reaper/merges_tested/zhuowei/raspberryjuice.csv +++ b/results/reaper/merges_tested/zhuowei/raspberryjuice.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 3,refs/heads/master,2ee0eb700df6b7c0d9ece3beb40e89b3306bfd81,1962a461f098fe9c1c2b84483e6aa86780934187,944d0578784893e80ebd85fcf4ea5ec2b51deeb4,,True,True,True,19,62,795,3,True,19,Tests_passed,89ac769156dd3b424e963ac2ac4a9140ebc78f71e4688bc357d61841996928b7,True,Tests_passed,8c549fcbbf5c095490917a6909da5b4e0c54700b3d17e5225995b2c10114ac18,True,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,46599f6e0db6ace0fdd3679a5059c79eb5e2cdb3c91a5a706e437e7458dcc326,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0,Tests_passed,c0638fb59c1753b5892d822af2779ffd2c73b4a1c57019f136e12155656009b0 9,refs/heads/master,8c537ab867b5f88945fb3985e05598c96efa70a8,28df7a5c2743b7fa8b43d378be49c84b82e11bfe,4deb15c845662e28d973c26b74650cf092dc0d73,,True,True,True,16,66,1251,3,True,16,Tests_passed,1f15ab56b8db882480879fcda00ab6124c0ac91b92a370509a6ec717d6a2869d,True,Tests_passed,7b3188e3707659936f9b50fc17325e158370b317d6d75506754894b8a7492ad7,True,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_failed,43bfc35a7e4a19e69085247a0446405e67d1aec21102bf5139c602a4c3afd6c8,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,a85964a4d52c54e3c011ad7aebddb2ee4b9291f01bca4c7e2e3b70c9c5555f77,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,dc7f066bf557c9736179b2b295ae62ada6631f56537b40ff002dede745b71fa9,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce,Tests_passed,8df05c339eee0bbeb9cc676eacf0cf134502d85d061dd8abbed91d0cb75ee5ce 12,refs/heads/master,b217e89f5d8ef404aff86b5d889027bb386a598c,79c1ae06ef97468fb5ab0ef2c31ae911ac0d733f,74342eabbf58aa6c45805deabf068b83f606db27,,True,True,True,8,17,333,3,True,8,Tests_passed,dabb6717f5d824b1a6f8de88c79cc88dd86f3e2578f800e54d05c5bdee3aa39b,True,Tests_passed,a862efbf621470af6051024e5d5d818ea366bdd4401195d8b135d58471254dd3,True,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,dba482011d4b358a5aaecbbd691879621886a605a2fa69070bee01755ad251b4,Merge_failed,1b392bd20cbea20697531562b0c771f3863d15b8d8b62fc751f60a6df1de60ec,Tests_passed,1c810c44dc7051f56cc39ef19941dc9d7f2fb159423984411d8c8a7ae5da71ce,Tests_failed,7e23dc279d0c7d5c3ea5b4afb98135d0163c338015f1d92f909e78137d1d008c,Merge_failed,1b392bd20cbea20697531562b0c771f3863d15b8d8b62fc751f60a6df1de60ec,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,5f4b2b8402b6d8201923a4e016762d090d8c4a4891e9e975f099fb35832f571b,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0cd10fffbc054b0873b166198486c7b00d4393d993cecfb5398172c7a462dd09,Tests_passed,1c810c44dc7051f56cc39ef19941dc9d7f2fb159423984411d8c8a7ae5da71ce,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,0bb5c01f776dc893c98e77fe99fb1577602bb34a77708d476b88f09e91f2643d,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869,Merge_failed,d63f9ba7ddaa438e8c48da9aec957051bef0a9219d42e0e31b8d150a9a114869 diff --git a/results/reaper/merges_tested/zsoltfabok/dojo.exercises.csv b/results/reaper/merges_tested/zsoltfabok/dojo.exercises.csv index 5cec5dfbc3..8511ff990f 100644 --- a/results/reaper/merges_tested/zsoltfabok/dojo.exercises.csv +++ b/results/reaper/merges_tested/zsoltfabok/dojo.exercises.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 10,refs/remotes/origin/heikkij,908be82a20bb82045861412089b7c7e409807de8,ae5e0ab1b02da13f7429822e9a1290bc065942bf,c3e18a0c82c7bbb1c7fa220d3d7a1701e9e1721f,,True,True,True,36,12,322,3,True,36,Tests_passed,e0d3707e4773af6228eddf33210cf51aa841f06a32579ddedcf43dc84357e72d,True,Tests_passed,7941519e8a53fd2f295b6a311a74cc0ada1997d9d148ca1929e59ea415e880a0,True,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,542a91092a9e81b23bf5cfa4ed624cad722b8034e735dd18d00cc01821781951,Merge_failed,3d484c4659e79285c1f5e4e92174f926e424e9c97e32091fa8bee34e152961c8,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15,Merge_failed,d566968e14a111618f43d46a60d8a77212b87dc799e622230ca7397f6732dc15 diff --git a/results/reaper/merges_tested/zxing/zxing.csv b/results/reaper/merges_tested/zxing/zxing.csv index 6a076d6efe..443ea8cce5 100644 --- a/results/reaper/merges_tested/zxing/zxing.csv +++ b/results/reaper/merges_tested/zxing/zxing.csv @@ -1,4 +1,4 @@ -idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 87,refs/remotes/origin/pull/1411,e3130cc10e7b16cbcaeb61545f8a65ed12e60be9,aa1e0fcd8874fb7481c774809c79d2b045110271,b94349949a9d62d79135d2f5140b70d355cfbcfe,,True,True,True,839,4944,19794,5,True,839,Tests_passed,b0fffe935db6b288c70d52f81c93f74b613ddc77093a2be799623d6316d6ac96,True,Tests_passed,2e8eddbde5694e567cfc27c0fd966f2964910c07034a4bb7aa8383824baad60f,True,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,5b5ebad3e886e142e323631654040997d1dddaa02290008904107e6853e40b79,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,218a2eeaad3eea8beaff8034d7a34209a09f81bb476c8f8cab12601c6b141779,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,b556a013cf58c4b1bff5ed009feea76d30260b3fd0934bca1830d38e2ac09a2d,Tests_failed,47aade3af941e1fdcfc17c0d5b625a814bcaacd98fb2964a61060ddcc76211bc,Merge_failed,eb5c3e72e24c2d6f275d427359738ac1024089fe2f83d17a44daed13bd144f48,Merge_timedout,,Tests_failed,47aade3af941e1fdcfc17c0d5b625a814bcaacd98fb2964a61060ddcc76211bc,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,218a2eeaad3eea8beaff8034d7a34209a09f81bb476c8f8cab12601c6b141779,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,2c6195f6c506136be2a8a8ff83b5e9b2490b1debee057eae79198ad4286c41bb,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,5b5ebad3e886e142e323631654040997d1dddaa02290008904107e6853e40b79,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d,Merge_failed,ee27eab6a950f3d3efdd579a8d1fd8fe650decf681d19762ae534fcdda8cae3d 89,refs/remotes/origin/pull/1445,26d5d1383623df1897bf2b4b80c358a9f90c630a,4130f24bc3d1b770c5a5298e33c38dc015a8b3e4,b51346c072723d6c3f14da17a0c842243af8a2ab,,True,True,True,75,188,3079,4,True,75,Tests_passed,e115fd94fd8bee0c15305298682e2941a10ba7edc607118dd01234781c7fd00f,True,Tests_passed,df4a36ad2723fe4577afe5bdc33ea4475e704d3b34acacc000ac84f7b1d8f7c5,True,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,93ff26f89efaf105b841b1709c3fb23a0cf238eed69f6dba060e2eff13ea965a,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,fc5c457bf5f1fae9e66573145407a6333450ac994cb2200c761e24f0bc34b37f,Tests_failed,3d16d83380785522c9388650e790ed040d8b94b460b58f70f6524ca71417371e,Tests_failed,bb9a700735b0bd127440dc36f840722451ba5c8e734c987fb3789a7d717e2f93,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,244ea54eff03da5fb6b937150c56973dbc9573be093e8eaf118051112efb68f1,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Tests_failed,db7352d863e696e9c53ff37e4b99dcaaa9e3b5f4b67155d2a87ca6c0bbc3f75e,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363,Merge_failed,0d126c58640fd5d12a266e15d8e2de2490219b4fb17165119d299bd9c1cb5363 90,refs/remotes/origin/pull/1446,620898d7d57a06972d8b31f61d58a4b25801ab55,153a4da399b03c00af6879e7e78bb6856832abdb,7a760c6384360a54d1a042133fc7c2805eaf3de9,,True,True,True,77,195,3277,3,True,77,Tests_passed,00a8401df9a8d7e0c398df594cf2abbde15bf5e6d4a8e608083c6eb9a5c93eeb,True,Tests_passed,c185b1e274b5f26be92739c0ca7aaa8280d9f1c986744fd4a800f3dc5624d8e1,True,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,1cbd4a8cc554eb47ea0b12994f5ed78bf561de564431096c454d2287a24fdef4,Merge_failed,a52f2dc3e984d96b80b799170ddb77342948bef2dd4f2c8234f1d972acf4879a,Merge_failed,9e15ecc086ddcd6d386ccf17592c59cf4b3374d081d597fd00cc15f2801fe62d,Merge_failed,9e15ecc086ddcd6d386ccf17592c59cf4b3374d081d597fd00cc15f2801fe62d,Merge_failed,a52f2dc3e984d96b80b799170ddb77342948bef2dd4f2c8234f1d972acf4879a,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,090aecf8af52b7dbf3d07fb75273d4d96b4805354a38116828cb1c116613d238,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Tests_failed,90478f72c3dc90efc10afe84a5b36dbf2b3ce6b1777d452e408ee7008f873af5,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd,Merge_failed,606b76679b47fcc6d730a80f1ba9a234b44ec25c21ff13392997d595f21cacdd diff --git a/results/reaper/result.csv b/results/reaper/result.csv index ca4c3cb4e3..ff46b46620 100644 --- a/results/reaper/result.csv +++ b/results/reaper/result.csv @@ -1,4 +1,4 @@ -idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation +idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation 3509-1,3509,1,refs/heads/master,68f967133364244b0238c0ccf7c38f6357e490f1,d0b634badf48029428b7f8d90bb3592e5cb76764,a7f0afe85806a63e842491f79028f1a00e971acb,,True,True,Tests_passed,ec996253d33d43c2baf924ceb34f84d6ceb8c630a05aab2dc10c5104f67bd114,True,15.0,81,428.0,25,True,Tests_passed,75788a4ec05dd6943f9916fc594eae88d2ea6545e37a12d5869eb3a4e4f4197a,True,37,True,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,9184172b1f9e0df0bbf20612d40afbe8b1fdae343b152fb83adbd0545011e524,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,2f20588461a06cef5099badca48a217a2b11ffaded70e92309927912fff03953,Merge_failed,0bed9d08855f71c955ea49337647ef78fb677a0cf283674ba9d07e7155f005e8,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,7fc754b5f625d3078e0bd8b165686f94da41c781623cdd925c22fe66901b791a,Merge_failed,d70a099216d4391b222d24d04037c2f1dbc91d3af23477fd750c49a063eb28ff,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,Merge_failed,e6c68f5130b9b028f837bea051f833aa38dd4517e67fdd722b375ef2d1a24246,lwhite1/tablesaw, 3509-3,3509,3,refs/heads/master,064b075c3a675302f3d372d0ce308a12dcca0ba4,a13a334c97c01a7284a80f171615f159d03b7975,2a7efb82d77980077ded7cee995c9c051fb1545e,,True,True,Tests_passed,8e253e7f54906664c5588ed04337ab0ebc000e46d65ad0c4260c8b5793b5459f,True,49.0,105,1735.0,7,True,Tests_passed,d9750fcfd6013df5ece52ac889dc4e82e0000e94661b33a5001b1fa9aee44e49,True,49,True,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_failed,a6641ae2f6190b5e571da73c4da12d540565a6b91954f68fc5696fe0aa8802a9,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,e912c6d514fed533bf06b745dbb208bee92256c3e46a794d43c80e9d57f89ffd,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,Tests_passed,941a1042b740ea3061bdc9be10c8fdfbe5ca3b7add21120b62d87b35d1c2add4,lwhite1/tablesaw, 3509-8,3509,8,refs/heads/master,13178c81a1ba18fc39b7280dc40919f4208650fa,25d12ee6c6f5bb70501541813caffa5265c0b9c8,92d27fbeb840ea070dfc5064ab3a67f223c56441,,True,True,Tests_passed,3af57b5a02ba264d51a67d6dc4c1a362302ed8f09cb98a0dcd08abceebeecd7a,True,24.0,84,245.0,2,True,Tests_passed,26fc25b1b168263e7dc12b303fdc31708348e8feab58e387de85d5a18a5fa6c4,True,24,True,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_passed,db916c422bc183b3099de3b057fae439030ebf3e54f36d29abcec0b6e61d1a53,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,Tests_failed,523dee1fb9efc1700c46d60c43a6d444bc7b9a8566cc1729660d6bb6c28e9e6a,lwhite1/tablesaw, diff --git a/results/reaper/tables/all/tool_comparison_table.csv b/results/reaper/tables/all/tool_comparison_table.csv index 15cd5e0cc9..fb157a19b2 100644 --- a/results/reaper/tables/all/tool_comparison_table.csv +++ b/results/reaper/tables/all/tool_comparison_table.csv @@ -1,4 +1,4 @@ -,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,plumelib_git_hires_merge,plumelib_intellimerge,plumelib_recursive_histogram,plumelib_recursive_ignorespace,plumelib_recursive_minimal,plumelib_recursive_myers,plumelib_recursive_patience,plumelib_resolve,plumelib_spork,plumelib_ort,plumelib_ort_ignorespace,adjacent,imports,version_numbers +,gitmerge_ort,gitmerge_ort_ignorespace,gitmerge_recursive_histogram,gitmerge_recursive_ignorespace,gitmerge_recursive_minimal,gitmerge_recursive_myers,gitmerge_recursive_patience,gitmerge_resolve,git_hires_merge,spork,intellimerge,git_hires_merge_plus,intellimerge_plus,gitmerge_recursive_histogram_plus,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_minimal_plus,gitmerge_recursive_myers_plus,gitmerge_recursive_patience_plus,gitmerge_resolve_plus,spork_plus,ivn,ivn_ignorespace,adjacent,imports,version_numbers gitmerge_ort,-,1,0,1,0,0,0,1,0,3,1,0,0,0,1,0,0,0,1,3,0,1,0,0,0 gitmerge_ort_ignorespace,17,-,17,0,17,17,17,18,14,14,12,14,17,17,0,17,17,17,18,14,17,0,17,17,17 gitmerge_recursive_histogram,0,1,-,1,0,0,0,1,0,3,1,0,0,0,1,0,0,0,1,3,0,1,0,0,0 @@ -10,17 +10,17 @@ gitmerge_resolve,2,3,2,2,1,1,1,-,1,4,3,1,2,2,2,1,1,1,0,4,2,3,2,2,2 git_hires_merge,49,47,49,46,48,48,48,49,-,22,23,0,49,49,46,48,48,48,49,22,49,47,49,49,49 spork,264,248,264,247,263,263,261,268,223,-,141,223,264,264,247,263,263,261,268,0,264,248,264,264,264 intellimerge,843,785,843,787,844,844,842,858,709,418,-,709,843,843,786,844,844,842,858,416,843,785,843,843,843 -plumelib_git_hires_merge,49,47,49,46,48,48,48,49,0,22,23,-,49,49,46,48,48,48,49,22,49,47,49,49,49 -plumelib_intellimerge,0,1,0,1,0,0,0,1,0,3,1,0,-,0,1,0,0,0,1,3,0,1,0,0,0 -plumelib_recursive_histogram,0,1,0,1,0,0,0,1,0,3,1,0,0,-,1,0,0,0,1,3,0,1,0,0,0 -plumelib_recursive_ignorespace,19,1,19,1,18,18,18,20,15,16,13,15,19,19,-,18,18,18,20,15,19,1,19,19,19 -plumelib_recursive_minimal,1,2,1,1,0,0,0,1,0,3,2,0,1,1,1,-,0,0,1,3,1,2,1,1,1 -plumelib_recursive_myers,1,2,1,1,0,0,0,1,0,3,2,0,1,1,1,0,-,0,1,3,1,2,1,1,1 -plumelib_recursive_patience,1,2,1,1,0,0,0,1,0,3,2,0,1,1,1,0,0,-,1,3,1,2,1,1,1 -plumelib_resolve,2,3,2,2,1,1,1,0,1,4,3,1,2,2,2,1,1,1,-,4,2,3,2,2,2 -plumelib_spork,264,248,264,247,263,263,261,268,223,0,141,223,264,264,247,263,263,261,268,-,264,248,264,264,264 -plumelib_ort,0,1,0,1,0,0,0,1,0,3,1,0,0,0,1,0,0,0,1,3,-,1,0,0,0 -plumelib_ort_ignorespace,17,0,17,0,17,17,17,18,14,14,12,14,17,17,0,17,17,17,18,14,17,-,17,17,17 +git_hires_merge_plus,49,47,49,46,48,48,48,49,0,22,23,-,49,49,46,48,48,48,49,22,49,47,49,49,49 +intellimerge_plus,0,1,0,1,0,0,0,1,0,3,1,0,-,0,1,0,0,0,1,3,0,1,0,0,0 +gitmerge_recursive_histogram_plus,0,1,0,1,0,0,0,1,0,3,1,0,0,-,1,0,0,0,1,3,0,1,0,0,0 +gitmerge_recursive_ignorespace_plus,19,1,19,1,18,18,18,20,15,16,13,15,19,19,-,18,18,18,20,15,19,1,19,19,19 +gitmerge_recursive_minimal_plus,1,2,1,1,0,0,0,1,0,3,2,0,1,1,1,-,0,0,1,3,1,2,1,1,1 +gitmerge_recursive_myers_plus,1,2,1,1,0,0,0,1,0,3,2,0,1,1,1,0,-,0,1,3,1,2,1,1,1 +gitmerge_recursive_patience_plus,1,2,1,1,0,0,0,1,0,3,2,0,1,1,1,0,0,-,1,3,1,2,1,1,1 +gitmerge_resolve_plus,2,3,2,2,1,1,1,0,1,4,3,1,2,2,2,1,1,1,-,4,2,3,2,2,2 +spork_plus,264,248,264,247,263,263,261,268,223,0,141,223,264,264,247,263,263,261,268,-,264,248,264,264,264 +ivn,0,1,0,1,0,0,0,1,0,3,1,0,0,0,1,0,0,0,1,3,-,1,0,0,0 +ivn_ignorespace,17,0,17,0,17,17,17,18,14,14,12,14,17,17,0,17,17,17,18,14,17,-,17,17,17 adjacent,0,1,0,1,0,0,0,1,0,3,1,0,0,0,1,0,0,0,1,3,0,1,-,0,0 imports,0,1,0,1,0,0,0,1,0,3,1,0,0,0,1,0,0,0,1,3,0,1,0,-,0 version_numbers,0,1,0,1,0,0,0,1,0,3,1,0,0,0,1,0,0,0,1,3,0,1,0,0,- diff --git a/results/reaper/tables/tools/tool_comparison_table.csv b/results/reaper/tables/tools/tool_comparison_table.csv index cee9ac3d86..bea5e70a01 100644 --- a/results/reaper/tables/tools/tool_comparison_table.csv +++ b/results/reaper/tables/tools/tool_comparison_table.csv @@ -1,4 +1,4 @@ -,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,plumelib_ort,plumelib_ort_ignorespace +,gitmerge_ort,gitmerge_ort_ignorespace,git_hires_merge,spork,intellimerge,adjacent,imports,version_numbers,ivn,ivn_ignorespace gitmerge_ort,-,1,0,3,1,0,0,0,0,1 gitmerge_ort_ignorespace,17,-,14,14,12,17,17,17,17,0 git_hires_merge,49,47,-,22,23,49,49,49,49,47 @@ -7,5 +7,5 @@ intellimerge,843,785,709,418,-,843,843,843,843,785 adjacent,0,1,0,3,1,-,0,0,0,1 imports,0,1,0,3,1,0,-,0,0,1 version_numbers,0,1,0,3,1,0,0,-,0,1 -plumelib_ort,0,1,0,3,1,0,0,0,-,1 -plumelib_ort_ignorespace,17,0,14,14,12,17,17,17,17,- +ivn,0,1,0,3,1,0,0,0,-,1 +ivn_ignorespace,17,0,14,14,12,17,17,17,17,- diff --git a/results/reaper/unhandled_and_failed_merges_without_intellimerge.csv b/results/reaper/unhandled_and_failed_merges_without_intellimerge.csv index eb6f3a56c8..fce0ff4744 100644 --- a/results/reaper/unhandled_and_failed_merges_without_intellimerge.csv +++ b/results/reaper/unhandled_and_failed_merges_without_intellimerge.csv @@ -1,4 +1,4 @@ -repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation +repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation 3509,143,refs/remotes/origin/pull/338,436f7cfe5ecfe763e7a45ce6745f1d1c52133d22,6e167b15fdeba936874662d6ccc6b0ae0a4ec6b8,03213c8c3ae8e233dc5e115bae6cdb049e8df71d,,True,True,Tests_passed,084c0bad8578a2dc019f9539b3f88abc9220fb38b95b98d40033abf1815975c3,True,18.0,44,145.0,3,True,Tests_passed,dc24f010e05c53895a5ef953bc983f6f75d56077d0931552aa69521dd1a7ee5c,True,18,True,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,05d48409e334cf67975c391080c77388ee1bbc360a2b63a3a4411f47bf836798,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,c3f606babc394883f854633cc4c995956ca0a91f5e5a982fc77c2dd26d00f458,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,664127fc97b840c7e0a318e67f081de2a351a0abec4df1912c5edeb522bc26a0,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,lwhite1/tablesaw, 10714,41,refs/heads/master,b41794d7af49d6c07e339f51eac8209f2a0bb9d1,b9f2366c231ac47575199cc0654635d5daa42f8a,2f6f0bd59c9cc4f98ef37cd79974ccedf4df063c,,True,True,Tests_passed,9ce7f449c1040527adf06cddd6f6da828ae9541db40eb6e2a2da5380535a96ca,True,26.0,81,1159.0,6,True,Tests_passed,7d40fae398405bcbdfd89d9512ef772288013a6bf9e9d383881f0596a1eae5d4,True,26,True,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,9e5ab73c3a123504c49f29c888bfa563004784ba45bb91ca1915bb0eb81a8885,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Tests_failed,d9fa2199d7e0c448f2178afb2b3937304e0cd398e4e5953cc273ad5ea9ae8785,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,7b246148fb1c7bba29cbeaf3ed2f0cebd25770b12b23b087d3a67b7f6e7602fb,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,brunoribeiro/sql-parser, 10714,48,refs/heads/master,21d9d04b08761aacd8cf844096fbe64d8c4b3c57,d2f7ff9fec38b8653499208aef522767003653fc,0d50066e7c2a0931565a2e2d5fc1d4197b5e2413,,True,True,Tests_passed,0f9a2db5f254d5963175c8669df9ecdb36704a166d4d6e2dff32063ae5b4f7d4,True,27.0,45,418.0,5,True,Tests_passed,20604532ae24b4efc082335ee65716b1923a2c44101faee9382b54975337062f,True,27,True,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,3f5ad9f12a4377acf4402ab238d2923eff22e58923c2f8449bfb229e039bc596,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Tests_failed,99fe1ac1fc65ff3060249daac63f9e4d9f88fe97bf8e2bc394505f45af92182a,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,de840cf8eb614267ee5ec704781bdcbdacaef23cb286f6538c83ac630f228f1e,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,brunoribeiro/sql-parser, diff --git a/results/reaper/unhandled_and_failed_merges_without_intellimerge_and_spork.csv b/results/reaper/unhandled_and_failed_merges_without_intellimerge_and_spork.csv index eb6f3a56c8..fce0ff4744 100644 --- a/results/reaper/unhandled_and_failed_merges_without_intellimerge_and_spork.csv +++ b/results/reaper/unhandled_and_failed_merges_without_intellimerge_and_spork.csv @@ -1,4 +1,4 @@ -repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation +repo-idx,merge-idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository,explanation 3509,143,refs/remotes/origin/pull/338,436f7cfe5ecfe763e7a45ce6745f1d1c52133d22,6e167b15fdeba936874662d6ccc6b0ae0a4ec6b8,03213c8c3ae8e233dc5e115bae6cdb049e8df71d,,True,True,Tests_passed,084c0bad8578a2dc019f9539b3f88abc9220fb38b95b98d40033abf1815975c3,True,18.0,44,145.0,3,True,Tests_passed,dc24f010e05c53895a5ef953bc983f6f75d56077d0931552aa69521dd1a7ee5c,True,18,True,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,05d48409e334cf67975c391080c77388ee1bbc360a2b63a3a4411f47bf836798,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,c3f606babc394883f854633cc4c995956ca0a91f5e5a982fc77c2dd26d00f458,Merge_failed,b690be9d0ba3d8b93141d20ed4b5944b396a78dbf0371e6cc0082ababffd6a26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,664127fc97b840c7e0a318e67f081de2a351a0abec4df1912c5edeb522bc26a0,Tests_failed,40d387e40888d42ce0ffe86c98d8f289d5595e47f869de91c7fd53779116ad26,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,Merge_failed,0c94035aa4be707d6fb6b10d45c086cb0e3094b823ffe2a2b1c43ee7bbde47d1,lwhite1/tablesaw, 10714,41,refs/heads/master,b41794d7af49d6c07e339f51eac8209f2a0bb9d1,b9f2366c231ac47575199cc0654635d5daa42f8a,2f6f0bd59c9cc4f98ef37cd79974ccedf4df063c,,True,True,Tests_passed,9ce7f449c1040527adf06cddd6f6da828ae9541db40eb6e2a2da5380535a96ca,True,26.0,81,1159.0,6,True,Tests_passed,7d40fae398405bcbdfd89d9512ef772288013a6bf9e9d383881f0596a1eae5d4,True,26,True,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,9e5ab73c3a123504c49f29c888bfa563004784ba45bb91ca1915bb0eb81a8885,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Tests_failed,d9fa2199d7e0c448f2178afb2b3937304e0cd398e4e5953cc273ad5ea9ae8785,Merge_failed,397821b959b9d14b15ae1edd3f57d68a70177ead1ad4d5aa725e06c9afd9c205,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,7b246148fb1c7bba29cbeaf3ed2f0cebd25770b12b23b087d3a67b7f6e7602fb,Tests_failed,78b3016c4ca80cc9a7b071d29aabde92414b31375181c318109467fefc40faf4,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,13006278e26e5dfadeebebe192394288e7fce122f7dce4ec9f14f94e047fa000,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,Merge_failed,09eec9ef4d7c53d97fd9bb611804e161e2326b9cfd8c5f567911a11a667ca350,brunoribeiro/sql-parser, 10714,48,refs/heads/master,21d9d04b08761aacd8cf844096fbe64d8c4b3c57,d2f7ff9fec38b8653499208aef522767003653fc,0d50066e7c2a0931565a2e2d5fc1d4197b5e2413,,True,True,Tests_passed,0f9a2db5f254d5963175c8669df9ecdb36704a166d4d6e2dff32063ae5b4f7d4,True,27.0,45,418.0,5,True,Tests_passed,20604532ae24b4efc082335ee65716b1923a2c44101faee9382b54975337062f,True,27,True,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,3f5ad9f12a4377acf4402ab238d2923eff22e58923c2f8449bfb229e039bc596,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Tests_failed,99fe1ac1fc65ff3060249daac63f9e4d9f88fe97bf8e2bc394505f45af92182a,Merge_failed,9a09538054cc627c0412d7a2f889bcabe98d763b1a2a406e62c1565276a531d5,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,de840cf8eb614267ee5ec704781bdcbdacaef23cb286f6538c83ac630f228f1e,Tests_failed,54215a89637a0e633fe6874e1e1fff3dac70d9056c5cd3811e646c804cce4445,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,fe2577f69b1f8e4cf5acdc092b9c904c0c818e2e6666dc1d71ffc04cbe758aa6,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,Merge_failed,56296908897654c621c518a0f9fdc9d60fdae42d99623d97304e505ff3a5b4e2,brunoribeiro/sql-parser, diff --git a/src/python/latex_output.py b/src/python/latex_output.py index 196018a2c4..add9a9bcb0 100755 --- a/src/python/latex_output.py +++ b/src/python/latex_output.py @@ -64,8 +64,8 @@ "adjacent": "Adjacent", "imports": "Imports", "version_numbers": "Version Numbers", - "plumelib_ort": "IVn", - "plumelib_ort_ignorespace": "IVn-ignorespace", + "ivn": "IVn", + "ivn_ignorespace": "IVn-ignorespace", } @@ -170,8 +170,8 @@ def latex_def(name, value) -> str: "adjacent", "imports", "version_numbers", - "plumelib_ort", - "plumelib_ort_ignorespace", + "ivn", + "ivn_ignorespace", ], } diff --git a/src/python/repo.py b/src/python/repo.py index 681ccabbeb..1289b28223 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -123,17 +123,17 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None: "adjacent", "imports", "version_numbers", - "plumelib_git_hires_merge", - "plumelib_intellimerge", - "plumelib_recursive_histogram", - "plumelib_recursive_ignorespace", - "plumelib_recursive_minimal", - "plumelib_recursive_myers", - "plumelib_recursive_patience", - "plumelib_resolve", - "plumelib_spork", - "plumelib_ort", - "plumelib_ort_ignorespace", + "git_hires_merge_plus", + "intellimerge_plus", + "gitmerge_recursive_histogram_plus", + "gitmerge_recursive_ignorespace_plus", + "gitmerge_recursive_minimal_plus", + "gitmerge_recursive_myers_plus", + "gitmerge_recursive_patience_plus", + "gitmerge_resolve_plus", + "spork_plus", + "ivn", + "ivn_ignorespace", ], ) MERGE_STATE = Enum( diff --git a/src/scripts/merge_tools/plumelib_adjacent.sh b/src/scripts/merge_tools/adjacent_plus.sh similarity index 100% rename from src/scripts/merge_tools/plumelib_adjacent.sh rename to src/scripts/merge_tools/adjacent_plus.sh diff --git a/src/scripts/merge_tools/plumelib_git_hires_merge.sh b/src/scripts/merge_tools/git_hires_merge_plus.sh similarity index 79% rename from src/scripts/merge_tools/plumelib_git_hires_merge.sh rename to src/scripts/merge_tools/git_hires_merge_plus.sh index b6c1b7293d..38f01be17a 100755 --- a/src/scripts/merge_tools/plumelib_git_hires_merge.sh +++ b/src/scripts/merge_tools/git_hires_merge_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_git_hires_merge.sh +# usage: ./git_hires_merge_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_recursive_histogram.sh b/src/scripts/merge_tools/gitmerge_recursive_histogram_plus.sh similarity index 78% rename from src/scripts/merge_tools/plumelib_recursive_histogram.sh rename to src/scripts/merge_tools/gitmerge_recursive_histogram_plus.sh index a6c7112e14..0ecfb0d6b3 100755 --- a/src/scripts/merge_tools/plumelib_recursive_histogram.sh +++ b/src/scripts/merge_tools/gitmerge_recursive_histogram_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_recursive_histogram.sh +# usage: ./gitmerge_recursive_histogram_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_recursive_ignorespace.sh b/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh similarity index 78% rename from src/scripts/merge_tools/plumelib_recursive_ignorespace.sh rename to src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh index a63aff271d..a49b82bc12 100755 --- a/src/scripts/merge_tools/plumelib_recursive_ignorespace.sh +++ b/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_recursive_ignorespace.sh +# usage: ./gitmerge_recursive_ignorespace_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_recursive_minimal.sh b/src/scripts/merge_tools/gitmerge_recursive_minimal_plus.sh similarity index 79% rename from src/scripts/merge_tools/plumelib_recursive_minimal.sh rename to src/scripts/merge_tools/gitmerge_recursive_minimal_plus.sh index 483839a5a4..f9457f945d 100755 --- a/src/scripts/merge_tools/plumelib_recursive_minimal.sh +++ b/src/scripts/merge_tools/gitmerge_recursive_minimal_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_recursive_minimal.sh +# usage: ./gitmerge_recursive_minimal_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_recursive_myers.sh b/src/scripts/merge_tools/gitmerge_recursive_myers_plus.sh similarity index 79% rename from src/scripts/merge_tools/plumelib_recursive_myers.sh rename to src/scripts/merge_tools/gitmerge_recursive_myers_plus.sh index 77e2a360be..712c3c0c76 100755 --- a/src/scripts/merge_tools/plumelib_recursive_myers.sh +++ b/src/scripts/merge_tools/gitmerge_recursive_myers_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_recursive_myers.sh +# usage: ./gitmerge_recursive_myers_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_recursive_patience.sh b/src/scripts/merge_tools/gitmerge_recursive_patience_plus.sh similarity index 78% rename from src/scripts/merge_tools/plumelib_recursive_patience.sh rename to src/scripts/merge_tools/gitmerge_recursive_patience_plus.sh index b363cad128..de31d1d26c 100755 --- a/src/scripts/merge_tools/plumelib_recursive_patience.sh +++ b/src/scripts/merge_tools/gitmerge_recursive_patience_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_recursive_patience.sh +# usage: ./gitmerge_recursive_patience_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_resolve.sh b/src/scripts/merge_tools/gitmerge_resolve_plus.sh similarity index 79% rename from src/scripts/merge_tools/plumelib_resolve.sh rename to src/scripts/merge_tools/gitmerge_resolve_plus.sh index 1d64b6d17a..f910795811 100755 --- a/src/scripts/merge_tools/plumelib_resolve.sh +++ b/src/scripts/merge_tools/gitmerge_resolve_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_resolve.sh +# usage: ./gitmerge_resolve_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_intellimerge.sh b/src/scripts/merge_tools/intellimerge_plus.sh similarity index 80% rename from src/scripts/merge_tools/plumelib_intellimerge.sh rename to src/scripts/merge_tools/intellimerge_plus.sh index 90f0c191f6..bccff7d4fd 100755 --- a/src/scripts/merge_tools/plumelib_intellimerge.sh +++ b/src/scripts/merge_tools/intellimerge_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_intellimerge.sh +# usage: ./intellimerge_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_ort.sh b/src/scripts/merge_tools/ivn.sh similarity index 81% rename from src/scripts/merge_tools/plumelib_ort.sh rename to src/scripts/merge_tools/ivn.sh index 4b8ed6d0ca..162976a74f 100755 --- a/src/scripts/merge_tools/plumelib_ort.sh +++ b/src/scripts/merge_tools/ivn.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_ort.sh +# usage: ./ivn.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_ort_ignorespace.sh b/src/scripts/merge_tools/ivn_ignorespace.sh similarity index 80% rename from src/scripts/merge_tools/plumelib_ort_ignorespace.sh rename to src/scripts/merge_tools/ivn_ignorespace.sh index 65002e6b1e..e6d4d5aa31 100755 --- a/src/scripts/merge_tools/plumelib_ort_ignorespace.sh +++ b/src/scripts/merge_tools/ivn_ignorespace.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_ort_ignorespace.sh +# usage: ./ivn_ignorespace.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/src/scripts/merge_tools/plumelib_spork.sh b/src/scripts/merge_tools/spork_plus.sh similarity index 81% rename from src/scripts/merge_tools/plumelib_spork.sh rename to src/scripts/merge_tools/spork_plus.sh index b1fa8d32d4..44f67a1046 100755 --- a/src/scripts/merge_tools/plumelib_spork.sh +++ b/src/scripts/merge_tools/spork_plus.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./plumelib_spork.sh +# usage: ./spork_plus.sh MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 diff --git a/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv b/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv index 28d78cbcc6..f8c138ddc0 100644 --- a/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv +++ b/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,4abab825dba02ae94f7cc664a590c7c4a57687e2b79fb78d2b92a5d190661e0f,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19 2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,d5f2cdfd3ff568d6b5f1200f5176590d41ab3ad38f72f5e4f630e3aeb8dc83dd,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d diff --git a/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv b/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv index cfd698ce28..27b4e427a9 100644 --- a/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv +++ b/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,d46e1be02785c17b203d59e5826734071ddc054a6e47461239bbc565807667e6,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0 diff --git a/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv b/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv index 7d2e3040f2..5bc8496f0f 100644 --- a/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv +++ b/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,d37c85012f27488ffb534f12b1e16e058689729b24f8193d14fddf6b3b41b31c,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7 19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,ea1afbafefd4d14186ae487d1d6e67184e2a2c79c74607cbd873dca0bb157c39,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4 diff --git a/test/small-goal-files/merges_tested/tntim96/jscover.csv b/test/small-goal-files/merges_tested/tntim96/jscover.csv index bcda5638f9..ad2f12ff91 100644 --- a/test/small-goal-files/merges_tested/tntim96/jscover.csv +++ b/test/small-goal-files/merges_tested/tntim96/jscover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint +idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint 20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042 diff --git a/test/small-goal-files/result.csv b/test/small-goal-files/result.csv index 0298d7d1aa..cf2b59d8fb 100644 --- a/test/small-goal-files/result.csv +++ b/test/small-goal-files/result.csv @@ -1,4 +1,4 @@ -idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,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_git_hires_merge,plumelib_git_hires_merge_merge_fingerprint,plumelib_intellimerge,plumelib_intellimerge_merge_fingerprint,plumelib_recursive_histogram,plumelib_recursive_histogram_merge_fingerprint,plumelib_recursive_ignorespace,plumelib_recursive_ignorespace_merge_fingerprint,plumelib_recursive_minimal,plumelib_recursive_minimal_merge_fingerprint,plumelib_recursive_myers,plumelib_recursive_myers_merge_fingerprint,plumelib_recursive_patience,plumelib_recursive_patience_merge_fingerprint,plumelib_resolve,plumelib_resolve_merge_fingerprint,plumelib_spork,plumelib_spork_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository +idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,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,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository 0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,4abab825dba02ae94f7cc664a590c7c4a57687e2b79fb78d2b92a5d190661e0f,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,benedikt-schesch/git-hires-merge-example 0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,d5f2cdfd3ff568d6b5f1200f5176590d41ab3ad38f72f5e4f630e3aeb8dc83dd,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,benedikt-schesch/git-hires-merge-example 1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,d46e1be02785c17b203d59e5826734071ddc054a6e47461239bbc565807667e6,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,mangstadt/ez-vcard